Bump version to 5.38.7

.github/workflows/android.yml

@@ -14,12 +14,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
 
     - name: set up JDK 11
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v1
       with:
-        distribution: temurin
         java-version: 11
 
     - name: Validate Gradle Wrapper
@@ -33,7 +32,7 @@ jobs:
 
     - name: Archive reports for failed build
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v2
       with:
         name: reports
         path: '*/build/reports'

.github/workflows/docker.yml

@@ -10,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
     - name: Build image
       run: cd reproducible-builds && docker build -t signal-android . && cd ..
 
     - name: Test build
-      run: docker run --rm -v $(pwd):/project -w /project signal-android ./gradlew clean assemblePlayProdRelease
+      run: docker run --rm -v $(pwd):/project -w /project signal-android ./gradlew clean assembleRelease

app/build.gradle

@@ -10,6 +10,12 @@ apply plugin: 'kotlin-parcelize'
 apply from: 'static-ips.gradle'
 
 repositories {
+    maven {
+        url "https://raw.github.com/signalapp/maven/master/circular-progress-button/releases/"
+        content {
+            includeGroupByRegex "com\\.github\\.dmytrodanylyk\\.circular-progress-button\\.*"
+        }
+    }
     maven {
         url "https://raw.github.com/signalapp/maven/master/sqlcipher/release/"
         content {
@@ -57,15 +63,15 @@ ktlint {
     version = "0.43.2"
 }
 
-def canonicalVersionCode = 1086
-def canonicalVersionName = "5.43.0"
+def canonicalVersionCode = 1055
+def canonicalVersionName = "5.38.7"
 
 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') ]
 
@@ -151,8 +157,6 @@ android {
         exclude 'META-INF/LICENSE'
         exclude 'META-INF/NOTICE'
         exclude 'META-INF/proguard/androidx-annotations.pro'
-        exclude 'libsignal_jni.dylib'
-        exclude 'signal_jni.dll'
     }
 
 
@@ -175,7 +179,7 @@ android {
         buildConfigField "String", "SIGNAL_CDN_URL", "\"https://cdn.signal.org\""
         buildConfigField "String", "SIGNAL_CDN2_URL", "\"https://cdn2.signal.org\""
         buildConfigField "String", "SIGNAL_CONTACT_DISCOVERY_URL", "\"https://api.directory.signal.org\""
-        buildConfigField "String", "SIGNAL_CDSI_URL", "\"https://cdsi.staging.signal.org\""
+        buildConfigField "String", "SIGNAL_CDSH_URL", "\"https://cdsh.staging.signal.org\""
         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\""
@@ -192,12 +196,17 @@ android {
         buildConfigField "String[]", "SIGNAL_SFU_IPS", sfu_ips
         buildConfigField "String[]", "SIGNAL_CONTENT_PROXY_IPS", content_proxy_ips
         buildConfigField "String", "SIGNAL_AGENT", "\"OWA\""
+        buildConfigField "String", "CDSH_PUBLIC_KEY", "\"2fe57da347cd62431528daac5fbb290730fff684afc4cfc2ed90995f58cb3b74\""
+        buildConfigField "String", "CDSH_CODE_HASH", "\"2f79dc6c1599b71c70fc2d14f3ea2e3bc65134436eb87011c88845b137af673a\""
         buildConfigField "String", "CDS_MRENCLAVE", "\"c98e00a4e3ff977a56afefe7362a27e4961e4f19e211febfbb19b897e6b80b15\""
-        buildConfigField "String", "CDSI_MRENCLAVE", "\"42e36b74794abe612d698308b148ff8a7dc5fdc6ad28d99bc5024ed6ece18dfe\""
         buildConfigField "org.thoughtcrime.securesms.KbsEnclave", "KBS_ENCLAVE", "new org.thoughtcrime.securesms.KbsEnclave(\"0cedba03535b41b67729ce9924185f831d7767928a1d1689acb689bc079c375f\", " +
                                                                                                                            "\"187d2739d22be65e74b65f0055e74d31310e4267e5fac2b1246cc8beba81af39\", " +
                                                                                                                            "\"ee19f1965b1eefa3dc4204eb70c04f397755f771b8c1909d080c04dad2a6a9ba\")"
-        buildConfigField "org.thoughtcrime.securesms.KbsEnclave[]", "KBS_FALLBACKS", "new org.thoughtcrime.securesms.KbsEnclave[0]"
+        buildConfigField "org.thoughtcrime.securesms.KbsEnclave[]", "KBS_FALLBACKS", "new org.thoughtcrime.securesms.KbsEnclave[] {" +
+                "new org.thoughtcrime.securesms.KbsEnclave(\"fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe\", " +
+                                                          "\"fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe\", " +
+                                                          "\"a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87\")" +
+            "}"
         buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF\""
         buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY/JYJHRooo5CEqYKBqdFnmbTVGEkCvJKxLnjwKWf+fEPoWeQFj5ObDjcKMZf2Jm2Ae69x+ikU5gBXsRmoF94GXQ==\""
         buildConfigField "String[]", "LANGUAGES", "new String[]{\"" + autoResConfig().collect { s -> s.replace('-r', '_') }.join('", "') + '"}'
@@ -335,7 +344,11 @@ android {
             buildConfigField "org.thoughtcrime.securesms.KbsEnclave", "KBS_ENCLAVE", "new org.thoughtcrime.securesms.KbsEnclave(\"dd6f66d397d9e8cf6ec6db238e59a7be078dd50e9715427b9c89b409ffe53f99\", " +
                                                                                                                                "\"4200003414528c151e2dccafbc87aa6d3d66a5eb8f8c05979a6e97cb33cd493a\", " +
                                                                                                                                "\"ee19f1965b1eefa3dc4204eb70c04f397755f771b8c1909d080c04dad2a6a9ba\")"
-            buildConfigField "org.thoughtcrime.securesms.KbsEnclave[]", "KBS_FALLBACKS", "new org.thoughtcrime.securesms.KbsEnclave[0]"
+            buildConfigField "org.thoughtcrime.securesms.KbsEnclave[]", "KBS_FALLBACKS", "new org.thoughtcrime.securesms.KbsEnclave[] {" +
+                    "new org.thoughtcrime.securesms.KbsEnclave(\"823a3b2c037ff0cbe305cc48928cfcc97c9ed4a8ca6d49af6f7d6981fb60a4e9\", " +
+                                                              "\"16b94ac6d2b7f7b9d72928f36d798dbb35ed32e7bb14c42b4301ad0344b46f29\", " +
+                                                              "\"a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87\")" +
+                "}"
             buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx\""
             buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXQ==\""
             buildConfigField "String", "MOBILE_COIN_ENVIRONMENT", "\"testnet\""
@@ -443,7 +456,6 @@ dependencies {
     implementation project(':image-editor')
     implementation project(':donations')
     implementation project(':contacts')
-    implementation project(':qr')
 
     implementation libs.libsignal.android
     implementation libs.google.protobuf.javalite
@@ -470,6 +482,7 @@ dependencies {
     implementation libs.materialish.progress
     implementation libs.greenrobot.eventbus
     implementation libs.waitingdots
+    implementation libs.floatingactionbutton
     implementation libs.google.zxing.android.integration
     implementation libs.time.duration.picker
     implementation libs.google.zxing.core
@@ -495,6 +508,7 @@ dependencies {
     implementation libs.lottie
 
     implementation libs.stickyheadergrid
+    implementation libs.circular.progress.button
 
     implementation libs.signal.android.database.sqlcipher
     implementation libs.androidx.sqlite
@@ -527,9 +541,6 @@ dependencies {
 
     androidTestImplementation testLibs.androidx.test.ext.junit
     androidTestImplementation testLibs.espresso.core
-    androidTestImplementation testLibs.androidx.test.core
-    androidTestImplementation testLibs.androidx.test.core.ktx
-    androidTestImplementation testLibs.androidx.test.ext.junit.ktx
 
     testImplementation testLibs.espresso.core
 

app/lint.xml

@@ -41,5 +41,4 @@
         <ignore path="*/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java" />
     </issue>
 
-    <issue id="OptionalUsedAsFieldOrParameterType" severity="ignore" />
 </lint>

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

@@ -1,66 +0,0 @@
-package org.thoughtcrime.securesms.conversation
-
-import androidx.test.core.app.ActivityScenario
-import androidx.test.ext.junit.runners.AndroidJUnit4
-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.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.profiles.ProfileName
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.safety.SafetyNumberBottomSheet
-import org.thoughtcrime.securesms.testing.SignalActivityRule
-
-/**
- * Android test to help show SNC dialog quickly with custom data to make sure it displays properly.
- */
-@RunWith(AndroidJUnit4::class)
-class SafetyNumberChangeDialogPreviewer {
-
-  @get:Rule val harness = SignalActivityRule(othersCount = 10)
-
-  @Test
-  fun testShowLongName() {
-    val other: Recipient = Recipient.resolved(harness.others.first())
-
-    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.changeIdentityKey(other)
-
-    val scenario: ActivityScenario<ConversationActivity> = harness.launchActivity { putExtra("recipient_id", other.id.serialize()) }
-    scenario.onActivity {
-      SafetyNumberBottomSheet.forRecipientId(other.id).show(it.supportFragmentManager)
-    }
-
-    // Uncomment to make dialog stay on screen, otherwise will show/dismiss immediately
-    // ThreadUtil.sleep(15000)
-  }
-
-  @Test
-  fun testShowLargeSheet() {
-    val othersRecipients = harness.others.map { Recipient.resolved(it) }
-    othersRecipients.forEach { other ->
-      SignalDatabase.recipients.setProfileName(other.id, ProfileName.fromParts("My", "Name"))
-
-      harness.setVerified(other, IdentityDatabase.VerifiedStatus.VERIFIED)
-      harness.changeIdentityKey(other)
-    }
-
-    val scenario: ActivityScenario<ConversationActivity> = harness.launchActivity { putExtra("recipient_id", harness.others.first().serialize()) }
-    scenario.onActivity { conversationActivity ->
-      SafetyNumberBottomSheet
-        .forIdentityRecordsAndDestinations(
-          identityRecords = ApplicationDependencies.getProtocolStore().aci().identities().getIdentityRecords(othersRecipients).identityRecords,
-          destinations = othersRecipients.map { ContactSearchKey.RecipientSearchKey.KnownRecipient(it.id) }
-        )
-        .show(conversationActivity.supportFragmentManager)
-    }
-
-    // Uncomment to make dialog stay on screen, otherwise will show/dismiss immediately
-    // ThreadUtil.sleep(15000)
-  }
-}

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

@@ -80,6 +80,25 @@ class DistributionListDatabaseTest {
     Assert.assertEquals(StoryType.STORY_WITHOUT_REPLIES, storyType)
   }
 
+  @Test
+  fun givenStoryExistsAndMarkedNoReplies_getAllListsForContactSelectionUi_returnsStoryWithoutReplies() {
+    val id: DistributionListId? = distributionDatabase.createList("test", recipientList(1, 2, 3))
+    Assert.assertNotNull(id)
+    distributionDatabase.setAllowsReplies(id!!, false)
+
+    val records = distributionDatabase.getAllListsForContactSelectionUi(null, false)
+    Assert.assertFalse(records.first().allowsReplies)
+  }
+
+  @Test
+  fun givenStoryExists_getAllListsForContactSelectionUi_returnsStoryWithReplies() {
+    val id: DistributionListId? = distributionDatabase.createList("test", recipientList(1, 2, 3))
+    Assert.assertNotNull(id)
+
+    val records = distributionDatabase.getAllListsForContactSelectionUi(null, false)
+    Assert.assertTrue(records.first().allowsReplies)
+  }
+
   @Test(expected = IllegalStateException::class)
   fun givenStoryDoesNotExist_getStoryType_throwsIllegalStateException() {
     distributionDatabase.getStoryType(DistributionListId.from(12))

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

@@ -0,0 +1,37 @@
+package org.thoughtcrime.securesms.database
+
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.signal.core.util.money.FiatMoney
+import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
+import java.math.BigDecimal
+import java.util.Currency
+
+class DonationReceiptDatabaseTest {
+
+  private val records = listOf(
+    DonationReceiptRecord.createForBoost(FiatMoney(BigDecimal.valueOf(100), Currency.getInstance("USD"))),
+    DonationReceiptRecord.createForBoost(FiatMoney(BigDecimal.valueOf(200), Currency.getInstance("USD")))
+  )
+
+  @Test
+  fun givenNoReceipts_whenICheckHasReceipts_thenIExpectFalse() {
+    assertFalse(SignalDatabase.donationReceipts.hasReceipts())
+  }
+
+  @Test
+  fun givenOneReceipt_whenICheckHasReceipts_thenIExpectTrue() {
+    SignalDatabase.donationReceipts.addReceipt(records.first())
+    assertTrue(SignalDatabase.donationReceipts.hasReceipts())
+  }
+
+  @Test
+  fun givenMultipleReceipts_whenICheckHasReceipts_thenIExpectTrue() {
+    records.forEach {
+      SignalDatabase.donationReceipts.addReceipt(it)
+    }
+
+    assertTrue(SignalDatabase.donationReceipts.hasReceipts())
+  }
+}

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

@@ -1,188 +0,0 @@
-package org.thoughtcrime.securesms.database
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.PNI
-import org.whispersystems.signalservice.api.push.ServiceId
-import java.util.UUID
-
-@Suppress("ClassName")
-@RunWith(AndroidJUnit4::class)
-class MmsDatabaseTest_gifts {
-  private lateinit var mms: MmsDatabase
-
-  private val localAci = ACI.from(UUID.randomUUID())
-  private val localPni = PNI.from(UUID.randomUUID())
-
-  private lateinit var recipients: List<RecipientId>
-
-  @Before
-  fun setUp() {
-    mms = SignalDatabase.mms
-
-    mms.deleteAllThreads()
-
-    SignalStore.account().setAci(localAci)
-    SignalStore.account().setPni(localPni)
-
-    recipients = (0 until 5).map { SignalDatabase.recipients.getOrInsertFromServiceId(ServiceId.from(UUID.randomUUID())) }
-  }
-
-  @Test
-  fun givenNoSentGifts_whenISetOutgoingGiftsRevealed_thenIExpectEmptyList() {
-    val result = mms.setOutgoingGiftsRevealed(listOf(1))
-
-    assertTrue(result.isEmpty())
-  }
-
-  @Test
-  fun givenSentGift_whenISetOutgoingGiftsRevealed_thenIExpectNonEmptyListContainingThatGift() {
-    val messageId = MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = GiftBadge.getDefaultInstance()
-    )
-
-    val result = mms.setOutgoingGiftsRevealed(listOf(messageId))
-
-    assertTrue(result.isNotEmpty())
-    assertEquals(messageId, result.first().messageId.id)
-  }
-
-  @Test
-  fun givenViewedSentGift_whenISetOutgoingGiftsRevealed_thenIExpectEmptyList() {
-    val messageId = MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = GiftBadge.getDefaultInstance()
-    )
-    mms.setOutgoingGiftsRevealed(listOf(messageId))
-
-    val result = mms.setOutgoingGiftsRevealed(listOf(messageId))
-
-    assertTrue(result.isEmpty())
-  }
-
-  @Test
-  fun givenMultipleSentGift_whenISetOutgoingGiftsRevealedForOne_thenIExpectNonEmptyListContainingThatGift() {
-    val messageId = MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = GiftBadge.getDefaultInstance()
-    )
-
-    MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = GiftBadge.getDefaultInstance()
-    )
-
-    val result = mms.setOutgoingGiftsRevealed(listOf(messageId))
-
-    assertEquals(1, result.size)
-    assertEquals(messageId, result.first().messageId.id)
-  }
-
-  @Test
-  fun givenMultipleSentGift_whenISetOutgoingGiftsRevealedForBoth_thenIExpectNonEmptyListContainingThoseGifts() {
-    val messageId = MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = GiftBadge.getDefaultInstance()
-    )
-
-    val messageId2 = MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = GiftBadge.getDefaultInstance()
-    )
-
-    val result = mms.setOutgoingGiftsRevealed(listOf(messageId, messageId2))
-
-    assertEquals(listOf(messageId, messageId2), result.map { it.messageId.id })
-  }
-
-  @Test
-  fun givenMultipleSentGiftAndNonGift_whenISetOutgoingGiftsRevealedForBothGifts_thenIExpectNonEmptyListContainingJustThoseGifts() {
-    val messageId = MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = GiftBadge.getDefaultInstance()
-    )
-
-    val messageId2 = MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = GiftBadge.getDefaultInstance()
-    )
-
-    MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = null
-    )
-
-    val result = mms.setOutgoingGiftsRevealed(listOf(messageId, messageId2))
-
-    assertEquals(listOf(messageId, messageId2), result.map { it.messageId.id })
-  }
-
-  @Test
-  fun givenMultipleSentGiftAndNonGift_whenISetOutgoingGiftsRevealedForAllThree_thenIExpectNonEmptyListContainingJustThoseGifts() {
-    val messageId = MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = GiftBadge.getDefaultInstance()
-    )
-
-    val messageId2 = MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = GiftBadge.getDefaultInstance()
-    )
-
-    val messageId3 = MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = null
-    )
-
-    val result = mms.setOutgoingGiftsRevealed(listOf(messageId, messageId2, messageId3))
-
-    assertEquals(listOf(messageId, messageId2), result.map { it.messageId.id })
-  }
-
-  @Test
-  fun givenMultipleSentGiftAndNonGift_whenISetOutgoingGiftsRevealedForNonGift_thenIExpectEmptyList() {
-    MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = GiftBadge.getDefaultInstance()
-    )
-
-    MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = GiftBadge.getDefaultInstance()
-    )
-
-    val messageId3 = MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = null
-    )
-
-    val result = mms.setOutgoingGiftsRevealed(listOf(messageId3))
-
-    assertTrue(result.isEmpty())
-  }
-}

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

@@ -8,7 +8,6 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.thoughtcrime.securesms.database.model.DistributionListId
-import org.thoughtcrime.securesms.database.model.ParentStoryId
 import org.thoughtcrime.securesms.database.model.StoryType
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.mms.IncomingMediaMessage
@@ -192,145 +191,4 @@ class MmsDatabaseTest_stories {
 
     assertEquals(unviewedIds.reversed() + interspersedIds.reversed(), resultOrderedIds)
   }
-
-  @Test
-  fun givenNoStories_whenICheckIsOutgoingStoryAlreadyInDatabase_thenIExpectFalse() {
-    // WHEN
-    val result = mms.isOutgoingStoryAlreadyInDatabase(recipients[0], 200)
-
-    // THEN
-    assertFalse(result)
-  }
-
-  @Test
-  fun givenNoOutgoingStories_whenICheckIsOutgoingStoryAlreadyInDatabase_thenIExpectFalse() {
-    // GIVEN
-    MmsHelper.insert(
-      IncomingMediaMessage(
-        from = recipients[0],
-        sentTimeMillis = 200,
-        serverTimeMillis = 2,
-        receivedTimeMillis = 2,
-        storyType = StoryType.STORY_WITH_REPLIES,
-      ),
-      -1L
-    )
-
-    // WHEN
-    val result = mms.isOutgoingStoryAlreadyInDatabase(recipients[0], 200)
-
-    // THEN
-    assertFalse(result)
-  }
-
-  @Test
-  fun givenOutgoingStoryExistsForRecipientAndTime_whenICheckIsOutgoingStoryAlreadyInDatabase_thenIExpectTrue() {
-    // GIVEN
-    MmsHelper.insert(
-      recipient = myStory,
-      sentTimeMillis = 200,
-      storyType = StoryType.STORY_WITH_REPLIES,
-      threadId = -1L
-    )
-
-    // WHEN
-    val result = mms.isOutgoingStoryAlreadyInDatabase(myStory.id, 200)
-
-    // THEN
-    assertTrue(result)
-  }
-
-  @Test
-  fun givenAGroupStoryWithNoReplies_whenICheckHasSelfReplyInGroupStory_thenIExpectFalse() {
-    // GIVEN
-    val groupStoryId = MmsHelper.insert(
-      recipient = myStory,
-      sentTimeMillis = 200,
-      storyType = StoryType.STORY_WITH_REPLIES,
-      threadId = -1L
-    )
-
-    // WHEN
-    val result = mms.hasSelfReplyInGroupStory(groupStoryId)
-
-    // THEN
-    assertFalse(result)
-  }
-
-  @Test
-  fun givenAGroupStoryWithAReplyFromSelf_whenICheckHasSelfReplyInGroupStory_thenIExpectTrue() {
-    // GIVEN
-    val groupStoryId = MmsHelper.insert(
-      recipient = myStory,
-      sentTimeMillis = 200,
-      storyType = StoryType.STORY_WITH_REPLIES,
-      threadId = -1L
-    )
-
-    MmsHelper.insert(
-      recipient = myStory,
-      sentTimeMillis = 201,
-      storyType = StoryType.NONE,
-      parentStoryId = ParentStoryId.GroupReply(groupStoryId)
-    )
-
-    // WHEN
-    val result = mms.hasSelfReplyInGroupStory(groupStoryId)
-
-    // THEN
-    assertTrue(result)
-  }
-
-  @Test
-  fun givenAGroupStoryWithAReactionFromSelf_whenICheckHasSelfReplyInGroupStory_thenIExpectFalse() {
-    // GIVEN
-    val groupStoryId = MmsHelper.insert(
-      recipient = myStory,
-      sentTimeMillis = 200,
-      storyType = StoryType.STORY_WITH_REPLIES,
-      threadId = -1L
-    )
-
-    MmsHelper.insert(
-      recipient = myStory,
-      sentTimeMillis = 201,
-      storyType = StoryType.NONE,
-      parentStoryId = ParentStoryId.GroupReply(groupStoryId),
-      isStoryReaction = true
-    )
-
-    // WHEN
-    val result = mms.hasSelfReplyInGroupStory(groupStoryId)
-
-    // THEN
-    assertFalse(result)
-  }
-
-  @Test
-  fun givenAGroupStoryWithAReplyFromSomeoneElse_whenICheckHasSelfReplyInGroupStory_thenIExpectFalse() {
-    // GIVEN
-    val groupStoryId = MmsHelper.insert(
-      recipient = myStory,
-      sentTimeMillis = 200,
-      storyType = StoryType.STORY_WITH_REPLIES,
-      threadId = -1L
-    )
-
-    MmsHelper.insert(
-      IncomingMediaMessage(
-        from = myStory.id,
-        sentTimeMillis = 201,
-        serverTimeMillis = 201,
-        receivedTimeMillis = 202,
-        parentStoryId = ParentStoryId.GroupReply(groupStoryId)
-      ),
-      -1
-    )
-
-    // WHEN
-    val result = mms.hasSelfReplyInGroupStory(groupStoryId)
-
-    // THEN
-    assertFalse(result)
-  }
 }

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

@@ -1,8 +1,6 @@
 package org.thoughtcrime.securesms.database
 
