Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 09:49:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor how we handle GV1->GV2 migration suggestions.

Browse Source
This commit is contained in:
Greyson Parrelli
2020-12-15 20:18:47 -05:00
committed by GitHub
parent 7864c8ceb4
commit f4c723cc60
9 changed files with 132 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/groups/ui/migration/GroupsV1MigrationSuggestionsDialog.java
View File

@@ -75,15 +75,15 @@ public final class GroupsV1MigrationSuggestionsDialog {
SimpleTask.run(SignalExecutors.UNBOUNDED, () -> {
try {
GroupManager.addMembers(fragmentActivity, groupId.requirePush(), suggestions);
Log.i(TAG, "Successfully added members! Clearing former members.");
DatabaseFactory.getGroupDatabase(fragmentActivity).clearFormerV1Members(groupId);
Log.i(TAG, "Successfully added members! Removing these dropped members from the list.");
DatabaseFactory.getGroupDatabase(fragmentActivity).removeUnmigratedV1Members(groupId, suggestions);
return Result.SUCCESS;
} catch (IOException | GroupChangeBusyException e) {
Log.w(TAG, "Temporary failure.", e);
return Result.NETWORK_ERROR;
} catch (GroupNotAMemberException | GroupInsufficientRightsException | MembershipNotSuitableForV2Exception | GroupChangeFailedException e) {
Log.w(TAG, "Permanent failure! Clearing former members.", e);
DatabaseFactory.getGroupDatabase(fragmentActivity).clearFormerV1Members(groupId);
Log.w(TAG, "Permanent failure! Removing these dropped members from the list.", e);
DatabaseFactory.getGroupDatabase(fragmentActivity).removeUnmigratedV1Members(groupId, suggestions);
return Result.IMPOSSIBLE;
}
}, result -> {