Bump version to 6.10.7

This reverts commit 3ee889cb79.

.github/workflows/android.yml

@@ -8,6 +8,9 @@ on:
     - '4.**'
     - '5.**'
 
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
   build:
 

.github/workflows/docker.yml

@@ -4,6 +4,9 @@ on:
   schedule:
     - cron: '0 5 * * *'
 
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
   build:
 

.idea/codeStyles/Project.xml

@@ -48,8 +48,6 @@
           <package name="io.ktor" alias="false" withSubpackages="true" />
         </value>
       </option>
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="HTML">
       <indentOptions>

README.md

@@ -1,10 +1,10 @@
 # Signal Android 
 
-Signal is a messaging app for simple private communication with friends.
+Signal is a simple, powerful, and secure messenger.
 
-Signal uses your phone's data connection (WiFi/3G/4G) to communicate securely, optionally supports plain SMS/MMS to function as a unified messenger, and can also encrypt the stored messages on your phone.
+Signal uses your phone's data connection (WiFi/3G/4G/5G) to communicate securely. Millions of people use Signal every day for free and instantaneous communication anywhere in the world. Send and receive high-fidelity messages, participate in HD voice/video calls, and explore a growing set of new features that help you stay connected. Signal’s advanced privacy-preserving technology is always enabled, so you can focus on sharing the moments that matter with the people who matter to you.
 
