From 864a1d5e93b2e6f92ff0afd36a0419f55dc984e2 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 24 Sep 2020 12:41:31 -0400
Subject: [PATCH] Prefer remote value for profile sharing during storage sync.

---
 .../thoughtcrime/securesms/storage/ContactConflictMerger.java | 2 +-
 .../securesms/storage/ContactConflictMergerTest.java          | 4 ++--
 2 files changed, 3 insertions(+), 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
index 31481fed8f..3e2a679ac4 100644
--- 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
index 6233010d5f..329a58290b 100644
--- 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 class ContactConflictMergerTest {
     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());
   }