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

Fix GV2 storage sync crash.

Browse source 
Fixes #11459
This commit is contained in:
Greyson Parrelli 2021-08-23 08:43:36 -04:00 • committed by Alex Hart
parent 5e8d74bc11
commit fc9b8f43dd
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -447,11 +447,20 @@ private static final String[] GROUP_PROJECTION = {
public GroupId.V2 create(@NonNull GroupMasterKey groupMasterKey, public GroupId.V2 create(@NonNull GroupMasterKey groupMasterKey,
@NonNull DecryptedGroup groupState) @NonNull DecryptedGroup groupState)
{
return create(groupMasterKey, groupState, false);
}
public GroupId.V2 create(@NonNull GroupMasterKey groupMasterKey,
@NonNull DecryptedGroup groupState,
boolean force)
{ {
GroupId.V2 groupId = GroupId.v2(groupMasterKey); GroupId.V2 groupId = GroupId.v2(groupMasterKey);
if (getGroupV1ByExpectedV2(groupId).isPresent()) { if (!force && getGroupV1ByExpectedV2(groupId).isPresent()) {
throw new MissedGroupMigrationInsertException(groupId); throw new MissedGroupMigrationInsertException(groupId);
} else if (force) {
Log.w(TAG, "Forcing the creation of a group even though we already have a V1 ID!");
} }
create(groupId, groupState.getTitle(), Collections.emptyList(), null, null, groupMasterKey, groupState); create(groupId, groupState.getTitle(), Collections.emptyList(), null, null, groupMasterKey, groupState);
@ -484,9 +493,11 @@ private static final String[] GROUP_PROJECTION = {
if (updated < 1) { if (updated < 1) {
Log.w(TAG, "No group entry. Creating restore placeholder for " + groupId); Log.w(TAG, "No group entry. Creating restore placeholder for " + groupId);
create(groupMasterKey, DecryptedGroup.newBuilder() create(groupMasterKey,
.setRevision(GroupsV2StateProcessor.RESTORE_PLACEHOLDER_REVISION) DecryptedGroup.newBuilder()
.build()); .setRevision(GroupsV2StateProcessor.RESTORE_PLACEHOLDER_REVISION)
.build(),
true);
} else { } else {
Log.w(TAG, "Had a group entry, but it was missing a master key. Updated."); Log.w(TAG, "Had a group entry, but it was missing a master key. Updated.");
} }