kopia lustrzana https://github.com/ryukoposting/Signal-Android
Fix crash when trying to update a group call without an era id.
rodzic
32dd227ab6
commit
e0633180ef
|
@ -73,7 +73,7 @@ public class GroupCallUpdateSendJob extends BaseJob {
|
||||||
}
|
}
|
||||||
|
|
||||||
private GroupCallUpdateSendJob(@NonNull RecipientId recipientId,
|
private GroupCallUpdateSendJob(@NonNull RecipientId recipientId,
|
||||||
@NonNull String eraId,
|
@Nullable String eraId,
|
||||||
@NonNull List<RecipientId> recipients,
|
@NonNull List<RecipientId> recipients,
|
||||||
int initialRecipientCount,
|
int initialRecipientCount,
|
||||||
@NonNull Parameters parameters)
|
@NonNull Parameters parameters)
|
||||||
|
|
|
@ -361,7 +361,7 @@ private void processStateless(@NonNull Function1<WebRtcEphemeralState, WebRtcEph
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} catch (IOException | VerificationFailedException | CallException e) {
|
} catch (IOException | VerificationFailedException | CallException e) {
|
||||||
Log.e(TAG, "error peeking from active conversation", e);
|
Log.i(TAG, "error peeking from active conversation", e);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -389,7 +389,7 @@ private void processStateless(@NonNull Function1<WebRtcEphemeralState, WebRtcEph
|
||||||
members,
|
members,
|
||||||
peekInfo -> receivedGroupCallPeekForRingingCheck(info, peekInfo));
|
peekInfo -> receivedGroupCallPeekForRingingCheck(info, peekInfo));
|
||||||
} catch (IOException | VerificationFailedException | CallException e) {
|
} catch (IOException | VerificationFailedException | CallException e) {
|
||||||
Log.e(TAG, "error peeking for ringing check", e);
|
Log.i(TAG, "error peeking for ringing check", e);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -1034,7 +1034,12 @@ public class SignalServiceMessageSender {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (message.getGroupCallUpdate().isPresent()) {
|
if (message.getGroupCallUpdate().isPresent()) {
|
||||||
builder.setGroupCallUpdate(DataMessage.GroupCallUpdate.newBuilder().setEraId(message.getGroupCallUpdate().get().getEraId()));
|
String eraId = message.getGroupCallUpdate().get().getEraId();
|
||||||
|
if (eraId != null) {
|
||||||
|
builder.setGroupCallUpdate(DataMessage.GroupCallUpdate.newBuilder().setEraId(eraId));
|
||||||
|
} else {
|
||||||
|
builder.setGroupCallUpdate(DataMessage.GroupCallUpdate.getDefaultInstance());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (message.getPayment().isPresent()) {
|
if (message.getPayment().isPresent()) {
|
||||||
|
|
Ładowanie…
Reference in New Issue