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

Fix crash when processing group updates with remapped members.

Browse source
This commit is contained in:
Cody Henthorne 2021-12-20 13:05:10 -05:00 • committed by Greyson Parrelli
parent 8c34357cc6
commit b69ffe4e15
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/org/thoughtcrime/securesms/database/GroupDatabase.java
View file

@ -581,7 +581,7 @@ private static final String[] GROUP_PROJECTION = {
throw new AssertionError("V2 master key but no group state");
}
groupId.requireV2();
groupMembers = getV2GroupMembers(context, groupState);
groupMembers = getV2GroupMembers(context, groupState, true);
contentValues.put(V2_MASTER_KEY, groupMasterKey.serialize());
contentValues.put(V2_REVISION, groupState.getRevision());
contentValues.put(V2_DECRYPTED_GROUP, groupState.toByteArray());
@ -720,7 +720,7 @@ private static final String[] GROUP_PROJECTION = {
contentValues.put(UNMIGRATED_V1_MEMBERS, unmigratedV1Members.isEmpty() ? null : RecipientId.toSerializedList(unmigratedV1Members));
}
List<RecipientId> groupMembers = getV2GroupMembers(context, decryptedGroup);
List<RecipientId> groupMembers = getV2GroupMembers(context, decryptedGroup, true);
contentValues.put(TITLE, title);
contentValues.put(V2_REVISION, decryptedGroup.getRevision());
contentValues.put(V2_DECRYPTED_GROUP, decryptedGroup.toByteArray());
@ -894,12 +894,18 @@ private static final String[] GROUP_PROJECTION = {
return groupMembers;
}
private static @NonNull List<RecipientId> getV2GroupMembers(@NonNull Context context, @NonNull DecryptedGroup decryptedGroup) {
private static @NonNull List<RecipientId> getV2GroupMembers(@NonNull Context context, @NonNull DecryptedGroup decryptedGroup, boolean shouldRetry) {
List<UUID> uuids = DecryptedGroupUtil.membersToUuidList(decryptedGroup.getMembersList());
List<RecipientId> ids = uuidsToRecipientIds(uuids);
if (RemappedRecords.getInstance().areAnyRemapped(ids)) {
throw new IllegalStateException("Remapped records in group membership!");
if (shouldRetry) {
Log.w(TAG, "Found remapped records where we shouldn't. Clearing cache and trying again.");
RecipientId.clearCache();
return getV2GroupMembers(context, decryptedGroup, false);
} else {
throw new IllegalStateException("Remapped records in group membership!");
}
} else {
return ids;
}