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

Add additional logging for conflict resolution.

fork-5.53.8
Alan Evans 2021-02-01 13:01:29 -04:00
rodzic dcfa7e3b36
commit 904593c103
1 zmienionych plików z 11 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
app/src/main/java/org/thoughtcrime/securesms/groups/GroupManagerV2.java
Wyświetl plik

@ -75,6 +75,7 @@ import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Set; import java.util.Set;
@ -578,7 +579,16 @@ final class GroupManagerV2 {
GroupsV2StateProcessor.GroupUpdateResult groupUpdateResult = groupsV2StateProcessor.forGroup(groupMasterKey) GroupsV2StateProcessor.GroupUpdateResult groupUpdateResult = groupsV2StateProcessor.forGroup(groupMasterKey)
.updateLocalGroupToRevision(GroupsV2StateProcessor.LATEST, System.currentTimeMillis(), null); .updateLocalGroupToRevision(GroupsV2StateProcessor.LATEST, System.currentTimeMillis(), null);
if (groupUpdateResult.getGroupState() != GroupsV2StateProcessor.GroupState.GROUP_UPDATED || groupUpdateResult.getLatestServer() == null) { if (groupUpdateResult.getLatestServer() == null) {
Log.w(TAG, "Latest server state null.");
throw new GroupChangeFailedException();
}
if (groupUpdateResult.getGroupState() != GroupsV2StateProcessor.GroupState.GROUP_UPDATED) {
int serverRevision = groupUpdateResult.getLatestServer().getRevision();
int localRevision = groupDatabase.requireGroup(groupId).requireV2GroupProperties().getGroupRevision();
int revisionDelta = serverRevision - localRevision;
Log.w(TAG, String.format(Locale.US, "Server is ahead by %d revisions", revisionDelta));
throw new GroupChangeFailedException(); throw new GroupChangeFailedException();
} }