Bump version to 5.45.2

Fixes #12369

.github/workflows/android.yml

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

.github/workflows/docker.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Build image
       run: cd reproducible-builds && docker build -t signal-android . && cd ..
 

CONTRIBUTING.md

@@ -15,11 +15,6 @@ Truths which we believe to be self-evident:
 1. **There is no such thing as time.**  Protocol ideas that require synchronized clocks are doomed to failure.
 
 
-## Translations
-
-Thanks to a dedicated community of volunteer translators, Signal is now available in more than one hundred languages. We use Transifex to manage our translation efforts, not GitHub. Any suggestions, corrections, or new translations should be submitted to the [Signal localization project for Android](https://www.transifex.com/signalapp/signal-android/).
-
-
 ## Issues
 
 ### Useful bug reports
@@ -75,10 +70,6 @@ There are several other ways to get involved:
   * Redirect support questions to support@signal.org and the [Signal Support Center](https://support.signal.org/).
   * Redirect non-bug discussions to the [community forum](https://community.signalusers.org).
 * Improve documentation in the [wiki](https://github.com/signalapp/Signal-Android/wiki).
-* Join the community of volunteer translators on Transifex:
-  * [Android](https://www.transifex.com/signalapp/signal-android/)
-  * [iOS](https://www.transifex.com/signalapp/signal-ios/)
-  * [Desktop](https://www.transifex.com/signalapp/signal-desktop/)
 * Find and mark duplicate issues.
 * Try to reproduce issues and help with troubleshooting.
 * Discover solutions to open issues and post any relevant findings.

README.md

@@ -21,11 +21,6 @@ https://play.google.com/apps/testing/org.thoughtcrime.securesms
  
 If you're interested in a life of peace and tranquility, stick with the standard releases.
 
-## Contributing Translations
-Interested in helping to translate Signal? Contribute here:
-
-https://www.transifex.com/projects/p/signal-android/
-
 ## Contributing Code
 
 If you're new to the Signal codebase, we recommend going through our issues and picking out a simple bug to fix (check the "easy" label in our issues) in order to get yourself familiar. Also please have a look at the [CONTRIBUTING.md](https://github.com/signalapp/Signal-Android/blob/main/CONTRIBUTING.md), that might answer some of your questions.

app/build.gradle

@@ -57,8 +57,8 @@ ktlint {
     version = "0.43.2"
 }
 
-def canonicalVersionCode = 1067
-def canonicalVersionName = "5.41.2"
+def canonicalVersionCode = 1100
+def canonicalVersionName = "5.45.2"
 
 def postFixSize = 100
 def abiPostFix = ['universal'   : 0,
@@ -76,10 +76,12 @@ def selectableVariants = [
         'playProdDebug',
         'playProdSpinner',
         'playProdPerf',
+        'playProdInstrumentation',
         'playProdRelease',
         'playStagingDebug',
         'playStagingSpinner',
         'playStagingPerf',
+        'playStagingInstrumentation',
         'playStagingRelease',
         'websiteProdSpinner',
         'websiteProdRelease',
@@ -91,6 +93,7 @@ android {
 
     flavorDimensions 'distribution', 'environment'
     useLibrary 'org.apache.http.legacy'
+    testBuildType 'instrumentation'
 
     kotlinOptions {
         jvmTarget = "1.8"
@@ -193,17 +196,13 @@ android {
         buildConfigField "String[]", "SIGNAL_CONTENT_PROXY_IPS", content_proxy_ips
         buildConfigField "String", "SIGNAL_AGENT", "\"OWA\""
         buildConfigField "String", "CDS_MRENCLAVE", "\"c98e00a4e3ff977a56afefe7362a27e4961e4f19e211febfbb19b897e6b80b15\""
-        buildConfigField "String", "CDSI_MRENCLAVE", "\"42e36b74794abe612d698308b148ff8a7dc5fdc6ad28d99bc5024ed6ece18dfe\""
+        buildConfigField "String", "CDSI_MRENCLAVE", "\"e5eaa62da3514e8b37ccabddb87e52e7f319ccf5120a13f9e1b42b87ec9dd3dd\""
         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[] {" +
-                "new org.thoughtcrime.securesms.KbsEnclave(\"fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe\", " +
-                                                          "\"fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe\", " +
-                                                          "\"a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87\")" +
-            "}"
+        buildConfigField "org.thoughtcrime.securesms.KbsEnclave[]", "KBS_FALLBACKS", "new org.thoughtcrime.securesms.KbsEnclave[0]"
         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", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY/JYJHRooo5CEqYKBqdFnmbTVGEkCvJKxLnjwKWf+fEPoWeQFj5ObDjcKMZf2Jm2Ae69x+ikU5gBXsRmoF94GXTLfN0/vLt98KDPnxwAQL9j5V1jGOY8jQl6MLxEs56cwXN0dqCnImzVH3TZT1cJ8SW1BRX6qIVxEzjsSGx3yxF3suAilPMqGRp4ffyopjMD1JXiKR2RwLKzizUe5e8XyGOy9fplzhw3jVzTRyUZTRSZKkMLWcQ/gv0E4aONNqs4P\""
         buildConfigField "String[]", "LANGUAGES", "new String[]{\"" + autoResConfig().collect { s -> s.replace('-r', '_') }.join('", "') + '"}'
         buildConfigField "int", "CANONICAL_VERSION_CODE", "$canonicalVersionCode"
         buildConfigField "String", "DEFAULT_CURRENCIES", "\"EUR,AUD,GBP,CAD,CNY\""
@@ -266,6 +265,17 @@ android {
 
             buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Debug\""
         }
+
+        instrumentation {
+            initWith debug
+            isDefault false
+            minifyEnabled false
+            matchingFallbacks = ['debug']
+            applicationIdSuffix ".instrumentation"
+
+            buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Instrumentation\""
+        }
+
         spinner {
             initWith debug
             isDefault false
@@ -339,13 +349,9 @@ 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[] {" +
-                    "new org.thoughtcrime.securesms.KbsEnclave(\"823a3b2c037ff0cbe305cc48928cfcc97c9ed4a8ca6d49af6f7d6981fb60a4e9\", " +
-                                                              "\"16b94ac6d2b7f7b9d72928f36d798dbb35ed32e7bb14c42b4301ad0344b46f29\", " +
-                                                              "\"a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87\")" +
-                "}"
+            buildConfigField "org.thoughtcrime.securesms.KbsEnclave[]", "KBS_FALLBACKS", "new org.thoughtcrime.securesms.KbsEnclave[0]"
             buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx\""
-            buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXQ==\""
+            buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXZSSsOZ6s7M1+rTJN0bI5CKY2PX29y5Ok3jSWufIKcgKOnWoP67d5b2du2ZVJjpjfibNIHbT/cegy/sBLoFwtHogVYUewANUAXIaMPyCLRArsKhfJ5wBtTminG/PAvuBdJ70Z/bXVPf8TVsR292zQ65xwvWTejROW6AZX6aqucUj\""
             buildConfigField "String", "MOBILE_COIN_ENVIRONMENT", "\"testnet\""
             buildConfigField "String", "SIGNAL_CAPTCHA_URL", "\"https://signalcaptchas.org/staging/registration/generate.html\""
             buildConfigField "String", "RECAPTCHA_PROOF_URL", "\"https://signalcaptchas.org/staging/challenge/generate.html\""

app/lint.xml

@@ -41,4 +41,5 @@
         <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

@@ -5,11 +5,15 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.thoughtcrime.securesms.conversation.ui.error.SafetyNumberChangeDialog
+import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey
 import org.thoughtcrime.securesms.database.IdentityDatabase
 import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.DistributionListId
+import org.thoughtcrime.securesms.database.model.DistributionListPrivacyMode
+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
 
 /**
@@ -18,7 +22,7 @@ import org.thoughtcrime.securesms.testing.SignalActivityRule
 @RunWith(AndroidJUnit4::class)
 class SafetyNumberChangeDialogPreviewer {
 
-  @get:Rule val harness = SignalActivityRule()
+  @get:Rule val harness = SignalActivityRule(othersCount = 10)
 
   @Test
   fun testShowLongName() {
@@ -31,10 +35,39 @@ class SafetyNumberChangeDialogPreviewer {
 
     val scenario: ActivityScenario<ConversationActivity> = harness.launchActivity { putExtra("recipient_id", other.id.serialize()) }
     scenario.onActivity {
-      SafetyNumberChangeDialog.show(it.supportFragmentManager, other.id)
+      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() {
+    SignalDatabase.distributionLists.setPrivacyMode(DistributionListId.MY_STORY, DistributionListPrivacyMode.ONLY_WITH)
+
+    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.DEFAULT)
+      harness.changeIdentityKey(other)
+
+      SignalDatabase.distributionLists.addMemberToList(DistributionListId.MY_STORY, DistributionListPrivacyMode.ONLY_WITH, other.id)
+    }
+
+    val myStoryRecipientId = SignalDatabase.distributionLists.getRecipientId(DistributionListId.MY_STORY)!!
+    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 = listOf(ContactSearchKey.RecipientSearchKey.Story(myStoryRecipientId))
+        )
+        .show(conversationActivity.supportFragmentManager)
+    }
+
+    // Uncomment to make dialog stay on screen, otherwise will show/dismiss immediately
+    // ThreadUtil.sleep( 30000)
+  }
 }

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

@@ -0,0 +1,106 @@
+package org.thoughtcrime.securesms.database
+
+import android.net.Uri
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotEquals
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.thoughtcrime.securesms.attachments.UriAttachment
+import org.thoughtcrime.securesms.mms.MediaStream
+import org.thoughtcrime.securesms.mms.SentMediaQuality
+import org.thoughtcrime.securesms.providers.BlobProvider
+import org.thoughtcrime.securesms.util.MediaUtil
+import java.util.Optional
+
+@RunWith(AndroidJUnit4::class)
+class AttachmentDatabaseTest {
+
+  @Before
+  fun setUp() {
+    SignalDatabase.attachments.deleteAllAttachments()
+  }
+
+  @Test
+  fun givenABlob_whenIInsert2AttachmentsForPreUpload_thenIExpectDistinctIdsButSameFileName() {
+    val blob = BlobProvider.getInstance().forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory()
+    val highQualityProperties = createHighQualityTransformProperties()
+    val highQualityImage = createAttachment(1, blob, highQualityProperties)
+    val attachment = SignalDatabase.attachments.insertAttachmentForPreUpload(highQualityImage)
+    val attachment2 = SignalDatabase.attachments.insertAttachmentForPreUpload(highQualityImage)
+
+    assertNotEquals(attachment2.attachmentId, attachment.attachmentId)
+    assertEquals(attachment2.fileName, attachment.fileName)
+  }
+
+  @Test
+  fun givenABlobAndDifferentTransformQuality_whenIInsert2AttachmentsForPreUpload_thenIExpectDifferentFileInfos() {
+    val blob = BlobProvider.getInstance().forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory()
+    val highQualityProperties = createHighQualityTransformProperties()
+    val highQualityImage = createAttachment(1, blob, highQualityProperties)
+    val lowQualityImage = createAttachment(1, blob, AttachmentDatabase.TransformProperties.empty())
+    val attachment = SignalDatabase.attachments.insertAttachmentForPreUpload(highQualityImage)
+    val attachment2 = SignalDatabase.attachments.insertAttachmentForPreUpload(lowQualityImage)
+
+    SignalDatabase.attachments.updateAttachmentData(
+      attachment,
+      createMediaStream(byteArrayOf(1, 2, 3, 4, 5)),
+      false
+    )
+
+    SignalDatabase.attachments.updateAttachmentData(
+      attachment2,
+      createMediaStream(byteArrayOf(1, 2, 3)),
+      false
+    )
+
+    val attachment1Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment.attachmentId, AttachmentDatabase.DATA)
+    val attachment2Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment2.attachmentId, AttachmentDatabase.DATA)
+
+    assertNotEquals(attachment1Info, attachment2Info)
+  }
+
+  @Test
+  fun givenIdenticalAttachmentsInsertedForPreUpload_whenIUpdateAttachmentDataAndSpecifyOnlyModifyThisAttachment_thenIExpectDifferentFileInfos() {
+    val blob = BlobProvider.getInstance().forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory()
+    val highQualityProperties = createHighQualityTransformProperties()
+    val highQualityImage = createAttachment(1, blob, highQualityProperties)
+    val attachment = SignalDatabase.attachments.insertAttachmentForPreUpload(highQualityImage)
+    val attachment2 = SignalDatabase.attachments.insertAttachmentForPreUpload(highQualityImage)
+
+    SignalDatabase.attachments.updateAttachmentData(
+      attachment,
+      createMediaStream(byteArrayOf(1, 2, 3, 4, 5)),
+      true
+    )
+
+    SignalDatabase.attachments.updateAttachmentData(
+      attachment2,
+      createMediaStream(byteArrayOf(1, 2, 3, 4)),
+      true
+    )
+
+    val attachment1Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment.attachmentId, AttachmentDatabase.DATA)
+    val attachment2Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment2.attachmentId, AttachmentDatabase.DATA)
+
+    assertNotEquals(attachment1Info, attachment2Info)
+  }
+
+  private fun createAttachment(id: Long, uri: Uri, transformProperties: AttachmentDatabase.TransformProperties): UriAttachment {
+    return UriAttachmentBuilder.build(
+      id,
+      uri = uri,
+      contentType = MediaUtil.IMAGE_JPEG,
+      transformProperties = transformProperties
+    )
+  }
+
+  private fun createHighQualityTransformProperties(): AttachmentDatabase.TransformProperties {
+    return AttachmentDatabase.TransformProperties.forSentMediaQuality(Optional.empty(), SentMediaQuality.HIGH)
+  }
+
+  private fun createMediaStream(byteArray: ByteArray): MediaStream {
+    return MediaStream(byteArray.inputStream(), MediaUtil.IMAGE_JPEG, 2, 2)
+  }
+}

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

@@ -80,25 +80,6 @@ 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/MmsDatabaseTest_stories.kt

@@ -3,11 +3,13 @@ package org.thoughtcrime.securesms.database
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
+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.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
@@ -17,6 +19,7 @@ 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
+import java.util.concurrent.TimeUnit
 
 @Suppress("ClassName")
 @RunWith(AndroidJUnit4::class)
@@ -29,6 +32,7 @@ class MmsDatabaseTest_stories {
 
   private lateinit var myStory: Recipient
   private lateinit var recipients: List<RecipientId>
+  private lateinit var releaseChannelRecipient: Recipient
 
   @Before
   fun setUp() {
@@ -41,12 +45,15 @@ class MmsDatabaseTest_stories {
 
     myStory = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromDistributionListId(DistributionListId.MY_STORY))
     recipients = (0 until 5).map { SignalDatabase.recipients.getOrInsertFromServiceId(ServiceId.from(UUID.randomUUID())) }
+    releaseChannelRecipient = Recipient.resolved(SignalDatabase.recipients.insertReleaseChannelRecipient())
+
+    SignalStore.releaseChannelValues().setReleaseChannelRecipientId(releaseChannelRecipient.id)
   }
 
   @Test
   fun givenNoStories_whenIGetOrderedStoryRecipientsAndIds_thenIExpectAnEmptyList() {
     // WHEN
-    val result = mms.orderedStoryRecipientsAndIds
+    val result = mms.getOrderedStoryRecipientsAndIds(false)
 
     // THEN
     assertEquals(0, result.size)
@@ -77,7 +84,7 @@ class MmsDatabaseTest_stories {
     )
 
     // WHEN
-    val result = mms.orderedStoryRecipientsAndIds
+    val result = mms.getOrderedStoryRecipientsAndIds(false)
 
     // THEN
     assertEquals(listOf(sender.toLong(), myStory.id.toLong()), result.map { it.recipientId.toLong() })
@@ -132,7 +139,7 @@ class MmsDatabaseTest_stories {
     }
 
     // WHEN
-    val result = SignalDatabase.mms.orderedStoryRecipientsAndIds
+    val result = SignalDatabase.mms.getOrderedStoryRecipientsAndIds(false)
     val resultOrderedIds = result.map { it.messageId }
 
     // THEN
@@ -186,7 +193,7 @@ class MmsDatabaseTest_stories {
       }
     }
 
-    val result = SignalDatabase.mms.orderedStoryRecipientsAndIds
+    val result = SignalDatabase.mms.getOrderedStoryRecipientsAndIds(false)
     val resultOrderedIds = result.map { it.messageId }
 
     assertEquals(unviewedIds.reversed() + interspersedIds.reversed(), resultOrderedIds)
@@ -238,4 +245,135 @@ class MmsDatabaseTest_stories {
     // 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)
+  }
+
+  @Test
+  fun givenNotViewedOnboardingAndOnlyStoryIsOnboardingAndAdded2DaysAgo_whenIGetOldestStoryTimestamp_thenIExpectNull() {
+    // GIVEN
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(releaseChannelRecipient)
+    MmsHelper.insert(
+      recipient = releaseChannelRecipient,
+      sentTimeMillis = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(2),
+      storyType = StoryType.STORY_WITH_REPLIES,
+      threadId = threadId
+    )
+
+    // WHEN
+    val oldestTimestamp = SignalDatabase.mms.getOldestStorySendTimestamp(false)
+
+    // THEN
+    assertNull(oldestTimestamp)
+  }
+
+  @Test
+  fun givenViewedOnboardingAndOnlyStoryIsOnboardingAndAdded2DaysAgo_whenIGetOldestStoryTimestamp_thenIExpectNotNull() {
+    // GIVEN
+    val expected = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(2)
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(releaseChannelRecipient)
+    MmsHelper.insert(
+      recipient = releaseChannelRecipient,
+      sentTimeMillis = expected,
+      storyType = StoryType.STORY_WITH_REPLIES,
+      threadId = threadId
+    )
+
+    // WHEN
+    val oldestTimestamp = SignalDatabase.mms.getOldestStorySendTimestamp(true)
+
+    // THEN
+    assertEquals(expected, oldestTimestamp)
+  }
 }

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

@@ -1,9 +1,11 @@
 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.mms.OutgoingSecureMediaMessage
 import org.thoughtcrime.securesms.recipients.Recipient
 import java.util.Optional
 
@@ -22,7 +24,10 @@ object MmsHelper {
     distributionType: Int = ThreadDatabase.DistributionTypes.DEFAULT,
     threadId: Long = 1,
     storyType: StoryType = StoryType.NONE,
-    giftBadge: GiftBadge? = null
+    parentStoryId: ParentStoryId? = null,
+    isStoryReaction: Boolean = false,
+    giftBadge: GiftBadge? = null,
+    secure: Boolean = true
   ): Long {
     val message = OutgoingMediaMessage(
       recipient,
@@ -34,8 +39,8 @@ object MmsHelper {
       viewOnce,
       distributionType,
       storyType,
-      null,
-      false,
+      parentStoryId,
+      isStoryReaction,
       null,
       emptyList(),
       emptyList(),
@@ -43,7 +48,9 @@ object MmsHelper {
       emptySet(),
       emptySet(),
       giftBadge
-    )
+    ).let {
+      if (secure) OutgoingSecureMediaMessage(it) else it
+    }
 
     return insert(
       message = message,

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

@@ -0,0 +1,91 @@
+package org.thoughtcrime.securesms.database
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotEquals
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.signal.core.util.CursorUtil
+import org.thoughtcrime.securesms.profiles.ProfileName
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+
+@RunWith(AndroidJUnit4::class)
+class RecipientDatabaseTest {
+
+  @get:Rule
+  val harness = SignalActivityRule()
+
+  @Test
+  fun givenABlockedRecipient_whenIQueryAllContacts_thenIDoNotExpectBlockedToBeReturned() {
+    val blockedRecipient = harness.others[0]
+    SignalDatabase.recipients.setProfileName(blockedRecipient, ProfileName.fromParts("Blocked", "Person"))
+    SignalDatabase.recipients.setBlocked(blockedRecipient, true)
+
+    val results = SignalDatabase.recipients.queryAllContacts("Blocked")!!
+
+    assertEquals(0, results.count)
+  }
+
+  @Test
+  fun givenABlockedRecipient_whenIGetSignalContacts_thenIDoNotExpectBlockedToBeReturned() {
+    val blockedRecipient = harness.others[0]
+    SignalDatabase.recipients.setProfileName(blockedRecipient, ProfileName.fromParts("Blocked", "Person"))
+    SignalDatabase.recipients.setBlocked(blockedRecipient, true)
+
+    val results: MutableList<RecipientId> = SignalDatabase.recipients.getSignalContacts(false)?.use {
+      val ids = mutableListOf<RecipientId>()
+      while (it.moveToNext()) {
+        ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientDatabase.ID)))
+      }
+
+      ids
+    }!!
+
+    assertNotEquals(0, results.size)
+    assertFalse(blockedRecipient in results)
+  }
+
+  @Test
+  fun givenABlockedRecipient_whenIQuerySignalContacts_thenIDoNotExpectBlockedToBeReturned() {
+    val blockedRecipient = harness.others[0]
+    SignalDatabase.recipients.setProfileName(blockedRecipient, ProfileName.fromParts("Blocked", "Person"))
+    SignalDatabase.recipients.setBlocked(blockedRecipient, true)
+
+    val results = SignalDatabase.recipients.querySignalContacts("Blocked", false)!!
+
+    assertEquals(0, results.count)
+  }
+
+  @Test
+  fun givenABlockedRecipient_whenIQueryNonGroupContacts_thenIDoNotExpectBlockedToBeReturned() {
+    val blockedRecipient = harness.others[0]
+    SignalDatabase.recipients.setProfileName(blockedRecipient, ProfileName.fromParts("Blocked", "Person"))
+    SignalDatabase.recipients.setBlocked(blockedRecipient, true)
+
+    val results = SignalDatabase.recipients.queryNonGroupContacts("Blocked", false)!!
+
+    assertEquals(0, results.count)
+  }
+
+  @Test
+  fun givenABlockedRecipient_whenIGetNonGroupContacts_thenIDoNotExpectBlockedToBeReturned() {
+    val blockedRecipient = harness.others[0]
+    SignalDatabase.recipients.setProfileName(blockedRecipient, ProfileName.fromParts("Blocked", "Person"))
+    SignalDatabase.recipients.setBlocked(blockedRecipient, true)
+
+    val results: MutableList<RecipientId> = SignalDatabase.recipients.getNonGroupContacts(false)?.use {
+      val ids = mutableListOf<RecipientId>()
+      while (it.moveToNext()) {
+        ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientDatabase.ID)))
+      }
+
+      ids
+    }!!
+
+    assertNotEquals(0, results.size)
+    assertFalse(blockedRecipient in results)
+  }
+}

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

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

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

@@ -0,0 +1,670 @@
+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. */
+  @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_processCdsV2Result.kt

@@ -1,206 +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.assertTrue
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.core.util.requireLong
-import org.signal.core.util.requireString
-import org.signal.core.util.select
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.PNI
-import org.whispersystems.signalservice.api.push.ServiceId
-import java.util.UUID
-
-@RunWith(AndroidJUnit4::class)
-class RecipientDatabaseTest_processCdsV2Result {
-
-  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 processCdsV2Result_noMatch() {
-    // Note that we haven't inserted any test data
-
-    val resultId: RecipientId = recipientDatabase.processCdsV2Result(E164_A, PNI_A, ACI_A)
-
-    val record: IdRecord = require(resultId)
-
-    assertEquals(resultId, record.id)
-    assertEquals(E164_A, record.e164)
-    assertEquals(ACI_A, record.sid)
-    assertEquals(PNI_A, record.pni)
-  }
-
-  @Test
-  fun processCdsV2Result_fullMatch() {
-    val inputId: RecipientId = insert(E164_A, PNI_A, ACI_A)
-    val resultId: RecipientId = recipientDatabase.processCdsV2Result(E164_A, PNI_A, ACI_A)
-
-    val record: IdRecord = require(resultId)
-
-    assertEquals(inputId, record.id)
-    assertEquals(E164_A, record.e164)
-    assertEquals(ACI_A, record.sid)
-    assertEquals(PNI_A, record.pni)
-  }
-
-  @Test
-  fun processCdsV2Result_onlyE164Matches() {
-    val inputId: RecipientId = insert(E164_A, null, null)
-    val resultId: RecipientId = recipientDatabase.processCdsV2Result(E164_A, PNI_A, ACI_A)
-
-    val record: IdRecord = require(resultId)
-
-    assertEquals(inputId, record.id)
-    assertEquals(E164_A, record.e164)
-    assertEquals(ACI_A, record.sid)
-    assertEquals(PNI_A, record.pni)
-  }
-
-  @Test
-  fun processCdsV2Result_e164AndPniMatches() {
-    val inputId: RecipientId = insert(E164_A, PNI_A, null)
-    val resultId: RecipientId = recipientDatabase.processCdsV2Result(E164_A, PNI_A, ACI_A)
-
-    val record: IdRecord = require(resultId)
-
-    assertEquals(inputId, record.id)
-    assertEquals(E164_A, record.e164)
-    assertEquals(ACI_A, record.sid)
-    assertEquals(PNI_A, record.pni)
-  }
-
-  @Test
-  fun processCdsV2Result_e164AndAciMatches() {
-    val inputId: RecipientId = insert(E164_A, null, ACI_A)
-    val resultId: RecipientId = recipientDatabase.processCdsV2Result(E164_A, PNI_A, ACI_A)
-
-    val record: IdRecord = require(resultId)
-
-    assertEquals(inputId, record.id)
-    assertEquals(E164_A, record.e164)
-    assertEquals(ACI_A, record.sid)
-    assertEquals(PNI_A, record.pni)
-  }
-
-  @Test
-  fun processCdsV2Result_onlyPniMatches() {
-    val inputId: RecipientId = insert(null, PNI_A, null)
-    val resultId: RecipientId = recipientDatabase.processCdsV2Result(E164_A, PNI_A, ACI_A)
-
-    val record: IdRecord = require(resultId)
-
-    assertEquals(inputId, record.id)
-    assertEquals(E164_A, record.e164)
-    assertEquals(ACI_A, record.sid)
-    assertEquals(PNI_A, record.pni)
-  }
-
-  @Test
-  fun processCdsV2Result_pniAndAciMatches() {
-    val inputId: RecipientId = insert(null, PNI_A, ACI_A)
-    val resultId: RecipientId = recipientDatabase.processCdsV2Result(E164_A, PNI_A, ACI_A)
-
-    val record: IdRecord = require(resultId)
-
-    assertEquals(inputId, record.id)
-    assertEquals(E164_A, record.e164)
-    assertEquals(ACI_A, record.sid)
-    assertEquals(PNI_A, record.pni)
-  }
-
-  @Test
-  fun processCdsV2Result_onlyAciMatches() {
-    val inputId: RecipientId = insert(null, null, ACI_A)
-    val resultId: RecipientId = recipientDatabase.processCdsV2Result(E164_A, PNI_A, ACI_A)
-
-    val record: IdRecord = require(resultId)
-
-    assertEquals(inputId, record.id)
-    assertEquals(E164_A, record.e164)
-    assertEquals(ACI_A, record.sid)
-    assertEquals(PNI_A, record.pni)
-  }
-
-  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))
-    }
-  }
-
-  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_processPnpTuple.kt

@@ -0,0 +1,459 @@
+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

@@ -0,0 +1,810 @@
+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,4 +122,62 @@ 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

@@ -0,0 +1,74 @@
+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/database/ThreadDatabaseTest_recents.kt

@@ -0,0 +1,52 @@
+package org.thoughtcrime.securesms.database
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Assert.assertFalse
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.signal.core.util.CursorUtil
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.testing.SignalDatabaseRule
+import org.whispersystems.signalservice.api.push.ServiceId
+import java.util.UUID
+
+@Suppress("ClassName")
+@RunWith(AndroidJUnit4::class)
+class ThreadDatabaseTest_recents {
+
+  @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 givenARecentRecipient_whenIBlockAndGetRecents_thenIDoNotExpectToSeeThatRecipient() {
+    // GIVEN
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
+    MmsHelper.insert(recipient = recipient, threadId = threadId)
+    SignalDatabase.threads.update(threadId, true)
+
+    // WHEN
+    SignalDatabase.recipients.setBlocked(recipient.id, true)
+    val results: MutableList<RecipientId> = SignalDatabase.threads.getRecentConversationList(10, false, false, false, false, false, false).use { cursor ->
+      val ids = mutableListOf<RecipientId>()
+      while (cursor.moveToNext()) {
+        ids.add(RecipientId.from(CursorUtil.requireLong(cursor, ThreadDatabase.RECIPIENT_ID)))
+      }
+
+      ids
+    }
+
+    // THEN
+    assertFalse(recipient.id in results)
+  }
+}

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

@@ -0,0 +1,44 @@
+package org.thoughtcrime.securesms.database
+
+import android.net.Uri
+import org.thoughtcrime.securesms.attachments.UriAttachment
+import org.thoughtcrime.securesms.audio.AudioHash
+import org.thoughtcrime.securesms.blurhash.BlurHash
+import org.thoughtcrime.securesms.stickers.StickerLocator
+
+object UriAttachmentBuilder {
+  fun build(
+    id: Long,
+    uri: Uri = Uri.parse("content://$id"),
+    contentType: String,
+    transferState: Int = AttachmentDatabase.TRANSFER_PROGRESS_PENDING,
+    size: Long = 0L,
+    fileName: String = "file$id",
+    voiceNote: Boolean = false,
+    borderless: Boolean = false,
+    videoGif: Boolean = false,
+    quote: Boolean = false,
+    caption: String? = null,
+    stickerLocator: StickerLocator? = null,
+    blurHash: BlurHash? = null,
+    audioHash: AudioHash? = null,
+    transformProperties: AttachmentDatabase.TransformProperties? = null
+  ): UriAttachment {
+    return UriAttachment(
+      uri,
+      contentType,
+      transferState,
+      size,
+      fileName,
+      voiceNote,
+      borderless,
+      videoGif,
+      quote,
+      caption,
+      stickerLocator,
+      blurHash,
+      audioHash,
+      transformProperties
+    )
+  }
+}

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

@@ -0,0 +1,119 @@
+package org.thoughtcrime.securesms.database.helpers.migration
+
+import android.app.Application
+import androidx.core.content.contentValuesOf
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
+import org.junit.Assert.fail
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.signal.core.util.SqlUtil
+import org.thoughtcrime.securesms.database.DistributionListDatabase
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.DistributionListId
+import org.thoughtcrime.securesms.testing.SignalDatabaseRule
+import org.whispersystems.signalservice.api.push.DistributionId
+import java.util.UUID
+
+@RunWith(AndroidJUnit4::class)
+class MyStoryMigrationTest {
+
+  @get:Rule val harness = SignalDatabaseRule(deleteAllThreadsOnEachRun = false)
+
+  @Test
+  fun givenAValidMyStory_whenIMigrate_thenIExpectMyStoryToBeValid() {
+    // GIVEN
+    assertValidMyStoryExists()
+
+    // WHEN
+    runMigration()
+
+    // THEN
+    assertValidMyStoryExists()
+  }
+
+  @Test
+  fun givenNoMyStory_whenIMigrate_thenIExpectMyStoryToBeCreated() {
+    // GIVEN
+    deleteMyStory()
+
+    // WHEN
+    runMigration()
+
+    // THEN
+    assertValidMyStoryExists()
+  }
+
+  @Test
+  fun givenA00000000DistributionIdForMyStory_whenIMigrate_thenIExpectMyStoryToBeCreated() {
+    // GIVEN
+    setMyStoryDistributionId("0000-0000")
+
+    // WHEN
+    runMigration()
+
+    // THEN
+    assertValidMyStoryExists()
+  }
+
+  @Test
+  fun givenARandomDistributionIdForMyStory_whenIMigrate_thenIExpectMyStoryToBeCreated() {
+    // GIVEN
+    setMyStoryDistributionId(UUID.randomUUID().toString())
+
+    // WHEN
+    runMigration()
+
+    // THEN
+    assertValidMyStoryExists()
+  }
+
+  private fun setMyStoryDistributionId(serializedId: String) {
+    SignalDatabase.rawDatabase.update(
+      DistributionListDatabase.LIST_TABLE_NAME,
+      contentValuesOf(
+        DistributionListDatabase.DISTRIBUTION_ID to serializedId
+      ),
+      "_id = ?",
+      SqlUtil.buildArgs(DistributionListId.MY_STORY)
+    )
+  }
+
+  private fun deleteMyStory() {
+    SignalDatabase.rawDatabase.delete(
+      DistributionListDatabase.LIST_TABLE_NAME,
+      "_id = ?",
+      SqlUtil.buildArgs(DistributionListId.MY_STORY)
+    )
+  }
+
+  private fun assertValidMyStoryExists() {
+    SignalDatabase.rawDatabase.query(
+      DistributionListDatabase.LIST_TABLE_NAME,
+      SqlUtil.COUNT,
+      "_id = ? AND ${DistributionListDatabase.DISTRIBUTION_ID} = ?",
+      SqlUtil.buildArgs(DistributionListId.MY_STORY, DistributionId.MY_STORY.toString()),
+      null,
+      null,
+      null
+    ).use {
+      if (it.moveToNext()) {
+        val count = it.getInt(0)
+        assertEquals("assertValidMyStoryExists: Query produced an unexpected count.", 1, count)
+      } else {
+        fail("assertValidMyStoryExists: Query did not produce a count.")
+      }
+    }
+  }
+
+  private fun runMigration() {
+    MyStoryMigration.migrate(
+      InstrumentationRegistry.getInstrumentation().targetContext.applicationContext as Application,
+      SignalDatabase.rawDatabase,
+      0,
+      1
+    )
+  }
+}

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

@@ -0,0 +1,139 @@
+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

@@ -28,7 +28,9 @@ 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
 
 /**
@@ -37,7 +39,7 @@ import java.util.UUID
  *
  * To use: `@get:Rule val harness = SignalActivityRule()`
  */
-class SignalActivityRule : ExternalResource() {
+class SignalActivityRule(private val othersCount: Int = 4) : ExternalResource() {
 
   val application: Application = ApplicationDependencies.getApplication()
 
@@ -87,9 +89,13 @@ class SignalActivityRule : ExternalResource() {
   private fun setupOthers(): List<RecipientId> {
     val others = mutableListOf<RecipientId>()
 
-    for (i in 0..4) {
+    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(aci, "+1555555101$i")
+      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))

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

@@ -0,0 +1,40 @@
+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/instrumentation/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/signal_accent_green"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/instrumentation/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Signal (Instrumentation)</string>
+</resources>

app/src/main/AndroidManifest.xml

@@ -366,11 +366,21 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
         <activity android:name=".mediasend.v2.MediaSelectionActivity"
-            android:theme="@style/TextSecure.FullScreenMedia"
+            android:theme="@style/TextSecure.DarkNoActionBar"
             android:windowSoftInputMode="stateAlwaysHidden|adjustNothing"
             android:launchMode="singleTop"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
+        <activity android:name=".conversation.mutiselect.forward.MultiselectForwardActivity"
+            android:theme="@style/Signal.DayNight.NoActionBar"
+            android:windowSoftInputMode="stateAlwaysHidden|adjustNothing"
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
+
+        <activity android:name=".mediasend.v2.stories.StoriesMultiselectForwardActivity"
+            android:theme="@style/Signal.DayNight.NoActionBar"
+            android:windowSoftInputMode="stateAlwaysHidden|adjustNothing"
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
+
     <activity android:name=".PassphraseChangeActivity"
               android:label="@string/AndroidManifest__change_passphrase"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

app/src/main/java/androidx/camera/view/SignalCameraView.java

@@ -1,848 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.camera.view;
-
-import android.Manifest.permission;
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.hardware.display.DisplayManager;
-import android.hardware.display.DisplayManager.DisplayListener;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.Parcelable;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.view.Display;
-import android.view.MotionEvent;
-import android.view.ScaleGestureDetector;
-import android.view.Surface;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
-import androidx.annotation.RequiresPermission;
-import androidx.annotation.RestrictTo;
-import androidx.annotation.RestrictTo.Scope;
-import androidx.camera.core.Camera;
-import androidx.camera.core.CameraSelector;
-import androidx.camera.core.FocusMeteringAction;
-import androidx.camera.core.FocusMeteringResult;
-import androidx.camera.core.ImageCapture;
-import androidx.camera.core.ImageCapture.OnImageCapturedCallback;
-import androidx.camera.core.ImageCapture.OnImageSavedCallback;
-import androidx.camera.core.ImageProxy;
-import androidx.camera.core.Logger;
-import androidx.camera.core.MeteringPoint;
-import androidx.camera.core.MeteringPointFactory;
-import androidx.camera.core.VideoCapture;
-import androidx.camera.core.VideoCapture.OnVideoSavedCallback;
-import androidx.camera.core.impl.LensFacingConverter;
-import androidx.camera.core.impl.utils.executor.CameraXExecutors;
-import androidx.camera.core.impl.utils.futures.FutureCallback;
-import androidx.camera.core.impl.utils.futures.Futures;
-import androidx.core.util.Consumer;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.lifecycle.LiveData;
-
-import com.google.common.util.concurrent.ListenableFuture;
-
-import org.signal.core.util.logging.Log;
-
-import java.io.File;
-import java.util.concurrent.Executor;
-
-/**
- * A {@link View} that displays a preview of the camera with methods {@link
- * #takePicture(Executor, OnImageCapturedCallback)},
- * {@link #takePicture(ImageCapture.OutputFileOptions, Executor, OnImageSavedCallback)},
- * {@link #startRecording(File , Executor , OnVideoSavedCallback callback)}
- * and {@link #stopRecording()}.
- *
- * <p>Because the Camera is a limited resource and consumes a high amount of power, CameraView must
- * be opened/closed. CameraView will handle opening/closing automatically through use of a {@link
- * LifecycleOwner}. Use {@link #bindToLifecycle(LifecycleOwner)} to start the camera.
- */
-@RequiresApi(21)
-@SuppressLint("RestrictedApi")
-public final class SignalCameraView extends FrameLayout {
-  static final String TAG = Log.tag(SignalCameraView.class);
-
-  static final int INDEFINITE_VIDEO_DURATION = -1;
-  static final int INDEFINITE_VIDEO_SIZE = -1;
-
-  private static final String EXTRA_SUPER = "super";
-  private static final String EXTRA_ZOOM_RATIO = "zoom_ratio";
-  private static final String EXTRA_PINCH_TO_ZOOM_ENABLED = "pinch_to_zoom_enabled";
-  private static final String EXTRA_FLASH = "flash";
-  private static final String EXTRA_MAX_VIDEO_DURATION = "max_video_duration";
-  private static final String EXTRA_MAX_VIDEO_SIZE = "max_video_size";
-  private static final String EXTRA_SCALE_TYPE = "scale_type";
-  private static final String EXTRA_CAMERA_DIRECTION = "camera_direction";
-  private static final String EXTRA_CAPTURE_MODE = "captureMode";
-
-  private static final int LENS_FACING_NONE = 0;
-  private static final int LENS_FACING_FRONT = 1;
-  private static final int LENS_FACING_BACK = 2;
-  private static final int FLASH_MODE_AUTO = 1;
-  private static final int FLASH_MODE_ON = 2;
-  private static final int FLASH_MODE_OFF = 4;
-  // For tap-to-focus
-  private long mDownEventTimestamp;
-  // For pinch-to-zoom
-  private PinchToZoomGestureDetector mPinchToZoomGestureDetector;
-  private boolean mIsPinchToZoomEnabled = true;
-  SignalCameraXModule mCameraModule;
-  private final DisplayManager.DisplayListener mDisplayListener =
-      new DisplayListener() {
-        @Override
-        public void onDisplayAdded(int displayId) {
-        }
-
-        @Override
-        public void onDisplayRemoved(int displayId) {
-        }
-
-        @Override
-        public void onDisplayChanged(int displayId) {
-          mCameraModule.invalidateView();
-        }
-      };
-  private PreviewView mPreviewView;
-  // For accessibility event
-  private MotionEvent mUpEvent;
-
-  // BEGIN Custom Signal Code Block
-  private Consumer<Throwable> errorConsumer;
-  private Throwable           pendingError;
-  // END Custom Signal Code Block
-
-  public SignalCameraView(@NonNull Context context) {
-    this(context, null);
-  }
-
-  public SignalCameraView(@NonNull Context context, @Nullable AttributeSet attrs) {
-    this(context, attrs, 0);
-  }
-
-  public SignalCameraView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyle) {
-    super(context, attrs, defStyle);
-    init(context, attrs);
-  }
-
-  @RequiresApi(21)
-  public SignalCameraView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr,
-                          int defStyleRes) {
-    super(context, attrs, defStyleAttr, defStyleRes);
-    init(context, attrs);
-  }
-
-  /**
-   * Binds control of the camera used by this view to the given lifecycle.
-   *
-   * <p>This links opening/closing the camera to the given lifecycle. The camera will not operate
-   * unless this method is called with a valid {@link LifecycleOwner} that is not in the {@link
-   * androidx.lifecycle.Lifecycle.State#DESTROYED} state. Call this method only once camera
-   * permissions have been obtained.
-   *
-   * <p>Once the provided lifecycle has transitioned to a {@link
-   * androidx.lifecycle.Lifecycle.State#DESTROYED} state, CameraView must be bound to a new
-   * lifecycle through this method in order to operate the camera.
-   *
-   * @param lifecycleOwner The lifecycle that will control this view's camera
-   * @throws IllegalArgumentException if provided lifecycle is in a {@link
-   *                                  androidx.lifecycle.Lifecycle.State#DESTROYED} state.
-   * @throws IllegalStateException    if camera permissions are not granted.
-   */
-  // BEGIN Custom Signal Code Block
-
-  @RequiresPermission(permission.CAMERA)
-  public void bindToLifecycle(@NonNull LifecycleOwner lifecycleOwner, Consumer<Throwable> errorConsumer) {
-    mCameraModule.bindToLifecycle(lifecycleOwner);
-    this.errorConsumer = errorConsumer;
-    if (pendingError != null) {
-      errorConsumer.accept(pendingError);
-    }
-  }
-  // END Custom Signal Code Block
-
-
-  private void init(Context context, @Nullable AttributeSet attrs) {
-    addView(mPreviewView = new PreviewView(getContext()), 0 /* view position */);
-
-    // Begin custom signal code block
-    mPreviewView.setImplementationMode(PreviewView.ImplementationMode.COMPATIBLE);
-    mCameraModule = new SignalCameraXModule(this, error -> {
-      if (errorConsumer != null) {
-        errorConsumer.accept(error);
-      } else {
-        pendingError = error;
-      }
-    });
-    // End custom signal code block
-
-    if (attrs != null) {
-      TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.CameraView);
-      setScaleType(
-          PreviewView.ScaleType.fromId(
-              a.getInteger(R.styleable.CameraView_scaleType,
-                  getScaleType().getId())));
-      setPinchToZoomEnabled(
-          a.getBoolean(
-              R.styleable.CameraView_pinchToZoomEnabled, isPinchToZoomEnabled()));
-      setCaptureMode(
-          CaptureMode.fromId(
-              a.getInteger(R.styleable.CameraView_captureMode,
-                  getCaptureMode().getId())));
-
-      int lensFacing = a.getInt(R.styleable.CameraView_lensFacing, LENS_FACING_BACK);
-      switch (lensFacing) {
-        case LENS_FACING_NONE:
-          setCameraLensFacing(null);
-          break;
-        case LENS_FACING_FRONT:
-          setCameraLensFacing(CameraSelector.LENS_FACING_FRONT);
-          break;
-        case LENS_FACING_BACK:
-          setCameraLensFacing(CameraSelector.LENS_FACING_BACK);
-          break;
-        default:
-          // Unhandled event.
-      }
-
-      int flashMode = a.getInt(R.styleable.CameraView_flash, 0);
-      switch (flashMode) {
-        case FLASH_MODE_AUTO:
-          setFlash(ImageCapture.FLASH_MODE_AUTO);
-          break;
-        case FLASH_MODE_ON:
-          setFlash(ImageCapture.FLASH_MODE_ON);
-          break;
-        case FLASH_MODE_OFF:
-          setFlash(ImageCapture.FLASH_MODE_OFF);
-          break;
-        default:
-          // Unhandled event.
-      }
-
-      a.recycle();
-    }
-
-    if (getBackground() == null) {
-      setBackgroundColor(0xFF111111);
-    }
-
-    mPinchToZoomGestureDetector = new PinchToZoomGestureDetector(context);
-  }
-
-  @Override
-  @NonNull
-  protected LayoutParams generateDefaultLayoutParams() {
-    return new LayoutParams(
-        ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
-  }
-
-  @Override
-  @NonNull
-  protected Parcelable onSaveInstanceState() {
-    // TODO(b/113884082): Decide what belongs here or what should be invalidated on
-    // configuration
-    // change
-    Bundle state = new Bundle();
-    state.putParcelable(EXTRA_SUPER, super.onSaveInstanceState());
-    state.putInt(EXTRA_SCALE_TYPE, getScaleType().getId());
-    state.putFloat(EXTRA_ZOOM_RATIO, getZoomRatio());
-    state.putBoolean(EXTRA_PINCH_TO_ZOOM_ENABLED, isPinchToZoomEnabled());
-    state.putString(EXTRA_FLASH, FlashModeConverter.nameOf(getFlash()));
-    state.putLong(EXTRA_MAX_VIDEO_DURATION, getMaxVideoDuration());
-    state.putLong(EXTRA_MAX_VIDEO_SIZE, getMaxVideoSize());
-    if (getCameraLensFacing() != null) {
-      state.putString(EXTRA_CAMERA_DIRECTION,
-          LensFacingConverter.nameOf(getCameraLensFacing()));
-    }
-    state.putInt(EXTRA_CAPTURE_MODE, getCaptureMode().getId());
-    return state;
-  }
-
-  @Override
-  protected void onRestoreInstanceState(@Nullable Parcelable savedState) {
-    // TODO(b/113884082): Decide what belongs here or what should be invalidated on
-    // configuration
-    // change
-    if (savedState instanceof Bundle) {
-      Bundle state = (Bundle) savedState;
-      super.onRestoreInstanceState(state.getParcelable(EXTRA_SUPER));
-      setScaleType(PreviewView.ScaleType.fromId(state.getInt(EXTRA_SCALE_TYPE)));
-      setZoomRatio(state.getFloat(EXTRA_ZOOM_RATIO));
-      setPinchToZoomEnabled(state.getBoolean(EXTRA_PINCH_TO_ZOOM_ENABLED));
-      setFlash(FlashModeConverter.valueOf(state.getString(EXTRA_FLASH)));
-      setMaxVideoDuration(state.getLong(EXTRA_MAX_VIDEO_DURATION));
-      setMaxVideoSize(state.getLong(EXTRA_MAX_VIDEO_SIZE));
-      String lensFacingString = state.getString(EXTRA_CAMERA_DIRECTION);
-      setCameraLensFacing(
-          TextUtils.isEmpty(lensFacingString)
-              ? null
-              : LensFacingConverter.valueOf(lensFacingString));
-      setCaptureMode(CaptureMode.fromId(state.getInt(EXTRA_CAPTURE_MODE)));
-    } else {
-      super.onRestoreInstanceState(savedState);
-    }
-  }
-
-  @Override
-  protected void onAttachedToWindow() {
-    super.onAttachedToWindow();
-    DisplayManager dpyMgr =
-        (DisplayManager) getContext().getSystemService(Context.DISPLAY_SERVICE);
-    dpyMgr.registerDisplayListener(mDisplayListener, new Handler(Looper.getMainLooper()));
-  }
-
-  @Override
-  protected void onDetachedFromWindow() {
-    super.onDetachedFromWindow();
-    DisplayManager dpyMgr =
-        (DisplayManager) getContext().getSystemService(Context.DISPLAY_SERVICE);
-    dpyMgr.unregisterDisplayListener(mDisplayListener);
-  }
-
-  /**
-   * Gets the {@link LiveData} of the underlying {@link PreviewView}'s
-   * {@link PreviewView.StreamState}.
-   *
-   * @return A {@link LiveData} containing the {@link PreviewView.StreamState}. Apps can either
-   * get current value by {@link LiveData#getValue()} or register a observer by
-   * {@link LiveData#observe}.
-   * @see PreviewView#getPreviewStreamState()
-   */
-  @NonNull
-  public LiveData<PreviewView.StreamState> getPreviewStreamState() {
-    return mPreviewView.getPreviewStreamState();
-  }
-
-  @NonNull
-  PreviewView getPreviewView() {
-    return mPreviewView;
-  }
-
-  // TODO(b/124269166): Rethink how we can handle permissions here.
-  @SuppressLint("MissingPermission")
-  @Override
-  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-    // Since bindToLifecycle will depend on the measured dimension, only call it when measured
-    // dimension is not 0x0
-    if (getMeasuredWidth() > 0 && getMeasuredHeight() > 0) {
-      mCameraModule.bindToLifecycleAfterViewMeasured();
-    }
-
-    super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-  }
-
-  // TODO(b/124269166): Rethink how we can handle permissions here.
-  @SuppressLint("MissingPermission")
-  @Override
-  protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-    // In case that the CameraView size is always set as 0x0, we still need to trigger to force
-    // binding to lifecycle
-    mCameraModule.bindToLifecycleAfterViewMeasured();
-
-    mCameraModule.invalidateView();
-    super.onLayout(changed, left, top, right, bottom);
-  }
-
-  /**
-   * @return One of {@link Surface#ROTATION_0}, {@link Surface#ROTATION_90}, {@link
-   * Surface#ROTATION_180}, {@link Surface#ROTATION_270}.
-   */
-  int getDisplaySurfaceRotation() {
-    Display display = getDisplay();
-
-    // Null when the View is detached. If we were in the middle of a background operation,
-    // better to not NPE. When the background operation finishes, it'll realize that the camera
-    // was closed.
-    if (display == null) {
-      return 0;
-    }
-
-    return display.getRotation();
-  }
-
-  /**
-   * Returns the scale type used to scale the preview.
-   *
-   * @return The current {@link PreviewView.ScaleType}.
-   */
-  @NonNull
-  public PreviewView.ScaleType getScaleType() {
-    return mPreviewView.getScaleType();
-  }
-
-  /**
-   * Sets the view finder scale type.
-   *
-   * <p>This controls how the view finder should be scaled and positioned within the view.
-   *
-   * @param scaleType The desired {@link PreviewView.ScaleType}.
-   */
-  public void setScaleType(@NonNull PreviewView.ScaleType scaleType) {
-    mPreviewView.setScaleType(scaleType);
-  }
-
-  /**
-   * Returns the scale type used to scale the preview.
-   *
-   * @return The current {@link CaptureMode}.
-   */
-  @NonNull
-  public CaptureMode getCaptureMode() {
-    return mCameraModule.getCaptureMode();
-  }
-
-  /**
-   * Sets the CameraView capture mode
-   *
-   * <p>This controls only image or video capture function is enabled or both are enabled.
-   *
-   * @param captureMode The desired {@link CaptureMode}.
-   */
-  public void setCaptureMode(@NonNull CaptureMode captureMode) {
-    mCameraModule.setCaptureMode(captureMode);
-  }
-
-  /**
-   * Returns the maximum duration of videos, or {@link #INDEFINITE_VIDEO_DURATION} if there is no
-   * timeout.
-   *
-   * @hide Not currently implemented.
-   */
-  @RestrictTo(Scope.LIBRARY_GROUP)
-  public long getMaxVideoDuration() {
-    return mCameraModule.getMaxVideoDuration();
-  }
-
-  /**
-   * Sets the maximum video duration before
-   * {@link OnVideoSavedCallback#onVideoSaved(VideoCapture.OutputFileResults)} is called
-   * automatically.
-   * Use {@link #INDEFINITE_VIDEO_DURATION} to disable the timeout.
-   */
-  private void setMaxVideoDuration(long duration) {
-    mCameraModule.setMaxVideoDuration(duration);
-  }
-
-  /**
-   * Returns the maximum size of videos in bytes, or {@link #INDEFINITE_VIDEO_SIZE} if there is no
-   * timeout.
-   */
-  private long getMaxVideoSize() {
-    return mCameraModule.getMaxVideoSize();
-  }
-
-  /**
-   * Sets the maximum video size in bytes before
-   * {@link OnVideoSavedCallback#onVideoSaved(VideoCapture.OutputFileResults)}
-   * is called automatically. Use {@link #INDEFINITE_VIDEO_SIZE} to disable the size restriction.
-   */
-  private void setMaxVideoSize(long size) {
-    mCameraModule.setMaxVideoSize(size);
-  }
-
-  /**
-   * Takes a picture, and calls {@link OnImageCapturedCallback#onCaptureSuccess(ImageProxy)}
-   * once when done.
-   *
-   * @param executor The executor in which the callback methods will be run.
-   * @param callback Callback which will receive success or failure callbacks.
-   */
-  public void takePicture(@NonNull Executor executor, @NonNull OnImageCapturedCallback callback) {
-    mCameraModule.takePicture(executor, callback);
-  }
-
-  /**
-   * Takes a picture and calls
-   * {@link OnImageSavedCallback#onImageSaved(ImageCapture.OutputFileResults)} when done.
-   *
-   * <p> The value of {@link ImageCapture.Metadata#isReversedHorizontal()} in the
-   * {@link ImageCapture.OutputFileOptions} will be overwritten based on camera direction. For
-   * front camera, it will be set to true; for back camera, it will be set to false.
-   *
-   * @param outputFileOptions Options to store the newly captured image.
-   * @param executor          The executor in which the callback methods will be run.
-   * @param callback          Callback which will receive success or failure.
-   */
-  public void takePicture(@NonNull ImageCapture.OutputFileOptions outputFileOptions,
-                          @NonNull Executor executor,
-                          @NonNull OnImageSavedCallback callback) {
-    mCameraModule.takePicture(outputFileOptions, executor, callback);
-  }
-
-  /**
-   * Takes a video and calls the OnVideoSavedCallback when done.
-   *
-   * @param outputFileOptions     Options to store the newly captured video.
-   * @param executor              The executor in which the callback methods will be run.
-   * @param callback              Callback which will receive success or failure.
-   */
-  public void startRecording(@NonNull VideoCapture.OutputFileOptions outputFileOptions,
-                             @NonNull Executor executor,
-                             @NonNull OnVideoSavedCallback callback) {
-    mCameraModule.startRecording(outputFileOptions, executor, callback);
-  }
-
-  /** Stops an in progress video. */
-  public void stopRecording() {
-    mCameraModule.stopRecording();
-  }
-
-  /** @return True if currently recording. */
-  public boolean isRecording() {
-    return mCameraModule.isRecording();
-  }
-
-  /**
-   * Queries whether the current device has a camera with the specified direction.
-   *
-   * @return True if the device supports the direction.
-   * @throws IllegalStateException if the CAMERA permission is not currently granted.
-   */
-  @RequiresPermission(permission.CAMERA)
-  public boolean hasCameraWithLensFacing(@CameraSelector.LensFacing int lensFacing) {
-    return mCameraModule.hasCameraWithLensFacing(lensFacing);
-  }
-
-  /**
-   * Toggles between the primary front facing camera and the primary back facing camera.
-   *
-   * <p>This will have no effect if not already bound to a lifecycle via {@link
-   * #bindToLifecycle(LifecycleOwner)}.
-   */
-  public void toggleCamera() {
-    mCameraModule.toggleCamera();
-  }
-
-  /**
-   * Sets the desired camera by specifying desired lensFacing.
-   *
-   * <p>This will choose the primary camera with the specified camera lensFacing.
-   *
-   * <p>If called before {@link #bindToLifecycle(LifecycleOwner)}, this will set the camera to be
-   * used when first bound to the lifecycle. If the specified lensFacing is not supported by the
-   * device, as determined by {@link #hasCameraWithLensFacing(int)}, the first supported
-   * lensFacing will be chosen when {@link #bindToLifecycle(LifecycleOwner)} is called.
-   *
-   * <p>If called with {@code null} AFTER binding to the lifecycle, the behavior would be
-   * equivalent to unbind the use cases without the lifecycle having to be destroyed.
-   *
-   * @param lensFacing The desired camera lensFacing.
-   */
-  public void setCameraLensFacing(@Nullable Integer lensFacing) {
-    mCameraModule.setCameraLensFacing(lensFacing);
-  }
-
-  /** Returns the currently selected lensFacing. */
-  @Nullable
-  public Integer getCameraLensFacing() {
-    return mCameraModule.getLensFacing();
-  }
-
-  /** Gets the active flash strategy. */
-  @ImageCapture.FlashMode
-  public int getFlash() {
-    return mCameraModule.getFlash();
-  }
-
-  // Begin Signal Custom Code Block
-  public boolean hasFlash() {
-    return mCameraModule.hasFlash();
-  }
-  // End Signal Custom Code Block
-
-  /** Sets the active flash strategy. */
-  public void setFlash(@ImageCapture.FlashMode int flashMode) {
-    mCameraModule.setFlash(flashMode);
-  }
-
-  private long delta() {
-    return System.currentTimeMillis() - mDownEventTimestamp;
-  }
-
-  @Override
-  public boolean onTouchEvent(@NonNull MotionEvent event) {
-    // Disable pinch-to-zoom and tap-to-focus while the camera module is paused.
-    if (mCameraModule.isPaused()) {
-      return false;
-    }
-    // Only forward the event to the pinch-to-zoom gesture detector when pinch-to-zoom is
-    // enabled.
-    if (isPinchToZoomEnabled()) {
-      mPinchToZoomGestureDetector.onTouchEvent(event);
-    }
-    if (event.getPointerCount() == 2 && isPinchToZoomEnabled() && isZoomSupported()) {
-      return true;
-    }
-
-    // Camera focus
-    switch (event.getAction()) {
-      case MotionEvent.ACTION_DOWN:
-        mDownEventTimestamp = System.currentTimeMillis();
-        break;
-      case MotionEvent.ACTION_UP:
-        if (delta() < ViewConfiguration.getLongPressTimeout()
-            && mCameraModule.isBoundToLifecycle()) {
-          mUpEvent = event;
-          performClick();
-        }
-        break;
-      default:
-        // Unhandled event.
-        return false;
-    }
-    return true;
-  }
-
-  /**
-   * Focus the position of the touch event, or focus the center of the preview for
-   * accessibility events
-   */
-  @Override
-  public boolean performClick() {
-    super.performClick();
-
-    final float x = (mUpEvent != null) ? mUpEvent.getX() : getX() + getWidth() / 2f;
-    final float y = (mUpEvent != null) ? mUpEvent.getY() : getY() + getHeight() / 2f;
-    mUpEvent = null;
-
-    Camera camera = mCameraModule.getCamera();
-    if (camera != null) {
-      MeteringPointFactory pointFactory = mPreviewView.getMeteringPointFactory();
-      float afPointWidth = 1.0f / 6.0f;  // 1/6 total area
-      float aePointWidth = afPointWidth * 1.5f;
-      MeteringPoint afPoint = pointFactory.createPoint(x, y, afPointWidth);
-      MeteringPoint aePoint = pointFactory.createPoint(x, y, aePointWidth);
-
-      ListenableFuture<FocusMeteringResult> future =
-          camera.getCameraControl().startFocusAndMetering(
-              new FocusMeteringAction.Builder(afPoint,
-                  FocusMeteringAction.FLAG_AF).addPoint(aePoint,
-                  FocusMeteringAction.FLAG_AE).build());
-      Futures.addCallback(future, new FutureCallback<FocusMeteringResult>() {
-        @Override
-        public void onSuccess(@Nullable FocusMeteringResult result) {
-        }
-
-        @Override
-        public void onFailure(Throwable t) {
-          // Throw the unexpected error.
-          throw new RuntimeException(t);
-        }
-      }, CameraXExecutors.directExecutor());
-
-    } else {
-      Logger.d(TAG, "cannot access camera");
-    }
-
-    return true;
-  }
-
-  float rangeLimit(float val, float max, float min) {
-    return Math.min(Math.max(val, min), max);
-  }
-
-  /**
-   * Returns whether the view allows pinch-to-zoom.
-   *
-   * @return True if pinch to zoom is enabled.
-   */
-  public boolean isPinchToZoomEnabled() {
-    return mIsPinchToZoomEnabled;
-  }
-
-  /**
-   * Sets whether the view should allow pinch-to-zoom.
-   *
-   * <p>When enabled, the user can pinch the camera to zoom in/out. This only has an effect if the
-   * bound camera supports zoom.
-   *
-   * @param enabled True to enable pinch-to-zoom.
-   */
-  public void setPinchToZoomEnabled(boolean enabled) {
-    mIsPinchToZoomEnabled = enabled;
-  }
-
-  /**
-   * Returns the current zoom ratio.
-   *
-   * @return The current zoom ratio.
-   */
-  public float getZoomRatio() {
-    return mCameraModule.getZoomRatio();
-  }
-
-  /**
-   * Sets the current zoom ratio.
-   *
-   * <p>Valid zoom values range from {@link #getMinZoomRatio()} to {@link #getMaxZoomRatio()}.
-   *
-   * @param zoomRatio The requested zoom ratio.
-   */
-  public void setZoomRatio(float zoomRatio) {
-    mCameraModule.setZoomRatio(zoomRatio);
-  }
-
-  /**
-   * Returns the minimum zoom ratio.
-   *
-   * <p>For most cameras this should return a zoom ratio of 1. A zoom ratio of 1 corresponds to a
-   * non-zoomed image.
-   *
-   * @return The minimum zoom ratio.
-   */
-  public float getMinZoomRatio() {
-    return mCameraModule.getMinZoomRatio();
-  }
-
-  /**
-   * Returns the maximum zoom ratio.
-   *
-   * <p>The zoom ratio corresponds to the ratio between both the widths and heights of a
-   * non-zoomed image and a maximally zoomed image for the selected camera.
-   *
-   * @return The maximum zoom ratio.
-   */
-  public float getMaxZoomRatio() {
-    return mCameraModule.getMaxZoomRatio();
-  }
-
-  /**
-   * Returns whether the bound camera supports zooming.
-   *
-   * @return True if the camera supports zooming.
-   */
-  public boolean isZoomSupported() {
-    return mCameraModule.isZoomSupported();
-  }
-
-  /**
-   * Turns on/off torch.
-   *
-   * @param torch True to turn on torch, false to turn off torch.
-   */
-  public void enableTorch(boolean torch) {
-    mCameraModule.enableTorch(torch);
-  }
-
-  /**
-   * Returns current torch status.
-   *
-   * @return true if torch is on , otherwise false
-   */
-  public boolean isTorchOn() {
-    return mCameraModule.isTorchOn();
-  }
-
-  /**
-   * The capture mode used by CameraView.
-   *
-   * <p>This enum can be used to determine which capture mode will be enabled for {@link
-   * SignalCameraView}.
-   */
-  public enum CaptureMode {
-    /** A mode where image capture is enabled. */
-    IMAGE(0),
-    /** A mode where video capture is enabled. */
-    VIDEO(1),
-    /**
-     * A mode where both image capture and video capture are simultaneously enabled. Note that
-     * this mode may not be available on every device.
-     */
-    MIXED(2);
-
-    private final int mId;
-
-    int getId() {
-      return mId;
-    }
-
-    CaptureMode(int id) {
-      mId = id;
-    }
-
-    static CaptureMode fromId(int id) {
-      for (CaptureMode f : values()) {
-        if (f.mId == id) {
-          return f;
-        }
-      }
-      throw new IllegalArgumentException();
-    }
-  }
-
-  static class S extends ScaleGestureDetector.SimpleOnScaleGestureListener {
-    private ScaleGestureDetector.OnScaleGestureListener mListener;
-
-    void setRealGestureDetector(ScaleGestureDetector.OnScaleGestureListener l) {
-      mListener = l;
-    }
-
-    @Override
-    public boolean onScale(ScaleGestureDetector detector) {
-      return mListener.onScale(detector);
-    }
-  }
-
-  private class PinchToZoomGestureDetector extends ScaleGestureDetector
-      implements ScaleGestureDetector.OnScaleGestureListener {
-    PinchToZoomGestureDetector(Context context) {
-      this(context, new S());
-    }
-
-    PinchToZoomGestureDetector(Context context, S s) {
-      super(context, s);
-      s.setRealGestureDetector(this);
-    }
-
-    @Override
-    public boolean onScale(ScaleGestureDetector detector) {
-      float scale = detector.getScaleFactor();
-
-      // Speeding up the zoom by 2X.
-      if (scale > 1f) {
-        scale = 1.0f + (scale - 1.0f) * 2;
-      } else {
-        scale = 1.0f - (1.0f - scale) * 2;
-      }
-
-      float newRatio = getZoomRatio() * scale;
-      newRatio = rangeLimit(newRatio, getMaxZoomRatio(), getMinZoomRatio());
-      setZoomRatio(newRatio);
-      return true;
-    }
-
-    @Override
-    public boolean onScaleBegin(ScaleGestureDetector detector) {
-      return true;
-    }
-
-    @Override
-    public void onScaleEnd(ScaleGestureDetector detector) {
-    }
-  }
-}

app/src/main/java/androidx/camera/view/SignalCameraXModule.java

@@ -1,699 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.camera.view;
-
-import android.Manifest.permission;
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.res.Resources;
-import android.util.Rational;
-import android.util.Size;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
-import androidx.annotation.RequiresPermission;
-import androidx.camera.core.Camera;
-import androidx.camera.core.CameraInfoUnavailableException;
-import androidx.camera.core.CameraSelector;
-import androidx.camera.core.ImageCapture;
-import androidx.camera.core.ImageCapture.OnImageCapturedCallback;
-import androidx.camera.core.ImageCapture.OnImageSavedCallback;
-import androidx.camera.core.Logger;
-import androidx.camera.core.Preview;
-import androidx.camera.core.TorchState;
-import androidx.camera.core.UseCase;
-import androidx.camera.core.VideoCapture;
-import androidx.camera.core.VideoCapture.OnVideoSavedCallback;
-import androidx.camera.core.impl.CameraInternal;
-import androidx.camera.core.impl.LensFacingConverter;
-import androidx.camera.core.impl.utils.CameraOrientationUtil;
-import androidx.camera.core.impl.utils.executor.CameraXExecutors;
-import androidx.camera.core.impl.utils.futures.FutureCallback;
-import androidx.camera.core.impl.utils.futures.Futures;
-import androidx.camera.lifecycle.ProcessCameraProvider;
-import androidx.core.util.Consumer;
-import androidx.core.util.Preconditions;
-import androidx.lifecycle.Lifecycle;
-import androidx.lifecycle.LifecycleObserver;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.lifecycle.OnLifecycleEvent;
-
-import com.google.common.util.concurrent.ListenableFuture;
-
-import org.thoughtcrime.securesms.mediasend.camerax.CameraXUtil;
-import org.thoughtcrime.securesms.mms.MediaConstraints;
-import org.thoughtcrime.securesms.video.VideoUtil;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.concurrent.Executor;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static androidx.camera.core.ImageCapture.FLASH_MODE_OFF;
-
-/** CameraX use case operation built on @{link androidx.camera.core}. */
-@RequiresApi(21)
-@SuppressLint("RestrictedApi")
-final class SignalCameraXModule {
-  public static final String TAG = "CameraXModule";
-
-  private static final float UNITY_ZOOM_SCALE = 1f;
-  private static final float ZOOM_NOT_SUPPORTED = UNITY_ZOOM_SCALE;
-  private static final Rational ASPECT_RATIO_16_9 = new Rational(16, 9);
-  private static final Rational ASPECT_RATIO_4_3 = new Rational(4, 3);
-  private static final Rational ASPECT_RATIO_9_16 = new Rational(9, 16);
-  private static final Rational ASPECT_RATIO_3_4 = new Rational(3, 4);
-
-  private final Preview.Builder mPreviewBuilder;
-  private final VideoCapture.Builder mVideoCaptureBuilder;
-  private final ImageCapture.Builder mImageCaptureBuilder;
-  private final SignalCameraView mCameraView;
-  final AtomicBoolean mVideoIsRecording = new AtomicBoolean(false);
-  private SignalCameraView.CaptureMode mCaptureMode = SignalCameraView.CaptureMode.IMAGE;
-  private long mMaxVideoDuration = SignalCameraView.INDEFINITE_VIDEO_DURATION;
-  private long mMaxVideoSize = SignalCameraView.INDEFINITE_VIDEO_SIZE;
-  @ImageCapture.FlashMode
-  private int mFlash = FLASH_MODE_OFF;
-  @Nullable
-  @SuppressWarnings("WeakerAccess") /* synthetic accessor */
-      Camera mCamera;
-  @Nullable
-  private ImageCapture mImageCapture;
-  @Nullable
-  private VideoCapture mVideoCapture;
-  @SuppressWarnings("WeakerAccess") /* synthetic accessor */
-  @Nullable
-  Preview mPreview;
-  @SuppressWarnings("WeakerAccess") /* synthetic accessor */
-  @Nullable
-  LifecycleOwner mCurrentLifecycle;
-  private final LifecycleObserver mCurrentLifecycleObserver =
-      new LifecycleObserver() {
-        @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
-        public void onDestroy(LifecycleOwner owner) {
-          if (owner == mCurrentLifecycle) {
-            clearCurrentLifecycle();
-          }
-        }
-      };
-  @Nullable
-  private LifecycleOwner mNewLifecycle;
-  @SuppressWarnings("WeakerAccess") /* synthetic accessor */
-  @Nullable
-  Integer mCameraLensFacing = CameraSelector.LENS_FACING_BACK;
-  @SuppressWarnings("WeakerAccess") /* synthetic accessor */
-  @Nullable
-  ProcessCameraProvider mCameraProvider;
-
-  // BEGIN Custom Signal Code Block
-  SignalCameraXModule(SignalCameraView view, Consumer<Throwable> errorConsumer) {
-    // END Custom Signal Code Block
-    mCameraView = view;
-
-    Futures.addCallback(ProcessCameraProvider.getInstance(view.getContext()),
-        new FutureCallback<ProcessCameraProvider>() {
-          // TODO(b/124269166): Rethink how we can handle permissions here.
-          @SuppressLint("MissingPermission")
-          @Override
-          public void onSuccess(@Nullable ProcessCameraProvider provider) {
-            Preconditions.checkNotNull(provider);
-            mCameraProvider = provider;
-            if (mCurrentLifecycle != null) {
-              bindToLifecycle(mCurrentLifecycle);
-            }
-          }
-
-          @Override
-          public void onFailure(Throwable t) {
-            // BEGIN Custom Signal Code Block
-            errorConsumer.accept(t);
-            // END Custom Signal Code Block
-          }
-        }, CameraXExecutors.mainThreadExecutor());
-
-    mPreviewBuilder = new Preview.Builder().setTargetName("Preview");
-
-    mImageCaptureBuilder = new ImageCapture.Builder().setTargetName("ImageCapture");
-
-    mVideoCaptureBuilder = new VideoCapture.Builder().setTargetName("VideoCapture")
-                                                     .setAudioBitRate(VideoUtil.AUDIO_BIT_RATE)
-                                                     .setVideoFrameRate(VideoUtil.VIDEO_FRAME_RATE)
-                                                     .setBitRate(VideoUtil.VIDEO_BIT_RATE);
-  }
-
-  @RequiresPermission(permission.CAMERA)
-  void bindToLifecycle(LifecycleOwner lifecycleOwner) {
-    mNewLifecycle = lifecycleOwner;
-
-    if (getMeasuredWidth() > 0 && getMeasuredHeight() > 0) {
-      bindToLifecycleAfterViewMeasured();
-    }
-  }
-
-  @RequiresPermission(permission.CAMERA)
-  void bindToLifecycleAfterViewMeasured() {
-    if (mNewLifecycle == null) {
-      return;
-    }
-
-    clearCurrentLifecycle();
-    if (mNewLifecycle.getLifecycle().getCurrentState() == Lifecycle.State.DESTROYED) {
-      // Lifecycle is already in a destroyed state. Since it may have been a valid
-      // lifecycle when bound, but became destroyed while waiting for layout, treat this as
-      // a no-op now that we have cleared the previous lifecycle.
-      mNewLifecycle = null;
-      return;
-    }
-    mCurrentLifecycle = mNewLifecycle;
-    mNewLifecycle = null;
-
-    if (mCameraProvider == null) {
-      // try again once the camera provider is no longer null
-      return;
-    }
-
-    Set<Integer> available = getAvailableCameraLensFacing();
-
-    if (available.isEmpty()) {
-      Logger.w(TAG, "Unable to bindToLifeCycle since no cameras available");
-      mCameraLensFacing = null;
-    }
-
-    // Ensure the current camera exists, or default to another camera
-    if (mCameraLensFacing != null && !available.contains(mCameraLensFacing)) {
-      Logger.w(TAG, "Camera does not exist with direction " + mCameraLensFacing);
-
-      // Default to the first available camera direction
-      mCameraLensFacing = available.iterator().next();
-
-      Logger.w(TAG, "Defaulting to primary camera with direction " + mCameraLensFacing);
-    }
-
-    // Do not attempt to create use cases for a null cameraLensFacing. This could occur if
-    // the user explicitly sets the LensFacing to null, or if we determined there
-    // were no available cameras, which should be logged in the logic above.
-    if (mCameraLensFacing == null) {
-      return;
-    }
-
-    // Set the preferred aspect ratio as 4:3 if it is IMAGE only mode. Set the preferred aspect
-    // ratio as 16:9 if it is VIDEO or MIXED mode. Then, it will be WYSIWYG when the view finder
-    // is in CENTER_INSIDE mode.
-
-    boolean isDisplayPortrait = getDisplayRotationDegrees() == 0
-        || getDisplayRotationDegrees() == 180;
-
-    // Begin Signal Custom Code Block
-    int resolution = CameraXUtil.getIdealResolution(Resources.getSystem().getDisplayMetrics().widthPixels, Resources.getSystem().getDisplayMetrics().heightPixels);
-    // End Signal Custom Code Block
-
-    Rational targetAspectRatio;
-    // Begin Signal Custom Code Block
-    mImageCaptureBuilder.setTargetResolution(CameraXUtil.buildResolutionForRatio(resolution, ASPECT_RATIO_16_9, isDisplayPortrait));
-    targetAspectRatio = isDisplayPortrait ? ASPECT_RATIO_9_16 : ASPECT_RATIO_16_9;
-    // End Signal Custom Code Block
-
-    // Begin Signal Custom Code Block
-    mImageCaptureBuilder.setCaptureMode(CameraXUtil.getOptimalCaptureMode());
-    // End Signal Custom Code Block
-
-    mImageCaptureBuilder.setTargetRotation(getDisplaySurfaceRotation());
-    mImageCapture = mImageCaptureBuilder.build();
-
-    // Begin Signal Custom Code Block
-    Size size = VideoUtil.getVideoRecordingSize();
-    mVideoCaptureBuilder.setTargetResolution(size);
-    mVideoCaptureBuilder.setMaxResolution(size);
-    // End Signal Custom Code Block
-
-    mVideoCaptureBuilder.setTargetRotation(getDisplaySurfaceRotation());
-    // Begin Signal Custom Code Block
-    if (MediaConstraints.isVideoTranscodeAvailable()) {
-      mVideoCapture = mVideoCaptureBuilder.build();
-    }
-    // End Signal Custom Code Block
-
-    // Adjusts the preview resolution according to the view size and the target aspect ratio.
-    int height = (int) (getMeasuredWidth() / targetAspectRatio.floatValue());
-    mPreviewBuilder.setTargetResolution(new Size(getMeasuredWidth(), height));
-
-    mPreview = mPreviewBuilder.build();
-    mPreview.setSurfaceProvider(mCameraView.getPreviewView().getSurfaceProvider());
-
-    CameraSelector cameraSelector =
-        new CameraSelector.Builder().requireLensFacing(mCameraLensFacing).build();
-    if (getCaptureMode() == SignalCameraView.CaptureMode.IMAGE) {
-      mCamera = mCameraProvider.bindToLifecycle(mCurrentLifecycle, cameraSelector,
-          mImageCapture,
-          mPreview);
-    } else if (getCaptureMode() == SignalCameraView.CaptureMode.VIDEO) {
-      mCamera = mCameraProvider.bindToLifecycle(mCurrentLifecycle, cameraSelector,
-          mVideoCapture,
-          mPreview);
-    } else {
-      mCamera = mCameraProvider.bindToLifecycle(mCurrentLifecycle, cameraSelector,
-          mImageCapture,
-          mVideoCapture, mPreview);
-    }
-
-    setZoomRatio(UNITY_ZOOM_SCALE);
-    mCurrentLifecycle.getLifecycle().addObserver(mCurrentLifecycleObserver);
-    // Enable flash setting in ImageCapture after use cases are created and binded.
-    setFlash(getFlash());
-  }
-
-  public void open() {
-    throw new UnsupportedOperationException(
-        "Explicit open/close of camera not yet supported. Use bindtoLifecycle() instead.");
-  }
-
-  public void close() {
-    throw new UnsupportedOperationException(
-        "Explicit open/close of camera not yet supported. Use bindtoLifecycle() instead.");
-  }
-
-  public void takePicture(Executor executor, OnImageCapturedCallback callback) {
-    if (mImageCapture == null) {
-      return;
-    }
-
-    if (getCaptureMode() == SignalCameraView.CaptureMode.VIDEO) {
-      throw new IllegalStateException("Can not take picture under VIDEO capture mode.");
-    }
-
-    if (callback == null) {
-      throw new IllegalArgumentException("OnImageCapturedCallback should not be empty");
-    }
-
-    mImageCapture.takePicture(executor, callback);
-  }
-
-  public void takePicture(@NonNull ImageCapture.OutputFileOptions outputFileOptions,
-                          @NonNull Executor executor, OnImageSavedCallback callback) {
-    if (mImageCapture == null) {
-      return;
-    }
-
-    if (getCaptureMode() == SignalCameraView.CaptureMode.VIDEO) {
-      throw new IllegalStateException("Can not take picture under VIDEO capture mode.");
-    }
-
-    if (callback == null) {
-      throw new IllegalArgumentException("OnImageSavedCallback should not be empty");
-    }
-
-    outputFileOptions.getMetadata().setReversedHorizontal(mCameraLensFacing != null
-        && mCameraLensFacing == CameraSelector.LENS_FACING_FRONT);
-    mImageCapture.takePicture(outputFileOptions, executor, callback);
-  }
-
-  public void startRecording(VideoCapture.OutputFileOptions outputFileOptions,
-                             Executor executor, final OnVideoSavedCallback callback) {
-    if (mVideoCapture == null) {
-      return;
-    }
-
-    if (getCaptureMode() == SignalCameraView.CaptureMode.IMAGE) {
-      throw new IllegalStateException("Can not record video under IMAGE capture mode.");
-    }
-
-    if (callback == null) {
-      throw new IllegalArgumentException("OnVideoSavedCallback should not be empty");
-    }
-
-    mVideoIsRecording.set(true);
-    mVideoCapture.startRecording(
-        outputFileOptions,
-        executor,
-        new VideoCapture.OnVideoSavedCallback() {
-          @Override
-          public void onVideoSaved(
-              @NonNull VideoCapture.OutputFileResults outputFileResults) {
-            mVideoIsRecording.set(false);
-            callback.onVideoSaved(outputFileResults);
-          }
-
-          @Override
-          public void onError(
-              @VideoCapture.VideoCaptureError int videoCaptureError,
-              @NonNull String message,
-              @Nullable Throwable cause) {
-            mVideoIsRecording.set(false);
-            Logger.e(TAG, message, cause);
-            callback.onError(videoCaptureError, message, cause);
-          }
-        });
-  }
-
-  public void stopRecording() {
-    if (mVideoCapture == null) {
-      return;
-    }
-
-    mVideoCapture.stopRecording();
-  }
-
-  public boolean isRecording() {
-    return mVideoIsRecording.get();
-  }
-
-  // TODO(b/124269166): Rethink how we can handle permissions here.
-  @SuppressLint("MissingPermission")
-  public void setCameraLensFacing(@Nullable Integer lensFacing) {
-    // Setting same lens facing is a no-op, so check for that first
-    if (!Objects.equals(mCameraLensFacing, lensFacing)) {
-      // If we're not bound to a lifecycle, just update the camera that will be opened when we
-      // attach to a lifecycle.
-      mCameraLensFacing = lensFacing;
-
-      if (mCurrentLifecycle != null) {
-        // Re-bind to lifecycle with new camera
-        bindToLifecycle(mCurrentLifecycle);
-      }
-    }
-  }
-
-  @RequiresPermission(permission.CAMERA)
-  public boolean hasCameraWithLensFacing(@CameraSelector.LensFacing int lensFacing) {
-    if (mCameraProvider == null) {
-      return false;
-    }
-    try {
-      return mCameraProvider.hasCamera(
-          new CameraSelector.Builder().requireLensFacing(lensFacing).build());
-    } catch (CameraInfoUnavailableException e) {
-      return false;
-    }
-  }
-
-  @Nullable
-  public Integer getLensFacing() {
-    return mCameraLensFacing;
-  }
-
-  public void toggleCamera() {
-    // TODO(b/124269166): Rethink how we can handle permissions here.
-    @SuppressLint("MissingPermission")
-    Set<Integer> availableCameraLensFacing = getAvailableCameraLensFacing();
-
-    if (availableCameraLensFacing.isEmpty()) {
-      return;
-    }
-
-    if (mCameraLensFacing == null) {
-      setCameraLensFacing(availableCameraLensFacing.iterator().next());
-      return;
-    }
-
-    if (mCameraLensFacing == CameraSelector.LENS_FACING_BACK
-        && availableCameraLensFacing.contains(CameraSelector.LENS_FACING_FRONT)) {
-      setCameraLensFacing(CameraSelector.LENS_FACING_FRONT);
-      return;
-    }
-
-    if (mCameraLensFacing == CameraSelector.LENS_FACING_FRONT
-        && availableCameraLensFacing.contains(CameraSelector.LENS_FACING_BACK)) {
-      setCameraLensFacing(CameraSelector.LENS_FACING_BACK);
-      return;
-    }
-  }
-
-  public float getZoomRatio() {
-    if (mCamera != null) {
-      return mCamera.getCameraInfo().getZoomState().getValue().getZoomRatio();
-    } else {
-      return UNITY_ZOOM_SCALE;
-    }
-  }
-
-  public void setZoomRatio(float zoomRatio) {
-    if (mCamera != null) {
-      ListenableFuture<Void> future = mCamera.getCameraControl().setZoomRatio(
-          zoomRatio);
-      Futures.addCallback(future, new FutureCallback<Void>() {
-        @Override
-        public void onSuccess(@Nullable Void result) {
-        }
-
-        @Override
-        public void onFailure(Throwable t) {
-          // Throw the unexpected error.
-          throw new RuntimeException(t);
-        }
-      }, CameraXExecutors.directExecutor());
-    } else {
-      Logger.e(TAG, "Failed to set zoom ratio");
-    }
-  }
-
-  public float getMinZoomRatio() {
-    if (mCamera != null) {
-      return mCamera.getCameraInfo().getZoomState().getValue().getMinZoomRatio();
-    } else {
-      return UNITY_ZOOM_SCALE;
-    }
-  }
-
-  public float getMaxZoomRatio() {
-    if (mCamera != null) {
-      return mCamera.getCameraInfo().getZoomState().getValue().getMaxZoomRatio();
-    } else {
-      return ZOOM_NOT_SUPPORTED;
-    }
-  }
-
-  public boolean isZoomSupported() {
-    return getMaxZoomRatio() != ZOOM_NOT_SUPPORTED;
-  }
-
-  // TODO(b/124269166): Rethink how we can handle permissions here.
-  @SuppressLint("MissingPermission")
-  private void rebindToLifecycle() {
-    if (mCurrentLifecycle != null) {
-      bindToLifecycle(mCurrentLifecycle);
-    }
-  }
-
-  boolean isBoundToLifecycle() {
-    return mCamera != null;
-  }
-
-  int getRelativeCameraOrientation(boolean compensateForMirroring) {
-    int rotationDegrees = 0;
-    if (mCamera != null) {
-      rotationDegrees =
-          mCamera.getCameraInfo().getSensorRotationDegrees(getDisplaySurfaceRotation());
-      if (compensateForMirroring) {
-        rotationDegrees = (360 - rotationDegrees) % 360;
-      }
-    }
-
-    return rotationDegrees;
-  }
-
-  @SuppressLint("UnsafeExperimentalUsageError")
-  public void invalidateView() {
-    if (mPreview != null) {
-      mPreview.setTargetRotation(getDisplaySurfaceRotation()); // Fixes issue #10940 (rotation not updated on phones using "Legacy API")
-    }
-
-    updateViewInfo();
-  }
-
-  void clearCurrentLifecycle() {
-    if (mCurrentLifecycle != null && mCameraProvider != null) {
-      // Remove previous use cases
-      List<UseCase> toUnbind = new ArrayList<>();
-      if (mImageCapture != null && mCameraProvider.isBound(mImageCapture)) {
-        toUnbind.add(mImageCapture);
-      }
-      if (mVideoCapture != null && mCameraProvider.isBound(mVideoCapture)) {
-        toUnbind.add(mVideoCapture);
-      }
-      if (mPreview != null && mCameraProvider.isBound(mPreview)) {
-        toUnbind.add(mPreview);
-      }
-
-      if (!toUnbind.isEmpty()) {
-        mCameraProvider.unbind(toUnbind.toArray((new UseCase[0])));
-      }
-
-      // Remove surface provider once unbound.
-      if (mPreview != null) {
-        mPreview.setSurfaceProvider(null);
-      }
-    }
-    mCamera = null;
-    mCurrentLifecycle = null;
-  }
-
-  // Update view related information used in use cases
-  private void updateViewInfo() {
-    if (mImageCapture != null) {
-      mImageCapture.setCropAspectRatio(new Rational(getWidth(), getHeight()));
-      mImageCapture.setTargetRotation(getDisplaySurfaceRotation());
-    }
-
-    if (mVideoCapture != null) {
-      mVideoCapture.setTargetRotation(getDisplaySurfaceRotation());
-    }
-  }
-
-  @RequiresPermission(permission.CAMERA)
-  private Set<Integer> getAvailableCameraLensFacing() {
-    // Start with all camera directions
-    Set<Integer> available = new LinkedHashSet<>(Arrays.asList(LensFacingConverter.values()));
-
-    // If we're bound to a lifecycle, remove unavailable cameras
-    if (mCurrentLifecycle != null) {
-      if (!hasCameraWithLensFacing(CameraSelector.LENS_FACING_BACK)) {
-        available.remove(CameraSelector.LENS_FACING_BACK);
-      }
-
-      if (!hasCameraWithLensFacing(CameraSelector.LENS_FACING_FRONT)) {
-        available.remove(CameraSelector.LENS_FACING_FRONT);
-      }
-    }
-
-    return available;
-  }
-
-  @ImageCapture.FlashMode
-  public int getFlash() {
-    return mFlash;
-  }
-
-  // Begin Signal Custom Code Block
-  public boolean hasFlash() {
-    if (mImageCapture == null) {
-      return false;
-    }
-
-    CameraInternal camera = mImageCapture.getCamera();
-
-    if (camera == null) {
-      return false;
-    }
-
-    return camera.getCameraInfoInternal().hasFlashUnit();
-  }
-  // End Signal Custom Code Block
-
-  public void setFlash(@ImageCapture.FlashMode int flash) {
-    this.mFlash = flash;
-
-    if (mImageCapture == null) {
-      // Do nothing if there is no imageCapture
-      return;
-    }
-
-    mImageCapture.setFlashMode(flash);
-  }
-
-  public void enableTorch(boolean torch) {
-    if (mCamera == null) {
-      return;
-    }
-    ListenableFuture<Void> future = mCamera.getCameraControl().enableTorch(torch);
-    Futures.addCallback(future, new FutureCallback<Void>() {
-      @Override
-      public void onSuccess(@Nullable Void result) {
-      }
-
-      @Override
-      public void onFailure(Throwable t) {
-        // Throw the unexpected error.
-        throw new RuntimeException(t);
-      }
-    }, CameraXExecutors.directExecutor());
-  }
-
-  public boolean isTorchOn() {
-    if (mCamera == null) {
-      return false;
-    }
-    return mCamera.getCameraInfo().getTorchState().getValue() == TorchState.ON;
-  }
-
-  public Context getContext() {
-    return mCameraView.getContext();
-  }
-
-  public int getWidth() {
-    return mCameraView.getWidth();
-  }
-
-  public int getHeight() {
-    return mCameraView.getHeight();
-  }
-
-  public int getDisplayRotationDegrees() {
-    return CameraOrientationUtil.surfaceRotationToDegrees(getDisplaySurfaceRotation());
-  }
-
-  protected int getDisplaySurfaceRotation() {
-    return mCameraView.getDisplaySurfaceRotation();
-  }
-
-  private int getMeasuredWidth() {
-    return mCameraView.getMeasuredWidth();
-  }
-
-  private int getMeasuredHeight() {
-    return mCameraView.getMeasuredHeight();
-  }
-
-  @Nullable
-  public Camera getCamera() {
-    return mCamera;
-  }
-
-  @NonNull
-  public SignalCameraView.CaptureMode getCaptureMode() {
-    return mCaptureMode;
-  }
-
-  public void setCaptureMode(@NonNull SignalCameraView.CaptureMode captureMode) {
-    this.mCaptureMode = captureMode;
-    rebindToLifecycle();
-  }
-
-  public long getMaxVideoDuration() {
-    return mMaxVideoDuration;
-  }
-
-  public void setMaxVideoDuration(long duration) {
-    mMaxVideoDuration = duration;
-  }
-
-  public long getMaxVideoSize() {
-    return mMaxVideoSize;
-  }
-
-  public void setMaxVideoSize(long size) {
-    mMaxVideoSize = size;
-  }
-
-  public boolean isPaused() {
-    return false;
-  }
-}

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

@@ -20,6 +20,6 @@ public final class AppCapabilities {
    *                       asking if the user has set a Signal PIN or not.
    */
   public static AccountAttributes.Capabilities getCapabilities(boolean storageCapable) {
-    return new AccountAttributes.Capabilities(UUID_CAPABLE, GV2_CAPABLE, storageCapable, GV1_MIGRATION, SENDER_KEY, ANNOUNCEMENT_GROUPS, CHANGE_NUMBER, FeatureFlags.stories(), FeatureFlags.giftBadges());
+    return new AccountAttributes.Capabilities(UUID_CAPABLE, GV2_CAPABLE, storageCapable, GV1_MIGRATION, SENDER_KEY, ANNOUNCEMENT_GROUPS, CHANGE_NUMBER, FeatureFlags.stories(), FeatureFlags.giftBadgeReceiveSupport());
   }
 }

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

@@ -61,6 +61,7 @@ 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;
@@ -203,6 +204,7 @@ 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");

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

@@ -92,7 +92,7 @@ public final class AvatarPreviewActivity extends PassphraseRequiredActivity {
     RecipientId recipientId = RecipientId.from(getIntent().getStringExtra(RECIPIENT_ID_EXTRA));
 
     Recipient.live(recipientId).observe(this, recipient -> {
-      ContactPhoto contactPhoto  = recipient.isSelf() ? new ProfileContactPhoto(recipient, recipient.getProfileAvatar())
+      ContactPhoto contactPhoto  = recipient.isSelf() ? new ProfileContactPhoto(recipient)
                                                       : recipient.getContactPhoto();
       FallbackContactPhoto fallbackPhoto = recipient.isSelf() ? new ResourceContactPhoto(R.drawable.ic_profile_outline_40, R.drawable.ic_profile_outline_20, R.drawable.ic_person_large)
                                                               : recipient.getFallbackContactPhoto();

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

@@ -46,7 +46,8 @@ public interface BindableConversationItem extends Unbindable, GiphyMp4Playable,
             boolean hasWallpaper,
             boolean isMessageRequestAccepted,
             boolean canPlayInline,
-            @NonNull Colorizer colorizer);
+            @NonNull Colorizer colorizer,
+            boolean isCondensedMode);
 
   @NonNull ConversationMessage getConversationMessage();
 
@@ -61,12 +62,13 @@ public interface BindableConversationItem extends Unbindable, GiphyMp4Playable,
   }
 
   default void updateSelectedState() {
-    // Intentionall Blank.
+    // Intentionally 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);

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

@@ -18,7 +18,6 @@ package org.thoughtcrime.securesms;
 
 
 import android.Manifest;
-import android.animation.LayoutTransition;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
@@ -32,7 +31,6 @@ 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;
 
@@ -43,6 +41,7 @@ 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;
@@ -54,7 +53,6 @@ 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;
 
@@ -62,7 +60,7 @@ import org.signal.core.util.concurrent.SimpleTask;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.components.RecyclerViewFastScroller;
 import org.thoughtcrime.securesms.contacts.AbstractContactsCursorLoader;
-import org.thoughtcrime.securesms.contacts.ContactChip;
+import org.thoughtcrime.securesms.contacts.ContactChipViewModel;
 import org.thoughtcrime.securesms.contacts.ContactSelectionListAdapter;
 import org.thoughtcrime.securesms.contacts.ContactSelectionListItem;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader;
@@ -70,21 +68,25 @@ 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.thoughtcrime.securesms.util.views.SimpleProgressDialog;
 
 import java.io.IOException;
@@ -94,6 +96,9 @@ 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.
  *
@@ -105,7 +110,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  = 1;
+  private static final int CHIP_GROUP_EMPTY_CHILD_COUNT  = 0;
   private static final int CHIP_GROUP_REVEAL_DURATION_MS = 150;
 
   public static final int NO_LIMIT = Integer.MAX_VALUE;
@@ -133,10 +138,12 @@ public final class ContactSelectionListFragment extends LoggingFragment
   private RecyclerView                                recyclerView;
   private RecyclerViewFastScroller                    fastScroller;
   private ContactSelectionListAdapter                 cursorRecyclerViewAdapter;
-  private ChipGroup                                   chipGroup;
-  private HorizontalScrollView                        chipGroupScrollContainer;
+  private RecyclerView                                chipRecycler;
   private OnSelectionLimitReachedListener             onSelectionLimitReachedListener;
   private AbstractContactsCursorLoaderFactoryProvider cursorFactoryProvider;
+  private MappingAdapter                              contactChipAdapter;
+  private ContactChipViewModel                        contactChipViewModel;
+  private LifecycleDisposable                         lifecycleDisposable;
 
   private HeaderActionProvider                        headerActionProvider;
   private TextView                                    headerActionView;
@@ -248,8 +255,7 @@ 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);
-    chipGroup                = view.findViewById(R.id.chipGroup);
-    chipGroupScrollContainer = view.findViewById(R.id.chipGroupScrollContainer);
+    chipRecycler             = view.findViewById(R.id.chipRecycler);
     constraintLayout         = view.findViewById(R.id.container);
     headerActionView         = view.findViewById(R.id.header_action);
 
@@ -263,6 +269,18 @@ 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();
 
@@ -385,7 +403,8 @@ public final class ContactSelectionListFragment extends LoggingFragment
                                                                 null,
                                                                 new ListClickListener(),
                                                                 isMulti,
-                                                                currentSelection);
+                                                                currentSelection,
+                                                                safeArguments().getInt(ContactSelectionArguments.CHECKBOX_RESOURCE, R.drawable.contact_selection_checkbox));
 
     RecyclerViewConcatenateAdapterStickyHeader concatenateAdapter = new RecyclerViewConcatenateAdapterStickyHeader();
 
@@ -728,75 +747,22 @@ public final class ContactSelectionListFragment extends LoggingFragment
   private void markContactUnselected(@NonNull SelectedContact selectedContact) {
     cursorRecyclerViewAdapter.removeFromSelectedContacts(selectedContact);
     cursorRecyclerViewAdapter.notifyItemRangeChanged(0, cursorRecyclerViewAdapter.getItemCount(), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
-    removeChipForContact(selectedContact);
+    contactChipViewModel.remove(selectedContact);
 
     if (onContactSelectedListener != null) {
       onContactSelectedListener.onSelectionChanged();
     }
   }
 
-  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);
-      }
-    }
+  private void handleSelectedContactsChanged(@NonNull List<SelectedContacts.Model> selectedContacts) {
+    contactChipAdapter.submitList(new MappingModelList(selectedContacts), this::smoothScrollChipsToEnd);
 
-    if (getChipCount() == 0) {
+    if (selectedContacts.isEmpty()) {
       setChipGroupVisibility(ConstraintSet.GONE);
-    }
-  }
-
-  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) {
+    } else {
       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());
@@ -806,21 +772,25 @@ public final class ContactSelectionListFragment extends LoggingFragment
     }
   }
 
-  private int getChipCount() {
-    int count = chipGroup.getChildCount() - CHIP_GROUP_EMPTY_CHILD_COUNT;
-    if (count < 0) throw new AssertionError();
-    return count;
+  private void addChipForSelectedContact(@NonNull SelectedContact selectedContact) {
+    SimpleTask.run(getViewLifecycleOwner().getLifecycle(),
+                   () -> Recipient.resolved(selectedContact.getOrCreateRecipientId(requireContext())),
+                   resolved -> contactChipViewModel.add(selectedContact));
   }
 
-  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 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;
+    if (count < 0) throw new AssertionError();
+    return count;
   }
 
   private void setChipGroupVisibility(int visibility) {
@@ -836,7 +806,7 @@ public final class ContactSelectionListFragment extends LoggingFragment
 
     ConstraintSet constraintSet = new ConstraintSet();
     constraintSet.clone(constraintLayout);
-    constraintSet.setVisibility(R.id.chipGroupScrollContainer, visibility);
+    constraintSet.setVisibility(R.id.chipRecycler, visibility);
     constraintSet.applyTo(constraintLayout);
   }
 
@@ -845,8 +815,8 @@ public final class ContactSelectionListFragment extends LoggingFragment
   }
 
   private void smoothScrollChipsToEnd() {
-    int x = ViewUtil.isLtr(chipGroupScrollContainer) ? chipGroup.getWidth() : 0;
-    chipGroupScrollContainer.smoothScrollTo(x, 0);
+    int x = ViewUtil.isLtr(chipRecycler) ? chipRecycler.getWidth() : 0;
+    chipRecycler.smoothScrollBy(x, 0);
   }
 
   public interface OnContactSelectedListener {

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

@@ -57,7 +57,7 @@ public class DeviceAddFragment extends LoggingFragment {
       });
     }
 
-    scannerView.start(getViewLifecycleOwner(), FeatureFlags.useQrLegacyScan());
+    scannerView.start(getViewLifecycleOwner());
 
     lifecycleDisposable.bindTo(getViewLifecycleOwner());
 

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(getWindow(), ContextCompat.getColor(this, R.color.signal_colorSurface2));
+      WindowUtil.setNavigationBarColor(this, ContextCompat.getColor(this, R.color.signal_colorSurface2));
     } else {
       findViewById(R.id.conversation_list_tabs).setVisibility(View.GONE);
-      WindowUtil.setNavigationBarColor(getWindow(), ContextCompat.getColor(this, R.color.signal_colorBackground));
+      WindowUtil.setNavigationBarColor(this, ContextCompat.getColor(this, R.color.signal_colorBackground));
       conversationListTabsViewModel.onChatsSelected();
     }
   }

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

@@ -51,6 +51,8 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager.widget.ViewPager;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.animation.DepthPageTransformer;
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
@@ -397,6 +399,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
     if (mediaItem != null) {
       MultiselectForwardFragmentArgs.create(
           this,
+          threadId,
           mediaItem.uri,
           mediaItem.type,
           args -> MultiselectForwardFragment.showBottomSheet(getSupportFragmentManager(), args)
@@ -463,7 +466,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
       return;
     }
 
-    AlertDialog.Builder builder = new AlertDialog.Builder(this);
+    AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
     builder.setIcon(R.drawable.ic_warning);
     builder.setTitle(R.string.MediaPreviewActivity_media_delete_confirmation_title);
     builder.setMessage(R.string.MediaPreviewActivity_media_delete_confirmation_message);

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

@@ -62,6 +62,7 @@ import org.thoughtcrime.securesms.components.webrtc.WebRtcAudioOutput;
 import org.thoughtcrime.securesms.components.webrtc.WebRtcCallView;
 import org.thoughtcrime.securesms.components.webrtc.WebRtcCallViewModel;
 import org.thoughtcrime.securesms.components.webrtc.WebRtcControls;
+import org.thoughtcrime.securesms.components.webrtc.WifiToCellularPopupWindow;
 import org.thoughtcrime.securesms.components.webrtc.participantslist.CallParticipantsListDialog;
 import org.thoughtcrime.securesms.conversation.ui.error.SafetyNumberChangeDialog;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
@@ -70,6 +71,7 @@ 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;
@@ -107,6 +109,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
   public static final String EXTRA_ENABLE_VIDEO_IF_AVAILABLE = WebRtcCallActivity.class.getCanonicalName() + ".ENABLE_VIDEO_IF_AVAILABLE";
 
   private CallParticipantsListUpdatePopupWindow participantUpdateWindow;
+  private WifiToCellularPopupWindow             wifiToCellularPopupWindow;
   private DeviceOrientationMonitor              deviceOrientationMonitor;
 
   private FullscreenHelper              fullscreenHelper;
@@ -298,7 +301,8 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
     callScreen = findViewById(R.id.callScreen);
     callScreen.setControlsListener(new ControlsListener());
 
-    participantUpdateWindow = new CallParticipantsListUpdatePopupWindow(callScreen);
+    participantUpdateWindow   = new CallParticipantsListUpdatePopupWindow(callScreen);
+    wifiToCellularPopupWindow = new WifiToCellularPopupWindow(callScreen);
   }
 
   private void initializeViewModel(boolean isLandscapeEnabled) {
@@ -344,7 +348,8 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
       startCall(((WebRtcCallViewModel.Event.StartCall) event).isVideoCall());
       return;
     } else if (event instanceof WebRtcCallViewModel.Event.ShowGroupCallSafetyNumberChange) {
-      SafetyNumberChangeDialog.showForGroupCall(getSupportFragmentManager(), ((WebRtcCallViewModel.Event.ShowGroupCallSafetyNumberChange) event).getIdentityRecords());
+      SafetyNumberBottomSheet.forGroupCall(((WebRtcCallViewModel.Event.ShowGroupCallSafetyNumberChange) event).getIdentityRecords())
+                             .show(getSupportFragmentManager());
       return;
     } else if (event instanceof WebRtcCallViewModel.Event.SwitchToSpeaker) {
       callScreen.switchToSpeakerView();
@@ -373,6 +378,8 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
         videoTooltip.dismiss();
         videoTooltip = null;
       }
+    } else if (event instanceof WebRtcCallViewModel.Event.ShowWifiToCellularPopup) {
+      wifiToCellularPopupWindow.show();
     } else {
       throw new IllegalArgumentException("Unknown event: " + event);
     }