-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.recipients.Recipient
@@ -22,10 +20,7 @@ object MmsHelper {
     viewOnce: Boolean = false,
     distributionType: Int = ThreadDatabase.DistributionTypes.DEFAULT,
     threadId: Long = 1,
-    storyType: StoryType = StoryType.NONE,
-    parentStoryId: ParentStoryId? = null,
-    isStoryReaction: Boolean = false,
-    giftBadge: GiftBadge? = null
+    storyType: StoryType = StoryType.NONE
   ): Long {
     val message = OutgoingMediaMessage(
       recipient,
@@ -37,15 +32,15 @@ object MmsHelper {
       viewOnce,
       distributionType,
       storyType,
-      parentStoryId,
-      isStoryReaction,
+      null,
+      false,
       null,
       emptyList(),
       emptyList(),
       emptyList(),
       emptySet(),
       emptySet(),
-      giftBadge
+      null
     )
 
     return insert(

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

@@ -46,7 +46,7 @@ import java.util.Optional
 import java.util.UUID
 
 @RunWith(AndroidJUnit4::class)
-class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
+class RecipientDatabaseTest_getAndPossiblyMerge {
 
   private lateinit var recipientDatabase: RecipientDatabase
   private lateinit var identityDatabase: IdentityDatabase
@@ -92,8 +92,18 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
 
   /** 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.getAndPossiblyMergeLegacy(ACI_A, null)
+  fun getAndPossiblyMerge_aciAndE164MapToNoOne_aciOnly_highTrust() {
+    val recipientId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, null, true)
+
+    val recipient = Recipient.resolved(recipientId)
+    assertEquals(ACI_A, recipient.requireServiceId())
+    assertFalse(recipient.hasE164())
+  }
+
+  /** If all you have is an ACI, you can just store that, regardless of trust level. */
+  @Test
+  fun getAndPossiblyMerge_aciAndE164MapToNoOne_aciOnly_lowTrust() {
+    val recipientId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, null, false)
 
     val recipient = Recipient.resolved(recipientId)
     assertEquals(ACI_A, recipient.requireServiceId())
@@ -102,8 +112,18 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
 
   /** 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.getAndPossiblyMergeLegacy(null, E164_A)
+  fun getAndPossiblyMerge_aciAndE164MapToNoOne_e164Only_highTrust() {
+    val recipientId: RecipientId = recipientDatabase.getAndPossiblyMerge(null, E164_A, true)
+
+    val recipient = Recipient.resolved(recipientId)
+    assertEquals(E164_A, recipient.requireE164())
+    assertFalse(recipient.hasServiceId())
+  }
+
+  /** If all you have is an E164, you can just store that, regardless of trust level. */
+  @Test
+  fun getAndPossiblyMerge_aciAndE164MapToNoOne_e164Only_lowTrust() {
+    val recipientId: RecipientId = recipientDatabase.getAndPossiblyMerge(null, E164_A, false)
 
     val recipient = Recipient.resolved(recipientId)
     assertEquals(E164_A, recipient.requireE164())
@@ -112,24 +132,34 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
 
   /** With high trust, you can associate an ACI-e164 pair. */
   @Test
-  fun getAndPossiblyMerge_aciAndE164MapToNoOne_aciAndE164() {
-    val recipientId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+  fun getAndPossiblyMerge_aciAndE164MapToNoOne_aciAndE164_highTrust() {
+    val recipientId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
 
     val recipient = Recipient.resolved(recipientId)
     assertEquals(ACI_A, recipient.requireServiceId())
     assertEquals(E164_A, recipient.requireE164())
   }
 
+  /** With low trust, you cannot associate an ACI-e164 pair, and therefore can only store the ACI. */
+  @Test
+  fun getAndPossiblyMerge_aciAndE164MapToNoOne_aciAndE164_lowTrust() {
+    val recipientId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, false)
+
+    val recipient = Recipient.resolved(recipientId)
+    assertEquals(ACI_A, recipient.requireServiceId())
+    assertFalse(recipient.hasE164())
+  }
+
   // ==============================================================
   // If the ACI maps to an existing user, but the E164 doesn't
   // ==============================================================
 
-  /** You can associate an e164 with an existing ACI. */
+  /** With high trust, you can associate an e164 with an existing ACI. */
   @Test
-  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciAndE164() {
+  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciAndE164_highTrust() {
     val existingId: RecipientId = recipientDatabase.getOrInsertFromServiceId(ACI_A)
 
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
     assertEquals(existingId, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
@@ -137,12 +167,25 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
     assertEquals(E164_A, retrievedRecipient.requireE164())
   }
 
-  /** Basically the ‘change number’ case. Update the existing user. */
+  /** With low trust, you cannot associate an ACI-e164 pair, and therefore cannot store the e164. */
   @Test
-  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciAndE164_2() {
-    val existingId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciAndE164_lowTrust() {
+    val existingId: RecipientId = recipientDatabase.getOrInsertFromServiceId(ACI_A)
 
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_B)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, false)
+    assertEquals(existingId, retrievedId)
+
+    val retrievedRecipient = Recipient.resolved(retrievedId)
+    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
+    assertFalse(retrievedRecipient.hasE164())
+  }
+
+  /** Basically the ‘change number’ case. High trust lets you update the existing user. */
+  @Test
+  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciAndE164_2_highTrust() {
+    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
+
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, true)
     assertEquals(existingId, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
@@ -150,16 +193,12 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
     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. */
+  /** Low trust means you can’t update the underlying data, but you also don’t need to create any new rows. */
   @Test
-  fun getAndPossiblyMerge_e164MapsToExistingUserButAciDoesNot_aciAndE164() {
-    val existingId: RecipientId = recipientDatabase.getOrInsertFromE164(E164_A)
+  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciAndE164_2_lowTrust() {
+    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
 
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, false)
     assertEquals(existingId, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
@@ -167,13 +206,47 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
     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. */
+  // ==============================================================
+  // If the E164 maps to an existing user, but the ACI doesn't
+  // ==============================================================
+
+  /** With high trust, you can associate an e164 with an existing ACI. */
   @Test
-  fun getAndPossiblyMerge_e164MapsToExistingUserButAciDoesNot_aciAndE164_2() {
-    val existingId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+  fun getAndPossiblyMerge_e164MapsToExistingUserButAciDoesNot_aciAndE164_highTrust() {
+    val existingId: RecipientId = recipientDatabase.getOrInsertFromE164(E164_A)
+
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
+    assertEquals(existingId, retrievedId)
+
+    val retrievedRecipient = Recipient.resolved(retrievedId)
+    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
+    assertEquals(E164_A, retrievedRecipient.requireE164())
+  }
+
+  /** With low trust, you cannot associate an ACI-e164 pair, and therefore need to create a new person with just the ACI. */
+  @Test
+  fun getAndPossiblyMerge_e164MapsToExistingUserButAciDoesNot_aciAndE164_lowTrust() {
+    val existingId: RecipientId = recipientDatabase.getOrInsertFromE164(E164_A)
+
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, false)
+    assertNotEquals(existingId, retrievedId)
+
+    val retrievedRecipient = Recipient.resolved(retrievedId)
+    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
+    assertFalse(retrievedRecipient.hasE164())
+
+    val existingRecipient = Recipient.resolved(existingId)
+    assertEquals(E164_A, existingRecipient.requireE164())
+    assertFalse(existingRecipient.hasServiceId())
+  }
+
+  /** We never change the ACI of an existing row. New ACI = new person, regardless of trust. But high trust lets us take the e164 from the current holder. */
+  @Test
+  fun getAndPossiblyMerge_e164MapsToExistingUserButAciDoesNot_aciAndE164_2_highTrust() {
+    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
     recipientDatabase.setPni(existingId, PNI_A)
 
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_B, E164_A)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_B, E164_A, true)
     recipientDatabase.setPni(retrievedId, PNI_A)
     assertNotEquals(existingId, retrievedId)
 
@@ -186,18 +259,35 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
     assertFalse(existingRecipient.hasE164())
   }
 
-  /** We never want to remove the e164 of our own contact entry. Leave the e164 alone. */
+  /** We never change the ACI of an existing row. New ACI = new person, regardless of trust. And low trust means we can’t take the e164. */
   @Test
-  fun getAndPossiblyMerge_e164MapsToExistingUserButAciDoesNot_e164BelongsToLocalUser() {
+  fun getAndPossiblyMerge_e164MapsToExistingUserButAciDoesNot_aciAndE164_2_lowTrust() {
+    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
+
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_B, E164_A, false)
+    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())
+  }
+
+  /** We never want to remove the e164 of our own contact entry. So basically treat this as a low-trust case, and leave the e164 alone. */
+  @Test
+  fun getAndPossiblyMerge_e164MapsToExistingUserButAciDoesNot_e164BelongsToLocalUser_highTrust() {
     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.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
 
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_B, E164_A)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_B, E164_A, true)
     assertNotEquals(existingId, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
@@ -213,12 +303,12 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
   // If both the ACI and E164 map to an existing user
   // ==============================================================
 
-  /** If your ACI and e164 match, you’re good. */
+  /** Regardless of trust, if your ACI and e164 match, you’re good. */
   @Test
-  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164() {
-    val existingId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_highTrust() {
+    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
 
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
     assertEquals(existingId, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
@@ -226,16 +316,16 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
     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. */
+  /** 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_bothAciAndE164MapToExistingUser_aciAndE164_merge() {
+  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_merge_highTrust() {
     val changeNumberListener = ChangeNumberListener()
     changeNumberListener.enqueue()
 
-    val existingAciId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, null)
-    val existingE164Id: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(null, E164_A)
+    val existingAciId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, null, true)
+    val existingE164Id: RecipientId = recipientDatabase.getAndPossiblyMerge(null, E164_A, true)
 
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
     assertEquals(existingAciId, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
@@ -249,16 +339,16 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
     assertFalse(changeNumberListener.numberChangeWasEnqueued)
   }
 
-  /** Same as [getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_merge], but with a number change. */
+  /** Same as [getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_merge_highTrust], but with a number change. */
   @Test
-  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_merge_changedNumber() {
+  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_merge_highTrust_changedNumber() {
     val changeNumberListener = ChangeNumberListener()
     changeNumberListener.enqueue()
 
-    val existingAciId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_B)
-    val existingE164Id: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(null, E164_A)
+    val existingAciId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, true)
+    val existingE164Id: RecipientId = recipientDatabase.getAndPossiblyMerge(null, E164_A, true)
 
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
     assertEquals(existingAciId, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
@@ -272,16 +362,34 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
     assert(changeNumberListener.numberChangeWasEnqueued)
   }
 
-  /** No new rules here, just a more complex scenario to show how different rules interact. */
+  /** Low trust means you can’t merge. If you’re retrieving a user from the table with this data, prefer the ACI one. */
   @Test
-  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_complex() {
+  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_lowTrust() {
+    val existingAciId: RecipientId = recipientDatabase.getOrInsertFromServiceId(ACI_A)
+    val existingE164Id: RecipientId = recipientDatabase.getOrInsertFromE164(E164_A)
+
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, false)
+    assertEquals(existingAciId, retrievedId)
+
+    val retrievedRecipient = Recipient.resolved(retrievedId)
+    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
+    assertFalse(retrievedRecipient.hasE164())
+
+    val existingE164Recipient = Recipient.resolved(existingE164Id)
+    assertEquals(E164_A, existingE164Recipient.requireE164())
+    assertFalse(existingE164Recipient.hasServiceId())
+  }
+
+  /** Another high trust case. No new rules here, just a more complex scenario to show how different rules interact. */
+  @Test
+  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_complex_highTrust() {
     val changeNumberListener = ChangeNumberListener()
     changeNumberListener.enqueue()
 
-    val existingId1: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_B)
-    val existingId2: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_B, E164_A)
+    val existingId1: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, true)
+    val existingId2: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_B, E164_A, true)
 
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
     assertEquals(existingId1, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
@@ -295,16 +403,34 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
     assert(changeNumberListener.numberChangeWasEnqueued)
   }
 
+  /** Another low trust case. No new rules here, just a more complex scenario to show how different rules interact. */
+  @Test
+  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_complex_lowTrust() {
+    val existingId1: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, true)
+    val existingId2: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_B, E164_A, true)
+
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, false)
+    assertEquals(existingId1, retrievedId)
+
+    val retrievedRecipient = Recipient.resolved(retrievedId)
+    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
+    assertEquals(E164_B, retrievedRecipient.requireE164())
+
+    val existingRecipient2 = Recipient.resolved(existingId2)
+    assertEquals(ACI_B, existingRecipient2.requireServiceId())
+    assertEquals(E164_A, existingRecipient2.requireE164())
+  }
+
   /**
-   * 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,
+   * Another high trust 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.getAndPossiblyMergeLegacy(ACI_A, E164_B)
-    val existingId2: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(null, E164_A)
+  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_mergeAndPhoneNumberChange_highTrust() {
+    val existingId1: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, true)
+    val existingId2: RecipientId = recipientDatabase.getAndPossiblyMerge(null, E164_A, true)
 
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
     assertEquals(existingId1, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
@@ -317,7 +443,7 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
     assertEquals(retrievedId, recipientWithId2.id)
   }
 
-  /** We never want to remove the e164 of our own contact entry. Leave the e164 alone. */
+  /** We never want to remove the e164 of our own contact entry. So basically treat this as a low-trust case, and leave the e164 alone. */
   @Test
   fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_e164BelongsToLocalUser() {
     val dataSet = KeyValueDataSet().apply {
@@ -326,10 +452,10 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
     }
     SignalStore.inject(KeyValueStore(MockKeyValuePersistentStorage.withDataSet(dataSet)))
 
-    val existingId1: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_B, E164_A)
-    val existingId2: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, null)
+    val existingId1: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_B, E164_A, true)
+    val existingId2: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, null, true)
 
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
     assertEquals(existingId2, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
@@ -343,16 +469,16 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
 
   /** 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() {
+  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciBelongsToLocalUser_highTrust_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.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
 
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_B, changeSelf = false)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, highTrust = true, changeSelf = false)
     assertEquals(existingId, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
@@ -362,16 +488,16 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
 
   /** This is a case where we're changing our own number, and it's allowed because changeSelf = true. */
   @Test
-  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciBelongsToLocalUser_changeSelfTrue() {
+  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciBelongsToLocalUser_highTrust_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.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
 
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_B, changeSelf = true)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, highTrust = true, changeSelf = true)
     assertEquals(existingId, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
@@ -381,13 +507,13 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
 
   /** Verifying a case where a change number job is expected to be enqueued. */
   @Test
-  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_changedNumber() {
+  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_highTrust_changedNumber() {
     val changeNumberListener = ChangeNumberListener()
     changeNumberListener.enqueue()
 
-    val existingId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
 
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_B)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, true)
     assertEquals(existingId, retrievedId)
 
     val retrievedRecipient = Recipient.resolved(retrievedId)
@@ -445,7 +571,7 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
     val distributionListId: DistributionListId = distributionListDatabase.createList("testlist", listOf(recipientIdE164, recipientIdAciB))!!
 
     // Merge
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A, true)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
     val retrievedThreadId: Long = threadDatabase.getThreadIdFor(retrievedId)!!
     assertEquals(recipientIdAci, retrievedId)
 