-Currently available on the Play store and [signal.org](https://signal.org/android/apk/).
+Currently available on the Play Store and [signal.org](https://signal.org/android/apk/).
 
 <a href='https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height='80px'/></a>
 
@@ -18,7 +18,7 @@ Want to live life on the bleeding edge and help out with testing?
 
 You can subscribe to Signal Android Beta releases here:
 https://play.google.com/apps/testing/org.thoughtcrime.securesms
- 
+
 If you're interested in a life of peace and tranquility, stick with the standard releases.
 
 ## Contributing Code
@@ -28,7 +28,7 @@ If you're new to the Signal codebase, we recommend going through our issues and
 For larger changes and feature ideas, we ask that you propose it on the [unofficial Community Forum](https://community.signalusers.org) for a high-level discussion with the wider community before implementation.
 
 ## Contributing Ideas
-Have something you want to say about Open Whisper Systems projects or want to be part of the conversation? Get involved in the [community forum](https://community.signalusers.org).
+Have something you want to say about Signal projects or want to be part of the conversation? Get involved in the [community forum](https://community.signalusers.org).
 
 Help
 ====

app/build.gradle

@@ -1,3 +1,5 @@
+import com.android.build.api.dsl.ManagedVirtualDevice
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'com.google.protobuf'
@@ -11,7 +13,7 @@ apply from: 'static-ips.gradle'
 
 repositories {
     maven {
-        url "https://raw.github.com/signalapp/maven/master/sqlcipher/release/"
+        url "https://raw.githubusercontent.com/signalapp/maven/master/sqlcipher/release/"
         content {
             includeGroupByRegex "org\\.signal.*"
         }
@@ -50,15 +52,15 @@ ktlint {
     version = "0.43.2"
 }
 
-def canonicalVersionCode = 1156
-def canonicalVersionName = "6.0.6"
+def canonicalVersionCode = 1205
+def canonicalVersionName = "6.10.6"
 
 def postFixSize = 100
-def abiPostFix = ['universal'   : 0,
-                  'armeabi-v7a' : 1,
-                  'arm64-v8a'   : 2,
-                  'x86'         : 3,
-                  'x86_64'      : 4]
+def abiPostFix = ['universal'   : 10,
+                  'armeabi-v7a' : 11,
+                  'arm64-v8a'   : 12,
+                  'x86'         : 13,
+                  'x86_64'      : 14]
 
 def keystores = [ 'debug'  : loadKeystoreProperties('keystore.debug.properties') ]
 
@@ -93,10 +95,6 @@ android {
         freeCompilerArgs = ["-Xallow-result-return-type"]
     }
 
-    dexOptions {
-        javaMaxHeapSize "4g"
-    }
-
     signingConfigs {
         if (keystores.debug != null) {
             debug {
@@ -108,12 +106,28 @@ android {
         }
     }
 
+    dependenciesInfo {
+        includeInBundle false
+        includeInApk false
+    }
+
     testOptions {
         execution 'ANDROIDX_TEST_ORCHESTRATOR'
 
         unitTests {
             includeAndroidResources = true
         }
+
+        managedDevices {
+            devices {
+                pixel3api30 (ManagedVirtualDevice) {
+                    device = "Pixel 3"
+                    apiLevel = 30
+                    systemImageSource = "google-atd"
+                    require64Bit = false
+                }
+            }
+        }
     }
 
     lintOptions {
@@ -165,7 +179,7 @@ android {
         multiDexEnabled true
 
         vectorDrawables.useSupportLibrary = true
-        project.ext.set("archivesBaseName", "Signal");
+        project.ext.set("archivesBaseName", "Signal")
 
         manifestPlaceholders = [mapsKey:"AIzaSyCSx9xea86GwDKGznCAULE9Y5a8b-TfN9U"]
 
@@ -180,6 +194,7 @@ android {
         buildConfigField "String", "SIGNAL_SERVICE_STATUS_URL", "\"uptime.signal.org\""
         buildConfigField "String", "SIGNAL_KEY_BACKUP_URL", "\"https://api.backup.signal.org\""
         buildConfigField "String", "SIGNAL_SFU_URL", "\"https://sfu.voip.signal.org\""
+        buildConfigField "String", "SIGNAL_STAGING_SFU_URL", "\"https://sfu.staging.voip.signal.org\""
         buildConfigField "String[]", "SIGNAL_SFU_INTERNAL_NAMES", "new String[]{\"Test\", \"Staging\", \"Development\"}"
         buildConfigField "String[]", "SIGNAL_SFU_INTERNAL_URLS", "new String[]{\"https://sfu.test.voip.signal.org\", \"https://sfu.staging.voip.signal.org\", \"https://sfu.staging.test.voip.signal.org\"}"
         buildConfigField "String", "CONTENT_PROXY_HOST", "\"contentproxy.signal.org\""
@@ -256,6 +271,7 @@ android {
                     'proguard/proguard-retrofit.pro',
                     'proguard/proguard-webrtc.pro',
                     'proguard/proguard-klinker.pro',
+                    'proguard/proguard-mobilecoin.pro',
                     'proguard/proguard-retrolambda.pro',
                     'proguard/proguard-okhttp.pro',
                     'proguard/proguard-ez-vcard.pro',
@@ -538,6 +554,7 @@ dependencies {
         force = true
     }
     testImplementation testLibs.hamcrest.hamcrest
+    testImplementation testLibs.mockk
 
     testImplementation(testFixtures(project(":libsignal-service")))
 
@@ -573,7 +590,7 @@ def getLastCommitTimestamp() {
     }
 
     new ByteArrayOutputStream().withStream { os ->
-        def result = exec {
+        exec {
             executable = 'git'
             args = ['log', '-1', '--pretty=format:%ct']
             standardOutput = os
@@ -585,20 +602,20 @@ def getLastCommitTimestamp() {
 
 def getGitHash() {
     if (!(new File('.git').exists())) {
-        return "abcd1234"
+        throw new IllegalStateException("Must be a git repository to guarantee reproducible builds! (git hash is part of APK)")
     }
 
     def stdout = new ByteArrayOutputStream()
     exec {
-        commandLine 'git', 'rev-parse', '--short', 'HEAD'
+        commandLine 'git', 'rev-parse', 'HEAD'
         standardOutput = stdout
     }
-    return stdout.toString().trim()
+    return stdout.toString().trim().substring(0, 12)
 }
 
 def getCurrentGitTag() {
     if (!(new File('.git').exists())) {
-        return ''
+        throw new IllegalStateException("Must be a git repository to guarantee reproducible builds! (git hash is part of APK)")
     }
 
     def stdout = new ByteArrayOutputStream()
@@ -632,13 +649,13 @@ def loadKeystoreProperties(filename) {
     if (keystorePropertiesFile.exists()) {
         def keystoreProperties = new Properties()
         keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-        return keystoreProperties;
+        return keystoreProperties
     } else {
-        return null;
+        return null
     }
 }
 
-def getDateSuffix() {
+static def getDateSuffix() {
     def date = new Date()
     def formattedDate = date.format('yyyy-MM-dd-HH:mm')
     return formattedDate

app/proguard/proguard-mobilecoin.pro

@@ -0,0 +1,2 @@
+# MobileCoin
+-keep class com.mobilecoin.** { *; }

app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModelTest.kt

@@ -2,9 +2,11 @@ package org.thoughtcrime.securesms.components.settings.app.changenumber
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.FlakyTest
 import okhttp3.mockwebserver.MockResponse
 import org.junit.After
 import org.junit.Before
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -17,7 +19,7 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.pin.KbsRepository
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.registration.VerifyAccountRepository
-import org.thoughtcrime.securesms.registration.VerifyAccountResponseProcessor
+import org.thoughtcrime.securesms.registration.VerifyResponseProcessor
 import org.thoughtcrime.securesms.testing.Get
 import org.thoughtcrime.securesms.testing.MockProvider
 import org.thoughtcrime.securesms.testing.Put
@@ -115,7 +117,7 @@ class ChangeNumberViewModelTest {
     )
 
     // WHEN
-    val processor: VerifyAccountResponseProcessor = viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet()
+    val processor: VerifyResponseProcessor = viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet()
 
     // THEN
     processor.isServerSentError() assertIs true
@@ -146,7 +148,7 @@ class ChangeNumberViewModelTest {
     )
 
     // WHEN
-    val processor: VerifyAccountResponseProcessor = viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet()
+    val processor: VerifyResponseProcessor = viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet()
 
     // THEN
     processor.isServerSentError() assertIs false
@@ -166,6 +168,8 @@ class ChangeNumberViewModelTest {
    * and apply the pending state after confirming the change on the server.
    */
   @Test
+  @FlakyTest
+  @Ignore("Test sometimes requires manual intervention to continue.")
   fun testChangeNumber_givenNetworkFailedApiCallEnRouteToClient() {
     // GIVEN
     val aci = Recipient.self().requireServiceId()
@@ -191,7 +195,7 @@ class ChangeNumberViewModelTest {
     )
 
     // WHEN
-    val processor: VerifyAccountResponseProcessor = viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet()
+    val processor: VerifyResponseProcessor = viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet()
 
     // THEN
     processor.isServerSentError() assertIs false

app/src/androidTest/java/org/thoughtcrime/securesms/conversation/ConversationItemPreviewer.kt

@@ -9,11 +9,8 @@ import org.junit.runner.RunWith
 import org.signal.core.util.ThreadUtil
 import org.thoughtcrime.securesms.attachments.PointerAttachment
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.database.ThreadDatabase
-import org.thoughtcrime.securesms.database.model.StoryType
 import org.thoughtcrime.securesms.mms.IncomingMediaMessage
-import org.thoughtcrime.securesms.mms.OutgoingMediaMessage
-import org.thoughtcrime.securesms.mms.OutgoingSecureMediaMessage
+import org.thoughtcrime.securesms.mms.OutgoingMessage
 import org.thoughtcrime.securesms.profiles.ProfileName
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.releasechannel.ReleaseChannel
@@ -75,7 +72,7 @@ class ConversationItemPreviewer {
       attachments = PointerAttachment.forPointers(Optional.of(attachments)),
     )
 
-    SignalDatabase.mms.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get()
+    SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get()
 
     ThreadUtil.sleep(1)
   }
@@ -94,7 +91,7 @@ class ConversationItemPreviewer {
       attachments = PointerAttachment.forPointers(Optional.of(attachments)),
     )
 
-    val insert = SignalDatabase.mms.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get()
+    val insert = SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get()
 
     SignalDatabase.attachments.getAttachmentsForMessage(insert.messageId).forEachIndexed { index, attachment ->
 //      if (index != 1) {
@@ -112,29 +109,16 @@ class ConversationItemPreviewer {
       attachment()
     }
 
-    val message = OutgoingMediaMessage(
-      other,
-      body,
-      PointerAttachment.forPointers(Optional.of(attachments)),
-      System.currentTimeMillis(),
-      -1,
-      0,
-      false,
-      ThreadDatabase.DistributionTypes.DEFAULT,
-      StoryType.NONE,
-      null,
-      false,
-      null,
-      emptyList(),
-      emptyList(),
-      emptyList(),
-      emptySet(),
-      emptySet(),
-      null
+    val message = OutgoingMessage(
+      recipient = other,
+      body = body,
+      attachments = PointerAttachment.forPointers(Optional.of(attachments)),
+      timestamp = System.currentTimeMillis(),
+      isSecure = true
     )
 
-    val insert = SignalDatabase.mms.insertMessageOutbox(
-      OutgoingSecureMediaMessage(message),
+    val insert = SignalDatabase.messages.insertMessageOutbox(
+      message,
       SignalDatabase.threads.getOrCreateThreadIdFor(other),
       false,
       null

app/src/androidTest/java/org/thoughtcrime/securesms/conversation/SafetyNumberChangeDialogPreviewer.kt

@@ -2,11 +2,12 @@ package org.thoughtcrime.securesms.conversation
 
 import androidx.test.core.app.ActivityScenario
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey
-import org.thoughtcrime.securesms.database.IdentityDatabase
+import org.thoughtcrime.securesms.database.IdentityTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.DistributionListId
 import org.thoughtcrime.securesms.database.model.DistributionListPrivacyMode
@@ -19,6 +20,7 @@ import org.thoughtcrime.securesms.testing.SignalActivityRule
 /**
  * Android test to help show SNC dialog quickly with custom data to make sure it displays properly.
  */
+@Ignore("For testing/previewing manually, no assertions")
 @RunWith(AndroidJUnit4::class)
 class SafetyNumberChangeDialogPreviewer {
 
@@ -30,7 +32,7 @@ class SafetyNumberChangeDialogPreviewer {
 
     SignalDatabase.recipients.setProfileName(other.id, ProfileName.fromParts("Super really long name like omg", "But seriously it's long like really really long"))
 
-    harness.setVerified(other, IdentityDatabase.VerifiedStatus.VERIFIED)
+    harness.setVerified(other, IdentityTable.VerifiedStatus.VERIFIED)
     harness.changeIdentityKey(other)
 
     val scenario: ActivityScenario<ConversationActivity> = harness.launchActivity { putExtra("recipient_id", other.id.serialize()) }
@@ -50,7 +52,7 @@ class SafetyNumberChangeDialogPreviewer {
     othersRecipients.forEach { other ->
       SignalDatabase.recipients.setProfileName(other.id, ProfileName.fromParts("My", "Name"))
 
-      harness.setVerified(other, IdentityDatabase.VerifiedStatus.DEFAULT)
+      harness.setVerified(other, IdentityTable.VerifiedStatus.DEFAULT)
       harness.changeIdentityKey(other)
 
       SignalDatabase.distributionLists.addMemberToList(DistributionListId.MY_STORY, DistributionListPrivacyMode.ONLY_WITH, other.id)
@@ -62,7 +64,7 @@ class SafetyNumberChangeDialogPreviewer {
       SafetyNumberBottomSheet
         .forIdentityRecordsAndDestinations(
           identityRecords = ApplicationDependencies.getProtocolStore().aci().identities().getIdentityRecords(othersRecipients).identityRecords,
-          destinations = listOf(ContactSearchKey.RecipientSearchKey.Story(myStoryRecipientId))
+          destinations = listOf(ContactSearchKey.RecipientSearchKey(myStoryRecipientId, true))
         )
         .show(conversationActivity.supportFragmentManager)
     }

app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTest.kt

@@ -15,7 +15,7 @@ import org.thoughtcrime.securesms.util.MediaUtil
 import java.util.Optional
 
 @RunWith(AndroidJUnit4::class)
-class AttachmentDatabaseTest {
+class AttachmentTableTest {
 
   @Before
   fun setUp() {
@@ -39,7 +39,7 @@ class AttachmentDatabaseTest {
     val blob = BlobProvider.getInstance().forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory()
     val highQualityProperties = createHighQualityTransformProperties()
     val highQualityImage = createAttachment(1, blob, highQualityProperties)
-    val lowQualityImage = createAttachment(1, blob, AttachmentDatabase.TransformProperties.empty())
+    val lowQualityImage = createAttachment(1, blob, AttachmentTable.TransformProperties.empty())
     val attachment = SignalDatabase.attachments.insertAttachmentForPreUpload(highQualityImage)
     val attachment2 = SignalDatabase.attachments.insertAttachmentForPreUpload(lowQualityImage)
 
@@ -55,8 +55,8 @@ class AttachmentDatabaseTest {
       false
     )
 
-    val attachment1Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment.attachmentId, AttachmentDatabase.DATA)
-    val attachment2Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment2.attachmentId, AttachmentDatabase.DATA)
+    val attachment1Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment.attachmentId, AttachmentTable.DATA)
+    val attachment2Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment2.attachmentId, AttachmentTable.DATA)
 
     assertNotEquals(attachment1Info, attachment2Info)
   }
@@ -81,13 +81,13 @@ class AttachmentDatabaseTest {
       true
     )
 
-    val attachment1Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment.attachmentId, AttachmentDatabase.DATA)
-    val attachment2Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment2.attachmentId, AttachmentDatabase.DATA)
+    val attachment1Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment.attachmentId, AttachmentTable.DATA)
+    val attachment2Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment2.attachmentId, AttachmentTable.DATA)
 
     assertNotEquals(attachment1Info, attachment2Info)
   }
 
-  private fun createAttachment(id: Long, uri: Uri, transformProperties: AttachmentDatabase.TransformProperties): UriAttachment {
+  private fun createAttachment(id: Long, uri: Uri, transformProperties: AttachmentTable.TransformProperties): UriAttachment {
     return UriAttachmentBuilder.build(
       id,
       uri = uri,
@@ -96,8 +96,8 @@ class AttachmentDatabaseTest {
     )
   }
 
-  private fun createHighQualityTransformProperties(): AttachmentDatabase.TransformProperties {
-    return AttachmentDatabase.TransformProperties.forSentMediaQuality(Optional.empty(), SentMediaQuality.HIGH)
+  private fun createHighQualityTransformProperties(): AttachmentTable.TransformProperties {
+    return AttachmentTable.TransformProperties.forSentMediaQuality(Optional.empty(), SentMediaQuality.HIGH)
   }
 
   private fun createMediaStream(byteArray: ByteArray): MediaStream {

app/src/androidTest/java/org/thoughtcrime/securesms/database/DistributionListTablesTest.kt

@@ -10,9 +10,9 @@ import org.thoughtcrime.securesms.recipients.RecipientId
 import org.whispersystems.signalservice.api.push.ACI
 import java.util.UUID
 
-class DistributionListDatabaseTest {
+class DistributionListTablesTest {
 
-  private lateinit var distributionDatabase: DistributionListDatabase
+  private lateinit var distributionDatabase: DistributionListTables
 
   @Before
   fun setup() {

app/src/androidTest/java/org/thoughtcrime/securesms/database/GroupTableTest.kt

@@ -0,0 +1,225 @@
+package org.thoughtcrime.securesms.database
+
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotEquals
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.signal.core.util.delete
+import org.signal.core.util.readToList
+import org.signal.core.util.requireLong
+import org.signal.core.util.withinTransaction
+import org.signal.libsignal.zkgroup.groups.GroupMasterKey
+import org.signal.storageservice.protos.groups.Member
+import org.signal.storageservice.protos.groups.local.DecryptedGroup
+import org.signal.storageservice.protos.groups.local.DecryptedMember
+import org.thoughtcrime.securesms.groups.GroupId
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+import java.security.SecureRandom
+import kotlin.random.Random
+
+class GroupTableTest {
+
+  @get:Rule
+  val harness = SignalActivityRule()
+
+  private lateinit var groupTable: GroupTable
+
+  @Before
+  fun setUp() {
+    groupTable = SignalDatabase.groups
+
+    groupTable.writableDatabase.delete(GroupTable.TABLE_NAME).run()
+    groupTable.writableDatabase.delete(GroupTable.MembershipTable.TABLE_NAME).run()
+  }
+
+  @Test
+  fun whenICreateGroupV2_thenIExpectMemberRowsPopulated() {
+    val groupId = insertPushGroup()
+
+    //language=sql
+    val members: List<RecipientId> = groupTable.writableDatabase.query(
+      """
+      SELECT ${GroupTable.MembershipTable.RECIPIENT_ID} 
+      FROM ${GroupTable.MembershipTable.TABLE_NAME}
+      WHERE ${GroupTable.MembershipTable.GROUP_ID} = "${groupId.serialize()}"
+      """.trimIndent()
+    ).readToList {
+      RecipientId.from(it.requireLong(GroupTable.RECIPIENT_ID))
+    }
+
+    assertEquals(2, members.size)
+  }
+
+  @Test
+  fun givenAGroupV2_whenIGetGroupsContainingMember_thenIExpectGroup() {
+    val groupId = insertPushGroup()
+    insertThread(groupId)
+
+    val groups = groupTable.getGroupsContainingMember(harness.others[0], false)
+
+    assertEquals(1, groups.size)
+    assertEquals(groupId, groups[0].id)
+  }
+
+  @Test
+  fun givenAnMmsGroup_whenIGetMembers_thenIExpectAllMembers() {
+    val groupId = insertMmsGroup()
+
+    val groups = groupTable.getGroupMemberIds(groupId, GroupTable.MemberSet.FULL_MEMBERS_INCLUDING_SELF)
+
+    assertEquals(2, groups.size)
+  }
+
+  @Test
+  fun givenGroups_whenIQueryGroupsByMembership_thenIExpectBothGroups() {
+    insertPushGroup()
+    insertMmsGroup(members = listOf(harness.others[1]))
+
+    val groups = groupTable.queryGroupsByMembership(
+      setOf(harness.self.id, harness.others[1]),
+      includeInactive = false,
+      excludeV1 = false,
+      excludeMms = false
+    )
+
+    assertEquals(2, groups.cursor?.count)
+  }
+
+  @Test
+  fun givenGroups_whenIGetGroups_thenIExpectBothGroups() {
+    insertPushGroup()
+    insertMmsGroup(members = listOf(harness.others[1]))
+
+    val groups = groupTable.getGroups()
+
+    assertEquals(2, groups.cursor?.count)
+  }
+
+  @Test
+  fun givenAGroup_whenIGetGroup_thenIExpectGroup() {
+    val v2Group = insertPushGroup()
+    insertThread(v2Group)
+
+    val groupRecord = groupTable.getGroup(v2Group).get()
+    assertEquals(setOf(harness.self.id, harness.others[0]), groupRecord.members.toSet())
+  }
+
+  @Test
+  fun givenAGroupAndARemap_whenIGetGroup_thenIExpectRemap() {
+    val v2Group = insertPushGroup()
+    insertThread(v2Group)
+
+    groupTable.writableDatabase.withinTransaction {
+      RemappedRecords.getInstance().addRecipient(harness.others[0], harness.others[1])
+    }
+
+    val groupRecord = groupTable.getGroup(v2Group).get()
+    assertEquals(groupRecord.members.toSet(), setOf(harness.self.id, harness.others[1]))
+  }
+
+  @Test
+  fun givenAGroupAndMember_whenIIsCurrentMember_thenIExpectTrue() {
+    val v2Group = insertPushGroup()
+
+    val actual = groupTable.isCurrentMember(v2Group.requirePush(), harness.others[0])
+
+    assertTrue(actual)
+  }
+
+  @Test
+  fun givenAGroupAndMember_whenIRemove_thenIExpectNotAMember() {
+    val v2Group = insertPushGroup()
+
+    groupTable.remove(v2Group, harness.others[0])
+    val actual = groupTable.isCurrentMember(v2Group.requirePush(), harness.others[0])
+
+    assertFalse(actual)
+  }
+
+  @Test
+  fun givenAGroupAndNonMember_whenIIsCurrentMember_thenIExpectFalse() {
+    val v2Group = insertPushGroup()
+
+    val actual = groupTable.isCurrentMember(v2Group.requirePush(), harness.others[1])
+
+    assertFalse(actual)
+  }
+
+  @Test
+  fun givenAGroup_whenIUpdateMembers_thenIExpectUpdatedMembers() {
+    val v2Group = insertPushGroup()
+    groupTable.updateMembers(v2Group, listOf(harness.self.id, harness.others[1]))
+    val groupRecord = groupTable.getGroup(v2Group)
+
+    assertEquals(setOf(harness.self.id, harness.others[1]), groupRecord.get().members.toSet())
+  }
+
+  @Test
+  fun givenAnMmsGroup_whenIGetOrCreateMmsGroup_thenIExpectMyMmsGroup() {
+    val members: List<RecipientId> = listOf(harness.self.id, harness.others[0])
+    val other = insertMmsGroup(members + listOf(harness.others[1]))
+    val mmsGroup = insertMmsGroup(members)
+    val actual = groupTable.getOrCreateMmsGroupForMembers(members.toSet())
+
+    assertNotEquals(other, actual)
+    assertEquals(mmsGroup, actual)
+  }
+
+  @Test
+  fun givenTwoGroupsWithoutMembers_whenIQueryThem_thenIExpectEach() {
+    val g1 = insertPushGroup(listOf())
+    val g2 = insertPushGroup(listOf())
+
+    val gr1 = groupTable.getGroup(g1)
+    val gr2 = groupTable.getGroup(g2)
+
+    assertEquals(g1, gr1.get().id)
+    assertEquals(g2, gr2.get().id)
+  }
+
+  private fun insertThread(groupId: GroupId): Long {
+    val groupRecipient = SignalDatabase.recipients.getByGroupId(groupId).get()
+    return SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(groupRecipient))
+  }
+
+  private fun insertMmsGroup(members: List<RecipientId> = listOf(harness.self.id, harness.others[0])): GroupId {
+    val id = GroupId.createMms(SecureRandom())
+    groupTable.create(
+      id,
+      null,
+      members.apply {
+        println("Creating a group with ${members.size} members")
+      }
+    )
+
+    return id
+  }
+
+  private fun insertPushGroup(
+    members: List<DecryptedMember> = listOf(
+      DecryptedMember.newBuilder()
+        .setUuid(harness.self.requireServiceId().toByteString())
+        .setJoinedAtRevision(0)
+        .setRole(Member.Role.DEFAULT)
+        .build(),
+      DecryptedMember.newBuilder()
+        .setUuid(Recipient.resolved(harness.others[0]).requireServiceId().toByteString())
+        .setJoinedAtRevision(0)
+        .setRole(Member.Role.DEFAULT)
+        .build()
+    )
+  ): GroupId {
+    val groupMasterKey = GroupMasterKey(Random.nextBytes(GroupMasterKey.SIZE))
+    val decryptedGroupState = DecryptedGroup.newBuilder()
+      .addAllMembers(members)
+      .setRevision(0)
+      .build()
+
+    return groupTable.create(groupMasterKey, decryptedGroupState)
+  }
+}

app/src/androidTest/java/org/thoughtcrime/securesms/database/MessageTableTest_gifts.kt

@@ -17,8 +17,8 @@ import java.util.UUID
 
 @Suppress("ClassName")
 @RunWith(AndroidJUnit4::class)
-class MmsDatabaseTest_gifts {
-  private lateinit var mms: MmsDatabase
+class MessageTableTest_gifts {
+  private lateinit var mms: MessageTable
 
   private val localAci = ACI.from(UUID.randomUUID())
   private val localPni = PNI.from(UUID.randomUUID())
@@ -27,7 +27,7 @@ class MmsDatabaseTest_gifts {
 
   @Before
   fun setUp() {
-    mms = SignalDatabase.mms
+    mms = SignalDatabase.messages
 
     mms.deleteAllThreads()
 

app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsHelper.kt

@@ -4,8 +4,7 @@ import org.thoughtcrime.securesms.database.model.ParentStoryId
 import org.thoughtcrime.securesms.database.model.StoryType
 import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
 import org.thoughtcrime.securesms.mms.IncomingMediaMessage
-import org.thoughtcrime.securesms.mms.OutgoingMediaMessage
-import org.thoughtcrime.securesms.mms.OutgoingSecureMediaMessage
+import org.thoughtcrime.securesms.mms.OutgoingMessage
 import org.thoughtcrime.securesms.recipients.Recipient
 import java.util.Optional
 
@@ -21,36 +20,28 @@ object MmsHelper {
     subscriptionId: Int = -1,
     expiresIn: Long = 0,
     viewOnce: Boolean = false,
-    distributionType: Int = ThreadDatabase.DistributionTypes.DEFAULT,
-    threadId: Long = 1,
+    distributionType: Int = ThreadTable.DistributionTypes.DEFAULT,
+    threadId: Long = SignalDatabase.threads.getOrCreateThreadIdFor(recipient, distributionType),
     storyType: StoryType = StoryType.NONE,
     parentStoryId: ParentStoryId? = null,
     isStoryReaction: Boolean = false,
     giftBadge: GiftBadge? = null,
     secure: Boolean = true
   ): Long {
-    val message = OutgoingMediaMessage(
-      recipient,
-      body,
-      emptyList(),
-      sentTimeMillis,
-      subscriptionId,
-      expiresIn,
-      viewOnce,
-      distributionType,
-      storyType,
-      parentStoryId,
-      isStoryReaction,
-      null,
-      emptyList(),
-      emptyList(),
-      emptyList(),
-      emptySet(),
-      emptySet(),
-      giftBadge
-    ).let {
-      if (secure) OutgoingSecureMediaMessage(it) else it
-    }
+    val message = OutgoingMessage(
+      recipient = recipient,
+      body = body,
+      timestamp = sentTimeMillis,
+      subscriptionId = subscriptionId,
+      expiresIn = expiresIn,
+      viewOnce = viewOnce,
+      distributionType = distributionType,
+      storyType = storyType,
+      parentStoryId = parentStoryId,
+      isStoryReaction = isStoryReaction,
+      giftBadge = giftBadge,
+      isSecure = secure
+    )
 
     return insert(
       message = message,
@@ -59,16 +50,16 @@ object MmsHelper {
   }
 
   fun insert(
-    message: OutgoingMediaMessage,
+    message: OutgoingMessage,
     threadId: Long
   ): Long {
-    return SignalDatabase.mms.insertMessageOutbox(message, threadId, false, GroupReceiptDatabase.STATUS_UNKNOWN, null)
+    return SignalDatabase.messages.insertMessageOutbox(message, threadId, false, GroupReceiptTable.STATUS_UNKNOWN, null)
   }
 
   fun insert(
     message: IncomingMediaMessage,
     threadId: Long
-  ): Optional<MessageDatabase.InsertResult> {
-    return SignalDatabase.mms.insertSecureDecryptedMessageInbox(message, threadId)
+  ): Optional<MessageTable.InsertResult> {
+    return SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, threadId)
   }
 }

app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsTableTest_stories.kt

@@ -24,9 +24,9 @@ import java.util.concurrent.TimeUnit
 
 @Suppress("ClassName")
 @RunWith(AndroidJUnit4::class)
-class MmsDatabaseTest_stories {
+class MmsTableTest_stories {
 
-  private lateinit var mms: MmsDatabase
+  private lateinit var mms: MessageTable
 
   private val localAci = ACI.from(UUID.randomUUID())
   private val localPni = PNI.from(UUID.randomUUID())
@@ -37,7 +37,7 @@ class MmsDatabaseTest_stories {
 
   @Before
   fun setUp() {
-    mms = SignalDatabase.mms
+    mms = SignalDatabase.messages
 
     mms.deleteAllThreads()
 
@@ -106,14 +106,14 @@ class MmsDatabaseTest_stories {
       -1L
     ).get().messageId
 
-    val messageBeforeMark = SignalDatabase.mms.getMessageRecord(messageId)
+    val messageBeforeMark = SignalDatabase.messages.getMessageRecord(messageId)
     assertFalse(messageBeforeMark.incomingStoryViewedAtTimestamp > 0)
 
     // WHEN
-    SignalDatabase.mms.setIncomingMessageViewed(messageId)
+    SignalDatabase.messages.setIncomingMessageViewed(messageId)
 
     // THEN
-    val messageAfterMark = SignalDatabase.mms.getMessageRecord(messageId)
+    val messageAfterMark = SignalDatabase.messages.getMessageRecord(messageId)
     assertTrue(messageAfterMark.incomingStoryViewedAtTimestamp > 0)
   }
 
@@ -136,12 +136,12 @@ class MmsDatabaseTest_stories {
 
     val randomizedOrderedIds = messageIds.shuffled()
     randomizedOrderedIds.forEach {
-      SignalDatabase.mms.setIncomingMessageViewed(it)
+      SignalDatabase.messages.setIncomingMessageViewed(it)
       Thread.sleep(5)
     }
 
     // WHEN
-    val result = SignalDatabase.mms.getOrderedStoryRecipientsAndIds(false)
+    val result = SignalDatabase.messages.getOrderedStoryRecipientsAndIds(false)
     val resultOrderedIds = result.map { it.messageId }
 
     // THEN
@@ -183,7 +183,7 @@ class MmsDatabaseTest_stories {
     val interspersedIds: List<Long> = (0 until 10).map {
       Thread.sleep(5)
       if (it % 2 == 0) {
-        SignalDatabase.mms.setIncomingMessageViewed(viewedIds[it / 2])
+        SignalDatabase.messages.setIncomingMessageViewed(viewedIds[it / 2])
         viewedIds[it / 2]
       } else {
         MmsHelper.insert(
@@ -195,7 +195,7 @@ class MmsDatabaseTest_stories {
       }
     }
 
-    val result = SignalDatabase.mms.getOrderedStoryRecipientsAndIds(false)
+    val result = SignalDatabase.messages.getOrderedStoryRecipientsAndIds(false)
     val resultOrderedIds = result.map { it.messageId }
 
     assertEquals(unviewedIds.reversed() + interspersedIds.reversed(), resultOrderedIds)
@@ -237,8 +237,7 @@ class MmsDatabaseTest_stories {
     MmsHelper.insert(
       recipient = myStory,
       sentTimeMillis = 200,
-      storyType = StoryType.STORY_WITH_REPLIES,
-      threadId = -1L
+      storyType = StoryType.STORY_WITH_REPLIES
     )
 
     // WHEN
@@ -291,13 +290,12 @@ class MmsDatabaseTest_stories {
   }
 
   @Test
-  fun givenAGroupStoryWithAReactionFromSelf_whenICheckHasSelfReplyInGroupStory_thenIExpectFalse() {
+  fun givenAGroupStoryWithAReactionFromSelf_whenICheckHasSelfReplyInGroupStory_thenIExpectTrue() {
     // GIVEN
     val groupStoryId = MmsHelper.insert(
       recipient = myStory,
       sentTimeMillis = 200,
-      storyType = StoryType.STORY_WITH_REPLIES,
-      threadId = -1L
+      storyType = StoryType.STORY_WITH_REPLIES
     )
 
     MmsHelper.insert(
@@ -312,7 +310,7 @@ class MmsDatabaseTest_stories {
     val result = mms.hasGroupReplyOrReactionInStory(groupStoryId)
 
     // THEN
-    assertFalse(result)
+    assertTrue(result)
   }
 
   @Test
@@ -355,7 +353,7 @@ class MmsDatabaseTest_stories {
     )
 
     // WHEN
-    val oldestTimestamp = SignalDatabase.mms.getOldestStorySendTimestamp(false)
+    val oldestTimestamp = SignalDatabase.messages.getOldestStorySendTimestamp(false)
 
     // THEN
     assertNull(oldestTimestamp)
@@ -374,7 +372,7 @@ class MmsDatabaseTest_stories {
     )
 
     // WHEN
-    val oldestTimestamp = SignalDatabase.mms.getOldestStorySendTimestamp(true)
+    val oldestTimestamp = SignalDatabase.messages.getOldestStorySendTimestamp(true)
 
     // THEN
     assertEquals(expected, oldestTimestamp)

app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest_getAndPossiblyMerge.kt

@@ -1,661 +0,0 @@
-package org.thoughtcrime.securesms.database
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-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.assertNotEquals
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.core.util.CursorUtil
-import org.signal.core.util.ThreadUtil
-import org.signal.libsignal.protocol.IdentityKey
-import org.signal.libsignal.protocol.SignalProtocolAddress
-import org.signal.libsignal.protocol.state.SessionRecord
-import org.signal.libsignal.zkgroup.groups.GroupMasterKey
-import org.signal.storageservice.protos.groups.local.DecryptedGroup
-import org.signal.storageservice.protos.groups.local.DecryptedMember
-import org.thoughtcrime.securesms.conversation.colors.AvatarColor
-import org.thoughtcrime.securesms.database.model.DistributionListId
-import org.thoughtcrime.securesms.database.model.DistributionListRecord
-import org.thoughtcrime.securesms.database.model.Mention
-import org.thoughtcrime.securesms.database.model.MessageId
-import org.thoughtcrime.securesms.database.model.MessageRecord
-import org.thoughtcrime.securesms.database.model.ReactionRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.groups.GroupId
-import org.thoughtcrime.securesms.jobs.RecipientChangedNumberJob
-import org.thoughtcrime.securesms.keyvalue.AccountValues
-import org.thoughtcrime.securesms.keyvalue.KeyValueDataSet
-import org.thoughtcrime.securesms.keyvalue.KeyValueStore
-import org.thoughtcrime.securesms.keyvalue.MockKeyValuePersistentStorage
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-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.IncomingTextMessage
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.PNI
-import org.whispersystems.signalservice.api.util.UuidUtil
-import java.util.Optional
-import java.util.UUID
-
-@RunWith(AndroidJUnit4::class)
-class RecipientDatabaseTest_getAndPossiblyMerge {
-
-  private lateinit var recipientDatabase: RecipientDatabase
-  private lateinit var identityDatabase: IdentityDatabase
-  private lateinit var groupReceiptDatabase: GroupReceiptDatabase
-  private lateinit var groupDatabase: GroupDatabase
-  private lateinit var threadDatabase: ThreadDatabase
-  private lateinit var smsDatabase: MessageDatabase
-  private lateinit var mmsDatabase: MessageDatabase
-  private lateinit var sessionDatabase: SessionDatabase
-  private lateinit var mentionDatabase: MentionDatabase
-  private lateinit var reactionDatabase: ReactionDatabase
-  private lateinit var notificationProfileDatabase: NotificationProfileDatabase
-  private lateinit var distributionListDatabase: DistributionListDatabase
-
-  private val localAci = ACI.from(UUID.randomUUID())
-  private val localPni = PNI.from(UUID.randomUUID())
-
-  @Before
-  fun setup() {
-    recipientDatabase = SignalDatabase.recipients
-    recipientDatabase = SignalDatabase.recipients
-    identityDatabase = SignalDatabase.identities
-    groupReceiptDatabase = SignalDatabase.groupReceipts
-    groupDatabase = SignalDatabase.groups
-    threadDatabase = SignalDatabase.threads
-    smsDatabase = SignalDatabase.sms
-    mmsDatabase = SignalDatabase.mms
-    sessionDatabase = SignalDatabase.sessions
-    mentionDatabase = SignalDatabase.mentions
-    reactionDatabase = SignalDatabase.reactions
-    notificationProfileDatabase = SignalDatabase.notificationProfiles
-    distributionListDatabase = SignalDatabase.distributionLists
-
-    ensureDbEmpty()
-
-    SignalStore.account().setAci(localAci)
-    SignalStore.account().setPni(localPni)
-  }
-
-  // ==============================================================
-  // If both the ACI and E164 map to no one
-  // ==============================================================
-
-  /** If all you have is an ACI, you can just store that, regardless of trust level. */
-  @Test
-  fun getAndPossiblyMerge_aciAndE164MapToNoOne_aciOnly() {
-    val recipientId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, null)
-
-    val recipient = Recipient.resolved(recipientId)
-    assertEquals(ACI_A, recipient.requireServiceId())
-    assertFalse(recipient.hasE164())
-  }
-
-  /** If all you have is an E164, you can just store that, regardless of trust level. */
-  @Test
-  fun getAndPossiblyMerge_aciAndE164MapToNoOne_e164Only() {
-    val recipientId: RecipientId = recipientDatabase.getAndPossiblyMerge(null, E164_A)
-
-    val recipient = Recipient.resolved(recipientId)
-    assertEquals(E164_A, recipient.requireE164())
-    assertFalse(recipient.hasServiceId())
-  }
-
-  /** With high trust, you can associate an ACI-e164 pair. */
-  @Test
-  fun getAndPossiblyMerge_aciAndE164MapToNoOne_aciAndE164() {
-    val recipientId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A)
-
-    val recipient = Recipient.resolved(recipientId)
-    assertEquals(ACI_A, recipient.requireServiceId())
-    assertEquals(E164_A, recipient.requireE164())
-  }
-
-  // ==============================================================
-  // If the ACI maps to an existing user, but the E164 doesn't
-  // ==============================================================
-
-  /** You can associate an e164 with an existing ACI. */
-  @Test
-  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciAndE164() {
-    val existingId: RecipientId = recipientDatabase.getOrInsertFromServiceId(ACI_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A)
-    assertEquals(existingId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
-    assertEquals(E164_A, retrievedRecipient.requireE164())
-  }
-
-  /** Basically the ‘change number’ case. Update the existing user. */
-  @Test
-  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciAndE164_2() {
-    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B)
-    assertEquals(existingId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
-    assertEquals(E164_B, retrievedRecipient.requireE164())
-  }
-
-  // ==============================================================
-  // If the E164 maps to an existing user, but the ACI doesn't
-  // ==============================================================
-
-  /** You can associate an e164 with an existing ACI. */
-  @Test
-  fun getAndPossiblyMerge_e164MapsToExistingUserButAciDoesNot_aciAndE164() {
-    val existingId: RecipientId = recipientDatabase.getOrInsertFromE164(E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A)
-    assertEquals(existingId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
-    assertEquals(E164_A, retrievedRecipient.requireE164())
-  }
-
-  /** We never change the ACI of an existing row. New ACI = new person. Take the e164 from the current holder. */
-  @Test
-  fun getAndPossiblyMerge_e164MapsToExistingUserButAciDoesNot_aciAndE164_2() {
-    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A)
-    recipientDatabase.setPni(existingId, PNI_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_B, E164_A)
-    recipientDatabase.setPni(retrievedId, PNI_A)
-    assertNotEquals(existingId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_B, retrievedRecipient.requireServiceId())
-    assertEquals(E164_A, retrievedRecipient.requireE164())
-
-    val existingRecipient = Recipient.resolved(existingId)
-    assertEquals(ACI_A, existingRecipient.requireServiceId())
-    assertFalse(existingRecipient.hasE164())
-  }
-
-  /** We never want to remove the e164 of our own contact entry. Leave the e164 alone. */
-  @Test
-  fun getAndPossiblyMerge_e164MapsToExistingUserButAciDoesNot_e164BelongsToLocalUser() {
-    val dataSet = KeyValueDataSet().apply {
-      putString(AccountValues.KEY_E164, E164_A)
-      putString(AccountValues.KEY_ACI, ACI_A.toString())
-    }
-    SignalStore.inject(KeyValueStore(MockKeyValuePersistentStorage.withDataSet(dataSet)))
-
-    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_B, E164_A)
-    assertNotEquals(existingId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_B, retrievedRecipient.requireServiceId())
-    assertFalse(retrievedRecipient.hasE164())
-
-    val existingRecipient = Recipient.resolved(existingId)
-    assertEquals(ACI_A, existingRecipient.requireServiceId())
-    assertEquals(E164_A, existingRecipient.requireE164())
-  }
-
-  // ==============================================================
-  // If both the ACI and E164 map to an existing user
-  // ==============================================================
-
-  /** If your ACI and e164 match, you’re good. */
-  @Test
-  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164() {
-    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A)
-    assertEquals(existingId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
-    assertEquals(E164_A, retrievedRecipient.requireE164())
-  }
-
-  /** Merge two different users into one. You should prefer the ACI user. Not shown: merging threads, dropping e164 sessions, etc. */
-  @Test
-  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_merge() {
-    val changeNumberListener = ChangeNumberListener()
-    changeNumberListener.enqueue()
-
-    val existingAciId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, null)
-    val existingE164Id: RecipientId = recipientDatabase.getAndPossiblyMerge(null, E164_A)
-
-    val mergedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A)
-    assertEquals(existingAciId, mergedId)
-
-    val retrievedRecipient = Recipient.resolved(mergedId)
-    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
-    assertEquals(E164_A, retrievedRecipient.requireE164())
-
-    val existingE164Recipient = Recipient.resolved(existingE164Id)
-    assertEquals(mergedId, existingE164Recipient.id)
-
-    changeNumberListener.waitForJobManager()
-    assertFalse(changeNumberListener.numberChangeWasEnqueued)
-  }
-
-  /** Same as [getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_merge], but with a number change. */
-  @Test
-  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_merge_changedNumber() {
-    val changeNumberListener = ChangeNumberListener()
-    changeNumberListener.enqueue()
-
-    val existingAciId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B)
-    val existingE164Id: RecipientId = recipientDatabase.getAndPossiblyMerge(null, E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A)
-    assertEquals(existingAciId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
-    assertEquals(E164_A, retrievedRecipient.requireE164())
-
-    val existingE164Recipient = Recipient.resolved(existingE164Id)
-    assertEquals(retrievedId, existingE164Recipient.id)
-
-    changeNumberListener.waitForJobManager()
-    assert(changeNumberListener.numberChangeWasEnqueued)
-  }
-
-  /** No new rules here, just a more complex scenario to show how different rules interact. */
-  @Test
-  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_complex() {
-    val changeNumberListener = ChangeNumberListener()
-    changeNumberListener.enqueue()
-
-    val existingId1: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B)
-    val existingId2: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_B, E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A)
-    assertEquals(existingId1, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
-    assertEquals(E164_A, retrievedRecipient.requireE164())
-
-    val existingRecipient2 = Recipient.resolved(existingId2)
-    assertEquals(ACI_B, existingRecipient2.requireServiceId())
-    assertFalse(existingRecipient2.hasE164())
-
-    changeNumberListener.waitForJobManager()
-    assert(changeNumberListener.numberChangeWasEnqueued)
-  }
-
-  /**
-   * Another case that results in a merge. Nothing strictly new here, but this case is called out because it’s a merge but *also* an E164 change,
-   * which clients may need to know for UX purposes.
-   */
-  @Test
-  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_mergeAndPhoneNumberChange() {
-    val existingId1: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B)
-    val existingId2: RecipientId = recipientDatabase.getAndPossiblyMerge(null, E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A)
-    assertEquals(existingId1, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
-    assertEquals(E164_A, retrievedRecipient.requireE164())
-
-    assertFalse(recipientDatabase.getByE164(E164_B).isPresent)
-
-    val recipientWithId2 = Recipient.resolved(existingId2)
-    assertEquals(retrievedId, recipientWithId2.id)
-  }
-
-  /** We never want to remove the e164 of our own contact entry. Leave the e164 alone. */
-  @Test
-  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_e164BelongsToLocalUser() {
-    val dataSet = KeyValueDataSet().apply {
-      putString(AccountValues.KEY_E164, E164_A)
-      putString(AccountValues.KEY_ACI, ACI_B.toString())
-    }
-    SignalStore.inject(KeyValueStore(MockKeyValuePersistentStorage.withDataSet(dataSet)))
-
-    val existingId1: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_B, E164_A)
-    val existingId2: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, null)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A)
-    assertEquals(existingId2, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
-    assertFalse(retrievedRecipient.hasE164())
-
-    val recipientWithId1 = Recipient.resolved(existingId1)
-    assertEquals(ACI_B, recipientWithId1.requireServiceId())
-    assertEquals(E164_A, recipientWithId1.requireE164())
-  }
-
-  /** This is a case where normally we'd update the E164 of a user, but here the changeSelf flag is disabled, so we shouldn't. */
-  @Test
-  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciBelongsToLocalUser_changeSelfFalse() {
-    val dataSet = KeyValueDataSet().apply {
-      putString(AccountValues.KEY_E164, E164_A)
-      putString(AccountValues.KEY_ACI, ACI_A.toString())
-    }
-    SignalStore.inject(KeyValueStore(MockKeyValuePersistentStorage.withDataSet(dataSet)))
-
-    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, changeSelf = false)
-    assertEquals(existingId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
-    assertEquals(E164_A, retrievedRecipient.requireE164())
-  }
-
-  /** This is a case where we're changing our own number, and it's allowed because changeSelf = true. */
-  @Test
-  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciBelongsToLocalUser_changeSelfTrue() {
-    val dataSet = KeyValueDataSet().apply {
-      putString(AccountValues.KEY_E164, E164_A)
-      putString(AccountValues.KEY_ACI, ACI_A.toString())
-    }
-    SignalStore.inject(KeyValueStore(MockKeyValuePersistentStorage.withDataSet(dataSet)))
-
-    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, changeSelf = true)
-    assertEquals(existingId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
-    assertEquals(E164_B, retrievedRecipient.requireE164())
-  }
-
-  /** Verifying a case where a change number job is expected to be enqueued. */
-  @Test
-  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_changedNumber() {
-    val changeNumberListener = ChangeNumberListener()
-    changeNumberListener.enqueue()
-
-    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B)
-    assertEquals(existingId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
-    assertEquals(E164_B, retrievedRecipient.requireE164())
-
-    changeNumberListener.waitForJobManager()
-    assert(changeNumberListener.numberChangeWasEnqueued)
-  }
-
-  /** High trust lets you merge two different users into one. You should prefer the ACI user. Not shown: merging threads, dropping e164 sessions, etc. */
-  @Test
-  fun getAndPossiblyMerge_merge_general() {
-    // Setup
-    val recipientIdAci: RecipientId = recipientDatabase.getOrInsertFromServiceId(ACI_A)
-    val recipientIdE164: RecipientId = recipientDatabase.getOrInsertFromE164(E164_A)
-    val recipientIdAciB: RecipientId = recipientDatabase.getOrInsertFromServiceId(ACI_B)
-
-    val smsId1: Long = smsDatabase.insertMessageInbox(smsMessage(sender = recipientIdAci, time = 0, body = "0")).get().messageId
-    val smsId2: Long = smsDatabase.insertMessageInbox(smsMessage(sender = recipientIdE164, time = 1, body = "1")).get().messageId
-    val smsId3: Long = smsDatabase.insertMessageInbox(smsMessage(sender = recipientIdAci, time = 2, body = "2")).get().messageId
-
-    val mmsId1: Long = mmsDatabase.insertSecureDecryptedMessageInbox(mmsMessage(sender = recipientIdAci, time = 3, body = "3"), -1).get().messageId
-    val mmsId2: Long = mmsDatabase.insertSecureDecryptedMessageInbox(mmsMessage(sender = recipientIdE164, time = 4, body = "4"), -1).get().messageId
-    val mmsId3: Long = mmsDatabase.insertSecureDecryptedMessageInbox(mmsMessage(sender = recipientIdAci, time = 5, body = "5"), -1).get().messageId
-
-    val threadIdAci: Long = threadDatabase.getThreadIdFor(recipientIdAci)!!
-    val threadIdE164: Long = threadDatabase.getThreadIdFor(recipientIdE164)!!
-    assertNotEquals(threadIdAci, threadIdE164)
-
-    mentionDatabase.insert(threadIdAci, mmsId1, listOf(Mention(recipientIdE164, 0, 1)))
-    mentionDatabase.insert(threadIdE164, mmsId2, listOf(Mention(recipientIdAci, 0, 1)))
-
-    groupReceiptDatabase.insert(listOf(recipientIdAci, recipientIdE164), mmsId1, 0, 3)
-
-    val identityKeyAci: IdentityKey = identityKey(1)
-    val identityKeyE164: IdentityKey = identityKey(2)
-
-    identityDatabase.saveIdentity(ACI_A.toString(), recipientIdAci, identityKeyAci, IdentityDatabase.VerifiedStatus.VERIFIED, false, 0, false)
-    identityDatabase.saveIdentity(E164_A, recipientIdE164, identityKeyE164, IdentityDatabase.VerifiedStatus.VERIFIED, false, 0, false)
-
-    sessionDatabase.store(localAci, SignalProtocolAddress(ACI_A.toString(), 1), SessionRecord())
-
-    reactionDatabase.addReaction(MessageId(smsId1, false), ReactionRecord("a", recipientIdAci, 1, 1))
-    reactionDatabase.addReaction(MessageId(mmsId1, true), ReactionRecord("b", recipientIdE164, 1, 1))
-
-    val profile1: NotificationProfile = notificationProfile(name = "Test")
-    val profile2: NotificationProfile = notificationProfile(name = "Test2")
-
-    notificationProfileDatabase.addAllowedRecipient(profileId = profile1.id, recipientId = recipientIdAci)
-    notificationProfileDatabase.addAllowedRecipient(profileId = profile1.id, recipientId = recipientIdE164)
-    notificationProfileDatabase.addAllowedRecipient(profileId = profile2.id, recipientId = recipientIdE164)
-    notificationProfileDatabase.addAllowedRecipient(profileId = profile2.id, recipientId = recipientIdAciB)
-
-    val distributionListId: DistributionListId = distributionListDatabase.createList("testlist", listOf(recipientIdE164, recipientIdAciB))!!
-
-    // Merge
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
-    val retrievedThreadId: Long = threadDatabase.getThreadIdFor(retrievedId)!!
-    assertEquals(recipientIdAci, retrievedId)
-
-    // Recipient validation
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
-    assertEquals(E164_A, retrievedRecipient.requireE164())
-
-    val existingE164Recipient = Recipient.resolved(recipientIdE164)
-    assertEquals(retrievedId, existingE164Recipient.id)
-
-    // Thread validation
-    assertEquals(threadIdAci, retrievedThreadId)
-    Assert.assertNull(threadDatabase.getThreadIdFor(recipientIdE164))
-    Assert.assertNull(threadDatabase.getThreadRecord(threadIdE164))
-
-    // SMS validation
-    val sms1: MessageRecord = smsDatabase.getMessageRecord(smsId1)!!
-    val sms2: MessageRecord = smsDatabase.getMessageRecord(smsId2)!!
-    val sms3: MessageRecord = smsDatabase.getMessageRecord(smsId3)!!
-
-    assertEquals(retrievedId, sms1.recipient.id)
-    assertEquals(retrievedId, sms2.recipient.id)
-    assertEquals(retrievedId, sms3.recipient.id)
-
-    assertEquals(retrievedThreadId, sms1.threadId)
-    assertEquals(retrievedThreadId, sms2.threadId)
-    assertEquals(retrievedThreadId, sms3.threadId)
-
-    // MMS validation
-    val mms1: MessageRecord = mmsDatabase.getMessageRecord(mmsId1)!!
-    val mms2: MessageRecord = mmsDatabase.getMessageRecord(mmsId2)!!
-    val mms3: MessageRecord = mmsDatabase.getMessageRecord(mmsId3)!!
-
-    assertEquals(retrievedId, mms1.recipient.id)
-    assertEquals(retrievedId, mms2.recipient.id)
-    assertEquals(retrievedId, mms3.recipient.id)
-
-    assertEquals(retrievedThreadId, mms1.threadId)
-    assertEquals(retrievedThreadId, mms2.threadId)
-    assertEquals(retrievedThreadId, mms3.threadId)
-
-    // Mention validation
-    val mention1: MentionModel = getMention(mmsId1)
-    assertEquals(retrievedId, mention1.recipientId)
-    assertEquals(retrievedThreadId, mention1.threadId)
-
-    val mention2: MentionModel = getMention(mmsId2)
-    assertEquals(retrievedId, mention2.recipientId)
-    assertEquals(retrievedThreadId, mention2.threadId)
-
-    // Group receipt validation
-    val groupReceipts: List<GroupReceiptDatabase.GroupReceiptInfo> = groupReceiptDatabase.getGroupReceiptInfo(mmsId1)
-    assertEquals(retrievedId, groupReceipts[0].recipientId)
-    assertEquals(retrievedId, groupReceipts[1].recipientId)
-
-    // Identity validation
-    assertEquals(identityKeyAci, identityDatabase.getIdentityStoreRecord(ACI_A.toString())!!.identityKey)
-    Assert.assertNull(identityDatabase.getIdentityStoreRecord(E164_A))
-
-    // Session validation
-    Assert.assertNotNull(sessionDatabase.load(localAci, SignalProtocolAddress(ACI_A.toString(), 1)))
-
-    // Reaction validation
-    val reactionsSms: List<ReactionRecord> = reactionDatabase.getReactions(MessageId(smsId1, false))
-    val reactionsMms: List<ReactionRecord> = reactionDatabase.getReactions(MessageId(mmsId1, true))
-
-    assertEquals(1, reactionsSms.size)
-    assertEquals(ReactionRecord("a", recipientIdAci, 1, 1), reactionsSms[0])
-
-    assertEquals(1, reactionsMms.size)
-    assertEquals(ReactionRecord("b", recipientIdAci, 1, 1), reactionsMms[0])
-
-    // Notification Profile validation
-    val updatedProfile1: NotificationProfile = notificationProfileDatabase.getProfile(profile1.id)!!
-    val updatedProfile2: NotificationProfile = notificationProfileDatabase.getProfile(profile2.id)!!
-
-    MatcherAssert.assertThat("Notification Profile 1 should now only contain ACI $recipientIdAci", updatedProfile1.allowedMembers, Matchers.containsInAnyOrder(recipientIdAci))
-    MatcherAssert.assertThat("Notification Profile 2 should now contain ACI A ($recipientIdAci) and ACI B ($recipientIdAciB)", updatedProfile2.allowedMembers, Matchers.containsInAnyOrder(recipientIdAci, recipientIdAciB))
-
-    // Distribution List validation
-    val updatedList: DistributionListRecord = distributionListDatabase.getList(distributionListId)!!
-
-    MatcherAssert.assertThat("Distribution list should have updated $recipientIdE164 to $recipientIdAci", updatedList.members, Matchers.containsInAnyOrder(recipientIdAci, recipientIdAciB))
-  }
-
-  // ==============================================================
-  // Misc
-  // ==============================================================
-
-  @Test
-  fun createByE164SanityCheck() {
-    // GIVEN one recipient
-    val recipientId: RecipientId = recipientDatabase.getOrInsertFromE164(E164_A)
-
-    // WHEN I retrieve one by E164
-    val possible: Optional<RecipientId> = recipientDatabase.getByE164(E164_A)
-
-    // THEN I get it back, and it has the properties I expect
-    assertTrue(possible.isPresent)
-    assertEquals(recipientId, possible.get())
-
-    val recipient = Recipient.resolved(recipientId)
-    assertTrue(recipient.e164.isPresent)
-    assertEquals(E164_A, recipient.e164.get())
-  }
-
-  @Test
-  fun createByUuidSanityCheck() {
-    // GIVEN one recipient
-    val recipientId: RecipientId = recipientDatabase.getOrInsertFromServiceId(ACI_A)
-
-    // WHEN I retrieve one by UUID
-    val possible: Optional<RecipientId> = recipientDatabase.getByServiceId(ACI_A)
-
-    // THEN I get it back, and it has the properties I expect
-    assertTrue(possible.isPresent)
-    assertEquals(recipientId, possible.get())
-
-    val recipient = Recipient.resolved(recipientId)
-    assertTrue(recipient.serviceId.isPresent)
-    assertEquals(ACI_A, recipient.serviceId.get())
-  }
-
-  @Test(expected = IllegalArgumentException::class)
-  fun getAndPossiblyMerge_noArgs_invalid() {
-    recipientDatabase.getAndPossiblyMerge(null, null, true)
-  }
-
-  private fun ensureDbEmpty() {
-    SignalDatabase.rawDatabase.rawQuery("SELECT COUNT(*) FROM ${RecipientDatabase.TABLE_NAME} WHERE ${RecipientDatabase.DISTRIBUTION_LIST_ID} IS NULL ", null).use { cursor ->
-      assertTrue(cursor.moveToFirst())
-      assertEquals(0, cursor.getLong(0))
-    }
-  }
-
-  private fun smsMessage(sender: RecipientId, time: Long = 0, body: String = "", groupId: Optional<GroupId> = Optional.empty()): IncomingTextMessage {
-    return IncomingTextMessage(sender, 1, time, time, time, body, groupId, 0, true, null)
-  }
-
-  private fun mmsMessage(sender: RecipientId, time: Long = 0, body: String = "", groupId: Optional<GroupId> = Optional.empty()): IncomingMediaMessage {
-    return IncomingMediaMessage(sender, groupId, body, time, time, time, emptyList(), 0, 0, false, false, true, Optional.empty())
-  }
-
-  private fun identityKey(value: Byte): IdentityKey {
-    val bytes = ByteArray(33)
-    bytes[0] = 0x05
-    bytes[1] = value
-    return IdentityKey(bytes)
-  }
-
-  private fun notificationProfile(name: String): NotificationProfile {
-    return (notificationProfileDatabase.createProfile(name = name, emoji = "", color = AvatarColor.A210, System.currentTimeMillis()) as NotificationProfileDatabase.NotificationProfileChangeResult.Success).notificationProfile
-  }
-
-  private fun groupMasterKey(value: Byte): GroupMasterKey {
-    val bytes = ByteArray(32)
-    bytes[0] = value
-    return GroupMasterKey(bytes)
-  }
-
-  private fun decryptedGroup(members: Collection<UUID>): DecryptedGroup {
-    return DecryptedGroup.newBuilder()
-      .addAllMembers(members.map { DecryptedMember.newBuilder().setUuid(UuidUtil.toByteString(it)).build() })
-      .build()
-  }
-
-  private fun getMention(messageId: Long): MentionModel {
-    SignalDatabase.rawDatabase.rawQuery("SELECT * FROM ${MentionDatabase.TABLE_NAME} WHERE ${MentionDatabase.MESSAGE_ID} = $messageId").use { cursor ->
-      cursor.moveToFirst()
-      return MentionModel(
-        recipientId = RecipientId.from(CursorUtil.requireLong(cursor, MentionDatabase.RECIPIENT_ID)),
-        threadId = CursorUtil.requireLong(cursor, MentionDatabase.THREAD_ID)
-      )
-    }
-  }
-
-  /** The normal mention model doesn't have a threadId, so we need to do it ourselves for the test */
-  data class MentionModel(
-    val recipientId: RecipientId,
-    val threadId: Long
-  )
-
-  private class ChangeNumberListener {
-
-    var numberChangeWasEnqueued = false
-      private set
-
-    fun waitForJobManager() {
-      ApplicationDependencies.getJobManager().flush()
-      ThreadUtil.sleep(500)
-    }
-
-    fun enqueue() {
-      ApplicationDependencies.getJobManager().addListener(
-        { job -> job.factoryKey == RecipientChangedNumberJob.KEY },
-        { _, _ -> numberChangeWasEnqueued = true }
-      )
-    }
-  }
-
-  companion object {
-    val ACI_A = ACI.from(UUID.fromString("3436efbe-5a76-47fa-a98a-7e72c948a82e"))
-    val ACI_B = ACI.from(UUID.fromString("8de7f691-0b60-4a68-9cd9-ed2f8453f9ed"))
-
-    val PNI_A = PNI.from(UUID.fromString("154b8d92-c960-4f6c-8385-671ad2ffb999"))
-    val PNI_B = PNI.from(UUID.fromString("ba92b1fb-cd55-40bf-adda-c35a85375533"))
-
-    const val E164_A = "+12221234567"
-    const val E164_B = "+13331234567"
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest_processPnpTuple.kt

@@ -1,457 +0,0 @@
-package org.thoughtcrime.securesms.database
-
-import androidx.core.content.contentValuesOf
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNull
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.core.util.requireLong
-import org.signal.core.util.requireString
-import org.signal.core.util.select
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-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 java.util.UUID
-
-@RunWith(AndroidJUnit4::class)
-class RecipientDatabaseTest_processPnpTuple {
-
-  private lateinit var recipientDatabase: RecipientDatabase
-
-  private val localAci = ACI.from(UUID.randomUUID())
-  private val localPni = PNI.from(UUID.randomUUID())
-
-  @Before
-  fun setup() {
-    recipientDatabase = SignalDatabase.recipients
-
-    ensureDbEmpty()
-
-    SignalStore.account().setAci(localAci)
-    SignalStore.account().setPni(localPni)
-  }
-
-  @Test
-  fun noMatch_e164Only() {
-    test {
-      process(E164_A, null, null)
-      expect(E164_A, null, null)
-    }
-  }
-
-  @Test
-  fun noMatch_e164AndPni() {
-    test {
-      process(E164_A, PNI_A, null)
-      expect(E164_A, PNI_A, null)
-    }
-  }
-
-  @Test
-  fun noMatch_aciOnly() {
-    test {
-      process(null, null, ACI_A)
-      expect(null, null, ACI_A)
-    }
-  }
-
-  @Test(expected = IllegalStateException::class)
-  fun noMatch_noData() {
-    test {
-      process(null, null, null)
-    }
-  }
-
-  @Test
-  fun noMatch_allFields() {
-    test {
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun fullMatch() {
-    test {
-      given(E164_A, PNI_A, ACI_A)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun onlyE164Matches() {
-    test {
-      given(E164_A, null, null)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun onlyE164Matches_differentAci() {
-    test {
-      given(E164_A, null, ACI_B)
-      process(E164_A, PNI_A, ACI_A)
-
-      expect(null, null, ACI_B)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun e164AndPniMatches() {
-    test {
-      given(E164_A, PNI_A, null)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun e164AndAciMatches() {
-    test {
-      given(E164_A, null, ACI_A)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun onlyPniMatches() {
-    test {
-      given(null, PNI_A, null)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun pniAndAciMatches() {
-    test {
-      given(null, PNI_A, ACI_A)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun onlyAciMatches() {
-    test {
-      given(null, null, ACI_A)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun onlyE164Matches_pniChanges_noAciProvided_noPniSession() {
-    test {
-      given(E164_A, PNI_B, null)
-      process(E164_A, PNI_A, null)
-      expect(E164_A, PNI_A, null)
-    }
-  }
-
-  @Test
-  fun e164AndPniMatches_noExistingSession() {
-    test {
-      given(E164_A, PNI_A, null)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun onlyPniMatches_noExistingSession() {
-    test {
-      given(null, PNI_A, null)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun onlyPniMatches_noExistingPniSession_changeNumber() {
-    // This test, I could go either way. We decide to change the E164 on the existing row rather than create a new one.
-    // But it's an "unstable E164->PNI mapping" case, which we don't expect, so as long as there's a user-visible impact that should be fine.
-    // TODO Verify change number
-    test {
-      given(E164_B, PNI_A, null)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun pniAndAciMatches_changeNumber() {
-    // This test, I could go either way. We decide to change the E164 on the existing row rather than create a new one.
-    // But it's an "unstable E164->PNI mapping" case, which we don't expect, so as long as there's a user-visible impact that should be fine.
-    // TODO Verify change number
-    test {
-      given(E164_B, PNI_A, ACI_A)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun onlyAciMatches_changeNumber() {
-    // TODO Verify change number
-    test {
-      given(E164_B, null, ACI_A)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun merge_e164Only_pniOnly_aciOnly() {
-    test {
-      given(E164_A, null, null)
-      given(null, PNI_A, null)
-      given(null, null, ACI_A)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expectDeleted()
-      expectDeleted()
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun merge_e164Only_pniOnly_noAciProvided() {
-    test {
-      given(E164_A, null, null)
-      given(null, PNI_A, null)
-
-      process(E164_A, PNI_A, null)
-
-      expect(E164_A, PNI_A, null)
-      expectDeleted()
-    }
-  }
-
-  @Test
-  fun merge_e164Only_pniOnly_aciProvidedButNoAciRecord() {
-    test {
-      given(E164_A, null, null)
-      given(null, PNI_A, null)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expect(E164_A, PNI_A, ACI_A)
-      expectDeleted()
-    }
-  }
-
-  @Test
-  fun merge_e164Only_pniAndE164_noAciProvided() {
-    test {
-      given(E164_A, null, null)
-      given(E164_B, PNI_A, null)
-
-      process(E164_A, PNI_A, null)
-
-      expect(E164_A, PNI_A, null)
-      expect(E164_B, null, null)
-    }
-  }
-
-  @Test
-  fun merge_e164AndPni_pniOnly_noAciProvided() {
-    test {
-      given(E164_A, PNI_B, null)
-      given(null, PNI_A, null)
-
-      process(E164_A, PNI_A, null)
-
-      expect(E164_A, PNI_A, null)
-      expectDeleted()
-    }
-  }
-
-  @Test
-  fun merge_e164AndPni_e164AndPni_noAciProvided_noSessions() {
-    test {
-      given(E164_A, PNI_B, null)
-      given(E164_B, PNI_A, null)
-
-      process(E164_A, PNI_A, null)
-
-      expect(E164_A, PNI_A, null)
-      expect(E164_B, null, null)
-    }
-  }
-
-  @Test
-  fun merge_e164AndPni_aciOnly() {
-    test {
-      given(E164_A, PNI_A, null)
-      given(null, null, ACI_A)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expectDeleted()
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun merge_e164AndPni_aciOnly_e164RecordHasSeparateE164() {
-    test {
-      given(E164_B, PNI_A, null)
-      given(null, null, ACI_A)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expect(E164_B, null, null)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun merge_e164AndPni_e164AndPniAndAci_changeNumber() {
-    // TODO Verify change number
-    test {
-      given(E164_A, PNI_A, null)
-      given(E164_B, PNI_B, ACI_A)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expectDeleted()
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun merge_e164AndPni_e164Aci_changeNumber() {
-    // TODO Verify change number
-    test {
-      given(E164_A, PNI_A, null)
-      given(E164_B, null, ACI_A)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expectDeleted()
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  private fun insert(e164: String?, pni: PNI?, aci: ACI?): RecipientId {
-    val id: Long = SignalDatabase.rawDatabase.insert(
-      RecipientDatabase.TABLE_NAME,
-      null,
-      contentValuesOf(
-        RecipientDatabase.PHONE to e164,
-        RecipientDatabase.SERVICE_ID to (aci ?: pni)?.toString(),
-        RecipientDatabase.PNI_COLUMN to pni?.toString(),
-        RecipientDatabase.REGISTERED to RecipientDatabase.RegisteredState.REGISTERED.id
-      )
-    )
-
-    return RecipientId.from(id)
-  }
-
-  private fun require(id: RecipientId): IdRecord {
-    return get(id)!!
-  }
-
-  private fun get(id: RecipientId): IdRecord? {
-    SignalDatabase.rawDatabase
-      .select(RecipientDatabase.ID, RecipientDatabase.PHONE, RecipientDatabase.SERVICE_ID, RecipientDatabase.PNI_COLUMN)
-      .from(RecipientDatabase.TABLE_NAME)
-      .where("${RecipientDatabase.ID} = ?", id)
-      .run()
-      .use { cursor ->
-        return if (cursor.moveToFirst()) {
-          IdRecord(
-            id = RecipientId.from(cursor.requireLong(RecipientDatabase.ID)),
-            e164 = cursor.requireString(RecipientDatabase.PHONE),
-            sid = ServiceId.parseOrNull(cursor.requireString(RecipientDatabase.SERVICE_ID)),
-            pni = PNI.parseOrNull(cursor.requireString(RecipientDatabase.PNI_COLUMN))
-          )
-        } else {
-          null
-        }
-      }
-  }
-
-  private fun ensureDbEmpty() {
-    SignalDatabase.rawDatabase.rawQuery("SELECT COUNT(*) FROM ${RecipientDatabase.TABLE_NAME} WHERE ${RecipientDatabase.DISTRIBUTION_LIST_ID} IS NULL ", null).use { cursor ->
-      assertTrue(cursor.moveToFirst())
-      assertEquals(0, cursor.getLong(0))
-    }
-  }
-
-  /**
-   * Baby DSL for making tests readable.
-   */
-  private fun test(init: TestCase.() -> Unit): TestCase {
-    val test = TestCase()
-    test.init()
-    return test
-  }
-
-  private inner class TestCase {
-    private val generatedIds: LinkedHashSet<RecipientId> = LinkedHashSet()
-    private var expectCount = 0
-
-    fun given(e164: String?, pni: PNI?, aci: ACI?) {
-      generatedIds += insert(e164, pni, aci)
-    }
-
-    fun process(e164: String?, pni: PNI?, aci: ACI?) {
-      SignalDatabase.rawDatabase.beginTransaction()
-      try {
-        generatedIds += recipientDatabase.processPnpTuple(e164, pni, aci, pniVerified = false).finalId
-        SignalDatabase.rawDatabase.setTransactionSuccessful()
-      } finally {
-        SignalDatabase.rawDatabase.endTransaction()
-      }
-    }
-
-    fun expect(e164: String?, pni: PNI?, aci: ACI?) {
-      expect(generatedIds.elementAt(expectCount++), e164, pni, aci)
-    }
-
-    fun expect(id: RecipientId, e164: String?, pni: PNI?, aci: ACI?) {
-      val record: IdRecord = require(id)
-      assertEquals(e164, record.e164)
-      assertEquals(pni, record.pni)
-      assertEquals(aci ?: pni, record.sid)
-    }
-
-    fun expectDeleted() {
-      expectDeleted(generatedIds.elementAt(expectCount++))
-    }
-
-    fun expectDeleted(id: RecipientId) {
-      assertNull(get(id))
-    }
-  }
-
-  private data class IdRecord(
-    val id: RecipientId,
-    val e164: String?,
-    val sid: ServiceId?,
-    val pni: PNI?,
-  )
-
-  companion object {
-    val ACI_A = ACI.from(UUID.fromString("3436efbe-5a76-47fa-a98a-7e72c948a82e"))
-    val ACI_B = ACI.from(UUID.fromString("8de7f691-0b60-4a68-9cd9-ed2f8453f9ed"))
-
-    val PNI_A = PNI.from(UUID.fromString("154b8d92-c960-4f6c-8385-671ad2ffb999"))
-    val PNI_B = PNI.from(UUID.fromString("ba92b1fb-cd55-40bf-adda-c35a85375533"))
-
-    const val E164_A = "+12221234567"
-    const val E164_B = "+13331234567"
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest.kt

@@ -13,7 +13,7 @@ import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.testing.SignalActivityRule
 
 @RunWith(AndroidJUnit4::class)
-class RecipientDatabaseTest {
+class RecipientTableTest {
 
   @get:Rule
   val harness = SignalActivityRule()
@@ -38,7 +38,7 @@ class RecipientDatabaseTest {
     val results: MutableList<RecipientId> = SignalDatabase.recipients.getSignalContacts(false)?.use {
       val ids = mutableListOf<RecipientId>()
       while (it.moveToNext()) {
-        ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientDatabase.ID)))
+        ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientTable.ID)))
       }
 
       ids
@@ -79,7 +79,7 @@ class RecipientDatabaseTest {
     val results: MutableList<RecipientId> = SignalDatabase.recipients.getNonGroupContacts(false)?.use {
       val ids = mutableListOf<RecipientId>()
       while (it.moveToNext()) {
-        ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientDatabase.ID)))
+        ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientTable.ID)))
       }
 
       ids
@@ -109,7 +109,7 @@ class RecipientDatabaseTest {
     val results: MutableList<RecipientId> = SignalDatabase.recipients.getSignalContacts(false)?.use {
       val ids = mutableListOf<RecipientId>()
       while (it.moveToNext()) {
-        ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientDatabase.ID)))
+        ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientTable.ID)))
       }
 
       ids
@@ -150,7 +150,7 @@ class RecipientDatabaseTest {
     val results: MutableList<RecipientId> = SignalDatabase.recipients.getNonGroupContacts(false)?.use {
       val ids = mutableListOf<RecipientId>()
       while (it.moveToNext()) {
-        ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientDatabase.ID)))
+        ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientTable.ID)))
       }
 
       ids

app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_getAndPossiblyMerge.kt

@@ -0,0 +1,954 @@
+package org.thoughtcrime.securesms.database
+
+import android.database.Cursor
+import androidx.core.content.contentValuesOf
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.hamcrest.MatcherAssert
+import org.hamcrest.Matchers
+import org.junit.Assert
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.signal.core.util.SqlUtil
+import org.signal.core.util.requireLong
+import org.signal.core.util.requireNonNullString
+import org.signal.core.util.select
+import org.signal.libsignal.protocol.IdentityKey
+import org.signal.libsignal.protocol.SignalProtocolAddress
+import org.signal.libsignal.protocol.state.SessionRecord
+import org.thoughtcrime.securesms.conversation.colors.AvatarColor
+import org.thoughtcrime.securesms.database.model.DistributionListId
+import org.thoughtcrime.securesms.database.model.DistributionListRecord
+import org.thoughtcrime.securesms.database.model.Mention
+import org.thoughtcrime.securesms.database.model.MessageId
+import org.thoughtcrime.securesms.database.model.MessageRecord
+import org.thoughtcrime.securesms.database.model.ReactionRecord
+import org.thoughtcrime.securesms.database.model.databaseprotos.SessionSwitchoverEvent
+import org.thoughtcrime.securesms.database.model.databaseprotos.ThreadMergeEvent
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.groups.GroupId
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+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 java.util.Optional
+import java.util.UUID
+
+@RunWith(AndroidJUnit4::class)
+class RecipientTableTest_getAndPossiblyMerge {
+
+  @Before
+  fun setup() {
+    SignalStore.account().setE164(E164_SELF)
+    SignalStore.account().setAci(ACI_SELF)
+    SignalStore.account().setPni(PNI_SELF)
+    FeatureFlagsAccessor.forceValue(FeatureFlags.PHONE_NUMBER_PRIVACY, true)
+  }
+
+  @Test
+  fun allSimpleTests() {
+    test("no match, e164-only") {
+      process(E164_A, null, null)
+      expect(E164_A, null, null)
+    }
+
+    test("no match, e164 and pni") {
+      process(E164_A, PNI_A, null)
+      expect(E164_A, PNI_A, null)
+    }
+
+    test("no match, aci-only") {
+      process(null, null, ACI_A)
+      expect(null, null, ACI_A)
+    }
+
+    test("no match, e164 and aci") {
+      process(E164_A, null, ACI_A)
+      expect(E164_A, null, ACI_A)
+    }
+
+    test("no match, no data", exception = java.lang.IllegalArgumentException::class.java) {
+      process(null, null, null)
+    }
+
+    test("no match, all fields") {
+      process(E164_A, PNI_A, ACI_A)
+      expect(E164_A, PNI_A, ACI_A)
+    }
+
+    test("full match") {
+      given(E164_A, PNI_A, ACI_A)
+      process(E164_A, PNI_A, ACI_A)
+      expect(E164_A, PNI_A, ACI_A)
+    }
+
+    test("e164 matches, all fields provided") {
+      given(E164_A, null, null)
+      process(E164_A, PNI_A, ACI_A)
+      expect(E164_A, PNI_A, ACI_A)
+    }
+
+    test("e164 matches, e164 and aci provided") {
+      given(E164_A, null, null)
+      process(E164_A, null, ACI_A)
+      expect(E164_A, null, ACI_A)
+    }
+
+    test("e164 matches, all provided, different aci") {
+      given(E164_A, null, ACI_B)
+
+      process(E164_A, PNI_A, ACI_A)
+
+      expect(null, null, ACI_B)
+      expect(E164_A, PNI_A, ACI_A)
+    }
+
+    test("e164 matches, e164 and aci provided, different aci") {
+      given(E164_A, null, ACI_A)
+
+      process(E164_A, null, ACI_B)
+
+      expect(null, null, ACI_A)
+      expect(E164_A, null, ACI_B)
+    }
+
+    test("e164 and pni matches, all provided, new aci, no pni session") {
+      given(E164_A, PNI_A, null)
+      process(E164_A, PNI_A, ACI_A)
+      expect(E164_A, PNI_A, ACI_A)
+    }
+
+    test("e164 and pni matches, all provided, new aci, existing pni session") {
+      given(E164_A, PNI_A, null, pniSession = true)
+      process(E164_A, PNI_A, ACI_A)
+      expect(E164_A, PNI_A, ACI_A)
+
+      expectSessionSwitchoverEvent(E164_A)
+    }
+
+    test("e164 and aci matches, all provided, new pni") {
+      given(E164_A, null, ACI_A)
+      process(E164_A, PNI_A, ACI_A)
+      expect(E164_A, PNI_A, ACI_A)
+    }
+
+    test("pni matches, all provided, new e164 and aci, no pni session") {
+      given(null, PNI_A, null)
+      process(E164_A, PNI_A, ACI_A)
+      expect(E164_A, PNI_A, ACI_A)
+    }
+
+    test("pni matches, all provided, new e164 and aci, existing pni session") {
+      given(null, PNI_A, null, pniSession = true)
+      process(E164_A, PNI_A, ACI_A)
+      expect(E164_A, PNI_A, ACI_A)
+
+      expectSessionSwitchoverEvent(E164_A)
+    }
+
+    test("pni and aci matches, all provided, new e164") {
+      given(null, PNI_A, ACI_A)
+      process(E164_A, PNI_A, ACI_A)
+      expect(E164_A, PNI_A, ACI_A)
+    }
+
+    test("e164 and aci matches, e164 and aci provided, nothing new") {
+      given(E164_A, null, ACI_A)
+      process(E164_A, null, ACI_A)
+      expect(E164_A, null, ACI_A)
+    }
+
+    test("aci matches, all provided, new e164 and pni") {
+      given(null, null, ACI_A)
+      process(E164_A, PNI_A, ACI_A)
+      expect(E164_A, PNI_A, ACI_A)
+    }
+
+    test("aci matches, e164 and aci provided") {
+      given(null, null, ACI_A)
+      process(E164_A, null, ACI_A)
+      expect(E164_A, null, ACI_A)
+    }
+
+    test("aci matches, local user, changeSelf=false") {
+      given(E164_SELF, PNI_SELF, ACI_SELF)
+
+      process(E164_SELF, null, ACI_B)
+
+      expect(E164_SELF, PNI_SELF, ACI_SELF)
+      expect(null, null, ACI_B)
+    }
+
+    test("e164 matches, e164 and pni provided, pni changes, no pni session") {
+      given(E164_A, PNI_B, null)
+      process(E164_A, PNI_A, null)
+      expect(E164_A, PNI_A, null)
+    }
+
+    test("e164 matches, e164 and pni provided, pni changes, existing pni session") {
+      given(E164_A, PNI_B, null, pniSession = true)
+      process(E164_A, PNI_A, null)
+      expect(E164_A, PNI_A, null)
+
+      expectSessionSwitchoverEvent(E164_A)
+    }
+
+    test("e164 and pni matches, all provided, no pni session") {
+      given(E164_A, PNI_A, null)
+      process(E164_A, PNI_A, ACI_A)
+      expect(E164_A, PNI_A, ACI_A)
+    }
+
+    test("e164 and pni matches, all provided, existing pni session") {
+      given(E164_A, PNI_A, null, pniSession = true)
+      process(E164_A, PNI_A, ACI_A)
+      expect(E164_A, PNI_A, ACI_A)
+
+      expectSessionSwitchoverEvent(E164_A)
+    }
+
+    test("pni matches, all provided, no pni session") {
+      given(null, PNI_A, null)
+      process(E164_A, PNI_A, ACI_A)
+      expect(E164_A, PNI_A, ACI_A)
+    }
+
+    test("pni matches, all provided, existing pni session") {
+      given(null, PNI_A, null, pniSession = true)
+      process(E164_A, PNI_A, ACI_A)
+      expect(E164_A, PNI_A, ACI_A)
+
+      expectSessionSwitchoverEvent(E164_A)
+    }
+
+    test("pni matches, no existing pni session, changes number") {
+      given(E164_B, PNI_A, null)
+      process(E164_A, PNI_A, ACI_A)
+      expect(E164_A, PNI_A, ACI_A)
+
+      expectChangeNumberEvent()
+    }
+
+    test("pni matches, existing pni session, changes number") {
+      given(E164_B, PNI_A, null, pniSession = true)
+      process(E164_A, PNI_A, ACI_A)
+      expect(E164_A, PNI_A, ACI_A)
+
+      expectSessionSwitchoverEvent(E164_B)
+      expectChangeNumberEvent()
+    }
+
+    test("pni and aci matches, change number") {
+      given(E164_B, PNI_A, ACI_A)
+      process(E164_A, PNI_A, ACI_A)
+      expect(E164_A, PNI_A, ACI_A)
+
+      expectChangeNumberEvent()
+    }
+
+    test("aci matches, all provided, change number") {
+      given(E164_B, null, ACI_A)
+      process(E164_A, PNI_A, ACI_A)
+      expect(E164_A, PNI_A, ACI_A)
+
+      expectChangeNumberEvent()
+    }
+
+    test("aci matches, e164 and aci provided, change number") {
+      given(E164_B, null, ACI_A)
+      process(E164_A, null, ACI_A)
+      expect(E164_A, null, ACI_A)
+
+      expectChangeNumberEvent()
+    }
+
+    test("steal, e164+pni & e164+pni, no aci provided, no pni session") {
+      given(E164_A, PNI_B, null)
+      given(E164_B, PNI_A, null)
+
+      process(E164_A, PNI_A, null)
+
+      expect(E164_A, PNI_A, null)
+      expect(E164_B, null, null)
+    }
+
+    test("steal, e164+pni & e164+pni, no aci provided, existing pni session") {
+      given(E164_A, PNI_B, null, pniSession = true)
+      given(E164_B, PNI_A, null) // TODO How to handle if this user had a session? They just end up losing the PNI, meaning it would become unregistered, but it could register again later with a different PNI?
+
+      process(E164_A, PNI_A, null)
+
+      expect(E164_A, PNI_A, null)
+      expect(E164_B, null, null)
+
+      expectSessionSwitchoverEvent(E164_A)
+    }
+
+    test("steal, e164+pni & aci, e164 record has separate e164") {
+      given(E164_B, PNI_A, null)
+      given(null, null, ACI_A)
+
+      process(E164_A, PNI_A, ACI_A)
+
+      expect(E164_B, null, null)
+      expect(E164_A, PNI_A, ACI_A)
+    }
+
+    test("steal, e164+aci & e164+aci, change number") {
+      given(E164_B, null, ACI_A)
+      given(E164_A, null, ACI_B)
+
+      process(E164_A, null, ACI_A)
+
+      expect(E164_A, null, ACI_A)
+      expect(null, null, ACI_B)
+
+      expectChangeNumberEvent()
+    }
+
+    test("steal, e164 & pni+e164, no aci provided") {
+      val id1 = given(E164_A, null, null)
+      val id2 = given(E164_B, PNI_A, null, pniSession = true)
+
+      process(E164_A, PNI_A, null)
+
+      expect(E164_A, PNI_A, null)
+      expect(E164_B, null, null)
+
+      expectSessionSwitchoverEvent(id1, E164_A)
+      expectSessionSwitchoverEvent(id2, E164_B)
+    }
+
+    test("merge, e164 & pni & aci, all provided") {
+      given(E164_A, null, null)
+      given(null, PNI_A, null)
+      given(null, null, ACI_A)
+
+      process(E164_A, PNI_A, ACI_A)
+
+      expectDeleted()
+      expectDeleted()
+      expect(E164_A, PNI_A, ACI_A)
+
+      expectThreadMergeEvent(E164_A)
+    }
+
+    test("merge, e164 & pni, no aci provided") {
+      given(E164_A, null, null)
+      given(null, PNI_A, null)
+
+      process(E164_A, PNI_A, null)
+
+      expect(E164_A, PNI_A, null)
+      expectDeleted()
+
+      expectThreadMergeEvent("")
+    }
+
+    test("merge, e164 & pni, aci provided, no pni session") {
+      given(E164_A, null, null)
+      given(null, PNI_A, null)
+
+      process(E164_A, PNI_A, ACI_A)
+
+      expect(E164_A, PNI_A, ACI_A)
+      expectDeleted()
+
+      expectThreadMergeEvent("")
+    }
+
+    test("merge, e164 & pni, aci provided, no pni session") {
+      given(E164_A, null, null)
+      given(null, PNI_A, null)
+
+      process(E164_A, PNI_A, ACI_A)
+
+      expect(E164_A, PNI_A, ACI_A)
+      expectDeleted()
+
+      expectThreadMergeEvent("")
+    }
+
+    test("merge, e164 & pni, aci provided, existing pni session") {
+      given(E164_A, null, null)
+      given(null, PNI_A, null, pniSession = true)
+
+      process(E164_A, PNI_A, ACI_A)
+
+      expect(E164_A, PNI_A, ACI_A)
+      expectDeleted()
+
+      expectThreadMergeEvent("")
+      expectSessionSwitchoverEvent(E164_A)
+    }
+
+    test("merge, e164+pni & pni, no aci provided") {
+      given(E164_A, PNI_B, null)
+      given(null, PNI_A, null)
+
+      process(E164_A, PNI_A, null)
+
+      expect(E164_A, PNI_A, null)
+      expectDeleted()
+
+      expectThreadMergeEvent("")
+    }
+
+    test("merge, e164+pni & aci") {
+      given(E164_A, PNI_A, null)
+      given(null, null, ACI_A)
+
+      process(E164_A, PNI_A, ACI_A)
+
+      expectDeleted()
+      expect(E164_A, PNI_A, ACI_A)
+
+      expectThreadMergeEvent(E164_A)
+    }
+
+    test("merge, e164+pni & e164+pni+aci, change number") {
+      given(E164_A, PNI_A, null)
+      given(E164_B, PNI_B, ACI_A)
+
+      process(E164_A, PNI_A, ACI_A)
+
+      expectDeleted()
+      expect(E164_A, PNI_A, ACI_A)
+
+      expectChangeNumberEvent()
+      expectThreadMergeEvent(E164_A)
+    }
+
+    test("merge, e164+pni & e164+aci, change number") {
+      given(E164_A, PNI_A, null)
+      given(E164_B, null, ACI_A)
+
+      process(E164_A, PNI_A, ACI_A)
+
+      expectDeleted()
+      expect(E164_A, PNI_A, ACI_A)
+
+      expectChangeNumberEvent()
+      expectThreadMergeEvent(E164_A)
+    }
+
+    test("merge, e164 & aci") {
+      given(E164_A, null, null)
+      given(null, null, ACI_A)
+
+      process(E164_A, null, ACI_A)
+
+      expectDeleted()
+      expect(E164_A, null, ACI_A)
+
+      expectThreadMergeEvent(E164_A)
+    }
+
+    test("merge, e164 & e164+aci, change number") {
+      given(E164_A, null, null)
+      given(E164_B, null, ACI_A)
+
+      process(E164_A, null, ACI_A)
+
+      expectDeleted()
+      expect(E164_A, null, ACI_A)
+
+      expectChangeNumberEvent()
+
+      expectThreadMergeEvent(E164_A)
+    }
+
+    test("local user, local e164 and aci provided, changeSelf=false, leave e164 alone") {
+      given(E164_SELF, null, ACI_SELF)
+      given(null, null, ACI_A)
+
+      process(E164_SELF, null, ACI_A)
+
+      expect(E164_SELF, null, ACI_SELF)
+      expect(null, null, ACI_A)
+    }
+
+    test("local user, e164 and aci provided, changeSelf=false, leave e164 alone") {
+      given(E164_SELF, null, ACI_SELF)
+      process(E164_A, null, ACI_SELF)
+      expect(E164_SELF, null, ACI_SELF)
+    }
+
+    test("local user, e164 and aci provided, changeSelf=true, change e164") {
+      given(E164_SELF, null, ACI_SELF)
+      process(E164_A, null, ACI_SELF, changeSelf = true)
+      expect(E164_A, null, ACI_SELF)
+    }
+  }
+
+  /**
+   * Somewhat exhaustive test of verifying all the data that gets merged.
+   */
+  @Test
+  fun getAndPossiblyMerge_merge_general() {
+    // Setup
+    val recipientIdAci: RecipientId = SignalDatabase.recipients.getOrInsertFromServiceId(ACI_A)
+    val recipientIdE164: RecipientId = SignalDatabase.recipients.getOrInsertFromE164(E164_A)
+    val recipientIdAciB: RecipientId = SignalDatabase.recipients.getOrInsertFromServiceId(ACI_B)
+
+    val smsId1: Long = SignalDatabase.messages.insertMessageInbox(smsMessage(sender = recipientIdAci, time = 0, body = "0")).get().messageId
+    val smsId2: Long = SignalDatabase.messages.insertMessageInbox(smsMessage(sender = recipientIdE164, time = 1, body = "1")).get().messageId
+    val smsId3: Long = SignalDatabase.messages.insertMessageInbox(smsMessage(sender = recipientIdAci, time = 2, body = "2")).get().messageId
+
+    val mmsId1: Long = SignalDatabase.messages.insertSecureDecryptedMessageInbox(mmsMessage(sender = recipientIdAci, time = 3, body = "3"), -1).get().messageId
+    val mmsId2: Long = SignalDatabase.messages.insertSecureDecryptedMessageInbox(mmsMessage(sender = recipientIdE164, time = 4, body = "4"), -1).get().messageId
+    val mmsId3: Long = SignalDatabase.messages.insertSecureDecryptedMessageInbox(mmsMessage(sender = recipientIdAci, time = 5, body = "5"), -1).get().messageId
+
+    val threadIdAci: Long = SignalDatabase.threads.getThreadIdFor(recipientIdAci)!!
+    val threadIdE164: Long = SignalDatabase.threads.getThreadIdFor(recipientIdE164)!!
+    Assert.assertNotEquals(threadIdAci, threadIdE164)
+
+    SignalDatabase.mentions.insert(threadIdAci, mmsId1, listOf(Mention(recipientIdE164, 0, 1)))
+    SignalDatabase.mentions.insert(threadIdE164, mmsId2, listOf(Mention(recipientIdAci, 0, 1)))
+
+    SignalDatabase.groupReceipts.insert(listOf(recipientIdAci, recipientIdE164), mmsId1, 0, 3)
+
+    val identityKeyAci: IdentityKey = identityKey(1)
+    val identityKeyE164: IdentityKey = identityKey(2)
+
+    SignalDatabase.identities.saveIdentity(ACI_A.toString(), recipientIdAci, identityKeyAci, IdentityTable.VerifiedStatus.VERIFIED, false, 0, false)
+    SignalDatabase.identities.saveIdentity(E164_A, recipientIdE164, identityKeyE164, IdentityTable.VerifiedStatus.VERIFIED, false, 0, false)
+
+    SignalDatabase.sessions.store(ACI_SELF, SignalProtocolAddress(ACI_A.toString(), 1), SessionRecord())
+
+    SignalDatabase.reactions.addReaction(MessageId(smsId1), ReactionRecord("a", recipientIdAci, 1, 1))
+    SignalDatabase.reactions.addReaction(MessageId(mmsId1), ReactionRecord("b", recipientIdE164, 1, 1))
+
+    val profile1: NotificationProfile = notificationProfile(name = "Test")
+    val profile2: NotificationProfile = notificationProfile(name = "Test2")
+
+    SignalDatabase.notificationProfiles.addAllowedRecipient(profileId = profile1.id, recipientId = recipientIdAci)
+    SignalDatabase.notificationProfiles.addAllowedRecipient(profileId = profile1.id, recipientId = recipientIdE164)
+    SignalDatabase.notificationProfiles.addAllowedRecipient(profileId = profile2.id, recipientId = recipientIdE164)
+    SignalDatabase.notificationProfiles.addAllowedRecipient(profileId = profile2.id, recipientId = recipientIdAciB)
+
+    val distributionListId: DistributionListId = SignalDatabase.distributionLists.createList("testlist", listOf(recipientIdE164, recipientIdAciB))!!
+
+    // Merge
+    val retrievedId: RecipientId = SignalDatabase.recipients.getAndPossiblyMerge(ACI_A, E164_A, true)
+    val retrievedThreadId: Long = SignalDatabase.threads.getThreadIdFor(retrievedId)!!
+    assertEquals(recipientIdAci, retrievedId)
+
+    // Recipient validation
+    val retrievedRecipient = Recipient.resolved(retrievedId)
+    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
+    assertEquals(E164_A, retrievedRecipient.requireE164())
+
+    val existingE164Recipient = Recipient.resolved(recipientIdE164)
+    assertEquals(retrievedId, existingE164Recipient.id)
+
+    // Thread validation
+    assertEquals(threadIdAci, retrievedThreadId)
+    Assert.assertNull(SignalDatabase.threads.getThreadIdFor(recipientIdE164))
+    Assert.assertNull(SignalDatabase.threads.getThreadRecord(threadIdE164))
+
+    // SMS validation
+    val sms1: MessageRecord = SignalDatabase.messages.getMessageRecord(smsId1)!!
+    val sms2: MessageRecord = SignalDatabase.messages.getMessageRecord(smsId2)!!
+    val sms3: MessageRecord = SignalDatabase.messages.getMessageRecord(smsId3)!!
+
+    assertEquals(retrievedId, sms1.recipient.id)
+    assertEquals(retrievedId, sms2.recipient.id)
+    assertEquals(retrievedId, sms3.recipient.id)
+
+    assertEquals(retrievedThreadId, sms1.threadId)
+    assertEquals(retrievedThreadId, sms2.threadId)
+    assertEquals(retrievedThreadId, sms3.threadId)
+
+    // MMS validation
+    val mms1: MessageRecord = SignalDatabase.messages.getMessageRecord(mmsId1)!!
+    val mms2: MessageRecord = SignalDatabase.messages.getMessageRecord(mmsId2)!!
+    val mms3: MessageRecord = SignalDatabase.messages.getMessageRecord(mmsId3)!!
+
+    assertEquals(retrievedId, mms1.recipient.id)
+    assertEquals(retrievedId, mms2.recipient.id)
+    assertEquals(retrievedId, mms3.recipient.id)
+
+    assertEquals(retrievedThreadId, mms1.threadId)
+    assertEquals(retrievedThreadId, mms2.threadId)
+    assertEquals(retrievedThreadId, mms3.threadId)
+
+    // Mention validation
+    val mention1: MentionModel = getMention(mmsId1)
+    assertEquals(retrievedId, mention1.recipientId)
+    assertEquals(retrievedThreadId, mention1.threadId)
+
+    val mention2: MentionModel = getMention(mmsId2)
+    assertEquals(retrievedId, mention2.recipientId)
+    assertEquals(retrievedThreadId, mention2.threadId)
+
+    // Group receipt validation
+    val groupReceipts: List<GroupReceiptTable.GroupReceiptInfo> = SignalDatabase.groupReceipts.getGroupReceiptInfo(mmsId1)
+    assertEquals(retrievedId, groupReceipts[0].recipientId)
+    assertEquals(retrievedId, groupReceipts[1].recipientId)
+
+    // Identity validation
+    assertEquals(identityKeyAci, SignalDatabase.identities.getIdentityStoreRecord(ACI_A.toString())!!.identityKey)
+    Assert.assertNull(SignalDatabase.identities.getIdentityStoreRecord(E164_A))
+
+    // Session validation
+    Assert.assertNotNull(SignalDatabase.sessions.load(ACI_SELF, SignalProtocolAddress(ACI_A.toString(), 1)))
+
+    // Reaction validation
+    val reactionsSms: List<ReactionRecord> = SignalDatabase.reactions.getReactions(MessageId(smsId1))
+    val reactionsMms: List<ReactionRecord> = SignalDatabase.reactions.getReactions(MessageId(mmsId1))
+
+    assertEquals(1, reactionsSms.size)
+    assertEquals(ReactionRecord("a", recipientIdAci, 1, 1), reactionsSms[0])
+
+    assertEquals(1, reactionsMms.size)
+    assertEquals(ReactionRecord("b", recipientIdAci, 1, 1), reactionsMms[0])
+
+    // Notification Profile validation
+    val updatedProfile1: NotificationProfile = SignalDatabase.notificationProfiles.getProfile(profile1.id)!!
+    val updatedProfile2: NotificationProfile = SignalDatabase.notificationProfiles.getProfile(profile2.id)!!
+
+    MatcherAssert.assertThat("Notification Profile 1 should now only contain ACI $recipientIdAci", updatedProfile1.allowedMembers, Matchers.containsInAnyOrder(recipientIdAci))
+    MatcherAssert.assertThat("Notification Profile 2 should now contain ACI A ($recipientIdAci) and ACI B ($recipientIdAciB)", updatedProfile2.allowedMembers, Matchers.containsInAnyOrder(recipientIdAci, recipientIdAciB))
+
+    // Distribution List validation
+    val updatedList: DistributionListRecord = SignalDatabase.distributionLists.getList(distributionListId)!!
+
+    MatcherAssert.assertThat("Distribution list should have updated $recipientIdE164 to $recipientIdAci", updatedList.members, Matchers.containsInAnyOrder(recipientIdAci, recipientIdAciB))
+  }
+
+  private fun smsMessage(sender: RecipientId, time: Long = 0, body: String = "", groupId: Optional<GroupId> = Optional.empty()): IncomingTextMessage {
+    return IncomingTextMessage(sender, 1, time, time, time, body, groupId, 0, true, null)
+  }
+
+  private fun mmsMessage(sender: RecipientId, time: Long = 0, body: String = "", groupId: Optional<GroupId> = Optional.empty()): IncomingMediaMessage {
+    return IncomingMediaMessage(sender, groupId, body, time, time, time, emptyList(), 0, 0, false, false, true, Optional.empty(), false, false)
+  }
+
+  private fun identityKey(value: Byte): IdentityKey {
+    val bytes = ByteArray(33)
+    bytes[0] = 0x05
+    bytes[1] = value
+    return IdentityKey(bytes)
+  }
+
+  private fun notificationProfile(name: String): NotificationProfile {
+    return (SignalDatabase.notificationProfiles.createProfile(name = name, emoji = "", color = AvatarColor.A210, System.currentTimeMillis()) as NotificationProfileDatabase.NotificationProfileChangeResult.Success).notificationProfile
+  }
+
+  private fun getMention(messageId: Long): MentionModel {
+    return SignalDatabase.rawDatabase.rawQuery("SELECT * FROM ${MentionTable.TABLE_NAME} WHERE ${MentionTable.MESSAGE_ID} = $messageId").use { cursor ->
+      cursor.moveToFirst()
+      MentionModel(
+        recipientId = RecipientId.from(cursor.requireLong(MentionTable.RECIPIENT_ID)),
+        threadId = cursor.requireLong(MentionTable.THREAD_ID)
+      )
+    }
+  }
+
+  /** The normal mention model doesn't have a threadId, so we need to do it ourselves for the test */
+  data class MentionModel(
+    val recipientId: RecipientId,
+    val threadId: Long
+  )
+
+  /**
+   * Baby DSL for making tests readable.
+   */
+  private fun test(name: String, init: TestCase.() -> Unit): TestCase {
+    // Weird issue with generics wouldn't let me make the exception an arg with default value -- had to do an actual overload
+    return test(name, null as Class<Throwable>?, init)
+  }
+
+  /**
+   * Baby DSL for making tests readable.
+   */
+  private fun <E> test(name: String, exception: Class<E>?, init: TestCase.() -> Unit): TestCase where E : Throwable {
+    val test = TestCase()
+    try {
+      test.init()
+
+      if (exception != null) {
+        throw java.lang.AssertionError("Expected $exception, but none was thrown.")
+      }
+
+      if (!test.changeNumberExpected) {
+        test.expectNoChangeNumberEvent()
+      }
+
+      if (!test.threadMergeExpected) {
+        test.expectNoThreadMergeEvent()
+      }
+
+      if (!test.sessionSwitchoverExpected) {
+        test.expectNoSessionSwitchoverEvent()
+      }
+    } catch (e: Throwable) {
+      if (e.javaClass != exception) {
+        val error = java.lang.AssertionError("[$name] ${e.message}")
+        error.stackTrace = e.stackTrace
+        throw error
+      }
+    }
+
+    return test
+  }
+
+  private inner class TestCase {
+    private val generatedIds: LinkedHashSet<RecipientId> = LinkedHashSet()
+    private var expectCount = 0
+    private lateinit var outputRecipientId: RecipientId
+
+    var changeNumberExpected = false
+    var threadMergeExpected = false
+    var sessionSwitchoverExpected = false
+
+    init {
+      // Need to delete these first to prevent foreign key crash
+      SignalDatabase.rawDatabase.execSQL("DELETE FROM distribution_list")
+      SignalDatabase.rawDatabase.execSQL("DELETE FROM distribution_list_member")
+
+      SqlUtil.getAllTables(SignalDatabase.rawDatabase)
+        .filterNot { it.contains("sqlite") || it.contains("fts") || it.startsWith("emoji_search_") } // If we delete these we'll corrupt the DB
+        .sorted()
+        .forEach { table ->
+          SignalDatabase.rawDatabase.execSQL("DELETE FROM $table")
+        }
+
+      ApplicationDependencies.getRecipientCache().clear()
+      RecipientId.clearCache()
+    }
+
+    fun given(
+      e164: String?,
+      pni: PNI?,
+      aci: ACI?,
+      createThread: Boolean = true,
+      pniSession: Boolean = false
+    ): RecipientId {
+      val id = insert(e164, pni, aci)
+      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, 0, 0, 0, "", Optional.empty(), 0, false, ""), ""))
+      }
+
+      if (pniSession) {
+        if (pni == null) {
+          throw IllegalArgumentException("pniSession = true but pni is null!")
+        }
+
+        SignalDatabase.sessions.store(pni, SignalProtocolAddress(pni.toString(), 1), SessionRecord())
+      }
+
+      return id
+    }
+
+    fun process(e164: String?, pni: PNI?, aci: ACI?, changeSelf: Boolean = false) {
+      outputRecipientId = SignalDatabase.recipients.getAndPossiblyMerge(serviceId = aci ?: pni, pni = pni, e164 = e164, pniVerified = false, changeSelf = changeSelf)
+      generatedIds += outputRecipientId
+    }
+
+    fun expect(e164: String?, pni: PNI?, aci: ACI?) {
+      expect(generatedIds.elementAt(expectCount++), e164, pni, aci)
+    }
+
+    fun expect(id: RecipientId, e164: String?, pni: PNI?, aci: ACI?) {
+      val recipient = Recipient.resolved(id)
+      val expected = RecipientTuple(
+        e164 = e164,
+        pni = pni,
+        serviceId = aci ?: pni
+      )
+      val actual = RecipientTuple(
+        e164 = recipient.e164.orElse(null),
+        pni = recipient.pni.orElse(null),
+        serviceId = recipient.serviceId.orElse(null)
+      )
+
+      assertEquals(expected, actual)
+    }
+
+    fun expectDeleted() {
+      expectDeleted(generatedIds.elementAt(expectCount++))
+    }
+
+    fun expectDeleted(id: RecipientId) {
+      SignalDatabase.rawDatabase
+        .select("1")
+        .from(RecipientTable.TABLE_NAME)
+        .where("${RecipientTable.ID} = ?", id)
+        .run()
+        .use { !it.moveToFirst() }
+    }
+
+    fun expectChangeNumberEvent() {
+      assertEquals(1, SignalDatabase.messages.getChangeNumberMessageCount(outputRecipientId))
+      changeNumberExpected = true
+    }
+
+    fun expectNoChangeNumberEvent() {
+      assertEquals(0, SignalDatabase.messages.getChangeNumberMessageCount(outputRecipientId))
+      changeNumberExpected = false
+    }
+
+    fun expectSessionSwitchoverEvent(e164: String) {
+      expectSessionSwitchoverEvent(outputRecipientId, e164)
+    }
+
+    fun expectSessionSwitchoverEvent(recipientId: RecipientId, e164: String) {
+      val event: SessionSwitchoverEvent? = getLatestSessionSwitchoverEvent(recipientId)
+      assertNotNull(event)
+      assertEquals(e164, event!!.e164)
+      sessionSwitchoverExpected = true
+    }
+
+    fun expectNoSessionSwitchoverEvent() {
+      assertNull(getLatestSessionSwitchoverEvent(outputRecipientId))
+    }
+
+    fun expectThreadMergeEvent(previousE164: String) {
+      val event: ThreadMergeEvent? = getLatestThreadMergeEvent(outputRecipientId)
+      assertNotNull(event)
+      assertEquals(previousE164, event!!.previousE164)
+      threadMergeExpected = true
+    }
+
+    fun expectNoThreadMergeEvent() {
+      assertNull(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.REGISTERED to RecipientTable.RegisteredState.REGISTERED.id
+        )
+      )
+
+      assertTrue("Failed to insert! E164: $e164, ServiceId: $serviceIdString, PNI: $pniString", id > 0)
+
+      return RecipientId.from(id)
+    }
+  }
+
+  data class RecipientTuple(
+    val e164: String?,
+    val pni: PNI?,
+    val serviceId: ServiceId?
+  ) {
+
+    /**
+     * 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()})"
+    }
+
+    private fun String?.e164String(): String {
+      return this?.let {
+        when (it) {
+          E164_A -> "E164_A"
+          E164_B -> "E164_B"
+          else -> it
+        }
+      } ?: "null"
+    }
+
+    private fun PNI?.pniString(): String {
+      return this?.let {
+        when (it) {
+          PNI_A -> "PNI_A"
+          PNI_B -> "PNI_B"
+          PNI_SELF -> "PNI_SELF"
+          else -> it.toString()
+        }
+      } ?: "null"
+    }
+
+    private fun ServiceId?.serviceIdString(): 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"
+          else -> it.toString()
+        }
+      } ?: "null"
+    }
+  }
+
+  private fun getLatestThreadMergeEvent(recipientId: RecipientId): ThreadMergeEvent? {
+    return SignalDatabase.rawDatabase
+      .select(MessageTable.BODY)
+      .from(MessageTable.TABLE_NAME)
+      .where("${MessageTable.RECIPIENT_ID} = ? AND ${MessageTable.TYPE} = ?", recipientId, MessageTypes.THREAD_MERGE_TYPE)
+      .orderBy("${MessageTable.DATE_RECEIVED} DESC")
+      .limit(1)
+      .run()
+      .use { cursor: Cursor ->
+        if (cursor.moveToFirst()) {
+          val bytes = Base64.decode(cursor.requireNonNullString(MessageTable.BODY))
+          ThreadMergeEvent.parseFrom(bytes)
+        } else {
+          null
+        }
+      }
+  }
+
+  private fun getLatestSessionSwitchoverEvent(recipientId: RecipientId): SessionSwitchoverEvent? {
+    return SignalDatabase.rawDatabase
+      .select(MessageTable.BODY)
+      .from(MessageTable.TABLE_NAME)
+      .where("${MessageTable.RECIPIENT_ID} = ? AND ${MessageTable.TYPE} = ?", recipientId, MessageTypes.SESSION_SWITCHOVER_TYPE)
+      .orderBy("${MessageTable.DATE_RECEIVED} DESC")
+      .limit(1)
+      .run()
+      .use { cursor: Cursor ->
+        if (cursor.moveToFirst()) {
+          val bytes = Base64.decode(cursor.requireNonNullString(MessageTable.BODY))
+          SessionSwitchoverEvent.parseFrom(bytes)
+        } else {
+          null
+        }
+      }
+  }
+
+  companion object {
+    val ACI_A = ACI.from(UUID.fromString("aaaa0000-5a76-47fa-a98a-7e72c948a82e"))
+    val ACI_B = ACI.from(UUID.fromString("bbbb0000-0b60-4a68-9cd9-ed2f8453f9ed"))
+    val ACI_SELF = ACI.from(UUID.fromString("77770000-b477-4f35-a824-d92987a63641"))
+
+    val PNI_A = PNI.from(UUID.fromString("aaaa1111-c960-4f6c-8385-671ad2ffb999"))
+    val PNI_B = PNI.from(UUID.fromString("bbbb1111-cd55-40bf-adda-c35a85375533"))
+    val PNI_SELF = PNI.from(UUID.fromString("77771111-b014-41fb-bf73-05cb2ec52910"))
+
+    const val E164_A = "+12222222222"
+    const val E164_B = "+13333333333"
+    const val E164_SELF = "+10000000000"
+  }
+}

app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_processPnpTupleToChangeSet.kt

@@ -18,13 +18,13 @@ import java.lang.IllegalStateException
 import java.util.UUID
 
 @RunWith(AndroidJUnit4::class)
-class RecipientDatabaseTest_processPnpTupleToChangeSet {
+class RecipientTableTest_processPnpTupleToChangeSet {
 
   @Rule
   @JvmField
   val databaseRule = SignalDatabaseRule(deleteAllThreadsOnEachRun = false)
 
-  private lateinit var db: RecipientDatabase
+  private lateinit var db: RecipientTable
 
   @Before
   fun setup() {
@@ -111,7 +111,7 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.SetPni(result.id, PNI_A),
           PnpOperation.SetAci(result.id, ACI_A)
         )
@@ -131,9 +131,9 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.SetPni(result.id, PNI_A),
-          PnpOperation.SessionSwitchoverInsert(result.id)
+          PnpOperation.SessionSwitchoverInsert(result.id, E164_A)
         )
       ),
       result.changeSet
@@ -151,7 +151,7 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.SetPni(result.id, PNI_A)
         )
       ),
@@ -170,7 +170,7 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.SetAci(result.id, ACI_A)
         )
       ),
@@ -189,9 +189,9 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.SetAci(result.id, ACI_A),
-          PnpOperation.SessionSwitchoverInsert(result.id)
+          PnpOperation.SessionSwitchoverInsert(result.id, E164_A)
         )
       ),
       result.changeSet
@@ -209,7 +209,7 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.SetPni(result.id, PNI_A)
         )
       ),
@@ -228,7 +228,7 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.SetE164(result.id, E164_A),
           PnpOperation.SetAci(result.id, ACI_A)
         )
@@ -248,10 +248,10 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.SetE164(result.id, E164_A),
           PnpOperation.SetAci(result.id, ACI_A),
-          PnpOperation.SessionSwitchoverInsert(result.id)
+          PnpOperation.SessionSwitchoverInsert(result.id, E164_A)
         )
       ),
       result.changeSet
@@ -269,7 +269,7 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.SetE164(result.id, E164_A),
           PnpOperation.SetAci(result.id, ACI_A),
           PnpOperation.ChangeNumberInsert(
@@ -277,7 +277,7 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet {
             oldE164 = E164_B,
             newE164 = E164_A
           ),
-          PnpOperation.SessionSwitchoverInsert(result.id)
+          PnpOperation.SessionSwitchoverInsert(result.id, E164_A)
         )
       ),
       result.changeSet
@@ -295,7 +295,7 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.SetE164(result.id, E164_A),
         )
       ),
@@ -314,7 +314,7 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.SetE164(result.id, E164_A),
           PnpOperation.ChangeNumberInsert(
             recipientId = result.id,
@@ -338,7 +338,7 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.SetE164(result.id, E164_A),
           PnpOperation.SetPni(result.id, PNI_A)
         )
@@ -358,7 +358,7 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.SetE164(result.id, E164_A),
           PnpOperation.SetPni(result.id, PNI_A),
           PnpOperation.ChangeNumberInsert(
@@ -387,7 +387,7 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.thirdId),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.Merge(
             primaryId = result.firstId,
             secondaryId = result.secondId
@@ -416,7 +416,7 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.firstId),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.Merge(
             primaryId = result.firstId,
             secondaryId = result.secondId
@@ -441,7 +441,7 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.firstId),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.Merge(
             primaryId = result.firstId,
             secondaryId = result.secondId
@@ -470,7 +470,7 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.firstId),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.RemovePni(result.secondId),
           PnpOperation.SetPni(
             recipientId = result.firstId,
@@ -496,7 +496,7 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.firstId),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.RemovePni(result.firstId),
           PnpOperation.Merge(
             primaryId = result.firstId,
@@ -522,7 +522,7 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.firstId),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.RemovePni(result.secondId),
           PnpOperation.SetPni(result.firstId, PNI_A)
         )
@@ -545,11 +545,11 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.firstId),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.RemovePni(result.secondId),
           PnpOperation.SetPni(result.firstId, PNI_A),
-          PnpOperation.SessionSwitchoverInsert(result.secondId),
-          PnpOperation.SessionSwitchoverInsert(result.firstId)
+          PnpOperation.SessionSwitchoverInsert(result.secondId, E164_A),
+          PnpOperation.SessionSwitchoverInsert(result.firstId, E164_A)
         )
       ),
       result.changeSet
@@ -570,7 +570,7 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.secondId),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.Merge(
             primaryId = result.secondId,
             secondaryId = result.firstId
@@ -595,7 +595,7 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.secondId),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.RemovePni(result.firstId),
           PnpOperation.SetPni(
             recipientId = result.secondId,
@@ -625,7 +625,7 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.secondId),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.RemovePni(result.firstId),
           PnpOperation.SetPni(
             recipientId = result.secondId,
@@ -660,7 +660,7 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.secondId),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.RemovePni(result.secondId),
           PnpOperation.RemoveE164(result.secondId),
           PnpOperation.Merge(
@@ -692,7 +692,7 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet {
     assertEquals(
       PnpChangeSet(
         id = PnpIdResolver.PnpNoopId(result.secondId),
-        operations = listOf(
+        operations = linkedSetOf(
           PnpOperation.RemoveE164(result.secondId),
           PnpOperation.Merge(
             primaryId = result.secondId,
@@ -711,13 +711,13 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet {
 
   private fun insert(e164: String?, pni: PNI?, aci: ACI?): RecipientId {
     val id: Long = SignalDatabase.rawDatabase.insert(
-      RecipientDatabase.TABLE_NAME,
+      RecipientTable.TABLE_NAME,
       null,
       contentValuesOf(
-        RecipientDatabase.PHONE to e164,
-        RecipientDatabase.SERVICE_ID to (aci ?: pni)?.toString(),
-        RecipientDatabase.PNI_COLUMN to pni?.toString(),
-        RecipientDatabase.REGISTERED to RecipientDatabase.RegisteredState.REGISTERED.id
+        RecipientTable.PHONE to e164,
+        RecipientTable.SERVICE_ID to (aci ?: pni)?.toString(),
+        RecipientTable.PNI_COLUMN to pni?.toString(),
+        RecipientTable.REGISTERED to RecipientTable.RegisteredState.REGISTERED.id
       )
     )
 
@@ -726,12 +726,12 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet {
 
   private fun insertMockSessionFor(account: ServiceId, address: ServiceId) {
     SignalDatabase.rawDatabase.insert(
-      SessionDatabase.TABLE_NAME, null,
+      SessionTable.TABLE_NAME, null,
       contentValuesOf(
-        SessionDatabase.ACCOUNT_ID to account.toString(),
-        SessionDatabase.ADDRESS to address.toString(),
-        SessionDatabase.DEVICE to 1,
-        SessionDatabase.RECORD to Util.getSecretBytes(32)
+        SessionTable.ACCOUNT_ID to account.toString(),
+        SessionTable.ADDRESS to address.toString(),
+        SessionTable.DEVICE to 1,
+        SessionTable.RECORD to Util.getSecretBytes(32)
       )
     )
   }
@@ -762,7 +762,7 @@ class RecipientDatabaseTest_processPnpTupleToChangeSet {
   }
 
   /**
-   * Helper method that will call insert your recipients, call [RecipientDatabase.processPnpTupleToChangeSet] with your params,
+   * Helper method that will call insert your recipients, call [RecipientTable.processPnpTupleToChangeSet] with your params,
    * and then verify your output matches what you expect.
    *
    * It results the inserted ID's and changeset for additional verification.

app/src/androidTest/java/org/thoughtcrime/securesms/database/SmsDatabaseTest_collapseJoinRequestEventsIfPossible.kt

@@ -31,8 +31,8 @@ import java.util.UUID
 @RunWith(AndroidJUnit4::class)
 class SmsDatabaseTest_collapseJoinRequestEventsIfPossible {
 
-  private lateinit var recipients: RecipientDatabase
-  private lateinit var sms: SmsDatabase
+  private lateinit var recipients: RecipientTable
+  private lateinit var sms: MessageTable
 
   private val localAci = ACI.from(UUID.randomUUID())
   private val localPni = PNI.from(UUID.randomUUID())
@@ -45,7 +45,7 @@ class SmsDatabaseTest_collapseJoinRequestEventsIfPossible {
   @Before
   fun setUp() {
     recipients = SignalDatabase.recipients
-    sms = SignalDatabase.sms
+    sms = SignalDatabase.messages
 
     SignalStore.account().setAci(localAci)
     SignalStore.account().setPni(localPni)
@@ -163,7 +163,7 @@ class SmsDatabaseTest_collapseJoinRequestEventsIfPossible {
    */
   @Test
   fun previousJoinRequestCollapse() {
-    val latestMessage: MessageDatabase.InsertResult = sms.insertMessageInbox(
+    val latestMessage: MessageTable.InsertResult = sms.insertMessageInbox(
       groupUpdateMessage(
         sender = alice,
         groupContext = groupContext(masterKey = masterKey) {
@@ -197,7 +197,7 @@ class SmsDatabaseTest_collapseJoinRequestEventsIfPossible {
   fun previousJoinThenTextCollapse() {
     val secondLatestMessage = sms.insertMessageInbox(smsMessage(sender = alice, body = "What up")).get()
 
-    val latestMessage: MessageDatabase.InsertResult = sms.insertMessageInbox(
+    val latestMessage: MessageTable.InsertResult = sms.insertMessageInbox(
       groupUpdateMessage(
         sender = alice,
         groupContext = groupContext(masterKey = masterKey) {
@@ -231,7 +231,7 @@ class SmsDatabaseTest_collapseJoinRequestEventsIfPossible {
    */
   @Test
   fun previousCollapseAndJoinRequestDoubleCollapse() {
-    val secondLatestMessage: MessageDatabase.InsertResult = sms.insertMessageInbox(
+    val secondLatestMessage: MessageTable.InsertResult = sms.insertMessageInbox(
       groupUpdateMessage(
         sender = alice,
         groupContext = groupContext(masterKey = masterKey) {
@@ -243,7 +243,7 @@ class SmsDatabaseTest_collapseJoinRequestEventsIfPossible {
       )
     ).get()
 
-    val latestMessage: MessageDatabase.InsertResult = sms.insertMessageInbox(
+    val latestMessage: MessageTable.InsertResult = sms.insertMessageInbox(
       groupUpdateMessage(
         sender = alice,
         groupContext = groupContext(masterKey = masterKey) {

app/src/androidTest/java/org/thoughtcrime/securesms/database/StorySendTableTest.kt

@@ -10,6 +10,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertTrue
+import org.junit.Assert.fail
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -22,7 +23,7 @@ import org.whispersystems.signalservice.api.push.ServiceId
 import java.util.UUID
 
 @RunWith(AndroidJUnit4::class)
-class StorySendsDatabaseTest {
+class StorySendTableTest {
 
   private val distributionId1 = DistributionId.from(UUID.randomUUID())
   private val distributionId2 = DistributionId.from(UUID.randomUUID())
@@ -45,7 +46,7 @@ class StorySendsDatabaseTest {
   private var messageId2: Long = 0
   private var messageId3: Long = 0
 
-  private lateinit var storySends: StorySendsDatabase
+  private lateinit var storySends: StorySendTable
 
   @Before
   fun setup() {
@@ -183,7 +184,7 @@ class StorySendsDatabaseTest {
   @Test
   fun getRemoteDeleteRecipients_overlapWithPreviousDeletes() {
     storySends.insert(messageId1, recipients1to10, 200, false, distributionId1)
-    SignalDatabase.mms.markAsRemoteDelete(messageId1)
+    SignalDatabase.messages.markAsRemoteDelete(messageId1)
 
     storySends.insert(messageId2, recipients6to15, 200, true, distributionId2)
 
@@ -280,19 +281,20 @@ class StorySendsDatabaseTest {
   fun givenTwoStoriesAndOneIsRemoteDeleted_whenIGetFullSentStorySyncManifestForStory2_thenIExpectNonNullResult() {
     storySends.insert(messageId1, recipients1to10, 200, false, distributionId1)
     storySends.insert(messageId2, recipients1to10, 200, true, distributionId2)
-    SignalDatabase.mms.markAsRemoteDelete(messageId1)
+    SignalDatabase.messages.markAsRemoteDelete(messageId1)
 
     val manifest = storySends.getFullSentStorySyncManifest(messageId2, 200)!!
 
     assertNotNull(manifest)
   }
 
+  /*
   @Test
   fun givenTwoStoriesAndOneIsRemoteDeleted_whenIGetRecipientIdsForManifestUpdate_thenIExpectOnlyRecipientsWithStory2() {
     storySends.insert(messageId1, recipients1to10, 200, false, distributionId1)
     storySends.insert(messageId1, recipients11to20, 200, false, distributionId1)
     storySends.insert(messageId2, recipients1to10, 200, true, distributionId2)
-    SignalDatabase.mms.markAsRemoteDelete(messageId1)
+    SignalDatabase.messages.markAsRemoteDelete(messageId1)
 
     val recipientIds = storySends.getRecipientIdsForManifestUpdate(200, messageId1)
 
@@ -304,7 +306,7 @@ class StorySendsDatabaseTest {
     storySends.insert(messageId1, recipients1to10, 200, false, distributionId1)
     storySends.insert(messageId2, recipients1to10, 200, true, distributionId2)
     storySends.insert(messageId2, recipients11to20, 200, true, distributionId2)
-    SignalDatabase.mms.markAsRemoteDelete(messageId1)
+    SignalDatabase.messages.markAsRemoteDelete(messageId1)
     val recipientIds = storySends.getRecipientIdsForManifestUpdate(200, messageId1)
 
     val results = storySends.getSentStorySyncManifestForUpdate(200, recipientIds)
@@ -317,14 +319,14 @@ class StorySendsDatabaseTest {
   fun givenTwoStoriesAndTheOneThatAllowedRepliesIsRemoteDeleted_whenIGetPartialSentStorySyncManifest_thenIExpectAllowRepliesToBeTrue() {
     storySends.insert(messageId1, recipients1to10, 200, false, distributionId1)
     storySends.insert(messageId2, recipients1to10, 200, true, distributionId2)
-    SignalDatabase.mms.markAsRemoteDelete(messageId2)
+    SignalDatabase.messages.markAsRemoteDelete(messageId2)
     val recipientIds = storySends.getRecipientIdsForManifestUpdate(200, messageId1)
 
     val results = storySends.getSentStorySyncManifestForUpdate(200, recipientIds)
 
     assertTrue(results.entries.all { it.allowedToReply })
   }
-
+   */
   @Test
   fun givenEmptyManifest_whenIApplyRemoteManifest_thenNothingChanges() {
     storySends.insert(messageId1, recipients1to10, 200, false, distributionId1)
@@ -354,8 +356,8 @@ class StorySendsDatabaseTest {
     assertEquals(expected, result)
   }
 
-  @Test
-  fun givenAManifest_whenIApplyRemoteManifestWithoutOneList_thenIExpectMessageToBeMarkedRemoteDeleted() {
+  @Test(expected = NoSuchMessageException::class)
+  fun givenAManifest_whenIApplyRemoteManifestWithoutOneList_thenIExpectMessageToBeDeleted() {
     val messageId4 = MmsHelper.insert(
       recipient = distributionListRecipient1,
       storyType = StoryType.STORY_WITHOUT_REPLIES,
@@ -375,7 +377,8 @@ class StorySendsDatabaseTest {
 
     storySends.applySentStoryManifest(remote, 200)
 
-    assertTrue(SignalDatabase.mms.getMessageRecord(messageId5).isRemoteDelete)
+    SignalDatabase.messages.getMessageRecord(messageId5)
+    fail("Expected messageId5 to no longer exist.")
   }
 
   @Test
@@ -399,7 +402,7 @@ class StorySendsDatabaseTest {
 
     storySends.applySentStoryManifest(remote, 200)
 
-    assertFalse(SignalDatabase.mms.getMessageRecord(messageId4).isRemoteDelete)
+    assertFalse(SignalDatabase.messages.getMessageRecord(messageId4).isRemoteDelete)
   }
 
   @Test

app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadTableTest_pinned.kt

@@ -6,13 +6,14 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 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 java.util.UUID
 
 @Suppress("ClassName")
-class ThreadDatabaseTest_pinned {
+class ThreadTableTest_pinned {
 
   @Rule
   @JvmField
@@ -33,10 +34,10 @@ class ThreadDatabaseTest_pinned {
     SignalDatabase.threads.pinConversations(listOf(threadId))
 
     // WHEN
-    SignalDatabase.mms.deleteMessage(messageId)
+    SignalDatabase.messages.deleteMessage(messageId)
 
     // THEN
-    val pinned = SignalDatabase.threads.pinnedThreadIds
+    val pinned = SignalDatabase.threads.getPinnedThreadIds()
     assertTrue(threadId in pinned)
   }
 
@@ -48,10 +49,10 @@ class ThreadDatabaseTest_pinned {
     SignalDatabase.threads.pinConversations(listOf(threadId))
 
     // WHEN
-    SignalDatabase.mms.deleteMessage(messageId)
+    SignalDatabase.messages.deleteMessage(messageId)
 
     // THEN
-    val unarchivedCount = SignalDatabase.threads.unarchivedConversationListCount
+    val unarchivedCount = SignalDatabase.threads.getUnarchivedConversationListCount(ConversationFilter.OFF)
     assertEquals(1, unarchivedCount)
   }
 
@@ -63,12 +64,12 @@ class ThreadDatabaseTest_pinned {
     SignalDatabase.threads.pinConversations(listOf(threadId))
 
     // WHEN
-    SignalDatabase.mms.deleteMessage(messageId)
+    SignalDatabase.messages.deleteMessage(messageId)
 
     // THEN
-    SignalDatabase.threads.getUnarchivedConversationList(true, 0, 1).use {
+    SignalDatabase.threads.getUnarchivedConversationList(ConversationFilter.OFF, true, 0, 1).use {
       it.moveToFirst()
-      assertEquals(threadId, CursorUtil.requireLong(it, ThreadDatabase.ID))
+      assertEquals(threadId, CursorUtil.requireLong(it, ThreadTable.ID))
     }
   }
 }

app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadTableTest_recents.kt

@@ -15,7 +15,7 @@ import java.util.UUID
 
 @Suppress("ClassName")
 @RunWith(AndroidJUnit4::class)
-class ThreadDatabaseTest_recents {
+class ThreadTableTest_recents {
 
   @Rule
   @JvmField
@@ -40,7 +40,7 @@ class ThreadDatabaseTest_recents {
     val results: MutableList<RecipientId> = SignalDatabase.threads.getRecentConversationList(10, false, false, false, false, false, false).use { cursor ->
       val ids = mutableListOf<RecipientId>()
       while (cursor.moveToNext()) {
-        ids.add(RecipientId.from(CursorUtil.requireLong(cursor, ThreadDatabase.RECIPIENT_ID)))
+        ids.add(RecipientId.from(CursorUtil.requireLong(cursor, ThreadTable.RECIPIENT_ID)))
       }
 
       ids

app/src/androidTest/java/org/thoughtcrime/securesms/database/UriAttachmentBuilder.kt

@@ -11,7 +11,7 @@ object UriAttachmentBuilder {
     id: Long,
     uri: Uri = Uri.parse("content://$id"),
     contentType: String,
-    transferState: Int = AttachmentDatabase.TRANSFER_PROGRESS_PENDING,
+    transferState: Int = AttachmentTable.TRANSFER_PROGRESS_PENDING,
     size: Long = 0L,
     fileName: String = "file$id",
     voiceNote: Boolean = false,
@@ -22,7 +22,7 @@ object UriAttachmentBuilder {
     stickerLocator: StickerLocator? = null,
     blurHash: BlurHash? = null,
     audioHash: AudioHash? = null,
-    transformProperties: AttachmentDatabase.TransformProperties? = null
+    transformProperties: AttachmentTable.TransformProperties? = null
   ): UriAttachment {
     return UriAttachment(
       uri,

app/src/androidTest/java/org/thoughtcrime/securesms/database/helpers/migration/MyStoryMigrationTest.kt

@@ -10,7 +10,7 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.signal.core.util.SqlUtil
-import org.thoughtcrime.securesms.database.DistributionListDatabase
+import org.thoughtcrime.securesms.database.DistributionListTables
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.DistributionListId
 import org.thoughtcrime.securesms.testing.SignalDatabaseRule
@@ -72,9 +72,9 @@ class MyStoryMigrationTest {
 
   private fun setMyStoryDistributionId(serializedId: String) {
     SignalDatabase.rawDatabase.update(
-      DistributionListDatabase.LIST_TABLE_NAME,
+      DistributionListTables.LIST_TABLE_NAME,
       contentValuesOf(
-        DistributionListDatabase.DISTRIBUTION_ID to serializedId
+        DistributionListTables.DISTRIBUTION_ID to serializedId
       ),
       "_id = ?",
       SqlUtil.buildArgs(DistributionListId.MY_STORY)
@@ -83,7 +83,7 @@ class MyStoryMigrationTest {
 
   private fun deleteMyStory() {
     SignalDatabase.rawDatabase.delete(
-      DistributionListDatabase.LIST_TABLE_NAME,
+      DistributionListTables.LIST_TABLE_NAME,
       "_id = ?",
       SqlUtil.buildArgs(DistributionListId.MY_STORY)
     )
@@ -91,9 +91,9 @@ class MyStoryMigrationTest {
 
   private fun assertValidMyStoryExists() {
     SignalDatabase.rawDatabase.query(
-      DistributionListDatabase.LIST_TABLE_NAME,
+      DistributionListTables.LIST_TABLE_NAME,
       SqlUtil.COUNT,
-      "_id = ? AND ${DistributionListDatabase.DISTRIBUTION_ID} = ?",
+      "_id = ? AND ${DistributionListTables.DISTRIBUTION_ID} = ?",
       SqlUtil.buildArgs(DistributionListId.MY_STORY, DistributionId.MY_STORY.toString()),
       null,
       null,

app/src/androidTest/java/org/thoughtcrime/securesms/dependencies/InstrumentationApplicationDependencyProvider.kt

@@ -13,6 +13,7 @@ import org.thoughtcrime.securesms.BuildConfig
 import org.thoughtcrime.securesms.KbsEnclave
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess
 import org.thoughtcrime.securesms.push.SignalServiceTrustStore
+import org.thoughtcrime.securesms.recipients.LiveRecipientCache
 import org.thoughtcrime.securesms.testing.Verb
 import org.thoughtcrime.securesms.testing.runSync
 import org.thoughtcrime.securesms.util.Base64
@@ -41,6 +42,7 @@ class InstrumentationApplicationDependencyProvider(application: Application, def
   private val uncensoredConfiguration: SignalServiceConfiguration
   private val serviceNetworkAccessMock: SignalServiceNetworkAccess
   private val keyBackupService: KeyBackupService
+  private val recipientCache: LiveRecipientCache
 
   init {
     runSync {
@@ -71,7 +73,8 @@ class InstrumentationApplicationDependencyProvider(application: Application, def
       emptyList(),
       Optional.of(SignalServiceNetworkAccess.DNS),
       Optional.empty(),
-      Base64.decode(BuildConfig.ZKGROUP_SERVER_PUBLIC_PARAMS)
+      Base64.decode(BuildConfig.ZKGROUP_SERVER_PUBLIC_PARAMS),
+      true
     )
 
     serviceNetworkAccessMock = mock {
@@ -81,6 +84,8 @@ class InstrumentationApplicationDependencyProvider(application: Application, def
     }
 
     keyBackupService = mock()
+
+    recipientCache = LiveRecipientCache(application) { r -> r.run() }
   }
 
   override fun provideSignalServiceNetworkAccess(): SignalServiceNetworkAccess {
@@ -91,6 +96,10 @@ class InstrumentationApplicationDependencyProvider(application: Application, def
     return keyBackupService
   }
 
+  override fun provideRecipientCache(): LiveRecipientCache {
+    return recipientCache
+  }
+
   companion object {
     lateinit var webServer: MockWebServer
       private set

app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessorTest.kt

@@ -0,0 +1,62 @@
+package org.thoughtcrime.securesms.messages
+
+import android.app.Application
+import androidx.test.core.app.ApplicationProvider
+import org.junit.Rule
+import org.thoughtcrime.securesms.messages.MessageContentProcessor.ExceptionMetadata
+import org.thoughtcrime.securesms.messages.MessageContentProcessor.MessageState
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+import org.thoughtcrime.securesms.testing.TestProtos
+import org.whispersystems.signalservice.api.messages.SignalServiceContent
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos
+import org.whispersystems.signalservice.internal.serialize.protos.SignalServiceContentProto
+
+abstract class MessageContentProcessorTest {
+
+  @get:Rule
+  val harness = SignalActivityRule()
+
+  protected fun MessageContentProcessor.doProcess(
+    messageState: MessageState = MessageState.DECRYPTED_OK,
+    content: SignalServiceContent,
+    exceptionMetadata: ExceptionMetadata = ExceptionMetadata("sender", 1),
+    timestamp: Long = 100L,
+    smsMessageId: Long = -1L
+  ) {
+    process(messageState, content, exceptionMetadata, timestamp, smsMessageId)
+  }
+
+  protected fun createNormalContentTestSubject(): MessageContentProcessor {
+    val context = ApplicationProvider.getApplicationContext<Application>()
+
+    return MessageContentProcessor.forNormalContent(context)
+  }
+
+  /**
+   * Creates a valid ServiceContentProto with a data message which can be built via
+   * `injectDataMessage`. This function is intended to be built on-top of for more
+   * specific scenario in subclasses.
+   *
+   * Example can be seen in __handleStoryMessageTest
+   */
+  protected fun createServiceContentWithDataMessage(
+    messageSender: Recipient = Recipient.resolved(harness.others.first()),
+    injectDataMessage: SignalServiceProtos.DataMessage.Builder.() -> Unit
+  ): SignalServiceContentProto {
+    return TestProtos.build {
+      serviceContent(
+        localAddress = address(uuid = harness.self.requireServiceId().uuid()).build(),
+        metadata = metadata(
+          address = address(uuid = messageSender.requireServiceId().uuid()).build()
+        ).build()
+      ).apply {
+        content = content().apply {
+          dataMessage = dataMessage().apply {
+            injectDataMessage()
+          }.build()
+        }.build()
+      }.build()
+    }
+  }
+}

app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessor__handleStoryMessageTest.kt

@@ -0,0 +1,181 @@
+package org.thoughtcrime.securesms.messages
+
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.signal.core.util.requireLong
+import org.signal.libsignal.zkgroup.groups.GroupMasterKey
+import org.signal.storageservice.protos.groups.Member
+import org.signal.storageservice.protos.groups.local.DecryptedGroup
+import org.signal.storageservice.protos.groups.local.DecryptedMember
+import org.thoughtcrime.securesms.database.MessageTable
+import org.thoughtcrime.securesms.database.MmsHelper
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.DistributionListId
+import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord
+import org.thoughtcrime.securesms.database.model.ParentStoryId
+import org.thoughtcrime.securesms.database.model.StoryType
+import org.thoughtcrime.securesms.mms.IncomingMediaMessage
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.testing.TestProtos
+import org.whispersystems.signalservice.api.messages.SignalServiceContent
+import org.whispersystems.signalservice.api.push.DistributionId
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.DataMessage
+import org.whispersystems.signalservice.internal.serialize.protos.SignalServiceContentProto
+import kotlin.random.Random
+
+@Suppress("ClassName")
+class MessageContentProcessor__handleStoryMessageTest : MessageContentProcessorTest() {
+
+  @Before
+  fun setUp() {
+    SignalDatabase.messages.deleteAllThreads()
+  }
+
+  @After
+  fun tearDown() {
+    SignalDatabase.messages.deleteAllThreads()
+  }
+
+  @Test
+  fun givenContentWithADirectStoryReplyWhenIProcessThenIInsertAReplyInTheCorrectThread() {
+    val sender = Recipient.resolved(harness.others.first())
+    val senderThreadId = SignalDatabase.threads.getOrCreateThreadIdFor(sender)
+    val myStory = Recipient.resolved(SignalDatabase.distributionLists.getRecipientId(DistributionListId.MY_STORY)!!)
+    val myStoryThread = SignalDatabase.threads.getOrCreateThreadIdFor(myStory)
+    val expectedSentTime = 200L
+    val storyMessageId = MmsHelper.insert(
+      sentTimeMillis = expectedSentTime,
+      recipient = myStory,
+      storyType = StoryType.STORY_WITH_REPLIES,
+      threadId = myStoryThread
+    )
+
+    SignalDatabase.storySends.insert(
+      messageId = storyMessageId,
+      recipientIds = listOf(sender.id),
+      sentTimestamp = expectedSentTime,
+      allowsReplies = true,
+      distributionId = DistributionId.MY_STORY
+    )
+
+    val expectedBody = "Hello!"
+
+    val storyContent: SignalServiceContentProto = createServiceContentWithStoryContext(
+      messageSender = sender,
+      storyAuthor = harness.self,
+      storySentTimestamp = expectedSentTime
+    ) {
+      body = expectedBody
+    }
+
+    runTestWithContent(contentProto = storyContent)
+
+    val replyId = SignalDatabase.messages.getConversation(senderThreadId, 0, 1).use {
+      it.moveToFirst()
+      it.requireLong(MessageTable.ID)
+    }
+
+    val replyRecord = SignalDatabase.messages.getMessageRecord(replyId) as MediaMmsMessageRecord
+    assertEquals(ParentStoryId.DirectReply(storyMessageId).serialize(), replyRecord.parentStoryId!!.serialize())
+    assertEquals(expectedBody, replyRecord.body)
+
+    SignalDatabase.messages.deleteAllThreads()
+  }
+
+  @Test
+  fun givenContentWithAGroupStoryReplyWhenIProcessThenIInsertAReplyToTheCorrectStory() {
+    val sender = Recipient.resolved(harness.others[0])
+    val groupMasterKey = GroupMasterKey(Random.nextBytes(GroupMasterKey.SIZE))
+    val decryptedGroupState = DecryptedGroup.newBuilder()
+      .addAllMembers(
+        listOf(
+          DecryptedMember.newBuilder()
+            .setUuid(harness.self.requireServiceId().toByteString())
+            .setJoinedAtRevision(0)
+            .setRole(Member.Role.DEFAULT)
+            .build(),
+          DecryptedMember.newBuilder()
+            .setUuid(sender.requireServiceId().toByteString())
+            .setJoinedAtRevision(0)
+            .setRole(Member.Role.DEFAULT)
+            .build()
+        )
+      )
+      .setRevision(0)
+      .build()
+
+    val group = SignalDatabase.groups.create(
+      groupMasterKey,
+      decryptedGroupState
+    )
+
+    val groupRecipient = Recipient.externalGroupExact(group)
+    val threadForGroup = SignalDatabase.threads.getOrCreateThreadIdFor(groupRecipient)
+
+    val insertResult = MmsHelper.insert(
+      message = IncomingMediaMessage(
+        from = sender.id,
+        sentTimeMillis = 100L,
+        serverTimeMillis = 101L,
+        receivedTimeMillis = 102L,
+        storyType = StoryType.STORY_WITH_REPLIES
+      ),
+      threadId = threadForGroup
+    )
+
+    val expectedBody = "Hello, World!"
+    val storyContent: SignalServiceContentProto = createServiceContentWithStoryContext(
+      messageSender = sender,
+      storyAuthor = sender,
+      storySentTimestamp = 100L
+    ) {
+      groupV2 = TestProtos.build { groupContextV2(masterKeyBytes = groupMasterKey.serialize()).build() }
+      body = expectedBody
+    }
+
+    runTestWithContent(storyContent)
+
+    val replyId = SignalDatabase.messages.getStoryReplies(insertResult.get().messageId).use { cursor ->
+      assertEquals(1, cursor.count)
+      cursor.moveToFirst()
+      cursor.requireLong(MessageTable.ID)
+    }
+
+    val replyRecord = SignalDatabase.messages.getMessageRecord(replyId) as MediaMmsMessageRecord
+    assertEquals(ParentStoryId.GroupReply(insertResult.get().messageId).serialize(), replyRecord.parentStoryId?.serialize())
+    assertEquals(threadForGroup, replyRecord.threadId)
+    assertEquals(expectedBody, replyRecord.body)
+
+    SignalDatabase.messages.deleteGroupStoryReplies(insertResult.get().messageId)
+    SignalDatabase.messages.deleteAllThreads()
+  }
+
+  /**
+   * Creates a ServiceContent proto with a StoryContext, and then
+   * uses `injectDataMessage` to fill in the data message object.
+   */
+  private fun createServiceContentWithStoryContext(
+    messageSender: Recipient,
+    storyAuthor: Recipient,
+    storySentTimestamp: Long,
+    injectDataMessage: DataMessage.Builder.() -> Unit
+  ): SignalServiceContentProto {
+    return createServiceContentWithDataMessage(messageSender) {
+      storyContext = TestProtos.build {
+        storyContext(
+          sentTimestamp = storySentTimestamp,
+          authorUuid = storyAuthor.requireServiceId().toString()
+        ).build()
+      }
+      injectDataMessage()
+    }
+  }
+
+  private fun runTestWithContent(contentProto: SignalServiceContentProto) {
+    val content = SignalServiceContent.createFromProto(contentProto)
+    val testSubject = createNormalContentTestSubject()
+    testSubject.doProcess(content = content!!)
+  }
+}

app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessor__handleTextMessageTest.kt

@@ -0,0 +1,33 @@
+package org.thoughtcrime.securesms.messages
+
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.whispersystems.signalservice.api.messages.SignalServiceContent
+import org.whispersystems.signalservice.internal.serialize.protos.SignalServiceContentProto
+
+@Suppress("ClassName")
+class MessageContentProcessor__handleTextMessageTest : MessageContentProcessorTest() {
+  @Test
+  fun givenContentWithATextMessageWhenIProcessThenIInsertTheTextMessage() {
+    val testSubject: MessageContentProcessor = createNormalContentTestSubject()
+    val expectedBody = "Hello, World!"
+    val contentProto: SignalServiceContentProto = createServiceContentWithDataMessage {
+      body = expectedBody
+    }
+
+    val content = SignalServiceContent.createFromProto(contentProto)
+
+    // WHEN
+    testSubject.doProcess(content = content!!)
+
+    // THEN
+    val record = SignalDatabase.messages.getMessageRecord(1)
+    val threadSize = SignalDatabase.messages.getMessageCountForThread(record.threadId)
+    assertEquals(1, threadSize)
+
+    assertTrue(record.isSecure)
+    assertEquals(expectedBody, record.body)
+  }
+}

app/src/androidTest/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditFragmentTest.kt

@@ -21,6 +21,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.reactivex.rxjava3.schedulers.TestScheduler
 import okhttp3.mockwebserver.MockResponse
 import org.junit.After
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -72,6 +73,7 @@ class UsernameEditFragmentTest {
     onView(withContentDescription(R.string.load_more_header__loading)).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.GONE)))
   }
 
+  @Ignore("Flakey espresso test.")
   @Test
   fun testUsernameCreationOutsideOfRegistration() {
     val scenario = createScenario()
@@ -89,6 +91,7 @@ class UsernameEditFragmentTest {
     onView(withContentDescription(R.string.load_more_header__loading)).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.GONE)))
   }
 
+  @Ignore("Flakey espresso test.")
   @Test
   fun testNicknameUpdateHappyPath() {
     val nickname = "Spiderman"

app/src/androidTest/java/org/thoughtcrime/securesms/safety/SafetyNumberBottomSheetRepositoryTest.kt

@@ -27,13 +27,13 @@ class SafetyNumberBottomSheetRepositoryTest {
   @Test
   fun givenIOnlyHave1to1Destinations_whenIGetBuckets_thenIOnlyHaveContactsBucketContainingAllRecipients() {
     val recipients = harness.others
-    val destinations = harness.others.map { ContactSearchKey.RecipientSearchKey.KnownRecipient(it) }
+    val destinations = harness.others.map { ContactSearchKey.RecipientSearchKey(it, false) }
 
     val result = subjectUnderTest.getBuckets(recipients, destinations).test()
 
     testScheduler.triggerActions()
 
-    result.assertValueAt(1) { map ->
+    result.assertValueAt(0) { map ->
       assertMatch(map, mapOf(SafetyNumberBucket.ContactsBucket to harness.others))
     }
   }
@@ -42,7 +42,7 @@ class SafetyNumberBottomSheetRepositoryTest {
   fun givenIOnlyHaveASingle1to1Destination_whenIGetBuckets_thenIOnlyHaveContactsBucketContainingAllRecipients() {
     // GIVEN
     val recipients = harness.others
-    val destination = harness.others.take(1).map { ContactSearchKey.RecipientSearchKey.KnownRecipient(it) }
+    val destination = harness.others.take(1).map { ContactSearchKey.RecipientSearchKey(it, false) }
 
     // WHEN
     val result = subjectUnderTest.getBuckets(recipients, destination).test(1)
@@ -59,7 +59,7 @@ class SafetyNumberBottomSheetRepositoryTest {
     // GIVEN
     val distributionListMembers = harness.others.take(5)
     val distributionList = SignalDatabase.distributionLists.createList("ListA", distributionListMembers)!!
-    val destinationKey = ContactSearchKey.RecipientSearchKey.Story(SignalDatabase.distributionLists.getRecipientId(distributionList)!!)
+    val destinationKey = ContactSearchKey.RecipientSearchKey(SignalDatabase.distributionLists.getRecipientId(distributionList)!!, true)
 
     // WHEN
     val result = subjectUnderTest.getBuckets(harness.others, listOf(destinationKey)).test(1)
@@ -82,7 +82,7 @@ class SafetyNumberBottomSheetRepositoryTest {
     val distributionListMembers = harness.others.take(5)
     val toRemove = distributionListMembers.last()
     val distributionList = SignalDatabase.distributionLists.createList("ListA", distributionListMembers)!!
-    val destinationKey = ContactSearchKey.RecipientSearchKey.Story(SignalDatabase.distributionLists.getRecipientId(distributionList)!!)
+    val destinationKey = ContactSearchKey.RecipientSearchKey(SignalDatabase.distributionLists.getRecipientId(distributionList)!!, true)
     val testSubscriber = subjectUnderTest.getBuckets(distributionListMembers, listOf(destinationKey)).test(2)
     testScheduler.triggerActions()
 
@@ -108,7 +108,7 @@ class SafetyNumberBottomSheetRepositoryTest {
     // GIVEN
     val distributionListMembers = harness.others.take(5)
     val distributionList = SignalDatabase.distributionLists.createList("ListA", distributionListMembers)!!
-    val destinationKey = ContactSearchKey.RecipientSearchKey.Story(SignalDatabase.distributionLists.getRecipientId(distributionList)!!)
+    val destinationKey = ContactSearchKey.RecipientSearchKey(SignalDatabase.distributionLists.getRecipientId(distributionList)!!, true)
     val testSubscriber = subjectUnderTest.getBuckets(distributionListMembers, listOf(destinationKey)).test(2)
     testScheduler.triggerActions()
 

app/src/androidTest/java/org/thoughtcrime/securesms/testing/MockProvider.kt

@@ -81,7 +81,7 @@ object MockProvider {
     }
 
     kbsRepository.stub {
-      on { getToken(any() as String) } doReturn Single.just(ServiceResponse.forResult(tokenData, 200, ""))
+      on { getToken(any() as? String) } doReturn Single.just(ServiceResponse.forResult(tokenData, 200, ""))
     }
 
     val session: KeyBackupService.RestoreSession = object : KeyBackupService.RestoreSession {

app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalActivityRule.kt

@@ -15,7 +15,7 @@ import org.signal.libsignal.protocol.SignalProtocolAddress
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
-import org.thoughtcrime.securesms.database.IdentityDatabase
+import org.thoughtcrime.securesms.database.IdentityTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
@@ -27,6 +27,7 @@ import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.registration.RegistrationData
 import org.thoughtcrime.securesms.registration.RegistrationRepository
 import org.thoughtcrime.securesms.registration.RegistrationUtil
+import org.thoughtcrime.securesms.registration.VerifyResponse
 import org.thoughtcrime.securesms.util.Util
 import org.whispersystems.signalservice.api.profiles.SignalServiceProfile
 import org.whispersystems.signalservice.api.push.ACI
@@ -74,7 +75,7 @@ class SignalActivityRule(private val othersCount: Int = 4) : ExternalResource()
     val registrationRepository = RegistrationRepository(application)
 
     InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(Put("/v2/keys") { MockResponse().success() })
-    val response: ServiceResponse<VerifyAccountResponse> = registrationRepository.registerAccountWithoutRegistrationLock(
+    val response: ServiceResponse<VerifyResponse> = registrationRepository.registerAccount(
       RegistrationData(
         code = "123123",
         e164 = "+15555550101",
@@ -84,7 +85,7 @@ class SignalActivityRule(private val othersCount: Int = 4) : ExternalResource()
         fcmToken = null,
         pniRegistrationId = registrationRepository.pniRegistrationId
       ),
-      VerifyAccountResponse(UUID.randomUUID().toString(), UUID.randomUUID().toString(), false)
+      VerifyResponse(VerifyAccountResponse(UUID.randomUUID().toString(), UUID.randomUUID().toString(), false), null, null)
     ).blockingGet()
 
     ServiceResponseProcessor.DefaultProcessor(response).resultOrThrow
@@ -108,7 +109,7 @@ class SignalActivityRule(private val othersCount: Int = 4) : ExternalResource()
       val recipientId = RecipientId.from(SignalServiceAddress(aci, "+15555551%03d".format(i)))
       SignalDatabase.recipients.setProfileName(recipientId, ProfileName.fromParts("Buddy", "#$i"))
       SignalDatabase.recipients.setProfileKeyIfAbsent(recipientId, ProfileKeyUtil.createNew())
-      SignalDatabase.recipients.setCapabilities(recipientId, SignalServiceProfile.Capabilities(true, true, true, true, true, true, true, true))
+      SignalDatabase.recipients.setCapabilities(recipientId, SignalServiceProfile.Capabilities(true, true, true, true, true, true, true, true, true))
       SignalDatabase.recipients.setProfileSharing(recipientId, true)
       SignalDatabase.recipients.markRegistered(recipientId, aci)
       ApplicationDependencies.getProtocolStore().aci().saveIdentity(SignalProtocolAddress(aci.toString(), 0), IdentityKeyUtil.generateIdentityKeyPair().publicKey)
@@ -130,7 +131,7 @@ class SignalActivityRule(private val othersCount: Int = 4) : ExternalResource()
     return ApplicationDependencies.getProtocolStore().aci().identities().getIdentity(SignalProtocolAddress(recipient.requireServiceId().toString(), 0))
   }
 
-  fun setVerified(recipient: Recipient, status: IdentityDatabase.VerifiedStatus) {
-    ApplicationDependencies.getProtocolStore().aci().identities().setVerified(recipient.id, getIdentity(recipient), IdentityDatabase.VerifiedStatus.VERIFIED)
+  fun setVerified(recipient: Recipient, status: IdentityTable.VerifiedStatus) {
+    ApplicationDependencies.getProtocolStore().aci().identities().setVerified(recipient.id, getIdentity(recipient), IdentityTable.VerifiedStatus.VERIFIED)
   }
 }

app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalDatabaseRule.kt

@@ -34,7 +34,7 @@ class SignalDatabaseRule(
 
   private fun deleteAllThreads() {
     if (deleteAllThreadsOnEachRun) {
-      SignalDatabase.mms.deleteAllThreads()
+      SignalDatabase.messages.deleteAllThreads()
     }
   }
 }

app/src/androidTest/java/org/thoughtcrime/securesms/testing/TestProtos.kt

@@ -0,0 +1,70 @@
+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.internal.push.SignalServiceProtos
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.DataMessage
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.GroupContextV2
+import org.whispersystems.signalservice.internal.serialize.protos.AddressProto
+import org.whispersystems.signalservice.internal.serialize.protos.MetadataProto
+import org.whispersystems.signalservice.internal.serialize.protos.SignalServiceContentProto
+import java.util.UUID
+import kotlin.random.Random
+
+class TestProtos private constructor() {
+  fun address(
+    uuid: UUID = UUID.randomUUID()
+  ): AddressProto.Builder {
+    return AddressProto.newBuilder()
+      .setUuid(ServiceId.from(uuid).toByteString())
+  }
+
+  fun metadata(
+    address: AddressProto = address().build(),
+  ): MetadataProto.Builder {
+    return MetadataProto.newBuilder()
+      .setAddress(address)
+  }
+
+  fun groupContextV2(
+    revision: Int = 0,
+    masterKeyBytes: ByteArray = Random.Default.nextBytes(GroupMasterKey.SIZE)
+  ): GroupContextV2.Builder {
+    return GroupContextV2.newBuilder()
+      .setRevision(revision)
+      .setMasterKey(ByteString.copyFrom(masterKeyBytes))
+  }
+
+  fun storyContext(
+    sentTimestamp: Long = Random.nextLong(),
+    authorUuid: String = UUID.randomUUID().toString()
+  ): DataMessage.StoryContext.Builder {
+    return DataMessage.StoryContext.newBuilder()
+      .setAuthorUuid(authorUuid)
+      .setSentTimestamp(sentTimestamp)
+  }
+
+  fun dataMessage(): DataMessage.Builder {
+    return DataMessage.newBuilder()
+  }
+
+  fun content(): SignalServiceProtos.Content.Builder {
+    return SignalServiceProtos.Content.newBuilder()
+  }
+
+  fun serviceContent(
+    localAddress: AddressProto = address().build(),
+    metadata: MetadataProto = metadata().build()
+  ): SignalServiceContentProto.Builder {
+    return SignalServiceContentProto.newBuilder()
+      .setLocalAddress(localAddress)
+      .setMetadata(metadata)
+  }
+
+  companion object {
+    fun <T> build(buildFn: TestProtos.() -> T): T {
+      return TestProtos().buildFn()
+    }
+  }
+}

app/src/androidTest/java/org/thoughtcrime/securesms/util/FeatureFlagsAccessor.java

@@ -0,0 +1,11 @@
+package org.thoughtcrime.securesms.util;
+
+/**
+ * A class that allows us to inject feature flags during tests.
+ */
+public final class FeatureFlagsAccessor {
+
+  public static void forceValue(String key, Object value) {
+    FeatureFlags.FORCED_VALUES.put(FeatureFlags.PHONE_NUMBER_PRIVACY, true);
+  }
+}

app/src/main/AndroidManifest.xml

@@ -98,9 +98,10 @@
                  android:icon="@mipmap/ic_launcher"
                  android:label="@string/app_name"
                  android:supportsRtl="true"
-                 tools:replace="android:allowBackup"
                  android:resizeableActivity="true"
-                 android:allowBackup="false"
+                 android:fullBackupOnly="false"
+                 android:allowBackup="true"
+                 android:backupAgent=".absbackup.SignalBackupAgent"
                  android:theme="@style/TextSecure.LightTheme"
                  android:largeHeap="true">
 
@@ -332,11 +333,6 @@
               android:theme="@style/Signal.DayNight.NoActionBar"
               android:windowSoftInputMode="adjustResize"/>
 
-    <activity android:name=".DatabaseMigrationActivity"
-              android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar"
-              android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
     <activity android:name=".migrations.ApplicationMigrationActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:launchMode="singleTask"
@@ -696,9 +692,12 @@
               android:screenOrientation="portrait"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
+    <activity android:name=".components.settings.app.subscription.donate.DonateToSignalActivity"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
     <service android:enabled="true" android:name=".exporter.SignalSmsExportService" android:foregroundServiceType="dataSync" />
     <service android:enabled="true" android:name=".service.webrtc.WebRtcCallService" android:foregroundServiceType="camera|microphone"/>
-    <service android:enabled="true" android:name=".service.ApplicationMigrationService"/>
     <service android:enabled="true" android:exported="false" android:name=".service.KeyCachingService"/>
     <service android:enabled="true" android:name=".messages.IncomingMessageObserver$ForegroundService"/>
     <service android:name=".service.webrtc.AndroidCallConnectionService"
@@ -816,6 +815,8 @@
 
     <receiver android:name=".revealable.ViewOnceMessageManager$ViewOnceAlarm" />
 
+    <receiver android:name=".service.ScheduledMessageManager$ScheduledMessagesAlarm" />
+
     <receiver android:name=".service.PendingRetryReceiptManager$PendingRetryReceiptAlarm" />
 
     <receiver android:name=".service.TrimThreadsByDateManager$TrimThreadsByDateAlarm" />
@@ -884,7 +885,7 @@
         </intent-filter>
     </receiver>
 
-    <receiver android:name="org.thoughtcrime.securesms.jobs.ForegroundUtil$Receiver" android:exported="false" />
+    <receiver android:name="org.thoughtcrime.securesms.jobs.ForegroundServiceUtil$Receiver" android:exported="false" />
 
     <receiver android:name=".service.PersistentConnectionBootListener" android:exported="false">
         <intent-filter>

app/src/main/java/androidx/documentfile/provider/DocumentFileHelper.java

@@ -4,8 +4,6 @@ import android.content.Context;
 import android.net.Uri;
 import android.provider.DocumentsContract;
 
-import androidx.annotation.RequiresApi;
-
 import org.signal.core.util.logging.Log;
 
 /**
@@ -22,7 +20,6 @@ public class DocumentFileHelper {
    *
    * @return true if rename successful
    */
-  @RequiresApi(21)
   public static boolean renameTo(Context context, DocumentFile documentFile, String displayName) {
     if (documentFile instanceof TreeDocumentFile) {
       Log.d(TAG, "Renaming document directly");

app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.java

@@ -1,26 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import org.thoughtcrime.securesms.stories.Stories;
-import org.thoughtcrime.securesms.util.FeatureFlags;
-import org.whispersystems.signalservice.api.account.AccountAttributes;
-
-public final class AppCapabilities {
-
-  private AppCapabilities() {
-  }
-
-  private static final boolean UUID_CAPABLE        = false;
-  private static final boolean GV2_CAPABLE         = true;
-  private static final boolean GV1_MIGRATION       = true;
-  private static final boolean ANNOUNCEMENT_GROUPS = true;
-  private static final boolean SENDER_KEY          = true;
-  private static final boolean CHANGE_NUMBER       = true;
-
-  /**
-   * @param storageCapable Whether or not the user can use storage service. This is another way of
-   *                       asking if the user has set a Signal PIN or not.
-   */
-  public static AccountAttributes.Capabilities getCapabilities(boolean storageCapable) {
-    return new AccountAttributes.Capabilities(UUID_CAPABLE, GV2_CAPABLE, storageCapable, GV1_MIGRATION, SENDER_KEY, ANNOUNCEMENT_GROUPS, CHANGE_NUMBER, Stories.isFeatureFlagEnabled(), FeatureFlags.giftBadgeReceiveSupport(), FeatureFlags.phoneNumberPrivacy());
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.kt

@@ -0,0 +1,27 @@
+package org.thoughtcrime.securesms
+
+import org.thoughtcrime.securesms.util.FeatureFlags
+import org.whispersystems.signalservice.api.account.AccountAttributes
+
+object AppCapabilities {
+  /**
+   * @param storageCapable Whether or not the user can use storage service. This is another way of
+   * asking if the user has set a Signal PIN or not.
+   */
+  @JvmStatic
+  fun getCapabilities(storageCapable: Boolean): AccountAttributes.Capabilities {
+    return AccountAttributes.Capabilities(
+      isUuid = false,
+      isGv2 = true,
+      isStorage = storageCapable,
+      isGv1Migration = true,
+      isSenderKey = true,
+      isAnnouncementGroup = true,
+      isChangeNumber = true,
+      isStories = true,
+      isGiftBadges = true,
+      isPnp = FeatureFlags.phoneNumberPrivacy(),
+      paymentActivation = true
+    )
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java

@@ -16,6 +16,7 @@
  */
 package org.thoughtcrime.securesms;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Build;
 
@@ -35,6 +36,8 @@ import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.AndroidLogger;
 import org.signal.core.util.logging.Log;
 import org.signal.core.util.tracing.Tracer;
+import org.signal.donations.GooglePayApi;
+import org.signal.donations.StripeApi;
 import org.signal.glide.SignalGlideCodecs;
 import org.signal.libsignal.protocol.logging.SignalProtocolLoggerProvider;
 import org.signal.ringrtc.CallManager;
@@ -89,6 +92,7 @@ import org.thoughtcrime.securesms.storage.StorageSyncHelper;
 import org.thoughtcrime.securesms.util.AppForegroundObserver;
 import org.thoughtcrime.securesms.util.AppStartup;
 import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.Environment;
 import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.SignalLocalMetrics;
 import org.thoughtcrime.securesms.util.SignalUncaughtExceptionHandler;
@@ -100,8 +104,11 @@ import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWra
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
 import java.security.Security;
+import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 
+import io.reactivex.rxjava3.core.CompletableObserver;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException;
 import io.reactivex.rxjava3.exceptions.UndeliverableException;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -155,7 +162,6 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                             .addBlocking("rx-init", this::initializeRx)
                             .addBlocking("event-bus", () -> EventBus.builder().logNoSubscriberMessages(false).installDefaultEventBus())
                             .addBlocking("app-dependencies", this::initializeAppDependencies)
-                            .addBlocking("notification-channels", () -> NotificationChannels.create(this))
                             .addBlocking("first-launch", this::initializeFirstEverAppLaunch)
                             .addBlocking("app-migrations", this::initializeApplicationMigrations)
                             .addBlocking("ring-rtc", this::initializeRingRtc)
@@ -163,11 +169,6 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                             .addBlocking("lifecycle-observer", () -> ApplicationDependencies.getAppForegroundObserver().addListener(this))
                             .addBlocking("message-retriever", this::initializeMessageRetrieval)
                             .addBlocking("dynamic-theme", () -> DynamicTheme.setDefaultDayNightMode(this))
-                            .addBlocking("vector-compat", () -> {
-                              if (Build.VERSION.SDK_INT < 21) {
-                                AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
-                              }
-                            })
                             .addBlocking("proxy-init", () -> {
                               if (SignalStore.proxy().isProxyEnabled()) {
                                 Log.w(TAG, "Proxy detected. Enabling Conscrypt.setUseEngineSocketByDefault()");
@@ -177,9 +178,11 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                             .addBlocking("blob-provider", this::initializeBlobProvider)
                             .addBlocking("feature-flags", FeatureFlags::init)
                             .addBlocking("glide", () -> SignalGlideModule.setRegisterGlideComponents(new SignalGlideComponents()))
+                            .addNonBlocking(this::checkIsGooglePayReady)
                             .addNonBlocking(this::cleanAvatarStorage)
                             .addNonBlocking(this::initializeRevealableMessageManager)
                             .addNonBlocking(this::initializePendingRetryReceiptManager)
+                            .addNonBlocking(this::initializeScheduledMessageManager)
                             .addNonBlocking(this::initializeFcmCheck)
                             .addNonBlocking(PreKeysSyncJob::enqueueIfNeeded)
                             .addNonBlocking(this::initializePeriodicTasks)
@@ -208,6 +211,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                             .addPostRender(GroupV2UpdateSelfProfileKeyJob::enqueueForGroupsIfNecessary)
                             .addPostRender(StoryOnboardingDownloadJob.Companion::enqueueIfNeeded)
                             .addPostRender(PnpInitializeDevicesJob::enqueueIfNecessary)
+                            .addPostRender(() -> ApplicationDependencies.getExoPlayerPool().getPoolStats().getMaxUnreserved())
                             .execute();
 
     Log.d(TAG, "onCreate() took " + (System.currentTimeMillis() - startTime) + " ms");
@@ -387,6 +391,10 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
     ApplicationDependencies.getPendingRetryReceiptManager().scheduleIfNecessary();
   }
 
+  private void initializeScheduledMessageManager() {
+    ApplicationDependencies.getScheduledMessageManager().scheduleIfNecessary();
+  }
+
   private void initializeTrimThreadsByDateManager() {
     KeepMessagesDuration keepMessagesDuration = SignalStore.settings().getKeepMessagesDuration();
     if (keepMessagesDuration != KeepMessagesDuration.FOREVER) {
@@ -408,7 +416,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
 
   private void initializeRingRtc() {
     try {
-      CallManager.initialize(this, new RingRtcLogger());
+      CallManager.initialize(this, new RingRtcLogger(), Collections.emptyMap());
     } catch (UnsatisfiedLinkError e) {
       throw new AssertionError("Unable to load ringrtc library", e);
     }
@@ -460,6 +468,18 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
     AvatarPickerStorage.cleanOrphans(this);
   }
 
+  @SuppressLint("CheckResult")
+  private void checkIsGooglePayReady() {
+    GooglePayApi.queryIsReadyToPay(
+        this,
+        new StripeApi.Gateway(Environment.Donations.getStripeConfiguration()),
+        Environment.Donations.getGooglePayConfiguration()
+    ).subscribe(
+        /* onComplete = */ () -> SignalStore.donationsValues().setGooglePayReady(true),
+        /* onError    = */ t -> SignalStore.donationsValues().setGooglePayReady(false)
+    );
+  }
+
   @WorkerThread
   private void initializeCleanup() {
     int deleted = SignalDatabase.attachments().deleteAbandonedPreuploadedAttachments();

app/src/main/java/org/thoughtcrime/securesms/AvatarPreviewActivity.java

@@ -72,12 +72,10 @@ public final class AvatarPreviewActivity extends PassphraseRequiredActivity {
     setTheme(R.style.TextSecure_MediaPreview);
     setContentView(R.layout.contact_photo_preview_activity);
 
-    if (Build.VERSION.SDK_INT >= 21) {
-      postponeEnterTransition();
-      TransitionInflater inflater = TransitionInflater.from(this);
-      getWindow().setSharedElementEnterTransition(inflater.inflateTransition(R.transition.full_screen_avatar_image_enter_transition_set));
-      getWindow().setSharedElementReturnTransition(inflater.inflateTransition(R.transition.full_screen_avatar_image_return_transition_set));
-    }
+    postponeEnterTransition();
+    TransitionInflater inflater = TransitionInflater.from(this);
+    getWindow().setSharedElementEnterTransition(inflater.inflateTransition(R.transition.full_screen_avatar_image_enter_transition_set));
+    getWindow().setSharedElementReturnTransition(inflater.inflateTransition(R.transition.full_screen_avatar_image_return_transition_set));
 
     Toolbar       toolbar = findViewById(R.id.toolbar);
     EmojiTextView title   = findViewById(R.id.title);
@@ -122,9 +120,7 @@ public final class AvatarPreviewActivity extends PassphraseRequiredActivity {
                 @Override
                 public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition<? super Bitmap> transition) {
                   avatar.setImageDrawable(RoundedBitmapDrawableFactory.create(resources, resource));
-                  if (Build.VERSION.SDK_INT >= 21) {
-                    startPostponedEnterTransition();
-                  }
+                  startPostponedEnterTransition();
                 }
 
                 @Override

app/src/main/java/org/thoughtcrime/securesms/BaseActivity.java

@@ -19,6 +19,7 @@ import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.util.AppStartup;
 import org.thoughtcrime.securesms.util.ConfigurationUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.WindowUtil;
 import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
 
 import java.util.Objects;
@@ -42,7 +43,7 @@ public abstract class BaseActivity extends AppCompatActivity {
   @Override
   protected void onResume() {
     super.onResume();
-    initializeScreenshotSecurity();
+    WindowUtil.initializeScreenshotSecurity(this, getWindow());
   }
 
   @Override
@@ -64,14 +65,6 @@ public abstract class BaseActivity extends AppCompatActivity {
     super.onDestroy();
   }
 
-  private void initializeScreenshotSecurity() {
-    if (TextSecurePreferences.isScreenSecurityEnabled(this)) {
-      getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
-    } else {
-      getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
-    }
-  }
-
   protected void startActivitySceneTransition(Intent intent, View sharedView, String transitionName) {
     Bundle bundle = ActivityOptionsCompat.makeSceneTransitionAnimation(this, sharedView, transitionName)
                                          .toBundle();

app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java

@@ -104,6 +104,9 @@ public interface BindableConversationItem extends Unbindable, GiphyMp4Playable,
     void onBlockJoinRequest(@NonNull Recipient recipient);
     void onRecipientNameClicked(@NonNull RecipientId target);
     void onInviteToSignalClicked();
+    void onActivatePaymentsClicked();
+    void onSendPaymentClicked(@NonNull RecipientId recipientId);
+    void onScheduledIndicatorClicked(@NonNull View view, @NonNull MessageRecord messageRecord);
 
     /** @return true if handled, false if you want to let the normal url handling continue */
     boolean onUrlClicked(@NonNull String url);

app/src/main/java/org/thoughtcrime/securesms/BiometricDeviceAuthentication.kt

@@ -5,7 +5,6 @@ import android.content.Context
 import android.content.Intent
 import android.os.Build
 import androidx.activity.result.contract.ActivityResultContract
-import androidx.annotation.RequiresApi
 import androidx.biometric.BiometricManager
 import androidx.biometric.BiometricPrompt
 import androidx.biometric.BiometricPrompt.PromptInfo
@@ -44,7 +43,7 @@ class BiometricDeviceAuthentication(
         Log.i(TAG, "Skipping show system biometric or device lock dialog unless forced")
       }
       true
-    } else if (Build.VERSION.SDK_INT >= 21) {
+    } else {
       if (force) {
         Log.i(TAG, "firing intent...")
         showConfirmDeviceCredentialIntent()
@@ -52,9 +51,6 @@ class BiometricDeviceAuthentication(
         Log.i(TAG, "Skipping firing intent unless forced")
       }
       true
-    } else {
-      Log.w(TAG, "Not compatible...")
-      false
     }
   }
 
@@ -65,7 +61,6 @@ class BiometricDeviceAuthentication(
 
 class BiometricDeviceLockContract : ActivityResultContract<String, Int>() {
 
-  @RequiresApi(api = 21)
   override fun createIntent(context: Context, input: String): Intent {
     val keyguardManager = ServiceUtil.getKeyguardManager(context)
     return keyguardManager.createConfirmDeviceCredentialIntent(input, "")

app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java

@@ -356,6 +356,12 @@ public final class ContactSelectionListFragment extends LoggingFragment
     return view;
   }
 
+  @Override
+  public void onDestroyView() {
+    super.onDestroyView();
+    constraintLayout = null;
+  }
+
   private @NonNull Bundle safeArguments() {
     return getArguments() != null ? getArguments() : new Bundle();
   }
@@ -661,7 +667,7 @@ public final class ContactSelectionListFragment extends LoggingFragment
       SelectedContact selectedContact = contact.isUsernameType() ? SelectedContact.forUsername(contact.getRecipientId().orElse(null), contact.getNumber())
                                                                  : SelectedContact.forPhone(contact.getRecipientId().orElse(null), contact.getNumber());
 
-      if (!canSelectSelf && Recipient.self().getId().equals(selectedContact.getOrCreateRecipientId(requireContext()))) {
+      if (!canSelectSelf && !selectedContact.hasUsername() && Recipient.self().getId().equals(selectedContact.getOrCreateRecipientId(requireContext()))) {
         Toast.makeText(requireContext(), R.string.ContactSelectionListFragment_you_do_not_need_to_add_yourself_to_the_group, Toast.LENGTH_SHORT).show();
         return;
       }

app/src/main/java/org/thoughtcrime/securesms/DatabaseMigrationActivity.java

@@ -1,201 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import android.content.BroadcastReceiver;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.ServiceConnection;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.Looper;
-import android.os.Message;
-import android.os.Parcelable;
-import android.view.View;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import org.thoughtcrime.securesms.database.SmsMigrator.ProgressDescription;
-import org.thoughtcrime.securesms.service.ApplicationMigrationService;
-import org.thoughtcrime.securesms.service.ApplicationMigrationService.ImportState;
-
-public class DatabaseMigrationActivity extends PassphraseRequiredActivity {
-
-  private final ImportServiceConnection serviceConnection  = new ImportServiceConnection();
-  private final ImportStateHandler      importStateHandler = new ImportStateHandler();
-  private final BroadcastReceiver       completedReceiver  = new NullReceiver();
-
-  private LinearLayout promptLayout;
-  private LinearLayout progressLayout;
-  private Button       skipButton;
-  private Button       importButton;
-  private ProgressBar  progress;
-  private TextView     progressLabel;
-
-  private ApplicationMigrationService importService;
-  private boolean isVisible = false;
-
-  @Override
-  protected void onCreate(Bundle bundle, boolean ready) {
-    setContentView(R.layout.database_migration_activity);
-
-    initializeResources();
-    initializeServiceBinding();
-  }
-
-  @Override
-  public void onResume() {
-    super.onResume();
-    isVisible = true;
-    registerForCompletedNotification();
-  }
-
-  @Override
-  public void onPause() {
-    super.onPause();
-    isVisible = false;
-    unregisterForCompletedNotification();
-  }
-
-  @Override
-  public void onDestroy() {
-    super.onDestroy();
-    shutdownServiceBinding();
-  }
-
-  @Override
-  public void onBackPressed() {
-
-  }
-
-  private void initializeServiceBinding() {
-    Intent intent = new Intent(this, ApplicationMigrationService.class);
-    bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE);
-  }
-
-  private void initializeResources() {
-    this.promptLayout   = (LinearLayout)findViewById(R.id.prompt_layout);
-    this.progressLayout = (LinearLayout)findViewById(R.id.progress_layout);
-    this.skipButton     = (Button)      findViewById(R.id.skip_button);
-    this.importButton   = (Button)      findViewById(R.id.import_button);
-    this.progress       = (ProgressBar) findViewById(R.id.import_progress);
-    this.progressLabel  = (TextView)    findViewById(R.id.import_status);
-
-    this.progressLayout.setVisibility(View.GONE);
-    this.promptLayout.setVisibility(View.GONE);
-
-    this.importButton.setOnClickListener(new View.OnClickListener() {
-      @Override
-      public void onClick(View v) {
-        Intent intent = new Intent(DatabaseMigrationActivity.this, ApplicationMigrationService.class);
-        intent.setAction(ApplicationMigrationService.MIGRATE_DATABASE);
-        intent.putExtra("master_secret", (Parcelable)getIntent().getParcelableExtra("master_secret"));
-        startService(intent);
-
-        promptLayout.setVisibility(View.GONE);
-        progressLayout.setVisibility(View.VISIBLE);
-      }
-    });
-
-    this.skipButton.setOnClickListener(new View.OnClickListener() {
-      @Override
-      public void onClick(View v) {
-        ApplicationMigrationService.setDatabaseImported(DatabaseMigrationActivity.this);
-        handleImportComplete();
-      }
-    });
-  }
-
-  private void registerForCompletedNotification() {
-    IntentFilter filter = new IntentFilter();
-    filter.addAction(ApplicationMigrationService.COMPLETED_ACTION);
-    filter.setPriority(1000);
-
-    registerReceiver(completedReceiver, filter);
-  }
-
-  private void unregisterForCompletedNotification() {
-    unregisterReceiver(completedReceiver);
-  }
-
-  private void shutdownServiceBinding() {
-    unbindService(serviceConnection);
-  }
-
-  private void handleStateIdle() {
-    this.promptLayout.setVisibility(View.VISIBLE);
-    this.progressLayout.setVisibility(View.GONE);
-  }
-
-  private void handleStateProgress(ProgressDescription update) {
-    this.promptLayout.setVisibility(View.GONE);
-    this.progressLayout.setVisibility(View.VISIBLE);
-    this.progressLabel.setText(update.primaryComplete + "/" + update.primaryTotal);
-
-    double max               = this.progress.getMax();
-    double primaryTotal      = update.primaryTotal;
-    double primaryComplete   = update.primaryComplete;
-    double secondaryTotal    = update.secondaryTotal;
-    double secondaryComplete = update.secondaryComplete;
-
-    this.progress.setProgress((int)Math.round((primaryComplete / primaryTotal) * max));
-    this.progress.setSecondaryProgress((int)Math.round((secondaryComplete / secondaryTotal) * max));
-  }
-
-  private void handleImportComplete() {
-    if (isVisible) {
-      if (getIntent().hasExtra("next_intent")) {
-        startActivity((Intent)getIntent().getParcelableExtra("next_intent"));
-      } else {
-        // TODO [greyson] Navigation
-        startActivity(MainActivity.clearTop(this));
-      }
-    }
-
-    finish();
-  }
-
-  private class ImportStateHandler extends Handler {
-
-    public ImportStateHandler() {
-      super(Looper.getMainLooper());
-    }
-
-    @Override
-    public void handleMessage(Message message) {
-      switch (message.what) {
-      case ImportState.STATE_IDLE:                   handleStateIdle();                                     break;
-      case ImportState.STATE_MIGRATING_IN_PROGRESS:  handleStateProgress((ProgressDescription)message.obj); break;
-      case ImportState.STATE_MIGRATING_COMPLETE:     handleImportComplete();                                break;
-      }
-    }
-  }
-
-  private class ImportServiceConnection implements ServiceConnection {
-    @Override
-    public void onServiceConnected(ComponentName className, IBinder service) {
-      importService  = ((ApplicationMigrationService.ApplicationMigrationBinder)service).getService();
-      importService.setImportStateHandler(importStateHandler);
-
-      ImportState state = importService.getState();
-      importStateHandler.obtainMessage(state.state, state.progress).sendToTarget();
-    }
-
-    @Override
-    public void onServiceDisconnected(ComponentName name) {
-      importService.setImportStateHandler(null);
-    }
-  }
-
-  private static class NullReceiver extends BroadcastReceiver {
-    @Override
-    public void onReceive(Context context, Intent intent) {
-      abortBroadcast();
-    }
-  }
-
-
-}

app/src/main/java/org/thoughtcrime/securesms/DeviceActivity.java

@@ -140,27 +140,18 @@ public class DeviceActivity extends PassphraseRequiredActivity
       Uri uri = Uri.parse(data);
       deviceLinkFragment.setLinkClickedListener(uri, DeviceActivity.this);
 
-      if (Build.VERSION.SDK_INT >= 21) {
-        deviceAddFragment.setSharedElementReturnTransition(TransitionInflater.from(DeviceActivity.this).inflateTransition(R.transition.fragment_shared));
-        deviceAddFragment.setExitTransition(TransitionInflater.from(DeviceActivity.this).inflateTransition(android.R.transition.fade));
+      deviceAddFragment.setSharedElementReturnTransition(TransitionInflater.from(DeviceActivity.this).inflateTransition(R.transition.fragment_shared));
+      deviceAddFragment.setExitTransition(TransitionInflater.from(DeviceActivity.this).inflateTransition(android.R.transition.fade));
 
-        deviceLinkFragment.setSharedElementEnterTransition(TransitionInflater.from(DeviceActivity.this).inflateTransition(R.transition.fragment_shared));
-        deviceLinkFragment.setEnterTransition(TransitionInflater.from(DeviceActivity.this).inflateTransition(android.R.transition.fade));
+      deviceLinkFragment.setSharedElementEnterTransition(TransitionInflater.from(DeviceActivity.this).inflateTransition(R.transition.fragment_shared));
+      deviceLinkFragment.setEnterTransition(TransitionInflater.from(DeviceActivity.this).inflateTransition(android.R.transition.fade));
 
-        getSupportFragmentManager().beginTransaction()
-                                   .addToBackStack(null)
-                                   .addSharedElement(deviceAddFragment.getDevicesImage(), "devices")
-                                   .replace(R.id.fragment_container, deviceLinkFragment)
-                                   .commit();
+      getSupportFragmentManager().beginTransaction()
+                                 .addToBackStack(null)
+                                 .addSharedElement(deviceAddFragment.getDevicesImage(), "devices")
+                                 .replace(R.id.fragment_container, deviceLinkFragment)
+                                 .commit();
 
-      } else {
-        getSupportFragmentManager().beginTransaction()
-                                   .setCustomAnimations(R.anim.slide_from_bottom, R.anim.slide_to_bottom,
-                                                        R.anim.slide_from_bottom, R.anim.slide_to_bottom)
-                                   .replace(R.id.fragment_container, deviceLinkFragment)
-                                   .addToBackStack(null)
-                                   .commit();
-      }
     });
   }
 

app/src/main/java/org/thoughtcrime/securesms/DeviceAddFragment.java

@@ -41,22 +41,19 @@ public class DeviceAddFragment extends LoggingFragment {
     this.devicesImage = container.findViewById(R.id.devices);
     ViewCompat.setTransitionName(devicesImage, "devices");
 
-    if (Build.VERSION.SDK_INT >= 21) {
-      container.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
-        @TargetApi(21)
-        @Override
-        public void onLayoutChange(View v, int left, int top, int right, int bottom,
-                                   int oldLeft, int oldTop, int oldRight, int oldBottom)
-        {
-          v.removeOnLayoutChangeListener(this);
+    container.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
+      @Override
+      public void onLayoutChange(View v, int left, int top, int right, int bottom,
+                                 int oldLeft, int oldTop, int oldRight, int oldBottom)
+      {
+        v.removeOnLayoutChangeListener(this);
 
-          Animator reveal = ViewAnimationUtils.createCircularReveal(v, right, bottom, 0, (int) Math.hypot(right, bottom));
-          reveal.setInterpolator(new DecelerateInterpolator(2f));
-          reveal.setDuration(800);
-          reveal.start();
-        }
-      });
-    }
+        Animator reveal = ViewAnimationUtils.createCircularReveal(v, right, bottom, 0, (int) Math.hypot(right, bottom));
+        reveal.setInterpolator(new DecelerateInterpolator(2f));
+        reveal.setDuration(800);
+        reveal.start();
+      }
+    });
 
     scannerView.start(getViewLifecycleOwner(), CameraXModelBlocklist.isBlocklisted());
 

app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java

@@ -28,10 +28,10 @@ import org.thoughtcrime.securesms.contacts.SelectedContact;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.groups.SelectionLimits;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
+import org.thoughtcrime.securesms.mms.OutgoingMessage;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.sms.MessageSender;
-import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarInviteTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.Util;
@@ -254,7 +254,7 @@ public class InviteActivity extends PassphraseRequiredActivity implements Contac
         Recipient   recipient      = Recipient.resolved(recipientId);
         int         subscriptionId = recipient.getDefaultSubscriptionId().orElse(-1);
 
-        MessageSender.send(context, new OutgoingTextMessage(recipient, message, subscriptionId), -1L, true, null, null);
+        MessageSender.send(context, OutgoingMessage.sms(recipient, message, subscriptionId), -1L, MessageSender.SendType.SMS, null, null);
 
         if (recipient.getContactUri() != null) {
           SignalDatabase.recipients().setHasSentInvite(recipient.getId());

app/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java

@@ -342,7 +342,8 @@ public class NewConversationActivity extends ContactSelectionActivity
                                               recipient,
                                               () -> {
                                                 disposables.add(viewModel.blockContact(recipient).subscribe(() -> {
-                                                  displaySnackbar(R.string.NewConversationActivity__s_has_been_removed);
+                                                  displaySnackbar(R.string.NewConversationActivity__s_has_been_blocked, recipient.getDisplayName(this));
+                                                  contactsFragment.reset();
                                                 }));
                                               })
     );
@@ -366,7 +367,7 @@ public class NewConversationActivity extends ContactSelectionActivity
         .setPositiveButton(R.string.NewConversationActivity__remove,
                            (dialog, which) -> {
                              disposables.add(viewModel.hideContact(recipient).subscribe(() -> {
-                               displaySnackbar(R.string.NewConversationActivity__s_has_been_removed);
+                               displaySnackbar(R.string.NewConversationActivity__s_has_been_removed, recipient.getDisplayName(this));
                              }));
                            }
         )
@@ -374,7 +375,7 @@ public class NewConversationActivity extends ContactSelectionActivity
         .show();
   }
 
-  private void displaySnackbar(@StringRes int message) {
-    Snackbar.make(findViewById(android.R.id.content), message, Snackbar.LENGTH_SHORT).show();
+  private void displaySnackbar(@StringRes int message, Object ... formatArgs) {
+    Snackbar.make(findViewById(android.R.id.content), getString(message, formatArgs), Snackbar.LENGTH_SHORT).show();
   }
 }

app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java

@@ -307,10 +307,8 @@ public class PassphrasePromptActivity extends PassphraseActivity {
 
   public Unit showConfirmDeviceCredentialIntent() {
     KeyguardManager keyguardManager = (KeyguardManager) getSystemService(Context.KEYGUARD_SERVICE);
-    Intent          intent          = null;
-    if (Build.VERSION.SDK_INT >= 21) {
-      intent = keyguardManager.createConfirmDeviceCredentialIntent(getString(R.string.PassphrasePromptActivity_unlock_signal), "");
-    }
+    Intent          intent          = keyguardManager.createConfirmDeviceCredentialIntent(getString(R.string.PassphrasePromptActivity_unlock_signal), "");
+
     startActivityForResult(intent, AUTHENTICATE_REQUEST_CODE);
     return Unit.INSTANCE;
   }

app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java

@@ -602,7 +602,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
   }
 
   public void handleGroupMemberCountChange(int count) {
-    boolean canRing = count <= FeatureFlags.maxGroupCallRingSize() && FeatureFlags.groupCallRinging();
+    boolean canRing = count <= FeatureFlags.maxGroupCallRingSize();
     callScreen.enableRingGroup(canRing);
     ApplicationDependencies.getSignalCallManager().setRingGroup(canRing);
   }

app/src/main/java/org/thoughtcrime/securesms/absbackup/AndroidBackupItem.kt

@@ -0,0 +1,11 @@
+package org.thoughtcrime.securesms.absbackup
+
+/**
+ * Abstracts away the implementation of pieces of data we want to hand off to various backup services.
+ * Here we can control precisely which data gets backed up and more importantly, what does not.
+ */
+interface AndroidBackupItem {
+  fun getKey(): String
+  fun getDataForBackup(): ByteArray
+  fun restoreData(data: ByteArray)
+}

app/src/main/java/org/thoughtcrime/securesms/absbackup/SignalBackupAgent.kt

@@ -0,0 +1,65 @@
+package org.thoughtcrime.securesms.absbackup
+
+import android.app.backup.BackupAgent
+import android.app.backup.BackupDataInput
+import android.app.backup.BackupDataOutput
+import android.os.ParcelFileDescriptor
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.absbackup.backupables.KbsAuthTokens
+import java.io.DataInputStream
+import java.io.DataOutputStream
+import java.io.FileInputStream
+import java.io.FileOutputStream
+import java.io.IOException
+
+/**
+ * Uses the [Android Backup Service](https://developer.android.com/guide/topics/data/keyvaluebackup) and backs up everything in [items]
+ */
+class SignalBackupAgent : BackupAgent() {
+  private val items: List<AndroidBackupItem> = listOf(
+    KbsAuthTokens,
+  )
+
+  override fun onBackup(oldState: ParcelFileDescriptor?, data: BackupDataOutput, newState: ParcelFileDescriptor) {
+    val contentsHash = cumulativeHashCode()
+    if (oldState == null) {
+      performBackup(data)
+    } else {
+      val hash = try {
+        DataInputStream(FileInputStream(oldState.fileDescriptor)).use { it.readInt() }
+      } catch (e: IOException) {
+        Log.w(TAG, "No old state, may be first backup request or bug with not writing to newState at end.", e)
+      }
+      if (hash != contentsHash) {
+        performBackup(data)
+      }
+    }
+
+    DataOutputStream(FileOutputStream(newState.fileDescriptor)).use { it.writeInt(contentsHash) }
+  }
+
+  private fun performBackup(data: BackupDataOutput) {
+    items.forEach {
+      val backupData = it.getDataForBackup()
+      data.writeEntityHeader(it.getKey(), backupData.size)
+      data.writeEntityData(backupData, backupData.size)
+    }
+  }
+
+  override fun onRestore(dataInput: BackupDataInput, appVersionCode: Int, newState: ParcelFileDescriptor) {
+    while (dataInput.readNextHeader()) {
+      val buffer = ByteArray(dataInput.dataSize)
+      dataInput.readEntityData(buffer, 0, dataInput.dataSize)
+      items.find { dataInput.key == it.getKey() }?.restoreData(buffer)
+    }
+    DataOutputStream(FileOutputStream(newState.fileDescriptor)).use { it.writeInt(cumulativeHashCode()) }
+  }
+
+  private fun cumulativeHashCode(): Int {
+    return items.fold("") { acc: String, androidBackupItem: AndroidBackupItem -> acc + androidBackupItem.getDataForBackup().decodeToString() }.hashCode()
+  }
+
+  companion object {
+    private const val TAG = "SignalBackupAgent"
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/absbackup/backupables/KbsAuthTokens.kt

@@ -0,0 +1,40 @@
+package org.thoughtcrime.securesms.absbackup.backupables
+
+import com.google.protobuf.InvalidProtocolBufferException
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.absbackup.AndroidBackupItem
+import org.thoughtcrime.securesms.absbackup.ExternalBackupProtos
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+
+/**
+ * This backs up the not-secret KBS Auth tokens, which can be combined with a PIN to prove ownership of a phone number in order to complete the registration process.
+ */
+object KbsAuthTokens : AndroidBackupItem {
+  private const val TAG = "KbsAuthTokens"
+
+  override fun getKey(): String {
+    return TAG
+  }
+
+  override fun getDataForBackup(): ByteArray {
+    val registrationRecoveryTokenList = SignalStore.kbsValues().kbsAuthTokenList
+    val proto = ExternalBackupProtos.KbsAuthToken.newBuilder()
+      .addAllToken(registrationRecoveryTokenList)
+      .build()
+    return proto.toByteArray()
+  }
+
+  override fun restoreData(data: ByteArray) {
+    if (SignalStore.kbsValues().kbsAuthTokenList.isNotEmpty()) {
+      return
+    }
+
+    try {
+      val proto = ExternalBackupProtos.KbsAuthToken.parseFrom(data)
+
+      SignalStore.kbsValues().putAuthTokenList(proto.tokenList)
+    } catch (e: InvalidProtocolBufferException) {
+      Log.w(TAG, "Cannot restore KbsAuthToken from backup service.")
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/animation/DepthPageTransformer.java

@@ -1,41 +0,0 @@
-package org.thoughtcrime.securesms.animation;
-
-import android.view.View;
-
-import androidx.annotation.NonNull;
-import androidx.viewpager.widget.ViewPager;
-import androidx.viewpager2.widget.ViewPager2;
-
-/**
- * Based on https://developer.android.com/training/animation/screen-slide#depth-page
- */
-public final class DepthPageTransformer implements ViewPager.PageTransformer {
-  private static final float MIN_SCALE = 0.75f;
-
-  public void transformPage(@NonNull View view, float position) {
-    final int pageWidth = view.getWidth();
-
-    if (position < -1f) {
-      view.setAlpha(0f);
-
-    } else if (position <= 0f) {
-      view.setAlpha(1f);
-      view.setTranslationX(0f);
-      view.setScaleX(1f);
-      view.setScaleY(1f);
-
-    } else if (position <= 1f) {
-      view.setAlpha(1f - position);
-
-      view.setTranslationX(pageWidth * -position);
-
-      final float scaleFactor = MIN_SCALE + (1f - MIN_SCALE) * (1f - Math.abs(position));
-
-      view.setScaleX(scaleFactor);
-      view.setScaleY(scaleFactor);
-
-    } else {
-      view.setAlpha(0f);
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/animation/DepthPageTransformer2.kt

@@ -1,41 +0,0 @@
-package org.thoughtcrime.securesms.animation
-
-import android.view.View
-import androidx.annotation.RequiresApi
-import androidx.viewpager2.widget.ViewPager2
-
-private const val MIN_SCALE = 0.75f
-
-/**
- * Lifted from https://developer.android.com/develop/ui/views/animations/screen-slide-2#depth-page
- */
-@RequiresApi(21)
-class DepthPageTransformer2 : ViewPager2.PageTransformer {
-
-  override fun transformPage(view: View, position: Float) {
-    view.apply {
-      val pageWidth = width
-      when {
-        position < -1 -> alpha = 0f
-        position <= 0 -> {
-          alpha = 1f
-          translationX = 0f
-          translationZ = 0f
-          scaleX = 1f
-          scaleY = 1f
-        }
-        position <= 1 -> {
-          alpha = 1 - position
-
-          translationX = pageWidth * -position
-          translationZ = -1f
-
-          val scaleFactor = (MIN_SCALE + (1 - MIN_SCALE) * (1 - Math.abs(position)))
-          scaleX = scaleFactor
-          scaleY = scaleFactor
-        }
-        else -> alpha = 0f
-      }
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/animation/transitions/CircleAvatarTransition.kt

@@ -13,7 +13,6 @@ import android.view.ViewGroup
 import android.view.animation.AccelerateInterpolator
 import android.view.animation.DecelerateInterpolator
 import android.view.animation.Interpolator
-import androidx.annotation.RequiresApi
 
 private const val POSITION_ON_SCREEN = "signal.circleavatartransition.positiononscreen"
 private const val WIDTH = "signal.circleavatartransition.width"
@@ -22,7 +21,6 @@ private const val HEIGHT = "signal.circleavatartransition.height"
 /**
  * Custom transition for Circular avatars, because once you have multiple things animating stuff was getting broken and weird.
  */
-@RequiresApi(21)
 class CircleAvatarTransition(context: Context, attrs: AttributeSet?) : Transition(context, attrs) {
   override fun captureStartValues(transitionValues: TransitionValues) {
     captureValues(transitionValues)

app/src/main/java/org/thoughtcrime/securesms/animation/transitions/CrossfaderTransition.kt

@@ -7,11 +7,9 @@ import android.transition.Transition
 import android.transition.TransitionValues
 import android.util.AttributeSet
 import android.view.ViewGroup
-import androidx.annotation.RequiresApi
 import androidx.core.animation.doOnEnd
 import androidx.core.animation.doOnStart
 
-@RequiresApi(21)
 class CrossfaderTransition(context: Context, attrs: AttributeSet?) : Transition(context, attrs) {
 
   companion object {

app/src/main/java/org/thoughtcrime/securesms/animation/transitions/WipeDownTransition.kt

@@ -10,7 +10,6 @@ import android.transition.TransitionValues
 import android.util.AttributeSet
 import android.view.View
 import android.view.ViewGroup
-import androidx.annotation.RequiresApi
 import androidx.core.animation.addListener
 import androidx.fragment.app.FragmentContainerView
 
@@ -19,7 +18,6 @@ private const val BOUNDS = "signal.wipedowntransition.bottom"
 /**
  * WipeDownTransition will animate the bottom position of a view such that it "wipes" down the screen to a final position.
  */
-@RequiresApi(21)
 class WipeDownTransition(context: Context, attrs: AttributeSet?) : Transition(context, attrs) {
   override fun captureStartValues(transitionValues: TransitionValues) {
     captureValues(transitionValues)

app/src/main/java/org/thoughtcrime/securesms/attachments/Attachment.java

@@ -7,8 +7,8 @@ import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.audio.AudioHash;
 import org.thoughtcrime.securesms.blurhash.BlurHash;
-import org.thoughtcrime.securesms.database.AttachmentDatabase;
-import org.thoughtcrime.securesms.database.AttachmentDatabase.TransformProperties;
+import org.thoughtcrime.securesms.database.AttachmentTable;
+import org.thoughtcrime.securesms.database.AttachmentTable.TransformProperties;
 import org.thoughtcrime.securesms.stickers.StickerLocator;
 
 public abstract class Attachment {
@@ -118,13 +118,13 @@ public abstract class Attachment {
   }
 
   public boolean isInProgress() {
-    return transferState != AttachmentDatabase.TRANSFER_PROGRESS_DONE &&
-           transferState != AttachmentDatabase.TRANSFER_PROGRESS_FAILED &&
-           transferState != AttachmentDatabase.TRANSFER_PROGRESS_PERMANENT_FAILURE;
+    return transferState != AttachmentTable.TRANSFER_PROGRESS_DONE &&
+           transferState != AttachmentTable.TRANSFER_PROGRESS_FAILED &&
+           transferState != AttachmentTable.TRANSFER_PROGRESS_PERMANENT_FAILURE;
   }
 
   public boolean isPermanentlyFailed() {
-    return transferState == AttachmentDatabase.TRANSFER_PROGRESS_PERMANENT_FAILURE;
+    return transferState == AttachmentTable.TRANSFER_PROGRESS_PERMANENT_FAILURE;
   }
 
   public long getSize() {

app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachment.java

@@ -6,7 +6,7 @@ import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.audio.AudioHash;
 import org.thoughtcrime.securesms.blurhash.BlurHash;
-import org.thoughtcrime.securesms.database.AttachmentDatabase.TransformProperties;
+import org.thoughtcrime.securesms.database.AttachmentTable.TransformProperties;
 import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.stickers.StickerLocator;
 

app/src/main/java/org/thoughtcrime/securesms/attachments/MmsNotificationAttachment.java

@@ -5,8 +5,8 @@ import android.net.Uri;
 
 import androidx.annotation.Nullable;
 
-import org.thoughtcrime.securesms.database.AttachmentDatabase;
-import org.thoughtcrime.securesms.database.MmsDatabase;
+import org.thoughtcrime.securesms.database.AttachmentTable;
+import org.thoughtcrime.securesms.database.MessageTable;
 
 public class MmsNotificationAttachment extends Attachment {
 
@@ -26,14 +26,14 @@ public class MmsNotificationAttachment extends Attachment {
   }
 
   private static int getTransferStateFromStatus(int status) {
-    if (status == MmsDatabase.Status.DOWNLOAD_INITIALIZED ||
-        status == MmsDatabase.Status.DOWNLOAD_NO_CONNECTIVITY)
+    if (status == MessageTable.MmsStatus.DOWNLOAD_INITIALIZED ||
+        status == MessageTable.MmsStatus.DOWNLOAD_NO_CONNECTIVITY)
     {
-      return AttachmentDatabase.TRANSFER_PROGRESS_PENDING;
-    } else if (status == MmsDatabase.Status.DOWNLOAD_CONNECTING) {
-      return AttachmentDatabase.TRANSFER_PROGRESS_STARTED;
+      return AttachmentTable.TRANSFER_PROGRESS_PENDING;
+    } else if (status == MessageTable.MmsStatus.DOWNLOAD_CONNECTING) {
+      return AttachmentTable.TRANSFER_PROGRESS_STARTED;
     } else {
-      return AttachmentDatabase.TRANSFER_PROGRESS_FAILED;
+      return AttachmentTable.TRANSFER_PROGRESS_FAILED;
     }
   }
 }

app/src/main/java/org/thoughtcrime/securesms/attachments/PointerAttachment.java

@@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.blurhash.BlurHash;
-import org.thoughtcrime.securesms.database.AttachmentDatabase;
+import org.thoughtcrime.securesms.database.AttachmentTable;
 import org.thoughtcrime.securesms.stickers.StickerLocator;
 import org.thoughtcrime.securesms.util.Base64;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
@@ -68,7 +68,7 @@ public class PointerAttachment extends Attachment {
     return results;
   }
 
-  public static List<Attachment> forPointers(List<SignalServiceDataMessage.Quote.QuotedAttachment> pointers) {
+  public static List<Attachment> forPointers(@Nullable List<SignalServiceDataMessage.Quote.QuotedAttachment> pointers) {
     List<Attachment> results = new LinkedList<>();
 
     if (pointers != null) {
@@ -102,7 +102,7 @@ public class PointerAttachment extends Attachment {
     }
 
     return Optional.of(new PointerAttachment(pointer.get().getContentType(),
-                                             AttachmentDatabase.TRANSFER_PROGRESS_PENDING,
+                                             AttachmentTable.TRANSFER_PROGRESS_PENDING,
                                              pointer.get().asPointer().getSize().orElse(0),
                                              pointer.get().asPointer().getFileName().orElse(null),
                                              pointer.get().asPointer().getCdnNumber(),
@@ -126,7 +126,7 @@ public class PointerAttachment extends Attachment {
     SignalServiceAttachment thumbnail = pointer.getThumbnail();
 
     return Optional.of(new PointerAttachment(pointer.getContentType(),
-                                             AttachmentDatabase.TRANSFER_PROGRESS_PENDING,
+                                             AttachmentTable.TRANSFER_PROGRESS_PENDING,
                                              thumbnail != null ? thumbnail.asPointer().getSize().orElse(0) : 0,
                                              pointer.getFileName(),
                                              thumbnail != null ? thumbnail.asPointer().getCdnNumber() : 0,

app/src/main/java/org/thoughtcrime/securesms/attachments/TombstoneAttachment.java

@@ -5,7 +5,7 @@ import android.net.Uri;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.thoughtcrime.securesms.database.AttachmentDatabase;
+import org.thoughtcrime.securesms.database.AttachmentTable;
 
 /**
  * An attachment that represents where an attachment used to be. Useful when you need to know that
@@ -16,7 +16,7 @@ import org.thoughtcrime.securesms.database.AttachmentDatabase;
 public class TombstoneAttachment extends Attachment {
 
   public TombstoneAttachment(@NonNull String contentType, boolean quote) {
-    super(contentType, AttachmentDatabase.TRANSFER_PROGRESS_DONE, 0, null, 0, null, null, null, null, null, false, false, false, 0, 0, quote, 0, null, null, null, null, null);
+    super(contentType, AttachmentTable.TRANSFER_PROGRESS_DONE, 0, null, 0, null, null, null, null, null, false, false, false, 0, 0, quote, 0, null, null, null, null, null);
   }
 
   @Override

app/src/main/java/org/thoughtcrime/securesms/attachments/UriAttachment.java

@@ -7,9 +7,11 @@ import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.audio.AudioHash;
 import org.thoughtcrime.securesms.blurhash.BlurHash;
-import org.thoughtcrime.securesms.database.AttachmentDatabase.TransformProperties;
+import org.thoughtcrime.securesms.database.AttachmentTable.TransformProperties;
 import org.thoughtcrime.securesms.stickers.StickerLocator;
 
+import java.util.Objects;
+
 public class UriAttachment extends Attachment {
 
   private final @NonNull  Uri dataUri;
@@ -51,7 +53,7 @@ public class UriAttachment extends Attachment {
                        @Nullable TransformProperties transformProperties)
   {
     super(contentType, transferState, size, fileName, 0, null, null, null, null, fastPreflightId, voiceNote, borderless, videoGif, width, height, quote, 0, caption, stickerLocator, blurHash, audioHash, transformProperties);
-    this.dataUri = dataUri;
+    this.dataUri = Objects.requireNonNull(dataUri);
   }
 
   @Override

app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java

@@ -1,42 +1,51 @@
 package org.thoughtcrime.securesms.audio;
 
 import android.content.Context;
+import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.ParcelFileDescriptor;
 
 import androidx.annotation.NonNull;
 
-import org.signal.core.util.ThreadUtil;
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.components.voice.VoiceNoteDraft;
 import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.util.MediaUtil;
-import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
-import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
 
 import java.io.IOException;
 import java.util.concurrent.ExecutorService;
 
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.subjects.SingleSubject;
+
 public class AudioRecorder {
 
   private static final String TAG = Log.tag(AudioRecorder.class);
 
   private static final ExecutorService executor = SignalExecutors.newCachedSingleThreadExecutor("signal-AudioRecorder");
 
-  private final Context context;
+  private final Context                   context;
+  private final AudioRecorderFocusManager audioFocusManager;
 
   private Recorder recorder;
   private Uri      captureUri;
 
+  private SingleSubject<VoiceNoteDraft> recordingSubject;
+
   public AudioRecorder(@NonNull Context context) {
     this.context = context;
+    audioFocusManager = AudioRecorderFocusManager.create(context, focusChange -> {
+      Log.i(TAG, "Audio focus change " + focusChange + " stopping recording");
+      stopRecording();
+    });
   }
 
-  public void startRecording() {
+  public @NonNull Single<VoiceNoteDraft> startRecording() {
     Log.i(TAG, "startRecording()");
 
+    final SingleSubject<VoiceNoteDraft> recordingSingle = SingleSubject.create();
     executor.execute(() -> {
       Log.i(TAG, "Running startRecording() + " + Thread.currentThread().getId());
       try {
@@ -50,48 +59,46 @@ public class AudioRecorder {
                                  .forData(new ParcelFileDescriptor.AutoCloseInputStream(fds[0]), 0)
                                  .withMimeType(MediaUtil.AUDIO_AAC)
                                  .createForDraftAttachmentAsync(context, () -> Log.i(TAG, "Write successful."), e -> Log.w(TAG, "Error during recording", e));
-
         recorder = Build.VERSION.SDK_INT >= 26 ? new MediaRecorderWrapper() : new AudioCodec();
+        int focusResult = audioFocusManager.requestAudioFocus();
+        if (focusResult != AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
+          Log.w(TAG, "Could not gain audio focus. Received result code " + focusResult);
+        }
         recorder.start(fds[1]);
+        this.recordingSubject = recordingSingle;
       } catch (IOException e) {
+        recordingSingle.onError(e);
+        recorder = null;
         Log.w(TAG, e);
       }
     });
+
+    return recordingSingle;
   }
 
-  public @NonNull ListenableFuture<VoiceNoteDraft> stopRecording() {
+  public void stopRecording() {
     Log.i(TAG, "stopRecording()");
 
-    final SettableFuture<VoiceNoteDraft> future = new SettableFuture<>();
-
     executor.execute(() -> {
       if (recorder == null) {
-        sendToFuture(future, new IOException("MediaRecorder was never initialized successfully!"));
+        Log.e(TAG, "MediaRecorder was never initialized successfully!");
         return;
       }
 
+      audioFocusManager.abandonAudioFocus();
       recorder.stop();
 
       try {
         long size = MediaUtil.getMediaSize(context, captureUri);
-        sendToFuture(future, new VoiceNoteDraft(captureUri, size));
+        recordingSubject.onSuccess(new VoiceNoteDraft(captureUri, size));
       } catch (IOException ioe) {
         Log.w(TAG, ioe);
-        sendToFuture(future, ioe);
+        recordingSubject.onError(ioe);
       }
 
-      recorder   = null;
-      captureUri = null;
+      recordingSubject = null;
+      recorder         = null;
+      captureUri       = null;
     });
-
-    return future;
-  }
-
-  private <T> void sendToFuture(final SettableFuture<T> future, final Exception exception) {
-    ThreadUtil.runOnMain(() -> future.setException(exception));
-  }
-
-  private <T> void sendToFuture(final SettableFuture<T> future, final T result) {
-    ThreadUtil.runOnMain(() -> future.set(result));
   }
 }

app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorderFocusManager.kt

@@ -0,0 +1,63 @@
+package org.thoughtcrime.securesms.audio
+
+import android.content.Context
+import android.media.AudioAttributes
+import android.media.AudioFocusRequest
+import android.media.AudioManager
+import android.media.AudioManager.OnAudioFocusChangeListener
+import android.os.Build
+import androidx.annotation.RequiresApi
+import org.thoughtcrime.securesms.util.ServiceUtil
+
+abstract class AudioRecorderFocusManager(val context: Context) {
+  protected val audioManager: AudioManager = ServiceUtil.getAudioManager(context)
+
+  abstract fun requestAudioFocus(): Int
+  abstract fun abandonAudioFocus(): Int
+
+  companion object {
+    @JvmStatic
+    fun create(context: Context, changeListener: OnAudioFocusChangeListener): AudioRecorderFocusManager {
+      return if (Build.VERSION.SDK_INT >= 26) {
+        AudioRecorderFocusManager26(context, changeListener)
+      } else {
+        AudioRecorderFocusManagerLegacy(context, changeListener)
+      }
+    }
+  }
+}
+
+@RequiresApi(26)
+private class AudioRecorderFocusManager26(context: Context, changeListener: OnAudioFocusChangeListener) : AudioRecorderFocusManager(context) {
+  val audioFocusRequest: AudioFocusRequest
+
+  init {
+    val audioAttributes = AudioAttributes.Builder()
+      .setUsage(AudioAttributes.USAGE_MEDIA)
+      .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
+      .build()
+    audioFocusRequest = AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE)
+      .setAudioAttributes(audioAttributes)
+      .setOnAudioFocusChangeListener(changeListener)
+      .build()
+  }
+
+  override fun requestAudioFocus(): Int {
+    return audioManager.requestAudioFocus(audioFocusRequest)
+  }
+
+  override fun abandonAudioFocus(): Int {
+    return audioManager.abandonAudioFocusRequest(audioFocusRequest)
+  }
+}
+
+@Suppress("DEPRECATION")
+private class AudioRecorderFocusManagerLegacy(context: Context, val changeListener: OnAudioFocusChangeListener) : AudioRecorderFocusManager(context) {
+  override fun requestAudioFocus(): Int {
+    return audioManager.requestAudioFocus(changeListener, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE)
+  }
+
+  override fun abandonAudioFocus(): Int {
+    return audioManager.abandonAudioFocus(changeListener)
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/audio/AudioWaveForm.java

@@ -21,7 +21,7 @@ import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
-import org.thoughtcrime.securesms.database.AttachmentDatabase;
+import org.thoughtcrime.securesms.database.AttachmentTable;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.databaseprotos.AudioWaveFormData;
 import org.thoughtcrime.securesms.media.DecryptableUriMediaInput;
@@ -100,7 +100,7 @@ public final class AudioWaveForm {
 
       if (attachment instanceof DatabaseAttachment) {
         try {
-          AttachmentDatabase attachmentDatabase = SignalDatabase.attachments();
+          AttachmentTable    attachmentDatabase = SignalDatabase.attachments();
           DatabaseAttachment dbAttachment       = (DatabaseAttachment) attachment;
           long               startTime          = System.currentTimeMillis();
 

app/src/main/java/org/thoughtcrime/securesms/avatar/TextAvatarDrawable.kt

@@ -30,6 +30,7 @@ class TextAvatarDrawable(
     setBounds(0, 0, size, size)
   }
 
+  @Suppress("DEPRECATION")
   override fun draw(canvas: Canvas) {
     val width = bounds.width()
     val textSize = Avatars.getTextSizeForLength(context, avatar.text, width * 0.8f, width * 0.45f)

app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerFragment.kt

@@ -123,7 +123,7 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) {
         }
       )
     }
-    clearButton.setOnClickListener { viewModel.clear() }
+    clearButton.setOnClickListener { viewModel.clearAvatar() }
 
     setFragmentResultListener(TextAvatarCreationFragment.REQUEST_KEY_TEXT) { _, bundle ->
       val text = AvatarBundler.extractText(bundle)

app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerViewModel.kt

@@ -32,7 +32,7 @@ sealed class AvatarPickerViewModel(private val repository: AvatarPickerRepositor
     }
   }
 
-  fun clear() {
+  fun clearAvatar() {
     store.update {
       val avatar = getDefaultAvatarFromRepository()
       it.copy(currentAvatar = avatar, canSave = true, canClear = false, isCleared = true)

app/src/main/java/org/thoughtcrime/securesms/backup/BackupCountQueries.kt

@@ -1,30 +1,27 @@
 package org.thoughtcrime.securesms.backup
 
-import org.thoughtcrime.securesms.database.AttachmentDatabase
-import org.thoughtcrime.securesms.database.GroupReceiptDatabase
-import org.thoughtcrime.securesms.database.MmsDatabase
-import org.thoughtcrime.securesms.database.SmsDatabase
+import org.thoughtcrime.securesms.database.AttachmentTable
+import org.thoughtcrime.securesms.database.GroupReceiptTable
+import org.thoughtcrime.securesms.database.MessageTable
 
 /**
  * Queries used by backup exporter to estimate total counts for various complicated tables.
  */
 object BackupCountQueries {
 
-  const val mmsCount: String = "SELECT COUNT(*) FROM ${MmsDatabase.TABLE_NAME} WHERE ${MmsDatabase.EXPIRES_IN} <= 0 AND ${MmsDatabase.VIEW_ONCE} <= 0"
-
-  const val smsCount: String = "SELECT COUNT(*) FROM ${SmsDatabase.TABLE_NAME} WHERE ${SmsDatabase.EXPIRES_IN} <= 0"
+  const val mmsCount: String = "SELECT COUNT(*) FROM ${MessageTable.TABLE_NAME} WHERE ${MessageTable.EXPIRES_IN} <= 0 AND ${MessageTable.VIEW_ONCE} <= 0"
 
   @get:JvmStatic
   val groupReceiptCount: String = """
-      SELECT COUNT(*) FROM ${GroupReceiptDatabase.TABLE_NAME} 
-      INNER JOIN ${MmsDatabase.TABLE_NAME} ON ${GroupReceiptDatabase.TABLE_NAME}.${GroupReceiptDatabase.MMS_ID} = ${MmsDatabase.TABLE_NAME}.${MmsDatabase.ID} 
-      WHERE ${MmsDatabase.TABLE_NAME}.${MmsDatabase.EXPIRES_IN} <= 0 AND ${MmsDatabase.TABLE_NAME}.${MmsDatabase.VIEW_ONCE} <= 0
+      SELECT COUNT(*) FROM ${GroupReceiptTable.TABLE_NAME} 
+      INNER JOIN ${MessageTable.TABLE_NAME} ON ${GroupReceiptTable.TABLE_NAME}.${GroupReceiptTable.MMS_ID} = ${MessageTable.TABLE_NAME}.${MessageTable.ID} 
+      WHERE ${MessageTable.TABLE_NAME}.${MessageTable.EXPIRES_IN} <= 0 AND ${MessageTable.TABLE_NAME}.${MessageTable.VIEW_ONCE} <= 0
   """.trimIndent()
 
   @get:JvmStatic
   val attachmentCount: String = """
-      SELECT COUNT(*) FROM ${AttachmentDatabase.TABLE_NAME} 
-      INNER JOIN ${MmsDatabase.TABLE_NAME} ON ${AttachmentDatabase.TABLE_NAME}.${AttachmentDatabase.MMS_ID} = ${MmsDatabase.TABLE_NAME}.${MmsDatabase.ID} 
-      WHERE ${MmsDatabase.TABLE_NAME}.${MmsDatabase.EXPIRES_IN} <= 0 AND ${MmsDatabase.TABLE_NAME}.${MmsDatabase.VIEW_ONCE} <= 0
+      SELECT COUNT(*) FROM ${AttachmentTable.TABLE_NAME} 
+      INNER JOIN ${MessageTable.TABLE_NAME} ON ${AttachmentTable.TABLE_NAME}.${AttachmentTable.MMS_ID} = ${MessageTable.TABLE_NAME}.${MessageTable.ID} 
+      WHERE ${MessageTable.TABLE_NAME}.${MessageTable.EXPIRES_IN} <= 0 AND ${MessageTable.TABLE_NAME}.${MessageTable.VIEW_ONCE} <= 0
   """.trimIndent()
 }

app/src/main/java/org/thoughtcrime/securesms/backup/BackupFileIOError.java

@@ -42,7 +42,7 @@ public enum BackupFileIOError {
 
   public void postNotification(@NonNull Context context) {
     PendingIntent pendingIntent           = PendingIntent.getActivity(context, -1, AppSettingsActivity.backups(context), PendingIntentFlags.mutable());
-    Notification backupFailedNotification = new NotificationCompat.Builder(context, NotificationChannels.FAILURES)
+    Notification backupFailedNotification = new NotificationCompat.Builder(context, NotificationChannels.getInstance().FAILURES)
                                                                   .setSmallIcon(R.drawable.ic_signal_backup)
                                                                   .setContentTitle(context.getString(titleId))
                                                                   .setContentText(context.getString(messageId))

app/src/main/java/org/thoughtcrime/securesms/backup/BackupVerifier.kt

@@ -15,6 +15,7 @@ object BackupVerifier {
   private val TAG = Log.tag(BackupVerifier::class.java)
 
   @JvmStatic
+  @Throws(IOException::class)
   fun verifyFile(cipherStream: InputStream, passphrase: String, expectedCount: Long): Boolean {
     val inputStream = BackupRecordInputStream(cipherStream, passphrase)
 
@@ -47,7 +48,7 @@ object BackupVerifier {
     try {
       inputStream.readAttachmentTo(NullOutputStream, attachment.length)
     } catch (e: IOException) {
-      Log.w(TAG, "Bad attachment: ${attachment.attachmentId}", e)
+      Log.w(TAG, "Bad attachment id: ${attachment.attachmentId} len: ${attachment.length}", e)
       return false
     }
 
@@ -58,7 +59,7 @@ object BackupVerifier {
     try {
       inputStream.readAttachmentTo(NullOutputStream, sticker.length)
     } catch (e: IOException) {
-      Log.w(TAG, "Bad sticker: ${sticker.rowId}", e)
+      Log.w(TAG, "Bad sticker id: ${sticker.rowId} len: ${sticker.length}", e)
       return false
     }
     return true
@@ -68,7 +69,7 @@ object BackupVerifier {
     try {
       inputStream.readAttachmentTo(NullOutputStream, avatar.length)
     } catch (e: IOException) {
-      Log.w(TAG, "Bad sticker: ${avatar.recipientId}", e)
+      Log.w(TAG, "Bad avatar id: ${avatar.recipientId} len: ${avatar.length}", e)
       return false
     }
     return true

app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java

@@ -8,6 +8,7 @@ import android.text.TextUtils;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
+import androidx.annotation.VisibleForTesting;
 import androidx.documentfile.provider.DocumentFile;
 
 import com.annimon.stream.function.Predicate;
@@ -19,6 +20,7 @@ import org.greenrobot.eventbus.EventBus;
 import org.signal.core.util.Conversions;
 import org.signal.core.util.CursorUtil;
 import org.signal.core.util.SetUtil;
+import org.signal.core.util.SqlUtil;
 import org.signal.core.util.Stopwatch;
 import org.signal.core.util.logging.Log;
 import org.signal.libsignal.protocol.kdf.HKDF;
@@ -27,23 +29,21 @@ import org.thoughtcrime.securesms.attachments.AttachmentId;
 import org.thoughtcrime.securesms.crypto.AttachmentSecret;
 import org.thoughtcrime.securesms.crypto.ClassicDecryptingPartInputStream;
 import org.thoughtcrime.securesms.crypto.ModernDecryptingPartInputStream;
-import org.thoughtcrime.securesms.database.AttachmentDatabase;
-import org.thoughtcrime.securesms.database.EmojiSearchDatabase;
-import org.thoughtcrime.securesms.database.GroupReceiptDatabase;
+import org.thoughtcrime.securesms.database.AttachmentTable;
+import org.thoughtcrime.securesms.database.EmojiSearchTable;
+import org.thoughtcrime.securesms.database.GroupReceiptTable;
 import org.thoughtcrime.securesms.database.KeyValueDatabase;
-import org.thoughtcrime.securesms.database.MentionDatabase;
-import org.thoughtcrime.securesms.database.MmsDatabase;
-import org.thoughtcrime.securesms.database.MmsSmsColumns;
-import org.thoughtcrime.securesms.database.OneTimePreKeyDatabase;
-import org.thoughtcrime.securesms.database.PendingRetryReceiptDatabase;
-import org.thoughtcrime.securesms.database.ReactionDatabase;
-import org.thoughtcrime.securesms.database.SearchDatabase;
-import org.thoughtcrime.securesms.database.SenderKeyDatabase;
-import org.thoughtcrime.securesms.database.SenderKeySharedDatabase;
-import org.thoughtcrime.securesms.database.SessionDatabase;
-import org.thoughtcrime.securesms.database.SignedPreKeyDatabase;
-import org.thoughtcrime.securesms.database.SmsDatabase;
-import org.thoughtcrime.securesms.database.StickerDatabase;
+import org.thoughtcrime.securesms.database.MentionTable;
+import org.thoughtcrime.securesms.database.MessageTable;
+import org.thoughtcrime.securesms.database.OneTimePreKeyTable;
+import org.thoughtcrime.securesms.database.PendingRetryReceiptTable;
+import org.thoughtcrime.securesms.database.ReactionTable;
+import org.thoughtcrime.securesms.database.SearchTable;
+import org.thoughtcrime.securesms.database.SenderKeyTable;
+import org.thoughtcrime.securesms.database.SenderKeySharedTable;
+import org.thoughtcrime.securesms.database.SessionTable;
+import org.thoughtcrime.securesms.database.SignedPreKeyTable;
+import org.thoughtcrime.securesms.database.StickerTable;
 import org.thoughtcrime.securesms.database.model.AvatarPickerDatabase;
 import org.thoughtcrime.securesms.database.model.MessageId;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
@@ -62,10 +62,15 @@ import java.io.OutputStream;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
-import java.util.LinkedList;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
@@ -84,16 +89,19 @@ public class FullBackupExporter extends FullBackupBase {
   private static final long IDENTITY_KEY_BACKUP_RECORD_COUNT = 2L;
   private static final long FINAL_MESSAGE_COUNT              = 1L;
 
-  private static final Set<String> BLACKLISTED_TABLES = SetUtil.newHashSet(
-      SignedPreKeyDatabase.TABLE_NAME,
-      OneTimePreKeyDatabase.TABLE_NAME,
-      SessionDatabase.TABLE_NAME,
-      SearchDatabase.SMS_FTS_TABLE_NAME,
-      SearchDatabase.MMS_FTS_TABLE_NAME,
-      EmojiSearchDatabase.TABLE_NAME,
-      SenderKeyDatabase.TABLE_NAME,
-      SenderKeySharedDatabase.TABLE_NAME,
-      PendingRetryReceiptDatabase.TABLE_NAME,
+  /**
+   * Tables in list will still have their *schema* exported (so the tables will be created),
+   * but we will not export the actual contents.
+   */
+  private static final Set<String> TABLE_CONTENT_BLOCKLIST = SetUtil.newHashSet(
+      SignedPreKeyTable.TABLE_NAME,
+      OneTimePreKeyTable.TABLE_NAME,
+      SessionTable.TABLE_NAME,
+      SearchTable.FTS_TABLE_NAME,
+      EmojiSearchTable.TABLE_NAME,
+      SenderKeyTable.TABLE_NAME,
+      SenderKeySharedTable.TABLE_NAME,
+      PendingRetryReceiptTable.TABLE_NAME,
       AvatarPickerDatabase.TABLE_NAME
   );
 
@@ -161,21 +169,19 @@ public class FullBackupExporter extends FullBackupBase {
 
       for (String table : tables) {
         throwIfCanceled(cancellationSignal);
-        if (table.equals(MmsDatabase.TABLE_NAME)) {
+        if (table.equals(MessageTable.TABLE_NAME)) {
           count = exportTable(table, input, outputStream, FullBackupExporter::isNonExpiringMmsMessage, null, count, estimatedCount, cancellationSignal);
-        } else if (table.equals(SmsDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, FullBackupExporter::isNonExpiringSmsMessage, null, count, estimatedCount, cancellationSignal);
-        } else if (table.equals(ReactionDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, new MessageId(CursorUtil.requireLong(cursor, ReactionDatabase.MESSAGE_ID), CursorUtil.requireBoolean(cursor, ReactionDatabase.IS_MMS))), null, count, estimatedCount, cancellationSignal);
-        } else if (table.equals(MentionDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMmsMessage(input, CursorUtil.requireLong(cursor, MentionDatabase.MESSAGE_ID)), null, count, estimatedCount, cancellationSignal);
-        } else if (table.equals(GroupReceiptDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMmsMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(GroupReceiptDatabase.MMS_ID))), null, count, estimatedCount, cancellationSignal);
-        } else if (table.equals(AttachmentDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMmsMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.MMS_ID))), (cursor, innerCount) -> exportAttachment(attachmentSecret, cursor, outputStream, innerCount, estimatedCount), count, estimatedCount, cancellationSignal);
-        } else if (table.equals(StickerDatabase.TABLE_NAME)) {
+        } else if (table.equals(ReactionTable.TABLE_NAME)) {
+          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, new MessageId(CursorUtil.requireLong(cursor, ReactionTable.MESSAGE_ID))), null, count, estimatedCount, cancellationSignal);
+        } else if (table.equals(MentionTable.TABLE_NAME)) {
+          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMmsMessage(input, CursorUtil.requireLong(cursor, MentionTable.MESSAGE_ID)), null, count, estimatedCount, cancellationSignal);
+        } else if (table.equals(GroupReceiptTable.TABLE_NAME)) {
+          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMmsMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(GroupReceiptTable.MMS_ID))), null, count, estimatedCount, cancellationSignal);
+        } else if (table.equals(AttachmentTable.TABLE_NAME)) {
+          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMmsMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentTable.MMS_ID))), (cursor, innerCount) -> exportAttachment(attachmentSecret, cursor, outputStream, innerCount, estimatedCount), count, estimatedCount, cancellationSignal);
+        } else if (table.equals(StickerTable.TABLE_NAME)) {
           count = exportTable(table, input, outputStream, cursor -> true, (cursor, innerCount) -> exportSticker(attachmentSecret, cursor, outputStream, innerCount, estimatedCount), count, estimatedCount, cancellationSignal);
-        } else if (!BLACKLISTED_TABLES.contains(table) && !table.startsWith("sqlite_")) {
+        } else if (!TABLE_CONTENT_BLOCKLIST.contains(table)) {
           count = exportTable(table, input, outputStream, null, null, count, estimatedCount, cancellationSignal);
         }
         stopwatch.split("table::" + table);
@@ -219,17 +225,15 @@ public class FullBackupExporter extends FullBackupBase {
     long count = DATABASE_VERSION_RECORD_COUNT + TABLE_RECORD_COUNT_MULTIPLIER * tables.size();
 
     for (String table : tables) {
-      if (table.equals(MmsDatabase.TABLE_NAME)) {
+      if (table.equals(MessageTable.TABLE_NAME)) {
         count += getCount(input, BackupCountQueries.mmsCount);
-      } else if (table.equals(SmsDatabase.TABLE_NAME)) {
-        count += getCount(input, BackupCountQueries.smsCount);
-      } else if (table.equals(GroupReceiptDatabase.TABLE_NAME)) {
+      } else if (table.equals(GroupReceiptTable.TABLE_NAME)) {
         count += getCount(input, BackupCountQueries.getGroupReceiptCount());
-      } else if (table.equals(AttachmentDatabase.TABLE_NAME)) {
+      } else if (table.equals(AttachmentTable.TABLE_NAME)) {
         count += getCount(input, BackupCountQueries.getAttachmentCount());
-      } else if (table.equals(StickerDatabase.TABLE_NAME)) {
+      } else if (table.equals(StickerTable.TABLE_NAME)) {
         count += getCount(input, "SELECT COUNT(*) FROM " + table);
-      } else if (!BLACKLISTED_TABLES.contains(table) && !table.startsWith("sqlite_")) {
+      } else if (!TABLE_CONTENT_BLOCKLIST.contains(table)) {
         count += getCount(input, "SELECT COUNT(*) FROM " + table);
       }
     }
@@ -266,31 +270,110 @@ public class FullBackupExporter extends FullBackupBase {
   private static List<String> exportSchema(@NonNull SQLiteDatabase input, @NonNull BackupFrameOutputStream outputStream)
       throws IOException
   {
-    List<String> tables = new LinkedList<>();
+    List<String> tablesInOrder = getTablesToExportInOrder(input);
 
-    try (Cursor cursor = input.rawQuery("SELECT sql, name, type FROM sqlite_master", null)) {
+    Map<String, String> createStatementsByTable = new HashMap<>();
+
+    try (Cursor cursor = input.rawQuery("SELECT sql, name, type FROM sqlite_master WHERE type = 'table' AND sql NOT NULL", null)) {
       while (cursor != null && cursor.moveToNext()) {
         String sql  = cursor.getString(0);
         String name = cursor.getString(1);
-        String type = cursor.getString(2);
 
-        if (sql != null) {
-          boolean isSmsFtsSecretTable   = name != null && !name.equals(SearchDatabase.SMS_FTS_TABLE_NAME) && name.startsWith(SearchDatabase.SMS_FTS_TABLE_NAME);
-          boolean isMmsFtsSecretTable   = name != null && !name.equals(SearchDatabase.MMS_FTS_TABLE_NAME) && name.startsWith(SearchDatabase.MMS_FTS_TABLE_NAME);
-          boolean isEmojiFtsSecretTable = name != null && !name.equals(EmojiSearchDatabase.TABLE_NAME) && name.startsWith(EmojiSearchDatabase.TABLE_NAME);
+        createStatementsByTable.put(name, sql);
+      }
+    }
 
-          if (!isSmsFtsSecretTable && !isMmsFtsSecretTable && !isEmojiFtsSecretTable) {
-            if ("table".equals(type)) {
-              tables.add(name);
-            }
+    for (String table :  tablesInOrder) {
+      String statement = createStatementsByTable.get(table);
 
-            outputStream.write(BackupProtos.SqlStatement.newBuilder().setStatement(cursor.getString(0)).build());
-          }
+      if (statement != null) {
+        outputStream.write(BackupProtos.SqlStatement.newBuilder().setStatement(statement).build());
+      } else {
+        throw new IOException("Failed to find a create statement for table: " + table);
+      }
+    }
+
+    try (Cursor cursor = input.rawQuery("SELECT sql, name, type FROM sqlite_master where type != 'table' AND sql NOT NULL", null)) {
+      while (cursor != null && cursor.moveToNext()) {
+        String sql  = cursor.getString(0);
+        String name = cursor.getString(1);
+
+        if (isTableAllowed(name)) {
+          outputStream.write(BackupProtos.SqlStatement.newBuilder().setStatement(sql).build());
         }
       }
     }
 
-    return tables;
+    return tablesInOrder;
+  }
+
+  /**
+   * Returns the list of tables we should export, in the order they should be exported in.
+   * The order is chosen to ensure we won't violate any foreign key constraints when we import them.
+   */
+  private static List<String> getTablesToExportInOrder(@NonNull SQLiteDatabase input) {
+    List<String> tables = SqlUtil.getAllTables(input)
+                                 .stream()
+                                 .filter(FullBackupExporter::isTableAllowed)
+                                 .sorted()
+                                 .collect(Collectors.toList());
+
+    
+    Map<String, Set<String>> dependsOn = new LinkedHashMap<>();
+    for (String table : tables) {
+      dependsOn.put(table, SqlUtil.getForeignKeyDependencies(input, table));
+    }
+    
+    return computeTableOrder(dependsOn);
+  }
+
+  @VisibleForTesting
+  static List<String> computeTableOrder(@NonNull Map<String, Set<String>> dependsOn) {
+    List<String> rootNodes = dependsOn.keySet()
+                                      .stream()
+                                      .filter(table -> {
+                                        boolean nothingDependsOnIt = dependsOn.values().stream().noneMatch(it -> it.contains(table));
+                                        return nothingDependsOnIt;
+                                      })
+                                      .sorted()
+                                      .collect(Collectors.toList());
+
+    LinkedHashSet<String> outputOrder = new LinkedHashSet<>();
+
+    for (String root : rootNodes) {
+      postOrderTraversal(root, dependsOn, outputOrder);
+    }
+
+    return new ArrayList<>(outputOrder);
+  }
+
+  private static void postOrderTraversal(String current, Map<String, Set<String>> dependsOn, LinkedHashSet<String> outputOrder) {
+    Set<String> dependencies = dependsOn.get(current);
+
+    if (dependencies == null || dependencies.isEmpty()) {
+      outputOrder.add(current);
+      return;
+    }
+
+    for (String dependency : dependencies) {
+      postOrderTraversal(dependency, dependsOn, outputOrder);
+    }
+
+    outputOrder.add(current);
+  }
+
+  private static boolean isTableAllowed(@Nullable String table) {
+    if (table == null) {
+      return true;
+    }
+
+    boolean isReservedTable       = table.startsWith("sqlite_");
+    boolean isMmsFtsSecretTable   = !table.equals(SearchTable.FTS_TABLE_NAME) && table.startsWith(SearchTable.FTS_TABLE_NAME);
+    boolean isEmojiFtsSecretTable = !table.equals(EmojiSearchTable.TABLE_NAME) && table.startsWith(EmojiSearchTable.TABLE_NAME);
+
+    return !isReservedTable &&
+           !isMmsFtsSecretTable &&
+           !isEmojiFtsSecretTable;
   }
 
   private static int exportTable(@NonNull String table,
@@ -359,12 +442,12 @@ public class FullBackupExporter extends FullBackupBase {
                                       long estimatedCount)
       throws IOException
   {
-    long rowId    = cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.ROW_ID));
-    long uniqueId = cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.UNIQUE_ID));
-    long size     = cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.SIZE));
+    long rowId    = cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentTable.ROW_ID));
+    long uniqueId = cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentTable.UNIQUE_ID));
+    long size     = cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentTable.SIZE));
 
-    String data   = cursor.getString(cursor.getColumnIndexOrThrow(AttachmentDatabase.DATA));
-    byte[] random = cursor.getBlob(cursor.getColumnIndexOrThrow(AttachmentDatabase.DATA_RANDOM));
+    String data   = cursor.getString(cursor.getColumnIndexOrThrow(AttachmentTable.DATA));
+    byte[] random = cursor.getBlob(cursor.getColumnIndexOrThrow(AttachmentTable.DATA_RANDOM));
 
     if (!TextUtils.isEmpty(data)) {
       long fileLength = new File(data).length();
@@ -381,7 +464,7 @@ public class FullBackupExporter extends FullBackupBase {
       try (InputStream inputStream = openAttachmentStream(attachmentSecret, random, data)) {
         outputStream.write(new AttachmentId(rowId, uniqueId), inputStream, size);
       } catch (FileNotFoundException e) {
-        Log.w(TAG, "Missing attachment: " + e.getMessage());
+        Log.w(TAG, "Missing attachment", e);
       }
     }
 
@@ -395,18 +478,18 @@ public class FullBackupExporter extends FullBackupBase {
                                    long estimatedCount)
       throws IOException
   {
-    long rowId = cursor.getLong(cursor.getColumnIndexOrThrow(StickerDatabase._ID));
-    long size  = cursor.getLong(cursor.getColumnIndexOrThrow(StickerDatabase.FILE_LENGTH));
+    long rowId = cursor.getLong(cursor.getColumnIndexOrThrow(StickerTable._ID));
+    long size  = cursor.getLong(cursor.getColumnIndexOrThrow(StickerTable.FILE_LENGTH));
 
-    String data   = cursor.getString(cursor.getColumnIndexOrThrow(StickerDatabase.FILE_PATH));
-    byte[] random = cursor.getBlob(cursor.getColumnIndexOrThrow(StickerDatabase.FILE_RANDOM));
+    String data   = cursor.getString(cursor.getColumnIndexOrThrow(StickerTable.FILE_PATH));
+    byte[] random = cursor.getBlob(cursor.getColumnIndexOrThrow(StickerTable.FILE_RANDOM));
 
     if (!TextUtils.isEmpty(data) && size > 0) {
       EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count, estimatedCount));
       try (InputStream inputStream = ModernDecryptingPartInputStream.createFor(attachmentSecret, random, new File(data), 0)) {
         outputStream.writeSticker(rowId, inputStream, size);
       } catch (FileNotFoundException e) {
-        Log.w(TAG, "Missing sticker: " + e.getMessage());
+        Log.w(TAG, "Missing sticker", e);
       }
     }
 
@@ -424,7 +507,7 @@ public class FullBackupExporter extends FullBackupBase {
         result += read;
       }
     } catch (FileNotFoundException e) {
-      Log.w(TAG, "Missing attachment: " + e.getMessage());
+      Log.w(TAG, "Missing attachment for size calculation", e);
       return 0;
     } catch (IOException e) {
       Log.w(TAG, "Failed to determine stream length", e);
@@ -494,42 +577,24 @@ public class FullBackupExporter extends FullBackupBase {
   }
 
   private static boolean isNonExpiringMmsMessage(@NonNull Cursor cursor) {
-    return cursor.getLong(cursor.getColumnIndexOrThrow(MmsSmsColumns.EXPIRES_IN)) <= 0 &&
-           cursor.getLong(cursor.getColumnIndexOrThrow(MmsDatabase.VIEW_ONCE)) <= 0;
+    return cursor.getLong(cursor.getColumnIndexOrThrow(MessageTable.EXPIRES_IN)) <= 0 &&
+           cursor.getLong(cursor.getColumnIndexOrThrow(MessageTable.VIEW_ONCE)) <= 0;
   }
 
   private static boolean isNonExpiringSmsMessage(@NonNull Cursor cursor) {
-    return cursor.getLong(cursor.getColumnIndexOrThrow(MmsSmsColumns.EXPIRES_IN)) <= 0;
+    return cursor.getLong(cursor.getColumnIndexOrThrow(MessageTable.EXPIRES_IN)) <= 0;
   }
 
   private static boolean isForNonExpiringMessage(@NonNull SQLiteDatabase db, @NonNull MessageId messageId) {
-    if (messageId.isMms()) {
-      return isForNonExpiringMmsMessage(db, messageId.getId());
-    } else {
-      return isForNonExpiringSmsMessage(db, messageId.getId());
-    }
-  }
-
-  private static boolean isForNonExpiringSmsMessage(@NonNull SQLiteDatabase db, long smsId) {
-    String[] columns = new String[] { SmsDatabase.EXPIRES_IN };
-    String   where   = SmsDatabase.ID + " = ?";
-    String[] args    = new String[] { String.valueOf(smsId) };
-
-    try (Cursor cursor = db.query(SmsDatabase.TABLE_NAME, columns, where, args, null, null, null)) {
-      if (cursor != null && cursor.moveToFirst()) {
-        return isNonExpiringSmsMessage(cursor);
-      }
-    }
-
-    return false;
+    return isForNonExpiringMmsMessage(db, messageId.getId());
   }
 
   private static boolean isForNonExpiringMmsMessage(@NonNull SQLiteDatabase db, long mmsId) {
-    String[] columns = new String[] { MmsDatabase.RECIPIENT_ID, MmsDatabase.EXPIRES_IN, MmsDatabase.VIEW_ONCE };
-    String   where   = MmsDatabase.ID + " = ?";
+    String[] columns = new String[] { MessageTable.RECIPIENT_ID, MessageTable.EXPIRES_IN, MessageTable.VIEW_ONCE };
+    String   where   = MessageTable.ID + " = ?";
     String[] args    = new String[] { String.valueOf(mmsId) };
 
-    try (Cursor mmsCursor = db.query(MmsDatabase.TABLE_NAME, columns, where, args, null, null, null)) {
+    try (Cursor mmsCursor = db.query(MessageTable.TABLE_NAME, columns, where, args, null, null, null)) {
       if (mmsCursor != null && mmsCursor.moveToFirst()) {
         return isNonExpiringMmsMessage(mmsCursor);
       }

app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java

@@ -5,11 +5,11 @@ import android.annotation.SuppressLint;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.database.Cursor;
 import android.net.Uri;
 import android.util.Pair;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
 
 import net.zetetic.database.sqlcipher.SQLiteDatabase;
 
@@ -24,11 +24,11 @@ import org.thoughtcrime.securesms.backup.BackupProtos.SqlStatement;
 import org.thoughtcrime.securesms.backup.BackupProtos.Sticker;
 import org.thoughtcrime.securesms.crypto.AttachmentSecret;
 import org.thoughtcrime.securesms.crypto.ModernEncryptingPartOutputStream;
-import org.thoughtcrime.securesms.database.AttachmentDatabase;
-import org.thoughtcrime.securesms.database.EmojiSearchDatabase;
+import org.thoughtcrime.securesms.database.AttachmentTable;
+import org.thoughtcrime.securesms.database.EmojiSearchTable;
 import org.thoughtcrime.securesms.database.KeyValueDatabase;
-import org.thoughtcrime.securesms.database.SearchDatabase;
-import org.thoughtcrime.securesms.database.StickerDatabase;
+import org.thoughtcrime.securesms.database.SearchTable;
+import org.thoughtcrime.securesms.database.StickerTable;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.keyvalue.KeyValueDataSet;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -42,29 +42,24 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
+import java.util.Queue;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 public class FullBackupImporter extends FullBackupBase {
 
   @SuppressWarnings("unused")
   private static final String TAG = Log.tag(FullBackupImporter.class);
 
-  private static final String[] TABLES_TO_DROP_FIRST = {
-      "distribution_list_member",
-      "distribution_list",
-      "message_send_log_recipients",
-      "msl_recipient",
-      "msl_message",
-      "reaction",
-      "notification_profile_schedule",
-      "notification_profile_allowed_members",
-      "story_sends"
-  };
-
   public static void importFile(@NonNull Context context, @NonNull AttachmentSecret attachmentSecret,
                                 @NonNull SQLiteDatabase db, @NonNull Uri uri, @NonNull String passphrase)
       throws IOException
@@ -132,12 +127,11 @@ public class FullBackupImporter extends FullBackupBase {
   }
 
   private static void processStatement(@NonNull SQLiteDatabase db, SqlStatement statement) {
-    boolean isForSmsFtsSecretTable = statement.getStatement().contains(SearchDatabase.SMS_FTS_TABLE_NAME + "_");
-    boolean isForMmsFtsSecretTable = statement.getStatement().contains(SearchDatabase.MMS_FTS_TABLE_NAME + "_");
-    boolean isForEmojiSecretTable  = statement.getStatement().contains(EmojiSearchDatabase.TABLE_NAME + "_");
+    boolean isForMmsFtsSecretTable = statement.getStatement().contains(SearchTable.FTS_TABLE_NAME + "_");
+    boolean isForEmojiSecretTable  = statement.getStatement().contains(EmojiSearchTable.TABLE_NAME + "_");
     boolean isForSqliteSecretTable = statement.getStatement().toLowerCase().startsWith("create table sqlite_");
 
-    if (isForSmsFtsSecretTable || isForMmsFtsSecretTable || isForEmojiSecretTable || isForSqliteSecretTable) {
+    if (isForMmsFtsSecretTable || isForEmojiSecretTable || isForSqliteSecretTable) {
       Log.i(TAG, "Ignoring import for statement: " + statement.getStatement());
       return;
     }
@@ -159,7 +153,7 @@ public class FullBackupImporter extends FullBackupBase {
   private static void processAttachment(@NonNull Context context, @NonNull AttachmentSecret attachmentSecret, @NonNull SQLiteDatabase db, @NonNull Attachment attachment, BackupRecordInputStream inputStream)
       throws IOException
   {
-    File                       dataFile = AttachmentDatabase.newFile(context);
+    File                       dataFile = AttachmentTable.newFile(context);
     Pair<byte[], OutputStream> output   = ModernEncryptingPartOutputStream.createFor(attachmentSecret, dataFile, false);
 
     ContentValues contentValues = new ContentValues();
@@ -167,24 +161,24 @@ public class FullBackupImporter extends FullBackupBase {
     try {
       inputStream.readAttachmentTo(output.second, attachment.getLength());
 
-      contentValues.put(AttachmentDatabase.DATA, dataFile.getAbsolutePath());
-      contentValues.put(AttachmentDatabase.DATA_RANDOM, output.first);
+      contentValues.put(AttachmentTable.DATA, dataFile.getAbsolutePath());
+      contentValues.put(AttachmentTable.DATA_RANDOM, output.first);
     } catch (BackupRecordInputStream.BadMacException e) {
       Log.w(TAG, "Bad MAC for attachment " + attachment.getAttachmentId() + "! Can't restore it.", e);
       dataFile.delete();
-      contentValues.put(AttachmentDatabase.DATA, (String) null);
-      contentValues.put(AttachmentDatabase.DATA_RANDOM, (String) null);
+      contentValues.put(AttachmentTable.DATA, (String) null);
+      contentValues.put(AttachmentTable.DATA_RANDOM, (String) null);
     }
 
-    db.update(AttachmentDatabase.TABLE_NAME, contentValues,
-              AttachmentDatabase.ROW_ID + " = ? AND " + AttachmentDatabase.UNIQUE_ID + " = ?",
+    db.update(AttachmentTable.TABLE_NAME, contentValues,
+              AttachmentTable.ROW_ID + " = ? AND " + AttachmentTable.UNIQUE_ID + " = ?",
               new String[] {String.valueOf(attachment.getRowId()), String.valueOf(attachment.getAttachmentId())});
   }
 
   private static void processSticker(@NonNull Context context, @NonNull AttachmentSecret attachmentSecret, @NonNull SQLiteDatabase db, @NonNull Sticker sticker, BackupRecordInputStream inputStream)
       throws IOException
   {
-    File stickerDirectory = context.getDir(StickerDatabase.DIRECTORY, Context.MODE_PRIVATE);
+    File stickerDirectory = context.getDir(StickerTable.DIRECTORY, Context.MODE_PRIVATE);
     File dataFile         = File.createTempFile("sticker", ".mms", stickerDirectory);
 
     Pair<byte[], OutputStream> output = ModernEncryptingPartOutputStream.createFor(attachmentSecret, dataFile, false);
@@ -192,12 +186,12 @@ public class FullBackupImporter extends FullBackupBase {
     inputStream.readAttachmentTo(output.second, sticker.getLength());
 
     ContentValues contentValues = new ContentValues();
-    contentValues.put(StickerDatabase.FILE_PATH, dataFile.getAbsolutePath());
-    contentValues.put(StickerDatabase.FILE_LENGTH, sticker.getLength());
-    contentValues.put(StickerDatabase.FILE_RANDOM, output.first);
+    contentValues.put(StickerTable.FILE_PATH, dataFile.getAbsolutePath());
+    contentValues.put(StickerTable.FILE_LENGTH, sticker.getLength());
+    contentValues.put(StickerTable.FILE_RANDOM, output.first);
 
-    db.update(StickerDatabase.TABLE_NAME, contentValues,
-              StickerDatabase._ID + " = ?",
+    db.update(StickerTable.TABLE_NAME, contentValues,
+              StickerTable._ID + " = ?",
               new String[] {String.valueOf(sticker.getRowId())});
   }
 
@@ -268,21 +262,69 @@ public class FullBackupImporter extends FullBackupBase {
   }
 
   private static void dropAllTables(@NonNull SQLiteDatabase db) {
-    for (String name : TABLES_TO_DROP_FIRST) {
-      db.execSQL("DROP TABLE IF EXISTS " + name);
+    for (String trigger : SqlUtil.getAllTriggers(db)) {
+      Log.i(TAG, "Dropping trigger: " + trigger);
+      db.execSQL("DROP TRIGGER IF EXISTS " + trigger);
+    }
+    for (String table : getTablesToDropInOrder(db)) {
+      Log.i(TAG, "Dropping table: " + table);
+      db.execSQL("DROP TABLE IF EXISTS " + table);
+    }
+  }
+
+  /**
+   * Returns the list of tables we should drop, in the order they should be dropped in.
+   * The order is chosen to ensure we won't violate any foreign key constraints when we import them.
+   */
+  private static List<String> getTablesToDropInOrder(@NonNull SQLiteDatabase input) {
+    List<String> tables = SqlUtil.getAllTables(input)
+                                 .stream()
+                                 .filter(table -> !table.startsWith("sqlite_"))
+                                 .sorted()
+                                 .collect(Collectors.toList());
+
+
+    Map<String, Set<String>> dependsOn = new LinkedHashMap<>();
+    for (String table : tables) {
+      dependsOn.put(table, SqlUtil.getForeignKeyDependencies(input, table));
     }
 
-    try (Cursor cursor = db.rawQuery("SELECT name, type FROM sqlite_master", null)) {
-      while (cursor != null && cursor.moveToNext()) {
-        String name = cursor.getString(0);
-        String type = cursor.getString(1);
+    for (String table : tables) {
+      Set<String> dependsOnTable = dependsOn.keySet().stream().filter(t -> dependsOn.get(t).contains(table)).collect(Collectors.toSet());
+      Log.i(TAG, "Tables that depend on " + table + ": " + dependsOnTable);
+    }
 
-        if ("table".equals(type) && !name.startsWith("sqlite_")) {
-          Log.i(TAG, "Dropping table: " + name);
-          db.execSQL("DROP TABLE IF EXISTS " + name);
-        }
+    return computeTableDropOrder(dependsOn);
+  }
+
+  @VisibleForTesting
+  static List<String> computeTableDropOrder(@NonNull Map<String, Set<String>> dependsOn) {
+    List<String> rootNodes = dependsOn.keySet()
+                                      .stream()
+                                      .filter(table -> {
+                                        boolean nothingDependsOnIt = dependsOn.values().stream().noneMatch(it -> it.contains(table));
+                                        return nothingDependsOnIt;
+                                      })
+                                      .sorted()
+                                      .collect(Collectors.toList());
+
+    LinkedHashSet<String> dropOrder = new LinkedHashSet<>();
+
+    Queue<String> processOrder = new LinkedList<>(rootNodes);
+
+    while (!processOrder.isEmpty()) {
+      String head = processOrder.remove();
+
+      dropOrder.remove(head);
+      dropOrder.add(head);
+
+      Set<String> dependencies = dependsOn.get(head);
+      if (dependencies != null) {
+        processOrder.addAll(dependencies);
       }
     }
+
+    return new ArrayList<>(dropOrder);
   }
 
   public static class DatabaseDowngradeException extends IOException {

app/src/main/java/org/thoughtcrime/securesms/badges/BadgeRepository.kt

@@ -6,7 +6,7 @@ import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.schedulers.Schedulers
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.badges.models.Badge
-import org.thoughtcrime.securesms.database.RecipientDatabase
+import org.thoughtcrime.securesms.database.RecipientTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.jobs.MultiDeviceProfileContentUpdateJob
@@ -40,13 +40,13 @@ class BadgeRepository(context: Context) {
   ): List<Badge> {
     Log.d(TAG, "[setVisibilityForAllBadgesSync] Setting badge visibility...", true)
 
-    val recipientDatabase: RecipientDatabase = SignalDatabase.recipients
+    val recipientTable: RecipientTable = SignalDatabase.recipients
     val badges = selfBadges.map { it.copy(visible = displayBadgesOnProfile) }
 
     Log.d(TAG, "[setVisibilityForAllBadgesSync] Uploading profile...", true)
     ProfileUtil.uploadProfileWithBadges(context, badges)
     SignalStore.donationsValues().setDisplayBadgesOnProfile(displayBadgesOnProfile)
-    recipientDatabase.markNeedsSync(Recipient.self().id)
+    recipientTable.markNeedsSync(Recipient.self().id)
 
     Log.d(TAG, "[setVisibilityForAllBadgesSync] Requesting data change sync...", true)
     StorageSyncHelper.scheduleSyncForDataChange()

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/ExpiredGiftSheetConfiguration.kt

@@ -30,14 +30,14 @@ object ExpiredGiftSheetConfiguration {
   private fun DSLConfiguration.expiredSheet(onMakeAMonthlyDonation: () -> Unit, onNotNow: () -> Unit) {
     textPref(
       title = DSLSettingsText.from(
-        stringId = R.string.ExpiredGiftSheetConfiguration__your_gift_badge_has_expired,
+        stringId = R.string.ExpiredGiftSheetConfiguration__your_badge_has_expired,
         DSLSettingsText.CenterModifier, DSLSettingsText.TitleLargeModifier
       )
     )
 
     textPref(
       title = DSLSettingsText.from(
-        stringId = R.string.ExpiredGiftSheetConfiguration__your_gift_badge_has_expired_and_is,
+        stringId = R.string.ExpiredGiftSheetConfiguration__your_badge_has_expired_and_is,
         DSLSettingsText.CenterModifier
       )
     )

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/GiftMessageView.kt

@@ -16,6 +16,7 @@ import org.thoughtcrime.securesms.badges.BadgeImageView
 import org.thoughtcrime.securesms.badges.gifts.Gifts.formatExpiry
 import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
 import org.thoughtcrime.securesms.mms.GlideRequests
+import org.thoughtcrime.securesms.recipients.Recipient
 
 /**
  * Displays a gift badge sent to or received from a user, and allows the user to
@@ -49,8 +50,7 @@ class GiftMessageView @JvmOverloads constructor(
     }
   }
 
-  fun setGiftBadge(glideRequests: GlideRequests, giftBadge: GiftBadge, isOutgoing: Boolean, callback: Callback) {
-    titleView.setText(R.string.GiftMessageView__gift_badge)
+  fun setGiftBadge(glideRequests: GlideRequests, giftBadge: GiftBadge, isOutgoing: Boolean, callback: Callback, recipient: Recipient) {
     descriptionView.text = giftBadge.formatExpiry(context)
     actionView.icon = null
     actionView.setOnClickListener { callback.onViewGiftBadgeClicked() }
@@ -58,7 +58,9 @@ class GiftMessageView @JvmOverloads constructor(
 
     if (isOutgoing) {
       actionView.setText(R.string.GiftMessageView__view)
+      titleView.text = context.getString(R.string.GiftMessageView__donation_to_s, recipient.getDisplayName(context))
     } else {
+      titleView.text = context.getString(R.string.GiftMessageView__s_donated_to_signal_on, recipient.getShortDisplayName(context))
       when (giftBadge.redemptionState) {
         GiftBadge.RedemptionState.REDEEMED -> {
           stopAnimationIfNeeded()

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/Gifts.kt

@@ -4,11 +4,8 @@ import android.content.Context
 import org.signal.libsignal.zkgroup.InvalidInputException
 import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialPresentation
 import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.database.ThreadDatabase
-import org.thoughtcrime.securesms.database.model.StoryType
 import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
-import org.thoughtcrime.securesms.mms.OutgoingMediaMessage
-import org.thoughtcrime.securesms.mms.OutgoingSecureMediaMessage
+import org.thoughtcrime.securesms.mms.OutgoingMessage
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.Base64
 import java.lang.Integer.min
@@ -32,23 +29,14 @@ object Gifts {
     giftBadge: GiftBadge,
     sentTimestamp: Long,
     expiresIn: Long
-  ): OutgoingMediaMessage {
-    return OutgoingSecureMediaMessage(
-      recipient,
-      Base64.encodeBytes(giftBadge.toByteArray()),
-      listOf(),
-      sentTimestamp,
-      ThreadDatabase.DistributionTypes.CONVERSATION,
-      expiresIn,
-      false,
-      StoryType.NONE,
-      null,
-      false,
-      null,
-      listOf(),
-      listOf(),
-      listOf(),
-      giftBadge
+  ): OutgoingMessage {
+    return OutgoingMessage(
+      recipient = recipient,
+      body = Base64.encodeBytes(giftBadge.toByteArray()),
+      isSecure = true,
+      sentTimeMillis = sentTimestamp,
+      expiresIn = expiresIn,
+      giftBadge = giftBadge
     )
   }
 

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowActivity.kt

@@ -11,14 +11,14 @@ import io.reactivex.rxjava3.subjects.Subject
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.FragmentWrapperActivity
 import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPaymentComponent
-import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPaymentRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.StripeRepository
 
 /**
  * Activity which houses the gift flow.
  */
 class GiftFlowActivity : FragmentWrapperActivity(), DonationPaymentComponent {
 
-  override val donationPaymentRepository: DonationPaymentRepository by lazy { DonationPaymentRepository(this) }
+  override val stripeRepository: StripeRepository by lazy { StripeRepository(this) }
 
   override val googlePayResultPublisher: Subject<DonationPaymentComponent.GooglePayResult> = PublishSubject.create()
 
@@ -31,6 +31,7 @@ class GiftFlowActivity : FragmentWrapperActivity(), DonationPaymentComponent {
     return NavHostFragment.create(R.navigation.gift_flow)
   }
 
+  @Suppress("DEPRECATION")
   override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
     super.onActivityResult(requestCode, resultCode, data)
     googlePayResultPublisher.onNext(DonationPaymentComponent.GooglePayResult(requestCode, resultCode, data))

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowConfirmationFragment.kt

@@ -1,13 +1,14 @@
 package org.thoughtcrime.securesms.badges.gifts.flow
 
-import android.content.DialogInterface
 import android.view.KeyEvent
 import android.widget.FrameLayout
 import android.widget.ImageView
+import android.widget.TextView
 import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
+import com.google.android.material.button.MaterialButton
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.subjects.PublishSubject
@@ -20,10 +21,10 @@ import org.thoughtcrime.securesms.components.emoji.MediaKeyboard
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
-import org.thoughtcrime.securesms.components.settings.app.subscription.DonationEvent
-import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPaymentComponent
-import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationError
-import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationErrorDialogs
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.DonateToSignalType
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.DonationCheckoutDelegate
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.DonationProcessorAction
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway.GatewayRequest
 import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationErrorSource
 import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.components.settings.conversation.preferences.RecipientPreference
@@ -33,22 +34,24 @@ import org.thoughtcrime.securesms.keyboard.KeyboardPage
 import org.thoughtcrime.securesms.keyboard.KeyboardPagerViewModel
 import org.thoughtcrime.securesms.keyboard.emoji.EmojiKeyboardPageFragment
 import org.thoughtcrime.securesms.keyboard.emoji.search.EmojiSearchFragment
+import org.thoughtcrime.securesms.payments.FiatMoneyUtil
 import org.thoughtcrime.securesms.util.Debouncer
 import org.thoughtcrime.securesms.util.LifecycleDisposable
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
-import org.thoughtcrime.securesms.util.fragments.requireListener
+import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
 /**
  * Allows the user to confirm details about a gift, add a message, and finally make a payment.
  */
 class GiftFlowConfirmationFragment :
   DSLSettingsFragment(
-    titleId = R.string.GiftFlowConfirmationFragment__confirm_gift,
+    titleId = R.string.GiftFlowConfirmationFragment__confirm_donation,
     layoutId = R.layout.gift_flow_confirmation_fragment
   ),
   EmojiKeyboardPageFragment.Callback,
   EmojiEventListener,
-  EmojiSearchFragment.Callback {
+  EmojiSearchFragment.Callback,
+  DonationCheckoutDelegate.Callback {
 
   companion object {
     private val TAG = Log.tag(GiftFlowConfirmationFragment::class.java)
@@ -66,10 +69,9 @@ class GiftFlowConfirmationFragment :
   private lateinit var emojiKeyboard: MediaKeyboard
 
   private val lifecycleDisposable = LifecycleDisposable()
-  private var errorDialog: DialogInterface? = null
+  private var donationCheckoutDelegate: DonationCheckoutDelegate? = null
   private lateinit var processingDonationPaymentDialog: AlertDialog
   private lateinit var verifyingRecipientDonationPaymentDialog: AlertDialog
-  private lateinit var donationPaymentComponent: DonationPaymentComponent
   private lateinit var textInputViewHolder: TextInput.MultilineViewHolder
 
   private val eventPublisher = PublishSubject.create<TextInput.TextInputEvent>()
@@ -81,7 +83,7 @@ class GiftFlowConfirmationFragment :
 
     keyboardPagerViewModel.setOnlyPage(KeyboardPage.EMOJI)
 
-    donationPaymentComponent = requireListener()
+    donationCheckoutDelegate = DonationCheckoutDelegate(this, this, DonationErrorSource.GIFT)
 
     processingDonationPaymentDialog = MaterialAlertDialogBuilder(requireContext())
       .setView(R.layout.processing_payment_dialog)
@@ -98,13 +100,29 @@ class GiftFlowConfirmationFragment :
 
     emojiKeyboard.setFragmentManager(childFragmentManager)
 
-    val googlePayButton = requireView().findViewById<GooglePayButton>(R.id.google_pay_button)
-    googlePayButton.setOnGooglePayClickListener {
-      viewModel.requestTokenFromGooglePay(getString(R.string.preferences__one_time))
+    val continueButton = requireView().findViewById<MaterialButton>(R.id.continue_button)
+    continueButton.setOnClickListener {
+      findNavController().safeNavigate(
+        GiftFlowConfirmationFragmentDirections.actionGiftFlowConfirmationFragmentToGatewaySelectorBottomSheet(
+          with(viewModel.snapshot) {
+            GatewayRequest(
+              donateToSignalType = DonateToSignalType.GIFT,
+              badge = giftBadge!!,
+              label = getString(R.string.preferences__one_time),
+              price = giftPrices[currency]!!.amount,
+              currencyCode = currency.currencyCode,
+              level = giftLevel!!,
+              recipientId = recipient!!.id,
+              additionalMessage = additionalMessage?.toString()
+            )
+          }
+        )
+      )
     }
 
     val textInput = requireView().findViewById<FrameLayout>(R.id.text_input)
     val emojiToggle = textInput.findViewById<ImageView>(R.id.emoji_toggle)
+    val amountView = requireView().findViewById<TextView>(R.id.amount)
     textInputViewHolder = TextInput.MultilineViewHolder(textInput, eventPublisher)
     textInputViewHolder.onAttachedToWindow()
 
@@ -139,7 +157,7 @@ class GiftFlowConfirmationFragment :
           viewModel.setAdditionalMessage(it)
         },
         onEmojiToggleClicked = {
-          if (inputAwareLayout.isKeyboardOpen || (!inputAwareLayout.isKeyboardOpen && !inputAwareLayout.isInputOpen)) {
+          if ((inputAwareLayout.isKeyboardOpen && !emojiKeyboard.isEmojiSearchMode) || (!inputAwareLayout.isKeyboardOpen && !inputAwareLayout.isInputOpen)) {
             inputAwareLayout.show(it, emojiKeyboard)
             emojiToggle.setImageResource(R.drawable.ic_keyboard_24)
           } else {
@@ -165,29 +183,11 @@ class GiftFlowConfirmationFragment :
       } else {
         processingDonationPaymentDialog.dismiss()
       }
+
+      amountView.text = FiatMoneyUtil.format(resources, state.giftPrices[state.currency]!!, FiatMoneyUtil.formatOptions().trimZerosAfterDecimal())
     }
 
     lifecycleDisposable.bindTo(viewLifecycleOwner)
-
-    lifecycleDisposable += DonationError
-      .getErrorsForSource(DonationErrorSource.GIFT)
-      .observeOn(AndroidSchedulers.mainThread())
-      .subscribe { donationError ->
-        onPaymentError(donationError)
-      }
-
-    lifecycleDisposable += viewModel.events.observeOn(AndroidSchedulers.mainThread()).subscribe { donationEvent ->
-      when (donationEvent) {
-        is DonationEvent.PaymentConfirmationSuccess -> onPaymentConfirmed()
-        DonationEvent.RequestTokenSuccess -> Log.i(TAG, "Successfully got request token from Google Pay")
-        DonationEvent.SubscriptionCancelled -> Unit
-        is DonationEvent.SubscriptionCancellationFailed -> Unit
-      }
-    }
-
-    lifecycleDisposable += donationPaymentComponent.googlePayResultPublisher.subscribe {
-      viewModel.onActivityResult(it.requestCode, it.resultCode, it.data)
-    }
   }
 
   override fun onDestroyView() {
@@ -196,6 +196,7 @@ class GiftFlowConfirmationFragment :
     processingDonationPaymentDialog.dismiss()
     debouncer.clear()
     verifyingRecipientDonationPaymentDialog.dismiss()
+    donationCheckoutDelegate = null
   }
 
   private fun getConfiguration(giftFlowState: GiftFlowState): DSLConfiguration {
@@ -220,39 +221,11 @@ class GiftFlowConfirmationFragment :
       )
 
       textPref(
-        summary = DSLSettingsText.from(R.string.GiftFlowConfirmationFragment__your_gift_will_be_sent_in)
+        summary = DSLSettingsText.from(R.string.GiftFlowConfirmationFragment__the_recipient_will_be_notified)
       )
     }
   }
 
-  private fun onPaymentConfirmed() {
-    val mainActivityIntent = MainActivity.clearTop(requireContext())
-    val conversationIntent = ConversationIntents
-      .createBuilder(requireContext(), viewModel.snapshot.recipient!!.id, -1L)
-      .withGiftBadge(viewModel.snapshot.giftBadge!!)
-      .build()
-
-    requireActivity().startActivities(arrayOf(mainActivityIntent, conversationIntent))
-  }
-
-  private fun onPaymentError(throwable: Throwable?) {
-    Log.w(TAG, "onPaymentError", throwable, true)
-
-    if (errorDialog != null) {
-      Log.i(TAG, "Already displaying an error dialog. Skipping.")
-      return
-    }
-
-    errorDialog = DonationErrorDialogs.show(
-      requireContext(), throwable,
-      object : DonationErrorDialogs.DialogCallback() {
-        override fun onDialogDismissed() {
-          requireActivity().finish()
-        }
-      }
-    )
-  }
-
   override fun onToolbarNavigationClicked() {
     findNavController().popBackStack()
   }
@@ -276,4 +249,31 @@ class GiftFlowConfirmationFragment :
       eventPublisher.onNext(TextInput.TextInputEvent.OnKeyEvent(keyEvent))
     }
   }
+
+  override fun navigateToStripePaymentInProgress(gatewayRequest: GatewayRequest) {
+    findNavController().safeNavigate(GiftFlowConfirmationFragmentDirections.actionGiftFlowConfirmationFragmentToStripePaymentInProgressFragment(DonationProcessorAction.PROCESS_NEW_DONATION, gatewayRequest))
+  }
+
+  override fun navigateToPayPalPaymentInProgress(gatewayRequest: GatewayRequest) {
+    findNavController().safeNavigate(GiftFlowConfirmationFragmentDirections.actionGiftFlowConfirmationFragmentToPaypalPaymentInProgressFragment(DonationProcessorAction.PROCESS_NEW_DONATION, gatewayRequest))
+  }
+
+  override fun navigateToCreditCardForm(gatewayRequest: GatewayRequest) {
+    findNavController().safeNavigate(GiftFlowConfirmationFragmentDirections.actionGiftFlowConfirmationFragmentToCreditCardFragment(gatewayRequest))
+  }
+
+  override fun onPaymentComplete(gatewayRequest: GatewayRequest) {
+    val mainActivityIntent = MainActivity.clearTop(requireContext())
+    val conversationIntent = ConversationIntents
+      .createBuilder(requireContext(), viewModel.snapshot.recipient!!.id, -1L)
+      .withGiftBadge(viewModel.snapshot.giftBadge!!)
+      .build()
+
+    requireActivity().startActivities(arrayOf(mainActivityIntent, conversationIntent))
+  }
+
+  override fun onProcessorActionProcessed() = Unit
+  override fun onUserCancelledPaymentFlow() {
+    findNavController().popBackStack(R.id.giftFlowConfirmationFragment, false)
+  }
 }

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowRecipientSelectionFragment.kt

@@ -79,8 +79,7 @@ class GiftFlowRecipientSelectionFragment : Fragment(R.layout.gift_flow_recipient
   override fun onSearchInputFocused() = Unit
 
   override fun setResult(bundle: Bundle) {
-    val parcelableContacts: List<ContactSearchKey.ParcelableRecipientSearchKey> = bundle.getParcelableArrayList(MultiselectForwardFragment.RESULT_SELECTION)!!
-    val contacts = parcelableContacts.map { it.asRecipientSearchKey() }
+    val contacts: List<ContactSearchKey.RecipientSearchKey> = bundle.getParcelableArrayList(MultiselectForwardFragment.RESULT_SELECTION)!!
 
     if (contacts.isNotEmpty()) {
       viewModel.setSelectedContact(contacts.first())

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowRepository.kt

@@ -2,13 +2,13 @@ package org.thoughtcrime.securesms.badges.gifts.flow
 
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.schedulers.Schedulers
+import org.signal.core.util.logging.Log
 import org.signal.core.util.money.FiatMoney
-import org.thoughtcrime.securesms.badges.Badges
 import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.components.settings.app.subscription.getGiftBadgeAmounts
+import org.thoughtcrime.securesms.components.settings.app.subscription.getGiftBadges
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.util.PlatformCurrencyUtil
-import org.whispersystems.signalservice.api.profiles.SignalServiceProfile
-import org.whispersystems.signalservice.internal.ServiceResponse
+import org.whispersystems.signalservice.internal.push.DonationsConfiguration
 import java.util.Currency
 import java.util.Locale
 
@@ -17,15 +17,18 @@ import java.util.Locale
  */
 class GiftFlowRepository {
 
-  fun getGiftBadge(): Single<Pair<Long, Badge>> {
+  companion object {
+    private val TAG = Log.tag(GiftFlowRepository::class.java)
+  }
+
+  fun getGiftBadge(): Single<Pair<Int, Badge>> {
     return Single
       .fromCallable {
         ApplicationDependencies.getDonationsService()
-          .getGiftBadges(Locale.getDefault())
+          .getDonationsConfiguration(Locale.getDefault())
       }
-      .flatMap(ServiceResponse<Map<Long, SignalServiceProfile.Badge>>::flattenResult)
-      .map { gifts -> gifts.map { it.key to Badges.fromServiceBadge(it.value) } }
-      .map { it.first() }
+      .flatMap { it.flattenResult() }
+      .map { DonationsConfiguration.GIFT_LEVEL to it.getGiftBadges().first() }
       .subscribeOn(Schedulers.io())
   }
 
@@ -33,15 +36,10 @@ class GiftFlowRepository {
     return Single
       .fromCallable {
         ApplicationDependencies.getDonationsService()
-          .giftAmount
+          .getDonationsConfiguration(Locale.getDefault())
       }
       .subscribeOn(Schedulers.io())
       .flatMap { it.flattenResult() }
-      .map { result ->
-        result
-          .filter { PlatformCurrencyUtil.getAvailableCurrencyCodes().contains(it.key) }
-          .mapKeys { (code, _) -> Currency.getInstance(code) }
-          .mapValues { (currency, price) -> FiatMoney(price, currency) }
-      }
+      .map { it.getGiftBadgeAmounts() }
   }
 }

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowStartFragment.kt

@@ -9,7 +9,6 @@ import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
-import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPaymentComponent
 import org.thoughtcrime.securesms.components.settings.app.subscription.models.CurrencySelection
 import org.thoughtcrime.securesms.components.settings.app.subscription.models.NetworkFailure
 import org.thoughtcrime.securesms.components.settings.configure
@@ -18,7 +17,6 @@ import org.thoughtcrime.securesms.components.settings.models.SplashImage
 import org.thoughtcrime.securesms.util.LifecycleDisposable
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
-import org.thoughtcrime.securesms.util.fragments.requireListener
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
 /**
@@ -30,7 +28,9 @@ class GiftFlowStartFragment : DSLSettingsFragment(
 
   private val viewModel: GiftFlowViewModel by viewModels(
     ownerProducer = { requireActivity() },
-    factoryProducer = { GiftFlowViewModel.Factory(GiftFlowRepository(), requireListener<DonationPaymentComponent>().donationPaymentRepository) }
+    factoryProducer = {
+      GiftFlowViewModel.Factory(GiftFlowRepository())
+    }
   )
 
   private val lifecycleDisposable = LifecycleDisposable()
@@ -70,7 +70,7 @@ class GiftFlowStartFragment : DSLSettingsFragment(
 
       noPadTextPref(
         title = DSLSettingsText.from(
-          R.string.GiftFlowStartFragment__gift_a_badge,
+          R.string.GiftFlowStartFragment__donate_for_a_friend,
           DSLSettingsText.CenterModifier,
           DSLSettingsText.TextAppearanceModifier(R.style.Signal_Text_Headline)
         )
@@ -79,7 +79,7 @@ class GiftFlowStartFragment : DSLSettingsFragment(
       space(DimensionUnit.DP.toPixels(16f).toInt())
 
       noPadTextPref(
-        title = DSLSettingsText.from(R.string.GiftFlowStartFragment__gift_someone_a_badge, DSLSettingsText.CenterModifier)
+        title = DSLSettingsText.from(resources.getQuantityString(R.plurals.GiftFlowStartFragment__support_signal_by, 30, 30), DSLSettingsText.CenterModifier)
       )
 
       space(DimensionUnit.DP.toPixels(16f).toInt())

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowViewModel.kt

@@ -1,10 +1,7 @@
 package org.thoughtcrime.securesms.badges.gifts.flow
 
-import android.content.Intent
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import com.google.android.gms.wallet.PaymentData
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.disposables.CompositeDisposable
@@ -14,16 +11,9 @@ import io.reactivex.rxjava3.kotlin.subscribeBy
 import io.reactivex.rxjava3.subjects.PublishSubject
 import org.signal.core.util.logging.Log
 import org.signal.core.util.money.FiatMoney
-import org.signal.donations.GooglePayApi
-import org.signal.donations.GooglePayPaymentSource
-import org.thoughtcrime.securesms.badges.gifts.Gifts
 import org.thoughtcrime.securesms.badges.models.Badge
 import org.thoughtcrime.securesms.components.settings.app.subscription.DonationEvent
-import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPaymentRepository
-import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationError
-import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationErrorSource
 import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.InternetConnectionObserver
@@ -34,12 +24,9 @@ import java.util.Currency
  * Maintains state as a user works their way through the gift flow.
  */
 class GiftFlowViewModel(
-  val repository: GiftFlowRepository,
-  val donationPaymentRepository: DonationPaymentRepository
+  private val giftFlowRepository: GiftFlowRepository
 ) : ViewModel() {
 
-  private var giftToPurchase: Gift? = null
-
   private val store = RxStore(
     GiftFlowState(
       currency = SignalStore.donationsValues().getOneTimeCurrency()
@@ -83,7 +70,7 @@ class GiftFlowViewModel(
       }
     }
 
-    disposables += repository.getGiftPricing().subscribe { giftPrices ->
+    disposables += giftFlowRepository.getGiftPricing().subscribe { giftPrices ->
       store.update {
         it.copy(
           giftPrices = giftPrices,
@@ -92,11 +79,11 @@ class GiftFlowViewModel(
       }
     }
 
-    disposables += repository.getGiftBadge().subscribeBy(
+    disposables += giftFlowRepository.getGiftBadge().subscribeBy(
       onSuccess = { (giftLevel, giftBadge) ->
         store.update {
           it.copy(
-            giftLevel = giftLevel,
+            giftLevel = giftLevel.toLong(),
             giftBadge = giftBadge,
             stage = getLoadState(it, giftBadge = giftBadge)
           )
@@ -127,79 +114,6 @@ class GiftFlowViewModel(
     return store.state.giftPrices.keys.map { it.currencyCode }
   }
 
-  fun requestTokenFromGooglePay(label: String) {
-    val giftLevel = store.state.giftLevel ?: return
-    val giftPrice = store.state.giftPrices[store.state.currency] ?: return
-    val giftRecipient = store.state.recipient?.id ?: return
-
-    this.giftToPurchase = Gift(giftLevel, giftPrice)
-
-    store.update { it.copy(stage = GiftFlowState.Stage.RECIPIENT_VERIFICATION) }
-    disposables += donationPaymentRepository.verifyRecipientIsAllowedToReceiveAGift(giftRecipient)
-      .observeOn(AndroidSchedulers.mainThread())
-      .subscribeBy(
-        onComplete = {
-          store.update { it.copy(stage = GiftFlowState.Stage.TOKEN_REQUEST) }
-          donationPaymentRepository.requestTokenFromGooglePay(giftToPurchase!!.price, label, Gifts.GOOGLE_PAY_REQUEST_CODE)
-        },
-        onError = this::onPaymentFlowError
-      )
-  }
-
-  fun onActivityResult(
-    requestCode: Int,
-    resultCode: Int,
-    data: Intent?
-  ) {
-    val gift = giftToPurchase
-    giftToPurchase = null
-
-    val recipient = store.state.recipient?.id
-
-    donationPaymentRepository.onActivityResult(
-      requestCode, resultCode, data, Gifts.GOOGLE_PAY_REQUEST_CODE,
-      object : GooglePayApi.PaymentRequestCallback {
-        override fun onSuccess(paymentData: PaymentData) {
-          if (gift != null && recipient != null) {
-            eventPublisher.onNext(DonationEvent.RequestTokenSuccess)
-
-            store.update { it.copy(stage = GiftFlowState.Stage.PAYMENT_PIPELINE) }
-
-            donationPaymentRepository.continuePayment(gift.price, GooglePayPaymentSource(paymentData), recipient, store.state.additionalMessage?.toString(), gift.level).subscribeBy(
-              onError = this@GiftFlowViewModel::onPaymentFlowError,
-              onComplete = {
-                store.update { it.copy(stage = GiftFlowState.Stage.READY) }
-                eventPublisher.onNext(DonationEvent.PaymentConfirmationSuccess(store.state.giftBadge!!))
-              }
-            )
-          } else {
-            store.update { it.copy(stage = GiftFlowState.Stage.READY) }
-          }
-        }
-
-        override fun onError(googlePayException: GooglePayApi.GooglePayException) {
-          store.update { it.copy(stage = GiftFlowState.Stage.READY) }
-          DonationError.routeDonationError(ApplicationDependencies.getApplication(), DonationError.getGooglePayRequestTokenError(DonationErrorSource.GIFT, googlePayException))
-        }
-
-        override fun onCancelled() {
-          store.update { it.copy(stage = GiftFlowState.Stage.READY) }
-        }
-      }
-    )
-  }
-
-  private fun onPaymentFlowError(throwable: Throwable) {
-    store.update { it.copy(stage = GiftFlowState.Stage.READY) }
-    val donationError: DonationError = if (throwable is DonationError) {
-      throwable
-    } else {
-      Log.w(TAG, "Failed to complete payment or redemption", throwable, true)
-      DonationError.genericBadgeRedemptionFailure(DonationErrorSource.GIFT)
-    }
-    DonationError.routeDonationError(ApplicationDependencies.getApplication(), donationError)
-  }
-
   private fun getLoadState(
     oldState: GiftFlowState,
     giftPrices: Map<Currency, FiatMoney>? = null,
@@ -237,14 +151,12 @@ class GiftFlowViewModel(
   }
 
   class Factory(
-    private val repository: GiftFlowRepository,
-    private val donationPaymentRepository: DonationPaymentRepository
+    private val repository: GiftFlowRepository
   ) : ViewModelProvider.Factory {
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
       return modelClass.cast(
         GiftFlowViewModel(
-          repository,
-          donationPaymentRepository
+          repository
         )
       ) as T
     }

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftRowItem.kt

@@ -34,7 +34,7 @@ object GiftRowItem {
     override fun bind(model: Model) {
       binding.check.visible = false
       binding.badge.setBadge(model.giftBadge)
-      binding.tagline.setText(R.string.GiftRowItem__send_a_gift_badge)
+      binding.tagline.visible = false
 
       val price = FiatMoneyUtil.format(
         context.resources,

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/thanks/GiftThanksSheet.kt

@@ -62,7 +62,10 @@ class GiftThanksSheet : DSLSettingsBottomSheetFragment() {
       )
 
       noPadTextPref(
-        title = DSLSettingsText.from(getString(R.string.GiftThanksSheet__youve_gifted_a_badge_to_s, recipient.getDisplayName(requireContext())))
+        title = DSLSettingsText.from(
+          getString(R.string.GiftThanksSheet__youve_made_a_donation, recipient.getDisplayName(requireContext())),
+          DSLSettingsText.CenterModifier
+        )
       )
 
       space(DimensionUnit.DP.toPixels(37f).toInt())

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/ViewGiftRepository.kt

@@ -4,8 +4,8 @@ import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.schedulers.Schedulers
 import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialPresentation
-import org.thoughtcrime.securesms.badges.Badges
 import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.components.settings.app.subscription.getBadge
 import org.thoughtcrime.securesms.database.DatabaseObserver
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
@@ -23,24 +23,24 @@ class ViewGiftRepository {
       .fromCallable {
         ApplicationDependencies
           .getDonationsService()
-          .getGiftBadge(Locale.getDefault(), presentation.receiptLevel)
+          .getDonationsConfiguration(Locale.getDefault())
       }
       .flatMap { it.flattenResult() }
-      .map { Badges.fromServiceBadge(it) }
+      .map { it.getBadge(presentation.receiptLevel.toInt()) }
       .subscribeOn(Schedulers.io())
   }
 
   fun getGiftBadge(messageId: Long): Observable<GiftBadge> {
     return Observable.create { emitter ->
       fun refresh() {
-        val record = SignalDatabase.mms.getMessageRecord(messageId)
+        val record = SignalDatabase.messages.getMessageRecord(messageId)
         val giftBadge: GiftBadge = (record as MmsMessageRecord).giftBadge!!
 
         emitter.onNext(giftBadge)
       }
 
       val messageObserver = DatabaseObserver.MessageObserver {
-        if (it.mms && messageId == it.id) {
+        if (messageId == it.id) {
           refresh()
         }
       }

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/received/ViewReceivedGiftBottomSheet.kt

@@ -157,7 +157,7 @@ class ViewReceivedGiftBottomSheet : DSLSettingsBottomSheetFragment() {
         if (state.recipient != null && !isGiftBadgeRedeemed(state.giftBadge)) {
           noPadTextPref(
             title = DSLSettingsText.from(
-              charSequence = requireContext().getString(R.string.ViewReceivedGiftBottomSheet__s_sent_you_a_gift, state.recipient.getShortDisplayName(requireContext())),
+              charSequence = requireContext().getString(R.string.ViewReceivedGiftBottomSheet__s_made_a_donation_for_you, state.recipient.getShortDisplayName(requireContext())),
               DSLSettingsText.CenterModifier, DSLSettingsText.TitleLargeModifier
             )
           )
@@ -179,7 +179,7 @@ class ViewReceivedGiftBottomSheet : DSLSettingsBottomSheetFragment() {
   private fun DSLConfiguration.presentSubheading(recipient: Recipient) {
     noPadTextPref(
       title = DSLSettingsText.from(
-        charSequence = requireContext().getString(R.string.ViewReceivedGiftBottomSheet__youve_received_a_gift_badge, recipient.getDisplayName(requireContext())),
+        charSequence = requireContext().getString(R.string.ViewReceivedGiftBottomSheet__s_made_a_donation_to_signal, recipient.getShortDisplayName(requireContext())),
         DSLSettingsText.CenterModifier
       )
     )
@@ -206,7 +206,8 @@ class ViewReceivedGiftBottomSheet : DSLSettingsBottomSheetFragment() {
       else -> {
         customPref(
           BadgeDisplay112.Model(
-            badge = badge
+            badge = badge,
+            withDisplayText = false
           )
         )
 

app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/sent/ViewSentGiftBottomSheet.kt

@@ -75,7 +75,7 @@ class ViewSentGiftBottomSheet : DSLSettingsBottomSheetFragment() {
       if (state.recipient != null) {
         noPadTextPref(
           title = DSLSettingsText.from(
-            charSequence = getString(R.string.ViewSentGiftBottomSheet__youve_gifted_a_badge, state.recipient.getDisplayName(requireContext())),
+            charSequence = getString(R.string.ViewSentGiftBottomSheet__youve_made_a_donation_to_signal, state.recipient.getDisplayName(requireContext())),
             DSLSettingsText.CenterModifier
           )
         )

app/src/main/java/org/thoughtcrime/securesms/badges/models/LargeBadge.kt

@@ -42,8 +42,13 @@ data class LargeBadge(
     override fun bind(model: Model) {
       badge.setBadge(model.largeBadge.badge)
 
-      name.text = model.largeBadge.badge.name
-      description.text = model.largeBadge.badge.resolveDescription(model.shortName)
+      name.text = context.getString(R.string.ViewBadgeBottomSheetDialogFragment__s_supports_signal, model.shortName)
+      description.text = if (model.largeBadge.badge.isSubscription()) {
+        context.getString(R.string.ViewBadgeBottomSheetDialogFragment__s_supports_signal_with_a_monthly, model.shortName)
+      } else {
+        context.getString(R.string.ViewBadgeBottomSheetDialogFragment__s_supports_signal_with_a_donation, model.shortName)
+      }
+
       description.setLines(model.maxLines)
       description.maxLines = model.maxLines
       description.minLines = model.maxLines

app/src/main/java/org/thoughtcrime/securesms/badges/self/none/BecomeASustainerFragment.kt

@@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter
 import org.thoughtcrime.securesms.components.settings.DSLSettingsBottomSheetFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
 import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
-import org.thoughtcrime.securesms.components.settings.app.subscription.SubscriptionsRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.MonthlyDonationRepository
 import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.util.BottomSheetUtil
@@ -21,7 +21,7 @@ class BecomeASustainerFragment : DSLSettingsBottomSheetFragment() {
 
   private val viewModel: BecomeASustainerViewModel by viewModels(
     factoryProducer = {
-      BecomeASustainerViewModel.Factory(SubscriptionsRepository(ApplicationDependencies.getDonationsService()))
+      BecomeASustainerViewModel.Factory(MonthlyDonationRepository(ApplicationDependencies.getDonationsService()))
     }
   )
 

app/src/main/java/org/thoughtcrime/securesms/badges/self/none/BecomeASustainerViewModel.kt

@@ -7,10 +7,10 @@ import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import io.reactivex.rxjava3.kotlin.subscribeBy
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.components.settings.app.subscription.SubscriptionsRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.MonthlyDonationRepository
 import org.thoughtcrime.securesms.util.livedata.Store
 
-class BecomeASustainerViewModel(subscriptionsRepository: SubscriptionsRepository) : ViewModel() {
+class BecomeASustainerViewModel(subscriptionsRepository: MonthlyDonationRepository) : ViewModel() {
 
   private val store = Store(BecomeASustainerState())
 
@@ -37,7 +37,7 @@ class BecomeASustainerViewModel(subscriptionsRepository: SubscriptionsRepository
     private val TAG = Log.tag(BecomeASustainerViewModel::class.java)
   }
 
-  class Factory(private val subscriptionsRepository: SubscriptionsRepository) : ViewModelProvider.Factory {
+  class Factory(private val subscriptionsRepository: MonthlyDonationRepository) : ViewModelProvider.Factory {
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
       return modelClass.cast(BecomeASustainerViewModel(subscriptionsRepository))!!
     }

app/src/main/java/org/thoughtcrime/securesms/badges/self/overview/BadgesOverviewFragment.kt

@@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.badges.view.ViewBadgeBottomSheetDialogFragment
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
-import org.thoughtcrime.securesms.components.settings.app.subscription.SubscriptionsRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.MonthlyDonationRepository
 import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -31,7 +31,7 @@ class BadgesOverviewFragment : DSLSettingsFragment(
   private val lifecycleDisposable = LifecycleDisposable()
   private val viewModel: BadgesOverviewViewModel by viewModels(
     factoryProducer = {
-      BadgesOverviewViewModel.Factory(BadgeRepository(requireContext()), SubscriptionsRepository(ApplicationDependencies.getDonationsService()))
+      BadgesOverviewViewModel.Factory(BadgeRepository(requireContext()), MonthlyDonationRepository(ApplicationDependencies.getDonationsService()))
     }
   )
 

app/src/main/java/org/thoughtcrime/securesms/badges/self/overview/BadgesOverviewViewModel.kt

@@ -12,7 +12,7 @@ import io.reactivex.rxjava3.kotlin.subscribeBy
 import io.reactivex.rxjava3.subjects.PublishSubject
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.badges.BadgeRepository
-import org.thoughtcrime.securesms.components.settings.app.subscription.SubscriptionsRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.MonthlyDonationRepository
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.InternetConnectionObserver
@@ -23,7 +23,7 @@ private val TAG = Log.tag(BadgesOverviewViewModel::class.java)
 
 class BadgesOverviewViewModel(
   private val badgeRepository: BadgeRepository,
-  private val subscriptionsRepository: SubscriptionsRepository
+  private val subscriptionsRepository: MonthlyDonationRepository
 ) : ViewModel() {
   private val store = Store(BadgesOverviewState())
   private val eventSubject = PublishSubject.create<BadgesOverviewEvent>()
@@ -89,7 +89,7 @@ class BadgesOverviewViewModel(
 
   class Factory(
     private val badgeRepository: BadgeRepository,
-    private val subscriptionsRepository: SubscriptionsRepository
+    private val subscriptionsRepository: MonthlyDonationRepository
   ) : ViewModelProvider.Factory {
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
       return requireNotNull(modelClass.cast(BadgesOverviewViewModel(badgeRepository, subscriptionsRepository)))

app/src/main/java/org/thoughtcrime/securesms/badges/view/ViewBadgeBottomSheetDialogFragment.kt

@@ -18,12 +18,12 @@ import org.thoughtcrime.securesms.badges.models.LargeBadge
 import org.thoughtcrime.securesms.components.FixedRoundedCornerBottomSheetDialogFragment
 import org.thoughtcrime.securesms.components.ViewBinderDelegate
 import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppDonations
 import org.thoughtcrime.securesms.databinding.ViewBadgeBottomSheetDialogFragmentBinding
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.util.BottomSheetUtil
 import org.thoughtcrime.securesms.util.CommunicationActions
-import org.thoughtcrime.securesms.util.PlayServicesUtil
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import org.thoughtcrime.securesms.util.visible
@@ -57,7 +57,7 @@ class ViewBadgeBottomSheetDialogFragment : FixedRoundedCornerBottomSheetDialogFr
     }
 
     @Suppress("CascadeIf")
-    if (PlayServicesUtil.getPlayServicesStatus(requireContext()) != PlayServicesUtil.PlayServicesStatus.SUCCESS) {
+    if (!InAppDonations.hasAtLeastOnePaymentMethodAvailable()) {
       binding.noSupport.visible = true
       binding.action.icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_open_20)
       binding.action.setText(R.string.preferences__donate_to_signal)