@@ -557,11 +564,10 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
     final Recipient   recipient = event.getRemoteParticipants().get(0).getRecipient();
 
     if (theirKey == null) {
-      Log.w(TAG, "Untrusted identity without an identity key, terminating call.");
-      handleTerminate(recipient, HangupMessage.Type.NORMAL);
+      Log.w(TAG, "Untrusted identity without an identity key.");
     }
 
-    SafetyNumberChangeDialog.showForCall(getSupportFragmentManager(), recipient.getId());
+    SafetyNumberBottomSheet.forCall(recipient.getId()).show(getSupportFragmentManager());
   }
 
   public void handleSafetyNumberChangeEvent(@NonNull WebRtcCallViewModel.SafetyNumberChangeEvent safetyNumberChangeEvent) {
@@ -570,7 +576,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
         GroupCallSafetyNumberChangeNotificationUtil.showNotification(this, viewModel.getRecipient().get());
       } else {
         GroupCallSafetyNumberChangeNotificationUtil.cancelNotification(this, viewModel.getRecipient().get());
-        SafetyNumberChangeDialog.showForDuringGroupCall(getSupportFragmentManager(), safetyNumberChangeEvent.getRecipientIds());
+        SafetyNumberBottomSheet.forDuringGroupCall(safetyNumberChangeEvent.getRecipientIds()).show(getSupportFragmentManager());
       }
     }
   }

