Prefer remote value for profile sharing during storage sync.

signalapp · Sep 24, 2020 · 864a1d5 · 864a1d5
1 parent 9cf7eec
commit 864a1d5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/ContactConflictMerger.java b/app/src/main/java/org/thoughtcrime/securesms/storage/ContactConflictMerger.java
@@ -84,7 +84,7 @@ class ContactConflictMerger implements StorageSyncHelper.ConflictMerger<SignalCo
     IdentityState        identityState  = remote.getIdentityState();
     byte[]               identityKey    = remote.getIdentityKey().or(local.getIdentityKey()).orNull();
     boolean              blocked        = remote.isBlocked();
-    boolean              profileSharing = remote.isProfileSharingEnabled() || local.isProfileSharingEnabled();
+    boolean              profileSharing = remote.isProfileSharingEnabled();
     boolean              archived       = remote.isArchived();
     boolean              matchesRemote  = doParamsMatch(remote, unknownFields, address, givenName, familyName, profileKey, username, identityState, identityKey, blocked, profileSharing, archived);
     boolean              matchesLocal   = doParamsMatch(local, unknownFields, address, givenName, familyName, profileKey, username, identityState, identityKey, blocked, profileSharing, archived);

diff --git a/app/src/test/java/org/thoughtcrime/securesms/storage/ContactConflictMergerTest.java b/app/src/test/java/org/thoughtcrime/securesms/storage/ContactConflictMergerTest.java
@@ -44,7 +44,7 @@ public class ContactConflictMergerTest {
   }
 
   @Test
-  public void merge_alwaysPreferRemote_exceptProfileSharingIsEitherOr() {
+  public void merge_alwaysPreferRemote() {
     SignalContactRecord remote = new SignalContactRecord.Builder(byteArray(1), new SignalServiceAddress(UUID_A, E164_A))
                                                         .setBlocked(true)
                                                         .setIdentityKey(byteArray(2))
@@ -79,7 +79,7 @@ public void merge_alwaysPreferRemote_exceptProfileSharingIsEitherOr() {
     assertEquals("AFirst", merged.getGivenName().get());
     assertEquals("ALast", merged.getFamilyName().get());
     assertEquals("username A", merged.getUsername().get());
-    assertTrue(merged.isProfileSharingEnabled());
+    assertFalse(merged.isProfileSharingEnabled());
     assertFalse(merged.isArchived());
   }