Use strongly-typed ACIs and PNIs everywhere.

2026-02-23 11:15:44 +00:00 · 2023-07-28 12:58:04 -04:00
parent 7ff4a82755
commit 82906aee58
146 changed files with 1416 additions and 1194 deletions
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModelTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModelTest.kt
@@ -35,6 +35,7 @@ import org.thoughtcrime.securesms.testing.success
 import org.thoughtcrime.securesms.testing.timeout
 import org.whispersystems.signalservice.api.account.ChangePhoneNumberRequest
 import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.api.push.ServiceId.PNI
 import org.whispersystems.signalservice.internal.push.MismatchedDevices
 import org.whispersystems.signalservice.internal.push.PreKeyState
 import java.util.UUID
@@ -73,7 +74,7 @@ class ChangeNumberViewModelTest {
  fun testChangeNumber_givenOnlyPrimaryAndNoRegLock() {
    // GIVEN
    val aci = Recipient.self().requireServiceId()
-    val newPni = ServiceId.from(UUID.randomUUID())
+    val newPni = PNI.from(UUID.randomUUID())
    lateinit var changeNumberRequest: ChangePhoneNumberRequest
    lateinit var setPreKeysRequest: PreKeyState

@@ -180,7 +181,7 @@ class ChangeNumberViewModelTest {
    val aci = Recipient.self().requireServiceId()
    val oldPni = Recipient.self().requirePni()
    val oldE164 = Recipient.self().requireE164()
-    val newPni = ServiceId.from(UUID.randomUUID())
+    val newPni = PNI.from(UUID.randomUUID())

    lateinit var changeNumberRequest: ChangePhoneNumberRequest
    lateinit var setPreKeysRequest: PreKeyState
@@ -225,7 +226,7 @@ class ChangeNumberViewModelTest {
  fun testChangeNumber_givenOnlyPrimaryAndRegistrationLock() {
    // GIVEN
    val aci = Recipient.self().requireServiceId()
-    val newPni = ServiceId.from(UUID.randomUUID())
+    val newPni = PNI.from(UUID.randomUUID())

    lateinit var changeNumberRequest: ChangePhoneNumberRequest
    lateinit var setPreKeysRequest: PreKeyState
@@ -269,7 +270,7 @@ class ChangeNumberViewModelTest {
  fun testChangeNumber_givenMismatchedDevicesOnFirstCall() {
    // GIVEN
    val aci = Recipient.self().requireServiceId()
-    val newPni = ServiceId.from(UUID.randomUUID())
+    val newPni = PNI.from(UUID.randomUUID())
    lateinit var changeNumberRequest: ChangePhoneNumberRequest
    lateinit var setPreKeysRequest: PreKeyState

@@ -313,7 +314,7 @@ class ChangeNumberViewModelTest {
  fun testChangeNumber_givenRegLockAndMismatchedDevicesOnFirstTwoCalls() {
    // GIVEN
    val aci = Recipient.self().requireServiceId()
-    val newPni = ServiceId.from(UUID.randomUUID())
+    val newPni = PNI.from(UUID.randomUUID())

    lateinit var changeNumberRequest: ChangePhoneNumberRequest
    lateinit var setPreKeysRequest: PreKeyState
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/DistributionListTablesTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/DistributionListTablesTest.kt
@@ -7,7 +7,7 @@ import org.thoughtcrime.securesms.database.model.DistributionListId
 import org.thoughtcrime.securesms.database.model.DistributionListRecord
 import org.thoughtcrime.securesms.database.model.StoryType
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.whispersystems.signalservice.api.push.ACI
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import java.util.UUID

 class DistributionListTablesTest {
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/MessageTableTest_gifts.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/MessageTableTest_gifts.kt
@@ -10,9 +10,8 @@ import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.PNI
-import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import org.whispersystems.signalservice.api.push.ServiceId.PNI
 import java.util.UUID

@Suppress("ClassName")
@@ -34,7 +33,7 @@ class MessageTableTest_gifts {
    SignalStore.account().setAci(localAci)
    SignalStore.account().setPni(localPni)

-    recipients = (0 until 5).map { SignalDatabase.recipients.getOrInsertFromServiceId(ServiceId.from(UUID.randomUUID())) }
+    recipients = (0 until 5).map { SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID())) }
  }

  @Test
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsTableTest_stories.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsTableTest_stories.kt
@@ -16,9 +16,8 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.mms.IncomingMediaMessage
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.PNI
-import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import org.whispersystems.signalservice.api.push.ServiceId.PNI
 import java.util.UUID
 import java.util.concurrent.TimeUnit

@@ -45,7 +44,7 @@ class MmsTableTest_stories {
    SignalStore.account().setPni(localPni)

    myStory = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromDistributionListId(DistributionListId.MY_STORY))
-    recipients = (0 until 5).map { SignalDatabase.recipients.getOrInsertFromServiceId(ServiceId.from(UUID.randomUUID())) }
+    recipients = (0 until 5).map { SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID())) }
    releaseChannelRecipient = Recipient.resolved(SignalDatabase.recipients.insertReleaseChannelRecipient())

    SignalStore.releaseChannelValues().setReleaseChannelRecipientId(releaseChannelRecipient.id)
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest.kt
@@ -13,8 +13,8 @@ import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.FeatureFlagsAccessor
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.PNI
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import org.whispersystems.signalservice.api.push.ServiceId.PNI
 import java.util.UUID

@RunWith(AndroidJUnit4::class)
@@ -173,10 +173,10 @@ class RecipientTableTest {

    SignalDatabase.recipients.markUnregistered(mainId)

-    val byAci: RecipientId = SignalDatabase.recipients.getByServiceId(ACI_A).get()
+    val byAci: RecipientId = SignalDatabase.recipients.getByAci(ACI_A).get()

    val byE164: RecipientId = SignalDatabase.recipients.getByE164(E164_A).get()
-    val byPni: RecipientId = SignalDatabase.recipients.getByServiceId(PNI_A).get()
+    val byPni: RecipientId = SignalDatabase.recipients.getByPni(PNI_A).get()

    assertEquals(mainId, byAci)
    assertEquals(byE164, byPni)
@@ -192,10 +192,10 @@ class RecipientTableTest {

    SignalDatabase.recipients.splitForStorageSync(mainRecord.storageId!!)

-    val byAci: RecipientId = SignalDatabase.recipients.getByServiceId(ACI_A).get()
+    val byAci: RecipientId = SignalDatabase.recipients.getByAci(ACI_A).get()

    val byE164: RecipientId = SignalDatabase.recipients.getByE164(E164_A).get()
-    val byPni: RecipientId = SignalDatabase.recipients.getByServiceId(PNI_A).get()
+    val byPni: RecipientId = SignalDatabase.recipients.getByPni(PNI_A).get()

    assertEquals(mainId, byAci)
    assertEquals(byE164, byPni)
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_getAndPossiblyMerge.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_getAndPossiblyMerge.kt
@@ -7,6 +7,7 @@ import org.hamcrest.MatcherAssert
 import org.hamcrest.Matchers
 import org.junit.Assert
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
@@ -14,6 +15,7 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.signal.core.util.SqlUtil
+import org.signal.core.util.exists
 import org.signal.core.util.requireLong
 import org.signal.core.util.requireNonNullString
 import org.signal.core.util.select
@@ -36,14 +38,13 @@ import org.thoughtcrime.securesms.mms.IncomingMediaMessage
 import org.thoughtcrime.securesms.notifications.profiles.NotificationProfile
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.sms.IncomingEncryptedMessage
 import org.thoughtcrime.securesms.sms.IncomingTextMessage
 import org.thoughtcrime.securesms.util.Base64
 import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.FeatureFlagsAccessor
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.PNI
-import org.whispersystems.signalservice.api.push.ServiceId
+import org.thoughtcrime.securesms.util.Util
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import org.whispersystems.signalservice.api.push.ServiceId.PNI
 import java.util.Optional
 import java.util.UUID

@@ -59,6 +60,21 @@ class RecipientTableTest_getAndPossiblyMerge {
    FeatureFlagsAccessor.forceValue(FeatureFlags.PHONE_NUMBER_PRIVACY, true)
  }

+  @Test
+  fun single() {
+    test("merge, e164 + pni reassigned, aci abandoned") {
+      given(E164_A, PNI_A, ACI_A)
+      given(E164_B, PNI_B, ACI_B)
+
+      process(E164_A, PNI_A, ACI_B)
+
+      expect(null, null, ACI_A)
+      expect(E164_A, PNI_A, ACI_B)
+
+      expectChangeNumberEvent()
+    }
+  }
+
  @Test
  fun allNonMergeTests() {
    test("e164-only insert") {
@@ -69,7 +85,7 @@ class RecipientTableTest_getAndPossiblyMerge {
      assertEquals(RecipientTable.RegisteredState.UNKNOWN, record.registered)
    }

-    test("pni-only insert") {
+    test("pni-only insert", exception = IllegalArgumentException::class.java) {
      val id = process(null, PNI_A, null)
      expect(null, PNI_A, null)

@@ -84,6 +100,21 @@ class RecipientTableTest_getAndPossiblyMerge {
      val record = SignalDatabase.recipients.getRecord(id)
      assertEquals(RecipientTable.RegisteredState.REGISTERED, record.registered)
    }
+
+    test("e164+pni insert") {
+      process(E164_A, PNI_A, null)
+      expect(E164_A, PNI_A, null)
+    }
+
+    test("e164+aci insert") {
+      process(E164_A, null, ACI_A)
+      expect(E164_A, null, ACI_A)
+    }
+
+    test("e164+pni+aci insert") {
+      process(E164_A, PNI_A, ACI_A)
+      expect(E164_A, PNI_A, ACI_A)
+    }
  }

  @Test
@@ -167,6 +198,12 @@ class RecipientTableTest_getAndPossiblyMerge {
      expectSessionSwitchoverEvent(E164_A)
    }

+    test("e164 and pni matches, all provided, new aci, existing pni session, pni-verified") {
+      given(E164_A, PNI_A, null, pniSession = true)
+      process(E164_A, PNI_A, ACI_A, pniVerified = true)
+      expect(E164_A, PNI_A, ACI_A)
+    }
+
    test("e164 and aci matches, all provided, new pni") {
      given(E164_A, null, ACI_A)
      process(E164_A, PNI_A, ACI_A)
@@ -309,6 +346,26 @@ class RecipientTableTest_getAndPossiblyMerge {
      expectChangeNumberEvent()
    }

+    test("steal, pni is changed") {
+      given(E164_A, PNI_B, ACI_A)
+      given(E164_B, PNI_A, null)
+
+      process(E164_A, PNI_A, null)
+
+      expect(E164_A, PNI_A, ACI_A)
+      expect(E164_B, null, null)
+    }
+
+    test("steal, pni is changed, aci left behind") {
+      given(E164_B, PNI_A, ACI_A)
+      given(E164_A, PNI_B, null)
+
+      process(E164_A, PNI_A, null)
+
+      expect(E164_B, null, ACI_A)
+      expect(E164_A, PNI_A, null)
+    }
+
    test("steal, e164+pni & e164+pni, no aci provided, no pni session") {
      given(E164_A, PNI_B, null)
      given(E164_B, PNI_A, null)
@@ -502,7 +559,7 @@ class RecipientTableTest_getAndPossiblyMerge {
      expectThreadMergeEvent(E164_A)
    }

-    test("merge, e164+pni & aci, pni session, thread merge shadows") {
+    test("merge, e164+pni & aci, pni session, thread merge shadows SSE") {
      given(E164_A, PNI_A, null, pniSession = true)
      given(null, null, ACI_A)

@@ -600,6 +657,18 @@ class RecipientTableTest_getAndPossiblyMerge {
      expectThreadMergeEvent(E164_A)
    }

+    test("merge, e164 + pni reassigned, aci abandoned") {
+      given(E164_A, PNI_A, ACI_A)
+      given(E164_B, PNI_B, ACI_B)
+
+      process(E164_A, PNI_A, ACI_B)
+
+      expect(null, null, ACI_A)
+      expect(E164_A, PNI_A, ACI_B)
+
+      expectChangeNumberEvent()
+    }
+
    test("local user, local e164 and aci provided, changeSelf=false, leave e164 alone") {
      given(E164_SELF, null, ACI_SELF)
      given(null, null, ACI_A)
@@ -768,9 +837,15 @@ class RecipientTableTest_getAndPossiblyMerge {
  }

  private fun identityKey(value: Byte): IdentityKey {
+    val byteArray = ByteArray(32)
+    byteArray[0] = value
+    return identityKey(byteArray)
+  }
+
+  private fun identityKey(value: ByteArray): IdentityKey {
    val bytes = ByteArray(33)
    bytes[0] = 0x05
-    bytes[1] = value
+    value.copyInto(bytes, 1)
    return IdentityKey(bytes)
  }

@@ -873,8 +948,8 @@ class RecipientTableTest_getAndPossiblyMerge {
      generatedIds += id
      if (createThread) {
        // Create a thread and throw a dummy message in it so it doesn't get automatically deleted
-        SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(id))
-        SignalDatabase.messages.insertMessageInbox(IncomingEncryptedMessage(IncomingTextMessage(id, 1, (Math.random() * Long.MAX_VALUE).toLong(), 0, 0, "", Optional.empty(), 0, false, ""), ""))
+        val result = SignalDatabase.messages.insertMessageInbox(smsMessage(sender = id, time = (Math.random() * 10000000).toLong(), body = "1"))
+        SignalDatabase.threads.markAsActiveEarly(result.get().threadId)
      }

      if (pniSession) {
@@ -885,11 +960,34 @@ class RecipientTableTest_getAndPossiblyMerge {
        SignalDatabase.sessions.store(pni, SignalProtocolAddress(pni.toString(), 1), SessionRecord())
      }

+      if (aci != null) {
+        SignalDatabase.identities.saveIdentity(
+          addressName = aci.toString(),
+          recipientId = id,
+          identityKey = identityKey(Util.getSecretBytes(32)),
+          verifiedStatus = IdentityTable.VerifiedStatus.DEFAULT,
+          firstUse = true,
+          timestamp = 0,
+          nonBlockingApproval = false
+        )
+      }
+      if (pni != null) {
+        SignalDatabase.identities.saveIdentity(
+          addressName = pni.toString(),
+          recipientId = id,
+          identityKey = identityKey(Util.getSecretBytes(32)),
+          verifiedStatus = IdentityTable.VerifiedStatus.DEFAULT,
+          firstUse = true,
+          timestamp = 0,
+          nonBlockingApproval = false
+        )
+      }
+
      return id
    }

    fun process(e164: String?, pni: PNI?, aci: ACI?, changeSelf: Boolean = false, pniVerified: Boolean = false): RecipientId {
-      outputRecipientId = SignalDatabase.recipients.getAndPossiblyMerge(serviceId = aci ?: pni, pni = pni, e164 = e164, pniVerified = pniVerified, changeSelf = changeSelf)
+      outputRecipientId = SignalDatabase.recipients.getAndPossiblyMerge(aci = aci, pni = pni, e164 = e164, pniVerified = pniVerified, changeSelf = changeSelf)
      generatedIds += outputRecipientId
      return outputRecipientId
    }
@@ -903,15 +1001,15 @@ class RecipientTableTest_getAndPossiblyMerge {
      val expected = RecipientTuple(
        e164 = e164,
        pni = pni,
-        serviceId = aci ?: pni
+        aci = aci
      )
      val actual = RecipientTuple(
        e164 = recipient.e164.orElse(null),
        pni = recipient.pni.orElse(null),
-        serviceId = recipient.serviceId.orElse(null)
+        aci = recipient.aci.orElse(null)
      )

-      assertEquals(expected, actual)
+      assertEquals("Recipient $id did not match expected result!", expected, actual)
    }

    fun expectDeleted() {
@@ -919,21 +1017,21 @@ class RecipientTableTest_getAndPossiblyMerge {
    }

    fun expectDeleted(id: RecipientId) {
-      SignalDatabase.rawDatabase
-        .select("1")
-        .from(RecipientTable.TABLE_NAME)
+      val found = SignalDatabase.rawDatabase
+        .exists(RecipientTable.TABLE_NAME)
        .where("${RecipientTable.ID} = ?", id)
        .run()
-        .use { !it.moveToFirst() }
+
+      assertFalse("Expected $id to be deleted, but it's still present!", found)
    }

    fun expectChangeNumberEvent() {
-      assertEquals(1, SignalDatabase.messages.getChangeNumberMessageCount(outputRecipientId))
+      assertEquals("Missing change number event!", 1, SignalDatabase.messages.getChangeNumberMessageCount(outputRecipientId))
      changeNumberExpected = true
    }

    fun expectNoChangeNumberEvent() {
-      assertEquals(0, SignalDatabase.messages.getChangeNumberMessageCount(outputRecipientId))
+      assertEquals("Unexpected change number event!", 0, SignalDatabase.messages.getChangeNumberMessageCount(outputRecipientId))
      changeNumberExpected = false
    }

@@ -943,42 +1041,39 @@ class RecipientTableTest_getAndPossiblyMerge {

    fun expectSessionSwitchoverEvent(recipientId: RecipientId, e164: String) {
      val event: SessionSwitchoverEvent? = getLatestSessionSwitchoverEvent(recipientId)
-      assertNotNull(event)
+      assertNotNull("Missing session switchover event! Expected one with e164 = $e164", event)
      assertEquals(e164, event!!.e164)
      sessionSwitchoverExpected = true
    }

    fun expectNoSessionSwitchoverEvent() {
-      assertNull(getLatestSessionSwitchoverEvent(outputRecipientId))
+      assertNull("Unexpected session switchover event!", getLatestSessionSwitchoverEvent(outputRecipientId))
    }

    fun expectThreadMergeEvent(previousE164: String) {
      val event: ThreadMergeEvent? = getLatestThreadMergeEvent(outputRecipientId)
-      assertNotNull(event)
-      assertEquals(previousE164, event!!.previousE164)
+      assertNotNull("Missing thread merge event! Expected one with e164 = $previousE164", event)
+      assertEquals("E164 on thread merge event doesn't match!", previousE164, event!!.previousE164)
      threadMergeExpected = true
    }

    fun expectNoThreadMergeEvent() {
-      assertNull(getLatestThreadMergeEvent(outputRecipientId))
+      assertNull("Unexpected thread merge event!", getLatestThreadMergeEvent(outputRecipientId))
    }

    private fun insert(e164: String?, pni: PNI?, aci: ACI?): RecipientId {
-      val serviceIdString: String? = (aci ?: pni)?.toString()
-      val pniString: String? = pni?.toString()
-
      val id: Long = SignalDatabase.rawDatabase.insert(
        RecipientTable.TABLE_NAME,
        null,
        contentValuesOf(
          RecipientTable.PHONE to e164,
-          RecipientTable.SERVICE_ID to serviceIdString,
-          RecipientTable.PNI_COLUMN to pniString,
+          RecipientTable.ACI_COLUMN to aci?.toString(),
+          RecipientTable.PNI_COLUMN to pni?.toString(),
          RecipientTable.REGISTERED to RecipientTable.RegisteredState.REGISTERED.id
        )
      )

-      assertTrue("Failed to insert! E164: $e164, ServiceId: $serviceIdString, PNI: $pniString", id > 0)
+      assertTrue("Failed to insert! E164: $e164, ACI: $aci, PNI: $pni", id > 0)

      return RecipientId.from(id)
    }
@@ -987,14 +1082,14 @@ class RecipientTableTest_getAndPossiblyMerge {
  data class RecipientTuple(
    val e164: String?,
    val pni: PNI?,
-    val serviceId: ServiceId?
+    val aci: ACI?
  ) {

    /**
     * The intent here is to give nice diffs with the name of the constants rather than the values.
     */
    override fun toString(): String {
-      return "(${e164.e164String()}, ${pni.pniString()}, ${serviceId.serviceIdString()})"
+      return "(${e164.e164String()}, ${pni.pniString()}, ${aci.aciString()})"
    }

    private fun String?.e164String(): String {
@@ -1018,12 +1113,9 @@ class RecipientTableTest_getAndPossiblyMerge {
      } ?: "null"
    }

-    private fun ServiceId?.serviceIdString(): String {
+    private fun ACI?.aciString(): String {
      return this?.let {
        when (it) {
-          PNI_A -> "PNI_A"
-          PNI_B -> "PNI_B"
-          PNI_SELF -> "PNI_SELF"
          ACI_A -> "ACI_A"
          ACI_B -> "ACI_B"
          ACI_SELF -> "ACI_SELF"
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/SmsDatabaseTest_collapseJoinRequestEventsIfPossible.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/SmsDatabaseTest_collapseJoinRequestEventsIfPossible.kt
@@ -21,9 +21,8 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.sms.IncomingGroupUpdateMessage
 import org.thoughtcrime.securesms.sms.IncomingTextMessage
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.PNI
-import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import org.whispersystems.signalservice.api.push.ServiceId.PNI
 import java.util.Optional
 import java.util.UUID

@@ -283,8 +282,8 @@ class SmsDatabaseTest_collapseJoinRequestEventsIfPossible {
  }

  companion object {
-    private val aliceServiceId: ServiceId = ACI.from(UUID.fromString("3436efbe-5a76-47fa-a98a-7e72c948a82e"))
-    private val bobServiceId: ServiceId = ACI.from(UUID.fromString("8de7f691-0b60-4a68-9cd9-ed2f8453f9ed"))
+    private val aliceServiceId: ACI = ACI.from(UUID.fromString("3436efbe-5a76-47fa-a98a-7e72c948a82e"))
+    private val bobServiceId: ACI = ACI.from(UUID.fromString("8de7f691-0b60-4a68-9cd9-ed2f8453f9ed"))

    private val masterKey = GroupMasterKey(Hex.fromStringCondensed("0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"))
    private val groupId = GroupId.v2(masterKey)
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/StorySendTableTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/StorySendTableTest.kt
@@ -21,7 +21,7 @@ import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.whispersystems.signalservice.api.push.DistributionId
-import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import java.util.UUID

@RunWith(AndroidJUnit4::class)
@@ -465,7 +465,7 @@ class StorySendTableTest {

  private fun makeRecipients(count: Int): List<RecipientId> {
    return (1..count).map {
-      SignalDatabase.recipients.getOrInsertFromServiceId(ServiceId.from(UUID.randomUUID()))
+      SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID()))
    }
  }
 }
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadTableTest_active.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadTableTest_active.kt
@@ -14,7 +14,7 @@ import org.junit.Test
 import org.thoughtcrime.securesms.conversationlist.model.ConversationFilter
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.testing.SignalDatabaseRule
-import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import java.util.UUID

@Suppress("ClassName")
@@ -28,7 +28,7 @@ class ThreadTableTest_active {

  @Before
  fun setUp() {
-    recipient = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromServiceId(ServiceId.from(UUID.randomUUID())))
+    recipient = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID())))
  }

  @Test
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadTableTest_pinned.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadTableTest_pinned.kt
@@ -9,7 +9,7 @@ import org.signal.core.util.CursorUtil
 import org.thoughtcrime.securesms.conversationlist.model.ConversationFilter
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.testing.SignalDatabaseRule
-import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import java.util.UUID

@Suppress("ClassName")
@@ -23,7 +23,7 @@ class ThreadTableTest_pinned {

  @Before
  fun setUp() {
-    recipient = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromServiceId(ServiceId.from(UUID.randomUUID())))
+    recipient = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID())))
  }

  @Test
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadTableTest_recents.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadTableTest_recents.kt
@@ -10,7 +10,7 @@ import org.signal.core.util.CursorUtil
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.testing.SignalDatabaseRule
-import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import java.util.UUID

@Suppress("ClassName")
@@ -25,7 +25,7 @@ class ThreadTableTest_recents {

  @Before
  fun setUp() {
-    recipient = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromServiceId(ServiceId.from(UUID.randomUUID())))
+    recipient = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID())))
  }

  @Test
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessorTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessorTest.kt
@@ -46,9 +46,9 @@ abstract class MessageContentProcessorTest {
  ): SignalServiceContentProto {
    return TestProtos.build {
      serviceContent(
-        localAddress = address(uuid = harness.self.requireServiceId().uuid()).build(),
+        localAddress = address(uuid = harness.self.requireServiceId().rawUuid).build(),
        metadata = metadata(
-          address = address(uuid = messageSender.requireServiceId().uuid()).build()
+          address = address(uuid = messageSender.requireServiceId().rawUuid).build()
        ).build()
      ).apply {
        content = content().apply {
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/storage/ContactRecordProcessorTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/storage/ContactRecordProcessorTest.kt
@@ -14,8 +14,8 @@ import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.util.Base64
 import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.FeatureFlagsAccessor
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.PNI
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import org.whispersystems.signalservice.api.push.ServiceId.PNI
 import org.whispersystems.signalservice.api.storage.SignalContactRecord
 import org.whispersystems.signalservice.api.storage.StorageId
 import org.whispersystems.signalservice.internal.storage.protos.ContactRecord
@@ -39,14 +39,14 @@ class ContactRecordProcessorTest {
    setStorageId(originalId, STORAGE_ID_A)

    val remote1 = buildRecord(STORAGE_ID_B) {
-      setServiceId(ACI_A.toString())
+      setAci(ACI_A.toString())
      setUnregisteredAtTimestamp(100)
    }

    val remote2 = buildRecord(STORAGE_ID_C) {
-      setServiceId(PNI_A.toString())
-      setServicePni(PNI_A.toString())
-      setServiceE164(E164_A)
+      setAci(PNI_A.toString())
+      setPni(PNI_A.toString())
+      setE164(E164_A)
    }

    // WHEN
@@ -54,10 +54,10 @@ class ContactRecordProcessorTest {
    subject.process(listOf(remote1, remote2), StorageSyncHelper.KEY_GENERATOR)

    // THEN
-    val byAci: RecipientId = SignalDatabase.recipients.getByServiceId(ACI_A).get()
+    val byAci: RecipientId = SignalDatabase.recipients.getByAci(ACI_A).get()

    val byE164: RecipientId = SignalDatabase.recipients.getByE164(E164_A).get()
-    val byPni: RecipientId = SignalDatabase.recipients.getByServiceId(PNI_A).get()
+    val byPni: RecipientId = SignalDatabase.recipients.getByPni(PNI_A).get()

    assertEquals(originalId, byAci)
    assertEquals(byE164, byPni)
@@ -71,14 +71,14 @@ class ContactRecordProcessorTest {
    setStorageId(originalId, STORAGE_ID_A)

    val remote1 = buildRecord(STORAGE_ID_B) {
-      setServiceId(ACI_A.toString())
+      setAci(ACI_A.toString())
      setUnregisteredAtTimestamp(0)
    }

    val remote2 = buildRecord(STORAGE_ID_C) {
-      setServiceId(PNI_A.toString())
-      setServicePni(PNI_A.toString())
-      setServiceE164(E164_A)
+      setAci(PNI_A.toString())
+      setPni(PNI_A.toString())
+      setE164(E164_A)
    }

    // WHEN
@@ -86,7 +86,7 @@ class ContactRecordProcessorTest {
    subject.process(listOf(remote1, remote2), StorageSyncHelper.KEY_GENERATOR)

    // THEN
-    val byAci: RecipientId = SignalDatabase.recipients.getByServiceId(ACI_A).get()
+    val byAci: RecipientId = SignalDatabase.recipients.getByAci(ACI_A).get()
    val byE164: RecipientId = SignalDatabase.recipients.getByE164(E164_A).get()
    val byPni: RecipientId = SignalDatabase.recipients.getByPni(PNI_A).get()

--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/AliceClient.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/AliceClient.kt
@@ -27,7 +27,7 @@ class AliceClient(val serviceId: ServiceId, val e164: String, val trustRoot: ECK

  private val aliceSenderCertificate = FakeClientHelpers.createCertificateFor(
    trustRoot = trustRoot,
-    uuid = serviceId.uuid(),
+    uuid = serviceId.rawUuid,
    e164 = e164,
    deviceId = 1,
    identityKey = SignalStore.account().aciIdentityKey.publicKey.publicKey,
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/BobClient.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/BobClient.kt
@@ -50,7 +50,7 @@ class BobClient(val serviceId: ServiceId, val e164: String, val identityKeyPair:
  private val serviceAddress = SignalServiceAddress(serviceId, e164)
  private val registrationId = KeyHelper.generateRegistrationId(false)
  private val aciStore = BobSignalServiceAccountDataStore(registrationId, identityKeyPair)
-  private val senderCertificate = FakeClientHelpers.createCertificateFor(trustRoot, serviceId.uuid(), e164, 1, identityKeyPair.publicKey.publicKey, 31337)
+  private val senderCertificate = FakeClientHelpers.createCertificateFor(trustRoot, serviceId.rawUuid, e164, 1, identityKeyPair.publicKey.publicKey, 31337)
  private val sessionLock = object : SignalSessionLock {
    private val lock = ReentrantLock()

--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalActivityRule.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalActivityRule.kt
@@ -32,7 +32,7 @@ import org.thoughtcrime.securesms.registration.VerifyResponse
 import org.thoughtcrime.securesms.testing.GroupTestingUtils.asMember
 import org.thoughtcrime.securesms.util.Util
 import org.whispersystems.signalservice.api.profiles.SignalServiceProfile
-import org.whispersystems.signalservice.api.push.ACI
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import org.whispersystems.signalservice.api.push.SignalServiceAddress
 import org.whispersystems.signalservice.internal.ServiceResponse
 import org.whispersystems.signalservice.internal.ServiceResponseProcessor
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalDatabaseRule.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalDatabaseRule.kt
@@ -4,8 +4,8 @@ import org.junit.rules.TestWatcher
 import org.junit.runner.Description
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.PNI
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import org.whispersystems.signalservice.api.push.ServiceId.PNI
 import java.util.UUID

 /**
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/TestProtos.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/TestProtos.kt
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.testing

 import com.google.protobuf.ByteString
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey
-import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos.DataMessage
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos.GroupContextV2
@@ -17,7 +17,7 @@ class TestProtos private constructor() {
    uuid: UUID = UUID.randomUUID()
  ): AddressProto.Builder {
    return AddressProto.newBuilder()
-      .setUuid(ServiceId.from(uuid).toByteString())
+      .setUuid(ACI.from(uuid).toByteString())
  }

  fun metadata(