app/src/main/java/org/thoughtcrime/securesms/avatar/photo/PhotoEditorFragment.kt

@@ -61,6 +61,9 @@ class PhotoEditorFragment : Fragment(R.layout.avatar_photo_editor_fragment), Ima
     Navigation.findNavController(requireView()).popBackStack()
   }
 
+  override fun restoreState() {
+  }
+
   override fun onMainImageLoaded() {
   }
 

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(applicationContext, groupId)
+    val recipient = Recipient.externalGroupExact(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(applicationContext, groupId)
+    val recipient = Recipient.externalGroupExact(groupId)
 
     return getDefaultAvatarForGroup(recipient.avatarColor)
   }

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

@@ -17,7 +17,10 @@ import net.zetetic.database.sqlcipher.SQLiteDatabase;
 
 import org.greenrobot.eventbus.EventBus;
 import org.signal.core.util.Conversions;
+import org.signal.core.util.CursorUtil;
+import org.signal.core.util.SetUtil;
 import org.signal.core.util.logging.Log;
+import org.signal.libsignal.protocol.kdf.HKDF;
 import org.signal.libsignal.protocol.kdf.HKDFv3;
 import org.signal.libsignal.protocol.util.ByteUtil;
 import org.thoughtcrime.securesms.attachments.AttachmentId;
