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

Prefer remote value for profile sharing during storage sync.

Browse Source
This commit is contained in:
Greyson Parrelli
2020-09-24 12:41:31 -04:00
parent 9cf7eec247
commit 864a1d5e93
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/test/java/org/thoughtcrime/securesms/storage/ContactConflictMergerTest.java
View File

@@ -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());
}