@@ -572,7 +698,7 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
 
   @Test(expected = IllegalArgumentException::class)
   fun getAndPossiblyMerge_noArgs_invalid() {
-    recipientDatabase.getAndPossiblyMergeLegacy(null, null, true)
+    recipientDatabase.getAndPossiblyMerge(null, null, true)
   }
 
   private fun ensureDbEmpty() {

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

@@ -1,671 +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.Ignore
-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_getAndPossiblyMergePnp {
-
-  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.getAndPossiblyMergePnp(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.getAndPossiblyMergePnp(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.getAndPossiblyMergePnp(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.getAndPossiblyMergePnp(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.getAndPossiblyMergePnp(ACI_A, E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergePnp(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.getAndPossiblyMergePnp(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.getAndPossiblyMergePnp(ACI_A, E164_A)
-    recipientDatabase.setPni(existingId, PNI_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergePnp(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. */
-  @Ignore("Change self isn't implemented yet!")
-  @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.getAndPossiblyMergePnp(ACI_A, E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergePnp(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.getAndPossiblyMergePnp(ACI_A, E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergePnp(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.getAndPossiblyMergePnp(ACI_A, null)
-    val existingE164Id: RecipientId = recipientDatabase.getAndPossiblyMergePnp(null, E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergePnp(ACI_A, E164_A)
-    assertEquals(existingAciId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
-    assertEquals(E164_A, retrievedRecipient.requireE164())
-
-    // TODO: Recipient remapping!
-//    val existingE164Recipient = Recipient.resolved(existingE164Id)
-//    assertEquals(retrievedId, 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.getAndPossiblyMergePnp(ACI_A, E164_B)
-    val existingE164Id: RecipientId = recipientDatabase.getAndPossiblyMergePnp(null, E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergePnp(ACI_A, E164_A)
-    assertEquals(existingAciId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
-    assertEquals(E164_A, retrievedRecipient.requireE164())
-
-    // TODO: Recipient remapping!
-//    val existingE164Recipient = Recipient.resolved(existingE164Id)
-//    assertEquals(retrievedId, existingE164Recipient.id)
-
-    // TODO: Change number!
-//    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.getAndPossiblyMergePnp(ACI_A, E164_B)
-    val existingId2: RecipientId = recipientDatabase.getAndPossiblyMergePnp(ACI_B, E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergePnp(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())
-
-    // TODO: Change number!
-//    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.getAndPossiblyMergePnp(ACI_A, E164_B)
-    val existingId2: RecipientId = recipientDatabase.getAndPossiblyMergePnp(null, E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergePnp(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)
-
-    // TODO: Recipient remapping!
-//    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. */
-  @Ignore("Change self isn't implemented yet!")
-  @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.getAndPossiblyMergePnp(ACI_B, E164_A)
-    val existingId2: RecipientId = recipientDatabase.getAndPossiblyMergePnp(ACI_A, null)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergePnp(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. */
-  @Ignore("Change self isn't implemented yet!")
-  @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.getAndPossiblyMergePnp(ACI_A, E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergePnp(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.getAndPossiblyMergePnp(ACI_A, E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergePnp(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.getAndPossiblyMergePnp(ACI_A, E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergePnp(ACI_A, E164_B)
-    assertEquals(existingId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
-    assertEquals(E164_B, retrievedRecipient.requireE164())
-
-    // TODO: Change number!
-//    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. */
-  @Ignore("This level of merging isn't implemented yet!")
-  @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.getAndPossiblyMergePnp(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.getAndPossiblyMergePnp(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,459 +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.lang.IllegalArgumentException
-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 = IllegalArgumentException::class)
-  fun noMatch_pniOnly() {
-    test {
-      process(null, PNI_A, null)
-    }
-  }
-
-  @Test(expected = IllegalArgumentException::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?) {
-      generatedIds += recipientDatabase.processPnpTuple(e164, pni, aci, false)
-    }
-
-    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/RecipientDatabaseTest_processPnpTupleToChangeSet.kt

@@ -1,810 +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.Before
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.testing.SignalDatabaseRule
-import org.thoughtcrime.securesms.util.Util
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.PNI
-import org.whispersystems.signalservice.api.push.ServiceId
-import java.lang.AssertionError
-import java.lang.IllegalArgumentException
-import java.lang.IllegalStateException
-import java.util.UUID
-
-@RunWith(AndroidJUnit4::class)
-class RecipientDatabaseTest_processPnpTupleToChangeSet {
-
-  @Rule
-  @JvmField
-  val databaseRule = SignalDatabaseRule(deleteAllThreadsOnEachRun = false)
-
-  private lateinit var db: RecipientDatabase
-
-  @Before
-  fun setup() {
-    db = SignalDatabase.recipients
-  }
-
-  @Test
-  fun noMatch_e164Only() {
-    val changeSet = db.processPnpTupleToChangeSet(E164_A, null, null, pniVerified = false)
-
-    assertEquals(
-      PnpChangeSet(
-        id = PnpIdResolver.PnpInsert(E164_A, null, null)
-      ),
-      changeSet
-    )
-  }
-
-  @Test
-  fun noMatch_e164AndPni() {
-    val changeSet = db.processPnpTupleToChangeSet(E164_A, PNI_A, null, pniVerified = false)
-
-    assertEquals(
-      PnpChangeSet(
-        id = PnpIdResolver.PnpInsert(E164_A, PNI_A, null)
-      ),
-      changeSet
-    )
-  }
-
-  @Test
-  fun noMatch_aciOnly() {
-    val changeSet = db.processPnpTupleToChangeSet(null, null, ACI_A, pniVerified = false)
-
-    assertEquals(
-      PnpChangeSet(
-        id = PnpIdResolver.PnpInsert(null, null, ACI_A)
-      ),
-      changeSet
-    )
-  }
-
-  @Test(expected = IllegalArgumentException::class)
-  fun noMatch_pniOnly() {
-    db.processPnpTupleToChangeSet(null, PNI_A, null, pniVerified = false)
-  }
-
-  @Test(expected = IllegalArgumentException::class)
-  fun noMatch_noData() {
-    db.processPnpTupleToChangeSet(null, null, null, pniVerified = false)
-  }
-
-  @Test
-  fun noMatch_allFields() {
-    val changeSet = db.processPnpTupleToChangeSet(E164_A, PNI_A, ACI_A, pniVerified = false)
-
-    assertEquals(
-      PnpChangeSet(
-        id = PnpIdResolver.PnpInsert(E164_A, PNI_A, ACI_A)
-      ),
-      changeSet
-    )
-  }
-
-  @Test
-  fun fullMatch() {
-    val result = applyAndAssert(
-      Input(E164_A, PNI_A, ACI_A),
-      Update(E164_A, PNI_A, ACI_A),
-      Output(E164_A, PNI_A, ACI_A)
-    )
-
-    assertEquals(
-      PnpChangeSet(
-        id = PnpIdResolver.PnpNoopId(result.id)
-      ),
-      result.changeSet
-    )
-  }
-
-  @Test
-  fun onlyE164Matches() {
-    val result = applyAndAssert(
-      Input(E164_A, null, null),
-      Update(E164_A, PNI_A, ACI_A),
-      Output(E164_A, PNI_A, ACI_A)
-    )
-
-    assertEquals(
-      PnpChangeSet(
-        id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
-          PnpOperation.SetPni(result.id, PNI_A),
-          PnpOperation.SetAci(result.id, ACI_A)
-        )
-      ),
-      result.changeSet
-    )
-  }
-
-  @Test
-  fun onlyE164Matches_pniChanges_noAciProvided_existingPniSession() {
-    val result = applyAndAssert(
-      Input(E164_A, PNI_B, null, pniSession = true),
-      Update(E164_A, PNI_A, null),
-      Output(E164_A, PNI_A, null)
-    )
-
-    assertEquals(
-      PnpChangeSet(
-        id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
-          PnpOperation.SetPni(result.id, PNI_A),
-          PnpOperation.SessionSwitchoverInsert(result.id)
-        )
-      ),
-      result.changeSet
-    )
-  }
-
-  @Test
-  fun onlyE164Matches_pniChanges_noAciProvided_noPniSession() {
-    val result = applyAndAssert(
-      Input(E164_A, PNI_B, null),
-      Update(E164_A, PNI_A, null),
-      Output(E164_A, PNI_A, null)
-    )
-
-    assertEquals(
-      PnpChangeSet(
-        id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
-          PnpOperation.SetPni(result.id, PNI_A)
-        )
-      ),
-      result.changeSet
-    )
-  }
-
-  @Test
-  fun e164AndPniMatches_noExistingSession() {
-    val result = applyAndAssert(
-      Input(E164_A, PNI_A, null),
-      Update(E164_A, PNI_A, ACI_A),
-      Output(E164_A, PNI_A, ACI_A)
-    )
-
-    assertEquals(
-      PnpChangeSet(
-        id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
-          PnpOperation.SetAci(result.id, ACI_A)
-        )
-      ),
-      result.changeSet
-    )
-  }
-
-  @Test
-  fun e164AndPniMatches_existingPniSession() {
-    val result = applyAndAssert(
-      Input(E164_A, PNI_A, null, pniSession = true),
-      Update(E164_A, PNI_A, ACI_A),
-      Output(E164_A, PNI_A, ACI_A)
-    )
-
-    assertEquals(
-      PnpChangeSet(
-        id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
-          PnpOperation.SetAci(result.id, ACI_A),
-          PnpOperation.SessionSwitchoverInsert(result.id)
-        )
-      ),
-      result.changeSet
-    )
-  }
-
-  @Test
-  fun e164AndAciMatches() {
-    val result = applyAndAssert(
-      Input(E164_A, null, ACI_A),
-      Update(E164_A, PNI_A, ACI_A),
-      Output(E164_A, PNI_A, ACI_A)
-    )
-
-    assertEquals(
-      PnpChangeSet(
-        id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
-          PnpOperation.SetPni(result.id, PNI_A)
-        )
-      ),
-      result.changeSet
-    )
-  }
-
-  @Test
-  fun onlyPniMatches_noExistingSession() {
-    val result = applyAndAssert(
-      Input(null, PNI_A, null),
-      Update(E164_A, PNI_A, ACI_A),
-      Output(E164_A, PNI_A, ACI_A)
-    )
-
-    assertEquals(
-      PnpChangeSet(
-        id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
-          PnpOperation.SetE164(result.id, E164_A),
-          PnpOperation.SetAci(result.id, ACI_A)
-        )
-      ),
-      result.changeSet
-    )
-  }
-
-  @Test
-  fun onlyPniMatches_existingPniSession() {
-    val result = applyAndAssert(
-      Input(null, PNI_A, null, pniSession = true),
-      Update(E164_A, PNI_A, ACI_A),
-      Output(E164_A, PNI_A, ACI_A)
-    )
-
-    assertEquals(
-      PnpChangeSet(
-        id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
-          PnpOperation.SetE164(result.id, E164_A),
-          PnpOperation.SetAci(result.id, ACI_A),
-          PnpOperation.SessionSwitchoverInsert(result.id)
-        )
-      ),
-      result.changeSet
-    )
-  }
-
-  @Test
-  fun onlyPniMatches_existingPniSession_changeNumber() {
-    val result = applyAndAssert(
-      Input(E164_B, PNI_A, null, pniSession = true),
-      Update(E164_A, PNI_A, ACI_A),
-      Output(E164_A, PNI_A, ACI_A)
-    )
-
-    assertEquals(
-      PnpChangeSet(
-        id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
-          PnpOperation.SetE164(result.id, E164_A),
-          PnpOperation.SetAci(result.id, ACI_A),
-          PnpOperation.ChangeNumberInsert(
-            recipientId = result.id,
-            oldE164 = E164_B,
-            newE164 = E164_A
-          ),
-          PnpOperation.SessionSwitchoverInsert(result.id)
-        )
-      ),
-      result.changeSet
-    )
-  }
-
-  @Test
-  fun pniAndAciMatches() {
-    val result = applyAndAssert(
-      Input(null, PNI_A, ACI_A),
-      Update(E164_A, PNI_A, ACI_A),
-      Output(E164_A, PNI_A, ACI_A)
-    )
-
-    assertEquals(
-      PnpChangeSet(
-        id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
-          PnpOperation.SetE164(result.id, E164_A),
-        )
-      ),
-      result.changeSet
-    )
-  }
-
-  @Test
-  fun pniAndAciMatches_changeNumber() {
-    val result = applyAndAssert(
-      Input(E164_B, PNI_A, ACI_A),
-      Update(E164_A, PNI_A, ACI_A),
-      Output(E164_A, PNI_A, ACI_A)
-    )
-
-    assertEquals(
-      PnpChangeSet(
-        id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
-          PnpOperation.SetE164(result.id, E164_A),
-          PnpOperation.ChangeNumberInsert(
-            recipientId = result.id,
-            oldE164 = E164_B,
-            newE164 = E164_A
-          )
-        )
-      ),
-      result.changeSet
-    )
-  }
-
-  @Test
-  fun onlyAciMatches() {
-    val result = applyAndAssert(
-      Input(null, null, ACI_A),
-      Update(E164_A, PNI_A, ACI_A),
-      Output(E164_A, PNI_A, ACI_A)
-    )
-
-    assertEquals(
-      PnpChangeSet(
-        id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
-          PnpOperation.SetE164(result.id, E164_A),
-          PnpOperation.SetPni(result.id, PNI_A)
-        )
-      ),
-      result.changeSet
-    )
-  }
-
-  @Test
-  fun onlyAciMatches_changeNumber() {
-    val result = applyAndAssert(
-      Input(E164_B, null, ACI_A),
-      Update(E164_A, PNI_A, ACI_A),
-      Output(E164_A, PNI_A, ACI_A)
-    )
-
-    assertEquals(
-      PnpChangeSet(
-        id = PnpIdResolver.PnpNoopId(result.id),
-        operations = listOf(
-          PnpOperation.SetE164(result.id, E164_A),
-          PnpOperation.SetPni(result.id, PNI_A),
-          PnpOperation.ChangeNumberInsert(
-            recipientId = result.id,
-            oldE164 = E164_B,
-            newE164 = E164_A
-          )
-        )
-      ),
-      result.changeSet
-    )
-  }
-
-  @Test
-  fun merge_e164Only_pniOnly_aciOnly() {
-    val result = applyAndAssert(
-      listOf(
-        Input(E164_A, null, null),
-        Input(null, PNI_A, null),
-        Input(null, null, ACI_A)
-      ),
-      Update(E164_A, PNI_A, ACI_A),
-      Output(E164_A, PNI_A, ACI_A)
-    )
-
-    assertEquals(
-      PnpChangeSet(
-        id = PnpIdResolver.PnpNoopId(result.thirdId),
-        operations = listOf(
-          PnpOperation.Merge(
-            primaryId = result.firstId,
-            secondaryId = result.secondId
-          ),
-          PnpOperation.Merge(
-            primaryId = result.thirdId,
-            secondaryId = result.firstId
-          )
-        )
-      ),
-      result.changeSet
-    )
-  }
-
-  @Test
-  fun merge_e164Only_pniOnly_noAciProvided() {
-    val result = applyAndAssert(
-      listOf(
-        Input(E164_A, null, null),
-        Input(null, PNI_A, null),
-      ),
-      Update(E164_A, PNI_A, null),
-      Output(E164_A, PNI_A, null)
-    )
-
-    assertEquals(
-      PnpChangeSet(
-        id = PnpIdResolver.PnpNoopId(result.firstId),
-        operations = listOf(
-          PnpOperation.Merge(
-            primaryId = result.firstId,
-            secondaryId = result.secondId
-          )
-        )
-      ),
-      result.changeSet
-    )
-  }
-
-  @Test
-  fun merge_e164Only_pniOnly_aciProvidedButNoAciRecord() {
-    val result = applyAndAssert(
-      listOf(
-        Input(E164_A, null, null),
-        Input(null, PNI_A, null),
-      ),
-      Update(E164_A, PNI_A, ACI_A),
-      Output(E164_A, PNI_A, ACI_A)
-    )
-
-    assertEquals(
-      PnpChangeSet(
-        id = PnpIdResolver.PnpNoopId(result.firstId),
-        operations = listOf(
-          PnpOperation.Merge(
-            primaryId = result.firstId,
-            secondaryId = result.secondId
-          ),
-          PnpOperation.SetAci(
-            recipientId = result.firstId,
-            aci = ACI_A
-          )
-        )
-      ),
-      result.changeSet
-    )
-  }
-
-  @Test
-  fun merge_e164Only_pniAndE164_noAciProvided() {
-    val result = applyAndAssert(
-      listOf(
-        Input(E164_A, null, null),
-        Input(E164_B, PNI_A, null),
-      ),
-      Update(E164_A, PNI_A, null),
-      Output(E164_A, PNI_A, null)
-    )
-
-    assertEquals(
-      PnpChangeSet(
-        id = PnpIdResolver.PnpNoopId(result.firstId),
-        operations = listOf(
-          PnpOperation.RemovePni(result.secondId),
-          PnpOperation.SetPni(
-            recipientId = result.firstId,
-            pni = PNI_A
-          ),
-        )
-      ),
-      result.changeSet
-    )
-  }
-
-  @Test
-  fun merge_e164AndPni_pniOnly_noAciProvided() {
-    val result = applyAndAssert(
-      listOf(
-        Input(E164_A, PNI_B, null),
-        Input(null, PNI_A, null),
-      ),
-      Update(E164_A, PNI_A, null),
-      Output(E164_A, PNI_A, null)
-    )
-
-    assertEquals(
-      PnpChangeSet(
-        id = PnpIdResolver.PnpNoopId(result.firstId),
-        operations = listOf(
-          PnpOperation.RemovePni(result.firstId),
-          PnpOperation.Merge(
-            primaryId = result.firstId,
-            secondaryId = result.secondId
-          ),
-        )
-      ),
-      result.changeSet
-    )
-  }
-
-  @Test
-  fun merge_e164AndPni_e164AndPni_noAciProvided_noSessions() {
-    val result = applyAndAssert(
-      listOf(
-        Input(E164_A, PNI_B, null),
-        Input(E164_B, PNI_A, null),
-      ),
-      Update(E164_A, PNI_A, null),
-      Output(E164_A, PNI_A, null)
-    )
-
-    assertEquals(
-      PnpChangeSet(
-        id = PnpIdResolver.PnpNoopId(result.firstId),
-        operations = listOf(
-          PnpOperation.RemovePni(result.secondId),
-          PnpOperation.SetPni(result.firstId, PNI_A)
-        )
-      ),
-      result.changeSet
-    )
-  }
-
-  @Test
-  fun merge_e164AndPni_e164AndPni_noAciProvided_sessionsExist() {
-    val result = applyAndAssert(
-      listOf(
-        Input(E164_A, PNI_B, null, pniSession = true),
-        Input(E164_B, PNI_A, null, pniSession = true),
-      ),
-      Update(E164_A, PNI_A, null),
-      Output(E164_A, PNI_A, null)
-    )
-
-    assertEquals(
-      PnpChangeSet(
-        id = PnpIdResolver.PnpNoopId(result.firstId),
-        operations = listOf(
-          PnpOperation.RemovePni(result.secondId),
-          PnpOperation.SetPni(result.firstId, PNI_A),
-          PnpOperation.SessionSwitchoverInsert(result.secondId),
-          PnpOperation.SessionSwitchoverInsert(result.firstId)
-        )
-      ),
-      result.changeSet
-    )
-  }
-
-  @Test
-  fun merge_e164AndPni_aciOnly() {
-    val result = applyAndAssert(
-      listOf(
-        Input(E164_A, PNI_A, null),
-        Input(null, null, ACI_A),
-      ),
-      Update(E164_A, PNI_A, ACI_A),
-      Output(E164_A, PNI_A, ACI_A)
-    )
-
-    assertEquals(
-      PnpChangeSet(
-        id = PnpIdResolver.PnpNoopId(result.secondId),
-        operations = listOf(
-          PnpOperation.Merge(
-            primaryId = result.secondId,
-            secondaryId = result.firstId
-          ),
-        )
-      ),
-      result.changeSet
-    )
-  }
-
-  @Test
-  fun merge_e164AndPni_aciOnly_e164RecordHasSeparateE164() {
-    val result = applyAndAssert(
-      listOf(
-        Input(E164_B, PNI_A, null),
-        Input(null, null, ACI_A),
-      ),
-      Update(E164_A, PNI_A, ACI_A),
-      Output(E164_A, PNI_A, ACI_A)
-    )
-
-    assertEquals(
-      PnpChangeSet(
-        id = PnpIdResolver.PnpNoopId(result.secondId),
-        operations = listOf(
-          PnpOperation.RemovePni(result.firstId),
-          PnpOperation.Update(
-            recipientId = result.secondId,
-            e164 = E164_A,
-            pni = PNI_A,
-            aci = ACI_A
-          )
-        )
-      ),
-      result.changeSet
-    )
-  }
-
-  @Test
-  fun merge_e164AndPni_e164AndPniAndAci_changeNumber() {
-    val result = applyAndAssert(
-      listOf(
-        Input(E164_A, PNI_A, null),
-        Input(E164_B, PNI_B, ACI_A),
-      ),
-      Update(E164_A, PNI_A, ACI_A),
-      Output(E164_A, PNI_A, ACI_A)
-    )
-
-    assertEquals(
-      PnpChangeSet(
-        id = PnpIdResolver.PnpNoopId(result.secondId),
-        operations = listOf(
-          PnpOperation.RemovePni(result.secondId),
-          PnpOperation.RemoveE164(result.secondId),
-          PnpOperation.Merge(
-            primaryId = result.secondId,
-            secondaryId = result.firstId
-          ),
-          PnpOperation.ChangeNumberInsert(
-            recipientId = result.secondId,
-            oldE164 = E164_B,
-            newE164 = E164_A
-          )
-        )
-      ),
-      result.changeSet
-    )
-  }
-
-  @Test
-  fun merge_e164AndPni_e164Aci_changeNumber() {
-    val result = applyAndAssert(
-      listOf(
-        Input(E164_A, PNI_A, null),
-        Input(E164_B, null, ACI_A),
-      ),
-      Update(E164_A, PNI_A, ACI_A),
-      Output(E164_A, PNI_A, ACI_A)
-    )
-
-    assertEquals(
-      PnpChangeSet(
-        id = PnpIdResolver.PnpNoopId(result.secondId),
-        operations = listOf(
-          PnpOperation.RemoveE164(result.secondId),
-          PnpOperation.Merge(
-            primaryId = result.secondId,
-            secondaryId = result.firstId
-          ),
-          PnpOperation.ChangeNumberInsert(
-            recipientId = result.secondId,
-            oldE164 = E164_B,
-            newE164 = E164_A
-          )
-        )
-      ),
-      result.changeSet
-    )
-  }
-
-  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 insertMockSessionFor(account: ServiceId, address: ServiceId) {
-    SignalDatabase.rawDatabase.insert(
-      SessionDatabase.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)
-      )
-    )
-  }
-
-  data class Input(val e164: String?, val pni: PNI?, val aci: ACI?, val pniSession: Boolean = false, val aciSession: Boolean = false)
-  data class Update(val e164: String?, val pni: PNI?, val aci: ACI?, val pniVerified: Boolean = false)
-  data class Output(val e164: String?, val pni: PNI?, val aci: ACI?)
-  data class PnpMatchResult(val ids: List<RecipientId>, val changeSet: PnpChangeSet) {
-    val id
-      get() = if (ids.size == 1) {
-        ids[0]
-      } else {
-        throw IllegalStateException("There are multiple IDs, but you assumed 1!")
-      }
-
-    val firstId
-      get() = ids[0]
-
-    val secondId
-      get() = ids[1]
-
-    val thirdId
-      get() = ids[2]
-  }
-
-  private fun applyAndAssert(input: Input, update: Update, output: Output): PnpMatchResult {
-    return applyAndAssert(listOf(input), update, output)
-  }
-
-  /**
-   * Helper method that will call insert your recipients, call [RecipientDatabase.processPnpTupleToChangeSet] with your params,
-   * and then verify your output matches what you expect.
-   *
-   * It results the inserted ID's and changeset for additional verification.
-   *
-   * But basically this is here to make the tests more readable. It gives you a clear list of:
-   * - input
-   * - update
-   * - output
-   *
-   * that you can spot check easily.
-   *
-   * Important: The output will only include records that contain fields from the input. That means
-   * for:
-   *
-   * Input:  E164_B, PNI_A, null
-   * Update: E164_A, PNI_A, null
-   *
-   * You will get:
-   * Output: E164_A, PNI_A, null
-   *
-   * Even though there was an update that will also result in the row (E164_B, null, null)
-   */
-  private fun applyAndAssert(input: List<Input>, update: Update, output: Output): PnpMatchResult {
-    val ids = input.map { insert(it.e164, it.pni, it.aci) }
-
-    input
-      .filter { it.pniSession }
-      .forEach { insertMockSessionFor(databaseRule.localAci, it.pni!!) }
-
-    input
-      .filter { it.aciSession }
-      .forEach { insertMockSessionFor(databaseRule.localAci, it.aci!!) }
-
-    val byE164 = update.e164?.let { db.getByE164(it).orElse(null) }
-    val byPniSid = update.pni?.let { db.getByServiceId(it).orElse(null) }
-    val byAciSid = update.aci?.let { db.getByServiceId(it).orElse(null) }
-
-    val data = PnpDataSet(
-      e164 = update.e164,
-      pni = update.pni,
-      aci = update.aci,
-      byE164 = byE164,
-      byPniSid = byPniSid,
-      byPniOnly = update.pni?.let { db.getByPni(it).orElse(null) },
-      byAciSid = byAciSid,
-      e164Record = byE164?.let { db.getRecord(it) },
-      pniSidRecord = byPniSid?.let { db.getRecord(it) },
-      aciSidRecord = byAciSid?.let { db.getRecord(it) }
-    )
-    val changeSet = db.processPnpTupleToChangeSet(update.e164, update.pni, update.aci, pniVerified = update.pniVerified)
-
-    val finalData = data.perform(changeSet.operations)
-
-    val finalRecords = setOfNotNull(finalData.e164Record, finalData.pniSidRecord, finalData.aciSidRecord)
-    assertEquals("There's still multiple records in the resulting record set! $finalRecords", 1, finalRecords.size)
-
-    finalRecords.firstOrNull { record -> record.e164 == output.e164 && record.pni == output.pni && record.serviceId == (output.aci ?: output.pni) }
-      ?: throw AssertionError("Expected output was not found in the result set! Expected: $output")
-
-    return PnpMatchResult(
-      ids = ids,
-      changeSet = changeSet
-    )
-  }
-
-  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/SQLiteDatabaseTest.kt

@@ -122,62 +122,4 @@ class SQLiteDatabaseTest {
     assertTrue(hasRun1.get())
     assertFalse(hasRun2.get())
   }
-
-  @Test
-  fun runPostSuccessfulTransaction_runsAndPerformsAnotherTransaction() {
-    val hasRun = AtomicBoolean(false)
-
-    db.beginTransaction()
-
-    db.runPostSuccessfulTransaction {
-      try {
-        db.beginTransaction()
-        hasRun.set(true)
-        db.setTransactionSuccessful()
-      } finally {
-        db.endTransaction()
-      }
-    }
-
-    assertFalse(hasRun.get())
-
-    db.setTransactionSuccessful()
-    db.endTransaction()
-
-    assertTrue(hasRun.get())
-  }
-
-  @Test
-  fun runPostSuccessfulTransaction_runsAndPerformsAnotherTransactionAndRunPostNested() {
-    val hasRun1 = AtomicBoolean(false)
-    val hasRun2 = AtomicBoolean(false)
-
-    db.beginTransaction()
-
-    db.runPostSuccessfulTransaction {
-      db.beginTransaction()
-
-      db.runPostSuccessfulTransaction {
-        assertTrue(hasRun1.get())
-        assertFalse(hasRun2.get())
-        hasRun2.set(true)
-      }
-
-      assertFalse(hasRun1.get())
-      hasRun1.set(true)
-      assertFalse(hasRun2.get())
-
-      db.setTransactionSuccessful()
-      db.endTransaction()
-    }
-
-    assertFalse(hasRun1.get())
-    assertFalse(hasRun2.get())
-
-    db.setTransactionSuccessful()
-    db.endTransaction()
-
-    assertTrue(hasRun1.get())
-    assertTrue(hasRun2.get())
-  }
 }

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

@@ -1,74 +0,0 @@
-package org.thoughtcrime.securesms.database
-
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.signal.core.util.CursorUtil
-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 {
-
-  @Rule
-  @JvmField
-  val databaseRule = SignalDatabaseRule()
-
-  private lateinit var recipient: Recipient
-
-  @Before
-  fun setUp() {
-    recipient = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromServiceId(ServiceId.from(UUID.randomUUID())))
-  }
-
-  @Test
-  fun givenAPinnedThread_whenIDeleteTheLastMessage_thenIDoNotDeleteOrUnpinTheThread() {
-    // GIVEN
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
-    val messageId = MmsHelper.insert(recipient = recipient, threadId = threadId)
-    SignalDatabase.threads.pinConversations(listOf(threadId))
-
-    // WHEN
-    SignalDatabase.mms.deleteMessage(messageId)
-
-    // THEN
-    val pinned = SignalDatabase.threads.pinnedThreadIds
-    assertTrue(threadId in pinned)
-  }
-
-  @Test
-  fun givenAPinnedThread_whenIDeleteTheLastMessage_thenIExpectTheThreadInUnarchivedCount() {
-    // GIVEN
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
-    val messageId = MmsHelper.insert(recipient = recipient, threadId = threadId)
-    SignalDatabase.threads.pinConversations(listOf(threadId))
-
-    // WHEN
-    SignalDatabase.mms.deleteMessage(messageId)
-
-    // THEN
-    val unarchivedCount = SignalDatabase.threads.unarchivedConversationListCount
-    assertEquals(1, unarchivedCount)
-  }
-
-  @Test
-  fun givenAPinnedThread_whenIDeleteTheLastMessage_thenIExpectPinnedThreadInUnarchivedList() {
-    // GIVEN
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
-    val messageId = MmsHelper.insert(recipient = recipient, threadId = threadId)
-    SignalDatabase.threads.pinConversations(listOf(threadId))
-
-    // WHEN
-    SignalDatabase.mms.deleteMessage(messageId)
-
-    // THEN
-    SignalDatabase.threads.getUnarchivedConversationList(true, 0, 1).use {
-      it.moveToFirst()
-      assertEquals(threadId, CursorUtil.requireLong(it, ThreadDatabase.ID))
-    }
-  }
-}

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

@@ -1,139 +0,0 @@
-package org.thoughtcrime.securesms.safety
-
-import io.reactivex.rxjava3.plugins.RxJavaPlugins
-import io.reactivex.rxjava3.schedulers.TestScheduler
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey
-import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.testing.SignalActivityRule
-
-class SafetyNumberBottomSheetRepositoryTest {
-
-  @get:Rule val harness = SignalActivityRule(othersCount = 10)
-
-  private val testScheduler = TestScheduler()
-  private val subjectUnderTest = SafetyNumberBottomSheetRepository()
-
-  @Before
-  fun setUp() {
-    RxJavaPlugins.setInitIoSchedulerHandler { testScheduler }
-    RxJavaPlugins.setIoSchedulerHandler { testScheduler }
-  }
-
-  @Test
-  fun givenIOnlyHave1to1Destinations_whenIGetBuckets_thenIOnlyHaveContactsBucketContainingAllRecipients() {
-    val recipients = harness.others
-    val destinations = harness.others.map { ContactSearchKey.RecipientSearchKey.KnownRecipient(it) }
-
-    val result = subjectUnderTest.getBuckets(recipients, destinations).test()
-
-    testScheduler.triggerActions()
-
-    result.assertValueAt(1) { map ->
-      assertMatch(map, mapOf(SafetyNumberBucket.ContactsBucket to harness.others))
-    }
-  }
-
-  @Test
-  fun givenIOnlyHaveASingle1to1Destination_whenIGetBuckets_thenIOnlyHaveContactsBucketContainingAllRecipients() {
-    // GIVEN
-    val recipients = harness.others
-    val destination = harness.others.take(1).map { ContactSearchKey.RecipientSearchKey.KnownRecipient(it) }
-
-    // WHEN
-    val result = subjectUnderTest.getBuckets(recipients, destination).test(1)
-    testScheduler.triggerActions()
-
-    // THEN
-    result.assertValue { map ->
-      assertMatch(map, mapOf(SafetyNumberBucket.ContactsBucket to harness.others.take(1)))
-    }
-  }
-
-  @Test
-  fun givenIHaveADistributionListDestination_whenIGetBuckets_thenIOnlyHaveDistributionListDestinationWithCorrespondingMembers() {
-    // GIVEN
-    val distributionListMembers = harness.others.take(5)
-    val distributionList = SignalDatabase.distributionLists.createList("ListA", distributionListMembers)!!
-    val destinationKey = ContactSearchKey.RecipientSearchKey.Story(SignalDatabase.distributionLists.getRecipientId(distributionList)!!)
-
-    // WHEN
-    val result = subjectUnderTest.getBuckets(harness.others, listOf(destinationKey)).test(1)
-    testScheduler.triggerActions()
-
-    // THEN
-    result.assertValue { map ->
-      assertMatch(
-        map,
-        mapOf(
-          SafetyNumberBucket.DistributionListBucket(distributionList, "ListA") to harness.others.take(5)
-        )
-      )
-    }
-  }
-
-  @Test
-  fun givenIHaveADistributionListDestinationAndIGetBuckets_whenIRemoveFromStories_thenIOnlyHaveDistributionListDestinationWithCorrespondingMembers() {
-    // GIVEN
-    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 testSubscriber = subjectUnderTest.getBuckets(distributionListMembers, listOf(destinationKey)).test(2)
-    testScheduler.triggerActions()
-
-    // WHEN
-    subjectUnderTest.removeFromStories(toRemove, listOf(destinationKey)).subscribe()
-    testSubscriber.request(1)
-    testScheduler.triggerActions()
-    testSubscriber.awaitCount(3)
-
-    // THEN
-    testSubscriber.assertValueAt(2) { map ->
-      assertMatch(
-        map,
-        mapOf(
-          SafetyNumberBucket.DistributionListBucket(distributionList, "ListA") to distributionListMembers.dropLast(1)
-        )
-      )
-    }
-  }
-
-  @Test
-  fun givenIHaveADistributionListDestinationAndIGetBuckets_whenIRemoveAllFromStory_thenINoLongerHaveEntryForThatBucket() {
-    // GIVEN
-    val distributionListMembers = harness.others.take(5)
-    val distributionList = SignalDatabase.distributionLists.createList("ListA", distributionListMembers)!!
-    val destinationKey = ContactSearchKey.RecipientSearchKey.Story(SignalDatabase.distributionLists.getRecipientId(distributionList)!!)
-    val testSubscriber = subjectUnderTest.getBuckets(distributionListMembers, listOf(destinationKey)).test(2)
-    testScheduler.triggerActions()
-
-    // WHEN
-    subjectUnderTest.removeAllFromStory(distributionListMembers, distributionList).subscribe()
-    testSubscriber.request(1)
-    testScheduler.triggerActions()
-    testSubscriber.awaitCount(3)
-
-    // THEN
-    testSubscriber.assertValueAt(2) { map ->
-      assertMatch(map, mapOf())
-    }
-  }
-
-  private fun assertMatch(
-    resultMap: Map<SafetyNumberBucket, List<SafetyNumberRecipient>>,
-    idMap: Map<SafetyNumberBucket, List<RecipientId>>
-  ): Boolean {
-    assertEquals("Result and ID Maps had different key sets", idMap.keys, resultMap.keys)
-
-    resultMap.forEach { (bucket, members) ->
-      assertEquals("Mismatch in Bucket $bucket", idMap[bucket], members.map { it.recipient.id })
-    }
-
-    return true
-  }
-}

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

@@ -1,125 +0,0 @@
-package org.thoughtcrime.securesms.testing
-
-import android.app.Activity
-import android.app.Application
-import android.content.Context
-import android.content.Intent
-import android.content.SharedPreferences
-import android.preference.PreferenceManager
-import androidx.test.core.app.ActivityScenario
-import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.rules.ExternalResource
-import org.signal.libsignal.protocol.IdentityKey
-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.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.net.DeviceTransferBlockingInterceptor
-import org.thoughtcrime.securesms.profiles.ProfileName
-import org.thoughtcrime.securesms.recipients.Recipient
-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.util.Util
-import org.whispersystems.signalservice.api.profiles.SignalServiceProfile
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.SignalServiceAddress
-import org.whispersystems.signalservice.internal.push.VerifyAccountResponse
-import java.lang.IllegalArgumentException
-import java.util.UUID
-
-/**
- * Test rule to use that sets up the application in a mostly registered state. Enough so that most
- * activities should be launchable directly.
- *
- * To use: `@get:Rule val harness = SignalActivityRule()`
- */
-class SignalActivityRule(private val othersCount: Int = 4) : ExternalResource() {
-
-  val application: Application = ApplicationDependencies.getApplication()
-
-  lateinit var context: Context
-    private set
-  lateinit var self: Recipient
-    private set
-  lateinit var others: List<RecipientId>
-    private set
-
-  override fun before() {
-    context = InstrumentationRegistry.getInstrumentation().targetContext
-    self = setupSelf()
-    others = setupOthers()
-  }
-
-  private fun setupSelf(): Recipient {
-    DeviceTransferBlockingInterceptor.getInstance().blockNetwork()
-
-    PreferenceManager.getDefaultSharedPreferences(application).edit().putBoolean("pref_prompted_push_registration", true).commit()
-    val masterSecret = MasterSecretUtil.generateMasterSecret(application, MasterSecretUtil.UNENCRYPTED_PASSPHRASE)
-    MasterSecretUtil.generateAsymmetricMasterSecret(application, masterSecret)
-    val preferences: SharedPreferences = application.getSharedPreferences(MasterSecretUtil.PREFERENCES_NAME, 0)
-    preferences.edit().putBoolean("passphrase_initialized", true).commit()
-
-    val registrationRepository = RegistrationRepository(application)
-
-    registrationRepository.registerAccountWithoutRegistrationLock(
-      RegistrationData(
-        code = "123123",
-        e164 = "+15554045550101",
-        password = Util.getSecret(18),
-        registrationId = registrationRepository.registrationId,
-        profileKey = registrationRepository.getProfileKey("+15554045550101"),
-        fcmToken = null
-      ),
-      VerifyAccountResponse(UUID.randomUUID().toString(), UUID.randomUUID().toString(), false)
-    ).blockingGet()
-
-    SignalStore.kbsValues().optOut()
-    RegistrationUtil.maybeMarkRegistrationComplete(application)
-    SignalDatabase.recipients.setProfileName(Recipient.self().id, ProfileName.fromParts("Tester", "McTesterson"))
-
-    return Recipient.self()
-  }
-
-  private fun setupOthers(): List<RecipientId> {
-    val others = mutableListOf<RecipientId>()
-
-    if (othersCount !in 0 until 1000) {
-      throw IllegalArgumentException("$othersCount must be between 0 and 1000")
-    }
-
-    for (i in 0 until othersCount) {
-      val aci = ACI.from(UUID.randomUUID())
-      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))
-      SignalDatabase.recipients.setProfileSharing(recipientId, true)
-      ApplicationDependencies.getProtocolStore().aci().saveIdentity(SignalProtocolAddress(aci.toString(), 0), IdentityKeyUtil.generateIdentityKeyPair().publicKey)
-      others += recipientId
-    }
-
-    return others
-  }
-
-  inline fun <reified T : Activity> launchActivity(initIntent: Intent.() -> Unit): ActivityScenario<T> {
-    return androidx.test.core.app.launchActivity(Intent(context, T::class.java).apply(initIntent))
-  }
-
-  fun changeIdentityKey(recipient: Recipient, identityKey: IdentityKey = IdentityKeyUtil.generateIdentityKeyPair().publicKey) {
-    ApplicationDependencies.getProtocolStore().aci().saveIdentity(SignalProtocolAddress(recipient.requireServiceId().toString(), 0), identityKey)
-  }
-
-  fun getIdentity(recipient: Recipient): IdentityKey {
-    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)
-  }
-}

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

@@ -1,40 +0,0 @@
-package org.thoughtcrime.securesms.testing
-
-import org.junit.rules.TestWatcher
-import org.junit.runner.Description
-import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.PNI
-import java.util.UUID
-
-/**
- * Sets up bare-minimum to allow writing unit tests against the database,
- * including setting up the local ACI and PNI pair.
- *
- * @param deleteAllThreadsOnEachRun Run deleteAllThreads between each unit test
- */
-class SignalDatabaseRule(
-  private val deleteAllThreadsOnEachRun: Boolean = true
-) : TestWatcher() {
-
-  val localAci: ACI = ACI.from(UUID.randomUUID())
-  val localPni: PNI = PNI.from(UUID.randomUUID())
-
-  override fun starting(description: Description?) {
-    deleteAllThreads()
-
-    SignalStore.account().setAci(localAci)
-    SignalStore.account().setPni(localPni)
-  }
-
-  override fun finished(description: Description?) {
-    deleteAllThreads()
-  }
-
-  private fun deleteAllThreads() {
-    if (deleteAllThreadsOnEachRun) {
-      SignalDatabase.mms.deleteAllThreads()
-    }
-  }
-}

app/src/main/AndroidManifest.xml

@@ -224,7 +224,7 @@
             <data android:scheme="sgnl"
                   android:host="addstickers" />
         </intent-filter>
-        <intent-filter android:autoVerify="true">
+        <intent-filter>
             <action android:name="android.intent.action.VIEW" />
             <category android:name="android.intent.category.DEFAULT" />
             <category android:name="android.intent.category.BROWSABLE" />
@@ -258,7 +258,7 @@
               android:noHistory="true"
               android:theme="@style/Signal.Transparent">
 
-        <intent-filter android:autoVerify="true">
+        <intent-filter>
             <action android:name="android.intent.action.VIEW" />
             <category android:name="android.intent.category.DEFAULT" />
             <category android:name="android.intent.category.BROWSABLE" />
@@ -275,7 +275,7 @@
                   android:host="signal.group"/>
         </intent-filter>
 
-        <intent-filter android:autoVerify="true">
+        <intent-filter>
             <action android:name="android.intent.action.VIEW" />
             <category android:name="android.intent.category.DEFAULT" />
             <category android:name="android.intent.category.BROWSABLE" />
@@ -285,7 +285,7 @@
                   android:host="signal.tube" />
         </intent-filter>
 
-        <intent-filter android:autoVerify="true">
+        <intent-filter>
             <action android:name="android.intent.action.VIEW" />
             <category android:name="android.intent.category.DEFAULT" />
             <category android:name="android.intent.category.BROWSABLE" />
@@ -406,14 +406,7 @@
         android:screenOrientation="portrait"
         android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
         android:theme="@style/TextSecure.DarkNoActionBar.StoryViewer"
-        android:launchMode="singleTask"
-        android:windowSoftInputMode="stateAlwaysHidden|adjustNothing"
-        android:parentActivityName=".MainActivity">
-
-        <meta-data
-            android:name="android.support.PARENT_ACTIVITY"
-            android:value="org.thoughtcrime.securesms.MainActivity" />
-    </activity>
+        android:windowSoftInputMode="stateAlwaysHidden|adjustNothing" />
 
         <activity android:name=".components.settings.app.changenumber.ChangeNumberLockActivity"
             android:theme="@style/Signal.DayNight.NoActionBar"
@@ -471,7 +464,6 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
      <activity android:name=".DeviceActivity"
-               android:screenOrientation="portrait"
                android:label="@string/AndroidManifest__linked_devices"
                android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -660,7 +652,7 @@
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <service android:enabled="true" android:name=".service.webrtc.WebRtcCallService" android:foregroundServiceType="camera|microphone"/>
+    <service android:enabled="true" android:name=".service.webrtc.WebRtcCallService"/>
     <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"/>

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

@@ -18,6 +18,7 @@ package org.thoughtcrime.securesms;
 
 import android.content.Context;
 import android.os.Build;
+import android.os.StrictMode;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -61,7 +62,6 @@ import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
 import org.thoughtcrime.securesms.jobs.RefreshPreKeysJob;
 import org.thoughtcrime.securesms.jobs.RetrieveProfileJob;
 import org.thoughtcrime.securesms.jobs.RetrieveRemoteAnnouncementsJob;
-import org.thoughtcrime.securesms.jobs.StoryOnboardingDownloadJob;
 import org.thoughtcrime.securesms.jobs.SubscriptionKeepAliveJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger;
@@ -87,6 +87,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;
@@ -98,6 +99,7 @@ import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWra
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
 import java.security.Security;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 import io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException;
@@ -204,7 +206,6 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                             .addPostRender(() -> ApplicationDependencies.getJobManager().add(new FontDownloaderJob()))
                             .addPostRender(CheckServiceReachabilityJob::enqueueIfNecessary)
                             .addPostRender(GroupV2UpdateSelfProfileKeyJob::enqueueForGroupsIfNecessary)
-                            .addPostRender(StoryOnboardingDownloadJob.Companion::enqueueIfNeeded)
                             .execute();
 
     Log.d(TAG, "onCreate() took " + (System.currentTimeMillis() - startTime) + " ms");
@@ -220,7 +221,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
     ApplicationDependencies.getFrameRateTracker().start();
     ApplicationDependencies.getMegaphoneRepository().onAppForegrounded();
     ApplicationDependencies.getDeadlockDetector().start();
-    SubscriptionKeepAliveJob.enqueueAndTrackTimeIfNecessary();
+    SubscriptionKeepAliveJob.launchSubscriberIdKeepAliveJobIfNecessary();
 
     SignalExecutors.BOUNDED.execute(() -> {
       FeatureFlags.refreshIfNecessary();

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

@@ -46,8 +46,7 @@ public interface BindableConversationItem extends Unbindable, GiphyMp4Playable,
             boolean hasWallpaper,
             boolean isMessageRequestAccepted,
             boolean canPlayInline,
-            @NonNull Colorizer colorizer,
-            boolean isCondensedMode);
+            @NonNull Colorizer colorizer);
 
   @NonNull ConversationMessage getConversationMessage();
 
@@ -62,13 +61,12 @@ public interface BindableConversationItem extends Unbindable, GiphyMp4Playable,
   }
 
   default void updateSelectedState() {
-    // Intentionally Blank.
+    // Intentionall Blank.
   }
 
   interface EventListener {
     void onQuoteClicked(MmsMessageRecord messageRecord);
     void onLinkPreviewClicked(@NonNull LinkPreview linkPreview);
-    void onQuotedIndicatorClicked(@NonNull MessageRecord messageRecord);
     void onMoreTextClicked(@NonNull RecipientId conversationRecipientId, long messageId, boolean isMms);
     void onStickerClicked(@NonNull StickerLocator stickerLocator);
     void onViewOnceMessageClicked(@NonNull MmsMessageRecord messageRecord);
@@ -107,6 +105,5 @@ public interface BindableConversationItem extends Unbindable, GiphyMp4Playable,
     boolean onUrlClicked(@NonNull String url);
 
     void onViewGiftBadgeClicked(@NonNull MessageRecord messageRecord);
-    void onGiftBadgeRevealed(@NonNull MessageRecord messageRecord);
   }
 }

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

@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms;
 
 import androidx.annotation.NonNull;
-import androidx.lifecycle.LifecycleOwner;
 
 import org.thoughtcrime.securesms.conversationlist.model.ConversationSet;
 import org.thoughtcrime.securesms.database.model.ThreadRecord;
@@ -12,8 +11,7 @@ import java.util.Set;
 
 public interface BindableConversationListItem extends Unbindable {
 
-  void bind(@NonNull LifecycleOwner lifecycleOwner,
-            @NonNull ThreadRecord thread,
+  void bind(@NonNull ThreadRecord thread,
             @NonNull GlideRequests glideRequests, @NonNull Locale locale,
             @NonNull Set<Long> typingThreads,
             @NonNull ConversationSet selectedConversations);

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

@@ -18,6 +18,7 @@ package org.thoughtcrime.securesms;
 
 
 import android.Manifest;
+import android.animation.LayoutTransition;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
@@ -31,6 +32,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.Button;
+import android.widget.HorizontalScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -41,7 +43,6 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.ConstraintSet;
 import androidx.fragment.app.FragmentActivity;
-import androidx.lifecycle.ViewModelProvider;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
 import androidx.recyclerview.widget.DefaultItemAnimator;
@@ -53,14 +54,15 @@ import androidx.transition.TransitionManager;
 
 import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;
+import com.google.android.material.chip.ChipGroup;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.pnikosis.materialishprogress.ProgressWheel;
 
-import org.signal.core.util.concurrent.SimpleTask;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.components.RecyclerViewFastScroller;
+import org.thoughtcrime.securesms.components.recyclerview.ToolbarShadowAnimationHelper;
 import org.thoughtcrime.securesms.contacts.AbstractContactsCursorLoader;
-import org.thoughtcrime.securesms.contacts.ContactChipViewModel;
+import org.thoughtcrime.securesms.contacts.ContactChip;
 import org.thoughtcrime.securesms.contacts.ContactSelectionListAdapter;
 import org.thoughtcrime.securesms.contacts.ContactSelectionListItem;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader;
@@ -68,25 +70,22 @@ import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
 import org.thoughtcrime.securesms.contacts.HeaderAction;
 import org.thoughtcrime.securesms.contacts.LetterHeaderDecoration;
 import org.thoughtcrime.securesms.contacts.SelectedContact;
-import org.thoughtcrime.securesms.contacts.SelectedContacts;
-import org.thoughtcrime.securesms.contacts.selection.ContactSelectionArguments;
 import org.thoughtcrime.securesms.contacts.sync.ContactDiscovery;
 import org.thoughtcrime.securesms.groups.SelectionLimits;
 import org.thoughtcrime.securesms.groups.ui.GroupLimitDialog;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.permissions.Permissions;
+import org.thoughtcrime.securesms.recipients.LiveRecipient;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.sharing.ShareContact;
-import org.thoughtcrime.securesms.util.LifecycleDisposable;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.UsernameUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.adapter.FixedViewsAdapter;
 import org.thoughtcrime.securesms.util.adapter.RecyclerViewConcatenateAdapterStickyHeader;
-import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter;
-import org.thoughtcrime.securesms.util.adapter.mapping.MappingModelList;
+import org.signal.core.util.concurrent.SimpleTask;
 import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
 
 import java.io.IOException;
@@ -96,9 +95,6 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.function.Consumer;
 
-import io.reactivex.rxjava3.disposables.Disposable;
-import kotlin.Unit;
-
 /**
  * Fragment for selecting a one or more contacts from a list.
  *
@@ -110,7 +106,7 @@ public final class ContactSelectionListFragment extends LoggingFragment
   @SuppressWarnings("unused")
   private static final String TAG = Log.tag(ContactSelectionListFragment.class);
 
-  private static final int CHIP_GROUP_EMPTY_CHILD_COUNT  = 0;
+  private static final int CHIP_GROUP_EMPTY_CHILD_COUNT  = 1;
   private static final int CHIP_GROUP_REVEAL_DURATION_MS = 150;
 
   public static final int NO_LIMIT = Integer.MAX_VALUE;
@@ -138,13 +134,12 @@ public final class ContactSelectionListFragment extends LoggingFragment
   private RecyclerView                                recyclerView;
   private RecyclerViewFastScroller                    fastScroller;
   private ContactSelectionListAdapter                 cursorRecyclerViewAdapter;
-  private RecyclerView                                chipRecycler;
+  private ChipGroup                                   chipGroup;
+  private HorizontalScrollView                        chipGroupScrollContainer;
   private OnSelectionLimitReachedListener             onSelectionLimitReachedListener;
   private AbstractContactsCursorLoaderFactoryProvider cursorFactoryProvider;
-  private MappingAdapter                              contactChipAdapter;
-  private ContactChipViewModel                        contactChipViewModel;
-  private LifecycleDisposable                         lifecycleDisposable;
-
+  private View                                        shadowView;
+  private ToolbarShadowAnimationHelper                toolbarShadowAnimationHelper;
   private HeaderActionProvider                        headerActionProvider;
   private TextView                                    headerActionView;
 
@@ -255,12 +250,17 @@ public final class ContactSelectionListFragment extends LoggingFragment
     showContactsButton       = view.findViewById(R.id.show_contacts_button);
     showContactsDescription  = view.findViewById(R.id.show_contacts_description);
     showContactsProgress     = view.findViewById(R.id.progress);
-    chipRecycler             = view.findViewById(R.id.chipRecycler);
+    chipGroup                = view.findViewById(R.id.chipGroup);
+    chipGroupScrollContainer = view.findViewById(R.id.chipGroupScrollContainer);
     constraintLayout         = view.findViewById(R.id.container);
+    shadowView               = view.findViewById(R.id.toolbar_shadow);
     headerActionView         = view.findViewById(R.id.header_action);
 
+    toolbarShadowAnimationHelper = new ToolbarShadowAnimationHelper(shadowView);
+
     final LinearLayoutManager layoutManager = new LinearLayoutManager(requireContext());
 
+    recyclerView.addOnScrollListener(toolbarShadowAnimationHelper);
     recyclerView.setLayoutManager(layoutManager);
     recyclerView.setItemAnimator(new DefaultItemAnimator() {
       @Override
@@ -269,18 +269,6 @@ public final class ContactSelectionListFragment extends LoggingFragment
       }
     });
 
-    contactChipViewModel = new ViewModelProvider(this).get(ContactChipViewModel.class);
-    contactChipAdapter   = new MappingAdapter();
-    lifecycleDisposable  = new LifecycleDisposable();
-
-    lifecycleDisposable.bindTo(getViewLifecycleOwner());
-    SelectedContacts.register(contactChipAdapter, this::onChipCloseIconClicked);
-    chipRecycler.setAdapter(contactChipAdapter);
-
-    Disposable disposable = contactChipViewModel.getState().subscribe(this::handleSelectedContactsChanged);
-
-    lifecycleDisposable.add(disposable);
-
     Intent intent    = requireActivity().getIntent();
     Bundle arguments = safeArguments();
 
@@ -403,8 +391,7 @@ public final class ContactSelectionListFragment extends LoggingFragment
                                                                 null,
                                                                 new ListClickListener(),
                                                                 isMulti,
-                                                                currentSelection,
-                                                                safeArguments().getInt(ContactSelectionArguments.CHECKBOX_RESOURCE, R.drawable.contact_selection_checkbox));
+                                                                currentSelection);
 
     RecyclerViewConcatenateAdapterStickyHeader concatenateAdapter = new RecyclerViewConcatenateAdapterStickyHeader();
 
@@ -747,22 +734,75 @@ public final class ContactSelectionListFragment extends LoggingFragment
   private void markContactUnselected(@NonNull SelectedContact selectedContact) {
     cursorRecyclerViewAdapter.removeFromSelectedContacts(selectedContact);
     cursorRecyclerViewAdapter.notifyItemRangeChanged(0, cursorRecyclerViewAdapter.getItemCount(), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
-    contactChipViewModel.remove(selectedContact);
+    removeChipForContact(selectedContact);
 
     if (onContactSelectedListener != null) {
       onContactSelectedListener.onSelectionChanged();
     }
   }
 
-  private void handleSelectedContactsChanged(@NonNull List<SelectedContacts.Model> selectedContacts) {
-    contactChipAdapter.submitList(new MappingModelList(selectedContacts), this::smoothScrollChipsToEnd);
+  private void removeChipForContact(@NonNull SelectedContact contact) {
+    for (int i = chipGroup.getChildCount() - 1; i >= 0; i--) {
+      View v = chipGroup.getChildAt(i);
+      if (v instanceof ContactChip && contact.matches(((ContactChip) v).getContact())) {
+        chipGroup.removeView(v);
+      }
+    }
 
-    if (selectedContacts.isEmpty()) {
+    if (getChipCount() == 0) {
       setChipGroupVisibility(ConstraintSet.GONE);
-    } else {
+    }
+  }
+
+  private void addChipForSelectedContact(@NonNull SelectedContact selectedContact) {
+    SimpleTask.run(getViewLifecycleOwner().getLifecycle(),
+                   () -> Recipient.resolved(selectedContact.getOrCreateRecipientId(requireContext())),
+                   resolved -> addChipForRecipient(resolved, selectedContact));
+  }
+
+  private void addChipForRecipient(@NonNull Recipient recipient, @NonNull SelectedContact selectedContact) {
+    final ContactChip chip = new ContactChip(requireContext());
+
+    if (getChipCount() == 0) {
       setChipGroupVisibility(ConstraintSet.VISIBLE);
     }
 
+    chip.setText(recipient.getShortDisplayName(requireContext()));
+    chip.setContact(selectedContact);
+    chip.setCloseIconVisible(true);
+    chip.setOnCloseIconClickListener(view -> {
+      markContactUnselected(selectedContact);
+
+      if (onContactSelectedListener != null) {
+        onContactSelectedListener.onContactDeselected(Optional.of(recipient.getId()), recipient.getE164().orElse(null));
+      }
+    });
+
+    chipGroup.getLayoutTransition().addTransitionListener(new LayoutTransition.TransitionListener() {
+      @Override
+      public void startTransition(LayoutTransition transition, ViewGroup container, View view, int transitionType) {
+      }
+
+      @Override
+      public void endTransition(LayoutTransition transition, ViewGroup container, View view, int transitionType) {
+        if (getView() == null || !requireView().isAttachedToWindow()) {
+          Log.w(TAG, "Fragment's view was detached before the animation completed.");
+          return;
+        }
+
+        if (view == chip && transitionType == LayoutTransition.APPEARING) {
+          chipGroup.getLayoutTransition().removeTransitionListener(this);
+          registerChipRecipientObserver(chip, recipient.live());
+          chipGroup.post(ContactSelectionListFragment.this::smoothScrollChipsToEnd);
+        }
+      }
+    });
+
+    chip.setAvatar(glideRequests, recipient, () -> addChip(chip));
+  }
+
+  private void addChip(@NonNull ContactChip chip) {
+    chipGroup.addView(chip);
     if (selectionWarningLimitReachedExactly()) {
       if (onSelectionLimitReachedListener != null) {
         onSelectionLimitReachedListener.onSuggestedLimitReached(selectionLimit.getRecommendedLimit());
@@ -772,27 +812,23 @@ public final class ContactSelectionListFragment extends LoggingFragment
     }
   }
 
-  private void addChipForSelectedContact(@NonNull SelectedContact selectedContact) {
-    SimpleTask.run(getViewLifecycleOwner().getLifecycle(),
-                   () -> Recipient.resolved(selectedContact.getOrCreateRecipientId(requireContext())),
-                   resolved -> contactChipViewModel.add(selectedContact));
-  }
-
-  private Unit onChipCloseIconClicked(SelectedContacts.Model model) {
-    markContactUnselected(model.getSelectedContact());
-    if (onContactSelectedListener != null) {
-      onContactSelectedListener.onContactDeselected(Optional.of(model.getRecipient().getId()), model.getRecipient().getE164().orElse(null));
-    }
-
-    return Unit.INSTANCE;
-  }
-
   private int getChipCount() {
-    int count = contactChipViewModel.getCount() - CHIP_GROUP_EMPTY_CHILD_COUNT;
+    int count = chipGroup.getChildCount() - CHIP_GROUP_EMPTY_CHILD_COUNT;
     if (count < 0) throw new AssertionError();
     return count;
   }
 
+  private void registerChipRecipientObserver(@NonNull ContactChip chip, @Nullable LiveRecipient recipient) {
+    if (recipient != null) {
+      recipient.observe(getViewLifecycleOwner(), resolved -> {
+        if (chip.isAttachedToWindow()) {
+          chip.setAvatar(glideRequests, resolved, null);
+          chip.setText(resolved.getShortDisplayName(chip.getContext()));
+        }
+      });
+    }
+  }
+
   private void setChipGroupVisibility(int visibility) {
     if (!safeArguments().getBoolean(DISPLAY_CHIPS, requireActivity().getIntent().getBooleanExtra(DISPLAY_CHIPS, true))) {
       return;
@@ -806,7 +842,7 @@ public final class ContactSelectionListFragment extends LoggingFragment
 
     ConstraintSet constraintSet = new ConstraintSet();
     constraintSet.clone(constraintLayout);
-    constraintSet.setVisibility(R.id.chipRecycler, visibility);
+    constraintSet.setVisibility(R.id.chipGroupScrollContainer, visibility);
     constraintSet.applyTo(constraintLayout);
   }
 
@@ -815,8 +851,8 @@ public final class ContactSelectionListFragment extends LoggingFragment
   }
 
   private void smoothScrollChipsToEnd() {
-    int x = ViewUtil.isLtr(chipRecycler) ? chipRecycler.getWidth() : 0;
-    chipRecycler.smoothScrollBy(x, 0);
+    int x = ViewUtil.isLtr(chipGroupScrollContainer) ? chipGroup.getWidth() : 0;
+    chipGroupScrollContainer.smoothScrollTo(x, 0);
   }
 
   public interface OnContactSelectedListener {

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

@@ -25,11 +25,11 @@ import org.signal.libsignal.protocol.InvalidKeyException;
 import org.signal.libsignal.protocol.ecc.Curve;
 import org.signal.libsignal.protocol.ecc.ECPublicKey;
 import org.signal.libsignal.zkgroup.profiles.ProfileKey;
-import org.signal.qr.kitkat.ScanListener;
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.permissions.Permissions;
+import org.thoughtcrime.securesms.qr.ScanListener;
 import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;

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

@@ -14,34 +14,36 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
-import androidx.core.view.ViewCompat;
 
-import org.signal.qr.QrScannerView;
-import org.signal.qr.kitkat.ScanListener;
-import org.thoughtcrime.securesms.util.FeatureFlags;
-import org.thoughtcrime.securesms.util.LifecycleDisposable;
+import org.thoughtcrime.securesms.components.camera.CameraView;
+import org.thoughtcrime.securesms.qr.ScanListener;
+import org.thoughtcrime.securesms.qr.ScanningThread;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
-import io.reactivex.rxjava3.disposables.Disposable;
-
 public class DeviceAddFragment extends LoggingFragment {
 
-  private final LifecycleDisposable lifecycleDisposable = new LifecycleDisposable();
-
-  private ImageView     devicesImage;
-  private ScanListener  scanListener;
+  private ViewGroup      container;
+  private LinearLayout   overlay;
+  private ImageView      devicesImage;
+  private CameraView     scannerView;
+  private ScanningThread scanningThread;
+  private ScanListener   scanListener;
 
   @Override
   public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup viewGroup, Bundle bundle) {
-    ViewGroup container = ViewUtil.inflate(inflater, viewGroup, R.layout.device_add_fragment);
+    this.container    = ViewUtil.inflate(inflater, viewGroup, R.layout.device_add_fragment);
+    this.overlay      = this.container.findViewById(R.id.overlay);
+    this.scannerView  = this.container.findViewById(R.id.scanner);
+    this.devicesImage = this.container.findViewById(R.id.devices);
 
-    QrScannerView scannerView = container.findViewById(R.id.scanner);
-    this.devicesImage = container.findViewById(R.id.devices);
-    ViewCompat.setTransitionName(devicesImage, "devices");
+    if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
+      this.overlay.setOrientation(LinearLayout.HORIZONTAL);
+    } else {
+      this.overlay.setOrientation(LinearLayout.VERTICAL);
+    }
 
     if (Build.VERSION.SDK_INT >= 21) {
-      container.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
+      this.container.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
         @TargetApi(21)
         @Override
         public void onLayoutChange(View v, int left, int top, int right, int bottom,
@@ -57,30 +59,52 @@ public class DeviceAddFragment extends LoggingFragment {
       });
     }
 
-    scannerView.start(getViewLifecycleOwner(), FeatureFlags.useQrLegacyScan());
-
-    lifecycleDisposable.bindTo(getViewLifecycleOwner());
-
-    Disposable qrDisposable = scannerView
-        .getQrData()
-        .distinctUntilChanged()
-        .observeOn(AndroidSchedulers.mainThread())
-        .subscribe(qrData -> {
-          if (scanListener != null) {
-            scanListener.onQrDataFound(qrData);
-          }
-        });
-
-    lifecycleDisposable.add(qrDisposable);
-
-    return container;
+    return this.container;
   }
 
+  @Override
+  public void onResume() {
+    super.onResume();
+    this.scanningThread = new ScanningThread();
+    this.scanningThread.setScanListener(scanListener);
+    this.scannerView.onResume();
+    this.scannerView.setPreviewCallback(scanningThread);
+    this.scanningThread.start();
+  }
+
+  @Override
+  public void onPause() {
+    super.onPause();
+    this.scannerView.onPause();
+    this.scanningThread.stopScanning();
+  }
+
+  @Override
+  public void onConfigurationChanged(@NonNull Configuration newConfiguration) {
+    super.onConfigurationChanged(newConfiguration);
+
+    this.scannerView.onPause();
+
+    if (newConfiguration.orientation == Configuration.ORIENTATION_LANDSCAPE) {
+      overlay.setOrientation(LinearLayout.HORIZONTAL);
+    } else {
+      overlay.setOrientation(LinearLayout.VERTICAL);
+    }
+
+    this.scannerView.onResume();
+    this.scannerView.setPreviewCallback(scanningThread);
+  }
+
+
   public ImageView getDevicesImage() {
     return devicesImage;
   }
 
   public void setScanListener(ScanListener scanListener) {
     this.scanListener = scanListener;
+
+    if (this.scanningThread != null) {
+      this.scanningThread.setScanListener(scanListener);
+    }
   }
 }

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

@@ -9,7 +9,6 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
-import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 
 public class DeviceLinkFragment extends Fragment implements View.OnClickListener {
@@ -22,7 +21,6 @@ public class DeviceLinkFragment extends Fragment implements View.OnClickListener
   public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup viewGroup, Bundle bundle) {
     this.container = (LinearLayout) inflater.inflate(R.layout.device_link_fragment, container, false);
     this.container.findViewById(R.id.link_device).setOnClickListener(this);
-    ViewCompat.setTransitionName(container.findViewById(R.id.devices), "devices");
 
     if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
       container.setOrientation(LinearLayout.HORIZONTAL);

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

@@ -21,7 +21,7 @@ import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.melnykov.fab.FloatingActionButton;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.loaders.DeviceListLoader;

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

@@ -125,10 +125,10 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
   private void updateTabVisibility() {
     if (Stories.isFeatureEnabled()) {
       findViewById(R.id.conversation_list_tabs).setVisibility(View.VISIBLE);
-      WindowUtil.setNavigationBarColor(this, ContextCompat.getColor(this, R.color.signal_colorSurface2));
+      WindowUtil.setNavigationBarColor(getWindow(), ContextCompat.getColor(this, R.color.signal_colorSecondaryContainer));
     } else {
       findViewById(R.id.conversation_list_tabs).setVisibility(View.GONE);
-      WindowUtil.setNavigationBarColor(this, ContextCompat.getColor(this, R.color.signal_colorBackground));
+      WindowUtil.setNavigationBarColor(getWindow(), ContextCompat.getColor(this, R.color.signal_background_primary));
       conversationListTabsViewModel.onChatsSelected();
     }
   }

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

@@ -0,0 +1,149 @@
+package org.thoughtcrime.securesms;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.text.TextUtils;
+
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+
+import org.thoughtcrime.securesms.util.CharacterCalculator;
+import org.thoughtcrime.securesms.util.CharacterCalculator.CharacterState;
+
+import java.util.Optional;
+
+
+public class TransportOption implements Parcelable {
+
+  public enum Type {
+    SMS,
+    TEXTSECURE
+  }
+
+  private final          int                    drawable;
+  private final          int                    backgroundColor;
+  private final @NonNull String                 text;
+  private final @NonNull Type                   type;
+  private final @NonNull String                 composeHint;
+  private final @NonNull CharacterCalculator    characterCalculator;
+  private final @NonNull Optional<CharSequence> simName;
+  private final @NonNull Optional<Integer>      simSubscriptionId;
+
+  public TransportOption(@NonNull  Type type,
+                         @DrawableRes int drawable,
+                         int backgroundColor,
+                         @NonNull String text,
+                         @NonNull String composeHint,
+                         @NonNull CharacterCalculator characterCalculator)
+  {
+    this(type, drawable, backgroundColor, text, composeHint, characterCalculator,
+         Optional.empty(), Optional.empty());
+  }
+
+  public TransportOption(@NonNull  Type type,
+                         @DrawableRes int drawable,
+                         int backgroundColor,
+                         @NonNull String text,
+                         @NonNull String composeHint,
+                         @NonNull CharacterCalculator characterCalculator,
+                         @NonNull Optional<CharSequence> simName,
+                         @NonNull Optional<Integer> simSubscriptionId)
+  {
+    this.type                = type;
+    this.drawable            = drawable;
+    this.backgroundColor     = backgroundColor;
+    this.text                = text;
+    this.composeHint         = composeHint;
+    this.characterCalculator = characterCalculator;
+    this.simName             = simName;
+    this.simSubscriptionId   = simSubscriptionId;
+  }
+
+  TransportOption(Parcel in) {
+    this(Type.valueOf(in.readString()),
+         in.readInt(),
+         in.readInt(),
+         in.readString(),
+         in.readString(),
+         CharacterCalculator.readFromParcel(in),
+         Optional.ofNullable(TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in)),
+         in.readInt() == 1 ? Optional.of(in.readInt()) : Optional.empty());
+  }
+
+  public @NonNull Type getType() {
+    return type;
+  }
+
+  public boolean isType(Type type) {
+    return this.type == type;
+  }
+
+  public boolean isSms() {
+    return type == Type.SMS;
+  }
+
+  public CharacterState calculateCharacters(String messageBody) {
+    return characterCalculator.calculateCharacters(messageBody);
+  }
+
+  public @DrawableRes int getDrawable() {
+    return drawable;
+  }
+
+  public int getBackgroundColor() {
+    return backgroundColor;
+  }
+
+  public @NonNull String getComposeHint() {
+    return composeHint;
+  }
+
+  public @NonNull String getDescription() {
+    return text;
+  }
+
+  @NonNull
+  public Optional<CharSequence> getSimName() {
+    return simName;
+  }
+
+  @NonNull
+  public Optional<Integer> getSimSubscriptionId() {
+    return simSubscriptionId;
+  }
+
+  @Override
+  public int describeContents() {
+    return 0;
+  }
+
+  @Override
+  public void writeToParcel(Parcel dest, int flags) {
+    dest.writeString(type.name());
+    dest.writeInt(drawable);
+    dest.writeInt(backgroundColor);
+    dest.writeString(text);
+    dest.writeString(composeHint);
+    CharacterCalculator.writeToParcel(dest, characterCalculator);
+    TextUtils.writeToParcel(simName.orElse(null), dest, flags);
+
+    if (simSubscriptionId.isPresent()) {
+      dest.writeInt(1);
+      dest.writeInt(simSubscriptionId.get());
+    } else {
+      dest.writeInt(0);
+    }
+  }
+
+  public static final Creator<TransportOption> CREATOR = new Creator<TransportOption>() {
+    @Override
+    public TransportOption createFromParcel(Parcel in) {
+      return new TransportOption(in);
+    }
+
+    @Override
+    public TransportOption[] newArray(int size) {
+      return new TransportOption[size];
+    }
+  };
+}

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

@@ -0,0 +1,226 @@
+package org.thoughtcrime.securesms;
+
+import android.Manifest;
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.signal.core.util.logging.Log;
+import org.thoughtcrime.securesms.permissions.Permissions;
+import org.thoughtcrime.securesms.util.CharacterCalculator;
+import org.thoughtcrime.securesms.util.MmsCharacterCalculator;
+import org.thoughtcrime.securesms.util.PushCharacterCalculator;
+import org.thoughtcrime.securesms.util.SmsCharacterCalculator;
+import org.thoughtcrime.securesms.util.dualsim.SubscriptionInfoCompat;
+import org.thoughtcrime.securesms.util.dualsim.SubscriptionManagerCompat;
+import org.whispersystems.signalservice.api.util.OptionalUtil;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Optional;
+
+import static org.thoughtcrime.securesms.TransportOption.Type;
+
+public class TransportOptions {
+
+  private static final String TAG = Log.tag(TransportOptions.class);
+
+  private final List<OnTransportChangedListener> listeners = new LinkedList<>();
+  private final Context                          context;
+  private final List<TransportOption>            enabledTransports;
+
+  private Type                      defaultTransportType  = Type.SMS;
+  private Optional<Integer>         defaultSubscriptionId = Optional.empty();
+  private Optional<TransportOption> selectedOption        = Optional.empty();
+
+  private final Optional<Integer> systemSubscriptionId;
+
+  public TransportOptions(Context context, boolean media) {
+    this.context              = context;
+    this.enabledTransports    = initializeAvailableTransports(media);
+    this.systemSubscriptionId = new SubscriptionManagerCompat(context).getPreferredSubscriptionId();
+  }
+
+  public void reset(boolean media) {
+    List<TransportOption> transportOptions = initializeAvailableTransports(media);
+
+    this.enabledTransports.clear();
+    this.enabledTransports.addAll(transportOptions);
+
+    if (selectedOption.isPresent() && !isEnabled(selectedOption.get())) {
+      setSelectedTransport(null);
+    } else {
+      this.defaultTransportType = Type.SMS;
+      this.defaultSubscriptionId = Optional.empty();
+
+      notifyTransportChangeListeners();
+    }
+  }
+
+  public void setDefaultTransport(Type type) {
+    this.defaultTransportType = type;
+
+    if (!selectedOption.isPresent()) {
+      notifyTransportChangeListeners();
+    }
+  }
+
+  public void setDefaultSubscriptionId(Optional<Integer> subscriptionId) {
+    if  (defaultSubscriptionId.equals(subscriptionId)) {
+      return;
+    }
+
+    this.defaultSubscriptionId = subscriptionId;
+
+    if (!selectedOption.isPresent()) {
+      notifyTransportChangeListeners();
+    }
+  }
+
+  public void setSelectedTransport(@Nullable  TransportOption transportOption) {
+    this.selectedOption = Optional.ofNullable(transportOption);
+    notifyTransportChangeListeners();
+  }
+
+  public boolean isManualSelection() {
+    return this.selectedOption.isPresent();
+  }
+
+  public @NonNull TransportOption getSelectedTransport() {
+    if (selectedOption.isPresent()) return selectedOption.get();
+
+    if (defaultTransportType == Type.SMS) {
+      TransportOption transportOption = findEnabledSmsTransportOption(OptionalUtil.or(defaultSubscriptionId, systemSubscriptionId));
+      if (transportOption != null) {
+        return transportOption;
+      }
+    }
+
+    for (TransportOption transportOption : enabledTransports) {
+      if (transportOption.getType() == defaultTransportType) {
+        return transportOption;
+      }
+    }
+
+    throw new AssertionError("No options of default type!");
+  }
+
+  public static @NonNull TransportOption getPushTransportOption(@NonNull Context context) {
+    return new TransportOption(Type.TEXTSECURE,
+                               R.drawable.ic_send_lock_24,
+                               context.getResources().getColor(R.color.core_ultramarine),
+                               context.getString(R.string.ConversationActivity_transport_signal),
+                               context.getString(R.string.conversation_activity__type_message_push),
+                               new PushCharacterCalculator());
+
+  }
+
+  private @Nullable TransportOption findEnabledSmsTransportOption(Optional<Integer> subscriptionId) {
+    if (subscriptionId.isPresent()) {
+      final int subId = subscriptionId.get();
+
+      for (TransportOption transportOption : enabledTransports) {
+        if (transportOption.getType() == Type.SMS &&
+            subId == transportOption.getSimSubscriptionId().orElse(-1)) {
+          return transportOption;
+        }
+      }
+    }
+    return null;
+  }
+
+  public void disableTransport(Type type) {
+    TransportOption selected = selectedOption.orElse(null);
+
+    Iterator<TransportOption> iterator = enabledTransports.iterator();
+    while (iterator.hasNext()) {
+      TransportOption option = iterator.next();
+
+      if (option.isType(type)) {
+        if (selected == option) {
+          setSelectedTransport(null);
+        }
+        iterator.remove();
+      }
+    }
+  }
+
+  public List<TransportOption> getEnabledTransports() {
+    return enabledTransports;
+  }
+
+  public void addOnTransportChangedListener(OnTransportChangedListener listener) {
+    this.listeners.add(listener);
+  }
+
+  private List<TransportOption> initializeAvailableTransports(boolean isMediaMessage) {
+    List<TransportOption> results = new LinkedList<>();
+
+    if (isMediaMessage) {
+      results.addAll(getTransportOptionsForSimCards(context.getString(R.string.ConversationActivity_transport_insecure_mms),
+                                                    context.getString(R.string.conversation_activity__type_message_mms_insecure),
+                                                    new MmsCharacterCalculator()));
+    } else {
+      results.addAll(getTransportOptionsForSimCards(context.getString(R.string.ConversationActivity_transport_insecure_sms),
+                                                    context.getString(R.string.conversation_activity__type_message_sms_insecure),
+                                                    new SmsCharacterCalculator()));
+    }
+
+    results.add(getPushTransportOption(context));
+
+    return results;
+  }
+
+  private @NonNull List<TransportOption> getTransportOptionsForSimCards(@NonNull String text,
+                                                                        @NonNull String composeHint,
+                                                                        @NonNull CharacterCalculator characterCalculator)
+  {
+    List<TransportOption>              results             = new LinkedList<>();
+    SubscriptionManagerCompat          subscriptionManager = new SubscriptionManagerCompat(context);
+    Collection<SubscriptionInfoCompat> subscriptions;
+
+    if (Permissions.hasAll(context, Manifest.permission.READ_PHONE_STATE)) {
+      subscriptions = subscriptionManager.getActiveAndReadySubscriptionInfos();
+    } else {
+      subscriptions = Collections.emptyList();
+    }
+
+    if (subscriptions.size() < 2) {
+      results.add(new TransportOption(Type.SMS, R.drawable.ic_send_unlock_24,
+                                      context.getResources().getColor(R.color.core_grey_50),
+                                      text, composeHint, characterCalculator));
+    } else {
+      for (SubscriptionInfoCompat subscriptionInfo : subscriptions) {
+        results.add(new TransportOption(Type.SMS, R.drawable.ic_send_unlock_24,
+                                        context.getResources().getColor(R.color.core_grey_50),
+                                        text, composeHint, characterCalculator,
+                                        Optional.of(subscriptionInfo.getDisplayName()),
+                                        Optional.of(subscriptionInfo.getSubscriptionId())));
+      }
+    }
+
+    return results;
+  }
+
+  private void notifyTransportChangeListeners() {
+    for (OnTransportChangedListener listener : listeners) {
+      listener.onChange(getSelectedTransport(), selectedOption.isPresent());
+    }
+  }
+
+  private boolean isEnabled(TransportOption transportOption) {
+    for (TransportOption option : enabledTransports) {
+      if (option.equals(transportOption)) return true;
+    }
+
+    return false;
+  }
+
+  public interface OnTransportChangedListener {
+    public void onChange(TransportOption newTransport, boolean manuallySelected);
+  }
+}

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

@@ -0,0 +1,73 @@
+package org.thoughtcrime.securesms;
+
+import android.content.Context;
+import android.graphics.PorterDuff.Mode;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+
+import java.util.List;
+
+public class TransportOptionsAdapter extends BaseAdapter {
+
+  private final LayoutInflater inflater;
+
+  private List<TransportOption> enabledTransports;
+
+  public TransportOptionsAdapter(@NonNull Context context,
+                                 @NonNull List<TransportOption> enabledTransports)
+  {
+    super();
+    this.inflater          = LayoutInflater.from(context);
+    this.enabledTransports = enabledTransports;
+  }
+
+  public void setEnabledTransports(List<TransportOption> enabledTransports) {
+    this.enabledTransports = enabledTransports;
+  }
+
+  @Override
+  public int getCount() {
+    return enabledTransports.size();
+  }
+
+  @Override
+  public Object getItem(int position) {
+    return enabledTransports.get(position);
+  }
+
+  @Override
+  public long getItemId(int position) {
+    return position;
+  }
+
+  @Override
+  public View getView(int position, View convertView, ViewGroup parent) {
+    if (convertView == null) {
+      convertView = inflater.inflate(R.layout.transport_selection_list_item, parent, false);
+    }
+
+    TransportOption transport   = (TransportOption) getItem(position);
+    ImageView       imageView   = convertView.findViewById(R.id.icon);
+    TextView        textView    = convertView.findViewById(R.id.text);
+    TextView        subtextView = convertView.findViewById(R.id.subtext);
+
+    imageView.getBackground().setColorFilter(transport.getBackgroundColor(), Mode.MULTIPLY);
+    imageView.setImageResource(transport.getDrawable());
+    textView.setText(transport.getDescription());
+
+    if (transport.getSimName().isPresent()) {
+      subtextView.setText(transport.getSimName().get());
+      subtextView.setVisibility(View.VISIBLE);
+    } else {
+      subtextView.setVisibility(View.GONE);
+    }
+
+    return convertView;
+  }
+}

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

@@ -0,0 +1,50 @@
+package org.thoughtcrime.securesms;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ListView;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.ListPopupWindow;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class TransportOptionsPopup extends ListPopupWindow implements ListView.OnItemClickListener {
+
+  private final TransportOptionsAdapter adapter;
+  private final SelectedListener        listener;
+
+  public TransportOptionsPopup(@NonNull Context context, @NonNull View anchor, @NonNull SelectedListener listener) {
+    super(context);
+    this.listener = listener;
+    this.adapter  = new TransportOptionsAdapter(context, new LinkedList<TransportOption>());
+
+    setVerticalOffset(context.getResources().getDimensionPixelOffset(R.dimen.transport_selection_popup_yoff));
+    setHorizontalOffset(context.getResources().getDimensionPixelOffset(R.dimen.transport_selection_popup_xoff));
+    setInputMethodMode(ListPopupWindow.INPUT_METHOD_NOT_NEEDED);
+    setModal(true);
+    setAnchorView(anchor);
+    setAdapter(adapter);
+    setContentWidth(context.getResources().getDimensionPixelSize(R.dimen.transport_selection_popup_width));
+
+    setOnItemClickListener(this);
+  }
+
+  public void display(List<TransportOption> enabledTransports) {
+    adapter.setEnabledTransports(enabledTransports);
+    adapter.notifyDataSetChanged();
+    show();
+  }
+
+  @Override
+  public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+    listener.onSelected((TransportOption)adapter.getItem(position));
+  }
+
+  public interface SelectedListener {
+    void onSelected(TransportOption option);
+  }
+
+}

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

@@ -70,7 +70,6 @@ import org.thoughtcrime.securesms.messagerequests.CalleeMustAcceptMessageRequest
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.safety.SafetyNumberBottomSheet;
 import org.thoughtcrime.securesms.service.webrtc.SignalCallManager;
 import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.util.EllapsedTimeFormatter;
@@ -345,8 +344,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
       startCall(((WebRtcCallViewModel.Event.StartCall) event).isVideoCall());
       return;
     } else if (event instanceof WebRtcCallViewModel.Event.ShowGroupCallSafetyNumberChange) {
-      SafetyNumberBottomSheet.forGroupCall(((WebRtcCallViewModel.Event.ShowGroupCallSafetyNumberChange) event).getIdentityRecords())
-                             .show(getSupportFragmentManager());
+      SafetyNumberChangeDialog.showForGroupCall(getSupportFragmentManager(), ((WebRtcCallViewModel.Event.ShowGroupCallSafetyNumberChange) event).getIdentityRecords());
       return;
     } else if (event instanceof WebRtcCallViewModel.Event.SwitchToSpeaker) {
       callScreen.switchToSpeakerView();
@@ -563,7 +561,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
       handleTerminate(recipient, HangupMessage.Type.NORMAL);
     }
 
-    SafetyNumberBottomSheet.forCall(recipient.getId()).show(getSupportFragmentManager());
+    SafetyNumberChangeDialog.showForCall(getSupportFragmentManager(), recipient.getId());
   }
 
   public void handleSafetyNumberChangeEvent(@NonNull WebRtcCallViewModel.SafetyNumberChangeEvent safetyNumberChangeEvent) {
@@ -572,7 +570,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
         GroupCallSafetyNumberChangeNotificationUtil.showNotification(this, viewModel.getRecipient().get());
       } else {
         GroupCallSafetyNumberChangeNotificationUtil.cancelNotification(this, viewModel.getRecipient().get());
-        SafetyNumberBottomSheet.forDuringGroupCall(safetyNumberChangeEvent.getRecipientIds()).show(getSupportFragmentManager());
+        SafetyNumberChangeDialog.showForDuringGroupCall(getSupportFragmentManager(), safetyNumberChangeEvent.getRecipientIds());
       }
     }
   }

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

@@ -81,7 +81,14 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) {
       }
 
       clearButton.visible = state.canClear
-      saveButton.isClickable = state.canSave
+
+      val wasEnabled = saveButton.isEnabled
+      saveButton.isEnabled = state.canSave
+      if (wasEnabled != state.canSave) {
+        val alpha = if (state.canSave) 1f else 0.5f
+        saveButton.animate().cancel()
+        saveButton.animate().alpha(alpha)
+      }
 
       val items = state.selectableAvatars.map { AvatarPickerItem.Model(it, it == state.currentAvatar) }
       val selectedPosition = items.indexOfFirst { it.isSelected }
@@ -97,11 +104,6 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) {
     photoButton.setOnIconClickedListener { openGallery() }
     textButton.setOnIconClickedListener { openTextEditor(null) }
     saveButton.setOnClickListener { v ->
-      if (!saveButton.isEnabled) {
-        return@setOnClickListener
-      }
-
-      saveButton.isEnabled = false
       viewModel.save(
         {
           setFragmentResult(

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

@@ -50,7 +50,7 @@ class AvatarPickerRepository(context: Context) {
   }
 
   fun getAvatarForGroup(groupId: GroupId): Single<Avatar> = Single.fromCallable {
-    val recipient = Recipient.externalGroupExact(groupId)
+    val recipient = Recipient.externalGroupExact(applicationContext, groupId)
 
     if (AvatarHelper.hasAvatar(applicationContext, recipient.id)) {
       try {
@@ -161,7 +161,7 @@ class AvatarPickerRepository(context: Context) {
   }
 
   fun getDefaultAvatarForGroup(groupId: GroupId): Avatar {
-    val recipient = Recipient.externalGroupExact(groupId)
+    val recipient = Recipient.externalGroupExact(applicationContext, groupId)
 
     return getDefaultAvatarForGroup(recipient.avatarColor)
   }

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

@@ -183,7 +183,7 @@ sealed class AvatarPickerViewModel(private val repository: AvatarPickerRepositor
     private val isNewGroup: Boolean,
     private val groupAvatarMedia: Media?
   ) : ViewModelProvider.Factory {
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
       val viewModel = if (groupId == null && !isNewGroup) {
         SelfAvatarPickerViewModel(repository)
       } else if (groupId == null) {

app/src/main/java/org/thoughtcrime/securesms/avatar/text/TextAvatarCreationViewModel.kt

@@ -33,7 +33,7 @@ class TextAvatarCreationViewModel(initialText: Avatar.Text) : ViewModel() {
   }
 
   class Factory(private val initialText: Avatar.Text) : ViewModelProvider.Factory {
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
       return requireNotNull(modelClass.cast(TextAvatarCreationViewModel(initialText)))
     }
   }

app/src/main/java/org/thoughtcrime/securesms/avatar/vector/VectorAvatarCreationViewModel.kt

@@ -20,7 +20,7 @@ class VectorAvatarCreationViewModel(initialAvatar: Avatar.Vector) : ViewModel()
   fun getCurrentAvatar() = store.state.currentAvatar
 
   class Factory(private val initialAvatar: Avatar.Vector) : ViewModelProvider.Factory {
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
       return requireNotNull(modelClass.cast(VectorAvatarCreationViewModel(initialAvatar)))
     }
   }

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

@@ -159,12 +159,12 @@ public class BackupDialog {
   public static void showVerifyBackupPassphraseDialog(@NonNull Context context) {
     View        view   = LayoutInflater.from(context).inflate(R.layout.enter_backup_passphrase_dialog, null);
     EditText    prompt = view.findViewById(R.id.restore_passphrase_input);
-    AlertDialog dialog = new MaterialAlertDialogBuilder(context)
-                            .setTitle(R.string.BackupDialog_enter_backup_passphrase_to_verify)
-                            .setView(view)
-                            .setPositiveButton(R.string.BackupDialog_verify, null)
-                            .setNegativeButton(android.R.string.cancel, null)
-                            .show();
+    AlertDialog dialog = new AlertDialog.Builder(context)
+                                        .setTitle(R.string.BackupDialog_enter_backup_passphrase_to_verify)
+                                        .setView(view)
+                                        .setPositiveButton(R.string.BackupDialog_verify, null)
+                                        .setNegativeButton(android.R.string.cancel, null)
+                                        .show();
 
     Button positiveButton = dialog.getButton(AlertDialog.BUTTON_POSITIVE);
     positiveButton.setEnabled(false);

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

@@ -197,9 +197,7 @@ public class FullBackupExporter extends FullBackupBase {
         throwIfCanceled(cancellationSignal);
         if (avatar != null) {
           EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count, estimatedCount));
-          try (InputStream inputStream = avatar.getInputStream()) {
-            outputStream.write(avatar.getFilename(), inputStream, avatar.getLength());
-          }
+          outputStream.write(avatar.getFilename(), avatar.getInputStream(), avatar.getLength());
         }
       }
 
@@ -379,7 +377,6 @@ public class FullBackupExporter extends FullBackupBase {
 
         EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count, estimatedCount));
         outputStream.write(new AttachmentId(rowId, uniqueId), inputStream, size);
-        inputStream.close();
       }
     } catch (IOException e) {
       Log.w(TAG, e);
@@ -398,9 +395,8 @@ public class FullBackupExporter extends FullBackupBase {
 
       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);
-        }
+        InputStream inputStream = ModernDecryptingPartInputStream.createFor(attachmentSecret, random, new File(data), 0);
+        outputStream.writeSticker(rowId, inputStream, size);
       }
     } catch (IOException e) {
       Log.w(TAG, e);

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

@@ -1,83 +1,41 @@
 package org.thoughtcrime.securesms.badges
 
 import android.content.Context
-import androidx.annotation.WorkerThread
 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.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.jobs.MultiDeviceProfileContentUpdateJob
-import org.thoughtcrime.securesms.jobs.RefreshOwnProfileJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.storage.StorageSyncHelper
 import org.thoughtcrime.securesms.util.ProfileUtil
-import java.io.IOException
 
 class BadgeRepository(context: Context) {
 
-  companion object {
-    private val TAG = Log.tag(BadgeRepository::class.java)
-  }
-
   private val context = context.applicationContext
 
-  /**
-   * Sets the visibility for each badge on a user's profile, and uploads them to the server.
-   * Does not write to the local database. The caller must either do that themselves or schedule
-   * a refresh own profile job.
-   *
-   * @return A list of the badges, properly modified to either visible or not visible, according to user preferences.
-   */
-  @Throws(IOException::class)
-  @WorkerThread
-  fun setVisibilityForAllBadgesSync(
-    displayBadgesOnProfile: Boolean,
-    selfBadges: List<Badge>
-  ): List<Badge> {
-    Log.d(TAG, "[setVisibilityForAllBadgesSync] Setting badge visibility...", true)
-
-    val recipientDatabase: RecipientDatabase = 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)
-
-    Log.d(TAG, "[setVisibilityForAllBadgesSync] Requesting data change sync...", true)
-    StorageSyncHelper.scheduleSyncForDataChange()
-
-    return badges
-  }
-
   fun setVisibilityForAllBadges(
     displayBadgesOnProfile: Boolean,
     selfBadges: List<Badge> = Recipient.self().badges
   ): Completable = Completable.fromAction {
-    setVisibilityForAllBadgesSync(displayBadgesOnProfile, selfBadges)
+    val recipientDatabase: RecipientDatabase = SignalDatabase.recipients
+    val badges = selfBadges.map { it.copy(visible = displayBadgesOnProfile) }
 
-    Log.d(TAG, "[setVisibilityForAllBadges] Enqueueing profile refresh...", true)
-    ApplicationDependencies.getJobManager()
-      .startChain(RefreshOwnProfileJob())
-      .then(MultiDeviceProfileContentUpdateJob())
-      .enqueue()
+    ProfileUtil.uploadProfileWithBadges(context, badges)
+    SignalStore.donationsValues().setDisplayBadgesOnProfile(displayBadgesOnProfile)
+    recipientDatabase.markNeedsSync(Recipient.self().id)
+    StorageSyncHelper.scheduleSyncForDataChange()
+
+    recipientDatabase.setBadges(Recipient.self().id, badges)
   }.subscribeOn(Schedulers.io())
 
   fun setFeaturedBadge(featuredBadge: Badge): Completable = Completable.fromAction {
     val badges = Recipient.self().badges
     val reOrderedBadges = listOf(featuredBadge.copy(visible = true)) + (badges.filterNot { it.id == featuredBadge.id })
-
-    Log.d(TAG, "[setFeaturedBadge] Uploading profile with reordered badges...", true)
     ProfileUtil.uploadProfileWithBadges(context, reOrderedBadges)
 
-    Log.d(TAG, "[setFeaturedBadge] Enqueueing profile refresh...", true)
-    ApplicationDependencies.getJobManager()
-      .startChain(RefreshOwnProfileJob())
-      .then(MultiDeviceProfileContentUpdateJob())
-      .enqueue()
+    val recipientDatabase: RecipientDatabase = SignalDatabase.recipients
+    recipientDatabase.setBadges(Recipient.self().id, reOrderedBadges)
   }.subscribeOn(Schedulers.io())
 }

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

@@ -19,7 +19,6 @@ import org.thoughtcrime.securesms.util.ScreenDensity
 import org.whispersystems.signalservice.api.profiles.SignalServiceProfile
 import java.math.BigDecimal
 import java.sql.Timestamp
-import java.util.concurrent.TimeUnit
 
 object Badges {
 
@@ -94,8 +93,7 @@ object Badges {
       Uri.parse(badge.imageUrl),
       badge.imageDensity,
       badge.expiration,
-      badge.visible,
-      0L
+      badge.visible
     )
   }
 
@@ -124,8 +122,7 @@ object Badges {
       uriAndDensity.first(),
       uriAndDensity.second(),
       serviceBadge.expiration?.let { getTimestamp(it) } ?: 0,
-      serviceBadge.isVisible,
-      TimeUnit.SECONDS.toMillis(serviceBadge.duration)
+      serviceBadge.isVisible
     )
   }
 }

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

@@ -31,7 +31,7 @@ object ExpiredGiftSheetConfiguration {
     textPref(
       title = DSLSettingsText.from(
         stringId = R.string.ExpiredGiftSheetConfiguration__your_gift_badge_has_expired,
-        DSLSettingsText.CenterModifier, DSLSettingsText.TitleLargeModifier
+        DSLSettingsText.CenterModifier, DSLSettingsText.Title2BoldModifier
       )
     )
 

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

@@ -13,7 +13,6 @@ import com.google.android.material.button.MaterialButton
 import org.signal.core.util.DimensionUnit
 import org.thoughtcrime.securesms.R
 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
 
@@ -51,7 +50,7 @@ class GiftMessageView @JvmOverloads constructor(
 
   fun setGiftBadge(glideRequests: GlideRequests, giftBadge: GiftBadge, isOutgoing: Boolean, callback: Callback) {
     titleView.setText(R.string.GiftMessageView__gift_badge)
-    descriptionView.text = giftBadge.formatExpiry(context)
+    descriptionView.text = resources.getQuantityString(R.plurals.GiftMessageView__lasts_for_d_months, 1, 1)
     actionView.icon = null
     actionView.setOnClickListener { callback.onViewGiftBadgeClicked() }
     actionView.isEnabled = true

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

@@ -1,9 +1,5 @@
 package org.thoughtcrime.securesms.badges.gifts
 
-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
@@ -11,8 +7,6 @@ import org.thoughtcrime.securesms.mms.OutgoingMediaMessage
 import org.thoughtcrime.securesms.mms.OutgoingSecureMediaMessage
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.Base64
-import java.lang.Integer.min
-import java.util.concurrent.TimeUnit
 
 /**
  * Helper object for Gift badges
@@ -51,36 +45,4 @@ object Gifts {
       giftBadge
     )
   }
-
-  /**
-   * @return the expiration time from the redemption token, in UNIX epoch seconds.
-   */
-  private fun GiftBadge.getExpiry(): Long {
-    return try {
-      ReceiptCredentialPresentation(redemptionToken.toByteArray()).receiptExpirationTime
-    } catch (e: InvalidInputException) {
-      return 0L
-    }
-  }
-
-  fun GiftBadge.formatExpiry(context: Context): String {
-    val expiry = getExpiry()
-    val timeRemaining = TimeUnit.SECONDS.toMillis(expiry) - System.currentTimeMillis()
-    if (timeRemaining <= 0) {
-      return context.getString(R.string.Gifts__expired)
-    }
-
-    val days = TimeUnit.MILLISECONDS.toDays(timeRemaining).toInt()
-    if (days > 0) {
-      return context.resources.getQuantityString(R.plurals.Gifts__d_days_remaining, days, days)
-    }
-
-    val hours = TimeUnit.MILLISECONDS.toHours(timeRemaining).toInt()
-    if (hours > 0) {
-      return context.resources.getQuantityString(R.plurals.Gifts__d_hours_remaining, hours, hours)
-    }
-
-    val minutes = min(1, TimeUnit.MILLISECONDS.toMinutes(timeRemaining).toInt())
-    return context.resources.getQuantityString(R.plurals.Gifts__d_minutes_remaining, minutes, minutes)
-  }
 }

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

@@ -9,7 +9,7 @@ interface OpenableGift {
   /**
    * Returns a projection to draw a top, or null to not do so.
    */
-  fun getOpenableGiftProjection(isAnimating: Boolean): Projection?
+  fun getOpenableGiftProjection(): Projection?
 
   /**
    * Returns a unique id assosicated with this gift.

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

@@ -70,19 +70,19 @@ class OpenableGiftItemDecoration(context: Context) : RecyclerView.ItemDecoration
     val notAnimated = openableChildren.filterNot { animationState.containsKey(it.getGiftId()) }
 
     notAnimated.filterNot { messageIdsOpenedThisSession.contains(it.getGiftId()) }.forEach { child ->
-      val projection = child.getOpenableGiftProjection(false)
+      val projection = child.getOpenableGiftProjection()
       if (projection != null) {
-        child.setOpenGiftCallback {
-          child.clearOpenGiftCallback()
-          val proj = it.getOpenableGiftProjection(true)
-          if (proj != null) {
-            messageIdsOpenedThisSession.add(it.getGiftId())
-            startOpenAnimation(it)
-            parent.invalidate()
-          }
-        }
-
         if (messageIdsShakenThisSession.contains(child.getGiftId())) {
+          child.setOpenGiftCallback {
+            child.clearOpenGiftCallback()
+            val proj = it.getOpenableGiftProjection()
+            if (proj != null) {
+              messageIdsOpenedThisSession.add(it.getGiftId())
+              startOpenAnimation(it)
+              parent.invalidate()
+            }
+          }
+
           drawGiftBox(c, projection)
           drawGiftBow(c, projection)
         } else {
@@ -210,7 +210,7 @@ class OpenableGiftItemDecoration(context: Context) : RecyclerView.ItemDecoration
     }
 
     fun update(animatorDurationScale: Float, canvas: Canvas, drawBox: (Canvas, Projection) -> Unit, drawBow: (Canvas, Projection) -> Unit): Boolean {
-      val projection = openableGift.getOpenableGiftProjection(true) ?: return false
+      val projection = openableGift.getOpenableGiftProjection() ?: return false
 
       if (animatorDurationScale <= 0f) {
         update(canvas, projection, 0f, 0f, drawBox, drawBow)

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

@@ -109,10 +109,6 @@ class GiftFlowConfirmationFragment :
     textInputViewHolder.onAttachedToWindow()
 
     inputAwareLayout.addOnKeyboardShownListener {
-      if (emojiKeyboard.isEmojiSearchMode) {
-        return@addOnKeyboardShownListener
-      }
-
       inputAwareLayout.hideAttachedInput(true)
       emojiToggle.setImageResource(R.drawable.ic_emoji_smiley_24)
     }
@@ -131,25 +127,6 @@ class GiftFlowConfirmationFragment :
       }
     )
 
-    textInputViewHolder.bind(
-      TextInput.MultilineModel(
-        text = viewModel.snapshot.additionalMessage,
-        hint = DSLSettingsText.from(R.string.GiftFlowConfirmationFragment__add_a_message),
-        onTextChanged = {
-          viewModel.setAdditionalMessage(it)
-        },
-        onEmojiToggleClicked = {
-          if (inputAwareLayout.isKeyboardOpen || (!inputAwareLayout.isKeyboardOpen && !inputAwareLayout.isInputOpen)) {
-            inputAwareLayout.show(it, emojiKeyboard)
-            emojiToggle.setImageResource(R.drawable.ic_keyboard_24)
-          } else {
-            inputAwareLayout.showSoftkey(it)
-            emojiToggle.setImageResource(R.drawable.ic_emoji_smiley_24)
-          }
-        }
-      )
-    )
-
     lifecycleDisposable += viewModel.state.observeOn(AndroidSchedulers.mainThread()).subscribe { state ->
       adapter.submitList(getConfiguration(state).toMappingModelList())
 
@@ -165,6 +142,25 @@ class GiftFlowConfirmationFragment :
       } else {
         processingDonationPaymentDialog.dismiss()
       }
+
+      textInputViewHolder.bind(
+        TextInput.MultilineModel(
+          text = state.additionalMessage,
+          hint = DSLSettingsText.from(R.string.GiftFlowConfirmationFragment__add_a_message),
+          onTextChanged = {
+            viewModel.setAdditionalMessage(it)
+          },
+          onEmojiToggleClicked = {
+            if (inputAwareLayout.isKeyboardOpen || (!inputAwareLayout.isKeyboardOpen && !inputAwareLayout.isInputOpen)) {
+              inputAwareLayout.show(it, emojiKeyboard)
+              emojiToggle.setImageResource(R.drawable.ic_keyboard_24)
+            } else {
+              inputAwareLayout.showSoftkey(it)
+              emojiToggle.setImageResource(R.drawable.ic_emoji_smiley_24)
+            }
+          }
+        )
+      )
     }
 
     lifecycleDisposable.bindTo(viewLifecycleOwner)
@@ -253,10 +249,6 @@ class GiftFlowConfirmationFragment :
     )
   }
 
-  override fun onToolbarNavigationClicked() {
-    findNavController().popBackStack()
-  }
-
   override fun openEmojiSearch() {
     emojiKeyboard.onOpenEmojiSearch()
   }

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

@@ -55,7 +55,6 @@ class GiftFlowRecipientSelectionFragment : Fragment(R.layout.gift_flow_recipient
       if (query.isNullOrEmpty()) {
         addSection(
           ContactSearchConfiguration.Section.Recents(
-            includeSelf = false,
             includeHeader = true,
             mode = ContactSearchConfiguration.Section.Recents.Mode.INDIVIDUALS
           )

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

@@ -14,7 +14,6 @@ import org.thoughtcrime.securesms.components.settings.app.subscription.models.Ne
 import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.components.settings.models.IndeterminateLoadingCircle
 import org.thoughtcrime.securesms.util.LifecycleDisposable
-import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.fragments.requireListener
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 
@@ -51,11 +50,6 @@ class GiftFlowStartFragment : DSLSettingsFragment(
     }
   }
 
-  override fun onResume() {
-    super.onResume()
-    ViewUtil.hideKeyboard(requireContext(), requireView())
-  }
-
   private fun getConfiguration(state: GiftFlowState): DSLConfiguration {
     return configure {
       customPref(

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

@@ -239,7 +239,7 @@ class GiftFlowViewModel(
     private val repository: GiftFlowRepository,
     private val donationPaymentRepository: DonationPaymentRepository
   ) : ViewModelProvider.Factory {
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
       return modelClass.cast(
         GiftFlowViewModel(
           repository,

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

@@ -12,7 +12,6 @@ import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
 import org.thoughtcrime.securesms.util.visible
-import java.util.concurrent.TimeUnit
 
 /**
  * A line item for gifts, displayed in the Gift flow's start and confirmation fragments.
@@ -41,18 +40,13 @@ object GiftRowItem {
       badgeView.setBadge(model.giftBadge)
       titleView.text = model.giftBadge.name
       taglineView.setText(R.string.GiftRowItem__send_a_gift_badge)
-
-      val price = FiatMoneyUtil.format(
+      priceView.text = FiatMoneyUtil.format(
         context.resources,
         model.price,
         FiatMoneyUtil.formatOptions()
           .trimZerosAfterDecimal()
           .withDisplayTime(false)
       )
-
-      val duration = TimeUnit.MILLISECONDS.toDays(model.giftBadge.duration)
-
-      priceView.text = context.resources.getQuantityString(R.plurals.GiftRowItem_s_dot_d_day_duration, duration.toInt(), price, duration)
     }
   }
 }

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

@@ -58,7 +58,7 @@ class GiftThanksSheet : DSLSettingsBottomSheetFragment() {
   private fun getConfiguration(recipient: Recipient): DSLConfiguration {
     return configure {
       textPref(
-        title = DSLSettingsText.from(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__thanks_for_your_support, DSLSettingsText.TitleLargeModifier, DSLSettingsText.CenterModifier)
+        title = DSLSettingsText.from(R.string.SubscribeThanksForYourSupportBottomSheetDialogFragment__thanks_for_your_support, DSLSettingsText.Title2BoldModifier, DSLSettingsText.CenterModifier)
       )
 
       noPadTextPref(

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

@@ -158,7 +158,7 @@ class ViewReceivedGiftBottomSheet : DSLSettingsBottomSheetFragment() {
           noPadTextPref(
             title = DSLSettingsText.from(
               charSequence = requireContext().getString(R.string.ViewReceivedGiftBottomSheet__s_sent_you_a_gift, state.recipient.getShortDisplayName(requireContext())),
-              DSLSettingsText.CenterModifier, DSLSettingsText.TitleLargeModifier
+              DSLSettingsText.CenterModifier, DSLSettingsText.Title2BoldModifier
             )
           )
 

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

@@ -143,7 +143,7 @@ class ViewReceivedGiftViewModel(
     private val repository: ViewGiftRepository,
     private val badgeRepository: BadgeRepository
   ) : ViewModelProvider.Factory {
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
       return modelClass.cast(ViewReceivedGiftViewModel(sentFrom, messageId, repository, badgeRepository)) as T
     }
   }

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

@@ -66,7 +66,7 @@ class ViewSentGiftBottomSheet : DSLSettingsBottomSheetFragment() {
       noPadTextPref(
         title = DSLSettingsText.from(
           stringId = R.string.ViewSentGiftBottomSheet__thanks_for_your_support,
-          DSLSettingsText.CenterModifier, DSLSettingsText.TitleLargeModifier
+          DSLSettingsText.CenterModifier, DSLSettingsText.Title2BoldModifier
         )
       )
 

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

@@ -45,7 +45,7 @@ class ViewSentGiftViewModel(
     private val giftBadge: GiftBadge,
     private val repository: ViewGiftRepository
   ) : ViewModelProvider.Factory {
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
       return modelClass.cast(ViewSentGiftViewModel(sentFrom, giftBadge, repository)) as T
     }
   }

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

@@ -35,13 +35,10 @@ data class Badge(
   val imageDensity: String,
   val expirationTimestamp: Long,
   val visible: Boolean,
-  val duration: Long
 ) : Parcelable, Key {
 
   fun isExpired(): Boolean = expirationTimestamp < System.currentTimeMillis() && expirationTimestamp > 0
   fun isBoost(): Boolean = id == BOOST_BADGE_ID
-  fun isGift(): Boolean = id == GIFT_BADGE_ID
-  fun isSubscription(): Boolean = !isBoost() && !isGift()
 
   override fun updateDiskCacheKey(messageDigest: MessageDigest) {
     messageDigest.update(id.toByteArray(Key.CHARSET))

app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/ExpiredBadgeBottomSheetDialogFragment.kt

@@ -2,8 +2,6 @@ package org.thoughtcrime.securesms.badges.self.expired
 
 import androidx.fragment.app.FragmentManager
 import org.signal.core.util.DimensionUnit
-import org.signal.core.util.logging.Log
-import org.signal.donations.StripeDeclineCode
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.badges.models.Badge
 import org.thoughtcrime.securesms.badges.models.ExpiredBadge
@@ -13,13 +11,9 @@ import org.thoughtcrime.securesms.components.settings.DSLSettingsBottomSheetFrag
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
 import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
 import org.thoughtcrime.securesms.components.settings.app.subscription.errors.UnexpectedSubscriptionCancellation
-import org.thoughtcrime.securesms.components.settings.app.subscription.errors.mapToErrorStringResource
-import org.thoughtcrime.securesms.components.settings.app.subscription.errors.shouldRouteToGooglePay
 import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.BottomSheetUtil
-import org.thoughtcrime.securesms.util.CommunicationActions
-import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
 
 /**
  * Bottom sheet displaying a fading badge with a notice and action for becoming a subscriber again.
@@ -36,12 +30,10 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
   private fun getConfiguration(): DSLConfiguration {
     val args = ExpiredBadgeBottomSheetDialogFragmentArgs.fromBundle(requireArguments())
     val badge: Badge = args.badge
-    val cancellationReason = UnexpectedSubscriptionCancellation.fromStatus(args.cancelationReason)
-    val declineCode: StripeDeclineCode? = args.chargeFailure?.let { StripeDeclineCode.getFromCode(it) }
+    val cancellationReason: UnexpectedSubscriptionCancellation? = UnexpectedSubscriptionCancellation.fromStatus(args.cancelationReason)
     val isLikelyASustainer = SignalStore.donationsValues().isLikelyASustainer()
-    val inactive = cancellationReason == UnexpectedSubscriptionCancellation.INACTIVE
 
-    Log.d(TAG, "Displaying Expired Badge Fragment with bundle: ${requireArguments()}", true)
+    val inactive = cancellationReason == UnexpectedSubscriptionCancellation.INACTIVE
 
     return configure {
       customPref(ExpiredBadge.Model(badge))
@@ -63,12 +55,6 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
         DSLSettingsText.from(
           if (badge.isBoost()) {
             getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_boost_badge_has_expired_and)
-          } else if (declineCode != null) {
-            getString(
-              R.string.ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_canceled_s,
-              getString(declineCode.mapToErrorStringResource()),
-              badge.name
-            )
           } else if (inactive) {
             getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_automatically, badge.name)
           } else {
@@ -80,33 +66,22 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
 
       space(DimensionUnit.DP.toPixels(16f).toInt())
 
-      if (badge.isSubscription() && declineCode?.shouldRouteToGooglePay() == true) {
-        space(DimensionUnit.DP.toPixels(68f).toInt())
-
-        secondaryButtonNoOutline(
-          text = DSLSettingsText.from(R.string.ExpiredBadgeBottomSheetDialogFragment__go_to_google_pay),
-          onClick = {
-            CommunicationActions.openBrowserLink(requireContext(), getString(R.string.google_pay_url))
-          }
-        )
-      } else {
-        noPadTextPref(
-          DSLSettingsText.from(
-            if (badge.isBoost()) {
-              if (isLikelyASustainer) {
-                R.string.ExpiredBadgeBottomSheetDialogFragment__you_can_reactivate
-              } else {
-                R.string.ExpiredBadgeBottomSheetDialogFragment__you_can_keep
-              }
+      noPadTextPref(
+        DSLSettingsText.from(
+          if (badge.isBoost()) {
+            if (isLikelyASustainer) {
+              R.string.ExpiredBadgeBottomSheetDialogFragment__you_can_reactivate
             } else {
-              R.string.ExpiredBadgeBottomSheetDialogFragment__you_can
-            },
-            DSLSettingsText.CenterModifier
-          )
+              R.string.ExpiredBadgeBottomSheetDialogFragment__you_can_keep
+            }
+          } else {
+            R.string.ExpiredBadgeBottomSheetDialogFragment__you_can
+          },
+          DSLSettingsText.CenterModifier
         )
+      )
 
-        space(DimensionUnit.DP.toPixels(92f).toInt())
-      }
+      space(DimensionUnit.DP.toPixels(92f).toInt())
 
       primaryButton(
         text = DSLSettingsText.from(
@@ -140,16 +115,9 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
   }
 
   companion object {
-    private val TAG = Log.tag(ExpiredBadgeBottomSheetDialogFragment::class.java)
-
     @JvmStatic
-    fun show(
-      badge: Badge,
-      cancellationReason: UnexpectedSubscriptionCancellation?,
-      chargeFailure: ActiveSubscription.ChargeFailure?,
-      fragmentManager: FragmentManager
-    ) {
-      val args = ExpiredBadgeBottomSheetDialogFragmentArgs.Builder(badge, cancellationReason?.status, chargeFailure?.code).build()
+    fun show(badge: Badge, cancellationReason: UnexpectedSubscriptionCancellation?, fragmentManager: FragmentManager) {
+      val args = ExpiredBadgeBottomSheetDialogFragmentArgs.Builder(badge, cancellationReason?.status).build()
       val fragment = ExpiredBadgeBottomSheetDialogFragment()
       fragment.arguments = args.toBundle()
 

app/src/main/java/org/thoughtcrime/securesms/badges/self/featured/SelectFeaturedBadgeFragment.kt

@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.badges.self.featured
 import android.os.Bundle
 import android.view.View
 import android.widget.Toast
-import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import org.thoughtcrime.securesms.R
@@ -12,12 +11,13 @@ import org.thoughtcrime.securesms.badges.Badges
 import org.thoughtcrime.securesms.badges.Badges.displayBadges
 import org.thoughtcrime.securesms.badges.models.Badge
 import org.thoughtcrime.securesms.badges.models.BadgePreview
+import org.thoughtcrime.securesms.components.recyclerview.OnScrollAnimationHelper
+import org.thoughtcrime.securesms.components.recyclerview.ToolbarShadowAnimationHelper
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
 import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.util.LifecycleDisposable
-import org.thoughtcrime.securesms.util.Material3OnScrollHelper
 
 /**
  * Fragment which allows user to select one of their badges to be their "Featured" badge.
@@ -46,8 +46,8 @@ class SelectFeaturedBadgeFragment : DSLSettingsFragment(
     }
   }
 
-  override fun getMaterial3OnScrollHelper(toolbar: Toolbar?): Material3OnScrollHelper? {
-    return Material3OnScrollHelper(requireActivity(), scrollShadow)
+  override fun getOnScrollAnimationHelper(toolbarShadow: View): OnScrollAnimationHelper {
+    return ToolbarShadowAnimationHelper(scrollShadow)
   }
 
   override fun bindAdapter(adapter: DSLSettingsAdapter) {

app/src/main/java/org/thoughtcrime/securesms/badges/self/featured/SelectFeaturedBadgeViewModel.kt

@@ -66,7 +66,7 @@ class SelectFeaturedBadgeViewModel(private val repository: BadgeRepository) : Vi
   }
 
   class Factory(private val badgeRepository: BadgeRepository) : ViewModelProvider.Factory {
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
       return requireNotNull(modelClass.cast(SelectFeaturedBadgeViewModel(badgeRepository)))
     }
   }

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

@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms.badges.self.none
 
 import android.content.Intent
-import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.viewModels
 import org.signal.core.util.DimensionUnit
@@ -41,7 +40,7 @@ class BecomeASustainerFragment : DSLSettingsBottomSheetFragment() {
         title = DSLSettingsText.from(
           R.string.BecomeASustainerFragment__get_badges,
           DSLSettingsText.CenterModifier,
-          DSLSettingsText.TitleLargeModifier
+          DSLSettingsText.Title2BoldModifier
         )
       )
 
@@ -50,15 +49,13 @@ class BecomeASustainerFragment : DSLSettingsBottomSheetFragment() {
       noPadTextPref(
         title = DSLSettingsText.from(
           R.string.BecomeASustainerFragment__signal_is_a_non_profit,
-          DSLSettingsText.CenterModifier,
-          DSLSettingsText.TextAppearanceModifier(R.style.Signal_Text_BodyMedium),
-          DSLSettingsText.ColorModifier(ContextCompat.getColor(requireContext(), R.color.signal_colorOnSurfaceVariant))
+          DSLSettingsText.CenterModifier
         )
       )
 
-      space(DimensionUnit.DP.toPixels(32f).toInt())
+      space(DimensionUnit.DP.toPixels(77f).toInt())
 
-      tonalButton(
+      primaryButton(
         text = DSLSettingsText.from(
           R.string.BecomeASustainerMegaphone__become_a_sustainer
         ),
@@ -68,7 +65,7 @@ class BecomeASustainerFragment : DSLSettingsBottomSheetFragment() {
         }
       )
 
-      space(DimensionUnit.DP.toPixels(32f).toInt())
+      space(DimensionUnit.DP.toPixels(8f).toInt())
     }
   }
 

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

@@ -38,7 +38,7 @@ class BecomeASustainerViewModel(subscriptionsRepository: SubscriptionsRepository
   }
 
   class Factory(private val subscriptionsRepository: SubscriptionsRepository) : ViewModelProvider.Factory {
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+    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

@@ -38,7 +38,7 @@ class BadgesOverviewFragment : DSLSettingsFragment(
   override fun bindAdapter(adapter: DSLSettingsAdapter) {
     Badge.register(adapter) { badge, _, isFaded ->
       if (badge.isExpired() || isFaded) {
-        findNavController().safeNavigate(BadgesOverviewFragmentDirections.actionBadgeManageFragmentToExpiredBadgeDialog(badge, null, null))
+        findNavController().safeNavigate(BadgesOverviewFragmentDirections.actionBadgeManageFragmentToExpiredBadgeDialog(badge, null))
       } else {
         ViewBadgeBottomSheetDialogFragment.show(parentFragmentManager, Recipient.self().id, badge)
       }

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

@@ -91,7 +91,7 @@ class BadgesOverviewViewModel(
     private val badgeRepository: BadgeRepository,
     private val subscriptionsRepository: SubscriptionsRepository
   ) : ViewModelProvider.Factory {
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+    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/ViewBadgeViewModel.kt

@@ -52,7 +52,7 @@ class ViewBadgeViewModel(
     private val recipientId: RecipientId,
     private val repository: BadgeRepository
   ) : ViewModelProvider.Factory {
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
+    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
       return requireNotNull(modelClass.cast(ViewBadgeViewModel(startBadge, recipientId, repository)))
     }
   }

app/src/main/java/org/thoughtcrime/securesms/blocked/BlockedUsersActivity.java

@@ -171,6 +171,6 @@ public class BlockedUsersActivity extends PassphraseRequiredActivity implements
         throw new IllegalArgumentException("Unsupported event type " + event);
     }
 
-    Snackbar.make(view, getString(messageResId, displayName), Snackbar.LENGTH_SHORT).show();
+    Snackbar.make(view, getString(messageResId, displayName), Snackbar.LENGTH_SHORT).setTextColor(Color.WHITE).show();
   }
 }

app/src/main/java/org/thoughtcrime/securesms/blurhash/BlurHash.java

@@ -1,8 +1,5 @@
 package org.thoughtcrime.securesms.blurhash;
 
-import android.os.Parcel;
-import android.os.Parcelable;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -12,7 +9,7 @@ import java.util.Objects;
  * A BlurHash is a compact string representation of a blurred image that we can use to show fast
  * image previews.
  */
-public class BlurHash implements Parcelable {
+public class BlurHash {
 
   private final String hash;
 
@@ -20,20 +17,6 @@ public class BlurHash implements Parcelable {
     this.hash = hash;
   }
 
-  protected BlurHash(Parcel in) {
-    hash = in.readString();
-  }
-
-  @Override
-  public void writeToParcel(Parcel dest, int flags) {
-    dest.writeString(hash);
-  }
-
-  @Override
-  public int describeContents() {
-    return 0;
-  }
-
   public static @Nullable BlurHash parseOrNull(@Nullable String hash) {
     if (Base83.isValid(hash)) {
       return new BlurHash(hash);
@@ -57,16 +40,4 @@ public class BlurHash implements Parcelable {
   public int hashCode() {
     return Objects.hash(hash);
   }
-
-  public static final Creator<BlurHash> CREATOR = new Creator<BlurHash>() {
-    @Override
-    public BlurHash createFromParcel(Parcel in) {
-      return new BlurHash(in);
-    }
-
-    @Override
-    public BlurHash[] newArray(int size) {
-      return new BlurHash[size];
-    }
-  };
 }

app/src/main/java/org/thoughtcrime/securesms/components/AudioView.java

@@ -87,8 +87,6 @@ public final class AudioView extends FrameLayout {
 
   public AudioView(Context context, AttributeSet attrs, int defStyleAttr) {
     super(context, attrs, defStyleAttr);
-    setLayoutDirection(LAYOUT_DIRECTION_LTR);
-
     TypedArray typedArray = null;
     try {
       typedArray = context.getTheme().obtainStyledAttributes(attrs, R.styleable.AudioView, 0, 0);

app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java

@@ -3,6 +3,9 @@ package org.thoughtcrime.securesms.components;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
@@ -39,6 +42,7 @@ import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.ui.bottomsheet.RecipientBottomSheetDialogFragment;
 import org.thoughtcrime.securesms.util.AvatarUtil;
 import org.thoughtcrime.securesms.util.BlurTransformation;
+import org.thoughtcrime.securesms.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
@@ -54,8 +58,24 @@ public final class AvatarImageView extends AppCompatImageView {
   @SuppressWarnings("unused")
   private static final String TAG = Log.tag(AvatarImageView.class);
 
+  private static final Paint LIGHT_THEME_OUTLINE_PAINT = new Paint();
+  private static final Paint DARK_THEME_OUTLINE_PAINT  = new Paint();
+
+  static {
+    LIGHT_THEME_OUTLINE_PAINT.setColor(Color.argb((int) (255 * 0.2), 0, 0, 0));
+    LIGHT_THEME_OUTLINE_PAINT.setStyle(Paint.Style.STROKE);
+    LIGHT_THEME_OUTLINE_PAINT.setStrokeWidth(1);
+    LIGHT_THEME_OUTLINE_PAINT.setAntiAlias(true);
+
+    DARK_THEME_OUTLINE_PAINT.setColor(Color.argb((int) (255 * 0.2), 255, 255, 255));
+    DARK_THEME_OUTLINE_PAINT.setStyle(Paint.Style.STROKE);
+    DARK_THEME_OUTLINE_PAINT.setStrokeWidth(1);
+    DARK_THEME_OUTLINE_PAINT.setAntiAlias(true);
+  }
+
   private int                             size;
   private boolean                         inverted;
+  private Paint                           outlinePaint;
   private OnClickListener                 listener;
   private Recipient.FallbackPhotoProvider fallbackPhotoProvider;
   private boolean                         blurred;
@@ -85,6 +105,8 @@ public final class AvatarImageView extends AppCompatImageView {
       typedArray.recycle();
     }
 
+    outlinePaint = ThemeUtil.isDarkTheme(context) ? DARK_THEME_OUTLINE_PAINT : LIGHT_THEME_OUTLINE_PAINT;
+
     unknownRecipientDrawable = new ResourceContactPhoto(R.drawable.ic_profile_outline_40, R.drawable.ic_profile_outline_20).asDrawable(context, AvatarColor.UNKNOWN, inverted);
     blurred                  = false;
     chatColors               = null;
@@ -95,6 +117,20 @@ public final class AvatarImageView extends AppCompatImageView {
     super.setClipBounds(clipBounds);
   }
 
+  @Override
+  protected void onDraw(Canvas canvas) {
+    super.onDraw(canvas);
+
+    float width  = getWidth() - getPaddingRight() - getPaddingLeft();
+    float height = getHeight() - getPaddingBottom() - getPaddingTop();
+    float cx     = width / 2f;
+    float cy     = height / 2f;
+    float radius = Math.min(cx, cy) - (outlinePaint.getStrokeWidth() / 2f);
+
+    canvas.translate(getPaddingLeft(), getPaddingTop());
+    canvas.drawCircle(cx, cy, radius, outlinePaint);
+  }
+
   @Override
   public void setOnClickListener(OnClickListener listener) {
     this.listener = listener;

app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java

@@ -28,12 +28,12 @@ import androidx.core.view.inputmethod.InputContentInfoCompat;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.TransportOption;
 import org.thoughtcrime.securesms.components.emoji.EmojiEditText;
 import org.thoughtcrime.securesms.components.mention.MentionAnnotation;
 import org.thoughtcrime.securesms.components.mention.MentionDeleter;
 import org.thoughtcrime.securesms.components.mention.MentionRendererDelegate;
 import org.thoughtcrime.securesms.components.mention.MentionValidatorWatcher;
-import org.thoughtcrime.securesms.conversation.MessageSendType;
 import org.thoughtcrime.securesms.database.model.Mention;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.RecipientId;
@@ -201,13 +201,13 @@ public class ComposeText extends EmojiEditText {
     return getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE;
   }
 
-  public void setMessageSendType(MessageSendType messageSendType) {
+  public void setTransport(TransportOption transport) {
     final boolean useSystemEmoji = SignalStore.settings().isPreferSystemEmoji();
 
     int imeOptions = (getImeOptions() & ~EditorInfo.IME_MASK_ACTION) | EditorInfo.IME_ACTION_SEND;
     int inputType  = getInputType();
 
-    if (isLandscape()) setImeActionLabel(getContext().getString(messageSendType.getComposeHintRes()), EditorInfo.IME_ACTION_SEND);
+    if (isLandscape()) setImeActionLabel(transport.getComposeHint(), EditorInfo.IME_ACTION_SEND);
     else               setImeActionLabel(null, 0);
 
     if (useSystemEmoji) {
@@ -215,9 +215,9 @@ public class ComposeText extends EmojiEditText {
     }
 
     setImeOptions(imeOptions);
-    setHint(getContext().getString(messageSendType.getComposeHintRes()),
-            messageSendType.getSimName() != null
-                ? getContext().getString(R.string.conversation_activity__from_sim_name, messageSendType.getSimName())
+    setHint(transport.getComposeHint(),
+            transport.getSimName().isPresent()
+                ? getContext().getString(R.string.conversation_activity__from_sim_name, transport.getSimName().get())
                 : null);
     setInputType(inputType);
   }

app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java

@@ -10,8 +10,8 @@ import android.widget.ImageView;
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.Px;
 import androidx.annotation.UiThread;
+import androidx.core.content.ContextCompat;
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.attachments.Attachment;
@@ -31,12 +31,12 @@ public class ConversationItemThumbnail extends FrameLayout {
   private ImageView              shade;
   private ConversationItemFooter footer;
   private CornerMask             cornerMask;
+  private Outliner               outliner;
   private Outliner               pulseOutliner;
   private boolean                borderless;
   private int[]                  normalBounds;
   private int[]                  gifBounds;
   private int                    minimumThumbnailWidth;
-  private int                    maximumThumbnailHeight;
 
   public ConversationItemThumbnail(Context context) {
     super(context);
@@ -61,6 +61,9 @@ public class ConversationItemThumbnail extends FrameLayout {
     this.shade      = findViewById(R.id.conversation_thumbnail_shade);
     this.footer     = findViewById(R.id.conversation_thumbnail_footer);
     this.cornerMask = new CornerMask(this);
+    this.outliner   = new Outliner();
+
+    outliner.setColor(ContextCompat.getColor(getContext(), R.color.signal_inverse_transparent_20));
 
     int gifWidth = ViewUtil.dpToPx(260);
     if (attrs != null) {
@@ -85,8 +88,7 @@ public class ConversationItemThumbnail extends FrameLayout {
         Integer.MAX_VALUE
     };
 
-    minimumThumbnailWidth  = -1;
-    maximumThumbnailHeight = -1;
+    minimumThumbnailWidth = -1;
   }
 
   @SuppressWarnings("SuspiciousNameCombination")
@@ -96,6 +98,10 @@ public class ConversationItemThumbnail extends FrameLayout {
 
     if (!borderless) {
       cornerMask.mask(canvas);
+
+      if (album.getVisibility() != VISIBLE) {
+        outliner.draw(canvas);
+      }
     }
 
     if (pulseOutliner != null) {
@@ -144,18 +150,14 @@ public class ConversationItemThumbnail extends FrameLayout {
 
   public void setCorners(int topLeft, int topRight, int bottomRight, int bottomLeft) {
     cornerMask.setRadii(topLeft, topRight, bottomRight, bottomLeft);
+    outliner.setRadii(topLeft, topRight, bottomRight, bottomLeft);
   }
 
-  public void setMinimumThumbnailWidth(@Px int width) {
+  public void setMinimumThumbnailWidth(int width) {
     minimumThumbnailWidth = width;
     thumbnail.setMinimumThumbnailWidth(width);
   }
 
-  public void setMaximumThumbnailHeight(@Px int height) {
-    maximumThumbnailHeight = height;
-    thumbnail.setMaximumThumbnailHeight(height);
-  }
-
   public void setBorderless(boolean borderless) {
     this.borderless = borderless;
   }
@@ -178,10 +180,6 @@ public class ConversationItemThumbnail extends FrameLayout {
         if (minimumThumbnailWidth != -1) {
           thumbnail.setMinimumThumbnailWidth(minimumThumbnailWidth);
         }
-
-        if (maximumThumbnailHeight != -1) {
-          thumbnail.setMaximumThumbnailHeight(maximumThumbnailHeight);
-        }
       }
 
       thumbnail.setVisibility(VISIBLE);

app/src/main/java/org/thoughtcrime/securesms/components/ConversationScrollToView.java

@@ -7,12 +7,9 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.airbnb.lottie.SimpleColorFilter;
-
 import org.thoughtcrime.securesms.R;
 
 public final class ConversationScrollToView extends FrameLayout {
@@ -46,18 +43,6 @@ public final class ConversationScrollToView extends FrameLayout {
     }
   }
 
-  public void setWallpaperEnabled(boolean hasWallpaper) {
-    if (hasWallpaper) {
-      scrollButton.setBackgroundResource(R.drawable.scroll_to_bottom_background_wallpaper);
-    } else {
-      scrollButton.setBackgroundResource(R.drawable.scroll_to_bottom_background_normal);
-    }
-  }
-
-  public void setUnreadCountBackgroundTint(@ColorInt int tint) {
-    unreadCount.getBackground().setColorFilter(new SimpleColorFilter(tint));
-  }
-
   @Override
   public void setOnClickListener(@Nullable OnClickListener l) {
     scrollButton.setOnClickListener(l);

app/src/main/java/org/thoughtcrime/securesms/components/ConversationTypingView.java

@@ -68,13 +68,11 @@ public class ConversationTypingView extends ConstraintLayout {
     }
 
     if (hasWallpaper) {
-      bubble.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.conversation_item_recv_bubble_color_wallpaper));
-      typistCount.getBackground().setColorFilter(ContextCompat.getColor(getContext(), R.color.conversation_item_recv_bubble_color_wallpaper), PorterDuff.Mode.SRC_IN);
-      indicator.setDotTint(ContextCompat.getColor(getContext(), R.color.conversation_typing_indicator_foreground_tint_wallpaper));
+      bubble.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.conversation_item_wallpaper_bubble_color));
+      typistCount.getBackground().setColorFilter(ContextCompat.getColor(getContext(), R.color.conversation_item_wallpaper_bubble_color), PorterDuff.Mode.SRC_IN);
     } else {
-      bubble.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.conversation_item_recv_bubble_color_normal));
-      typistCount.getBackground().setColorFilter(ContextCompat.getColor(getContext(), R.color.conversation_item_recv_bubble_color_normal), PorterDuff.Mode.SRC_IN);
-      indicator.setDotTint(ContextCompat.getColor(getContext(), R.color.conversation_typing_indicator_foreground_tint_normal));
+      bubble.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.signal_background_secondary));
+      typistCount.getBackground().setColorFilter(ContextCompat.getColor(getContext(), R.color.signal_background_secondary), PorterDuff.Mode.SRC_IN);
     }
 
     indicator.startAnimation();

app/src/main/java/org/thoughtcrime/securesms/components/FixedRoundedCornerBottomSheetDialogFragment.kt

@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms.components
 
 import android.app.Dialog
-import android.content.res.ColorStateList
 import android.graphics.Color
 import android.os.Bundle
 import android.view.ContextThemeWrapper
@@ -32,8 +31,6 @@ abstract class FixedRoundedCornerBottomSheetDialogFragment : BottomSheetDialogFr
   @ColorInt
   protected var backgroundColor: Int = Color.TRANSPARENT
 
-  private lateinit var dialogBackground: MaterialShapeDrawable
-
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setStyle(STYLE_NORMAL, themeResId)
@@ -49,11 +46,11 @@ abstract class FixedRoundedCornerBottomSheetDialogFragment : BottomSheetDialogFr
       .setTopRightCorner(CornerFamily.ROUNDED, ViewUtil.dpToPx(requireContext(), 18).toFloat())
       .build()
 
-    dialogBackground = MaterialShapeDrawable(shapeAppearanceModel)
+    val dialogBackground = MaterialShapeDrawable(shapeAppearanceModel)
 
     val bottomSheetStyle = ThemeUtil.getThemedResourceId(ContextThemeWrapper(requireContext(), themeResId), R.attr.bottomSheetStyle)
     backgroundColor = ThemeUtil.getThemedColor(ContextThemeWrapper(requireContext(), bottomSheetStyle), R.attr.backgroundTint)
-    dialogBackground.fillColor = ColorStateList.valueOf(backgroundColor)
+    dialogBackground.setTint(backgroundColor)
 
     dialog.behavior.addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() {
       override fun onStateChanged(bottomSheet: View, newState: Int) {

app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java

@@ -4,6 +4,8 @@ import android.content.Context;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.drawable.Drawable;
+import android.text.Spannable;
+import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.style.CharacterStyle;
 import android.util.AttributeSet;
@@ -47,11 +49,13 @@ public class FromTextView extends SimpleEmojiTextView {
 
   public void setText(Recipient recipient, @Nullable CharSequence fromString, boolean read, @Nullable String suffix) {
     SpannableStringBuilder builder  = new SpannableStringBuilder();
+    SpannableString        fromSpan = new SpannableString(fromString);
+    fromSpan.setSpan(getFontSpan(!read), 0, fromSpan.length(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
 
     if (recipient.isSelf()) {
       builder.append(getContext().getString(R.string.note_to_self));
     } else {
-      builder.append(fromString);
+      builder.append(fromSpan);
     }
 
     if (suffix != null) {
@@ -81,4 +85,8 @@ public class FromTextView extends SimpleEmojiTextView {
 
     return mutedDrawable;
   }
+
+  private CharacterStyle getFontSpan(boolean isBold) {
+    return isBold ? SpanUtil.getBoldSpan() : SpanUtil.getNormalSpan();
+  }
 }

app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java

@@ -15,7 +15,6 @@ import android.view.animation.Animation;
 import android.view.animation.AnimationSet;
 import android.view.animation.Interpolator;
 import android.view.animation.TranslateAnimation;
-import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -78,8 +77,8 @@ public class InputPanel extends LinearLayout
   private LinkPreviewView linkPreview;
   private EmojiToggle     mediaKeyboard;
   private ComposeText     composeText;
-  private ImageButton     quickCameraToggle;
-  private ImageButton     quickAudioToggle;
+  private View            quickCameraToggle;
+  private View            quickAudioToggle;
   private AnimatingToggle buttonToggle;
   private SendButton      sendButton;
   private View            recordingContainer;
@@ -95,7 +94,6 @@ public class InputPanel extends LinearLayout
   private @Nullable Listener listener;
   private           boolean  emojiVisible;
 
-  private boolean hideForMessageRequestState;
   private boolean hideForGroupState;
   private boolean hideForBlockedState;
   private boolean hideForSearch;
@@ -184,7 +182,7 @@ public class InputPanel extends LinearLayout
                        @NonNull SlideDeck attachments,
                        @NonNull QuoteModel.Type quoteType)
   {
-    this.quoteView.setQuote(glideRequests, id, author, body, false, attachments, null, quoteType);
+    this.quoteView.setQuote(glideRequests, id, author, body, false, attachments, null, null, quoteType);
 
     int originalHeight = this.quoteView.getVisibility() == VISIBLE ? this.quoteView.getMeasuredHeight()
                                                                    : 0;
@@ -324,39 +322,13 @@ public class InputPanel extends LinearLayout
   }
 
   public void setWallpaperEnabled(boolean enabled) {
-    final int iconTint;
-    final int textColor;
-    final int textHintColor;
-
     if (enabled) {
-      iconTint = getContext().getResources().getColor(R.color.signal_colorOnSurface);
-      textColor = getContext().getResources().getColor(R.color.signal_colorOnSurface);
-      textHintColor = getContext().getResources().getColor(R.color.signal_colorOnSurfaceVariant);
-
-      setBackground(null);
+      setBackground(new ColorDrawable(getContext().getResources().getColor(R.color.wallpaper_compose_background)));
       composeContainer.setBackground(Objects.requireNonNull(ContextCompat.getDrawable(getContext(), R.drawable.compose_background_wallpaper)));
-      quickAudioToggle.setColorFilter(iconTint);
-      quickCameraToggle.setColorFilter(iconTint);
     } else {
-      iconTint = getContext().getResources().getColor(R.color.signal_colorOnSurface);
-      textColor = getContext().getResources().getColor(R.color.signal_colorOnSurface);
-      textHintColor = getContext().getResources().getColor(R.color.signal_colorOnSurfaceVariant);
-
-      setBackground(new ColorDrawable(getContext().getResources().getColor(R.color.signal_colorSurface)));
+      setBackground(new ColorDrawable(getContext().getResources().getColor(R.color.signal_background_primary)));
       composeContainer.setBackground(Objects.requireNonNull(ContextCompat.getDrawable(getContext(), R.drawable.compose_background)));
     }
-
-    mediaKeyboard.setColorFilter(iconTint);
-    quickAudioToggle.setColorFilter(iconTint);
-    quickCameraToggle.setColorFilter(iconTint);
-    composeText.setTextColor(textColor);
-    composeText.setHintTextColor(textHintColor);
-    quoteView.setWallpaperEnabled(enabled);
-  }
-
-  public void setHideForMessageRequestState(boolean hideForMessageRequestState) {
-    this.hideForMessageRequestState = hideForMessageRequestState;
-    updateVisibility();
   }
 
   public void setHideForGroupState(boolean hideForGroupState) {
@@ -556,7 +528,7 @@ public class InputPanel extends LinearLayout
   }
 
   private void updateVisibility() {
-    if (hideForGroupState || hideForBlockedState || hideForSearch || hideForSelection || hideForMessageRequestState) {
+    if (hideForGroupState || hideForBlockedState || hideForSearch || hideForSelection) {
       setVisibility(GONE);
     } else {
       setVisibility(VISIBLE);

app/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java

@@ -63,7 +63,8 @@ public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
   private int viewInset;
 
   private boolean keyboardOpen = false;
-  private int     rotation     = 0;
+  private int     rotation     = -1;
+  private boolean isFullscreen = false;
   private boolean isBubble     = false;
 
   public KeyboardAwareLinearLayout(Context context) {
@@ -107,11 +108,7 @@ public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
   }
 
   private void updateKeyboardState() {
-    updateKeyboardState(Integer.MAX_VALUE);
-  }
-
-  private void updateKeyboardState(int previousHeight) {
-    if (viewInset == 0 && Build.VERSION.SDK_INT >= 21) viewInset = getViewInset();
+    if (viewInset == 0 && Build.VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) viewInset = getViewInset();
 
     getWindowVisibleDisplayFrame(rect);
 
@@ -130,22 +127,16 @@ public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
         onKeyboardOpen(keyboardHeight);
       }
     } else if (keyboardOpen) {
-      if (previousHeight == keyboardHeight) {
-        onKeyboardClose();
-      } else {
-        postDelayed(() -> updateKeyboardState(keyboardHeight), 100);
-      }
+      onKeyboardClose();
     }
   }
 
   @Override
   protected void onAttachedToWindow() {
     super.onAttachedToWindow();
-    rotation = getDeviceRotation();
     if (Build.VERSION.SDK_INT >= 23 && getRootWindowInsets() != null) {
       int          bottomInset;
       WindowInsets windowInsets = getRootWindowInsets();
-
       if (Build.VERSION.SDK_INT >= 30) {
         bottomInset = windowInsets.getInsets(WindowInsets.Type.navigationBars()).bottom;
       } else {
@@ -307,6 +298,10 @@ public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
     shownListeners.remove(listener);
   }
 
+  public void setFullscreen(boolean isFullscreen) {
+    this.isFullscreen = isFullscreen;
+  }
+
   private void notifyHiddenListeners() {
     final Set<OnKeyboardHiddenListener> listeners = new HashSet<>(hiddenListeners);
     for (OnKeyboardHiddenListener listener : listeners) {

app/src/main/java/org/thoughtcrime/securesms/components/KeyboardEntryDialogFragment.kt

@@ -22,10 +22,8 @@ abstract class KeyboardEntryDialogFragment(@LayoutRes contentLayoutId: Int) :
 
   protected open val withDim: Boolean = false
 
-  protected open val themeResId: Int = R.style.Theme_Signal_RoundedBottomSheet
-
   override fun onCreate(savedInstanceState: Bundle?) {
-    setStyle(STYLE_NORMAL, themeResId)
+    setStyle(STYLE_NORMAL, R.style.Theme_Signal_RoundedBottomSheet)
     super.onCreate(savedInstanceState)
   }
 

app/src/main/java/org/thoughtcrime/securesms/components/LinkPreviewView.java

@@ -13,6 +13,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
+import androidx.core.content.ContextCompat;
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.linkpreview.LinkPreview;
@@ -50,6 +51,7 @@ public class LinkPreviewView extends FrameLayout {
   private int                  type;
   private int                  defaultRadius;
   private CornerMask           cornerMask;
+  private Outliner             outliner;
   private CloseClickedListener closeClickedListener;
 
   public LinkPreviewView(Context context) {
@@ -76,6 +78,9 @@ public class LinkPreviewView extends FrameLayout {
     noPreview     = findViewById(R.id.linkpreview_no_preview);
     defaultRadius = getResources().getDimensionPixelSize(R.dimen.thumbnail_default_radius);
     cornerMask    = new CornerMask(this);
+    outliner      = new Outliner();
+
+    outliner.setColor(ContextCompat.getColor(getContext(), R.color.signal_inverse_transparent_20));
 
     if (attrs != null) {
       TypedArray typedArray   = getContext().getTheme().obtainStyledAttributes(attrs, R.styleable.LinkPreviewView, 0, 0);
@@ -107,6 +112,7 @@ public class LinkPreviewView extends FrameLayout {
     if (type == TYPE_COMPOSE) return;
 
     cornerMask.mask(canvas);
+    outliner.draw(canvas);
   }
 
   public void setLoading() {
@@ -128,10 +134,6 @@ public class LinkPreviewView extends FrameLayout {
   }
 
   public void setLinkPreview(@NonNull GlideRequests glideRequests, @NonNull LinkPreview linkPreview, boolean showThumbnail) {
-    setLinkPreview(glideRequests, linkPreview, showThumbnail, true);
-  }
-
-  public void setLinkPreview(@NonNull GlideRequests glideRequests, @NonNull LinkPreview linkPreview, boolean showThumbnail, boolean showDescription) {
     spinner.setVisibility(GONE);
     noPreview.setVisibility(GONE);
 
@@ -142,7 +144,7 @@ public class LinkPreviewView extends FrameLayout {
       title.setVisibility(GONE);
     }
 
-    if (showDescription && !Util.isEmpty(linkPreview.getDescription())) {
+    if (!Util.isEmpty(linkPreview.getDescription())) {
       description.setText(linkPreview.getDescription());
       description.setVisibility(VISIBLE);
     } else {
@@ -183,9 +185,11 @@ public class LinkPreviewView extends FrameLayout {
   public void setCorners(int topStart, int topEnd) {
     if (ViewUtil.isRtl(this)) {
       cornerMask.setRadii(topEnd, topStart, 0, 0);
+      outliner.setRadii(topEnd, topStart, 0, 0);
       thumbnail.setCorners(defaultRadius, topEnd, defaultRadius, defaultRadius);
     } else {
       cornerMask.setRadii(topStart, topEnd, 0, 0);
+      outliner.setRadii(topStart, topEnd, 0, 0);
       thumbnail.setCorners(topStart, defaultRadius, defaultRadius, defaultRadius);
     }
     postInvalidate();

app/src/main/java/org/thoughtcrime/securesms/components/Material3SearchToolbar.kt

@@ -1,87 +0,0 @@
-package org.thoughtcrime.securesms.components
-
-import android.content.Context
-import android.graphics.PointF
-import android.os.Build
-import android.util.AttributeSet
-import android.view.View
-import android.view.ViewAnimationUtils
-import android.widget.EditText
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.animation.addListener
-import androidx.core.widget.addTextChangedListener
-import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.util.ViewUtil
-import org.thoughtcrime.securesms.util.visible
-
-/**
- * Search Toolbar following the Signal Material3 design spec.
- */
-class Material3SearchToolbar @JvmOverloads constructor(
-  context: Context,
-  attrs: AttributeSet? = null
-) : ConstraintLayout(context, attrs) {
-
-  var listener: Listener? = null
-
-  private val input: EditText
-
-  private val circularRevealPoint = PointF()
-
-  init {
-    inflate(context, R.layout.material3_serarch_toolbar, this)
-
-    input = findViewById(R.id.search_input)
-
-    val close = findViewById<View>(R.id.search_close)
-    val clear = findViewById<View>(R.id.search_clear)
-
-    close.setOnClickListener { collapse() }
-    clear.setOnClickListener { input.setText("") }
-
-    input.addTextChangedListener(afterTextChanged = {
-      clear.visible = !it.isNullOrBlank()
-      listener?.onSearchTextChange(it?.toString() ?: "")
-    })
-  }
-
-  fun display(x: Float, y: Float) {
-    if (Build.VERSION.SDK_INT < 21) {
-      visibility = VISIBLE
-      ViewUtil.focusAndShowKeyboard(input)
-    } else if (!visible) {
-      circularRevealPoint.set(x, y)
-
-      val animator = ViewAnimationUtils.createCircularReveal(this, x.toInt(), y.toInt(), 0f, width.toFloat())
-      animator.duration = 400
-
-      visibility = VISIBLE
-      ViewUtil.focusAndShowKeyboard(input)
-      animator.start()
-    }
-  }
-
-  fun collapse() {
-    if (visibility == VISIBLE) {
-      listener?.onSearchClosed()
-      ViewUtil.hideKeyboard(context, input)
-
-      if (Build.VERSION.SDK_INT >= 21) {
-        val animator = ViewAnimationUtils.createCircularReveal(this, circularRevealPoint.x.toInt(), circularRevealPoint.y.toInt(), width.toFloat(), 0f)
-        animator.duration = 400
-
-        animator.addListener(onEnd = {
-          visibility = INVISIBLE
-        })
-        animator.start()
-      } else {
-        visibility = INVISIBLE
-      }
-    }
-  }
-
-  interface Listener {
-    fun onSearchTextChange(text: String)
-    fun onSearchClosed()
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java

@@ -4,6 +4,7 @@ package org.thoughtcrime.securesms.components;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
+import android.graphics.Color;
 import android.os.Build;
 import android.text.TextUtils;
 import android.util.AttributeSet;
@@ -16,19 +17,17 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
+import androidx.appcompat.content.res.AppCompatResources;
+import androidx.core.content.ContextCompat;
 
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.google.android.material.imageview.ShapeableImageView;
-import com.google.android.material.shape.CornerFamily;
-import com.google.android.material.shape.ShapeAppearanceModel;
 
-import org.signal.core.util.DimensionUnit;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.components.emoji.EmojiImageView;
 import org.thoughtcrime.securesms.components.mention.MentionAnnotation;
-import org.thoughtcrime.securesms.components.quotes.QuoteViewColorTheme;
+import org.thoughtcrime.securesms.conversation.colors.ChatColors;
 import org.thoughtcrime.securesms.database.model.Mention;
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
 import org.thoughtcrime.securesms.mms.GlideRequests;
@@ -41,6 +40,7 @@ import org.thoughtcrime.securesms.recipients.RecipientForeverObserver;
 import org.thoughtcrime.securesms.stories.StoryTextPostModel;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.Projection;
+import org.thoughtcrime.securesms.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.Util;
 
 import java.io.IOException;
@@ -76,19 +76,18 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
     }
   }
 
-  private View               background;
-  private ViewGroup          mainView;
-  private ViewGroup          footerView;
-  private TextView           authorView;
-  private TextView           bodyView;
-  private View               quoteBarView;
-  private ShapeableImageView thumbnailView;
-  private View               attachmentVideoOverlayView;
-  private ViewGroup          attachmentContainerView;
-  private TextView           attachmentNameView;
-  private ImageView          dismissView;
-  private EmojiImageView     missingStoryReaction;
-  private EmojiImageView     storyReactionEmoji;
+  private ViewGroup      mainView;
+  private ViewGroup      footerView;
+  private TextView       authorView;
+  private TextView       bodyView;
+  private View           quoteBarView;
+  private ImageView      thumbnailView;
+  private View           attachmentVideoOverlayView;
+  private ViewGroup      attachmentContainerView;
+  private TextView       attachmentNameView;
+  private ImageView      dismissView;
+  private EmojiImageView missingStoryReaction;
+  private EmojiImageView storyReactionEmoji;
 
   private long            id;
   private LiveRecipient   author;
@@ -101,7 +100,6 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
   private int             smallCornerRadius;
   private CornerMask      cornerMask;
   private QuoteModel.Type quoteType;
-  private boolean         isWallpaperEnabled;
 
   private int thumbHeight;
   private int thumbWidth;
@@ -130,7 +128,6 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
   private void initialize(@Nullable AttributeSet attrs) {
     inflate(getContext(), R.layout.quote_view, this);
 
-    this.background                   = findViewById(R.id.quote_background);
     this.mainView                     = findViewById(R.id.quote_main);
     this.footerView                   = findViewById(R.id.quote_missing_footer);
     this.authorView                   = findViewById(R.id.quote_author);
@@ -151,12 +148,19 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
     cornerMask = new CornerMask(this);
 
     if (attrs != null) {
-      TypedArray typedArray = getContext().getTheme().obtainStyledAttributes(attrs, R.styleable.QuoteView, 0, 0);
-
+      TypedArray typedArray     = getContext().getTheme().obtainStyledAttributes(attrs, R.styleable.QuoteView, 0, 0);
+      int        primaryColor   = typedArray.getColor(R.styleable.QuoteView_quote_colorPrimary, Color.BLACK);
+      int        secondaryColor = typedArray.getColor(R.styleable.QuoteView_quote_colorSecondary, Color.BLACK);
       messageType = MessageType.fromCode(typedArray.getInt(R.styleable.QuoteView_message_type, 0));
       typedArray.recycle();
 
       dismissView.setVisibility(messageType == MessageType.PREVIEW ? VISIBLE : GONE);
+
+      authorView.setTextColor(primaryColor);
+      bodyView.setTextColor(primaryColor);
+      attachmentNameView.setTextColor(primaryColor);
+      mediaDescriptionText.setTextColor(secondaryColor);
+      missingLinkText.setTextColor(primaryColor);
     }
 
     setMessageType(messageType);
@@ -204,6 +208,7 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
                        @Nullable CharSequence body,
                        boolean originalMissing,
                        @NonNull SlideDeck attachments,
+                       @Nullable ChatColors chatColors,
                        @Nullable String storyReaction,
                        @NonNull QuoteModel.Type quoteType)
   {
@@ -220,7 +225,12 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
     setQuoteText(resolveBody(body, quoteType), attachments, originalMissing, storyReaction);
     setQuoteAttachment(glideRequests, body, attachments, originalMissing);
     setQuoteMissingFooter(originalMissing);
-    applyColorTheme();
+
+    if (Build.VERSION.SDK_INT < 21 && messageType == MessageType.INCOMING && chatColors != null) {
+      this.setBackgroundColor(chatColors.asSingleColor());
+    } else {
+      this.setBackground(null);
+    }
   }
 
   private @Nullable CharSequence resolveBody(@Nullable CharSequence body, @NonNull QuoteModel.Type quoteType) {
@@ -242,11 +252,6 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
     setVisibility(GONE);
   }
 
-  public void setWallpaperEnabled(boolean isWallpaperEnabled) {
-    this.isWallpaperEnabled = isWallpaperEnabled;
-    applyColorTheme();
-  }
-
   @Override
   public void onRecipientChanged(@NonNull Recipient recipient) {
     setQuoteAuthor(recipient);
@@ -261,6 +266,9 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
   }
 
   private void setQuoteAuthor(@NonNull Recipient author) {
+    boolean outgoing = messageType != MessageType.INCOMING && messageType != MessageType.STORY_REPLY_INCOMING;
+    boolean preview  = messageType == MessageType.PREVIEW || messageType == MessageType.STORY_REPLY_PREVIEW;
+
     if (isStoryReply()) {
       authorView.setText(author.isSelf() ? getContext().getString(R.string.QuoteView_your_story)
                                          : getContext().getString(R.string.QuoteView_s_story, author.getDisplayName(getContext())));
@@ -268,6 +276,19 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
       authorView.setText(author.isSelf() ? getContext().getString(R.string.QuoteView_you)
                                          : author.getDisplayName(getContext()));
     }
+
+    quoteBarView.setBackgroundColor(ContextCompat.getColor(getContext(), outgoing || isStoryReply() ? R.color.core_white : android.R.color.transparent));
+
+    int mainViewColor;
+    if (preview) {
+      mainViewColor = R.color.quote_preview_background;
+    } else if (!outgoing && isStoryReply()) {
+      mainViewColor = R.color.quote_incoming_story_background;
+    } else {
+      mainViewColor = R.color.quote_view_background;
+    }
+
+    mainView.setBackgroundColor(ContextCompat.getColor(getContext(), mainViewColor));
   }
 
   private boolean isStoryReply() {
@@ -359,11 +380,7 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
   }
 
   private void setQuoteAttachment(@NonNull GlideRequests glideRequests, @NonNull CharSequence body, @NonNull SlideDeck slideDeck, boolean originalMissing) {
-    boolean outgoing = messageType != MessageType.INCOMING && messageType != MessageType.STORY_REPLY_INCOMING;
-    boolean preview  = messageType == MessageType.PREVIEW || messageType == MessageType.STORY_REPLY_PREVIEW;
-
     mainView.setMinimumHeight(isStoryReply() && originalMissing ? 0 : thumbHeight);
-    thumbnailView.setPadding(0, 0, 0, 0);
 
     if (!attachments.containsMediaSlide() && isStoryReply()) {
       StoryTextPostModel model = getStoryTextPost(body);
@@ -379,12 +396,6 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
     }
 
     if (quoteType == QuoteModel.Type.GIFT_BADGE) {
-      if (outgoing && !preview) {
-        int oneDp = (int) DimensionUnit.DP.toPixels(1);
-        thumbnailView.setPadding(oneDp, oneDp, oneDp, oneDp);
-        thumbnailView.setShapeAppearanceModel(buildShapeAppearanceForLayoutDirection());
-      }
-
       attachmentVideoOverlayView.setVisibility(GONE);
       attachmentContainerView.setVisibility(GONE);
       thumbnailView.setVisibility(VISIBLE);
@@ -426,10 +437,15 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
       attachmentContainerView.setVisibility(GONE);
       dismissView.setBackgroundDrawable(null);
     }
+
+    if (ThemeUtil.isDarkTheme(getContext())) {
+      dismissView.setBackgroundResource(R.drawable.circle_alpha);
+    }
   }
 
   private void setQuoteMissingFooter(boolean missing) {
     footerView.setVisibility(missing && !isStoryReply() ? VISIBLE : GONE);
+    footerView.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.quote_view_background));
   }
 
   private @Nullable StoryTextPostModel getStoryTextPost(@Nullable CharSequence body) {
@@ -471,35 +487,4 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
   public @NonNull List<Mention> getMentions() {
     return MentionAnnotation.getMentionsFromAnnotations(body);
   }
-
-  private @NonNull ShapeAppearanceModel buildShapeAppearanceForLayoutDirection() {
-    int fourDp = (int) DimensionUnit.DP.toPixels(4);
-    if (getLayoutDirection() == LAYOUT_DIRECTION_LTR) {
-      return ShapeAppearanceModel.builder()
-                                 .setTopRightCorner(CornerFamily.ROUNDED, fourDp)
-                                 .setBottomRightCorner(CornerFamily.ROUNDED, fourDp)
-                                 .build();
-    } else {
-      return ShapeAppearanceModel.builder()
-                                 .setTopLeftCorner(CornerFamily.ROUNDED, fourDp)
-                                 .setBottomLeftCorner(CornerFamily.ROUNDED, fourDp)
-                                 .build();
-    }
-  }
-
-  private void applyColorTheme() {
-    boolean isOutgoing = messageType != MessageType.INCOMING && messageType != MessageType.STORY_REPLY_INCOMING;
-    boolean isPreview  = messageType == MessageType.PREVIEW || messageType == MessageType.STORY_REPLY_PREVIEW;
-
-    QuoteViewColorTheme quoteViewColorTheme = QuoteViewColorTheme.resolveTheme(isOutgoing, isPreview, isWallpaperEnabled);
-
-    quoteBarView.setBackgroundColor(quoteViewColorTheme.getBarColor(getContext()));
-    background.setBackgroundColor(quoteViewColorTheme.getBackgroundColor(getContext()));
-    authorView.setTextColor(quoteViewColorTheme.getForegroundColor(getContext()));
-    bodyView.setTextColor(quoteViewColorTheme.getForegroundColor(getContext()));
-    attachmentNameView.setTextColor(quoteViewColorTheme.getForegroundColor(getContext()));
-    mediaDescriptionText.setTextColor(quoteViewColorTheme.getForegroundColor(getContext()));
-    missingLinkText.setTextColor(quoteViewColorTheme.getForegroundColor(getContext()));
-    footerView.setBackgroundColor(quoteViewColorTheme.getBackgroundColor(getContext()));
-  }
 }

app/src/main/java/org/thoughtcrime/securesms/components/SendButton.java

@@ -0,0 +1,121 @@
+package org.thoughtcrime.securesms.components;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.AppCompatImageButton;
+
+import org.thoughtcrime.securesms.TransportOption;
+import org.thoughtcrime.securesms.TransportOptions;
+import org.thoughtcrime.securesms.TransportOptions.OnTransportChangedListener;
+import org.thoughtcrime.securesms.TransportOptionsPopup;
+import org.thoughtcrime.securesms.util.ViewUtil;
+
+import java.util.Optional;
+
+
+public class SendButton extends AppCompatImageButton
+    implements TransportOptions.OnTransportChangedListener,
+               TransportOptionsPopup.SelectedListener,
+               View.OnLongClickListener
+{
+
+  private final TransportOptions transportOptions;
+
+  private Optional<TransportOptionsPopup> transportOptionsPopup = Optional.empty();
+
+  @SuppressWarnings("unused")
+  public SendButton(Context context) {
+    super(context);
+    this.transportOptions = initializeTransportOptions(false);
+    ViewUtil.mirrorIfRtl(this, getContext());
+  }
+
+  @SuppressWarnings("unused")
+  public SendButton(Context context, AttributeSet attrs) {
+    super(context, attrs);
+    this.transportOptions = initializeTransportOptions(false);
+    ViewUtil.mirrorIfRtl(this, getContext());
+  }
+
+  @SuppressWarnings("unused")
+  public SendButton(Context context, AttributeSet attrs, int defStyle) {
+    super(context, attrs, defStyle);
+    this.transportOptions = initializeTransportOptions(false);
+    ViewUtil.mirrorIfRtl(this, getContext());
+  }
+
+  private TransportOptions initializeTransportOptions(boolean media) {
+    if (isInEditMode()) return null;
+
+    TransportOptions transportOptions = new TransportOptions(getContext(), media);
+    transportOptions.addOnTransportChangedListener(this);
+
+    setOnLongClickListener(this);
+
+    return transportOptions;
+  }
+
+  private TransportOptionsPopup getTransportOptionsPopup() {
+    if (!transportOptionsPopup.isPresent()) {
+      transportOptionsPopup = Optional.of(new TransportOptionsPopup(getContext(), this, this));
+    }
+    return transportOptionsPopup.get();
+  }
+
+  public boolean isManualSelection() {
+    return transportOptions.isManualSelection();
+  }
+
+  public void addOnTransportChangedListener(OnTransportChangedListener listener) {
+    transportOptions.addOnTransportChangedListener(listener);
+  }
+
+  public TransportOption getSelectedTransport() {
+    return transportOptions.getSelectedTransport();
+  }
+
+  public void resetAvailableTransports(boolean isMediaMessage) {
+    transportOptions.reset(isMediaMessage);
+  }
+
+  public void disableTransport(TransportOption.Type type) {
+    transportOptions.disableTransport(type);
+  }
+
+  public void setDefaultTransport(TransportOption.Type type) {
+    transportOptions.setDefaultTransport(type);
+  }
+
+  public void setTransport(@NonNull TransportOption option) {
+    transportOptions.setSelectedTransport(option);
+  }
+
+  public void setDefaultSubscriptionId(Optional<Integer> subscriptionId) {
+    transportOptions.setDefaultSubscriptionId(subscriptionId);
+  }
+
+  @Override
+  public void onSelected(TransportOption option) {
+    transportOptions.setSelectedTransport(option);
+    getTransportOptionsPopup().dismiss();
+  }
+
+  @Override
+  public void onChange(TransportOption newTransport, boolean isManualSelection) {
+    setImageResource(newTransport.getDrawable());
+    setContentDescription(newTransport.getDescription());
+  }
+
+  @Override
+  public boolean onLongClick(View v) {
+    if (isEnabled() && transportOptions.getEnabledTransports().size() > 1) {
+      getTransportOptionsPopup().display(transportOptions.getEnabledTransports());
+      return true;
+    }
+
+    return false;
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/SendButton.kt

@@ -1,181 +0,0 @@
-package org.thoughtcrime.securesms.components
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.View
-import android.view.View.OnLongClickListener
-import android.view.ViewGroup
-import androidx.appcompat.widget.AppCompatImageButton
-import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.components.menu.ActionItem
-import org.thoughtcrime.securesms.components.menu.SignalContextMenu
-import org.thoughtcrime.securesms.conversation.MessageSendType
-import org.thoughtcrime.securesms.util.ViewUtil
-import java.lang.AssertionError
-import java.util.concurrent.CopyOnWriteArrayList
-
-/**
- * The send button you see in a conversation.
- * Also encapsulates the long-press menu that allows users to switch [MessageSendType]s.
- */
-class SendButton(context: Context, attributeSet: AttributeSet?) : AppCompatImageButton(context, attributeSet), OnLongClickListener {
-
-  companion object {
-    private val TAG = Log.tag(SendButton::class.java)
-  }
-
-  private val listeners: MutableList<SendTypeChangedListener> = CopyOnWriteArrayList()
-
-  private var availableSendTypes: List<MessageSendType> = MessageSendType.getAllAvailable(context, false)
-  private var activeMessageSendType: MessageSendType? = null
-  private var defaultTransportType: MessageSendType.TransportType = MessageSendType.TransportType.SMS
-  private var defaultSubscriptionId: Int? = null
-  private var popupContainer: ViewGroup? = null
-
-  init {
-    setOnLongClickListener(this)
-    ViewUtil.mirrorIfRtl(this, getContext())
-  }
-
-  /**
-   * @return True if the [selectedSendType] was chosen manually by the user, otherwise false.
-   */
-  val isManualSelection: Boolean
-    get() = activeMessageSendType != null
-
-  /**
-   * The actively-selected send type.
-   */
-  val selectedSendType: MessageSendType
-    get() {
-      activeMessageSendType?.let {
-        return it
-      }
-
-      if (defaultTransportType === MessageSendType.TransportType.SMS) {
-        for (type in availableSendTypes) {
-          if (type.usesSmsTransport && (defaultSubscriptionId == null || type.simSubscriptionId == defaultSubscriptionId)) {
-            return type
-          }
-        }
-      }
-
-      for (type in availableSendTypes) {
-        if (type.transportType === defaultTransportType) {
-          return type
-        }
-      }
-
-      Log.w(TAG, "No options of default type! Resetting. DefaultTransportType: $defaultTransportType, AllAvailable: ${availableSendTypes.map { it.transportType }}")
-
-      val signalType: MessageSendType? = availableSendTypes.firstOrNull { it.usesSignalTransport }
-      if (signalType != null) {
-        Log.w(TAG, "No options of default type, but Signal type is available. Switching. DefaultTransportType: $defaultTransportType, AllAvailable: ${availableSendTypes.map { it.transportType }}")
-        defaultTransportType = MessageSendType.TransportType.SIGNAL
-        onSelectionChanged(signalType, false)
-        return signalType
-      } else if (availableSendTypes.isEmpty()) {
-        Log.w(TAG, "No send types available at all! Enabling the Signal transport.")
-        defaultTransportType = MessageSendType.TransportType.SIGNAL
-        availableSendTypes = listOf(MessageSendType.SignalMessageSendType)
-        onSelectionChanged(MessageSendType.SignalMessageSendType, false)
-        return MessageSendType.SignalMessageSendType
-      } else {
-        throw AssertionError("No options of default type! DefaultTransportType: $defaultTransportType, AllAvailable: ${availableSendTypes.map { it.transportType }}")
-      }
-    }
-
-  fun addOnSelectionChangedListener(listener: SendTypeChangedListener) {
-    listeners.add(listener)
-  }
-
-  fun triggerSelectedChangedEvent() {
-    onSelectionChanged(newType = selectedSendType, isManualSelection = false)
-  }
-
-  fun resetAvailableTransports(isMediaMessage: Boolean) {
-    availableSendTypes = MessageSendType.getAllAvailable(context, isMediaMessage)
-
-    if (!availableSendTypes.contains(activeMessageSendType)) {
-      Log.w(TAG, "[resetAvailableTransports] The active send type is no longer available. Unsetting.")
-      setSendType(null)
-    } else {
-      defaultTransportType = MessageSendType.TransportType.SMS
-      defaultSubscriptionId = null
-      onSelectionChanged(newType = selectedSendType, isManualSelection = false)
-    }
-  }
-
-  fun disableTransportType(type: MessageSendType.TransportType) {
-    availableSendTypes = availableSendTypes.filterNot { it.transportType == type }
-  }
-
-  fun setDefaultTransport(type: MessageSendType.TransportType) {
-    if (defaultTransportType == type) {
-      return
-    }
-    defaultTransportType = type
-    onSelectionChanged(newType = selectedSendType, isManualSelection = false)
-  }
-
-  fun setSendType(sendType: MessageSendType?) {
-    if (activeMessageSendType == sendType) {
-      return
-    }
-    activeMessageSendType = sendType
-    onSelectionChanged(newType = selectedSendType, isManualSelection = true)
-  }
-
-  fun setDefaultSubscriptionId(subscriptionId: Int?) {
-    if (defaultSubscriptionId == subscriptionId) {
-      return
-    }
-    defaultSubscriptionId = subscriptionId
-    onSelectionChanged(newType = selectedSendType, isManualSelection = false)
-  }
-
-  /**
-   * Must be called with a view that is acceptable for determining the bounds of the popup selector.
-   */
-  fun setPopupContainer(container: ViewGroup) {
-    popupContainer = container
-  }
-
-  private fun onSelectionChanged(newType: MessageSendType, isManualSelection: Boolean) {
-    setImageResource(newType.buttonDrawableRes)
-    contentDescription = context.getString(newType.titleRes)
-
-    for (listener in listeners) {
-      listener.onSendTypeChanged(newType, isManualSelection)
-    }
-  }
-
-  override fun onLongClick(v: View): Boolean {
-    if (!isEnabled || availableSendTypes.size == 1) {
-      return false
-    }
-
-    val currentlySelected: MessageSendType = selectedSendType
-
-    val items = availableSendTypes
-      .filterNot { it == currentlySelected }
-      .map { option ->
-        ActionItem(
-          iconRes = option.menuDrawableRes,
-          title = option.getTitle(context),
-          action = { setSendType(option) }
-        )
-      }
-
-    SignalContextMenu.Builder((parent as View), popupContainer!!)
-      .preferredVerticalPosition(SignalContextMenu.VerticalPosition.ABOVE)
-      .offsetY(ViewUtil.dpToPx(8))
-      .show(items)
-
-    return true
-  }
-
-  interface SendTypeChangedListener {
-    fun onSendTypeChanged(newType: MessageSendType, manuallySelected: Boolean)
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java

@@ -14,7 +14,6 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Px;
 import androidx.annotation.UiThread;
 
 import com.bumptech.glide.RequestBuilder;
@@ -156,16 +155,11 @@ public class ThumbnailView extends FrameLayout {
     captionIcon.setScaleY(captionIconScale);
   }
 
-  public void setMinimumThumbnailWidth(@Px int width) {
+  public void setMinimumThumbnailWidth(int width) {
     bounds[MIN_WIDTH] = width;
     invalidate();
   }
 
-  public void setMaximumThumbnailHeight(@Px int height) {
-    bounds[MAX_HEIGHT] = height;
-    invalidate();
-  }
-
   @SuppressWarnings("SuspiciousNameCombination")
   private void fillTargetDimensions(int[] targetDimens, int[] dimens, int[] bounds) {
     int     dimensFilledCount = getNonZeroCount(dimens);

app/src/main/java/org/thoughtcrime/securesms/components/TypingIndicatorView.java

@@ -9,7 +9,6 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.LinearLayout;
 
-import androidx.annotation.ColorInt;
 import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.R;
@@ -55,16 +54,12 @@ public class TypingIndicatorView extends LinearLayout {
       int        tint       = typedArray.getColor(R.styleable.TypingIndicatorView_typingIndicator_tint, Color.WHITE);
       typedArray.recycle();
 
-      setDotTint(tint);
+      dot1.getBackground().setColorFilter(tint, PorterDuff.Mode.MULTIPLY);
+      dot2.getBackground().setColorFilter(tint, PorterDuff.Mode.MULTIPLY);
+      dot3.getBackground().setColorFilter(tint, PorterDuff.Mode.MULTIPLY);
     }
   }
 
-  public void setDotTint(@ColorInt int tint) {
-    dot1.getBackground().setColorFilter(tint, PorterDuff.Mode.MULTIPLY);
-    dot2.getBackground().setColorFilter(tint, PorterDuff.Mode.MULTIPLY);
-    dot3.getBackground().setColorFilter(tint, PorterDuff.Mode.MULTIPLY);
-  }
-
   @Override
   protected void onDraw(Canvas canvas) {
     if (!isActive) {

app/src/main/java/org/thoughtcrime/securesms/components/WrapperDialogFragment.kt

@@ -1,73 +0,0 @@
-package org.thoughtcrime.securesms.components
-
-import android.content.DialogInterface
-import android.os.Bundle
-import android.view.View
-import androidx.activity.OnBackPressedCallback
-import androidx.fragment.app.DialogFragment
-import androidx.fragment.app.Fragment
-import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.util.fragments.findListener
-
-/**
- * Convenience class for wrapping Fragments in full-screen dialogs. Due to how fragments work, they
- * must be public static classes. Therefore, this class should be subclassed as its own entity, rather
- * than via `object : WrapperDialogFragment`.
- *
- * Example usage:
- *
- * ```
- * class Dialog : WrapperDialogFragment() {
- *   override fun getWrappedFragment(): Fragment {
- *     return NavHostFragment.create(R.navigation.private_story_settings, requireArguments())
- *   }
- * }
- *
- * companion object {
- *   fun createAsDialog(distributionListId: DistributionListId): DialogFragment {
- *     return Dialog().apply {
- *       arguments = PrivateStorySettingsFragmentArgs.Builder(distributionListId).build().toBundle()
- *     }
- *   }
- * }
- * ```
- */
-abstract class WrapperDialogFragment : DialogFragment(R.layout.fragment_container) {
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-
-    setStyle(STYLE_NO_FRAME, R.style.Signal_DayNight_Dialog_FullScreen)
-  }
-
-  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-    requireActivity().onBackPressedDispatcher.addCallback(
-      viewLifecycleOwner,
-      object : OnBackPressedCallback(true) {
-        override fun handleOnBackPressed() {
-          onHandleBackPressed()
-        }
-      }
-    )
-
-    if (savedInstanceState == null) {
-      childFragmentManager.beginTransaction()
-        .replace(R.id.fragment_container, getWrappedFragment())
-        .commitAllowingStateLoss()
-    }
-  }
-
-  open fun onHandleBackPressed() {
-    dismissAllowingStateLoss()
-  }
-
-  override fun onDismiss(dialog: DialogInterface) {
-    findListener<WrapperDialogFragmentCallback>()?.onWrapperDialogFragmentDismissed()
-  }
-
-  abstract fun getWrappedFragment(): Fragment
-
-  interface WrapperDialogFragmentCallback {
-    fun onWrapperDialogFragmentDismissed()
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java

@@ -38,7 +38,6 @@ import androidx.annotation.Nullable;
 
 import org.signal.core.util.ThreadUtil;
 import org.signal.core.util.logging.Log;
-import org.signal.qr.kitkat.QrCameraView;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.util.BitmapUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
@@ -229,7 +228,7 @@ public class CameraView extends ViewGroup {
     listeners.add(listener);
   }
 
-  public void setPreviewCallback(final @NonNull QrCameraView.PreviewCallback previewCallback) {
+  public void setPreviewCallback(final @NonNull PreviewCallback previewCallback) {
     enqueueTask(new PostInitializationTask<Void>() {
       @Override
       protected void onPostMain(Void avoid) {
@@ -244,7 +243,7 @@ public class CameraView extends ViewGroup {
               final int  rotation    = getCameraPictureOrientation();
               final Size previewSize = camera.getParameters().getPreviewSize();
               if (data != null) {
-                previewCallback.onPreviewFrame(new QrCameraView.PreviewFrame(data, previewSize.width, previewSize.height, rotation));
+                previewCallback.onPreviewFrame(new PreviewFrame(data, previewSize.width, previewSize.height, rotation));
               }
             }
           });
@@ -569,6 +568,40 @@ public class CameraView extends ViewGroup {
     void onCameraStop();
   }
 
+  public interface PreviewCallback {
+    void onPreviewFrame(@NonNull PreviewFrame frame);
+  }
+
+  public static class PreviewFrame {
+    private final @NonNull byte[] data;
+    private final          int    width;
+    private final          int    height;
+    private final          int    orientation;
+
+    private PreviewFrame(@NonNull byte[] data, int width, int height, int orientation) {
+      this.data        = data;
+      this.width       = width;
+      this.height      = height;
+      this.orientation = orientation;
+    }
+
+    public @NonNull byte[] getData() {
+      return data;
+    }
+
+    public int getWidth() {
+      return width;
+    }
+
+    public int getHeight() {
+      return height;
+    }
+
+    public int getOrientation() {
+      return orientation;
+    }
+  }
+
   private enum State {
     PAUSED, RESUMED, ACTIVE
   }

app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java

@@ -26,7 +26,6 @@ import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewKt;
 import androidx.core.widget.TextViewCompat;
 
-import org.signal.core.util.StringUtil;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.emoji.parsing.EmojiParser;
 import org.thoughtcrime.securesms.components.mention.MentionAnnotation;
@@ -152,10 +151,10 @@ public class EmojiTextView extends AppCompatTextView {
     // Android fails to ellipsize spannable strings. (https://issuetracker.google.com/issues/36991688)
     // We ellipsize them ourselves by manually truncating the appropriate section.
     if (getText() != null && getText().length() > 0 && isEllipsizedAtEnd()) {
-      if (getMaxLines() > 0) {
-        ellipsizeEmojiTextForMaxLines();
-      } else if (maxLength > 0) {
+      if (maxLength > 0) {
         ellipsizeAnyTextForMaxLength();
+      } else if (getMaxLines() > 0) {
+        ellipsizeEmojiTextForMaxLines();
       }
     }
 
@@ -309,17 +308,11 @@ public class EmojiTextView extends AppCompatTextView {
 
       int lineCount = getLineCount();
       if (lineCount > maxLines) {
-        int overflowStart = getLayout().getLineStart(maxLines - 1);
-
-        if (maxLength > 0 && overflowStart > maxLength) {
-          ellipsizeAnyTextForMaxLength();
-          return;
-        }
-
+        int          overflowStart = getLayout().getLineStart(maxLines - 1);
         int          overflowEnd   = getLayout().getLineEnd(maxLines - 1);
         CharSequence overflow      = getText().subSequence(overflowStart, overflowEnd);
         float        adjust        = overflowText != null ? getPaint().measureText(overflowText, 0, overflowText.length()) : 0f;
-        CharSequence ellipsized    = StringUtil.trim(TextUtils.ellipsize(overflow, getPaint(), getWidth() - adjust, TextUtils.TruncateAt.END));
+        CharSequence ellipsized    = TextUtils.ellipsize(overflow, getPaint(), getWidth() - adjust, TextUtils.TruncateAt.END);
 
         SpannableStringBuilder newContent = new SpannableStringBuilder();
         newContent.append(getText().subSequence(0, overflowStart))
@@ -330,8 +323,6 @@ public class EmojiTextView extends AppCompatTextView {
         CharSequence              emojified     = EmojiProvider.emojify(newCandidates, newContent, this, isJumbomoji || forceJumboEmoji);
 
         super.setText(emojified, BufferType.SPANNABLE);
-      } else if (maxLength > 0) {
-        ellipsizeAnyTextForMaxLength();
       }
     };
 

app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java

@@ -26,17 +26,17 @@ public class EmojiToggle extends AppCompatImageButton implements MediaKeyboard.M
 
   public EmojiToggle(Context context) {
     super(context);
-    initialize();
+    initialize(null);
   }
 
   public EmojiToggle(Context context, AttributeSet attrs) {
     super(context, attrs);
-    initialize();
+    initialize(attrs);
   }
 
   public EmojiToggle(Context context, AttributeSet attrs, int defStyle) {
     super(context, attrs, defStyle);
-    initialize();
+    initialize(attrs);
   }
 
   public void setToMedia() {
@@ -47,11 +47,18 @@ public class EmojiToggle extends AppCompatImageButton implements MediaKeyboard.M
     setImageDrawable(imeToggle);
   }
 
-  private void initialize() {
-    this.emojiToggle   = ContextUtil.requireDrawable(getContext(), R.drawable.ic_emoji);
+  private void initialize(@Nullable AttributeSet attrs) {
+    boolean forceOutline = false;
+    if (attrs != null) {
+      TypedArray typedArray = getContext().getTheme().obtainStyledAttributes(attrs, R.styleable.EmojiToggle, 0, 0);
+      forceOutline = typedArray.getBoolean(R.styleable.EmojiToggle_force_outline, false);
+      typedArray.recycle();
+    }
+
+    this.emojiToggle   = ContextUtil.requireDrawable(getContext(), forceOutline ? R.drawable.ic_emoji_outline : R.drawable.ic_emoji);
     this.stickerToggle = ContextUtil.requireDrawable(getContext(), R.drawable.ic_sticker_24);
     this.gifToggle     = ContextUtil.requireDrawable(getContext(), R.drawable.ic_gif_24);
-    this.imeToggle     = ContextUtil.requireDrawable(getContext(), R.drawable.ic_keyboard_24);
+    this.imeToggle     = ContextUtil.requireDrawable(getContext(), forceOutline ? R.drawable.ic_keyboard_outline_24 : R.drawable.ic_keyboard_24);
     this.mediaToggle   = emojiToggle;
 
     setToMedia();

app/src/main/java/org/thoughtcrime/securesms/components/menu/ActionItem.kt

@@ -1,15 +1,12 @@
 package org.thoughtcrime.securesms.components.menu
 
-import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
-import org.thoughtcrime.securesms.R
 
 /**
  * Represents an action to be rendered via [SignalContextMenu] or [SignalBottomActionBar]
  */
-data class ActionItem @JvmOverloads constructor(
+data class ActionItem(
   @DrawableRes val iconRes: Int,
   val title: CharSequence,
-  @ColorRes val tintRes: Int = R.color.signal_colorOnSurface,
-  val action: Runnable,
+  val action: Runnable
 )

app/src/main/java/org/thoughtcrime/securesms/components/menu/ContextMenuList.kt

@@ -4,7 +4,6 @@ import android.os.Build
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
-import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import org.thoughtcrime.securesms.R
@@ -79,10 +78,6 @@ class ContextMenuList(recyclerView: RecyclerView, onItemClick: () -> Unit) {
         onItemClick()
       }
 
-      val tintColor = ContextCompat.getColor(context, model.item.tintRes)
-      icon.setColorFilter(tintColor)
-      title.setTextColor(tintColor)
-
       if (Build.VERSION.SDK_INT >= 21) {
         when (model.displayType) {
           DisplayType.TOP -> itemView.setBackgroundResource(R.drawable.signal_context_menu_item_background_top)

app/src/main/java/org/thoughtcrime/securesms/components/menu/SignalContextMenu.kt

@@ -25,7 +25,6 @@ class SignalContextMenu private constructor(
   val baseOffsetX: Int = 0,
   val baseOffsetY: Int = 0,
   val horizontalPosition: HorizontalPosition = HorizontalPosition.START,
-  val verticalPosition: VerticalPosition = VerticalPosition.BELOW,
   val onDismiss: Runnable? = null
 ) : PopupWindow(
   LayoutInflater.from(anchor.context).inflate(R.layout.signal_context_menu, null),
@@ -42,7 +41,6 @@ class SignalContextMenu private constructor(
 
   init {
     setBackgroundDrawable(ContextCompat.getDrawable(context, R.drawable.signal_context_menu_background))
-    inputMethodMode = INPUT_METHOD_NOT_NEEDED
 
     isFocusable = true
 
@@ -82,10 +80,7 @@ class SignalContextMenu private constructor(
 
     val offsetY: Int
 
-    if (verticalPosition == VerticalPosition.ABOVE && menuTopBound > screenTopBound) {
-      offsetY = -(anchorRect.height() + contentView.measuredHeight + baseOffsetY)
-      contextMenuList.setItems(items.reversed())
-    } else if (menuBottomBound < screenBottomBound) {
+    if (menuBottomBound < screenBottomBound) {
       offsetY = baseOffsetY
     } else if (menuTopBound > screenTopBound) {
       offsetY = -(anchorRect.height() + contentView.measuredHeight + baseOffsetY)
@@ -120,10 +115,6 @@ class SignalContextMenu private constructor(
     START, END
   }
 
-  enum class VerticalPosition {
-    ABOVE, BELOW
-  }
-
   /**
    * @param anchor The view to put the pop-up on
    * @param container A parent of [anchor] that represents the acceptable boundaries of the popup
@@ -137,7 +128,6 @@ class SignalContextMenu private constructor(
     var offsetX = 0
     var offsetY = 0
     var horizontalPosition = HorizontalPosition.START
-    var verticalPosition = VerticalPosition.BELOW
 
     fun onDismiss(onDismiss: Runnable): Builder {
       this.onDismiss = onDismiss
@@ -159,11 +149,6 @@ class SignalContextMenu private constructor(
       return this
     }
 
-    fun preferredVerticalPosition(verticalPosition: VerticalPosition): Builder {
-      this.verticalPosition = verticalPosition
-      return this
-    }
-
     fun show(items: List<ActionItem>): SignalContextMenu {
       return SignalContextMenu(
         anchor = anchor,
@@ -172,7 +157,6 @@ class SignalContextMenu private constructor(
         baseOffsetX = offsetX,
         baseOffsetY = offsetY,
         horizontalPosition = horizontalPosition,
-        verticalPosition = verticalPosition,
         onDismiss = onDismiss
       ).show()
     }

app/src/main/java/org/thoughtcrime/securesms/components/quotes/QuoteViewColorTheme.kt

@@ -1,51 +0,0 @@
-package org.thoughtcrime.securesms.components.quotes
-
-import android.content.Context
-import androidx.core.content.ContextCompat
-import org.thoughtcrime.securesms.R
-
-enum class QuoteViewColorTheme(
-  private val backgroundColorRes: Int,
-  private val barColorRes: Int,
-  private val foregroundColorRes: Int
-) {
-
-  INCOMING_WALLPAPER(
-    R.color.quote_view_background_incoming_wallpaper,
-    R.color.quote_view_bar_incoming_wallpaper,
-    R.color.quote_view_foreground_incoming_wallpaper
-  ),
-  INCOMING_NORMAL(
-    R.color.quote_view_background_incoming_normal,
-    R.color.quote_view_bar_incoming_normal,
-    R.color.quote_view_foreground_incoming_normal
-  ),
-  OUTGOING_WALLPAPER(
-    R.color.quote_view_background_outgoing_wallpaper,
-    R.color.quote_view_bar_outgoing_wallpaper,
-    R.color.quote_view_foreground_outgoing_wallpaper
-  ),
-  OUTGOING_NORMAL(
-    R.color.quote_view_background_outgoing_normal,
-    R.color.quote_view_bar_outgoing_normal,
-    R.color.quote_view_foreground_outgoing_normal
-  );
-
-  fun getBackgroundColor(context: Context) = ContextCompat.getColor(context, backgroundColorRes)
-  fun getBarColor(context: Context) = ContextCompat.getColor(context, barColorRes)
-  fun getForegroundColor(context: Context) = ContextCompat.getColor(context, foregroundColorRes)
-
-  companion object {
-    @JvmStatic
-    fun resolveTheme(isOutgoing: Boolean, isPreview: Boolean, hasWallpaper: Boolean): QuoteViewColorTheme {
-      return when {
-        isPreview && hasWallpaper -> INCOMING_WALLPAPER
-        isPreview && !hasWallpaper -> INCOMING_NORMAL
-        isOutgoing && hasWallpaper -> OUTGOING_WALLPAPER
-        !isOutgoing && hasWallpaper -> INCOMING_WALLPAPER
-        isOutgoing && !hasWallpaper -> OUTGOING_NORMAL
-        else -> INCOMING_NORMAL
-      }
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/components/registration/CallMeCountDownView.java

@@ -6,13 +6,11 @@ import android.util.AttributeSet;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.google.android.material.button.MaterialButton;
-
 import org.thoughtcrime.securesms.R;
 
 import java.util.concurrent.TimeUnit;
 
-public class CallMeCountDownView extends MaterialButton {
+public class CallMeCountDownView extends androidx.appcompat.widget.AppCompatButton {
 
   private long countDownToTime;
   @Nullable

app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsAdapter.kt

@@ -22,7 +22,6 @@ import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
-import org.thoughtcrime.securesms.util.views.LearnMoreTextView
 import org.thoughtcrime.securesms.util.visible
 
 class DSLSettingsAdapter : MappingAdapter() {
@@ -30,7 +29,6 @@ class DSLSettingsAdapter : MappingAdapter() {
     registerFactory(ClickPreference::class.java, LayoutFactory(::ClickPreferenceViewHolder, R.layout.dsl_preference_item))
     registerFactory(LongClickPreference::class.java, LayoutFactory(::LongClickPreferenceViewHolder, R.layout.dsl_preference_item))
     registerFactory(TextPreference::class.java, LayoutFactory(::TextPreferenceViewHolder, R.layout.dsl_preference_item))
-    registerFactory(LearnMoreTextPreference::class.java, LayoutFactory(::LearnMoreTextPreferenceViewHolder, R.layout.dsl_learn_more_preference_item))
     registerFactory(RadioListPreference::class.java, LayoutFactory(::RadioListPreferenceViewHolder, R.layout.dsl_preference_item))
     registerFactory(MultiSelectListPreference::class.java, LayoutFactory(::MultiSelectListPreferenceViewHolder, R.layout.dsl_preference_item))
     registerFactory(ExternalLinkPreference::class.java, LayoutFactory(::ExternalLinkPreferenceViewHolder, R.layout.dsl_preference_item))
@@ -93,14 +91,6 @@ abstract class PreferenceViewHolder<T : PreferenceModel<T>>(itemView: View) : Ma
 
 class TextPreferenceViewHolder(itemView: View) : PreferenceViewHolder<TextPreference>(itemView)
 
-class LearnMoreTextPreferenceViewHolder(itemView: View) : PreferenceViewHolder<LearnMoreTextPreference>(itemView) {
-  override fun bind(model: LearnMoreTextPreference) {
-    super.bind(model)
-    (titleView as LearnMoreTextView).setOnLinkClickListener { model.onClick() }
-    (summaryView as LearnMoreTextView).setOnLinkClickListener { model.onClick() }
-  }
-}
-
 class ClickPreferenceViewHolder(itemView: View) : PreferenceViewHolder<ClickPreference>(itemView) {
   override fun bind(model: ClickPreference) {
     super.bind(model)

app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsFragment.kt

@@ -15,7 +15,8 @@ import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.util.Material3OnScrollHelper
+import org.thoughtcrime.securesms.components.recyclerview.OnScrollAnimationHelper
+import org.thoughtcrime.securesms.components.recyclerview.ToolbarShadowAnimationHelper
 
 abstract class DSLSettingsFragment(
   @StringRes private val titleId: Int = -1,
@@ -27,16 +28,19 @@ abstract class DSLSettingsFragment(
   protected var recyclerView: RecyclerView? = null
     private set
 
+  private var scrollAnimationHelper: OnScrollAnimationHelper? = null
+
   @CallSuper
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     val toolbar: Toolbar? = view.findViewById(R.id.toolbar)
+    val toolbarShadow: View? = view.findViewById(R.id.toolbar_shadow)
 
     if (titleId != -1) {
       toolbar?.setTitle(titleId)
     }
 
     toolbar?.setNavigationOnClickListener {
-      onToolbarNavigationClicked()
+      requireActivity().onBackPressed()
     }
 
     if (menuId != -1) {
@@ -44,6 +48,10 @@ abstract class DSLSettingsFragment(
       toolbar?.setOnMenuItemClickListener { onOptionsItemSelected(it) }
     }
 
+    if (toolbarShadow != null) {
+      scrollAnimationHelper = getOnScrollAnimationHelper(toolbarShadow)
+    }
+
     val settingsAdapter = DSLSettingsAdapter()
 
     recyclerView = view.findViewById<RecyclerView>(R.id.recycler).apply {
@@ -51,29 +59,23 @@ abstract class DSLSettingsFragment(
       layoutManager = layoutManagerProducer(requireContext())
       adapter = settingsAdapter
 
-      getMaterial3OnScrollHelper(toolbar)?.let {
-        it.attach(this)
+      val helper = scrollAnimationHelper
+      if (helper != null) {
+        addOnScrollListener(helper)
       }
     }
 
     bindAdapter(settingsAdapter)
   }
 
-  open fun getMaterial3OnScrollHelper(toolbar: Toolbar?): Material3OnScrollHelper? {
-    if (toolbar == null) {
-      return null
-    }
-
-    return Material3OnScrollHelper(requireActivity(), toolbar)
-  }
-
-  open fun onToolbarNavigationClicked() {
-    requireActivity().onBackPressed()
-  }
-
   override fun onDestroyView() {
     super.onDestroyView()
     recyclerView = null
+    scrollAnimationHelper = null
+  }
+
+  protected open fun getOnScrollAnimationHelper(toolbarShadow: View): OnScrollAnimationHelper {
+    return ToolbarShadowAnimationHelper(toolbarShadow)
   }
 
   abstract fun bindAdapter(adapter: DSLSettingsAdapter)

app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsText.kt

@@ -65,7 +65,7 @@ sealed class DSLSettingsText {
     }
   }
 
-  object TitleLargeModifier : TextAppearanceModifier(R.style.Signal_Text_TitleLarge)
+  object Title2BoldModifier : TextAppearanceModifier(R.style.TextAppearance_Signal_Title2_Bold)
   object Body1BoldModifier : TextAppearanceModifier(R.style.TextAppearance_Signal_Body1_Bold)
 
   open class TextAppearanceModifier(@StyleRes private val textAppearance: Int) : Modifier {

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsActivity.kt

@@ -62,7 +62,6 @@ class AppSettingsActivity : DSLSettingsActivity(), DonationPaymentComponent {
         StartLocation.NOTIFICATION_PROFILE_DETAILS -> AppSettingsFragmentDirections.actionDirectToNotificationProfileDetails(
           EditNotificationProfileScheduleFragmentArgs.fromBundle(intent.getBundleExtra(START_ARGUMENTS)!!).profileId
         )
-        StartLocation.PRIVACY -> AppSettingsFragmentDirections.actionDirectToPrivacy()
       }
     }
 
@@ -169,9 +168,6 @@ class AppSettingsActivity : DSLSettingsActivity(), DonationPaymentComponent {
     @JvmStatic
     fun createNotificationProfile(context: Context): Intent = getIntentForStartLocation(context, StartLocation.CREATE_NOTIFICATION_PROFILE)
 
-    @JvmStatic
-    fun privacy(context: Context): Intent = getIntentForStartLocation(context, StartLocation.PRIVACY)
-
     @JvmStatic
     fun notificationProfileDetails(context: Context, profileId: Long): Intent {
       val arguments = EditNotificationProfileScheduleFragmentArgs.Builder(profileId, false)
@@ -201,8 +197,7 @@ class AppSettingsActivity : DSLSettingsActivity(), DonationPaymentComponent {
     MANAGE_SUBSCRIPTIONS(8),
     NOTIFICATION_PROFILES(9),
     CREATE_NOTIFICATION_PROFILE(10),
-    NOTIFICATION_PROFILE_DETAILS(11),
-    PRIVACY(12);
+    NOTIFICATION_PROFILE_DETAILS(11);
 
     companion object {
       fun fromCode(code: Int?): StartLocation {