TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-30 15:26:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prefer remote value for profile sharing for groups during storage sync.

Browse Source
This commit is contained in:
Greyson Parrelli
2020-10-06 18:43:00 -04:00
parent 441a6d3fe7
commit ab2235fc88
5 changed files with 12 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/storage/GroupV1ConflictMerger.java
View File

@@ -38,7 +38,7 @@ final class GroupV1ConflictMerger implements StorageSyncHelper.ConflictMerger<Si
public @NonNull SignalGroupV1Record merge(@NonNull SignalGroupV1Record remote, @NonNull SignalGroupV1Record local, @NonNull StorageSyncHelper.KeyGenerator keyGenerator) {
byte[] unknownFields = remote.serializeUnknownFields();
boolean blocked = remote.isBlocked();
boolean profileSharing = remote.isProfileSharingEnabled() || local.isProfileSharingEnabled();
boolean profileSharing = remote.isProfileSharingEnabled();
boolean archived = remote.isArchived();
boolean matchesRemote = Arrays.equals(unknownFields, remote.serializeUnknownFields()) && blocked == remote.isBlocked() && profileSharing == remote.isProfileSharingEnabled() && archived == remote.isArchived();

2
app/src/main/java/org/thoughtcrime/securesms/storage/GroupV2ConflictMerger.java
View File

@@ -38,7 +38,7 @@ final class GroupV2ConflictMerger implements StorageSyncHelper.ConflictMerger<Si
public @NonNull SignalGroupV2Record merge(@NonNull SignalGroupV2Record remote, @NonNull SignalGroupV2Record local, @NonNull StorageSyncHelper.KeyGenerator keyGenerator) {
byte[] unknownFields = remote.serializeUnknownFields();
boolean blocked = remote.isBlocked();
boolean profileSharing = remote.isProfileSharingEnabled() || local.isProfileSharingEnabled();
boolean profileSharing = remote.isProfileSharingEnabled();
boolean archived = remote.isArchived();
boolean matchesRemote = Arrays.equals(unknownFields, remote.serializeUnknownFields()) && blocked == remote.isBlocked() && profileSharing == remote.isProfileSharingEnabled() && archived == remote.isArchived();