@@ -47,9 +50,6 @@ import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.keyvalue.KeyValueDataSet;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
-import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.signal.core.util.CursorUtil;
-import org.signal.core.util.SetUtil;
 import org.thoughtcrime.securesms.util.Stopwatch;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
@@ -162,17 +162,17 @@ public class FullBackupExporter extends FullBackupBase {
       for (String table : tables) {
         throwIfCanceled(cancellationSignal);
         if (table.equals(MmsDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isNonExpiringMmsMessage(cursor) && isNotReleaseChannel(cursor), null, count, estimatedCount, cancellationSignal);
+          count = exportTable(table, input, outputStream, FullBackupExporter::isNonExpiringMmsMessage, null, count, estimatedCount, cancellationSignal);
         } else if (table.equals(SmsDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isNonExpiringSmsMessage(cursor) && isNotReleaseChannel(cursor), null, count, estimatedCount, cancellationSignal);
+          count = exportTable(table, input, outputStream, FullBackupExporter::isNonExpiringSmsMessage, null, count, estimatedCount, cancellationSignal);
         } else if (table.equals(ReactionDatabase.TABLE_NAME)) {
           count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, new MessageId(CursorUtil.requireLong(cursor, ReactionDatabase.MESSAGE_ID), CursorUtil.requireBoolean(cursor, ReactionDatabase.IS_MMS))), null, count, estimatedCount, cancellationSignal);
         } else if (table.equals(MentionDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMmsMessageAndNotReleaseChannel(input, CursorUtil.requireLong(cursor, MentionDatabase.MESSAGE_ID)), null, count, estimatedCount, cancellationSignal);
+          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMmsMessage(input, CursorUtil.requireLong(cursor, MentionDatabase.MESSAGE_ID)), null, count, estimatedCount, cancellationSignal);
         } else if (table.equals(GroupReceiptDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMmsMessageAndNotReleaseChannel(input, cursor.getLong(cursor.getColumnIndexOrThrow(GroupReceiptDatabase.MMS_ID))), null, count, estimatedCount, cancellationSignal);
+          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMmsMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(GroupReceiptDatabase.MMS_ID))), null, count, estimatedCount, cancellationSignal);
         } else if (table.equals(AttachmentDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMmsMessageAndNotReleaseChannel(input, cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.MMS_ID))), (cursor, innerCount) -> exportAttachment(attachmentSecret, cursor, outputStream, innerCount, estimatedCount), count, estimatedCount, cancellationSignal);
