Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-26 20:55:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for system names on the ContactRecord.

Browse Source
This commit is contained in:
Greyson Parrelli
2022-09-28 14:09:44 -04:00
parent 6e5f28339d
commit 1999db97f2
11 changed files with 197 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/test/java/org/thoughtcrime/securesms/storage/ContactRecordProcessorTest.kt
View File

@@ -3,17 +3,23 @@ package org.thoughtcrime.securesms.storage
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.BeforeClass
import org.junit.Rule
import org.junit.Test
import org.mockito.Mock
import org.mockito.MockedStatic
import org.mockito.Mockito
import org.mockito.Mockito.mock
import org.mockito.Mockito.`when`
import org.mockito.internal.configuration.plugins.Plugins
import org.mockito.internal.junit.JUnitRule
import org.mockito.junit.MockitoRule
import org.mockito.quality.Strictness
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.database.RecipientDatabase
import org.thoughtcrime.securesms.keyvalue.AccountValues
import org.thoughtcrime.securesms.keyvalue.SignalStore
import org.thoughtcrime.securesms.testutil.EmptyLogger
import org.thoughtcrime.securesms.util.FeatureFlags
import org.whispersystems.signalservice.api.push.ACI
@@ -35,6 +41,16 @@ class ContactRecordProcessorTest {
@Mock
lateinit var featureFlags: MockedStatic<FeatureFlags>
@Mock
lateinit var signalStore: MockedStatic<SignalStore>
@Before
fun setup() {
val mockAccountValues = mock(AccountValues::class.java)
Mockito.lenient().`when`(mockAccountValues.isPrimaryDevice).thenReturn(true)
signalStore.`when`<AccountValues> { SignalStore.account() }.thenReturn(mockAccountValues)
}
@Test
fun `isInvalid, normal, false`() {
// GIVEN

3
app/src/test/java/org/thoughtcrime/securesms/storage/StorageSyncHelperTest.java
View File

@@ -14,7 +14,6 @@ import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.storage.StorageSyncHelper.IdDifferenceResult;
import org.thoughtcrime.securesms.util.FeatureFlags;
import org.whispersystems.signalservice.api.push.ServiceId;
import org.whispersystems.signalservice.api.push.SignalServiceAddress;
import org.whispersystems.signalservice.api.storage.SignalAccountRecord;
import org.whispersystems.signalservice.api.storage.SignalContactRecord;
import org.whispersystems.signalservice.api.storage.SignalGroupV1Record;
@@ -178,7 +177,7 @@ public final class StorageSyncHelperTest {
{
return new SignalContactRecord.Builder(byteArray(key), aci, null)
.setE164(e164)
.setGivenName(profileName);
.setProfileGivenName(profileName);
}
private static <E extends SignalRecord> StorageRecordUpdate<E> update(E oldRecord, E newRecord) {