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

Fix rejoining group on linked device not showing as joined.

fork-5.53.8
Cody Henthorne 2022-03-03 11:23:23 -05:00 zatwierdzone przez Alex Hart
rodzic 41b5813984
commit 35199abf1f
1 zmienionych plików z 3 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/groups/v2/processing/GroupsV2StateProcessor.java
Wyświetl plik

@ -315,7 +315,7 @@ public class GroupsV2StateProcessor {
throw new IOException(e); throw new IOException(e);
} }
if (localState != null && localState.getRevision() >= latestServerGroup.getRevision()) { if (localState != null && localState.getRevision() >= latestServerGroup.getRevision() && GroupProtoUtil.isMember(selfAci.uuid(), localState.getMembersList())) {
Log.i(TAG, "Local state is at or later than server"); Log.i(TAG, "Local state is at or later than server");
return new GroupUpdateResult(GroupState.GROUP_CONSISTENT_OR_AHEAD, null); return new GroupUpdateResult(GroupState.GROUP_CONSISTENT_OR_AHEAD, null);
} }
@ -329,6 +329,8 @@ public class GroupsV2StateProcessor {
boolean includeFirstState = forceIncludeFirst || boolean includeFirstState = forceIncludeFirst ||
localState == null || localState == null ||
localState.getRevision() < 0 || localState.getRevision() < 0 ||
localState.getRevision() == revisionWeWereAdded ||
!GroupProtoUtil.isMember(selfAci.uuid(), localState.getMembersList()) ||
(revision == LATEST && localState.getRevision() + 1 < latestServerGroup.getRevision()); (revision == LATEST && localState.getRevision() + 1 < latestServerGroup.getRevision());
Log.i(TAG, Log.i(TAG,