empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix crash if synced pinned contact is malformed.

Browse source
This commit is contained in:
Greyson Parrelli 2022-03-10 11:14:55 -05:00
parent 80bfa103ab
commit 15f51ea26e
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libsignal/service/src/main/java/org/whispersystems/signalservice/api/storage/SignalAccountRecord.java
View file

@ -315,7 +315,13 @@ public final class SignalAccountRecord implements SignalRecord {
static PinnedConversation fromRemote(AccountRecord.PinnedConversation remote) {
if (remote.hasContact()) {
return forContact(new SignalServiceAddress(ServiceId.parseOrThrow(remote.getContact().getUuid()), remote.getContact().getE164()));
ServiceId serviceId = ServiceId.parseOrNull(remote.getContact().getUuid());
if (serviceId != null) {
return forContact(new SignalServiceAddress(serviceId, remote.getContact().getE164()));
} else {
Log.w(TAG, "Bad serviceId on pinned contact! Length: " + remote.getContact().getUuid());
return PinnedConversation.forEmpty();
}
} else if (!remote.getLegacyGroupId().isEmpty()) {
return forGroupV1(remote.getLegacyGroupId().toByteArray());
} else if (!remote.getGroupMasterKey().isEmpty()) {