mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix crash when trying to update a group call without an era id.

main
Cody Henthorne 2023-01-25 16:41:27 -05:00 zatwierdzone przez Greyson Parrelli
rodzic 32dd227ab6
commit e0633180ef
3 zmienionych plików z 9 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/jobs/GroupCallUpdateSendJob.java
Wyświetl plik

@ -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)

4
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/SignalCallManager.java
Wyświetl plik

@ -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);
} }
}); });
} }

7
libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
Wyświetl plik

@ -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()) {