+          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMmsMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.MMS_ID))), (cursor, innerCount) -> exportAttachment(attachmentSecret, cursor, outputStream, innerCount, estimatedCount), count, estimatedCount, cancellationSignal);
         } else if (table.equals(StickerDatabase.TABLE_NAME)) {
           count = exportTable(table, input, outputStream, cursor -> true, (cursor, innerCount) -> exportSticker(attachmentSecret, cursor, outputStream, innerCount, estimatedCount), count, estimatedCount, cancellationSignal);
         } else if (!BLACKLISTED_TABLES.contains(table) && !table.startsWith("sqlite_")) {
@@ -488,7 +488,7 @@ public class FullBackupExporter extends FullBackupBase {
 
   private static boolean isForNonExpiringMessage(@NonNull SQLiteDatabase db, @NonNull MessageId messageId) {
     if (messageId.isMms()) {
-      return isForNonExpiringMmsMessageAndNotReleaseChannel(db, messageId.getId());
+      return isForNonExpiringMmsMessage(db, messageId.getId());
     } else {
       return isForNonExpiringSmsMessage(db, messageId.getId());
     }
@@ -508,25 +508,20 @@ public class FullBackupExporter extends FullBackupBase {
     return false;
   }
 
-  private static boolean isForNonExpiringMmsMessageAndNotReleaseChannel(@NonNull SQLiteDatabase db, long mmsId) {
+  private static boolean isForNonExpiringMmsMessage(@NonNull SQLiteDatabase db, long mmsId) {
     String[] columns = new String[] { MmsDatabase.RECIPIENT_ID, MmsDatabase.EXPIRES_IN, MmsDatabase.VIEW_ONCE};
     String   where   = MmsDatabase.ID + " = ?";
     String[] args    = new String[] { String.valueOf(mmsId) };
 
     try (Cursor mmsCursor = db.query(MmsDatabase.TABLE_NAME, columns, where, args, null, null, null)) {
       if (mmsCursor != null && mmsCursor.moveToFirst()) {
-        return isNonExpiringMmsMessage(mmsCursor) && isNotReleaseChannel(mmsCursor);
+        return isNonExpiringMmsMessage(mmsCursor);
       }
     }
 
     return false;
   }
 
-  private static boolean isNotReleaseChannel(Cursor cursor) {
-    RecipientId releaseChannel = SignalStore.releaseChannelValues().getReleaseChannelRecipientId();
-    return releaseChannel == null || cursor.getLong(cursor.getColumnIndexOrThrow(MmsDatabase.RECIPIENT_ID)) != releaseChannel.toLong();
-  }
-
   private static class BackupFrameOutputStream extends BackupStream {
 
     private final OutputStream outputStream;

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

@@ -25,4 +25,31 @@ interface OpenableGift {
    * Clears any callback created to start the open animation
    */
   fun clearOpenGiftCallback()
+
+  /**
+   * Gets the appropriate sign for the animation evaluators:
+   *
+   * - Incoming and LTR -> Positive
+   * - Incoming and RTL -> Negative
+   * - Outgoing and LTR -> Negative
+   * - Outgoing and RTL -> Positive
+   */
+  fun getAnimationSign(): AnimationSign
+
+  enum class AnimationSign(val sign: Float) {
+    POSITIVE(1f),
+    NEGATIVE(-1f);
+
+    companion object {
+      @JvmStatic
+      fun get(isLtr: Boolean, isOutgoing: Boolean): AnimationSign {
+        return when {
+          isLtr && isOutgoing -> NEGATIVE
+          isLtr -> POSITIVE
+          isOutgoing -> POSITIVE
+          else -> NEGATIVE
+        }
+      }
+    }
+  }
 }

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

@@ -5,6 +5,7 @@ import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.Paint
+import android.graphics.Path
 import android.graphics.RectF
 import android.graphics.drawable.Drawable
 import android.provider.Settings
@@ -13,8 +14,10 @@ import android.view.animation.AnticipateInterpolator
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.toRect
+import androidx.core.graphics.withRotation
 import androidx.core.graphics.withSave
 import androidx.core.graphics.withTranslation
+import androidx.core.view.animation.PathInterpolatorCompat
 import androidx.core.view.children
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
@@ -53,6 +56,10 @@ class OpenableGiftItemDecoration(context: Context) : RecyclerView.ItemDecoration
   private val bowHeight = DimensionUnit.DP.toPixels(60f)
   private val bowDrawable: Drawable = AppCompatResources.getDrawable(context, R.drawable.ic_gift_bow)!!
 
+  fun hasOpenedGiftThisSession(messageRecordId: Long): Boolean {
+    return messageIdsOpenedThisSession.contains(messageRecordId)
+  }
+
   override fun onDestroy(owner: LifecycleOwner) {
     super.onDestroy(owner)
     animationState.clear()
@@ -187,7 +194,7 @@ class OpenableGiftItemDecoration(context: Context) : RecyclerView.ItemDecoration
       }
 
       private fun getTranslation(progress: Float): Double {
-        val interpolated = INTERPOLATOR.getInterpolation(progress)
+        val interpolated = TRANSLATION_X_INTERPOLATOR.getInterpolation(progress)
         val evaluated = EVALUATOR.evaluate(interpolated, 0f, 360f)
 
         return 0.25f * sin(4 * evaluated * PI / 180f) * 180f / PI
@@ -195,17 +202,60 @@ class OpenableGiftItemDecoration(context: Context) : RecyclerView.ItemDecoration
     }
 
     class OpenAnimationState(openableGift: OpenableGift, startTime: Long) : GiftAnimationState(openableGift, startTime, OPEN_DURATION_MILLIS) {
-      override fun update(canvas: Canvas, projection: Projection, progress: Float, lastFrameProgress: Float, drawBox: (Canvas, Projection) -> Unit, drawBow: (Canvas, Projection) -> Unit) {
-        val interpolatedProgress = INTERPOLATOR.getInterpolation(progress)
-        val evaluatedValue = EVALUATOR.evaluate(interpolatedProgress, 0f, DimensionUnit.DP.toPixels(161f))
 
-        val interpolatedY = TRANSLATION_Y_INTERPOLATOR.getInterpolation(progress)
+      private val bowRotationPath = Path().apply {
+        lineTo(0.13f, -0.75f)
+        lineTo(0.26f, 0f)
+        lineTo(0.73f, -1.375f)
+        lineTo(1f, 1f)
+      }
+
+      private val boxRotationPath = Path().apply {
+        lineTo(0.63f, -1.6f)
+        lineTo(1f, 1f)
+      }
+
+      private val bowRotationInterpolator = PathInterpolatorCompat.create(bowRotationPath)
+
+      private val boxRotationInterpolator = PathInterpolatorCompat.create(boxRotationPath)
+
+      override fun update(canvas: Canvas, projection: Projection, progress: Float, lastFrameProgress: Float, drawBox: (Canvas, Projection) -> Unit, drawBow: (Canvas, Projection) -> Unit) {
+        val sign = openableGift.getAnimationSign().sign
+
+        val boxStartDelay: Float = OPEN_BOX_START_DELAY / duration.toFloat()
+        val boxProgress: Float = max(0f, progress - boxStartDelay) / (1f - boxStartDelay)
+
+        val bowStartDelay: Float = OPEN_BOW_START_DELAY / duration.toFloat()
+        val bowProgress: Float = max(0f, progress - bowStartDelay) / (1f - bowStartDelay)
+
+        val interpolatedX = TRANSLATION_X_INTERPOLATOR.getInterpolation(boxProgress)
+        val evaluatedX = EVALUATOR.evaluate(interpolatedX, 0f, DimensionUnit.DP.toPixels(18f * sign))
+
+        val interpolatedY = TRANSLATION_Y_INTERPOLATOR.getInterpolation(boxProgress)
         val evaluatedY = EVALUATOR.evaluate(interpolatedY, 0f, DimensionUnit.DP.toPixels(355f))
 
-        canvas.translate(evaluatedValue, evaluatedY)
+        val interpolatedBowRotation = bowRotationInterpolator.getInterpolation(bowProgress)
+        val evaluatedBowRotation = EVALUATOR.evaluate(interpolatedBowRotation, 0f, 8f * sign)
 
-        drawBox(canvas, projection)
-        drawBow(canvas, projection)
+        val interpolatedBoxRotation = boxRotationInterpolator.getInterpolation(boxProgress)
+        val evaluatedBoxRotation = EVALUATOR.evaluate(interpolatedBoxRotation, 0f, -5f * sign)
+
+        canvas.withTranslation(evaluatedX, evaluatedY) {
+          canvas.withRotation(
+            degrees = evaluatedBoxRotation,
+            pivotX = projection.x + projection.width / 2f,
+            pivotY = projection.y + projection.height / 2f
+          ) {
+            drawBox(this, projection)
+            canvas.withRotation(
+              degrees = evaluatedBowRotation,
+              pivotX = projection.x + projection.width / 2f,
+              pivotY = projection.y + projection.height / 2f
+            ) {
+              drawBow(this, projection)
+            }
+          }
+        }
       }
     }
 
@@ -245,11 +295,13 @@ class OpenableGiftItemDecoration(context: Context) : RecyclerView.ItemDecoration
 
   companion object {
     private val TRANSLATION_Y_INTERPOLATOR = AnticipateInterpolator(3f)
-    private val INTERPOLATOR = AccelerateDecelerateInterpolator()
+    private val TRANSLATION_X_INTERPOLATOR = AccelerateDecelerateInterpolator()
     private val EVALUATOR = FloatEvaluator()
 
     private const val SHAKE_DURATION_MILLIS = 1000L
-    private const val OPEN_DURATION_MILLIS = 700L
+    private const val OPEN_DURATION_MILLIS = 1400L
+    private const val OPEN_BOX_START_DELAY = 400L
+    private const val OPEN_BOW_START_DELAY = 50L
     private const val ONE_FRAME_RELATIVE_TO_30_FPS_MILLIS = 33
   }
 }

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

@@ -18,8 +18,11 @@ import java.util.Locale
 class GiftFlowRepository {
 
   fun getGiftBadge(): Single<Pair<Long, Badge>> {
-    return ApplicationDependencies.getDonationsService()
-      .getGiftBadges(Locale.getDefault())
+    return Single
+      .fromCallable {
+        ApplicationDependencies.getDonationsService()
+          .getGiftBadges(Locale.getDefault())
+      }
       .flatMap(ServiceResponse<Map<Long, SignalServiceProfile.Badge>>::flattenResult)
       .map { gifts -> gifts.map { it.key to Badges.fromServiceBadge(it.value) } }
       .map { it.first() }
@@ -27,8 +30,11 @@ class GiftFlowRepository {
   }
 
   fun getGiftPricing(): Single<Map<Currency, FiatMoney>> {
-    return ApplicationDependencies.getDonationsService()
-      .giftAmount
+    return Single
+      .fromCallable {
+        ApplicationDependencies.getDonationsService()
+          .giftAmount
+      }
       .subscribeOn(Schedulers.io())
       .flatMap { it.flattenResult() }
       .map { result ->

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

@@ -19,9 +19,12 @@ import java.util.Locale
 class ViewGiftRepository {
   fun getBadge(giftBadge: GiftBadge): Single<Badge> {
     val presentation = ReceiptCredentialPresentation(giftBadge.redemptionToken.toByteArray())
-    return ApplicationDependencies
-      .getDonationsService()
-      .getGiftBadge(Locale.getDefault(), presentation.receiptLevel)
+    return Single
+      .fromCallable {
+        ApplicationDependencies
+          .getDonationsService()
+          .getGiftBadge(Locale.getDefault(), presentation.receiptLevel)
+      }
       .flatMap { it.flattenResult() }
       .map { Badges.fromServiceBadge(it) }
       .subscribeOn(Schedulers.io())

app/src/main/java/org/thoughtcrime/securesms/badges/glide/BadgeSpriteTransformation.kt

@@ -5,6 +5,7 @@ import android.graphics.Canvas
 import android.graphics.Rect
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool
 import com.bumptech.glide.load.resource.bitmap.BitmapTransformation
+import org.signal.core.util.logging.Log
 import java.security.MessageDigest
 
 /**
@@ -15,7 +16,6 @@ class BadgeSpriteTransformation(
   private val density: String,
   private val isDarkTheme: Boolean
 ) : BitmapTransformation() {
-
   private val id = "BadgeSpriteTransformation(${size.code},$density,$isDarkTheme).$VERSION"
 
   override fun updateDiskCacheKey(messageDigest: MessageDigest) {
@@ -32,11 +32,29 @@ class BadgeSpriteTransformation(
 
   override fun transform(pool: BitmapPool, toTransform: Bitmap, outWidth: Int, outHeight: Int): Bitmap {
     val outBitmap = pool.get(outWidth, outHeight, Bitmap.Config.ARGB_8888)
-    val canvas = Canvas(outBitmap)
     val inBounds = getInBounds(density, size, isDarkTheme)
-    val outBounds = Rect(0, 0, outWidth, outHeight)
+    val outCanvas = Canvas(outBitmap)
 
-    canvas.drawBitmap(toTransform, inBounds, outBounds, null)
+    if (inBounds.width() != outWidth || inBounds.height() != outHeight) {
+      Log.d(TAG, "Bitmap size mismatch, performing filtered scale. (Wanted $outWidth x $outHeight but got ${inBounds.width()} x ${inBounds.height()})")
+
+      val tempBitmap = pool.get(inBounds.width(), inBounds.height(), Bitmap.Config.ARGB_8888)
+      val tempCanvas = Canvas(tempBitmap)
+
+      val tempBounds = Rect(0, 0, inBounds.width(), inBounds.height())
+
+      tempCanvas.drawBitmap(toTransform, inBounds, tempBounds, null)
+      val scaledBitmap = Bitmap.createScaledBitmap(tempBitmap, outWidth, outHeight, true)
+      pool.put(tempBitmap)
+
+      outCanvas.drawBitmap(scaledBitmap, 0f, 0f, null)
+      scaledBitmap.recycle()
+    } else {
+      Log.d(TAG, "Bitmap size match, performing direct draw. ($outWidth x $outHeight)")
+
+      val outBounds = Rect(0, 0, outWidth, outHeight)
+      outCanvas.drawBitmap(toTransform, inBounds, outBounds, null)
+    }
 
     return outBitmap
   }
@@ -149,6 +167,8 @@ class BadgeSpriteTransformation(
   companion object {
     private const val VERSION = 3
 
+    private val TAG = Log.tag(BadgeSpriteTransformation::class.java)
+
     private fun getDensity(density: String): Density {
       return Density.values().first { it.density == density }
     }

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

@@ -87,6 +87,8 @@ 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

@@ -160,8 +160,7 @@ public final class AvatarImageView extends AppCompatImageView {
   private void setAvatar(@NonNull GlideRequests requestManager, @Nullable Recipient recipient, @NonNull AvatarOptions avatarOptions) {
     if (recipient != null) {
       RecipientContactPhoto photo = (recipient.isSelf() && avatarOptions.useSelfProfileAvatar) ? new RecipientContactPhoto(recipient,
-                                                                                                                           new ProfileContactPhoto(Recipient.self(),
-                                                                                                                                                   Recipient.self().getProfileAvatar()))
+                                                                                                                           new ProfileContactPhoto(Recipient.self()))
                                                                                                : new RecipientContactPhoto(recipient);
 
       boolean    shouldBlur = recipient.shouldBlurAvatar();

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

@@ -0,0 +1,35 @@
+package org.thoughtcrime.securesms.components
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Path
+import android.graphics.Rect
+import android.graphics.RectF
+import android.util.AttributeSet
+import androidx.cardview.widget.CardView
+import androidx.core.graphics.withClip
+
+/**
+ * Adds manual clipping around the card. This ensures that software rendering
+ * still maintains border radius of cards.
+ */
+class ClippedCardView @JvmOverloads constructor(
+  context: Context,
+  attrs: AttributeSet? = null
+) : CardView(context, attrs) {
+
+  private val bounds = Rect()
+  private val boundsF = RectF()
+  private val path = Path()
+
+  override fun draw(canvas: Canvas) {
+    canvas.getClipBounds(bounds)
+    boundsF.set(bounds)
+    path.reset()
+
+    path.addRoundRect(boundsF, radius, radius, Path.Direction.CW)
+    canvas.withClip(path) {
+      super.draw(canvas)
+    }
+  }
+}

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

@@ -26,6 +26,7 @@ import androidx.core.view.inputmethod.EditorInfoCompat;
 import androidx.core.view.inputmethod.InputConnectionCompat;
 import androidx.core.view.inputmethod.InputContentInfoCompat;
 
+import org.signal.core.util.StringUtil;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiEditText;
@@ -34,19 +35,25 @@ 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.conversation.ui.inlinequery.InlineQuery;
+import org.thoughtcrime.securesms.conversation.ui.inlinequery.InlineQueryChangedListener;
+import org.thoughtcrime.securesms.conversation.ui.inlinequery.InlineQueryReplacement;
 import org.thoughtcrime.securesms.database.model.Mention;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.signal.core.util.StringUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 import java.util.List;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 
 import static org.thoughtcrime.securesms.database.MentionUtil.MENTION_STARTER;
 
 public class ComposeText extends EmojiEditText {
 
+  private static final char EMOJI_STARTER       = ':';
+  private static final long EMOJI_KEYWORD_DELAY = 1500;
+
   private CharSequence            hint;
   private SpannableString         subHint;
   private MentionRendererDelegate mentionRendererDelegate;
@@ -54,7 +61,14 @@ public class ComposeText extends EmojiEditText {
 
   @Nullable private InputPanel.MediaListener      mediaListener;
   @Nullable private CursorPositionChangedListener cursorPositionChangedListener;
-  @Nullable private MentionQueryChangedListener   mentionQueryChangedListener;
+  @Nullable private InlineQueryChangedListener    inlineQueryChangedListener;
+
+  private final Runnable keywordSearchRunnable = () -> {
+    Editable text = getText();
+    if (text != null && enoughToFilter(text, true)) {
+      performFiltering(text, true);
+    }
+  };
 
   public ComposeText(Context context) {
     super(context);
@@ -111,7 +125,7 @@ public class ComposeText extends EmojiEditText {
       if (selectionStart == selectionEnd) {
         doAfterCursorChange(getText());
       } else {
-        updateQuery(null);
+        clearInlineQuery();
       }
     }
 
@@ -189,8 +203,8 @@ public class ComposeText extends EmojiEditText {
     this.cursorPositionChangedListener = listener;
   }
 
-  public void setMentionQueryChangedListener(@Nullable MentionQueryChangedListener listener) {
-    this.mentionQueryChangedListener = listener;
+  public void setInlineQueryChangedListener(@Nullable InlineQueryChangedListener listener) {
+    this.inlineQueryChangedListener = listener;
   }
 
   public void setMentionValidator(@Nullable MentionValidatorWatcher.MentionValidator mentionValidator) {
@@ -226,15 +240,23 @@ public class ComposeText extends EmojiEditText {
   public InputConnection onCreateInputConnection(EditorInfo editorInfo) {
     InputConnection inputConnection = super.onCreateInputConnection(editorInfo);
 
-    if(SignalStore.settings().isEnterKeySends()) {
+    if (SignalStore.settings().isEnterKeySends()) {
       editorInfo.imeOptions &= ~EditorInfo.IME_FLAG_NO_ENTER_ACTION;
     }
 
-    if (Build.VERSION.SDK_INT < 21) return inputConnection;
-    if (mediaListener == null)      return inputConnection;
-    if (inputConnection == null)    return null;
+    if (Build.VERSION.SDK_INT < 21) {
+      return inputConnection;
+    }
 
-    EditorInfoCompat.setContentMimeTypes(editorInfo, new String[] {"image/jpeg", "image/png", "image/gif"});
+    if (mediaListener == null) {
+      return inputConnection;
+    }
+
+    if (inputConnection == null) {
+      return null;
+    }
+
+    EditorInfoCompat.setContentMimeTypes(editorInfo, new String[] { "image/jpeg", "image/png", "image/gif" });
     return InputConnectionCompat.createWrapper(inputConnection, editorInfo, new CommitContentListener(mediaListener));
   }
 
@@ -300,35 +322,51 @@ public class ComposeText extends EmojiEditText {
   }
 
   private void doAfterCursorChange(@NonNull Editable text) {
-    if (enoughToFilter(text)) {
-      performFiltering(text);
+    if (enoughToFilter(text, false)) {
+      performFiltering(text, false);
     } else {
-      updateQuery(null);
+      clearInlineQuery();
     }
   }
 
-  private void performFiltering(@NonNull Editable text) {
-    int          end   = getSelectionEnd();
-    int          start = findQueryStart(text, end);
-    CharSequence query = text.subSequence(start, end);
-    updateQuery(query.toString());
-  }
+  private void performFiltering(@NonNull Editable text, boolean keywordEmojiSearch) {
+    int        end        = getSelectionEnd();
+    QueryStart queryStart = findQueryStart(text, end, keywordEmojiSearch);
+    int        start      = queryStart.index;
+    String     query      = text.subSequence(start, end).toString();
 
-  private void updateQuery(@Nullable String query) {
-    if (mentionQueryChangedListener != null) {
-      mentionQueryChangedListener.onQueryChanged(query);
+    if (inlineQueryChangedListener != null) {
+      if (queryStart.isMentionQuery) {
+        inlineQueryChangedListener.onQueryChanged(new InlineQuery.Mention(query));
+      } else {
+        inlineQueryChangedListener.onQueryChanged(new InlineQuery.Emoji(query, keywordEmojiSearch));
+      }
     }
   }
 
-  private boolean enoughToFilter(@NonNull Editable text) {
+  private void clearInlineQuery() {
+    if (inlineQueryChangedListener != null) {
+      inlineQueryChangedListener.clearQuery();
+    }
+  }
+
+  private boolean enoughToFilter(@NonNull Editable text, boolean keywordEmojiSearch) {
     int end = getSelectionEnd();
     if (end < 0) {
       return false;
     }
-    return findQueryStart(text, end) != -1;
+    return findQueryStart(text, end, keywordEmojiSearch).index != -1;
   }
 
   public void replaceTextWithMention(@NonNull String displayName, @NonNull RecipientId recipientId) {
+    replaceText(createReplacementToken(displayName, recipientId), false);
+  }
+
+  public void replaceText(@NonNull InlineQueryReplacement replacement) {
+    replaceText(replacement.toCharSequence(getContext()), replacement.isKeywordSearch());
+  }
+
+  private void replaceText(@NonNull CharSequence replacement, boolean keywordReplacement) {
     Editable text = getText();
     if (text == null) {
       return;
@@ -336,10 +374,11 @@ public class ComposeText extends EmojiEditText {
 
     clearComposingText();
 
-    int    end      = getSelectionEnd();
-    int    start    = findQueryStart(text, end) - 1;
+    int end   = getSelectionEnd();
+    int start = findQueryStart(text, end, keywordReplacement).index - (keywordReplacement ? 0 : 1);
 
-    text.replace(start, end, createReplacementToken(displayName, recipientId));
+    text.replace(start, end, "");
+    text.insert(start, replacement);
   }
 
   private @NonNull CharSequence createReplacementToken(@NonNull CharSequence text, @NonNull RecipientId recipientId) {
@@ -357,17 +396,37 @@ public class ComposeText extends EmojiEditText {
     return builder;
   }
 
-  private int findQueryStart(@NonNull CharSequence text, int inputCursorPosition) {
+  private QueryStart findQueryStart(@NonNull CharSequence text, int inputCursorPosition, boolean keywordEmojiSearch) {
+    if (keywordEmojiSearch) {
+      int start = findQueryStart(text, inputCursorPosition, ' ');
+      if (start == -1 && inputCursorPosition != 0) {
+        start = 0;
+      } else if (start == inputCursorPosition) {
+        start = -1;
+      }
+      return new QueryStart(start, false);
+    }
+
+    QueryStart queryStart = new QueryStart(findQueryStart(text, inputCursorPosition, MENTION_STARTER), true);
+
+    if (queryStart.index < 0) {
+      queryStart = new QueryStart(findQueryStart(text, inputCursorPosition, EMOJI_STARTER), false);
+    }
+
+    return queryStart;
+  }
+
+  private int findQueryStart(@NonNull CharSequence text, int inputCursorPosition, char starter) {
     if (inputCursorPosition == 0) {
       return -1;
     }
 
     int delimiterSearchIndex = inputCursorPosition - 1;
-    while (delimiterSearchIndex >= 0 && (text.charAt(delimiterSearchIndex) != MENTION_STARTER && text.charAt(delimiterSearchIndex) != ' ')) {
+    while (delimiterSearchIndex >= 0 && (text.charAt(delimiterSearchIndex) != starter && text.charAt(delimiterSearchIndex) != ' ')) {
       delimiterSearchIndex--;
     }
 
-    if (delimiterSearchIndex >= 0 && text.charAt(delimiterSearchIndex) == MENTION_STARTER) {
+    if (delimiterSearchIndex >= 0 && text.charAt(delimiterSearchIndex) == starter) {
       return delimiterSearchIndex + 1;
     }
     return -1;
@@ -405,11 +464,18 @@ public class ComposeText extends EmojiEditText {
     }
   }
 
+  private static class QueryStart {
+    public int     index;
+    public boolean isMentionQuery;
+
+    public QueryStart(int index, boolean isMentionQuery) {
+      this.index          = index;
+      this.isMentionQuery = isMentionQuery;
+    }
+  }
+
   public interface CursorPositionChangedListener {
     void onCursorPositionChanged(int start, int end);
   }
 
-  public interface MentionQueryChangedListener {
-    void onQueryChanged(@Nullable String query);
-  }
 }

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

@@ -10,6 +10,7 @@ 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 org.thoughtcrime.securesms.R;
@@ -35,6 +36,7 @@ public class ConversationItemThumbnail extends FrameLayout {
   private int[]                  normalBounds;
   private int[]                  gifBounds;
   private int                    minimumThumbnailWidth;
+  private int                    maximumThumbnailHeight;
 
   public ConversationItemThumbnail(Context context) {
     super(context);
@@ -83,7 +85,8 @@ public class ConversationItemThumbnail extends FrameLayout {
         Integer.MAX_VALUE
     };
 
-    minimumThumbnailWidth = -1;
+    minimumThumbnailWidth  = -1;
+    maximumThumbnailHeight = -1;
   }
 
   @SuppressWarnings("SuspiciousNameCombination")
@@ -143,11 +146,16 @@ public class ConversationItemThumbnail extends FrameLayout {
     cornerMask.setRadii(topLeft, topRight, bottomRight, bottomLeft);
   }
 
-  public void setMinimumThumbnailWidth(int width) {
+  public void setMinimumThumbnailWidth(@Px 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;
   }
@@ -170,6 +178,10 @@ 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/FixedRoundedCornerBottomSheetDialogFragment.kt

@@ -1,6 +1,7 @@
 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
@@ -31,6 +32,8 @@ 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)
@@ -46,11 +49,11 @@ abstract class FixedRoundedCornerBottomSheetDialogFragment : BottomSheetDialogFr
       .setTopRightCorner(CornerFamily.ROUNDED, ViewUtil.dpToPx(requireContext(), 18).toFloat())
       .build()
 
-    val dialogBackground = MaterialShapeDrawable(shapeAppearanceModel)
+    dialogBackground = MaterialShapeDrawable(shapeAppearanceModel)
 
     val bottomSheetStyle = ThemeUtil.getThemedResourceId(ContextThemeWrapper(requireContext(), themeResId), R.attr.bottomSheetStyle)
     backgroundColor = ThemeUtil.getThemedColor(ContextThemeWrapper(requireContext(), bottomSheetStyle), R.attr.backgroundTint)
-    dialogBackground.setTint(backgroundColor)
+    dialogBackground.fillColor = ColorStateList.valueOf(backgroundColor)
 
     dialog.behavior.addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() {
       override fun onStateChanged(bottomSheet: View, newState: Int) {

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

@@ -13,10 +13,11 @@ import org.thoughtcrime.securesms.util.DynamicTheme
 abstract class FragmentWrapperActivity : PassphraseRequiredActivity() {
 
   protected open val dynamicTheme: DynamicTheme = DynamicNoActionBarTheme()
+  protected open val contentViewId: Int = R.layout.fragment_container
 
   override fun onCreate(savedInstanceState: Bundle?, ready: Boolean) {
     super.onCreate(savedInstanceState, ready)
-    setContentView(R.layout.fragment_container)
+    setContentView(contentViewId)
     dynamicTheme.onCreate(this)
 
     if (savedInstanceState == null) {

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

@@ -329,11 +329,11 @@ public class InputPanel extends LinearLayout
     final int textHintColor;
 
     if (enabled) {
-      iconTint = getContext().getResources().getColor(R.color.signal_colorNeutralInverse);
-      textColor = getContext().getResources().getColor(R.color.signal_colorNeutralInverse);
-      textHintColor = getContext().getResources().getColor(R.color.signal_colorNeutralVariantInverse);
+      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.wallpaper_compose_background)));
+      setBackground(null);
       composeContainer.setBackground(Objects.requireNonNull(ContextCompat.getDrawable(getContext(), R.drawable.compose_background_wallpaper)));
       quickAudioToggle.setColorFilter(iconTint);
       quickCameraToggle.setColorFilter(iconTint);

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

@@ -63,8 +63,7 @@ public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
   private int viewInset;
 
   private boolean keyboardOpen = false;
-  private int     rotation     = -1;
-  private boolean isFullscreen = false;
+  private int     rotation     = 0;
   private boolean isBubble     = false;
 
   public KeyboardAwareLinearLayout(Context context) {
@@ -108,6 +107,10 @@ 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();
 
     getWindowVisibleDisplayFrame(rect);
@@ -127,13 +130,18 @@ public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
         onKeyboardOpen(keyboardHeight);
       }
     } else if (keyboardOpen) {
-      onKeyboardClose();
+      if (previousHeight == keyboardHeight) {
+        onKeyboardClose();
+      } else {
+        postDelayed(() -> updateKeyboardState(keyboardHeight), 100);
+      }
     }
   }
 
   @Override
   protected void onAttachedToWindow() {
     super.onAttachedToWindow();
+    rotation = getDeviceRotation();
     if (Build.VERSION.SDK_INT >= 23 && getRootWindowInsets() != null) {
       int          bottomInset;
       WindowInsets windowInsets = getRootWindowInsets();
@@ -299,10 +307,6 @@ 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,8 +22,10 @@ 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, R.style.Theme_Signal_RoundedBottomSheet)
+    setStyle(STYLE_NORMAL, themeResId)
     super.onCreate(savedInstanceState)
   }
 

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

@@ -128,6 +128,10 @@ 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);
 
@@ -138,7 +142,7 @@ public class LinkPreviewView extends FrameLayout {
       title.setVisibility(GONE);
     }
 
-    if (!Util.isEmpty(linkPreview.getDescription())) {
+    if (showDescription && !Util.isEmpty(linkPreview.getDescription())) {
       description.setText(linkPreview.getDescription());
       description.setVisibility(VISIBLE);
     } else {

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

@@ -0,0 +1,75 @@
+package org.thoughtcrime.securesms.components
+
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
+import org.thoughtcrime.securesms.R
+
+/**
+ * A "forced" EN US Numeric keyboard designed solely for SMS code entry. This
+ * "upgrade" over KeyboardView will ensure that the keyboard is navigable via
+ * TalkBack and will read out keys as they are selected by the user. This is
+ * not a perfect solution, but save being able to force the system keyboard to
+ * appear in EN US, this is the best we can do for the time being.
+ */
+class NumericKeyboardView @JvmOverloads constructor(
+  context: Context,
+  attrs: AttributeSet? = null
+) : ConstraintLayout(context, attrs) {
+
+  var listener: Listener? = null
+
+  init {
+    inflate(context, R.layout.numeric_keyboard_view, this)
+
+    findViewById<TextView>(R.id.numeric_keyboard_1).setOnClickListener {
+      listener?.onKeyPress(1)
+    }
+
+    findViewById<TextView>(R.id.numeric_keyboard_2).setOnClickListener {
+      listener?.onKeyPress(2)
+    }
+
+    findViewById<TextView>(R.id.numeric_keyboard_3).setOnClickListener {
+      listener?.onKeyPress(3)
+    }
+
+    findViewById<TextView>(R.id.numeric_keyboard_4).setOnClickListener {
+      listener?.onKeyPress(4)
+    }
+
+    findViewById<TextView>(R.id.numeric_keyboard_5).setOnClickListener {
+      listener?.onKeyPress(5)
+    }
+
+    findViewById<TextView>(R.id.numeric_keyboard_6).setOnClickListener {
+      listener?.onKeyPress(6)
+    }
+
+    findViewById<TextView>(R.id.numeric_keyboard_7).setOnClickListener {
+      listener?.onKeyPress(7)
+    }
+
+    findViewById<TextView>(R.id.numeric_keyboard_8).setOnClickListener {
+      listener?.onKeyPress(8)
+    }
+
+    findViewById<TextView>(R.id.numeric_keyboard_9).setOnClickListener {
+      listener?.onKeyPress(9)
+    }
+
+    findViewById<TextView>(R.id.numeric_keyboard_0).setOnClickListener {
+      listener?.onKeyPress(0)
+    }
+
+    findViewById<ImageView>(R.id.numeric_keyboard_back).setOnClickListener {
+      listener?.onKeyPress(-1)
+    }
+  }
+
+  interface Listener {
+    fun onKeyPress(keyCode: Int)
+  }
+}

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

@@ -66,7 +66,23 @@ class SendButton(context: Context, attributeSet: AttributeSet?) : AppCompatImage
         }
       }
 
-      throw AssertionError("No options of default 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) {
@@ -79,15 +95,10 @@ class SendButton(context: Context, attributeSet: AttributeSet?) : AppCompatImage
 
   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)
-    }
+    activeMessageSendType = null
+    defaultTransportType = MessageSendType.TransportType.SMS
+    defaultSubscriptionId = null
+    onSelectionChanged(newType = selectedSendType, isManualSelection = false)
   }
 
   fun disableTransportType(type: MessageSendType.TransportType) {

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

@@ -5,6 +5,7 @@ import android.content.res.TypedArray;
 import android.graphics.Bitmap;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
 import android.util.AttributeSet;
@@ -14,6 +15,8 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.Px;
 import androidx.annotation.UiThread;
 
 import com.bumptech.glide.RequestBuilder;
@@ -155,11 +158,16 @@ public class ThumbnailView extends FrameLayout {
     captionIcon.setScaleY(captionIconScale);
   }
 
-  public void setMinimumThumbnailWidth(int width) {
+  public void setMinimumThumbnailWidth(@Px 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);
@@ -274,6 +282,14 @@ public class ThumbnailView extends FrameLayout {
     forceLayout();
   }
 
+  public void setImageDrawable(@NonNull GlideRequests glideRequests, @Nullable Drawable drawable) {
+    glideRequests.clear(image);
+    glideRequests.clear(blurhash);
+
+    image.setImageDrawable(drawable);
+    blurhash.setImageDrawable(null);
+  }
+
   @UiThread
   public ListenableFuture<Boolean> setImageResource(@NonNull GlideRequests glideRequests, @NonNull Slide slide,
                                                     boolean showControls, boolean isPreview)

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

@@ -14,11 +14,13 @@ import android.widget.TextView;
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.Px;
 import androidx.annotation.StringRes;
 import androidx.core.content.ContextCompat;
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.mms.GlideApp;
+import org.thoughtcrime.securesms.util.ViewUtil;
 
 /**
  * Class for creating simple tooltips to show throughout the app. Utilizes a popup window so you
@@ -36,7 +38,8 @@ public class TooltipPopup extends PopupWindow {
 
   private final View      anchor;
   private final ImageView arrow;
-  private final int       position;
+  private final int position;
+  private final int startMargin;
 
   public static Builder forTarget(@NonNull View anchor) {
     return new Builder(anchor);
@@ -44,6 +47,7 @@ public class TooltipPopup extends PopupWindow {
 
   private TooltipPopup(@NonNull View anchor,
                        int rawPosition,
+                       @Px int startMargin,
                        @NonNull String text,
                        @ColorInt int backgroundTint,
                        @ColorInt int textColor,
@@ -54,8 +58,9 @@ public class TooltipPopup extends PopupWindow {
           ViewGroup.LayoutParams.WRAP_CONTENT,
           ViewGroup.LayoutParams.WRAP_CONTENT);
 
-    this.anchor   = anchor;
-    this.position = getRtlPosition(anchor.getContext(), rawPosition);
+    this.anchor          = anchor;
+    this.position    = getRtlPosition(anchor.getContext(), rawPosition);
+    this.startMargin = startMargin;
 
     switch (rawPosition) {
       case POSITION_ABOVE: arrow = getContentView().findViewById(R.id.tooltip_arrow_bottom); break;
@@ -140,6 +145,19 @@ public class TooltipPopup extends PopupWindow {
         throw new AssertionError("Invalid tooltip position!");
     }
 
+    switch (position) {
+      case POSITION_ABOVE:
+        xoffset += startMargin;
+      case POSITION_BELOW:
+        xoffset += startMargin;
+        break;
+      case POSITION_LEFT:
+        xoffset += startMargin;
+        break;
+      case POSITION_RIGHT:
+        xoffset -= startMargin;
+    }
+
     showAsDropDown(anchor, xoffset, yoffset);
   }
 
@@ -192,6 +210,7 @@ public class TooltipPopup extends PopupWindow {
     private int               textResId;
     private Object            iconGlideModel;
     private OnDismissListener dismissListener;
+    private int               setStartMargin;
 
     private Builder(@NonNull View anchor) {
       this.anchor = anchor;
@@ -222,9 +241,14 @@ public class TooltipPopup extends PopupWindow {
       return this;
     }
 
+    public Builder setStartMargin(@Px int startMargin) {
+      this.setStartMargin = startMargin;
+      return this;
+    }
+
     public TooltipPopup show(int position) {
       String       text    = anchor.getContext().getString(textResId);
-      TooltipPopup tooltip = new TooltipPopup(anchor, position, text, backgroundTint, textColor, iconGlideModel, dismissListener);
+      TooltipPopup tooltip = new TooltipPopup(anchor, position, setStartMargin, text, backgroundTint, textColor, iconGlideModel, dismissListener);
 
       tooltip.show();
 

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

@@ -0,0 +1,73 @@
+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/CameraSurfaceView.java

@@ -1,33 +0,0 @@
-package org.thoughtcrime.securesms.components.camera;
-
-import android.content.Context;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-
-public class CameraSurfaceView extends SurfaceView implements SurfaceHolder.Callback {
-  private boolean ready;
-
-  @SuppressWarnings("deprecation")
-  public CameraSurfaceView(Context context) {
-    super(context);
-    getHolder().setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
-    getHolder().addCallback(this);
-  }
-
-  public boolean isReady() {
-    return ready;
-  }
-
-  @Override
-  public void surfaceCreated(SurfaceHolder holder) {
-    ready = true;
-  }
-
-  @Override
-  public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {}
-
-  @Override
-  public void surfaceDestroyed(SurfaceHolder holder) {
-    ready = false;
-  }
-}

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

@@ -1,110 +0,0 @@
-package org.thoughtcrime.securesms.components.camera;
-
-import android.app.Activity;
-import android.hardware.Camera;
-import android.hardware.Camera.CameraInfo;
-import android.hardware.Camera.Parameters;
-import android.hardware.Camera.Size;
-import android.util.DisplayMetrics;
-import android.view.Surface;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import org.signal.core.util.logging.Log;
-
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-
-@SuppressWarnings("deprecation")
-public class CameraUtils {
-  private static final String TAG = Log.tag(CameraUtils.class);
-  /*
-   * modified from: https://github.com/commonsguy/cwac-camera/blob/master/camera/src/com/commonsware/cwac/camera/CameraUtils.java
-   */
-  public static @Nullable Size getPreferredPreviewSize(int displayOrientation,
-                                                       int width,
-                                                       int height,
-                                                       @NonNull Parameters parameters) {
-    final int    targetWidth  = displayOrientation % 180 == 90 ? height : width;
-    final int    targetHeight = displayOrientation % 180 == 90 ? width  : height;
-    final double targetRatio  = (double) targetWidth / targetHeight;
-
-    Log.d(TAG, String.format(Locale.US,
-                             "getPreferredPreviewSize(%d, %d, %d) -> target %dx%d, AR %.02f",
-                             displayOrientation, width, height,
-                             targetWidth, targetHeight, targetRatio));
-
-    List<Size> sizes     = parameters.getSupportedPreviewSizes();
-    List<Size> ideals    = new LinkedList<>();
-    List<Size> bigEnough = new LinkedList<>();
-
-    for (Size size : sizes) {
-      Log.d(TAG, String.format(Locale.US, "  %dx%d (%.02f)", size.width, size.height, (float)size.width / size.height));
-
-      if (size.height == size.width * targetRatio && size.height >= targetHeight && size.width >= targetWidth) {
-        ideals.add(size);
-        Log.d(TAG, "    (ideal ratio)");
-      } else if (size.width >= targetWidth && size.height >= targetHeight) {
-        bigEnough.add(size);
-        Log.d(TAG, "    (good size, suboptimal ratio)");
-      }
-    }
-
-    if      (!ideals.isEmpty())    return Collections.min(ideals, new AreaComparator());
-    else if (!bigEnough.isEmpty()) return Collections.min(bigEnough, new AspectRatioComparator(targetRatio));
-    else                           return Collections.max(sizes, new AreaComparator());
-  }
-
-  // based on
-  // http://developer.android.com/reference/android/hardware/Camera.html#setDisplayOrientation(int)
-  // and http://stackoverflow.com/a/10383164/115145
-  public static int getCameraDisplayOrientation(@NonNull Activity activity,
-                                                @NonNull CameraInfo info)
-  {
-    int            rotation = activity.getWindowManager().getDefaultDisplay().getRotation();
-    int            degrees  = 0;
-    DisplayMetrics dm       = new DisplayMetrics();
-
-    activity.getWindowManager().getDefaultDisplay().getMetrics(dm);
-
-    switch (rotation) {
-    case Surface.ROTATION_0:   degrees = 0;   break;
-    case Surface.ROTATION_90:  degrees = 90;  break;
-    case Surface.ROTATION_180: degrees = 180; break;
-    case Surface.ROTATION_270: degrees = 270; break;
-    }
-
-    if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
-      return (360 - ((info.orientation + degrees) % 360)) % 360;
-    } else {
-      return (info.orientation - degrees + 360) % 360;
-    }
-  }
-
-  private static class AreaComparator implements Comparator<Size> {
-    @Override
-    public int compare(Size lhs, Size rhs) {
-      return Long.signum(lhs.width * lhs.height - rhs.width * rhs.height);
-    }
-  }
-
-  private static class AspectRatioComparator extends AreaComparator {
-    private final double target;
-    public AspectRatioComparator(double target) {
-      this.target = target;
-    }
-
-    @Override
-    public int compare(Size lhs, Size rhs) {
-      final double lhsDiff = Math.abs(target - (double) lhs.width / lhs.height);
-      final double rhsDiff = Math.abs(target - (double) rhs.width / rhs.height);
-      if      (lhsDiff < rhsDiff)  return -1;
-      else if (lhsDiff > rhsDiff)  return 1;
-      else                         return super.compare(lhs, rhs);
-    }
-  }
-}

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

@@ -1,575 +0,0 @@
-/***
- Copyright (c) 2013-2014 CommonsWare, LLC
- Portions Copyright (C) 2007 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License"); you may
- not use this file except in compliance with the License. You may obtain
- a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-package org.thoughtcrime.securesms.components.camera;
-
-import android.annotation.TargetApi;
-import android.app.Activity;
-import android.content.Context;
-import android.content.pm.ActivityInfo;
-import android.content.res.TypedArray;
-import android.graphics.Color;
-import android.graphics.Rect;
-import android.hardware.Camera;
-import android.hardware.Camera.CameraInfo;
-import android.hardware.Camera.Parameters;
-import android.hardware.Camera.Size;
-import android.os.AsyncTask;
-import android.os.Build;
-import android.os.Build.VERSION;
-import android.util.AttributeSet;
-import android.view.OrientationEventListener;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-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;
-import org.thoughtcrime.securesms.util.Util;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Optional;
-
-@SuppressWarnings("deprecation")
-public class CameraView extends ViewGroup {
-  private static final String TAG = Log.tag(CameraView.class);
-
-  private final CameraSurfaceView   surface;
-  private final OnOrientationChange onOrientationChange;
-
-  private volatile Optional<Camera> camera   = Optional.empty();
-  private volatile int              cameraId = CameraInfo.CAMERA_FACING_BACK;
-  private volatile int              displayOrientation = -1;
-
-  private @NonNull  State                    state = State.PAUSED;
-  private @Nullable Size                     previewSize;
-  private @NonNull  List<CameraViewListener> listeners = Collections.synchronizedList(new LinkedList<CameraViewListener>());
-  private           int                      outputOrientation  = -1;
-
-  public CameraView(Context context) {
-    this(context, null);
-  }
-
-  public CameraView(Context context, AttributeSet attrs) {
-    this(context, attrs, 0);
-  }
-
-  public CameraView(Context context, AttributeSet attrs, int defStyle) {
-    super(context, attrs, defStyle);
-    setBackgroundColor(Color.BLACK);
-
-    if (attrs != null) {
-      TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.CameraView);
-      int        camera     = typedArray.getInt(R.styleable.CameraView_camera, -1);
-
-      if      (camera != -1)    cameraId = camera;
-      else if (isMultiCamera()) cameraId = TextSecurePreferences.getDirectCaptureCameraId(context);
-
-      typedArray.recycle();
-    }
-
-    surface             = new CameraSurfaceView(getContext());
-    onOrientationChange = new OnOrientationChange(context.getApplicationContext());
-    addView(surface);
-  }
-
-  @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
-  public void onResume() {
-    if (state != State.PAUSED) return;
-    state = State.RESUMED;
-    Log.i(TAG, "onResume() queued");
-    enqueueTask(new SerialAsyncTask<Void>() {
-      @Override
-      protected
-      @Nullable
-      Void onRunBackground() {
-        try {
-          long openStartMillis = System.currentTimeMillis();
-          camera = Optional.ofNullable(Camera.open(cameraId));
-          Log.i(TAG, "camera.open() -> " + (System.currentTimeMillis() - openStartMillis) + "ms");
-          synchronized (CameraView.this) {
-            CameraView.this.notifyAll();
-          }
-          if (camera.isPresent()) onCameraReady(camera.get());
-        } catch (Exception e) {
-          Log.w(TAG, e);
-        }
-        return null;
-      }
-
-      @Override
-      protected void onPostMain(Void avoid) {
-        if (!camera.isPresent()) {
-          Log.w(TAG, "tried to open camera but got null");
-          for (CameraViewListener listener : listeners) {
-            listener.onCameraFail();
-          }
-          return;
-        }
-
-        if (getActivity().getRequestedOrientation() != ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED) {
-          onOrientationChange.enable();
-        }
-        Log.i(TAG, "onResume() completed");
-      }
-    });
-  }
-
-  public void onPause() {
-    if (state == State.PAUSED) return;
-    state = State.PAUSED;
-    Log.i(TAG, "onPause() queued");
-
-    enqueueTask(new SerialAsyncTask<Void>() {
-      private Optional<Camera> cameraToDestroy;
-
-      @Override
-      protected void onPreMain() {
-        cameraToDestroy = camera;
-        camera = Optional.empty();
-      }
-
-      @Override
-      protected Void onRunBackground() {
-        if (cameraToDestroy.isPresent()) {
-          try {
-            stopPreview();
-            cameraToDestroy.get().setPreviewCallback(null);
-            cameraToDestroy.get().release();
-            Log.w(TAG, "released old camera instance");
-          } catch (Exception e) {
-            Log.w(TAG, e);
-          }
-        }
-        return null;
-      }
-
-      @Override protected void onPostMain(Void avoid) {
-        onOrientationChange.disable();
-        displayOrientation = -1;
-        outputOrientation = -1;
-        removeView(surface);
-        addView(surface);
-        Log.i(TAG, "onPause() completed");
-      }
-    });
-
-    for (CameraViewListener listener : listeners) {
-      listener.onCameraStop();
-    }
-  }
-
-  public boolean isStarted() {
-    return state != State.PAUSED;
-  }
-
-  @SuppressWarnings("SuspiciousNameCombination")
-  @Override
-  protected void onLayout(boolean changed, int l, int t, int r, int b) {
-    final int  width         = r - l;
-    final int  height        = b - t;
-    final int  previewWidth;
-    final int  previewHeight;
-
-    if (camera.isPresent() && previewSize != null) {
-      if (displayOrientation == 90 || displayOrientation == 270) {
-        previewWidth  = previewSize.height;
-        previewHeight = previewSize.width;
-      } else {
-        previewWidth  = previewSize.width;
-        previewHeight = previewSize.height;
-      }
-    } else {
-      previewWidth  = width;
-      previewHeight = height;
-    }
-
-    if (previewHeight == 0 || previewWidth == 0) {
-      Log.w(TAG, "skipping layout due to zero-width/height preview size");
-      return;
-    }
-
-    if (width * previewHeight > height * previewWidth) {
-      final int scaledChildHeight = previewHeight * width / previewWidth;
-      surface.layout(0, (height - scaledChildHeight) / 2, width, (height + scaledChildHeight) / 2);
-    } else {
-      final int scaledChildWidth = previewWidth * height / previewHeight;
-      surface.layout((width - scaledChildWidth) / 2, 0, (width + scaledChildWidth) / 2, height);
-    }
-  }
-
-  @Override
-  protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-    Log.i(TAG, "onSizeChanged(" + oldw + "x" + oldh + " -> " + w + "x" + h + ")");
-    super.onSizeChanged(w, h, oldw, oldh);
-    if (camera.isPresent()) startPreview(camera.get().getParameters());
-  }
-
-  public void addListener(@NonNull CameraViewListener listener) {
-    listeners.add(listener);
-  }
-
-  public void setPreviewCallback(final @NonNull QrCameraView.PreviewCallback previewCallback) {
-    enqueueTask(new PostInitializationTask<Void>() {
-      @Override
-      protected void onPostMain(Void avoid) {
-        if (camera.isPresent()) {
-          camera.get().setPreviewCallback(new Camera.PreviewCallback() {
-            @Override
-            public void onPreviewFrame(byte[] data, Camera camera) {
-              if (!CameraView.this.camera.isPresent()) {
-                return;
-              }
-
-              final int  rotation    = getCameraPictureOrientation();
-              final Size previewSize = camera.getParameters().getPreviewSize();
-              if (data != null) {
-                previewCallback.onPreviewFrame(new QrCameraView.PreviewFrame(data, previewSize.width, previewSize.height, rotation));
-              }
-            }
-          });
-        }
-      }
-    });
-  }
-
-  public boolean isMultiCamera() {
-    return Camera.getNumberOfCameras() > 1;
-  }
-
-  public boolean isRearCamera() {
-    return cameraId == CameraInfo.CAMERA_FACING_BACK;
-  }
-
-  public void flipCamera() {
-    if (Camera.getNumberOfCameras() > 1) {
-      cameraId = cameraId == CameraInfo.CAMERA_FACING_BACK
-                 ? CameraInfo.CAMERA_FACING_FRONT
-                 : CameraInfo.CAMERA_FACING_BACK;
-      onPause();
-      onResume();
-      TextSecurePreferences.setDirectCaptureCameraId(getContext(), cameraId);
-    }
-  }
-
-  @TargetApi(14)
-  private void onCameraReady(final @NonNull Camera camera) {
-    final Parameters parameters = camera.getParameters();
-
-    if (VERSION.SDK_INT >= 14) {
-      parameters.setRecordingHint(true);
-      final List<String> focusModes = parameters.getSupportedFocusModes();
-      if (focusModes.contains(Parameters.FOCUS_MODE_CONTINUOUS_PICTURE)) {
-        parameters.setFocusMode(Parameters.FOCUS_MODE_CONTINUOUS_PICTURE);
-      } else if (focusModes.contains(Parameters.FOCUS_MODE_CONTINUOUS_VIDEO)) {
-        parameters.setFocusMode(Parameters.FOCUS_MODE_CONTINUOUS_VIDEO);
-      }
-    }
-
-    displayOrientation = CameraUtils.getCameraDisplayOrientation(getActivity(), getCameraInfo());
-    camera.setDisplayOrientation(displayOrientation);
-    camera.setParameters(parameters);
-    enqueueTask(new PostInitializationTask<Void>() {
-      @Override
-      protected Void onRunBackground() {
-        try {
-          camera.setPreviewDisplay(surface.getHolder());
-          startPreview(parameters);
-        } catch (Exception e) {
-          Log.w(TAG, "couldn't set preview display", e);
-        }
-        return null;
-      }
-    });
-  }
-
-  private void startPreview(final @NonNull Parameters parameters) {
-    if (this.camera.isPresent()) {
-      try {
-        final Camera     camera               = this.camera.get();
-        final Size       preferredPreviewSize = getPreferredPreviewSize(parameters);
-
-        if (preferredPreviewSize != null && !parameters.getPreviewSize().equals(preferredPreviewSize)) {
-          Log.i(TAG, "starting preview with size " + preferredPreviewSize.width + "x" + preferredPreviewSize.height);
-          if (state == State.ACTIVE) stopPreview();
-          previewSize = preferredPreviewSize;
-          parameters.setPreviewSize(preferredPreviewSize.width, preferredPreviewSize.height);
-          camera.setParameters(parameters);
-        } else {
-          previewSize = parameters.getPreviewSize();
-        }
-        long previewStartMillis = System.currentTimeMillis();
-        camera.startPreview();
-        Log.i(TAG, "camera.startPreview() -> " + (System.currentTimeMillis() - previewStartMillis) + "ms");
-        state = State.ACTIVE;
-        ThreadUtil.runOnMain(new Runnable() {
-          @Override
-          public void run() {
-            requestLayout();
-            for (CameraViewListener listener : listeners) {
-              listener.onCameraStart();
-            }
-          }
-        });
-      } catch (Exception e) {
-        Log.w(TAG, e);
-      }
-    }
-  }
-
-  private void stopPreview() {
-    if (camera.isPresent()) {
-      try {
-        camera.get().stopPreview();
-        state = State.RESUMED;
-      } catch (Exception e) {
-        Log.w(TAG, e);
-      }
-    }
-  }
-
-
-  private Size getPreferredPreviewSize(@NonNull Parameters parameters) {
-    return CameraUtils.getPreferredPreviewSize(displayOrientation,
-                                               getMeasuredWidth(),
-                                               getMeasuredHeight(),
-                                               parameters);
-  }
-
-  private int getCameraPictureOrientation() {
-    if (getActivity().getRequestedOrientation() != ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED) {
-      outputOrientation = getCameraPictureRotation(getActivity().getWindowManager()
-                                                                .getDefaultDisplay()
-                                                                .getOrientation());
-    } else if (getCameraInfo().facing == CameraInfo.CAMERA_FACING_FRONT) {
-      outputOrientation = (360 - displayOrientation) % 360;
-    } else {
-      outputOrientation = displayOrientation;
-    }
-
-    return outputOrientation;
-  }
-
-  // https://github.com/signalapp/Signal-Android/issues/4715
-  private boolean isTroublemaker() {
-    return getCameraInfo().facing == CameraInfo.CAMERA_FACING_FRONT &&
-           "JWR66Y".equals(Build.DISPLAY) &&
-           "yakju".equals(Build.PRODUCT);
-  }
-
-  private @NonNull CameraInfo getCameraInfo() {
-    final CameraInfo info = new Camera.CameraInfo();
-    Camera.getCameraInfo(cameraId, info);
-    return info;
-  }
-
-  // XXX this sucks
-  private Activity getActivity() {
-    return (Activity)getContext();
-  }
-
-  public int getCameraPictureRotation(int orientation) {
-    final CameraInfo info = getCameraInfo();
-    final int        rotation;
-
-    orientation = (orientation + 45) / 90 * 90;
-
-    if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
-      rotation = (info.orientation - orientation + 360) % 360;
-    } else {
-      rotation = (info.orientation + orientation) % 360;
-    }
-
-    return rotation;
-  }
-
-  private class OnOrientationChange extends OrientationEventListener {
-    public OnOrientationChange(Context context) {
-      super(context);
-      disable();
-    }
-
-    @Override
-    public void onOrientationChanged(int orientation) {
-      if (camera.isPresent() && orientation != ORIENTATION_UNKNOWN) {
-        int newOutputOrientation = getCameraPictureRotation(orientation);
-
-        if (newOutputOrientation != outputOrientation) {
-          outputOrientation = newOutputOrientation;
-
-          Camera.Parameters params = camera.get().getParameters();
-
-          params.setRotation(outputOrientation);
-
-          try {
-            camera.get().setParameters(params);
-          }
-          catch (Exception e) {
-            Log.e(TAG, "Exception updating camera parameters in orientation change", e);
-          }
-        }
-      }
-    }
-  }
-
-  public void takePicture(final Rect previewRect) {
-    if (!camera.isPresent() || camera.get().getParameters() == null) {
-      Log.w(TAG, "camera not in capture-ready state");
-      return;
-    }
-
-    camera.get().setOneShotPreviewCallback(new Camera.PreviewCallback() {
-      @Override
-      public void onPreviewFrame(byte[] data, final Camera camera) {
-        final int  rotation     = getCameraPictureOrientation();
-        final Size previewSize  = camera.getParameters().getPreviewSize();
-        final Rect croppingRect = getCroppedRect(previewSize, previewRect, rotation);
-
-        Log.i(TAG, "previewSize: " + previewSize.width + "x" + previewSize.height);
-        Log.i(TAG, "data bytes: " + data.length);
-        Log.i(TAG, "previewFormat: " + camera.getParameters().getPreviewFormat());
-        Log.i(TAG, "croppingRect: " + croppingRect.toString());
-        Log.i(TAG, "rotation: " + rotation);
-        new CaptureTask(previewSize, rotation, croppingRect).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, data);
-      }
-    });
-  }
-
-  private Rect getCroppedRect(Size cameraPreviewSize, Rect visibleRect, int rotation) {
-    final int previewWidth  = cameraPreviewSize.width;
-    final int previewHeight = cameraPreviewSize.height;
-
-    if (rotation % 180 > 0) rotateRect(visibleRect);
-
-    float scale = (float) previewWidth / visibleRect.width();
-    if (visibleRect.height() * scale > previewHeight) {
-      scale = (float) previewHeight / visibleRect.height();
-    }
-    final float newWidth  = visibleRect.width()  * scale;
-    final float newHeight = visibleRect.height() * scale;
-    final float centerX   = (VERSION.SDK_INT < 14 || isTroublemaker()) ? previewWidth - newWidth / 2 : previewWidth / 2;
-    final float centerY   = previewHeight / 2;
-
-    visibleRect.set((int) (centerX - newWidth  / 2),
-                    (int) (centerY - newHeight / 2),
-                    (int) (centerX + newWidth  / 2),
-                    (int) (centerY + newHeight / 2));
-
-    if (rotation % 180 > 0) rotateRect(visibleRect);
-    return visibleRect;
-  }
-
-  @SuppressWarnings("SuspiciousNameCombination")
-  private void rotateRect(Rect rect) {
-    rect.set(rect.top, rect.left, rect.bottom, rect.right);
-  }
-
-  private void enqueueTask(SerialAsyncTask job) {
-    AsyncTask.SERIAL_EXECUTOR.execute(job);
-  }
-
-  public static abstract class SerialAsyncTask<Result> implements Runnable {
-
-    @Override
-    public final void run() {
-      if (!onWait()) {
-        Log.w(TAG, "skipping task, preconditions not met in onWait()");
-        return;
-      }
-
-      ThreadUtil.runOnMainSync(this::onPreMain);
-      final Result result = onRunBackground();
-      ThreadUtil.runOnMainSync(() -> onPostMain(result));
-    }
-
-    protected boolean onWait() { return true; }
-    protected void onPreMain() {}
-    protected Result onRunBackground() { return null; }
-    protected void onPostMain(Result result) {}
-  }
-
-  private abstract class PostInitializationTask<Result> extends SerialAsyncTask<Result> {
-    @Override protected boolean onWait() {
-      synchronized (CameraView.this) {
-        if (!camera.isPresent()) {
-          return false;
-        }
-        while (getMeasuredHeight() <= 0 || getMeasuredWidth() <= 0 || !surface.isReady()) {
-          Log.i(TAG, String.format("waiting. surface ready? %s", surface.isReady()));
-          Util.wait(CameraView.this, 0);
-        }
-        return true;
-      }
-    }
-  }
-
-  private class CaptureTask extends AsyncTask<byte[], Void, byte[]> {
-    private final Size previewSize;
-    private final int  rotation;
-    private final Rect croppingRect;
-
-    public CaptureTask(Size previewSize, int rotation, Rect croppingRect) {
-      this.previewSize  = previewSize;
-      this.rotation     = rotation;
-      this.croppingRect = croppingRect;
-    }
-
-    @Override
-    protected byte[] doInBackground(byte[]... params) {
-      final byte[] data = params[0];
-      try {
-        return BitmapUtil.createFromNV21(data,
-                                         previewSize.width,
-                                         previewSize.height,
-                                         rotation,
-                                         croppingRect,
-                                         cameraId == CameraInfo.CAMERA_FACING_FRONT);
-      } catch (IOException e) {
-        Log.w(TAG, e);
-        return null;
-      }
-    }
-
-    @Override
-    protected void onPostExecute(byte[] imageBytes) {
-      if (imageBytes != null) {
-        for (CameraViewListener listener : listeners) {
-          listener.onImageCapture(imageBytes);
-        }
-      }
-    }
-  }
-
-  private static class PreconditionsNotMetException extends Exception {}
-
-  public interface CameraViewListener {
-    void onImageCapture(@NonNull final byte[] imageBytes);
-    void onCameraFail();
-    void onCameraStart();
-    void onCameraStop();
-  }
-
-  private enum State {
-    PAUSED, RESUMED, ACTIVE
-  }
-}

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

@@ -10,14 +10,17 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatEditText;
 
-import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiProvider.EmojiDrawable;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 
+import java.util.HashSet;
+import java.util.Set;
+
 
 public class EmojiEditText extends AppCompatEditText {
-  private static final String TAG = Log.tag(EmojiEditText.class);
+
+  private final Set<OnFocusChangeListener> onFocusChangeListeners = new HashSet<>();
 
   public EmojiEditText(Context context) {
     this(context, null);
@@ -38,6 +41,12 @@ public class EmojiEditText extends AppCompatEditText {
     if (!isInEditMode() && (forceCustom || !SignalStore.settings().isPreferSystemEmoji())) {
       setFilters(appendEmojiFilter(this.getFilters(), jumboEmoji));
     }
+
+    super.setOnFocusChangeListener((v, hasFocus) -> {
+      for (OnFocusChangeListener listener : onFocusChangeListeners) {
+        listener.onFocusChange(v, hasFocus);
+      }
+    });
   }
 
   public void insertEmoji(String emoji) {
@@ -54,6 +63,17 @@ public class EmojiEditText extends AppCompatEditText {
     else                                   super.invalidateDrawable(drawable);
   }
 
+  @Override
+  public void setOnFocusChangeListener(@Nullable OnFocusChangeListener listener) {
+    if (listener != null) {
+      onFocusChangeListeners.add(listener);
+    }
+  }
+
+  public void addOnFocusChangeListener(@NonNull OnFocusChangeListener listener) {
+    onFocusChangeListeners.add(listener);
+  }
+
   private InputFilter[] appendEmojiFilter(@Nullable InputFilter[] originalFilters, boolean jumboEmoji) {
     InputFilter[] result;
 

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

@@ -26,6 +26,7 @@ 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;
@@ -151,10 +152,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 (maxLength > 0) {
-        ellipsizeAnyTextForMaxLength();
-      } else if (getMaxLines() > 0) {
+      if (getMaxLines() > 0 && getMaxLines() != Integer.MAX_VALUE) {
         ellipsizeEmojiTextForMaxLines();
+      } else if (maxLength > 0) {
+        ellipsizeAnyTextForMaxLength();
       }
     }
 
@@ -308,11 +309,17 @@ public class EmojiTextView extends AppCompatTextView {
 
       int lineCount = getLineCount();
       if (lineCount > maxLines) {
-        int          overflowStart = getLayout().getLineStart(maxLines - 1);
+        int overflowStart = getLayout().getLineStart(maxLines - 1);
+
+        if (maxLength > 0 && overflowStart > maxLength) {
+          ellipsizeAnyTextForMaxLength();
+          return;
+        }
+
         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    = TextUtils.ellipsize(overflow, getPaint(), getWidth() - adjust, TextUtils.TruncateAt.END);
+        CharSequence ellipsized    = StringUtil.trim(TextUtils.ellipsize(overflow, getPaint(), getWidth() - adjust, TextUtils.TruncateAt.END));
 
         SpannableStringBuilder newContent = new SpannableStringBuilder();
         newContent.append(getText().subSequence(0, overflowStart))
@@ -323,6 +330,8 @@ 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/menu/ActionItem.kt

@@ -1,12 +1,15 @@
 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(
+data class ActionItem @JvmOverloads constructor(
   @DrawableRes val iconRes: Int,
   val title: CharSequence,
-  val action: Runnable
+  @ColorRes val tintRes: Int = R.color.signal_colorOnSurface,
+  val action: Runnable,
 )

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

@@ -4,6 +4,7 @@ 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
@@ -78,6 +79,10 @@ 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

@@ -133,11 +133,11 @@ class SignalContextMenu private constructor(
     val container: ViewGroup
   ) {
 
-    var onDismiss: Runnable? = null
-    var offsetX = 0
-    var offsetY = 0
-    var horizontalPosition = HorizontalPosition.START
-    var verticalPosition = VerticalPosition.BELOW
+    private var onDismiss: Runnable? = null
+    private var offsetX = 0
+    private var offsetY = 0
+    private var horizontalPosition = HorizontalPosition.START
+    private var verticalPosition = VerticalPosition.BELOW
 
     fun onDismiss(onDismiss: Runnable): Builder {
       this.onDismiss = onDismiss

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

@@ -3,8 +3,6 @@ package org.thoughtcrime.securesms.components.registration;
 
 import android.content.Context;
 import android.graphics.PorterDuff;
-import android.inputmethodservice.Keyboard;
-import android.inputmethodservice.KeyboardView;
 import android.os.Build;
 import android.util.AttributeSet;
 import android.view.View;
@@ -21,17 +19,18 @@ import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.components.NumericKeyboardView;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
 import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
 
 public class VerificationPinKeyboard extends FrameLayout {
 
-  private KeyboardView keyboardView;
-  private ProgressBar  progressBar;
-  private ImageView    successView;
-  private ImageView    failureView;
-  private ImageView    lockedView;
+  private NumericKeyboardView keyboardView;
+  private ProgressBar         progressBar;
+  private ImageView           successView;
+  private ImageView           failureView;
+  private ImageView           lockedView;
 
   private OnKeyPressListener listener;
 
@@ -65,27 +64,8 @@ public class VerificationPinKeyboard extends FrameLayout {
     this.failureView  = findViewById(R.id.failure);
     this.lockedView   = findViewById(R.id.locked);
 
-    keyboardView.setPreviewEnabled(false);
-    keyboardView.setKeyboard(new Keyboard(getContext(), R.xml.pin_keyboard));
-    keyboardView.setOnKeyboardActionListener(new KeyboardView.OnKeyboardActionListener() {
-      @Override
-      public void onPress(int primaryCode) {
-        if (listener != null) listener.onKeyPress(primaryCode);
-      }
-      @Override
-      public void onRelease(int primaryCode) {}
-      @Override
-      public void onKey(int primaryCode, int[] keyCodes) {}
-      @Override
-      public void onText(CharSequence text) {}
-      @Override
-      public void swipeLeft() {}
-      @Override
-      public void swipeRight() {}
-      @Override
-      public void swipeDown() {}
-      @Override
-      public void swipeUp() {}
+    keyboardView.setListener(keyCode -> {
+      if (listener != null) listener.onKeyPress(keyCode);
     });
 
     displayKeyboard();

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

@@ -22,6 +22,7 @@ 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() {
@@ -29,6 +30,7 @@ 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))
@@ -91,6 +93,14 @@ 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/app/AppSettingsActivity.kt

@@ -62,6 +62,7 @@ class AppSettingsActivity : DSLSettingsActivity(), DonationPaymentComponent {
         StartLocation.NOTIFICATION_PROFILE_DETAILS -> AppSettingsFragmentDirections.actionDirectToNotificationProfileDetails(
           EditNotificationProfileScheduleFragmentArgs.fromBundle(intent.getBundleExtra(START_ARGUMENTS)!!).profileId
         )
+        StartLocation.PRIVACY -> AppSettingsFragmentDirections.actionDirectToPrivacy()
       }
     }
 
@@ -168,6 +169,9 @@ 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)
@@ -197,7 +201,8 @@ class AppSettingsActivity : DSLSettingsActivity(), DonationPaymentComponent {
     MANAGE_SUBSCRIPTIONS(8),
     NOTIFICATION_PROFILES(9),
     CREATE_NOTIFICATION_PROFILE(10),
-    NOTIFICATION_PROFILE_DETAILS(11);
+    NOTIFICATION_PROFILE_DETAILS(11),
+    PRIVACY(12);
 
     companion object {
       fun fromCode(code: Int?): StartLocation {

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

@@ -485,6 +485,15 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
           viewModel.toggleStories()
         }
       )
+
+      clickPref(
+        title = DSLSettingsText.from(R.string.preferences__internal_clear_onboarding_state),
+        summary = DSLSettingsText.from(R.string.preferences__internal_clears_onboarding_flag_and_triggers_download_of_onboarding_stories),
+        isEnabled = state.canClearOnboardingState,
+        onClick = {
+          viewModel.onClearOnboardingState()
+        }
+      )
     }
   }
 

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

@@ -38,14 +38,14 @@ class InternalSettingsRepository(context: Context) {
       val recipientId = SignalStore.releaseChannelValues().releaseChannelRecipientId!!
       val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(recipientId))
 
-      val insertResult: MessageDatabase.InsertResult? = ReleaseChannel.insertAnnouncement(
+      val insertResult: MessageDatabase.InsertResult? = ReleaseChannel.insertReleaseChannelMessage(
         recipientId = recipientId,
         body = body,
         threadId = threadId,
         messageRanges = bodyRangeList.build(),
-        image = "https://via.placeholder.com/720x480",
-        imageWidth = 720,
-        imageHeight = 480
+        image = "/static/release-notes/signal.png",
+        imageWidth = 1800,
+        imageHeight = 720
       )
 
       SignalDatabase.sms.insertBoostRequestMessage(recipientId, threadId)

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

@@ -22,5 +22,6 @@ data class InternalSettingsState(
   val removeSenderKeyMinimium: Boolean,
   val delayResends: Boolean,
   val disableStorageService: Boolean,
-  val disableStories: Boolean
+  val disableStories: Boolean,
+  val canClearOnboardingState: Boolean
 )

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

@@ -4,8 +4,10 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import org.signal.ringrtc.CallManager
+import org.thoughtcrime.securesms.jobs.StoryOnboardingDownloadJob
 import org.thoughtcrime.securesms.keyvalue.InternalValues
 import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.stories.Stories
 import org.thoughtcrime.securesms.util.livedata.Store
 
 class InternalSettingsViewModel(private val repository: InternalSettingsRepository) : ViewModel() {
@@ -139,9 +141,17 @@ class InternalSettingsViewModel(private val repository: InternalSettingsReposito
     removeSenderKeyMinimium = SignalStore.internalValues().removeSenderKeyMinimum(),
     delayResends = SignalStore.internalValues().delayResends(),
     disableStorageService = SignalStore.internalValues().storageServiceDisabled(),
-    disableStories = SignalStore.storyValues().isFeatureDisabled
+    disableStories = SignalStore.storyValues().isFeatureDisabled,
+    canClearOnboardingState = SignalStore.storyValues().hasDownloadedOnboardingStory && Stories.isFeatureEnabled()
   )
 
+  fun onClearOnboardingState() {
+    SignalStore.storyValues().hasDownloadedOnboardingStory = false
+    SignalStore.storyValues().userHasSeenOnboardingStory = false
+    refresh()
+    StoryOnboardingDownloadJob.enqueueIfNeeded()
+  }
+
   class Factory(private val repository: InternalSettingsRepository) : ViewModelProvider.Factory {
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
       return requireNotNull(modelClass.cast(InternalSettingsViewModel(repository)))

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/donor/DonorErrorConfigurationViewModel.kt

@@ -26,20 +26,29 @@ class DonorErrorConfigurationViewModel : ViewModel() {
   val state: Flowable<DonorErrorConfigurationState> = store.stateFlowable
 
   init {
-    val giftBadges: Single<List<Badge>> = ApplicationDependencies.getDonationsService()
-      .getGiftBadges(Locale.getDefault())
+    val giftBadges: Single<List<Badge>> = Single
+      .fromCallable {
+        ApplicationDependencies.getDonationsService()
+          .getGiftBadges(Locale.getDefault())
+      }
       .flatMap { it.flattenResult() }
       .map { results -> results.values.map { Badges.fromServiceBadge(it) } }
       .subscribeOn(Schedulers.io())
 
-    val boostBadges: Single<List<Badge>> = ApplicationDependencies.getDonationsService()
-      .getBoostBadge(Locale.getDefault())
+    val boostBadges: Single<List<Badge>> = Single
+      .fromCallable {
+        ApplicationDependencies.getDonationsService()
+          .getBoostBadge(Locale.getDefault())
+      }
       .flatMap { it.flattenResult() }
       .map { listOf(Badges.fromServiceBadge(it)) }
       .subscribeOn(Schedulers.io())
 
-    val subscriptionBadges: Single<List<Badge>> = ApplicationDependencies.getDonationsService()
-      .getSubscriptionLevels(Locale.getDefault())
+    val subscriptionBadges: Single<List<Badge>> = Single
+      .fromCallable {
+        ApplicationDependencies.getDonationsService()
+          .getSubscriptionLevels(Locale.getDefault())
+      }
       .flatMap { it.flattenResult() }
       .map { levels -> levels.levels.values.map { Badges.fromServiceBadge(it.badge) } }
       .subscribeOn(Schedulers.io())

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

@@ -170,8 +170,11 @@ class DonationPaymentRepository(activity: Activity) : StripeApi.PaymentIntentFet
   fun cancelActiveSubscription(): Completable {
     Log.d(TAG, "Canceling active subscription...", true)
     val localSubscriber = SignalStore.donationsValues().requireSubscriber()
-    return ApplicationDependencies.getDonationsService()
-      .cancelSubscription(localSubscriber.subscriberId)
+    return Single
+      .fromCallable {
+        ApplicationDependencies.getDonationsService()
+          .cancelSubscription(localSubscriber.subscriberId)
+      }
       .subscribeOn(Schedulers.io())
       .flatMap(ServiceResponse<EmptyResponse>::flattenResult)
       .ignoreElement()
@@ -181,9 +184,12 @@ class DonationPaymentRepository(activity: Activity) : StripeApi.PaymentIntentFet
   fun ensureSubscriberId(): Completable {
     Log.d(TAG, "Ensuring SubscriberId exists on Signal service...", true)
     val subscriberId = SignalStore.donationsValues().getSubscriber()?.subscriberId ?: SubscriberId.generate()
-    return ApplicationDependencies
-      .getDonationsService()
-      .putSubscription(subscriberId)
+    return Single
+      .fromCallable {
+        ApplicationDependencies
+          .getDonationsService()
+          .putSubscription(subscriberId)
+      }
       .subscribeOn(Schedulers.io())
       .flatMap(ServiceResponse<EmptyResponse>::flattenResult).ignoreElement()
       .doOnComplete {
@@ -268,67 +274,71 @@ class DonationPaymentRepository(activity: Activity) : StripeApi.PaymentIntentFet
         val subscriber = SignalStore.donationsValues().requireSubscriber()
 
         Log.d(TAG, "Attempting to set user subscription level to $subscriptionLevel", true)
-        ApplicationDependencies.getDonationsService().updateSubscriptionLevel(
-          subscriber.subscriberId,
-          subscriptionLevel,
-          subscriber.currencyCode,
-          levelUpdateOperation.idempotencyKey.serialize(),
-          SubscriptionReceiptRequestResponseJob.MUTEX
-        ).flatMapCompletable {
-          if (it.status == 200 || it.status == 204) {
-            Log.d(TAG, "Successfully set user subscription to level $subscriptionLevel with response code ${it.status}", true)
-            SignalStore.donationsValues().updateLocalStateForLocalSubscribe()
-            scheduleSyncForAccountRecordChange()
-            LevelUpdate.updateProcessingState(false)
-            Completable.complete()
-          } else {
-            if (it.applicationError.isPresent) {
-              Log.w(TAG, "Failed to set user subscription to level $subscriptionLevel with response code ${it.status}", it.applicationError.get(), true)
-              SignalStore.donationsValues().clearLevelOperations()
+        Single
+          .fromCallable {
+            ApplicationDependencies.getDonationsService().updateSubscriptionLevel(
+              subscriber.subscriberId,
+              subscriptionLevel,
+              subscriber.currencyCode,
+              levelUpdateOperation.idempotencyKey.serialize(),
+              SubscriptionReceiptRequestResponseJob.MUTEX
+            )
+          }
+          .flatMapCompletable {
+            if (it.status == 200 || it.status == 204) {
+              Log.d(TAG, "Successfully set user subscription to level $subscriptionLevel with response code ${it.status}", true)
+              SignalStore.donationsValues().updateLocalStateForLocalSubscribe()
+              scheduleSyncForAccountRecordChange()
+              LevelUpdate.updateProcessingState(false)
+              Completable.complete()
             } else {
-              Log.w(TAG, "Failed to set user subscription to level $subscriptionLevel", it.executionError.orElse(null), true)
-            }
-
-            LevelUpdate.updateProcessingState(false)
-            it.flattenResult().ignoreElement()
-          }
-        }.andThen {
-          Log.d(TAG, "Enqueuing request response job chain.", true)
-          val countDownLatch = CountDownLatch(1)
-          var finalJobState: JobTracker.JobState? = null
-
-          SubscriptionReceiptRequestResponseJob.createSubscriptionContinuationJobChain().enqueue { _, jobState ->
-            if (jobState.isComplete) {
-              finalJobState = jobState
-              countDownLatch.countDown()
-            }
-          }
-
-          try {
-            if (countDownLatch.await(10, TimeUnit.SECONDS)) {
-              when (finalJobState) {
-                JobTracker.JobState.SUCCESS -> {
-                  Log.d(TAG, "Subscription request response job chain succeeded.", true)
-                  it.onComplete()
-                }
-                JobTracker.JobState.FAILURE -> {
-                  Log.d(TAG, "Subscription request response job chain failed permanently.", true)
-                  it.onError(DonationError.genericBadgeRedemptionFailure(DonationErrorSource.SUBSCRIPTION))
-                }
-                else -> {
-                  Log.d(TAG, "Subscription request response job chain ignored due to in-progress jobs.", true)
-                  it.onError(DonationError.timeoutWaitingForToken(DonationErrorSource.SUBSCRIPTION))
-                }
+              if (it.applicationError.isPresent) {
+                Log.w(TAG, "Failed to set user subscription to level $subscriptionLevel with response code ${it.status}", it.applicationError.get(), true)
+                SignalStore.donationsValues().clearLevelOperations()
+              } else {
+                Log.w(TAG, "Failed to set user subscription to level $subscriptionLevel", it.executionError.orElse(null), true)
               }
-            } else {
-              Log.d(TAG, "Subscription request response job timed out.", true)
+
+              LevelUpdate.updateProcessingState(false)
+              it.flattenResult().ignoreElement()
+            }
+          }.andThen {
+            Log.d(TAG, "Enqueuing request response job chain.", true)
+            val countDownLatch = CountDownLatch(1)
+            var finalJobState: JobTracker.JobState? = null
+
+            SubscriptionReceiptRequestResponseJob.createSubscriptionContinuationJobChain().enqueue { _, jobState ->
+              if (jobState.isComplete) {
+                finalJobState = jobState
+                countDownLatch.countDown()
+              }
+            }
+
+            try {
+              if (countDownLatch.await(10, TimeUnit.SECONDS)) {
+                when (finalJobState) {
+                  JobTracker.JobState.SUCCESS -> {
+                    Log.d(TAG, "Subscription request response job chain succeeded.", true)
+                    it.onComplete()
+                  }
+                  JobTracker.JobState.FAILURE -> {
+                    Log.d(TAG, "Subscription request response job chain failed permanently.", true)
+                    it.onError(DonationError.genericBadgeRedemptionFailure(DonationErrorSource.SUBSCRIPTION))
+                  }
+                  else -> {
+                    Log.d(TAG, "Subscription request response job chain ignored due to in-progress jobs.", true)
+                    it.onError(DonationError.timeoutWaitingForToken(DonationErrorSource.SUBSCRIPTION))
+                  }
+                }
+              } else {
+                Log.d(TAG, "Subscription request response job timed out.", true)
+                it.onError(DonationError.timeoutWaitingForToken(DonationErrorSource.SUBSCRIPTION))
+              }
+            } catch (e: InterruptedException) {
+              Log.w(TAG, "Subscription request response interrupted.", e, true)
               it.onError(DonationError.timeoutWaitingForToken(DonationErrorSource.SUBSCRIPTION))
             }
-          } catch (e: InterruptedException) {
-            Log.w(TAG, "Subscription request response interrupted.", e, true)
-            it.onError(DonationError.timeoutWaitingForToken(DonationErrorSource.SUBSCRIPTION))
           }
-        }
       }.doOnError {
         LevelUpdate.updateProcessingState(false)
       }.subscribeOn(Schedulers.io())
@@ -356,9 +366,12 @@ class DonationPaymentRepository(activity: Activity) : StripeApi.PaymentIntentFet
 
   override fun fetchPaymentIntent(price: FiatMoney, level: Long): Single<StripeApi.PaymentIntent> {
     Log.d(TAG, "Fetching payment intent from Signal service for $price... (Locale.US minimum precision: ${price.minimumUnitPrecisionString})")
-    return ApplicationDependencies
-      .getDonationsService()
-      .createDonationIntentWithAmount(price.minimumUnitPrecisionString, price.currency.currencyCode, level)
+    return Single
+      .fromCallable {
+        ApplicationDependencies
+          .getDonationsService()
+          .createDonationIntentWithAmount(price.minimumUnitPrecisionString, price.currency.currencyCode, level)
+      }
       .flatMap(ServiceResponse<SubscriptionClientSecret>::flattenResult)
       .map {
         StripeApi.PaymentIntent(it.id, it.clientSecret)
@@ -370,7 +383,13 @@ class DonationPaymentRepository(activity: Activity) : StripeApi.PaymentIntentFet
   override fun fetchSetupIntent(): Single<StripeApi.SetupIntent> {
     Log.d(TAG, "Fetching setup intent from Signal service...")
     return Single.fromCallable { SignalStore.donationsValues().requireSubscriber() }
-      .flatMap { ApplicationDependencies.getDonationsService().createSubscriptionPaymentMethod(it.subscriberId) }
+      .flatMap {
+        Single.fromCallable {
+          ApplicationDependencies
+            .getDonationsService()
+            .createSubscriptionPaymentMethod(it.subscriberId)
+        }
+      }
       .flatMap(ServiceResponse<SubscriptionClientSecret>::flattenResult)
       .map { StripeApi.SetupIntent(it.id, it.clientSecret) }
       .doOnSuccess {
@@ -383,7 +402,11 @@ class DonationPaymentRepository(activity: Activity) : StripeApi.PaymentIntentFet
     return Single.fromCallable {
       SignalStore.donationsValues().requireSubscriber()
     }.flatMap {
-      ApplicationDependencies.getDonationsService().setDefaultPaymentMethodId(it.subscriberId, paymentMethodId)
+      Single.fromCallable {
+        ApplicationDependencies
+          .getDonationsService()
+          .setDefaultPaymentMethodId(it.subscriberId, paymentMethodId)
+      }
     }.flatMap(ServiceResponse<EmptyResponse>::flattenResult).ignoreElement().doOnComplete {
       Log.d(TAG, "Set default payment method via Signal service!")
     }

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

@@ -23,7 +23,7 @@ class SubscriptionsRepository(private val donationsService: DonationsService) {
   fun getActiveSubscription(): Single<ActiveSubscription> {
     val localSubscription = SignalStore.donationsValues().getSubscriber()
     return if (localSubscription != null) {
-      donationsService.getSubscription(localSubscription.subscriberId)
+      Single.fromCallable { donationsService.getSubscription(localSubscription.subscriberId) }
         .subscribeOn(Schedulers.io())
         .flatMap(ServiceResponse<ActiveSubscription>::flattenResult)
     } else {
@@ -31,7 +31,8 @@ class SubscriptionsRepository(private val donationsService: DonationsService) {
     }
   }
 
-  fun getSubscriptions(): Single<List<Subscription>> = donationsService.getSubscriptionLevels(Locale.getDefault())
+  fun getSubscriptions(): Single<List<Subscription>> = Single
+    .fromCallable { donationsService.getSubscriptionLevels(Locale.getDefault()) }
     .subscribeOn(Schedulers.io())
     .flatMap(ServiceResponse<SubscriptionLevels>::flattenResult)
     .map { subscriptionLevels ->

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/boost/BoostRepository.kt

@@ -5,6 +5,7 @@ import io.reactivex.rxjava3.schedulers.Schedulers
 import org.signal.core.util.money.FiatMoney
 import org.thoughtcrime.securesms.badges.Badges
 import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.util.PlatformCurrencyUtil
 import org.whispersystems.signalservice.api.profiles.SignalServiceProfile
 import org.whispersystems.signalservice.api.services.DonationsService
@@ -16,7 +17,7 @@ import java.util.Locale
 class BoostRepository(private val donationsService: DonationsService) {
 
   fun getBoosts(): Single<Map<Currency, List<Boost>>> {
-    return donationsService.boostAmounts
+    return Single.fromCallable { donationsService.boostAmounts }
       .subscribeOn(Schedulers.io())
       .flatMap(ServiceResponse<Map<String, List<BigDecimal>>>::flattenResult)
       .map { result ->
@@ -28,7 +29,11 @@ class BoostRepository(private val donationsService: DonationsService) {
   }
 
   fun getBoostBadge(): Single<Badge> {
-    return donationsService.getBoostBadge(Locale.getDefault())
+    return Single
+      .fromCallable {
+        ApplicationDependencies.getDonationsService()
+          .getBoostBadge(Locale.getDefault())
+      }
       .subscribeOn(Schedulers.io())
       .flatMap(ServiceResponse<SignalServiceProfile.Badge>::flattenResult)
       .map(Badges::fromServiceBadge)

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/manage/ManageDonationsFragment.kt

@@ -242,7 +242,7 @@ class ManageDonationsFragment : DSLSettingsFragment(), ExpiredGiftSheet.Callback
       }
     )
 
-    if (FeatureFlags.giftBadges() && Recipient.self().giftBadgesCapability == Recipient.Capability.SUPPORTED) {
+    if (FeatureFlags.giftBadgeSendSupport() && Recipient.self().giftBadgesCapability == Recipient.Capability.SUPPORTED) {
       clickPref(
         title = DSLSettingsText.from(R.string.ManageDonationsFragment__gift_a_badge),
         icon = DSLSettingsIcon.from(R.drawable.ic_gift_24),

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailRepository.kt

@@ -9,9 +9,12 @@ import java.util.Locale
 
 class DonationReceiptDetailRepository {
   fun getSubscriptionLevelName(subscriptionLevel: Int): Single<String> {
-    return ApplicationDependencies
-      .getDonationsService()
-      .getSubscriptionLevels(Locale.getDefault())
+    return Single
+      .fromCallable {
+        ApplicationDependencies
+          .getDonationsService()
+          .getSubscriptionLevels(Locale.getDefault())
+      }
       .flatMap { it.flattenResult() }
       .map { it.levels[subscriptionLevel.toString()] ?: throw Exception("Subscription level $subscriptionLevel not found") }
       .map { it.name }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/list/DonationReceiptListRepository.kt

@@ -9,7 +9,11 @@ import java.util.Locale
 
 class DonationReceiptListRepository {
   fun getBadges(): Single<List<DonationReceiptBadge>> {
-    val boostBadges: Single<List<DonationReceiptBadge>> = ApplicationDependencies.getDonationsService().getBoostBadge(Locale.getDefault())
+    val boostBadges: Single<List<DonationReceiptBadge>> = Single
+      .fromCallable {
+        ApplicationDependencies.getDonationsService()
+          .getBoostBadge(Locale.getDefault())
+      }
       .map { response ->
         if (response.result.isPresent) {
           listOf(DonationReceiptBadge(DonationReceiptRecord.Type.BOOST, -1, Badges.fromServiceBadge(response.result.get())))
@@ -18,7 +22,8 @@ class DonationReceiptListRepository {
         }
       }
 
-    val subBadges: Single<List<DonationReceiptBadge>> = ApplicationDependencies.getDonationsService().getSubscriptionLevels(Locale.getDefault())
+    val subBadges: Single<List<DonationReceiptBadge>> = Single
+      .fromCallable { ApplicationDependencies.getDonationsService().getSubscriptionLevels(Locale.getDefault()) }
       .map { response ->
         if (response.result.isPresent) {
           response.result.get().levels.map {

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/subscribe/SubscribeFragment.kt

@@ -30,6 +30,7 @@ import org.thoughtcrime.securesms.components.settings.app.subscription.models.Cu
 import org.thoughtcrime.securesms.components.settings.app.subscription.models.GooglePayButton
 import org.thoughtcrime.securesms.components.settings.app.subscription.models.NetworkFailure
 import org.thoughtcrime.securesms.components.settings.configure
+import org.thoughtcrime.securesms.components.settings.models.Button
 import org.thoughtcrime.securesms.components.settings.models.Progress
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.payments.FiatMoneyUtil
@@ -38,6 +39,7 @@ import org.thoughtcrime.securesms.util.LifecycleDisposable
 import org.thoughtcrime.securesms.util.SpanUtil
 import org.thoughtcrime.securesms.util.fragments.requireListener
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
+import org.thoughtcrime.securesms.util.visible
 import java.util.Currency
 import java.util.concurrent.TimeUnit
 
@@ -63,6 +65,10 @@ class SubscribeFragment : DSLSettingsFragment(
   private lateinit var processingDonationPaymentDialog: AlertDialog
   private lateinit var donationPaymentComponent: DonationPaymentComponent
 
+  private lateinit var googlePayButtonViewHolder: GooglePayButton.ViewHolder
+  private lateinit var updateSubscriptionButtonViewHolder: Button.ViewHolder<Button.Model.Primary>
+  private lateinit var cancelSubscriptionButtonViewHolder: Button.ViewHolder<Button.Model.SecondaryNoOutline>
+
   private var errorDialog: DialogInterface? = null
 
   private val viewModel: SubscribeViewModel by viewModels(
@@ -83,16 +89,20 @@ class SubscribeFragment : DSLSettingsFragment(
     BadgePreview.register(adapter)
     CurrencySelection.register(adapter)
     Subscription.register(adapter)
-    GooglePayButton.register(adapter)
     Progress.register(adapter)
     NetworkFailure.register(adapter)
 
+    googlePayButtonViewHolder = GooglePayButton.ViewHolder(requireView().findViewById(R.id.pay_button_wrapper))
+    updateSubscriptionButtonViewHolder = Button.ViewHolder(requireView().findViewById(R.id.update_button_wrapper))
+    cancelSubscriptionButtonViewHolder = Button.ViewHolder(requireView().findViewById(R.id.cancel_button_wrapper))
+
     processingDonationPaymentDialog = MaterialAlertDialogBuilder(requireContext())
       .setView(R.layout.processing_payment_dialog)
       .setCancelable(false)
       .create()
 
     viewModel.state.observe(viewLifecycleOwner) { state ->
+      bindFixedButtons(state)
       adapter.submitList(getConfiguration(state).toMappingModelList())
     }
 
@@ -202,71 +212,83 @@ class SubscribeFragment : DSLSettingsFragment(
           )
         }
       }
+    }
+  }
 
-      if (state.activeSubscription?.isActive == true) {
-        space(DimensionUnit.DP.toPixels(16f).toInt())
+  private fun bindFixedButtons(state: SubscribeState) {
+    val areFieldsEnabled = state.stage == SubscribeState.Stage.READY && !state.hasInProgressSubscriptionTransaction
 
-        val activeAndSameLevel = state.activeSubscription.isActive &&
-          state.selectedSubscription?.level == state.activeSubscription.activeSubscription?.level
+    if (state.activeSubscription?.isActive == true) {
+      val activeAndSameLevel = state.activeSubscription.isActive &&
+        state.selectedSubscription?.level == state.activeSubscription.activeSubscription?.level
 
-        primaryButton(
-          text = DSLSettingsText.from(R.string.SubscribeFragment__update_subscription),
-          isEnabled = areFieldsEnabled && (!activeAndSameLevel || state.isSubscriptionExpiring()),
-          onClick = {
-            val price = viewModel.getPriceOfSelectedSubscription() ?: return@primaryButton
+      val updateModel = Button.Model.Primary(
+        title = DSLSettingsText.from(R.string.SubscribeFragment__update_subscription),
+        icon = null,
+        isEnabled = areFieldsEnabled && (!activeAndSameLevel || state.isSubscriptionExpiring()),
+        onClick = {
+          val price = viewModel.getPriceOfSelectedSubscription() ?: return@Primary
 
-            MaterialAlertDialogBuilder(requireContext())
-              .setTitle(R.string.SubscribeFragment__update_subscription_question)
-              .setMessage(
-                getString(
-                  R.string.SubscribeFragment__you_will_be_charged_the_full_amount_s_of,
-                  FiatMoneyUtil.format(
-                    requireContext().resources,
-                    price,
-                    FiatMoneyUtil.formatOptions().trimZerosAfterDecimal()
-                  )
+          MaterialAlertDialogBuilder(requireContext())
+            .setTitle(R.string.SubscribeFragment__update_subscription_question)
+            .setMessage(
+              getString(
+                R.string.SubscribeFragment__you_will_be_charged_the_full_amount_s_of,
+                FiatMoneyUtil.format(
+                  requireContext().resources,
+                  price,
+                  FiatMoneyUtil.formatOptions().trimZerosAfterDecimal()
                 )
               )
-              .setPositiveButton(R.string.SubscribeFragment__update) { dialog, _ ->
-                dialog.dismiss()
-                viewModel.updateSubscription()
-              }
-              .setNegativeButton(android.R.string.cancel) { dialog, _ ->
-                dialog.dismiss()
-              }
-              .show()
-          }
-        )
+            )
+            .setPositiveButton(R.string.SubscribeFragment__update) { dialog, _ ->
+              dialog.dismiss()
+              viewModel.updateSubscription()
+            }
+            .setNegativeButton(android.R.string.cancel) { dialog, _ ->
+              dialog.dismiss()
+            }
+            .show()
+        }
+      )
 
-        secondaryButtonNoOutline(
-          text = DSLSettingsText.from(R.string.SubscribeFragment__cancel_subscription),
-          isEnabled = areFieldsEnabled,
-          onClick = {
-            MaterialAlertDialogBuilder(requireContext())
-              .setTitle(R.string.SubscribeFragment__confirm_cancellation)
-              .setMessage(R.string.SubscribeFragment__you_wont_be_charged_again)
-              .setPositiveButton(R.string.SubscribeFragment__confirm) { d, _ ->
-                d.dismiss()
-                viewModel.cancel()
-              }
-              .setNegativeButton(R.string.SubscribeFragment__not_now) { d, _ ->
-                d.dismiss()
-              }
-              .show()
-          }
-        )
-      } else {
-        space(DimensionUnit.DP.toPixels(16f).toInt())
+      updateSubscriptionButtonViewHolder.bind(updateModel)
 
-        customPref(
-          GooglePayButton.Model(
-            onClick = this@SubscribeFragment::onGooglePayButtonClicked,
-            isEnabled = areFieldsEnabled && state.selectedSubscription != null
-          )
-        )
+      val cancelModel = Button.Model.SecondaryNoOutline(
+        title = DSLSettingsText.from(R.string.SubscribeFragment__cancel_subscription),
+        icon = null,
+        isEnabled = areFieldsEnabled,
+        onClick = {
+          MaterialAlertDialogBuilder(requireContext())
+            .setTitle(R.string.SubscribeFragment__confirm_cancellation)
+            .setMessage(R.string.SubscribeFragment__you_wont_be_charged_again)
+            .setPositiveButton(R.string.SubscribeFragment__confirm) { d, _ ->
+              d.dismiss()
+              viewModel.cancel()
+            }
+            .setNegativeButton(R.string.SubscribeFragment__not_now) { d, _ ->
+              d.dismiss()
+            }
+            .show()
+        }
+      )
 
-        space(DimensionUnit.DP.toPixels(8f).toInt())
-      }
+      cancelSubscriptionButtonViewHolder.bind(cancelModel)
+
+      updateSubscriptionButtonViewHolder.itemView.visible = true
+      cancelSubscriptionButtonViewHolder.itemView.visible = true
+      googlePayButtonViewHolder.itemView.visible = false
+    } else {
+      val googlePayModel = GooglePayButton.Model(
+        onClick = this@SubscribeFragment::onGooglePayButtonClicked,
+        isEnabled = areFieldsEnabled && state.selectedSubscription != null
+      )
+
+      googlePayButtonViewHolder.bind(googlePayModel)
+
+      updateSubscriptionButtonViewHolder.itemView.visible = false
+      cancelSubscriptionButtonViewHolder.itemView.visible = false
+      googlePayButtonViewHolder.itemView.visible = true
     }
   }
 

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

@@ -195,7 +195,7 @@ class ConversationSettingsFragment : DSLSettingsFragment(
   override fun getMaterial3OnScrollHelper(toolbar: Toolbar?): Material3OnScrollHelper {
     return object : Material3OnScrollHelper(requireActivity(), toolbar!!) {
       override val inactiveColorSet = ColorSet(
-        toolbarColorRes = R.color.transparent,
+        toolbarColorRes = R.color.signal_colorBackground_0,
         statusBarColorRes = R.color.signal_colorBackground
       )
     }
@@ -235,7 +235,7 @@ class ConversationSettingsFragment : DSLSettingsFragment(
         }
 
         state.withRecipientSettingsState {
-          toolbarTitle.text = state.recipient.getDisplayName(requireContext())
+          toolbarTitle.text = if (state.recipient.isSelf) getString(R.string.note_to_self) else state.recipient.getDisplayName(requireContext())
         }
 
         state.withGroupSettingsState {
@@ -420,7 +420,7 @@ class ConversationSettingsFragment : DSLSettingsFragment(
         enabled = it.canEditGroupAttributes && !state.recipient.isBlocked
       }
 
-      if (!state.recipient.isReleaseNotes) {
+      if (!state.recipient.isReleaseNotes && !state.recipient.isBlocked) {
         clickPref(
           title = DSLSettingsText.from(R.string.ConversationSettingsFragment__disappearing_messages),
           summary = summary,
@@ -557,15 +557,17 @@ class ConversationSettingsFragment : DSLSettingsFragment(
             )
           )
 
-          customPref(
-            LargeIconClickPreference.Model(
-              title = DSLSettingsText.from(R.string.ConversationSettingsFragment__add_to_a_group),
-              icon = DSLSettingsIcon.from(R.drawable.add_to_a_group, NO_TINT),
-              onClick = {
-                viewModel.onAddToGroup()
-              }
+          if (!state.recipient.isBlocked) {
+            customPref(
+              LargeIconClickPreference.Model(
+                title = DSLSettingsText.from(R.string.ConversationSettingsFragment__add_to_a_group),
+                icon = DSLSettingsIcon.from(R.drawable.add_to_a_group, NO_TINT),
+                onClick = {
+                  viewModel.onAddToGroup()
+                }
+              )
             )
-          )
+          }
 
           for (group in recipientSettingsState.groupsInCommon) {
             customPref(

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

@@ -62,7 +62,7 @@ class ConversationSettingsRepository(
 
   fun getThreadId(groupId: GroupId, consumer: (Long) -> Unit) {
     SignalExecutors.BOUNDED.execute {
-      val recipientId = Recipient.externalGroupExact(context, groupId).id
+      val recipientId = Recipient.externalGroupExact(groupId).id
       consumer(SignalDatabase.threads.getThreadIdIfExistsFor(recipientId))
     }
   }
@@ -156,7 +156,7 @@ class ConversationSettingsRepository(
 
   fun setMuteUntil(groupId: GroupId, until: Long) {
     SignalExecutors.BOUNDED.execute {
-      val recipientId = Recipient.externalGroupExact(context, groupId).id
+      val recipientId = Recipient.externalGroupExact(groupId).id
       SignalDatabase.recipients.setMuted(recipientId, until)
     }
   }
@@ -181,14 +181,14 @@ class ConversationSettingsRepository(
 
   fun block(groupId: GroupId) {
     SignalExecutors.BOUNDED.execute {
-      val recipient = Recipient.externalGroupExact(context, groupId)
+      val recipient = Recipient.externalGroupExact(groupId)
       RecipientUtil.block(context, recipient)
     }
   }
 
   fun unblock(groupId: GroupId) {
     SignalExecutors.BOUNDED.execute {
-      val recipient = Recipient.externalGroupExact(context, groupId)
+      val recipient = Recipient.externalGroupExact(groupId)
       RecipientUtil.unblock(context, recipient)
     }
   }
@@ -204,7 +204,7 @@ class ConversationSettingsRepository(
 
   fun getExternalPossiblyMigratedGroupRecipientId(groupId: GroupId, consumer: (RecipientId) -> Unit) {
     SignalExecutors.BOUNDED.execute {
-      consumer(Recipient.externalPossiblyMigratedGroup(context, groupId).id)
+      consumer(Recipient.externalPossiblyMigratedGroup(groupId).id)
     }
   }
 }

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

@@ -152,7 +152,7 @@ sealed class ConversationSettingsViewModel(
           canModifyBlockedState = !recipient.isSelf && RecipientUtil.isBlockable(recipient),
           specificSettingsState = state.requireRecipientSettingsState().copy(
             contactLinkState = when {
-              recipient.isSelf || recipient.isReleaseNotes -> ContactLinkState.NONE
+              recipient.isSelf || recipient.isReleaseNotes || recipient.isBlocked -> ContactLinkState.NONE
               recipient.isSystemContact -> ContactLinkState.OPEN
               else -> ContactLinkState.ADD
             }
@@ -381,7 +381,7 @@ sealed class ConversationSettingsViewModel(
     private fun getLegacyGroupState(recipient: Recipient): LegacyGroupPreference.State {
       val showLegacyInfo = recipient.requireGroupId().isV1
 
-      return if (showLegacyInfo && recipient.participants.size > FeatureFlags.groupLimits().hardLimit) {
+      return if (showLegacyInfo && recipient.participantIds.size > FeatureFlags.groupLimits().hardLimit) {
         LegacyGroupPreference.State.TOO_LARGE
       } else if (showLegacyInfo) {
         LegacyGroupPreference.State.UPGRADE

app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/sounds/custom/CustomNotificationsSettingsRepository.kt

@@ -25,7 +25,8 @@ class CustomNotificationsSettingsRepository(context: Context) {
         val recipient = Recipient.resolved(recipientId)
         val database = SignalDatabase.recipients
         if (recipient.notificationChannel != null) {
-          database.setMessageRingtone(recipient.id, NotificationChannels.getMessageRingtone(context, recipient))
+          val ringtoneUri: Uri? = NotificationChannels.getMessageRingtone(context, recipient)
+          database.setMessageRingtone(recipient.id, if (ringtoneUri == Uri.EMPTY) null else ringtoneUri)
           database.setMessageVibrate(recipient.id, RecipientDatabase.VibrateState.fromBoolean(NotificationChannels.getMessageVibrate(context, recipient)))
         }
       }

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

@@ -185,6 +185,15 @@ class DSLConfiguration {
     children.add(preference)
   }
 
+  fun learnMoreTextPref(
+    title: DSLSettingsText? = null,
+    summary: DSLSettingsText? = null,
+    onClick: () -> Unit
+  ) {
+    val preference = LearnMoreTextPreference(title, summary, onClick)
+    children.add(preference)
+  }
+
   fun toMappingModelList(): MappingModelList = MappingModelList().apply { addAll(children) }
 }
 
@@ -218,6 +227,12 @@ class TextPreference(
   summary: DSLSettingsText?
 ) : PreferenceModel<TextPreference>(title = title, summary = summary)
 
+class LearnMoreTextPreference(
+  override val title: DSLSettingsText?,
+  override val summary: DSLSettingsText?,
+  val onClick: () -> Unit
+) : PreferenceModel<LearnMoreTextPreference>()
+
 class DividerPreference : PreferenceModel<DividerPreference>() {
   override fun areItemsTheSame(newItem: DividerPreference) = true
 }

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

@@ -2,7 +2,9 @@ package org.thoughtcrime.securesms.components.settings.models
 
 import android.view.View
 import android.widget.ImageView
+import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
+import androidx.core.content.ContextCompat
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.PreferenceModel
 import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
@@ -18,9 +20,9 @@ object SplashImage {
     mappingAdapter.registerFactory(Model::class.java, LayoutFactory(::ViewHolder, R.layout.splash_image))
   }
 
-  class Model(@DrawableRes val splashImageResId: Int) : PreferenceModel<Model>() {
+  class Model(@DrawableRes val splashImageResId: Int, @ColorRes val splashImageTintResId: Int = -1) : PreferenceModel<Model>() {
     override fun areItemsTheSame(newItem: Model): Boolean {
-      return newItem.splashImageResId == splashImageResId
+      return newItem.splashImageResId == splashImageResId && newItem.splashImageTintResId == splashImageTintResId
     }
   }
 
@@ -30,6 +32,12 @@ object SplashImage {
 
     override fun bind(model: Model) {
       splashImageView.setImageResource(model.splashImageResId)
+
+      if (model.splashImageTintResId != -1) {
+        splashImageView.setColorFilter(ContextCompat.getColor(context, model.splashImageTintResId))
+      } else {
+        splashImageView.clearColorFilter()
+      }
     }
   }
 }

app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteMediaItemFactory.java

@@ -175,7 +175,8 @@ class VoiceNoteMediaItemFactory {
                                sender.getDisplayName(context),
                                threadRecipient.getDisplayName(context));
     } else if (preference.isDisplayContact()) {
-      return sender.getDisplayName(context);
+      return sender.isSelf() ? context.getString(R.string.note_to_self)
+                             : sender.getDisplayName(context);
     } else {
       return context.getString(R.string.MessageNotifier_signal_message);
     }

app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackController.kt

@@ -11,17 +11,23 @@ import com.google.android.exoplayer2.SimpleExoPlayer
 import com.google.android.exoplayer2.audio.AudioAttributes
 import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector
 import com.google.android.exoplayer2.util.Util
+import org.signal.core.util.logging.Log
 
 class VoiceNotePlaybackController(
   private val player: SimpleExoPlayer,
   private val voiceNotePlaybackParameters: VoiceNotePlaybackParameters
 ) : MediaSessionConnector.CommandReceiver {
 
+  companion object {
+    private val TAG = Log.tag(VoiceNoteMediaController::class.java)
+  }
+
   @Suppress("deprecation")
   override fun onCommand(p: Player, controlDispatcher: ControlDispatcher, command: String, extras: Bundle?, cb: ResultReceiver?): Boolean {
+    Log.d(TAG, "[onCommand] Received player command $command (extras? ${extras != null})")
+
     if (command == VoiceNotePlaybackService.ACTION_NEXT_PLAYBACK_SPEED) {
       val speed = extras?.getFloat(VoiceNotePlaybackService.ACTION_NEXT_PLAYBACK_SPEED, 1f) ?: 1f
-
       player.playbackParameters = PlaybackParameters(speed)
       voiceNotePlaybackParameters.setSpeed(speed)
       return true

app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlayerView.kt

@@ -47,6 +47,7 @@ class VoiceNotePlayerView @JvmOverloads constructor(
 
   init {
     inflate(context, R.layout.voice_note_player_view, this)
+    layoutDirection = LAYOUT_DIRECTION_LTR
 
     playPauseToggleView = findViewById(R.id.voice_note_player_play_pause_toggle)
     infoView = findViewById(R.id.voice_note_player_info)

app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNoteProximityWakeLockManager.kt

@@ -82,6 +82,7 @@ class VoiceNoteProximityWakeLockManager(
     sensorManager.unregisterListener(hardwareSensorEventListener)
 
     if (wakeLock?.isHeld == true) {
+      Log.d(TAG, "[cleanUpWakeLock] Releasing wake lock.")
       wakeLock.release()
     }
 
@@ -102,10 +103,14 @@ class VoiceNoteProximityWakeLockManager(
 
       if (isPlayerActive()) {
         if (startTime == -1L) {
+          Log.d(TAG, "[onPlaybackStateChanged] Player became active with start time $startTime, registering sensor listener.")
           startTime = System.currentTimeMillis()
           sensorManager.registerListener(hardwareSensorEventListener, proximitySensor, SensorManager.SENSOR_DELAY_NORMAL)
+        } else {
+          Log.d(TAG, "[onPlaybackStateChanged] Player became active without start time, skipping sensor registration")
         }
       } else {
+        Log.d(TAG, "[onPlaybackStateChanged] Player became inactive. Cleaning up wake lock.")
         cleanUpWakeLock()
       }
     }
@@ -132,12 +137,14 @@ class VoiceNoteProximityWakeLockManager(
 
       if (newStreamType == AudioManager.STREAM_VOICE_CALL) {
         if (wakeLock?.isHeld == false) {
+          Log.d(TAG, "[onSensorChanged] Acquiring wakelock")
           wakeLock.acquire(TimeUnit.MINUTES.toMillis(30))
         }
 
         startTime = System.currentTimeMillis()
       } else {
         if (wakeLock?.isHeld == true) {
+          Log.d(TAG, "[onSensorChanged] Releasing wakelock")
           wakeLock.release()
         }
       }

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantView.java

@@ -253,7 +253,7 @@ public class CallParticipantView extends ConstraintLayout {
   }
 
   private void setPipAvatar(@NonNull Recipient recipient) {
-    ContactPhoto         contactPhoto  = recipient.isSelf() ? new ProfileContactPhoto(Recipient.self(), Recipient.self().getProfileAvatar())
+    ContactPhoto         contactPhoto  = recipient.isSelf() ? new ProfileContactPhoto(Recipient.self())
                                                             : recipient.getContactPhoto();
     FallbackContactPhoto fallbackPhoto = recipient.getFallbackContactPhoto(FALLBACK_PHOTO_PROVIDER);
 

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAudioOutputToggleButton.java

@@ -8,11 +8,12 @@ import android.util.AttributeSet;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 import org.thoughtcrime.securesms.R;
 
 import java.util.ArrayList;
@@ -113,7 +114,7 @@ public class WebRtcAudioOutputToggleButton extends AppCompatImageView {
     rv.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false));
     rv.setAdapter(adapter);
 
-    picker = new AlertDialog.Builder(getContext(), R.style.Theme_Signal_AlertDialog_Dark_Cornered)
+    picker = new MaterialAlertDialogBuilder(getContext())
                             .setTitle(R.string.WebRtcAudioOutputToggle__audio_output)
                             .setView(rv)
                             .setCancelable(true)

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java

@@ -505,7 +505,7 @@ public class WebRtcCallView extends ConstraintLayout {
         largeLocalRenderNoVideoAvatar.setVisibility(View.VISIBLE);
 
         GlideApp.with(getContext().getApplicationContext())
-                .load(new ProfileContactPhoto(localCallParticipant.getRecipient(), localCallParticipant.getRecipient().getProfileAvatar()))
+                .load(new ProfileContactPhoto(localCallParticipant.getRecipient()))
                 .transform(new CenterCrop(), new BlurTransformation(getContext(), 0.25f, BlurTransformation.MAX_RADIUS))
                 .diskCacheStrategy(DiskCacheStrategy.ALL)
                 .into(largeLocalRenderNoVideoAvatar);

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallViewModel.java

@@ -32,6 +32,7 @@ import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.service.webrtc.state.WebRtcEphemeralState;
 import org.thoughtcrime.securesms.util.DefaultValueLiveData;
+import org.thoughtcrime.securesms.util.NetworkUtil;
 import org.thoughtcrime.securesms.util.SingleLiveEvent;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.livedata.LiveDataUtil;
@@ -74,6 +75,7 @@ public class WebRtcCallViewModel extends ViewModel {
   private final Runnable stopOutgoingRingingMode = this::stopOutgoingRingingMode;
 
   private boolean               canDisplayTooltipIfNeeded = true;
+  private boolean               canDisplayPopupIfNeeded   = true;
   private boolean               hasEnabledLocalVideo      = false;
   private boolean               wasInOutgoingRingingMode  = false;
   private long                  callConnectedTime         = -1;
@@ -292,6 +294,13 @@ public class WebRtcCallViewModel extends ViewModel {
       canDisplayTooltipIfNeeded = false;
       events.setValue(new Event.ShowVideoTooltip());
     }
+
+    if (canDisplayPopupIfNeeded && webRtcViewModel.isCellularConnection() && NetworkUtil.isConnectedWifi(ApplicationDependencies.getApplication())) {
+      canDisplayPopupIfNeeded = false;
+      events.setValue(new Event.ShowWifiToCellularPopup());
+    } else if (!webRtcViewModel.isCellularConnection()) {
+      canDisplayPopupIfNeeded = true;
+    }
   }
 
   @MainThread
@@ -481,6 +490,9 @@ public class WebRtcCallViewModel extends ViewModel {
     public static class DismissVideoTooltip extends Event {
     }
 
+    public static class ShowWifiToCellularPopup extends Event {
+    }
+
     public static class StartCall extends Event {
       private final boolean isVideoCall;