Bump version to 5.41.14

Improve resiliance of FCM fetch.
Bump version to 5.41.13
2026-04-11 12:40:57 +01:00 · 2022-07-05 14:12:03 -04:00 · 2022-07-05 14:10:36 -04:00 · 2022-07-01 15:37:44 -04:00 · 2022-07-01 15:22:12 -04:00 · 2022-07-01 13:03:20 -04:00
1977 changed files with 258687 additions and 395262 deletions
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -14,12 +14,11 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2

    - name: set up JDK 11
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v1
      with:
-        distribution: temurin
        java-version: 11

    - name: Validate Gradle Wrapper
@@ -33,7 +32,7 @@ jobs:

    - name: Archive reports for failed build
      if: ${{ failure() }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v2
      with:
        name: reports
        path: '*/build/reports'
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -10,7 +10,7 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
    - name: Build image
      run: cd reproducible-builds && docker build -t signal-android . && cd ..

--- a/.gitignore
+++ b/.gitignore
@@ -27,4 +27,3 @@ obj/
 jni/libspeex/.deps/
 pkcs11.password
 dev.keystore
-maps.key
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -15,6 +15,11 @@ 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
@@ -70,6 +75,10 @@ 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.
--- a/README.md
+++ b/README.md
@@ -21,6 +21,11 @@ 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.
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -57,15 +57,15 @@ ktlint {
    version = "0.43.2"
 }

-def canonicalVersionCode = 1130
-def canonicalVersionName = "5.51.1"
+def canonicalVersionCode = 1076
+def canonicalVersionName = "5.41.14"

 def postFixSize = 100
-def abiPostFix = ['universal'   : 0,
-                  'armeabi-v7a' : 1,
-                  'arm64-v8a'   : 2,
-                  'x86'         : 3,
-                  'x86_64'      : 4]
+def abiPostFix = ['universal'   : 15,
+                  'armeabi-v7a' : 16,
+                  'arm64-v8a'   : 17,
+                  'x86'         : 18,
+                  'x86_64'      : 19]

 def keystores = [ 'debug'  : loadKeystoreProperties('keystore.debug.properties') ]

@@ -76,12 +76,10 @@ def selectableVariants = [
        'playProdDebug',
        'playProdSpinner',
        'playProdPerf',
-        'playProdInstrumentation',
        'playProdRelease',
        'playStagingDebug',
        'playStagingSpinner',
        'playStagingPerf',
-        'playStagingInstrumentation',
        'playStagingRelease',
        'websiteProdSpinner',
        'websiteProdRelease',
@@ -93,7 +91,6 @@ android {

    flavorDimensions 'distribution', 'environment'
    useLibrary 'org.apache.http.legacy'
-    testBuildType 'instrumentation'

    kotlinOptions {
        jvmTarget = "1.8"
@@ -158,9 +155,6 @@ android {
        exclude 'signal_jni.dll'
    }

-    buildFeatures {
-        viewBinding true
-    }

    defaultConfig {
        versionCode canonicalVersionCode * postFixSize
@@ -174,8 +168,6 @@ android {
        vectorDrawables.useSupportLibrary = true
        project.ext.set("archivesBaseName", "Signal");

-        manifestPlaceholders = [mapsKey:"AIzaSyCSx9xea86GwDKGznCAULE9Y5a8b-TfN9U"]
-
        buildConfigField "long", "BUILD_TIMESTAMP", getLastCommitTimestamp() + "L"
        buildConfigField "String", "GIT_HASH", "\"${getGitHash()}\""
        buildConfigField "String", "SIGNAL_URL", "\"https://chat.signal.org\""
@@ -183,7 +175,7 @@ android {
        buildConfigField "String", "SIGNAL_CDN_URL", "\"https://cdn.signal.org\""
        buildConfigField "String", "SIGNAL_CDN2_URL", "\"https://cdn2.signal.org\""
        buildConfigField "String", "SIGNAL_CONTACT_DISCOVERY_URL", "\"https://api.directory.signal.org\""
-        buildConfigField "String", "SIGNAL_CDSI_URL", "\"https://cdsi.signal.org\""
+        buildConfigField "String", "SIGNAL_CDSI_URL", "\"https://cdsi.staging.signal.org\""
        buildConfigField "String", "SIGNAL_SERVICE_STATUS_URL", "\"uptime.signal.org\""
        buildConfigField "String", "SIGNAL_KEY_BACKUP_URL", "\"https://api.backup.signal.org\""
        buildConfigField "String", "SIGNAL_SFU_URL", "\"https://sfu.voip.signal.org\""
@@ -200,16 +192,14 @@ android {
        buildConfigField "String[]", "SIGNAL_SFU_IPS", sfu_ips
        buildConfigField "String[]", "SIGNAL_CONTENT_PROXY_IPS", content_proxy_ips
        buildConfigField "String", "SIGNAL_AGENT", "\"OWA\""
-        buildConfigField "String", "CDS_MRENCLAVE", "\"74778bb0f93ae1f78c26e67152bab0bbeb693cd56d1bb9b4e9244157acc58081\""
-        buildConfigField "String", "CDSI_MRENCLAVE", "\"ef4787a56a154ac6d009138cac17155acd23cfe4329281252365dd7c252e7fbf\""
-        buildConfigField "org.thoughtcrime.securesms.KbsEnclave", "KBS_ENCLAVE", "new org.thoughtcrime.securesms.KbsEnclave(\"e18376436159cda3ad7a45d9320e382e4a497f26b0dca34d8eab0bd0139483b5\", " +
-                                                                                                                           "\"3a485adb56e2058ef7737764c738c4069dd62bc457637eafb6bbce1ce29ddb89\", " +
-                                                                                                                           "\"45627094b2ea4a66f4cf0b182858a8dcf4b8479122c3820fe7fd0551a6d4cf5c\")"
-        buildConfigField "org.thoughtcrime.securesms.KbsEnclave[]", "KBS_FALLBACKS", "new org.thoughtcrime.securesms.KbsEnclave[] { new org.thoughtcrime.securesms.KbsEnclave(\"0cedba03535b41b67729ce9924185f831d7767928a1d1689acb689bc079c375f\", " +
-                                                                                                                                                                             "\"187d2739d22be65e74b65f0055e74d31310e4267e5fac2b1246cc8beba81af39\", " +
-                                                                                                                                                                             "\"ee19f1965b1eefa3dc4204eb70c04f397755f771b8c1909d080c04dad2a6a9ba\") }"
+        buildConfigField "String", "CDS_MRENCLAVE", "\"c98e00a4e3ff977a56afefe7362a27e4961e4f19e211febfbb19b897e6b80b15\""
+        buildConfigField "String", "CDSI_MRENCLAVE", "\"42e36b74794abe612d698308b148ff8a7dc5fdc6ad28d99bc5024ed6ece18dfe\""
+        buildConfigField "org.thoughtcrime.securesms.KbsEnclave", "KBS_ENCLAVE", "new org.thoughtcrime.securesms.KbsEnclave(\"0cedba03535b41b67729ce9924185f831d7767928a1d1689acb689bc079c375f\", " +
+                                                                                                                           "\"187d2739d22be65e74b65f0055e74d31310e4267e5fac2b1246cc8beba81af39\", " +
+                                                                                                                           "\"ee19f1965b1eefa3dc4204eb70c04f397755f771b8c1909d080c04dad2a6a9ba\")"
+        buildConfigField "org.thoughtcrime.securesms.KbsEnclave[]", "KBS_FALLBACKS", "new org.thoughtcrime.securesms.KbsEnclave[0]"
        buildConfigField "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+ikU5gBXsRmoF94GXTLfN0/vLt98KDPnxwAQL9j5V1jGOY8jQl6MLxEs56cwXN0dqCnImzVH3TZT1cJ8SW1BRX6qIVxEzjsSGx3yxF3suAilPMqGRp4ffyopjMD1JXiKR2RwLKzizUe5e8XyGOy9fplzhw3jVzTRyUZTRSZKkMLWcQ/gv0E4aONNqs4P\""
+        buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY/JYJHRooo5CEqYKBqdFnmbTVGEkCvJKxLnjwKWf+fEPoWeQFj5ObDjcKMZf2Jm2Ae69x+ikU5gBXsRmoF94GXQ==\""
        buildConfigField "String[]", "LANGUAGES", "new String[]{\"" + autoResConfig().collect { s -> s.replace('-r', '_') }.join('", "') + '"}'
        buildConfigField "int", "CANONICAL_VERSION_CODE", "$canonicalVersionCode"
        buildConfigField "String", "DEFAULT_CURRENCIES", "\"EUR,AUD,GBP,CAD,CNY\""
@@ -238,7 +228,7 @@ android {
            }
        }

-        testInstrumentationRunner "org.thoughtcrime.securesms.testing.SignalTestRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        testInstrumentationRunnerArguments clearPackageData: 'true'
    }

@@ -270,21 +260,8 @@ android {
            testProguardFiles 'proguard/proguard-automation.pro',
                    'proguard/proguard.cfg'

-            manifestPlaceholders = [mapsKey:getMapsKey()]
-
            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
@@ -353,17 +330,14 @@ android {
            buildConfigField "String", "SIGNAL_CDN_URL", "\"https://cdn-staging.signal.org\""
            buildConfigField "String", "SIGNAL_CDN2_URL", "\"https://cdn2-staging.signal.org\""
            buildConfigField "String", "SIGNAL_CONTACT_DISCOVERY_URL", "\"https://api-staging.directory.signal.org\""
-            buildConfigField "String", "SIGNAL_CDSI_URL", "\"https://cdsi.staging.signal.org\""
            buildConfigField "String", "SIGNAL_KEY_BACKUP_URL", "\"https://api-staging.backup.signal.org\""
-            buildConfigField "String", "CDS_MRENCLAVE", "\"74778bb0f93ae1f78c26e67152bab0bbeb693cd56d1bb9b4e9244157acc58081\""
-            buildConfigField "org.thoughtcrime.securesms.KbsEnclave", "KBS_ENCLAVE", "new org.thoughtcrime.securesms.KbsEnclave(\"39963b736823d5780be96ab174869a9499d56d66497aa8f9b2244f777ebc366b\", " +
-                                                                                                                               "\"9dbc6855c198e04f21b5cc35df839fdcd51b53658454dfa3f817afefaffc95ef\", " +
-                                                                                                                               "\"45627094b2ea4a66f4cf0b182858a8dcf4b8479122c3820fe7fd0551a6d4cf5c\")"
-            buildConfigField "org.thoughtcrime.securesms.KbsEnclave[]", "KBS_FALLBACKS", "new org.thoughtcrime.securesms.KbsEnclave[] { new org.thoughtcrime.securesms.KbsEnclave(\"dd6f66d397d9e8cf6ec6db238e59a7be078dd50e9715427b9c89b409ffe53f99\", " +
-                                                                                                                                                                                 "\"4200003414528c151e2dccafbc87aa6d3d66a5eb8f8c05979a6e97cb33cd493a\", " +
-                                                                                                                                                                                 "\"ee19f1965b1eefa3dc4204eb70c04f397755f771b8c1909d080c04dad2a6a9ba\") }"
+            buildConfigField "String", "CDS_MRENCLAVE", "\"c98e00a4e3ff977a56afefe7362a27e4961e4f19e211febfbb19b897e6b80b15\""
+            buildConfigField "org.thoughtcrime.securesms.KbsEnclave", "KBS_ENCLAVE", "new org.thoughtcrime.securesms.KbsEnclave(\"dd6f66d397d9e8cf6ec6db238e59a7be078dd50e9715427b9c89b409ffe53f99\", " +
+                                                                                                                               "\"4200003414528c151e2dccafbc87aa6d3d66a5eb8f8c05979a6e97cb33cd493a\", " +
+                                                                                                                               "\"ee19f1965b1eefa3dc4204eb70c04f397755f771b8c1909d080c04dad2a6a9ba\")"
+            buildConfigField "org.thoughtcrime.securesms.KbsEnclave[]", "KBS_FALLBACKS", "new org.thoughtcrime.securesms.KbsEnclave[0]"
            buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx\""
-            buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXZSSsOZ6s7M1+rTJN0bI5CKY2PX29y5Ok3jSWufIKcgKOnWoP67d5b2du2ZVJjpjfibNIHbT/cegy/sBLoFwtHogVYUewANUAXIaMPyCLRArsKhfJ5wBtTminG/PAvuBdJ70Z/bXVPf8TVsR292zQ65xwvWTejROW6AZX6aqucUj\""
+            buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXQ==\""
            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\""
@@ -417,11 +391,10 @@ dependencies {

    implementation (libs.androidx.appcompat) {
        version {
-            strictly '1.5.1'
+            strictly '1.2.0'
        }
    }
-    implementation libs.androidx.window.window
-    implementation libs.androidx.window.java
+    implementation libs.androidx.window
    implementation libs.androidx.recyclerview
    implementation libs.material.material
    implementation libs.androidx.legacy.support
@@ -434,9 +407,7 @@ dependencies {
    implementation libs.androidx.multidex
    implementation libs.androidx.navigation.fragment.ktx
    implementation libs.androidx.navigation.ui.ktx
-    implementation libs.androidx.lifecycle.viewmodel.ktx
-    implementation libs.androidx.lifecycle.livedata.ktx
-    implementation libs.androidx.lifecycle.process
+    implementation libs.androidx.lifecycle.extensions
    implementation libs.androidx.lifecycle.viewmodel.savedstate
    implementation libs.androidx.lifecycle.common.java8
    implementation libs.androidx.lifecycle.reactivestreams.ktx
@@ -473,7 +444,6 @@ dependencies {
    implementation project(':donations')
    implementation project(':contacts')
    implementation project(':qr')
-    implementation project(':sms-exporter')

    implementation libs.libsignal.android
    implementation libs.google.protobuf.javalite
@@ -560,13 +530,6 @@ dependencies {
    androidTestImplementation testLibs.androidx.test.core
    androidTestImplementation testLibs.androidx.test.core.ktx
    androidTestImplementation testLibs.androidx.test.ext.junit.ktx
-    androidTestImplementation testLibs.mockito.android
-    androidTestImplementation testLibs.mockito.kotlin
-    androidTestImplementation testLibs.square.okhttp.mockserver
-
-    instrumentationImplementation (libs.androidx.fragment.testing) {
-        exclude group: 'androidx.test', module: 'core'
-    }

    testImplementation testLibs.espresso.core

@@ -578,7 +541,7 @@ dependencies {
    implementation libs.rxjava3.rxkotlin
    implementation libs.rxdogtag

-    androidTestUtil testLibs.androidx.test.orchestrator
+    androidTestUtil 'androidx.test:orchestrator:1.4.1'
 }

 def getLastCommitTimestamp() {
@@ -657,11 +620,3 @@ def getDateSuffix() {
    def formattedDate = date.format('yyyy-MM-dd-HH:mm')
    return formattedDate
 }
-
-def getMapsKey() {
-    def mapKey = file("${project.rootDir}/maps.key")
-    if (mapKey.exists()) {
-        return mapKey.readLines()[0]
-    }
-    return "AIzaSyCSx9xea86GwDKGznCAULE9Y5a8b-TfN9U"
-}
--- a/app/lint.xml
+++ b/app/lint.xml
@@ -41,5 +41,4 @@
        <ignore path="*/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java" />
    </issue>

-    <issue id="OptionalUsedAsFieldOrParameterType" severity="ignore" />
 </lint>
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/SignalInstrumentationApplicationContext.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/SignalInstrumentationApplicationContext.kt
@@ -1,15 +0,0 @@
-package org.thoughtcrime.securesms
-
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencyProvider
-import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
-
-/**
- * Application context for running instrumentation tests (aka androidTests).
- */
-class SignalInstrumentationApplicationContext : ApplicationContext() {
-  override fun initializeAppDependencies() {
-    val default = ApplicationDependencyProvider(this)
-    ApplicationDependencies.init(this, InstrumentationApplicationDependencyProvider(this, default))
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModelTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModelTest.kt
@@ -1,376 +0,0 @@
-package org.thoughtcrime.securesms.components.settings.app.changenumber
-
-import androidx.lifecycle.SavedStateHandle
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import okhttp3.mockwebserver.MockResponse
-import org.junit.After
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.mockito.kotlin.mock
-import org.signal.core.util.ThreadUtil
-import org.signal.libsignal.protocol.state.SignedPreKeyRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.pin.KbsRepository
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.registration.VerifyAccountRepository
-import org.thoughtcrime.securesms.registration.VerifyAccountResponseProcessor
-import org.thoughtcrime.securesms.testing.Get
-import org.thoughtcrime.securesms.testing.MockProvider
-import org.thoughtcrime.securesms.testing.Put
-import org.thoughtcrime.securesms.testing.SignalActivityRule
-import org.thoughtcrime.securesms.testing.assertIs
-import org.thoughtcrime.securesms.testing.assertIsNot
-import org.thoughtcrime.securesms.testing.assertIsNotNull
-import org.thoughtcrime.securesms.testing.assertIsNull
-import org.thoughtcrime.securesms.testing.assertIsSize
-import org.thoughtcrime.securesms.testing.connectionFailure
-import org.thoughtcrime.securesms.testing.failure
-import org.thoughtcrime.securesms.testing.parsedRequestBody
-import org.thoughtcrime.securesms.testing.success
-import org.thoughtcrime.securesms.testing.timeout
-import org.whispersystems.signalservice.api.account.ChangePhoneNumberRequest
-import org.whispersystems.signalservice.api.push.ServiceId
-import org.whispersystems.signalservice.internal.push.MismatchedDevices
-import org.whispersystems.signalservice.internal.push.PreKeyState
-import java.util.UUID
-
-@RunWith(AndroidJUnit4::class)
-class ChangeNumberViewModelTest {
-
-  @get:Rule
-  val harness = SignalActivityRule()
-
-  private lateinit var viewModel: ChangeNumberViewModel
-  private lateinit var kbsRepository: KbsRepository
-
-  @Before
-  fun setUp() {
-    ApplicationDependencies.getSignalServiceAccountManager().setSoTimeoutMillis(1000)
-    kbsRepository = mock()
-    ThreadUtil.runOnMainSync {
-      viewModel = ChangeNumberViewModel(
-        localNumber = harness.self.requireE164(),
-        changeNumberRepository = ChangeNumberRepository(),
-        savedState = SavedStateHandle(),
-        password = SignalStore.account().servicePassword!!,
-        verifyAccountRepository = VerifyAccountRepository(harness.application),
-        kbsRepository = kbsRepository
-      )
-
-      viewModel.setNewCountry(1)
-      viewModel.setNewNationalNumber("5555550102")
-    }
-  }
-
-  @After
-  fun tearDown() {
-    InstrumentationApplicationDependencyProvider.clearHandlers()
-  }
-
-  @Test
-  fun testChangeNumber_givenOnlyPrimaryAndNoRegLock() {
-    // GIVEN
-    val aci = Recipient.self().requireServiceId()
-    val newPni = ServiceId.from(UUID.randomUUID())
-    lateinit var changeNumberRequest: ChangePhoneNumberRequest
-    lateinit var setPreKeysRequest: PreKeyState
-
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Get("/v1/devices") { MockResponse().success(MockProvider.primaryOnlyDeviceList) },
-      Put("/v1/accounts/number") { r ->
-        changeNumberRequest = r.parsedRequestBody()
-        MockResponse().success(MockProvider.createVerifyAccountResponse(aci, newPni))
-      },
-      Put("/v2/keys") { r ->
-        setPreKeysRequest = r.parsedRequestBody()
-        MockResponse().success()
-      },
-      Get("/v1/certificate/delivery") { MockResponse().success(MockProvider.senderCertificate) }
-    )
-
-    // WHEN
-    viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet().resultOrThrow
-
-    // THEN
-    assertSuccess(newPni, changeNumberRequest, setPreKeysRequest)
-  }
-
-  /**
-   * If we encounter a server error, this means the server ack our request and rejected it. In this
-   * case we know the change *did not* take on the server and can reset to a clean state.
-   */
-  @Test
-  fun testChangeNumber_givenServerFailedApiCall() {
-    // GIVEN
-    val oldPni = Recipient.self().requirePni()
-    val oldE164 = Recipient.self().requireE164()
-
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Get("/v1/devices") { MockResponse().success(MockProvider.primaryOnlyDeviceList) },
-      Put("/v1/accounts/number") { MockResponse().failure(500) },
-    )
-
-    // WHEN
-    val processor: VerifyAccountResponseProcessor = viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet()
-
-    // THEN
-    processor.isServerSentError() assertIs true
-    Recipient.self().requireE164() assertIs oldE164
-    Recipient.self().requirePni() assertIs oldPni
-    SignalStore.misc().pendingChangeNumberMetadata.assertIsNull()
-  }
-
-  /**
-   * If we encounter a non-server error like a timeout or bad SSL, we do not know the state of our change
-   * number on the server side. We have to do a whoami call to query the server for our details and then
-   * respond accordingly.
-   *
-   * In this case, the whoami is our old details, so we can know the change *did not* take on the server
-   * and can reset to a clean state.
-   */
-  @Test
-  fun testChangeNumber_givenNetworkFailedApiCallEnRouteToServer() {
-    // GIVEN
-    val aci = Recipient.self().requireServiceId()
-    val oldPni = Recipient.self().requirePni()
-    val oldE164 = Recipient.self().requireE164()
-
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Get("/v1/devices") { MockResponse().success(MockProvider.primaryOnlyDeviceList) },
-      Put("/v1/accounts/number") { MockResponse().connectionFailure() },
-      Get("/v1/accounts/whoami") { MockResponse().success(MockProvider.createWhoAmIResponse(aci, oldPni, oldE164)) }
-    )
-
-    // WHEN
-    val processor: VerifyAccountResponseProcessor = viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet()
-
-    // THEN
-    processor.isServerSentError() assertIs false
-    Recipient.self().requireE164() assertIs oldE164
-    Recipient.self().requirePni() assertIs oldPni
-    SignalStore.misc().isChangeNumberLocked assertIs false
-    SignalStore.misc().pendingChangeNumberMetadata.assertIsNull()
-  }
-
-  /**
-   * If we encounter a non-server error like a timeout or bad SSL, we do not know the state of our change
-   * number on the server side. We have to do a whoami call to query the server for our details and then
-   * respond accordingly.
-   *
-   * In this case, the whoami is our new details, so we can know the change *did* take on the server
-   * and need to keep the app in a locked state. The test then uses the ChangeNumberLockActivity to unlock
-   * and apply the pending state after confirming the change on the server.
-   */
-  @Test
-  fun testChangeNumber_givenNetworkFailedApiCallEnRouteToClient() {
-    // GIVEN
-    val aci = Recipient.self().requireServiceId()
-    val oldPni = Recipient.self().requirePni()
-    val oldE164 = Recipient.self().requireE164()
-    val newPni = ServiceId.from(UUID.randomUUID())
-
-    lateinit var changeNumberRequest: ChangePhoneNumberRequest
-    lateinit var setPreKeysRequest: PreKeyState
-
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Get("/v1/devices") { MockResponse().success(MockProvider.primaryOnlyDeviceList) },
-      Put("/v1/accounts/number") { r ->
-        changeNumberRequest = r.parsedRequestBody()
-        MockResponse().timeout()
-      },
-      Get("/v1/accounts/whoami") { MockResponse().success(MockProvider.createWhoAmIResponse(aci, newPni, "+15555550102")) },
-      Put("/v2/keys") { r ->
-        setPreKeysRequest = r.parsedRequestBody()
-        MockResponse().success()
-      },
-      Get("/v1/certificate/delivery") { MockResponse().success(MockProvider.senderCertificate) }
-    )
-
-    // WHEN
-    val processor: VerifyAccountResponseProcessor = viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet()
-
-    // THEN
-    processor.isServerSentError() assertIs false
-    Recipient.self().requireE164() assertIs oldE164
-    Recipient.self().requirePni() assertIs oldPni
-    SignalStore.misc().isChangeNumberLocked assertIs true
-    SignalStore.misc().pendingChangeNumberMetadata.assertIsNotNull()
-
-    // WHEN AGAIN Processing lock
-    val scenario = harness.launchActivity<ChangeNumberLockActivity>()
-    scenario.onActivity {}
-    ThreadUtil.sleep(500)
-
-    // THEN AGAIN
-    assertSuccess(newPni, changeNumberRequest, setPreKeysRequest)
-  }
-
-  @Test
-  fun testChangeNumber_givenOnlyPrimaryAndRegistrationLock() {
-    // GIVEN
-    val aci = Recipient.self().requireServiceId()
-    val newPni = ServiceId.from(UUID.randomUUID())
-
-    lateinit var changeNumberRequest: ChangePhoneNumberRequest
-    lateinit var setPreKeysRequest: PreKeyState
-
-    MockProvider.mockGetRegistrationLockStringFlow(kbsRepository)
-
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Get("/v1/devices") { MockResponse().success(MockProvider.primaryOnlyDeviceList) },
-      Put("/v1/accounts/number") { r ->
-        changeNumberRequest = r.parsedRequestBody()
-        if (changeNumberRequest.registrationLock.isNullOrEmpty()) {
-          MockResponse().failure(423, MockProvider.lockedFailure)
-        } else {
-          MockResponse().success(MockProvider.createVerifyAccountResponse(aci, newPni))
-        }
-      },
-      Put("/v2/keys") { r ->
-        setPreKeysRequest = r.parsedRequestBody()
-        MockResponse().success()
-      },
-      Get("/v1/certificate/delivery") { MockResponse().success(MockProvider.senderCertificate) }
-    )
-
-    // WHEN
-    viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet().also { processor ->
-      processor.registrationLock() assertIs true
-      Recipient.self().requirePni() assertIsNot newPni
-      SignalStore.misc().pendingChangeNumberMetadata.assertIsNull()
-    }
-
-    viewModel.verifyCodeAndRegisterAccountWithRegistrationLock("pin").blockingGet().resultOrThrow
-
-    // THEN
-    assertSuccess(newPni, changeNumberRequest, setPreKeysRequest)
-  }
-
-  @Test
-  fun testChangeNumber_givenMismatchedDevicesOnFirstCall() {
-    // GIVEN
-    val aci = Recipient.self().requireServiceId()
-    val newPni = ServiceId.from(UUID.randomUUID())
-    lateinit var changeNumberRequest: ChangePhoneNumberRequest
-    lateinit var setPreKeysRequest: PreKeyState
-
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Get("/v1/devices") { MockResponse().success(MockProvider.primaryOnlyDeviceList) },
-      Put("/v1/accounts/number") { r ->
-        changeNumberRequest = r.parsedRequestBody()
-        if (changeNumberRequest.deviceMessages.isEmpty()) {
-          MockResponse().failure(
-            409,
-            MismatchedDevices().apply {
-              missingDevices = listOf(2)
-              extraDevices = emptyList()
-            }
-          )
-        } else {
-          MockResponse().success(MockProvider.createVerifyAccountResponse(aci, newPni))
-        }
-      },
-      Get("/v2/keys/$aci/2") {
-        MockResponse().success(MockProvider.createPreKeyResponse(deviceId = 2))
-      },
-      Put("/v2/keys") { r ->
-        setPreKeysRequest = r.parsedRequestBody()
-        MockResponse().success()
-      },
-      Get("/v1/certificate/delivery") { MockResponse().success(MockProvider.senderCertificate) }
-    )
-
-    // WHEN
-    viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet().resultOrThrow
-
-    // THEN
-    assertSuccess(newPni, changeNumberRequest, setPreKeysRequest)
-  }
-
-  @Test
-  fun testChangeNumber_givenRegLockAndMismatchedDevicesOnFirstTwoCalls() {
-    // GIVEN
-    val aci = Recipient.self().requireServiceId()
-    val newPni = ServiceId.from(UUID.randomUUID())
-
-    lateinit var changeNumberRequest: ChangePhoneNumberRequest
-    lateinit var setPreKeysRequest: PreKeyState
-
-    MockProvider.mockGetRegistrationLockStringFlow(kbsRepository)
-
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Put("/v1/accounts/number") { r ->
-        changeNumberRequest = r.parsedRequestBody()
-        if (changeNumberRequest.registrationLock.isNullOrEmpty()) {
-          MockResponse().failure(423, MockProvider.lockedFailure)
-        } else if (changeNumberRequest.deviceMessages.isEmpty()) {
-          MockResponse().failure(
-            409,
-            MismatchedDevices().apply {
-              missingDevices = listOf(2)
-              extraDevices = emptyList()
-            }
-          )
-        } else if (changeNumberRequest.deviceMessages.size == 1) {
-          MockResponse().failure(
-            409,
-            MismatchedDevices().apply {
-              missingDevices = listOf(2, 3)
-              extraDevices = emptyList()
-            }
-          )
-        } else {
-          MockResponse().success(MockProvider.createVerifyAccountResponse(aci, newPni))
-        }
-      },
-      Get("/v2/keys/$aci/2") {
-        MockResponse().success(MockProvider.createPreKeyResponse(deviceId = 2))
-      },
-      Get("/v2/keys/$aci/3") {
-        MockResponse().success(MockProvider.createPreKeyResponse(deviceId = 3))
-      },
-      Put("/v2/keys") { r ->
-        setPreKeysRequest = r.parsedRequestBody()
-        MockResponse().success()
-      },
-      Get("/v1/certificate/delivery") { MockResponse().success(MockProvider.senderCertificate) }
-    )
-
-    // WHEN
-    viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet().also { processor ->
-      processor.registrationLock() assertIs true
-      Recipient.self().requirePni() assertIsNot newPni
-      SignalStore.misc().pendingChangeNumberMetadata.assertIsNull()
-    }
-
-    viewModel.verifyCodeAndRegisterAccountWithRegistrationLock("pin").blockingGet().resultOrThrow
-
-    // THEN
-    assertSuccess(newPni, changeNumberRequest, setPreKeysRequest)
-  }
-
-  private fun assertSuccess(newPni: ServiceId, changeNumberRequest: ChangePhoneNumberRequest, setPreKeysRequest: PreKeyState) {
-    val pniProtocolStore = ApplicationDependencies.getProtocolStore().pni()
-    val pniMetadataStore = SignalStore.account().pniPreKeys
-
-    Recipient.self().requireE164() assertIs "+15555550102"
-    Recipient.self().requirePni() assertIs newPni
-
-    SignalStore.account().pniRegistrationId assertIs changeNumberRequest.pniRegistrationIds["1"]!!
-    SignalStore.account().pniIdentityKey.publicKey assertIs changeNumberRequest.pniIdentityKey
-    pniMetadataStore.activeSignedPreKeyId assertIs changeNumberRequest.devicePniSignedPrekeys["1"]!!.keyId
-
-    val activeSignedPreKey: SignedPreKeyRecord = pniProtocolStore.loadSignedPreKey(pniMetadataStore.activeSignedPreKeyId)
-    activeSignedPreKey.keyPair.publicKey assertIs changeNumberRequest.devicePniSignedPrekeys["1"]!!.publicKey
-    activeSignedPreKey.signature assertIs changeNumberRequest.devicePniSignedPrekeys["1"]!!.signature
-
-    setPreKeysRequest.signedPreKey.publicKey assertIs activeSignedPreKey.keyPair.publicKey
-    setPreKeysRequest.preKeys assertIsSize 100
-
-    SignalStore.misc().pendingChangeNumberMetadata.assertIsNull()
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/SafetyNumberChangeDialogPreviewer.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/SafetyNumberChangeDialogPreviewer.kt
@@ -5,15 +5,11 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey
+import org.thoughtcrime.securesms.conversation.ui.error.SafetyNumberChangeDialog
 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

 /**
@@ -22,7 +18,7 @@ import org.thoughtcrime.securesms.testing.SignalActivityRule
@RunWith(AndroidJUnit4::class)
 class SafetyNumberChangeDialogPreviewer {

-  @get:Rule val harness = SignalActivityRule(othersCount = 10)
+  @get:Rule val harness = SignalActivityRule()

  @Test
  fun testShowLongName() {
@@ -35,39 +31,10 @@ class SafetyNumberChangeDialogPreviewer {

    val scenario: ActivityScenario<ConversationActivity> = harness.launchActivity { putExtra("recipient_id", other.id.serialize()) }
    scenario.onActivity {
-      SafetyNumberBottomSheet.forRecipientId(other.id).show(it.supportFragmentManager)
+      SafetyNumberChangeDialog.show(it.supportFragmentManager, other.id)
    }

    // 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)
-  }
 }
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentDatabaseTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentDatabaseTest.kt
@@ -1,106 +0,0 @@
-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)
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/DistributionListDatabaseTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/DistributionListDatabaseTest.kt
@@ -80,6 +80,25 @@ class DistributionListDatabaseTest {
    Assert.assertEquals(StoryType.STORY_WITHOUT_REPLIES, storyType)
  }

+  @Test
+  fun givenStoryExistsAndMarkedNoReplies_getAllListsForContactSelectionUi_returnsStoryWithoutReplies() {
+    val id: DistributionListId? = distributionDatabase.createList("test", recipientList(1, 2, 3))
+    Assert.assertNotNull(id)
+    distributionDatabase.setAllowsReplies(id!!, false)
+
+    val records = distributionDatabase.getAllListsForContactSelectionUi(null, false)
+    Assert.assertFalse(records.first().allowsReplies)
+  }
+
+  @Test
+  fun givenStoryExists_getAllListsForContactSelectionUi_returnsStoryWithReplies() {
+    val id: DistributionListId? = distributionDatabase.createList("test", recipientList(1, 2, 3))
+    Assert.assertNotNull(id)
+
+    val records = distributionDatabase.getAllListsForContactSelectionUi(null, false)
+    Assert.assertTrue(records.first().allowsReplies)
+  }
+
  @Test(expected = IllegalStateException::class)
  fun givenStoryDoesNotExist_getStoryType_throwsIllegalStateException() {
    distributionDatabase.getStoryType(DistributionListId.from(12))
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsDatabaseTest_stories.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsDatabaseTest_stories.kt
@@ -3,14 +3,11 @@ 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.Ignore
 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
@@ -20,7 +17,6 @@ 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)
@@ -33,7 +29,6 @@ class MmsDatabaseTest_stories {

  private lateinit var myStory: Recipient
  private lateinit var recipients: List<RecipientId>
-  private lateinit var releaseChannelRecipient: Recipient

  @Before
  fun setUp() {
@@ -46,15 +41,12 @@ 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.getOrderedStoryRecipientsAndIds(false)
+    val result = mms.orderedStoryRecipientsAndIds

    // THEN
    assertEquals(0, result.size)
@@ -85,7 +77,7 @@ class MmsDatabaseTest_stories {
    )

    // WHEN
-    val result = mms.getOrderedStoryRecipientsAndIds(false)
+    val result = mms.orderedStoryRecipientsAndIds

    // THEN
    assertEquals(listOf(sender.toLong(), myStory.id.toLong()), result.map { it.recipientId.toLong() })
@@ -117,7 +109,6 @@ class MmsDatabaseTest_stories {
    assertTrue(messageAfterMark.incomingStoryViewedAtTimestamp > 0)
  }

-  @Ignore
  @Test
  fun given5ViewedStories_whenIGetOrderedStoryRecipientsAndIds_thenIExpectLatestViewedFirst() {
    // GIVEN
@@ -141,7 +132,7 @@ class MmsDatabaseTest_stories {
    }

    // WHEN
-    val result = SignalDatabase.mms.getOrderedStoryRecipientsAndIds(false)
+    val result = SignalDatabase.mms.orderedStoryRecipientsAndIds
    val resultOrderedIds = result.map { it.messageId }

    // THEN
@@ -195,7 +186,7 @@ class MmsDatabaseTest_stories {
      }
    }

-    val result = SignalDatabase.mms.getOrderedStoryRecipientsAndIds(false)
+    val result = SignalDatabase.mms.orderedStoryRecipientsAndIds
    val resultOrderedIds = result.map { it.messageId }

    assertEquals(unviewedIds.reversed() + interspersedIds.reversed(), resultOrderedIds)
@@ -247,136 +238,4 @@ 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.hasGroupReplyOrReactionInStory(groupStoryId)
-
-    // THEN
-    assertFalse(result)
-  }
-
-  @Ignore
-  @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.hasGroupReplyOrReactionInStory(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.hasGroupReplyOrReactionInStory(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.hasGroupReplyOrReactionInStory(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)
-  }
 }
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsHelper.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsHelper.kt
@@ -1,11 +1,9 @@
 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

@@ -24,10 +22,7 @@ object MmsHelper {
    distributionType: Int = ThreadDatabase.DistributionTypes.DEFAULT,
    threadId: Long = 1,
    storyType: StoryType = StoryType.NONE,
-    parentStoryId: ParentStoryId? = null,
-    isStoryReaction: Boolean = false,
-    giftBadge: GiftBadge? = null,
-    secure: Boolean = true
+    giftBadge: GiftBadge? = null
  ): Long {
    val message = OutgoingMediaMessage(
      recipient,
@@ -39,8 +34,8 @@ object MmsHelper {
      viewOnce,
      distributionType,
      storyType,
-      parentStoryId,
-      isStoryReaction,
+      null,
+      false,
      null,
      emptyList(),
      emptyList(),
@@ -48,9 +43,7 @@ object MmsHelper {
      emptySet(),
      emptySet(),
      giftBadge
-    ).let {
-      if (secure) OutgoingSecureMediaMessage(it) else it
-    }
+    )

    return insert(
      message = message,
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest.kt
@@ -1,162 +0,0 @@
-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 givenAHiddenRecipient_whenIQueryAllContacts_thenIDoNotExpectHiddenToBeReturned() {
-    val hiddenRecipient = harness.others[0]
-    SignalDatabase.recipients.setProfileName(hiddenRecipient, ProfileName.fromParts("Hidden", "Person"))
-    SignalDatabase.recipients.markHidden(hiddenRecipient)
-
-    val results = SignalDatabase.recipients.queryAllContacts("Hidden")!!
-
-    assertEquals(0, results.count)
-  }
-
-  @Test
-  fun givenAHiddenRecipient_whenIGetSignalContacts_thenIDoNotExpectHiddenToBeReturned() {
-    val hiddenRecipient = harness.others[0]
-    SignalDatabase.recipients.setProfileName(hiddenRecipient, ProfileName.fromParts("Hidden", "Person"))
-    SignalDatabase.recipients.markHidden(hiddenRecipient)
-
-    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(hiddenRecipient in results)
-  }
-
-  @Test
-  fun givenAHiddenRecipient_whenIQuerySignalContacts_thenIDoNotExpectHiddenToBeReturned() {
-    val hiddenRecipient = harness.others[0]
-    SignalDatabase.recipients.setProfileName(hiddenRecipient, ProfileName.fromParts("Hidden", "Person"))
-    SignalDatabase.recipients.markHidden(hiddenRecipient)
-
-    val results = SignalDatabase.recipients.querySignalContacts("Hidden", false)!!
-
-    assertEquals(0, results.count)
-  }
-
-  @Test
-  fun givenAHiddenRecipient_whenIQueryNonGroupContacts_thenIDoNotExpectHiddenToBeReturned() {
-    val hiddenRecipient = harness.others[0]
-    SignalDatabase.recipients.setProfileName(hiddenRecipient, ProfileName.fromParts("Hidden", "Person"))
-    SignalDatabase.recipients.markHidden(hiddenRecipient)
-
-    val results = SignalDatabase.recipients.queryNonGroupContacts("Hidden", false)!!
-
-    assertEquals(0, results.count)
-  }
-
-  @Test
-  fun givenAHiddenRecipient_whenIGetNonGroupContacts_thenIDoNotExpectHiddenToBeReturned() {
-    val hiddenRecipient = harness.others[0]
-    SignalDatabase.recipients.setProfileName(hiddenRecipient, ProfileName.fromParts("Hidden", "Person"))
-    SignalDatabase.recipients.markHidden(hiddenRecipient)
-
-    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(hiddenRecipient in results)
-  }
-
-  @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)
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest_getAndPossiblyMergeLegacy.kt
+++ b/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_getAndPossiblyMergeLegacy {
+class RecipientDatabaseTest_getAndPossiblyMerge {

  private lateinit var recipientDatabase: RecipientDatabase
  private lateinit var identityDatabase: IdentityDatabase
@@ -92,8 +92,18 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {

  /** If all you have is an ACI, you can just store that, regardless of trust level. */
  @Test
-  fun getAndPossiblyMerge_aciAndE164MapToNoOne_aciOnly() {
-    val recipientId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, null)
+  fun getAndPossiblyMerge_aciAndE164MapToNoOne_aciOnly_highTrust() {
+    val recipientId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, null, true)
+
+    val recipient = Recipient.resolved(recipientId)
+    assertEquals(ACI_A, recipient.requireServiceId())
+    assertFalse(recipient.hasE164())
+  }
+
+  /** If all you have is an ACI, you can just store that, regardless of trust level. */
+  @Test
+  fun getAndPossiblyMerge_aciAndE164MapToNoOne_aciOnly_lowTrust() {
+    val recipientId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, null, false)

    val recipient = Recipient.resolved(recipientId)
    assertEquals(ACI_A, recipient.requireServiceId())
@@ -102,8 +112,18 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {

  /** If all you have is an E164, you can just store that, regardless of trust level. */
  @Test
-  fun getAndPossiblyMerge_aciAndE164MapToNoOne_e164Only() {
-    val recipientId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(null, E164_A)
+  fun getAndPossiblyMerge_aciAndE164MapToNoOne_e164Only_highTrust() {
+    val recipientId: RecipientId = recipientDatabase.getAndPossiblyMerge(null, E164_A, true)
+
+    val recipient = Recipient.resolved(recipientId)
+    assertEquals(E164_A, recipient.requireE164())
+    assertFalse(recipient.hasServiceId())
+  }
+
+  /** If all you have is an E164, you can just store that, regardless of trust level. */
+  @Test
+  fun getAndPossiblyMerge_aciAndE164MapToNoOne_e164Only_lowTrust() {
+    val recipientId: RecipientId = recipientDatabase.getAndPossiblyMerge(null, E164_A, false)

    val recipient = Recipient.resolved(recipientId)
    assertEquals(E164_A, recipient.requireE164())
@@ -112,24 +132,34 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {

  /** With high trust, you can associate an ACI-e164 pair. */
  @Test
-  fun getAndPossiblyMerge_aciAndE164MapToNoOne_aciAndE164() {
-    val recipientId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+  fun getAndPossiblyMerge_aciAndE164MapToNoOne_aciAndE164_highTrust() {
+    val recipientId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)

    val recipient = Recipient.resolved(recipientId)
    assertEquals(ACI_A, recipient.requireServiceId())
    assertEquals(E164_A, recipient.requireE164())
  }

+  /** With low trust, you cannot associate an ACI-e164 pair, and therefore can only store the ACI. */
+  @Test
+  fun getAndPossiblyMerge_aciAndE164MapToNoOne_aciAndE164_lowTrust() {
+    val recipientId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, false)
+
+    val recipient = Recipient.resolved(recipientId)
+    assertEquals(ACI_A, recipient.requireServiceId())
+    assertFalse(recipient.hasE164())
+  }
+
  // ==============================================================
  // If the ACI maps to an existing user, but the E164 doesn't
  // ==============================================================

-  /** You can associate an e164 with an existing ACI. */
+  /** With high trust, you can associate an e164 with an existing ACI. */
  @Test
-  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciAndE164() {
+  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciAndE164_highTrust() {
    val existingId: RecipientId = recipientDatabase.getOrInsertFromServiceId(ACI_A)

-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
    assertEquals(existingId, retrievedId)

    val retrievedRecipient = Recipient.resolved(retrievedId)
@@ -137,12 +167,25 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
    assertEquals(E164_A, retrievedRecipient.requireE164())
  }

-  /** Basically the ‘change number’ case. Update the existing user. */
+  /** With low trust, you cannot associate an ACI-e164 pair, and therefore cannot store the e164. */
  @Test
-  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciAndE164_2() {
-    val existingId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciAndE164_lowTrust() {
+    val existingId: RecipientId = recipientDatabase.getOrInsertFromServiceId(ACI_A)

-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_B)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, false)
+    assertEquals(existingId, retrievedId)
+
+    val retrievedRecipient = Recipient.resolved(retrievedId)
+    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
+    assertFalse(retrievedRecipient.hasE164())
+  }
+
+  /** Basically the ‘change number’ case. High trust lets you update the existing user. */
+  @Test
+  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciAndE164_2_highTrust() {
+    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
+
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, true)
    assertEquals(existingId, retrievedId)

    val retrievedRecipient = Recipient.resolved(retrievedId)
@@ -150,16 +193,12 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
    assertEquals(E164_B, retrievedRecipient.requireE164())
  }

-  // ==============================================================
-  // If the E164 maps to an existing user, but the ACI doesn't
-  // ==============================================================
-
-  /** You can associate an e164 with an existing ACI. */
+  /** Low trust means you can’t update the underlying data, but you also don’t need to create any new rows. */
  @Test
-  fun getAndPossiblyMerge_e164MapsToExistingUserButAciDoesNot_aciAndE164() {
-    val existingId: RecipientId = recipientDatabase.getOrInsertFromE164(E164_A)
+  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciAndE164_2_lowTrust() {
+    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)

-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, false)
    assertEquals(existingId, retrievedId)

    val retrievedRecipient = Recipient.resolved(retrievedId)
@@ -167,13 +206,47 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
    assertEquals(E164_A, retrievedRecipient.requireE164())
  }

-  /** We never change the ACI of an existing row. New ACI = new person. Take the e164 from the current holder. */
+  // ==============================================================
+  // If the E164 maps to an existing user, but the ACI doesn't
+  // ==============================================================
+
+  /** With high trust, you can associate an e164 with an existing ACI. */
  @Test
-  fun getAndPossiblyMerge_e164MapsToExistingUserButAciDoesNot_aciAndE164_2() {
-    val existingId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+  fun getAndPossiblyMerge_e164MapsToExistingUserButAciDoesNot_aciAndE164_highTrust() {
+    val existingId: RecipientId = recipientDatabase.getOrInsertFromE164(E164_A)
+
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
+    assertEquals(existingId, retrievedId)
+
+    val retrievedRecipient = Recipient.resolved(retrievedId)
+    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
+    assertEquals(E164_A, retrievedRecipient.requireE164())
+  }
+
+  /** With low trust, you cannot associate an ACI-e164 pair, and therefore need to create a new person with just the ACI. */
+  @Test
+  fun getAndPossiblyMerge_e164MapsToExistingUserButAciDoesNot_aciAndE164_lowTrust() {
+    val existingId: RecipientId = recipientDatabase.getOrInsertFromE164(E164_A)
+
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, false)
+    assertNotEquals(existingId, retrievedId)
+
+    val retrievedRecipient = Recipient.resolved(retrievedId)
+    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
+    assertFalse(retrievedRecipient.hasE164())
+
+    val existingRecipient = Recipient.resolved(existingId)
+    assertEquals(E164_A, existingRecipient.requireE164())
+    assertFalse(existingRecipient.hasServiceId())
+  }
+
+  /** We never change the ACI of an existing row. New ACI = new person, regardless of trust. But high trust lets us take the e164 from the current holder. */
+  @Test
+  fun getAndPossiblyMerge_e164MapsToExistingUserButAciDoesNot_aciAndE164_2_highTrust() {
+    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
    recipientDatabase.setPni(existingId, PNI_A)

-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_B, E164_A)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_B, E164_A, true)
    recipientDatabase.setPni(retrievedId, PNI_A)
    assertNotEquals(existingId, retrievedId)

@@ -186,18 +259,35 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
    assertFalse(existingRecipient.hasE164())
  }

-  /** We never want to remove the e164 of our own contact entry. Leave the e164 alone. */
+  /** We never change the ACI of an existing row. New ACI = new person, regardless of trust. And low trust means we can’t take the e164. */
  @Test
-  fun getAndPossiblyMerge_e164MapsToExistingUserButAciDoesNot_e164BelongsToLocalUser() {
+  fun getAndPossiblyMerge_e164MapsToExistingUserButAciDoesNot_aciAndE164_2_lowTrust() {
+    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
+
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_B, E164_A, false)
+    assertNotEquals(existingId, retrievedId)
+
+    val retrievedRecipient = Recipient.resolved(retrievedId)
+    assertEquals(ACI_B, retrievedRecipient.requireServiceId())
+    assertFalse(retrievedRecipient.hasE164())
+
+    val existingRecipient = Recipient.resolved(existingId)
+    assertEquals(ACI_A, existingRecipient.requireServiceId())
+    assertEquals(E164_A, existingRecipient.requireE164())
+  }
+
+  /** We never want to remove the e164 of our own contact entry. So basically treat this as a low-trust case, and leave the e164 alone. */
+  @Test
+  fun getAndPossiblyMerge_e164MapsToExistingUserButAciDoesNot_e164BelongsToLocalUser_highTrust() {
    val dataSet = KeyValueDataSet().apply {
      putString(AccountValues.KEY_E164, E164_A)
      putString(AccountValues.KEY_ACI, ACI_A.toString())
    }
    SignalStore.inject(KeyValueStore(MockKeyValuePersistentStorage.withDataSet(dataSet)))

-    val existingId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)

-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_B, E164_A)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_B, E164_A, true)
    assertNotEquals(existingId, retrievedId)

    val retrievedRecipient = Recipient.resolved(retrievedId)
@@ -213,12 +303,12 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
  // If both the ACI and E164 map to an existing user
  // ==============================================================

-  /** If your ACI and e164 match, you’re good. */
+  /** Regardless of trust, if your ACI and e164 match, you’re good. */
  @Test
-  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164() {
-    val existingId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_highTrust() {
+    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)

-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
    assertEquals(existingId, retrievedId)

    val retrievedRecipient = Recipient.resolved(retrievedId)
@@ -226,16 +316,16 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
    assertEquals(E164_A, retrievedRecipient.requireE164())
  }

-  /** Merge two different users into one. You should prefer the ACI user. Not shown: merging threads, dropping e164 sessions, etc. */
+  /** High trust lets you merge two different users into one. You should prefer the ACI user. Not shown: merging threads, dropping e164 sessions, etc. */
  @Test
-  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_merge() {
+  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_merge_highTrust() {
    val changeNumberListener = ChangeNumberListener()
    changeNumberListener.enqueue()

-    val existingAciId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, null)
-    val existingE164Id: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(null, E164_A)
+    val existingAciId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, null, true)
+    val existingE164Id: RecipientId = recipientDatabase.getAndPossiblyMerge(null, E164_A, true)

-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
    assertEquals(existingAciId, retrievedId)

    val retrievedRecipient = Recipient.resolved(retrievedId)
@@ -249,16 +339,16 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
    assertFalse(changeNumberListener.numberChangeWasEnqueued)
  }

-  /** Same as [getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_merge], but with a number change. */
+  /** Same as [getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_merge_highTrust], but with a number change. */
  @Test
-  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_merge_changedNumber() {
+  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_merge_highTrust_changedNumber() {
    val changeNumberListener = ChangeNumberListener()
    changeNumberListener.enqueue()

-    val existingAciId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_B)
-    val existingE164Id: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(null, E164_A)
+    val existingAciId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, true)
+    val existingE164Id: RecipientId = recipientDatabase.getAndPossiblyMerge(null, E164_A, true)

-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
    assertEquals(existingAciId, retrievedId)

    val retrievedRecipient = Recipient.resolved(retrievedId)
@@ -272,16 +362,34 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
    assert(changeNumberListener.numberChangeWasEnqueued)
  }

-  /** No new rules here, just a more complex scenario to show how different rules interact. */
+  /** Low trust means you can’t merge. If you’re retrieving a user from the table with this data, prefer the ACI one. */
  @Test
-  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_complex() {
+  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_lowTrust() {
+    val existingAciId: RecipientId = recipientDatabase.getOrInsertFromServiceId(ACI_A)
+    val existingE164Id: RecipientId = recipientDatabase.getOrInsertFromE164(E164_A)
+
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, false)
+    assertEquals(existingAciId, retrievedId)
+
+    val retrievedRecipient = Recipient.resolved(retrievedId)
+    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
+    assertFalse(retrievedRecipient.hasE164())
+
+    val existingE164Recipient = Recipient.resolved(existingE164Id)
+    assertEquals(E164_A, existingE164Recipient.requireE164())
+    assertFalse(existingE164Recipient.hasServiceId())
+  }
+
+  /** Another high trust case. No new rules here, just a more complex scenario to show how different rules interact. */
+  @Test
+  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_complex_highTrust() {
    val changeNumberListener = ChangeNumberListener()
    changeNumberListener.enqueue()

-    val existingId1: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_B)
-    val existingId2: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_B, E164_A)
+    val existingId1: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, true)
+    val existingId2: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_B, E164_A, true)

-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
    assertEquals(existingId1, retrievedId)

    val retrievedRecipient = Recipient.resolved(retrievedId)
@@ -292,20 +400,37 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
    assertEquals(ACI_B, existingRecipient2.requireServiceId())
    assertFalse(existingRecipient2.hasE164())

-    changeNumberListener.waitForJobManager()
    assert(changeNumberListener.numberChangeWasEnqueued)
  }

+  /** Another low trust case. No new rules here, just a more complex scenario to show how different rules interact. */
+  @Test
+  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_complex_lowTrust() {
+    val existingId1: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, true)
+    val existingId2: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_B, E164_A, true)
+
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, false)
+    assertEquals(existingId1, retrievedId)
+
+    val retrievedRecipient = Recipient.resolved(retrievedId)
+    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
+    assertEquals(E164_B, retrievedRecipient.requireE164())
+
+    val existingRecipient2 = Recipient.resolved(existingId2)
+    assertEquals(ACI_B, existingRecipient2.requireServiceId())
+    assertEquals(E164_A, existingRecipient2.requireE164())
+  }
+
  /**
-   * Another case that results in a merge. Nothing strictly new here, but this case is called out because it’s a merge but *also* an E164 change,
+   * Another high trust case that results in a merge. Nothing strictly new here, but this case is called out because it’s a merge but *also* an E164 change,
   * which clients may need to know for UX purposes.
   */
  @Test
-  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_mergeAndPhoneNumberChange() {
-    val existingId1: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_B)
-    val existingId2: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(null, E164_A)
+  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_mergeAndPhoneNumberChange_highTrust() {
+    val existingId1: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, true)
+    val existingId2: RecipientId = recipientDatabase.getAndPossiblyMerge(null, E164_A, true)

-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
    assertEquals(existingId1, retrievedId)

    val retrievedRecipient = Recipient.resolved(retrievedId)
@@ -318,7 +443,7 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
    assertEquals(retrievedId, recipientWithId2.id)
  }

-  /** We never want to remove the e164 of our own contact entry. Leave the e164 alone. */
+  /** We never want to remove the e164 of our own contact entry. So basically treat this as a low-trust case, and leave the e164 alone. */
  @Test
  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_e164BelongsToLocalUser() {
    val dataSet = KeyValueDataSet().apply {
@@ -327,10 +452,10 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
    }
    SignalStore.inject(KeyValueStore(MockKeyValuePersistentStorage.withDataSet(dataSet)))

-    val existingId1: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_B, E164_A)
-    val existingId2: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, null)
+    val existingId1: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_B, E164_A, true)
+    val existingId2: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, null, true)

-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
    assertEquals(existingId2, retrievedId)

    val retrievedRecipient = Recipient.resolved(retrievedId)
@@ -344,16 +469,16 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {

  /** This is a case where normally we'd update the E164 of a user, but here the changeSelf flag is disabled, so we shouldn't. */
  @Test
-  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciBelongsToLocalUser_changeSelfFalse() {
+  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciBelongsToLocalUser_highTrust_changeSelfFalse() {
    val dataSet = KeyValueDataSet().apply {
      putString(AccountValues.KEY_E164, E164_A)
      putString(AccountValues.KEY_ACI, ACI_A.toString())
    }
    SignalStore.inject(KeyValueStore(MockKeyValuePersistentStorage.withDataSet(dataSet)))

-    val existingId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)

-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_B, changeSelf = false)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, highTrust = true, changeSelf = false)
    assertEquals(existingId, retrievedId)

    val retrievedRecipient = Recipient.resolved(retrievedId)
@@ -363,16 +488,16 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {

  /** This is a case where we're changing our own number, and it's allowed because changeSelf = true. */
  @Test
-  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciBelongsToLocalUser_changeSelfTrue() {
+  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciBelongsToLocalUser_highTrust_changeSelfTrue() {
    val dataSet = KeyValueDataSet().apply {
      putString(AccountValues.KEY_E164, E164_A)
      putString(AccountValues.KEY_ACI, ACI_A.toString())
    }
    SignalStore.inject(KeyValueStore(MockKeyValuePersistentStorage.withDataSet(dataSet)))

-    val existingId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)

-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_B, changeSelf = true)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, highTrust = true, changeSelf = true)
    assertEquals(existingId, retrievedId)

    val retrievedRecipient = Recipient.resolved(retrievedId)
@@ -382,13 +507,13 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {

  /** Verifying a case where a change number job is expected to be enqueued. */
  @Test
-  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_changedNumber() {
+  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_highTrust_changedNumber() {
    val changeNumberListener = ChangeNumberListener()
    changeNumberListener.enqueue()

-    val existingId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A)
+    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)

-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_B)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, true)
    assertEquals(existingId, retrievedId)

    val retrievedRecipient = Recipient.resolved(retrievedId)
@@ -446,7 +571,7 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {
    val distributionListId: DistributionListId = distributionListDatabase.createList("testlist", listOf(recipientIdE164, recipientIdAciB))!!

    // Merge
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, E164_A, true)
+    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
    val retrievedThreadId: Long = threadDatabase.getThreadIdFor(retrievedId)!!
    assertEquals(recipientIdAci, retrievedId)

@@ -573,7 +698,7 @@ class RecipientDatabaseTest_getAndPossiblyMergeLegacy {

  @Test(expected = IllegalArgumentException::class)
  fun getAndPossiblyMerge_noArgs_invalid() {
-    recipientDatabase.getAndPossiblyMergeLegacy(null, null, true)
+    recipientDatabase.getAndPossiblyMerge(null, null, true)
  }

  private fun ensureDbEmpty() {
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest_getAndPossiblyMergePnp.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest_getAndPossiblyMergePnp.kt
@@ -1,661 +0,0 @@
-package org.thoughtcrime.securesms.database
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.hamcrest.MatcherAssert
-import org.hamcrest.Matchers
-import org.junit.Assert
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertNotEquals
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.core.util.CursorUtil
-import org.signal.core.util.ThreadUtil
-import org.signal.libsignal.protocol.IdentityKey
-import org.signal.libsignal.protocol.SignalProtocolAddress
-import org.signal.libsignal.protocol.state.SessionRecord
-import org.signal.libsignal.zkgroup.groups.GroupMasterKey
-import org.signal.storageservice.protos.groups.local.DecryptedGroup
-import org.signal.storageservice.protos.groups.local.DecryptedMember
-import org.thoughtcrime.securesms.conversation.colors.AvatarColor
-import org.thoughtcrime.securesms.database.model.DistributionListId
-import org.thoughtcrime.securesms.database.model.DistributionListRecord
-import org.thoughtcrime.securesms.database.model.Mention
-import org.thoughtcrime.securesms.database.model.MessageId
-import org.thoughtcrime.securesms.database.model.MessageRecord
-import org.thoughtcrime.securesms.database.model.ReactionRecord
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.groups.GroupId
-import org.thoughtcrime.securesms.jobs.RecipientChangedNumberJob
-import org.thoughtcrime.securesms.keyvalue.AccountValues
-import org.thoughtcrime.securesms.keyvalue.KeyValueDataSet
-import org.thoughtcrime.securesms.keyvalue.KeyValueStore
-import org.thoughtcrime.securesms.keyvalue.MockKeyValuePersistentStorage
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.mms.IncomingMediaMessage
-import org.thoughtcrime.securesms.notifications.profiles.NotificationProfile
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.sms.IncomingTextMessage
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.PNI
-import org.whispersystems.signalservice.api.util.UuidUtil
-import java.util.Optional
-import java.util.UUID
-
-@RunWith(AndroidJUnit4::class)
-class RecipientDatabaseTest_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. */
-  @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 mergedId: RecipientId = recipientDatabase.getAndPossiblyMergePnp(ACI_A, E164_A)
-    assertEquals(existingAciId, mergedId)
-
-    val retrievedRecipient = Recipient.resolved(mergedId)
-    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
-    assertEquals(E164_A, retrievedRecipient.requireE164())
-
-    val existingE164Recipient = Recipient.resolved(existingE164Id)
-    assertEquals(mergedId, existingE164Recipient.id)
-
-    changeNumberListener.waitForJobManager()
-    assertFalse(changeNumberListener.numberChangeWasEnqueued)
-  }
-
-  /** Same as [getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_merge], but with a number change. */
-  @Test
-  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_merge_changedNumber() {
-    val changeNumberListener = ChangeNumberListener()
-    changeNumberListener.enqueue()
-
-    val existingAciId: RecipientId = recipientDatabase.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())
-
-    val existingE164Recipient = Recipient.resolved(existingE164Id)
-    assertEquals(retrievedId, existingE164Recipient.id)
-
-    changeNumberListener.waitForJobManager()
-    assert(changeNumberListener.numberChangeWasEnqueued)
-  }
-
-  /** No new rules here, just a more complex scenario to show how different rules interact. */
-  @Test
-  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_complex() {
-    val changeNumberListener = ChangeNumberListener()
-    changeNumberListener.enqueue()
-
-    val existingId1: RecipientId = recipientDatabase.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())
-
-    changeNumberListener.waitForJobManager()
-    assert(changeNumberListener.numberChangeWasEnqueued)
-  }
-
-  /**
-   * Another case that results in a merge. Nothing strictly new here, but this case is called out because it’s a merge but *also* an E164 change,
-   * which clients may need to know for UX purposes.
-   */
-  @Test
-  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_mergeAndPhoneNumberChange() {
-    val existingId1: RecipientId = recipientDatabase.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)
-
-    val recipientWithId2 = Recipient.resolved(existingId2)
-    assertEquals(retrievedId, recipientWithId2.id)
-  }
-
-  /** We never want to remove the e164 of our own contact entry. Leave the e164 alone. */
-  @Test
-  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_e164BelongsToLocalUser() {
-    val dataSet = KeyValueDataSet().apply {
-      putString(AccountValues.KEY_E164, E164_A)
-      putString(AccountValues.KEY_ACI, ACI_B.toString())
-    }
-    SignalStore.inject(KeyValueStore(MockKeyValuePersistentStorage.withDataSet(dataSet)))
-
-    val existingId1: RecipientId = recipientDatabase.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())
-
-    changeNumberListener.waitForJobManager()
-    assert(changeNumberListener.numberChangeWasEnqueued)
-  }
-
-  /** High trust lets you merge two different users into one. You should prefer the ACI user. Not shown: merging threads, dropping e164 sessions, etc. */
-  @Test
-  fun getAndPossiblyMerge_merge_general() {
-    // Setup
-    val recipientIdAci: RecipientId = recipientDatabase.getOrInsertFromServiceId(ACI_A)
-    val recipientIdE164: RecipientId = recipientDatabase.getOrInsertFromE164(E164_A)
-    val recipientIdAciB: RecipientId = recipientDatabase.getOrInsertFromServiceId(ACI_B)
-
-    val smsId1: Long = smsDatabase.insertMessageInbox(smsMessage(sender = recipientIdAci, time = 0, body = "0")).get().messageId
-    val smsId2: Long = smsDatabase.insertMessageInbox(smsMessage(sender = recipientIdE164, time = 1, body = "1")).get().messageId
-    val smsId3: Long = smsDatabase.insertMessageInbox(smsMessage(sender = recipientIdAci, time = 2, body = "2")).get().messageId
-
-    val mmsId1: Long = mmsDatabase.insertSecureDecryptedMessageInbox(mmsMessage(sender = recipientIdAci, time = 3, body = "3"), -1).get().messageId
-    val mmsId2: Long = mmsDatabase.insertSecureDecryptedMessageInbox(mmsMessage(sender = recipientIdE164, time = 4, body = "4"), -1).get().messageId
-    val mmsId3: Long = mmsDatabase.insertSecureDecryptedMessageInbox(mmsMessage(sender = recipientIdAci, time = 5, body = "5"), -1).get().messageId
-
-    val threadIdAci: Long = threadDatabase.getThreadIdFor(recipientIdAci)!!
-    val threadIdE164: Long = threadDatabase.getThreadIdFor(recipientIdE164)!!
-    assertNotEquals(threadIdAci, threadIdE164)
-
-    mentionDatabase.insert(threadIdAci, mmsId1, listOf(Mention(recipientIdE164, 0, 1)))
-    mentionDatabase.insert(threadIdE164, mmsId2, listOf(Mention(recipientIdAci, 0, 1)))
-
-    groupReceiptDatabase.insert(listOf(recipientIdAci, recipientIdE164), mmsId1, 0, 3)
-
-    val identityKeyAci: IdentityKey = identityKey(1)
-    val identityKeyE164: IdentityKey = identityKey(2)
-
-    identityDatabase.saveIdentity(ACI_A.toString(), recipientIdAci, identityKeyAci, IdentityDatabase.VerifiedStatus.VERIFIED, false, 0, false)
-    identityDatabase.saveIdentity(E164_A, recipientIdE164, identityKeyE164, IdentityDatabase.VerifiedStatus.VERIFIED, false, 0, false)
-
-    sessionDatabase.store(localAci, SignalProtocolAddress(ACI_A.toString(), 1), SessionRecord())
-
-    reactionDatabase.addReaction(MessageId(smsId1, false), ReactionRecord("a", recipientIdAci, 1, 1))
-    reactionDatabase.addReaction(MessageId(mmsId1, true), ReactionRecord("b", recipientIdE164, 1, 1))
-
-    val profile1: NotificationProfile = notificationProfile(name = "Test")
-    val profile2: NotificationProfile = notificationProfile(name = "Test2")
-
-    notificationProfileDatabase.addAllowedRecipient(profileId = profile1.id, recipientId = recipientIdAci)
-    notificationProfileDatabase.addAllowedRecipient(profileId = profile1.id, recipientId = recipientIdE164)
-    notificationProfileDatabase.addAllowedRecipient(profileId = profile2.id, recipientId = recipientIdE164)
-    notificationProfileDatabase.addAllowedRecipient(profileId = profile2.id, recipientId = recipientIdAciB)
-
-    val distributionListId: DistributionListId = distributionListDatabase.createList("testlist", listOf(recipientIdE164, recipientIdAciB))!!
-
-    // Merge
-    val retrievedId: RecipientId = recipientDatabase.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"
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest_processCdsV2Result.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest_processCdsV2Result.kt
@@ -0,0 +1,206 @@
+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"
+  }
+}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest_processPnpTuple.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest_processPnpTuple.kt
@@ -1,457 +0,0 @@
-package org.thoughtcrime.securesms.database
-
-import androidx.core.content.contentValuesOf
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNull
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.core.util.requireLong
-import org.signal.core.util.requireString
-import org.signal.core.util.select
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.PNI
-import org.whispersystems.signalservice.api.push.ServiceId
-import java.util.UUID
-
-@RunWith(AndroidJUnit4::class)
-class RecipientDatabaseTest_processPnpTuple {
-
-  private lateinit var recipientDatabase: RecipientDatabase
-
-  private val localAci = ACI.from(UUID.randomUUID())
-  private val localPni = PNI.from(UUID.randomUUID())
-
-  @Before
-  fun setup() {
-    recipientDatabase = SignalDatabase.recipients
-
-    ensureDbEmpty()
-
-    SignalStore.account().setAci(localAci)
-    SignalStore.account().setPni(localPni)
-  }
-
-  @Test
-  fun noMatch_e164Only() {
-    test {
-      process(E164_A, null, null)
-      expect(E164_A, null, null)
-    }
-  }
-
-  @Test
-  fun noMatch_e164AndPni() {
-    test {
-      process(E164_A, PNI_A, null)
-      expect(E164_A, PNI_A, null)
-    }
-  }
-
-  @Test
-  fun noMatch_aciOnly() {
-    test {
-      process(null, null, ACI_A)
-      expect(null, null, ACI_A)
-    }
-  }
-
-  @Test(expected = IllegalStateException::class)
-  fun noMatch_noData() {
-    test {
-      process(null, null, null)
-    }
-  }
-
-  @Test
-  fun noMatch_allFields() {
-    test {
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun fullMatch() {
-    test {
-      given(E164_A, PNI_A, ACI_A)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun onlyE164Matches() {
-    test {
-      given(E164_A, null, null)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun onlyE164Matches_differentAci() {
-    test {
-      given(E164_A, null, ACI_B)
-      process(E164_A, PNI_A, ACI_A)
-
-      expect(null, null, ACI_B)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun e164AndPniMatches() {
-    test {
-      given(E164_A, PNI_A, null)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun e164AndAciMatches() {
-    test {
-      given(E164_A, null, ACI_A)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun onlyPniMatches() {
-    test {
-      given(null, PNI_A, null)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun pniAndAciMatches() {
-    test {
-      given(null, PNI_A, ACI_A)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun onlyAciMatches() {
-    test {
-      given(null, null, ACI_A)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun onlyE164Matches_pniChanges_noAciProvided_noPniSession() {
-    test {
-      given(E164_A, PNI_B, null)
-      process(E164_A, PNI_A, null)
-      expect(E164_A, PNI_A, null)
-    }
-  }
-
-  @Test
-  fun e164AndPniMatches_noExistingSession() {
-    test {
-      given(E164_A, PNI_A, null)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun onlyPniMatches_noExistingSession() {
-    test {
-      given(null, PNI_A, null)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun onlyPniMatches_noExistingPniSession_changeNumber() {
-    // This test, I could go either way. We decide to change the E164 on the existing row rather than create a new one.
-    // But it's an "unstable E164->PNI mapping" case, which we don't expect, so as long as there's a user-visible impact that should be fine.
-    // TODO Verify change number
-    test {
-      given(E164_B, PNI_A, null)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun pniAndAciMatches_changeNumber() {
-    // This test, I could go either way. We decide to change the E164 on the existing row rather than create a new one.
-    // But it's an "unstable E164->PNI mapping" case, which we don't expect, so as long as there's a user-visible impact that should be fine.
-    // TODO Verify change number
-    test {
-      given(E164_B, PNI_A, ACI_A)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun onlyAciMatches_changeNumber() {
-    // TODO Verify change number
-    test {
-      given(E164_B, null, ACI_A)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun merge_e164Only_pniOnly_aciOnly() {
-    test {
-      given(E164_A, null, null)
-      given(null, PNI_A, null)
-      given(null, null, ACI_A)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expectDeleted()
-      expectDeleted()
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun merge_e164Only_pniOnly_noAciProvided() {
-    test {
-      given(E164_A, null, null)
-      given(null, PNI_A, null)
-
-      process(E164_A, PNI_A, null)
-
-      expect(E164_A, PNI_A, null)
-      expectDeleted()
-    }
-  }
-
-  @Test
-  fun merge_e164Only_pniOnly_aciProvidedButNoAciRecord() {
-    test {
-      given(E164_A, null, null)
-      given(null, PNI_A, null)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expect(E164_A, PNI_A, ACI_A)
-      expectDeleted()
-    }
-  }
-
-  @Test
-  fun merge_e164Only_pniAndE164_noAciProvided() {
-    test {
-      given(E164_A, null, null)
-      given(E164_B, PNI_A, null)
-
-      process(E164_A, PNI_A, null)
-
-      expect(E164_A, PNI_A, null)
-      expect(E164_B, null, null)
-    }
-  }
-
-  @Test
-  fun merge_e164AndPni_pniOnly_noAciProvided() {
-    test {
-      given(E164_A, PNI_B, null)
-      given(null, PNI_A, null)
-
-      process(E164_A, PNI_A, null)
-
-      expect(E164_A, PNI_A, null)
-      expectDeleted()
-    }
-  }
-
-  @Test
-  fun merge_e164AndPni_e164AndPni_noAciProvided_noSessions() {
-    test {
-      given(E164_A, PNI_B, null)
-      given(E164_B, PNI_A, null)
-
-      process(E164_A, PNI_A, null)
-
-      expect(E164_A, PNI_A, null)
-      expect(E164_B, null, null)
-    }
-  }
-
-  @Test
-  fun merge_e164AndPni_aciOnly() {
-    test {
-      given(E164_A, PNI_A, null)
-      given(null, null, ACI_A)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expectDeleted()
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun merge_e164AndPni_aciOnly_e164RecordHasSeparateE164() {
-    test {
-      given(E164_B, PNI_A, null)
-      given(null, null, ACI_A)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expect(E164_B, null, null)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun merge_e164AndPni_e164AndPniAndAci_changeNumber() {
-    // TODO Verify change number
-    test {
-      given(E164_A, PNI_A, null)
-      given(E164_B, PNI_B, ACI_A)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expectDeleted()
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  @Test
-  fun merge_e164AndPni_e164Aci_changeNumber() {
-    // TODO Verify change number
-    test {
-      given(E164_A, PNI_A, null)
-      given(E164_B, null, ACI_A)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expectDeleted()
-      expect(E164_A, PNI_A, ACI_A)
-    }
-  }
-
-  private fun insert(e164: String?, pni: PNI?, aci: ACI?): RecipientId {
-    val id: Long = SignalDatabase.rawDatabase.insert(
-      RecipientDatabase.TABLE_NAME,
-      null,
-      contentValuesOf(
-        RecipientDatabase.PHONE to e164,
-        RecipientDatabase.SERVICE_ID to (aci ?: pni)?.toString(),
-        RecipientDatabase.PNI_COLUMN to pni?.toString(),
-        RecipientDatabase.REGISTERED to RecipientDatabase.RegisteredState.REGISTERED.id
-      )
-    )
-
-    return RecipientId.from(id)
-  }
-
-  private fun require(id: RecipientId): IdRecord {
-    return get(id)!!
-  }
-
-  private fun get(id: RecipientId): IdRecord? {
-    SignalDatabase.rawDatabase
-      .select(RecipientDatabase.ID, RecipientDatabase.PHONE, RecipientDatabase.SERVICE_ID, RecipientDatabase.PNI_COLUMN)
-      .from(RecipientDatabase.TABLE_NAME)
-      .where("${RecipientDatabase.ID} = ?", id)
-      .run()
-      .use { cursor ->
-        return if (cursor.moveToFirst()) {
-          IdRecord(
-            id = RecipientId.from(cursor.requireLong(RecipientDatabase.ID)),
-            e164 = cursor.requireString(RecipientDatabase.PHONE),
-            sid = ServiceId.parseOrNull(cursor.requireString(RecipientDatabase.SERVICE_ID)),
-            pni = PNI.parseOrNull(cursor.requireString(RecipientDatabase.PNI_COLUMN))
-          )
-        } else {
-          null
-        }
-      }
-  }
-
-  private fun ensureDbEmpty() {
-    SignalDatabase.rawDatabase.rawQuery("SELECT COUNT(*) FROM ${RecipientDatabase.TABLE_NAME} WHERE ${RecipientDatabase.DISTRIBUTION_LIST_ID} IS NULL ", null).use { cursor ->
-      assertTrue(cursor.moveToFirst())
-      assertEquals(0, cursor.getLong(0))
-    }
-  }
-
-  /**
-   * Baby DSL for making tests readable.
-   */
-  private fun test(init: TestCase.() -> Unit): TestCase {
-    val test = TestCase()
-    test.init()
-    return test
-  }
-
-  private inner class TestCase {
-    private val generatedIds: LinkedHashSet<RecipientId> = LinkedHashSet()
-    private var expectCount = 0
-
-    fun given(e164: String?, pni: PNI?, aci: ACI?) {
-      generatedIds += insert(e164, pni, aci)
-    }
-
-    fun process(e164: String?, pni: PNI?, aci: ACI?) {
-      SignalDatabase.rawDatabase.beginTransaction()
-      try {
-        generatedIds += recipientDatabase.processPnpTuple(e164, pni, aci, pniVerified = false).finalId
-        SignalDatabase.rawDatabase.setTransactionSuccessful()
-      } finally {
-        SignalDatabase.rawDatabase.endTransaction()
-      }
-    }
-
-    fun expect(e164: String?, pni: PNI?, aci: ACI?) {
-      expect(generatedIds.elementAt(expectCount++), e164, pni, aci)
-    }
-
-    fun expect(id: RecipientId, e164: String?, pni: PNI?, aci: ACI?) {
-      val record: IdRecord = require(id)
-      assertEquals(e164, record.e164)
-      assertEquals(pni, record.pni)
-      assertEquals(aci ?: pni, record.sid)
-    }
-
-    fun expectDeleted() {
-      expectDeleted(generatedIds.elementAt(expectCount++))
-    }
-
-    fun expectDeleted(id: RecipientId) {
-      assertNull(get(id))
-    }
-  }
-
-  private data class IdRecord(
-    val id: RecipientId,
-    val e164: String?,
-    val sid: ServiceId?,
-    val pni: PNI?,
-  )
-
-  companion object {
-    val ACI_A = ACI.from(UUID.fromString("3436efbe-5a76-47fa-a98a-7e72c948a82e"))
-    val ACI_B = ACI.from(UUID.fromString("8de7f691-0b60-4a68-9cd9-ed2f8453f9ed"))
-
-    val PNI_A = PNI.from(UUID.fromString("154b8d92-c960-4f6c-8385-671ad2ffb999"))
-    val PNI_B = PNI.from(UUID.fromString("ba92b1fb-cd55-40bf-adda-c35a85375533"))
-
-    const val E164_A = "+12221234567"
-    const val E164_B = "+13331234567"
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest_processPnpTupleToChangeSet.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest_processPnpTupleToChangeSet.kt
@@ -1,842 +0,0 @@
-package org.thoughtcrime.securesms.database
-
-import androidx.core.content.contentValuesOf
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.testing.SignalDatabaseRule
-import org.thoughtcrime.securesms.util.Util
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.PNI
-import org.whispersystems.signalservice.api.push.ServiceId
-import java.lang.AssertionError
-import java.lang.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 = IllegalStateException::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.SetPni(
-            recipientId = result.secondId,
-            pni = PNI_A,
-          ),
-          PnpOperation.SetE164(
-            recipientId = result.secondId,
-            e164 = E164_A,
-          )
-        )
-      ),
-      result.changeSet
-    )
-  }
-
-  @Test
-  fun merge_e164AndPni_aciOnly_e164RecordHasSeparateE164_changeNumber() {
-    val result = applyAndAssert(
-      listOf(
-        Input(E164_B, PNI_A, null),
-        Input(E164_C, 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.SetPni(
-            recipientId = result.secondId,
-            pni = PNI_A,
-          ),
-          PnpOperation.SetE164(
-            recipientId = result.secondId,
-            e164 = E164_A,
-          ),
-          PnpOperation.ChangeNumberInsert(
-            recipientId = result.secondId,
-            oldE164 = E164_C,
-            newE164 = E164_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"
-    const val E164_C = "+14441234567"
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/SQLiteDatabaseTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/SQLiteDatabaseTest.kt
@@ -122,62 +122,4 @@ class SQLiteDatabaseTest {
    assertTrue(hasRun1.get())
    assertFalse(hasRun2.get())
  }
-
-  @Test
-  fun runPostSuccessfulTransaction_runsAndPerformsAnotherTransaction() {
-    val hasRun = AtomicBoolean(false)
-
-    db.beginTransaction()
-
-    db.runPostSuccessfulTransaction {
-      try {
-        db.beginTransaction()
-        hasRun.set(true)
-        db.setTransactionSuccessful()
-      } finally {
-        db.endTransaction()
-      }
-    }
-
-    assertFalse(hasRun.get())
-
-    db.setTransactionSuccessful()
-    db.endTransaction()
-
-    assertTrue(hasRun.get())
-  }
-
-  @Test
-  fun runPostSuccessfulTransaction_runsAndPerformsAnotherTransactionAndRunPostNested() {
-    val hasRun1 = AtomicBoolean(false)
-    val hasRun2 = AtomicBoolean(false)
-
-    db.beginTransaction()
-
-    db.runPostSuccessfulTransaction {
-      db.beginTransaction()
-
-      db.runPostSuccessfulTransaction {
-        assertTrue(hasRun1.get())
-        assertFalse(hasRun2.get())
-        hasRun2.set(true)
-      }
-
-      assertFalse(hasRun1.get())
-      hasRun1.set(true)
-      assertFalse(hasRun2.get())
-
-      db.setTransactionSuccessful()
-      db.endTransaction()
-    }
-
-    assertFalse(hasRun1.get())
-    assertFalse(hasRun2.get())
-
-    db.setTransactionSuccessful()
-    db.endTransaction()
-
-    assertTrue(hasRun1.get())
-    assertTrue(hasRun2.get())
-  }
 }
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadDatabaseTest_pinned.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadDatabaseTest_pinned.kt
@@ -1,74 +0,0 @@
-package org.thoughtcrime.securesms.database
-
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.signal.core.util.CursorUtil
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.testing.SignalDatabaseRule
-import org.whispersystems.signalservice.api.push.ServiceId
-import java.util.UUID
-
-@Suppress("ClassName")
-class ThreadDatabaseTest_pinned {
-
-  @Rule
-  @JvmField
-  val databaseRule = SignalDatabaseRule()
-
-  private lateinit var recipient: Recipient
-
-  @Before
-  fun setUp() {
-    recipient = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromServiceId(ServiceId.from(UUID.randomUUID())))
-  }
-
-  @Test
-  fun givenAPinnedThread_whenIDeleteTheLastMessage_thenIDoNotDeleteOrUnpinTheThread() {
-    // GIVEN
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
-    val messageId = MmsHelper.insert(recipient = recipient, threadId = threadId)
-    SignalDatabase.threads.pinConversations(listOf(threadId))
-
-    // WHEN
-    SignalDatabase.mms.deleteMessage(messageId)
-
-    // THEN
-    val pinned = SignalDatabase.threads.pinnedThreadIds
-    assertTrue(threadId in pinned)
-  }
-
-  @Test
-  fun givenAPinnedThread_whenIDeleteTheLastMessage_thenIExpectTheThreadInUnarchivedCount() {
-    // GIVEN
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
-    val messageId = MmsHelper.insert(recipient = recipient, threadId = threadId)
-    SignalDatabase.threads.pinConversations(listOf(threadId))
-
-    // WHEN
-    SignalDatabase.mms.deleteMessage(messageId)
-
-    // THEN
-    val unarchivedCount = SignalDatabase.threads.unarchivedConversationListCount
-    assertEquals(1, unarchivedCount)
-  }
-
-  @Test
-  fun givenAPinnedThread_whenIDeleteTheLastMessage_thenIExpectPinnedThreadInUnarchivedList() {
-    // GIVEN
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
-    val messageId = MmsHelper.insert(recipient = recipient, threadId = threadId)
-    SignalDatabase.threads.pinConversations(listOf(threadId))
-
-    // WHEN
-    SignalDatabase.mms.deleteMessage(messageId)
-
-    // THEN
-    SignalDatabase.threads.getUnarchivedConversationList(true, 0, 1).use {
-      it.moveToFirst()
-      assertEquals(threadId, CursorUtil.requireLong(it, ThreadDatabase.ID))
-    }
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadDatabaseTest_recents.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadDatabaseTest_recents.kt
@@ -1,52 +0,0 @@
-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)
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/UriAttachmentBuilder.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/UriAttachmentBuilder.kt
@@ -1,44 +0,0 @@
-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
-    )
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/helpers/migration/MyStoryMigrationTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/helpers/migration/MyStoryMigrationTest.kt
@@ -1,119 +0,0 @@
-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() {
-    V151_MyStoryMigration.migrate(
-      InstrumentationRegistry.getInstrumentation().targetContext.applicationContext as Application,
-      SignalDatabase.rawDatabase,
-      0,
-      1
-    )
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/dependencies/InstrumentationApplicationDependencyProvider.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/dependencies/InstrumentationApplicationDependencyProvider.kt
@@ -1,110 +0,0 @@
-package org.thoughtcrime.securesms.dependencies
-
-import android.app.Application
-import okhttp3.ConnectionSpec
-import okhttp3.mockwebserver.Dispatcher
-import okhttp3.mockwebserver.MockResponse
-import okhttp3.mockwebserver.MockWebServer
-import okhttp3.mockwebserver.RecordedRequest
-import org.mockito.kotlin.any
-import org.mockito.kotlin.doReturn
-import org.mockito.kotlin.mock
-import org.thoughtcrime.securesms.BuildConfig
-import org.thoughtcrime.securesms.KbsEnclave
-import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess
-import org.thoughtcrime.securesms.push.SignalServiceTrustStore
-import org.thoughtcrime.securesms.testing.Verb
-import org.thoughtcrime.securesms.testing.runSync
-import org.thoughtcrime.securesms.util.Base64
-import org.whispersystems.signalservice.api.KeyBackupService
-import org.whispersystems.signalservice.api.SignalServiceAccountManager
-import org.whispersystems.signalservice.api.push.TrustStore
-import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl
-import org.whispersystems.signalservice.internal.configuration.SignalCdsiUrl
-import org.whispersystems.signalservice.internal.configuration.SignalContactDiscoveryUrl
-import org.whispersystems.signalservice.internal.configuration.SignalKeyBackupServiceUrl
-import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration
-import org.whispersystems.signalservice.internal.configuration.SignalServiceUrl
-import org.whispersystems.signalservice.internal.configuration.SignalStorageUrl
-import java.security.KeyStore
-import java.util.Optional
-
-/**
- * Dependency provider used for instrumentation tests (aka androidTests).
- *
- * Handles setting up a mock web server for API calls, and provides mockable versions of [SignalServiceNetworkAccess] and
- * [KeyBackupService].
- */
-class InstrumentationApplicationDependencyProvider(application: Application, default: ApplicationDependencyProvider) : ApplicationDependencies.Provider by default {
-
-  private val serviceTrustStore: TrustStore
-  private val uncensoredConfiguration: SignalServiceConfiguration
-  private val serviceNetworkAccessMock: SignalServiceNetworkAccess
-  private val keyBackupService: KeyBackupService
-
-  init {
-    runSync {
-      webServer = MockWebServer()
-      baseUrl = webServer.url("").toString()
-    }
-
-    webServer.setDispatcher(object : Dispatcher() {
-      override fun dispatch(request: RecordedRequest): MockResponse {
-        val handler = handlers.firstOrNull {
-          request.method == it.verb && request.path.startsWith("/${it.path}")
-        }
-        return handler?.responseFactory?.invoke(request) ?: MockResponse().setResponseCode(500)
-      }
-    })
-
-    serviceTrustStore = SignalServiceTrustStore(application)
-    uncensoredConfiguration = SignalServiceConfiguration(
-      arrayOf(SignalServiceUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT)),
-      mapOf(
-        0 to arrayOf(SignalCdnUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT)),
-        2 to arrayOf(SignalCdnUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT))
-      ),
-      arrayOf(SignalContactDiscoveryUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT)),
-      arrayOf(SignalKeyBackupServiceUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT)),
-      arrayOf(SignalStorageUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT)),
-      arrayOf(SignalCdsiUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT)),
-      emptyList(),
-      Optional.of(SignalServiceNetworkAccess.DNS),
-      Optional.empty(),
-      Base64.decode(BuildConfig.ZKGROUP_SERVER_PUBLIC_PARAMS)
-    )
-
-    serviceNetworkAccessMock = mock {
-      on { getConfiguration() } doReturn uncensoredConfiguration
-      on { getConfiguration(any()) } doReturn uncensoredConfiguration
-      on { uncensoredConfiguration } doReturn uncensoredConfiguration
-    }
-
-    keyBackupService = mock()
-  }
-
-  override fun provideSignalServiceNetworkAccess(): SignalServiceNetworkAccess {
-    return serviceNetworkAccessMock
-  }
-
-  override fun provideKeyBackupService(signalServiceAccountManager: SignalServiceAccountManager, keyStore: KeyStore, enclave: KbsEnclave): KeyBackupService {
-    return keyBackupService
-  }
-
-  companion object {
-    lateinit var webServer: MockWebServer
-      private set
-    lateinit var baseUrl: String
-      private set
-
-    private val handlers: MutableList<Verb> = mutableListOf()
-
-    fun addMockWebRequestHandlers(vararg verbs: Verb) {
-      handlers.addAll(verbs)
-    }
-
-    fun clearHandlers() {
-      handlers.clear()
-    }
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/jobs/PreKeysSyncJobTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/jobs/PreKeysSyncJobTest.kt
@@ -1,212 +0,0 @@
-package org.thoughtcrime.securesms.jobs
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import okhttp3.mockwebserver.MockResponse
-import org.junit.After
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.libsignal.protocol.ecc.Curve
-import org.thoughtcrime.securesms.crypto.storage.PreKeyMetadataStore
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
-import org.thoughtcrime.securesms.jobmanager.Job
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.testing.Get
-import org.thoughtcrime.securesms.testing.Put
-import org.thoughtcrime.securesms.testing.SignalActivityRule
-import org.thoughtcrime.securesms.testing.assertIs
-import org.thoughtcrime.securesms.testing.assertIsNot
-import org.thoughtcrime.securesms.testing.parsedRequestBody
-import org.thoughtcrime.securesms.testing.success
-import org.whispersystems.signalservice.api.push.SignedPreKeyEntity
-import org.whispersystems.signalservice.internal.push.PreKeyState
-import org.whispersystems.signalservice.internal.push.PreKeyStatus
-
-@RunWith(AndroidJUnit4::class)
-class PreKeysSyncJobTest {
-
-  @get:Rule
-  val harness = SignalActivityRule()
-
-  private val aciPreKeyMeta: PreKeyMetadataStore
-    get() = SignalStore.account().aciPreKeys
-
-  private val pniPreKeyMeta: PreKeyMetadataStore
-    get() = SignalStore.account().pniPreKeys
-
-  private lateinit var job: PreKeysSyncJob
-
-  @Before
-  fun setUp() {
-    job = PreKeysSyncJob()
-  }
-
-  @After
-  fun tearDown() {
-    InstrumentationApplicationDependencyProvider.clearHandlers()
-  }
-
-  /**
-   * Create signed prekeys for both identities when both do not have registered prekeys according
-   * to our local state.
-   */
-  @Test
-  fun runWithoutRegisteredKeysForBothIdentities() {
-    // GIVEN
-    aciPreKeyMeta.isSignedPreKeyRegistered = false
-    pniPreKeyMeta.isSignedPreKeyRegistered = false
-
-    lateinit var aciSignedPreKey: SignedPreKeyEntity
-    lateinit var pniSignedPreKey: SignedPreKeyEntity
-
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Put("/v2/keys/signed?identity=aci") { r ->
-        aciSignedPreKey = r.parsedRequestBody()
-        MockResponse().success()
-      },
-      Put("/v2/keys/signed?identity=pni") { r ->
-        pniSignedPreKey = r.parsedRequestBody()
-        MockResponse().success()
-      },
-    )
-
-    // WHEN
-    val result: Job.Result = job.run()
-
-    // THEN
-    result.isSuccess assertIs true
-
-    aciPreKeyMeta.isSignedPreKeyRegistered assertIs true
-    pniPreKeyMeta.isSignedPreKeyRegistered assertIs true
-
-    val aciVerifySignatureResult = Curve.verifySignature(
-      ApplicationDependencies.getProtocolStore().aci().identityKeyPair.publicKey.publicKey,
-      aciSignedPreKey.publicKey.serialize(),
-      aciSignedPreKey.signature
-    )
-    aciVerifySignatureResult assertIs true
-
-    val pniVerifySignatureResult = Curve.verifySignature(
-      ApplicationDependencies.getProtocolStore().pni().identityKeyPair.publicKey.publicKey,
-      pniSignedPreKey.publicKey.serialize(),
-      pniSignedPreKey.signature
-    )
-    pniVerifySignatureResult assertIs true
-  }
-
-  /**
-   * With 100 prekeys registered for each identity, do nothing.
-   */
-  @Test
-  fun runWithRegisteredKeysForBothIdentities() {
-    // GIVEN
-    val currentAciKeyId = aciPreKeyMeta.activeSignedPreKeyId
-    val currentPniKeyId = pniPreKeyMeta.activeSignedPreKeyId
-
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Get("/v2/keys?identity=aci") { MockResponse().success(PreKeyStatus(100)) },
-      Get("/v2/keys?identity=pni") { MockResponse().success(PreKeyStatus(100)) },
-    )
-
-    // WHEN
-    val result: Job.Result = job.run()
-
-    // THEN
-    result.isSuccess assertIs true
-
-    aciPreKeyMeta.activeSignedPreKeyId assertIs currentAciKeyId
-    pniPreKeyMeta.activeSignedPreKeyId assertIs currentPniKeyId
-  }
-
-  /**
-   * With 100 prekeys registered for ACI, but no PNI prekeys registered according to local state,
-   * do nothing for ACI but create PNI prekeys and update local state.
-   */
-  @Test
-  fun runWithRegisteredKeysForAciIdentityOnly() {
-    // GIVEN
-    pniPreKeyMeta.isSignedPreKeyRegistered = false
-
-    val currentAciKeyId = aciPreKeyMeta.activeSignedPreKeyId
-    val currentPniKeyId = pniPreKeyMeta.activeSignedPreKeyId
-
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Get("/v2/keys?identity=aci") { MockResponse().success(PreKeyStatus(100)) },
-      Put("/v2/keys/signed?identity=pni") { MockResponse().success() },
-    )
-
-    // WHEN
-    val result: Job.Result = job.run()
-
-    // THEN
-    result.isSuccess assertIs true
-
-    pniPreKeyMeta.isSignedPreKeyRegistered assertIs true
-    aciPreKeyMeta.activeSignedPreKeyId assertIs currentAciKeyId
-    pniPreKeyMeta.activeSignedPreKeyId assertIsNot currentPniKeyId
-  }
-
-  /**
-   * With <10 prekeys registered for each identity, upload new.
-   */
-  @Test
-  fun runWithLowNumberOfRegisteredKeysForBothIdentities() {
-    // GIVEN
-    val currentAciKeyId = aciPreKeyMeta.activeSignedPreKeyId
-    val currentPniKeyId = pniPreKeyMeta.activeSignedPreKeyId
-
-    val currentNextAciPreKeyId = aciPreKeyMeta.nextOneTimePreKeyId
-    val currentNextPniPreKeyId = pniPreKeyMeta.nextOneTimePreKeyId
-
-    lateinit var aciPreKeyStateRequest: PreKeyState
-    lateinit var pniPreKeyStateRequest: PreKeyState
-
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Get("/v2/keys?identity=aci") { MockResponse().success(PreKeyStatus(5)) },
-      Get("/v2/keys?identity=pni") { MockResponse().success(PreKeyStatus(5)) },
-      Put("/v2/keys/?identity=aci") { r ->
-        aciPreKeyStateRequest = r.parsedRequestBody()
-        MockResponse().success()
-      },
-      Put("/v2/keys/?identity=pni") { r ->
-        pniPreKeyStateRequest = r.parsedRequestBody()
-        MockResponse().success()
-      },
-    )
-
-    // WHEN
-    val result: Job.Result = job.run()
-
-    // THEN
-    result.isSuccess assertIs true
-    aciPreKeyMeta.activeSignedPreKeyId assertIsNot currentAciKeyId
-    pniPreKeyMeta.activeSignedPreKeyId assertIsNot currentPniKeyId
-
-    aciPreKeyMeta.nextOneTimePreKeyId assertIsNot currentNextAciPreKeyId
-    pniPreKeyMeta.nextOneTimePreKeyId assertIsNot currentNextPniPreKeyId
-
-    ApplicationDependencies.getProtocolStore().aci().identityKeyPair.publicKey.let { aciIdentityKey ->
-      aciPreKeyStateRequest.identityKey assertIs aciIdentityKey
-
-      val verifySignatureResult = Curve.verifySignature(
-        aciIdentityKey.publicKey,
-        aciPreKeyStateRequest.signedPreKey.publicKey.serialize(),
-        aciPreKeyStateRequest.signedPreKey.signature
-      )
-      verifySignatureResult assertIs true
-    }
-
-    ApplicationDependencies.getProtocolStore().pni().identityKeyPair.publicKey.let { pniIdentityKey ->
-      pniPreKeyStateRequest.identityKey assertIs pniIdentityKey
-
-      val verifySignatureResult = Curve.verifySignature(
-        pniIdentityKey.publicKey,
-        pniPreKeyStateRequest.signedPreKey.publicKey.serialize(),
-        pniPreKeyStateRequest.signedPreKey.signature
-      )
-      verifySignatureResult assertIs true
-    }
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditFragmentTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditFragmentTest.kt
@@ -1,138 +0,0 @@
-package org.thoughtcrime.securesms.profiles.manage
-
-import androidx.appcompat.widget.Toolbar
-import androidx.fragment.app.testing.FragmentScenario
-import androidx.fragment.app.testing.launchFragmentInContainer
-import androidx.lifecycle.Lifecycle
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions.click
-import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
-import androidx.test.espresso.action.ViewActions.typeText
-import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers
-import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import androidx.test.espresso.matcher.ViewMatchers.isEnabled
-import androidx.test.espresso.matcher.ViewMatchers.isNotEnabled
-import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
-import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
-import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.espresso.matcher.ViewMatchers.withText
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.reactivex.rxjava3.schedulers.TestScheduler
-import okhttp3.mockwebserver.MockResponse
-import org.junit.After
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
-import org.thoughtcrime.securesms.testing.Put
-import org.thoughtcrime.securesms.testing.RxTestSchedulerRule
-import org.thoughtcrime.securesms.testing.SignalActivityRule
-import org.thoughtcrime.securesms.testing.assertIsNotNull
-import org.thoughtcrime.securesms.testing.assertIsNull
-import org.thoughtcrime.securesms.testing.success
-import org.whispersystems.signalservice.internal.push.ReserveUsernameResponse
-import java.util.concurrent.TimeUnit
-
-@RunWith(AndroidJUnit4::class)
-class UsernameEditFragmentTest {
-
-  @get:Rule
-  val harness = SignalActivityRule(othersCount = 10)
-
-  private val ioScheduler = TestScheduler()
-  private val computationScheduler = TestScheduler()
-
-  @get:Rule
-  val testSchedulerRule = RxTestSchedulerRule(
-    ioTestScheduler = ioScheduler,
-    computationTestScheduler = computationScheduler
-  )
-
-  @After
-  fun tearDown() {
-    InstrumentationApplicationDependencyProvider.clearHandlers()
-  }
-
-  @Test
-  fun testUsernameCreationInRegistration() {
-    val scenario = createScenario(true)
-
-    scenario.moveToState(Lifecycle.State.RESUMED)
-
-    onView(withId(R.id.toolbar)).check { view, noViewFoundException ->
-      noViewFoundException.assertIsNull()
-      val toolbar = view as Toolbar
-
-      toolbar.navigationIcon.assertIsNull()
-    }
-
-    onView(withText(R.string.UsernameEditFragment__add_a_username)).check(matches(isDisplayed()))
-    onView(withContentDescription(R.string.load_more_header__loading)).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.GONE)))
-  }
-
-  @Test
-  fun testUsernameCreationOutsideOfRegistration() {
-    val scenario = createScenario()
-
-    scenario.moveToState(Lifecycle.State.RESUMED)
-
-    onView(withId(R.id.toolbar)).check { view, noViewFoundException ->
-      noViewFoundException.assertIsNull()
-      val toolbar = view as Toolbar
-
-      toolbar.navigationIcon.assertIsNotNull()
-    }
-
-    onView(withText(R.string.UsernameEditFragment_username)).check(matches(isDisplayed()))
-    onView(withContentDescription(R.string.load_more_header__loading)).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.GONE)))
-  }
-
-  @Test
-  fun testNicknameUpdateHappyPath() {
-    val nickname = "Spiderman"
-    val discriminator = "4578"
-    val username = "$nickname${UsernameState.DELIMITER}$discriminator"
-
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Put("/v1/accounts/username/reserved") {
-        MockResponse().success(ReserveUsernameResponse(username, "reservationToken"))
-      },
-      Put("/v1/accounts/username/confirm") {
-        MockResponse().success()
-      }
-    )
-
-    val scenario = createScenario(isInRegistration = true)
-    scenario.moveToState(Lifecycle.State.RESUMED)
-
-    onView(withId(R.id.username_text)).perform(typeText(nickname))
-
-    computationScheduler.advanceTimeBy(501, TimeUnit.MILLISECONDS)
-    computationScheduler.triggerActions()
-
-    onView(withContentDescription(R.string.load_more_header__loading)).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
-
-    ioScheduler.triggerActions()
-    computationScheduler.triggerActions()
-
-    onView(withId(R.id.username_text)).perform(closeSoftKeyboard())
-    onView(withId(R.id.username_done_button)).check(matches(isDisplayed()))
-    onView(withId(R.id.username_done_button)).check(matches(isEnabled()))
-    onView(withText(username)).check(matches(isDisplayed()))
-
-    onView(withId(R.id.username_done_button)).perform(click())
-
-    computationScheduler.triggerActions()
-    onView(withId(R.id.username_done_button)).check(matches(isNotEnabled()))
-  }
-
-  private fun createScenario(isInRegistration: Boolean = false): FragmentScenario<UsernameEditFragment> {
-    val fragmentArgs = UsernameEditFragmentArgs.Builder().setIsInRegistration(isInRegistration).build().toBundle()
-    return launchFragmentInContainer(
-      fragmentArgs = fragmentArgs,
-      themeResId = R.style.Signal_DayNight_NoActionBar
-    )
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/safety/SafetyNumberBottomSheetRepositoryTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/safety/SafetyNumberBottomSheetRepositoryTest.kt
@@ -1,139 +0,0 @@
-package org.thoughtcrime.securesms.safety
-
-import io.reactivex.rxjava3.plugins.RxJavaPlugins
-import io.reactivex.rxjava3.schedulers.TestScheduler
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey
-import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.testing.SignalActivityRule
-
-class SafetyNumberBottomSheetRepositoryTest {
-
-  @get:Rule val harness = SignalActivityRule(othersCount = 10)
-
-  private val testScheduler = TestScheduler()
-  private val subjectUnderTest = SafetyNumberBottomSheetRepository()
-
-  @Before
-  fun setUp() {
-    RxJavaPlugins.setInitIoSchedulerHandler { testScheduler }
-    RxJavaPlugins.setIoSchedulerHandler { testScheduler }
-  }
-
-  @Test
-  fun givenIOnlyHave1to1Destinations_whenIGetBuckets_thenIOnlyHaveContactsBucketContainingAllRecipients() {
-    val recipients = harness.others
-    val destinations = harness.others.map { ContactSearchKey.RecipientSearchKey.KnownRecipient(it) }
-
-    val result = subjectUnderTest.getBuckets(recipients, destinations).test()
-
-    testScheduler.triggerActions()
-
-    result.assertValueAt(1) { map ->
-      assertMatch(map, mapOf(SafetyNumberBucket.ContactsBucket to harness.others))
-    }
-  }
-
-  @Test
-  fun givenIOnlyHaveASingle1to1Destination_whenIGetBuckets_thenIOnlyHaveContactsBucketContainingAllRecipients() {
-    // GIVEN
-    val recipients = harness.others
-    val destination = harness.others.take(1).map { ContactSearchKey.RecipientSearchKey.KnownRecipient(it) }
-
-    // WHEN
-    val result = subjectUnderTest.getBuckets(recipients, destination).test(1)
-    testScheduler.triggerActions()
-
-    // THEN
-    result.assertValue { map ->
-      assertMatch(map, mapOf(SafetyNumberBucket.ContactsBucket to harness.others.take(1)))
-    }
-  }
-
-  @Test
-  fun givenIHaveADistributionListDestination_whenIGetBuckets_thenIOnlyHaveDistributionListDestinationWithCorrespondingMembers() {
-    // GIVEN
-    val distributionListMembers = harness.others.take(5)
-    val distributionList = SignalDatabase.distributionLists.createList("ListA", distributionListMembers)!!
-    val destinationKey = ContactSearchKey.RecipientSearchKey.Story(SignalDatabase.distributionLists.getRecipientId(distributionList)!!)
-
-    // WHEN
-    val result = subjectUnderTest.getBuckets(harness.others, listOf(destinationKey)).test(1)
-    testScheduler.triggerActions()
-
-    // THEN
-    result.assertValue { map ->
-      assertMatch(
-        map,
-        mapOf(
-          SafetyNumberBucket.DistributionListBucket(distributionList, "ListA") to harness.others.take(5)
-        )
-      )
-    }
-  }
-
-  @Test
-  fun givenIHaveADistributionListDestinationAndIGetBuckets_whenIRemoveFromStories_thenIOnlyHaveDistributionListDestinationWithCorrespondingMembers() {
-    // GIVEN
-    val distributionListMembers = harness.others.take(5)
-    val toRemove = distributionListMembers.last()
-    val distributionList = SignalDatabase.distributionLists.createList("ListA", distributionListMembers)!!
-    val destinationKey = ContactSearchKey.RecipientSearchKey.Story(SignalDatabase.distributionLists.getRecipientId(distributionList)!!)
-    val testSubscriber = subjectUnderTest.getBuckets(distributionListMembers, listOf(destinationKey)).test(2)
-    testScheduler.triggerActions()
-
-    // WHEN
-    subjectUnderTest.removeFromStories(toRemove, listOf(destinationKey)).subscribe()
-    testSubscriber.request(1)
-    testScheduler.triggerActions()
-    testSubscriber.awaitCount(3)
-
-    // THEN
-    testSubscriber.assertValueAt(2) { map ->
-      assertMatch(
-        map,
-        mapOf(
-          SafetyNumberBucket.DistributionListBucket(distributionList, "ListA") to distributionListMembers.dropLast(1)
-        )
-      )
-    }
-  }
-
-  @Test
-  fun givenIHaveADistributionListDestinationAndIGetBuckets_whenIRemoveAllFromStory_thenINoLongerHaveEntryForThatBucket() {
-    // GIVEN
-    val distributionListMembers = harness.others.take(5)
-    val distributionList = SignalDatabase.distributionLists.createList("ListA", distributionListMembers)!!
-    val destinationKey = ContactSearchKey.RecipientSearchKey.Story(SignalDatabase.distributionLists.getRecipientId(distributionList)!!)
-    val testSubscriber = subjectUnderTest.getBuckets(distributionListMembers, listOf(destinationKey)).test(2)
-    testScheduler.triggerActions()
-
-    // WHEN
-    subjectUnderTest.removeAllFromStory(distributionListMembers, distributionList).subscribe()
-    testSubscriber.request(1)
-    testScheduler.triggerActions()
-    testSubscriber.awaitCount(3)
-
-    // THEN
-    testSubscriber.assertValueAt(2) { map ->
-      assertMatch(map, mapOf())
-    }
-  }
-
-  private fun assertMatch(
-    resultMap: Map<SafetyNumberBucket, List<SafetyNumberRecipient>>,
-    idMap: Map<SafetyNumberBucket, List<RecipientId>>
-  ): Boolean {
-    assertEquals("Result and ID Maps had different key sets", idMap.keys, resultMap.keys)
-
-    resultMap.forEach { (bucket, members) ->
-      assertEquals("Mismatch in Bucket $bucket", idMap[bucket], members.map { it.recipient.id })
-    }
-
-    return true
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/MockProvider.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/MockProvider.kt
@@ -1,114 +0,0 @@
-package org.thoughtcrime.securesms.testing
-
-import io.reactivex.rxjava3.core.Single
-import org.mockito.kotlin.any
-import org.mockito.kotlin.doReturn
-import org.mockito.kotlin.mock
-import org.mockito.kotlin.stub
-import org.signal.core.util.Hex
-import org.signal.libsignal.protocol.IdentityKeyPair
-import org.signal.libsignal.protocol.ecc.Curve
-import org.signal.libsignal.protocol.state.PreKeyRecord
-import org.signal.libsignal.protocol.util.KeyHelper
-import org.signal.libsignal.protocol.util.Medium
-import org.thoughtcrime.securesms.crypto.PreKeyUtil
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.pin.KbsRepository
-import org.thoughtcrime.securesms.pin.TokenData
-import org.thoughtcrime.securesms.test.BuildConfig
-import org.whispersystems.signalservice.api.KbsPinData
-import org.whispersystems.signalservice.api.KeyBackupService
-import org.whispersystems.signalservice.api.kbs.HashedPin
-import org.whispersystems.signalservice.api.kbs.MasterKey
-import org.whispersystems.signalservice.api.messages.multidevice.DeviceInfo
-import org.whispersystems.signalservice.api.push.ServiceId
-import org.whispersystems.signalservice.api.push.SignedPreKeyEntity
-import org.whispersystems.signalservice.internal.ServiceResponse
-import org.whispersystems.signalservice.internal.contacts.entities.TokenResponse
-import org.whispersystems.signalservice.internal.push.AuthCredentials
-import org.whispersystems.signalservice.internal.push.DeviceInfoList
-import org.whispersystems.signalservice.internal.push.PreKeyEntity
-import org.whispersystems.signalservice.internal.push.PreKeyResponse
-import org.whispersystems.signalservice.internal.push.PreKeyResponseItem
-import org.whispersystems.signalservice.internal.push.PushServiceSocket
-import org.whispersystems.signalservice.internal.push.SenderCertificate
-import org.whispersystems.signalservice.internal.push.VerifyAccountResponse
-import org.whispersystems.signalservice.internal.push.WhoAmIResponse
-import java.security.SecureRandom
-
-/**
- * Warehouse of reusable test data and mock configurations.
- */
-object MockProvider {
-
-  val senderCertificate = SenderCertificate().apply { certificate = ByteArray(0) }
-
-  val lockedFailure = PushServiceSocket.RegistrationLockFailure().apply {
-    backupCredentials = AuthCredentials.create("username", "password")
-  }
-
-  val primaryOnlyDeviceList = DeviceInfoList().apply {
-    devices = listOf(
-      DeviceInfo().apply {
-        id = 1
-      }
-    )
-  }
-
-  fun createVerifyAccountResponse(aci: ServiceId, newPni: ServiceId): VerifyAccountResponse {
-    return VerifyAccountResponse().apply {
-      uuid = aci.toString()
-      pni = newPni.toString()
-      storageCapable = false
-    }
-  }
-
-  fun createWhoAmIResponse(aci: ServiceId, pni: ServiceId, e164: String): WhoAmIResponse {
-    return WhoAmIResponse().apply {
-      this.uuid = aci.toString()
-      this.pni = pni.toString()
-      this.number = e164
-    }
-  }
-
-  fun mockGetRegistrationLockStringFlow(kbsRepository: KbsRepository) {
-    val tokenData: TokenData = mock {
-      on { enclave } doReturn BuildConfig.KBS_ENCLAVE
-      on { basicAuth } doReturn "basicAuth"
-      on { triesRemaining } doReturn 10
-      on { tokenResponse } doReturn TokenResponse()
-    }
-
-    kbsRepository.stub {
-      on { getToken(any() as String) } doReturn Single.just(ServiceResponse.forResult(tokenData, 200, ""))
-    }
-
-    val session: KeyBackupService.RestoreSession = object : KeyBackupService.RestoreSession {
-      override fun hashSalt(): ByteArray = Hex.fromStringCondensed("cba811749042b303a6a7efa5ccd160aea5e3ea243c8d2692bd13d515732f51a8")
-      override fun restorePin(hashedPin: HashedPin?): KbsPinData = KbsPinData(MasterKey.createNew(SecureRandom()), null)
-    }
-
-    val kbsService = ApplicationDependencies.getKeyBackupService(BuildConfig.KBS_ENCLAVE)
-    kbsService.stub {
-      on { newRegistrationSession(any(), any()) } doReturn session
-    }
-  }
-
-  fun createPreKeyResponse(identity: IdentityKeyPair = SignalStore.account().aciIdentityKey, deviceId: Int): PreKeyResponse {
-    val signedPreKeyRecord = PreKeyUtil.generateSignedPreKey(SecureRandom().nextInt(Medium.MAX_VALUE), identity.privateKey)
-    val oneTimePreKey = PreKeyRecord(SecureRandom().nextInt(Medium.MAX_VALUE), Curve.generateKeyPair())
-
-    val device = PreKeyResponseItem().apply {
-      this.deviceId = deviceId
-      registrationId = KeyHelper.generateRegistrationId(false)
-      signedPreKey = SignedPreKeyEntity(signedPreKeyRecord.id, signedPreKeyRecord.keyPair.publicKey, signedPreKeyRecord.signature)
-      preKey = PreKeyEntity(oneTimePreKey.id, oneTimePreKey.keyPair.publicKey)
-    }
-
-    return PreKeyResponse().apply {
-      identityKey = identity.publicKey
-      devices = listOf(device)
-    }
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/ResponseMocking.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/ResponseMocking.kt
@@ -1,48 +0,0 @@
-package org.thoughtcrime.securesms.testing
-
-import okhttp3.mockwebserver.MockResponse
-import okhttp3.mockwebserver.RecordedRequest
-import okhttp3.mockwebserver.SocketPolicy
-import org.thoughtcrime.securesms.util.JsonUtils
-import java.util.concurrent.TimeUnit
-
-typealias ResponseFactory = (request: RecordedRequest) -> MockResponse
-
-/**
- * Represent an HTTP verb for mocking web requests.
- */
-sealed class Verb(val verb: String, val path: String, val responseFactory: ResponseFactory)
-
-class Get(path: String, responseFactory: ResponseFactory) : Verb("GET", path, responseFactory)
-
-class Put(path: String, responseFactory: ResponseFactory) : Verb("PUT", path, responseFactory)
-
-fun MockResponse.success(response: Any? = null): MockResponse {
-  return setResponseCode(200).apply {
-    if (response != null) {
-      setBody(JsonUtils.toJson(response))
-    }
-  }
-}
-
-fun MockResponse.failure(code: Int, response: Any? = null): MockResponse {
-  return setResponseCode(code).apply {
-    if (response != null) {
-      setBody(JsonUtils.toJson(response))
-    }
-  }
-}
-
-fun MockResponse.connectionFailure(): MockResponse {
-  return setSocketPolicy(SocketPolicy.DISCONNECT_AT_START)
-}
-
-fun MockResponse.timeout(): MockResponse {
-  return setHeadersDelay(1, TimeUnit.DAYS)
-    .setBodyDelay(1, TimeUnit.DAYS)
-}
-
-inline fun <reified T> RecordedRequest.parsedRequestBody(): T {
-  val bodyString = String(body.readByteArray())
-  return JsonUtils.fromJson(bodyString, T::class.java)
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/RxTestSchedulerRule.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/RxTestSchedulerRule.kt
@@ -1,36 +0,0 @@
-package org.thoughtcrime.securesms.testing
-
-import io.reactivex.rxjava3.plugins.RxJavaPlugins
-import io.reactivex.rxjava3.schedulers.TestScheduler
-import org.junit.rules.ExternalResource
-
-/**
- * JUnit Rule which initialises Rx thread schedulers. If a specific
- * scheduler is not specified, it defaults to the `defaultTestScheduler`
- */
-class RxTestSchedulerRule(
-  val defaultTestScheduler: TestScheduler = TestScheduler(),
-  val ioTestScheduler: TestScheduler = defaultTestScheduler,
-  val computationTestScheduler: TestScheduler = defaultTestScheduler,
-  val singleTestScheduler: TestScheduler = defaultTestScheduler,
-  val newThreadTestScheduler: TestScheduler = defaultTestScheduler,
-) : ExternalResource() {
-
-  override fun before() {
-    RxJavaPlugins.setInitIoSchedulerHandler { ioTestScheduler }
-    RxJavaPlugins.setIoSchedulerHandler { ioTestScheduler }
-
-    RxJavaPlugins.setInitComputationSchedulerHandler { computationTestScheduler }
-    RxJavaPlugins.setComputationSchedulerHandler { computationTestScheduler }
-
-    RxJavaPlugins.setInitSingleSchedulerHandler { singleTestScheduler }
-    RxJavaPlugins.setSingleSchedulerHandler { singleTestScheduler }
-
-    RxJavaPlugins.setInitNewThreadSchedulerHandler { newThreadTestScheduler }
-    RxJavaPlugins.setNewThreadSchedulerHandler { newThreadTestScheduler }
-  }
-
-  override fun after() {
-    RxJavaPlugins.reset()
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalActivityRule.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalActivityRule.kt
@@ -8,7 +8,6 @@ import android.content.SharedPreferences
 import android.preference.PreferenceManager
 import androidx.test.core.app.ActivityScenario
 import androidx.test.platform.app.InstrumentationRegistry
-import okhttp3.mockwebserver.MockResponse
 import org.junit.rules.ExternalResource
 import org.signal.libsignal.protocol.IdentityKey
 import org.signal.libsignal.protocol.SignalProtocolAddress
@@ -18,7 +17,6 @@ import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
 import org.thoughtcrime.securesms.database.IdentityDatabase
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.net.DeviceTransferBlockingInterceptor
 import org.thoughtcrime.securesms.profiles.ProfileName
@@ -30,11 +28,7 @@ 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.ServiceResponse
-import org.whispersystems.signalservice.internal.ServiceResponseProcessor
 import org.whispersystems.signalservice.internal.push.VerifyAccountResponse
-import java.lang.IllegalArgumentException
 import java.util.UUID

 /**
@@ -43,7 +37,7 @@ import java.util.UUID
 *
 * To use: `@get:Rule val harness = SignalActivityRule()`
 */
-class SignalActivityRule(private val othersCount: Int = 4) : ExternalResource() {
+class SignalActivityRule : ExternalResource() {

  val application: Application = ApplicationDependencies.getApplication()

@@ -58,8 +52,6 @@ class SignalActivityRule(private val othersCount: Int = 4) : ExternalResource()
    context = InstrumentationRegistry.getInstrumentation().targetContext
    self = setupSelf()
    others = setupOthers()
-
-    InstrumentationApplicationDependencyProvider.clearHandlers()
  }

  private fun setupSelf(): Recipient {
@@ -73,22 +65,18 @@ class SignalActivityRule(private val othersCount: Int = 4) : ExternalResource()

    val registrationRepository = RegistrationRepository(application)

-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(Put("/v2/keys") { MockResponse().success() })
-    val response: ServiceResponse<VerifyAccountResponse> = registrationRepository.registerAccountWithoutRegistrationLock(
+    registrationRepository.registerAccountWithoutRegistrationLock(
      RegistrationData(
        code = "123123",
-        e164 = "+15555550101",
+        e164 = "+15554045550101",
        password = Util.getSecret(18),
        registrationId = registrationRepository.registrationId,
-        profileKey = registrationRepository.getProfileKey("+15555550101"),
-        fcmToken = null,
-        pniRegistrationId = registrationRepository.pniRegistrationId
+        profileKey = registrationRepository.getProfileKey("+15554045550101"),
+        fcmToken = null
      ),
      VerifyAccountResponse(UUID.randomUUID().toString(), UUID.randomUUID().toString(), false)
    ).blockingGet()

-    ServiceResponseProcessor.DefaultProcessor(response).resultOrThrow
-
    SignalStore.kbsValues().optOut()
    RegistrationUtil.maybeMarkRegistrationComplete(application)
    SignalDatabase.recipients.setProfileName(Recipient.self().id, ProfileName.fromParts("Tester", "McTesterson"))
@@ -99,16 +87,12 @@ class SignalActivityRule(private val othersCount: Int = 4) : ExternalResource()
  private fun setupOthers(): List<RecipientId> {
    val others = mutableListOf<RecipientId>()

-    if (othersCount !in 0 until 1000) {
-      throw IllegalArgumentException("$othersCount must be between 0 and 1000")
-    }
-
-    for (i in 0 until othersCount) {
+    for (i in 0..4) {
      val aci = ACI.from(UUID.randomUUID())
-      val recipientId = RecipientId.from(SignalServiceAddress(aci, "+15555551%03d".format(i)))
+      val recipientId = RecipientId.from(aci, "+1555555101$i")
      SignalDatabase.recipients.setProfileName(recipientId, ProfileName.fromParts("Buddy", "#$i"))
      SignalDatabase.recipients.setProfileKeyIfAbsent(recipientId, ProfileKeyUtil.createNew())
-      SignalDatabase.recipients.setCapabilities(recipientId, SignalServiceProfile.Capabilities(true, true, true, true, true, true, true, true))
+      SignalDatabase.recipients.setCapabilities(recipientId, SignalServiceProfile.Capabilities(true, true, true, true, true, true, true))
      SignalDatabase.recipients.setProfileSharing(recipientId, true)
      ApplicationDependencies.getProtocolStore().aci().saveIdentity(SignalProtocolAddress(aci.toString(), 0), IdentityKeyUtil.generateIdentityKeyPair().publicKey)
      others += recipientId
@@ -117,7 +101,7 @@ class SignalActivityRule(private val othersCount: Int = 4) : ExternalResource()
    return others
  }

-  inline fun <reified T : Activity> launchActivity(initIntent: Intent.() -> Unit = {}): ActivityScenario<T> {
+  inline fun <reified T : Activity> launchActivity(initIntent: Intent.() -> Unit): ActivityScenario<T> {
    return androidx.test.core.app.launchActivity(Intent(context, T::class.java).apply(initIntent))
  }

--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalDatabaseRule.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalDatabaseRule.kt
@@ -1,40 +0,0 @@
-package org.thoughtcrime.securesms.testing
-
-import org.junit.rules.TestWatcher
-import org.junit.runner.Description
-import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.PNI
-import java.util.UUID
-
-/**
- * Sets up bare-minimum to allow writing unit tests against the database,
- * including setting up the local ACI and PNI pair.
- *
- * @param deleteAllThreadsOnEachRun Run deleteAllThreads between each unit test
- */
-class SignalDatabaseRule(
-  private val deleteAllThreadsOnEachRun: Boolean = true
-) : TestWatcher() {
-
-  val localAci: ACI = ACI.from(UUID.randomUUID())
-  val localPni: PNI = PNI.from(UUID.randomUUID())
-
-  override fun starting(description: Description?) {
-    deleteAllThreads()
-
-    SignalStore.account().setAci(localAci)
-    SignalStore.account().setPni(localPni)
-  }
-
-  override fun finished(description: Description?) {
-    deleteAllThreads()
-  }
-
-  private fun deleteAllThreads() {
-    if (deleteAllThreadsOnEachRun) {
-      SignalDatabase.mms.deleteAllThreads()
-    }
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalTestRunner.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalTestRunner.kt
@@ -1,16 +0,0 @@
-package org.thoughtcrime.securesms.testing
-
-import android.app.Application
-import android.content.Context
-import androidx.test.runner.AndroidJUnitRunner
-import org.thoughtcrime.securesms.SignalInstrumentationApplicationContext
-
-/**
- * Custom runner that replaces application with [SignalInstrumentationApplicationContext].
- */
-@Suppress("unused")
-class SignalTestRunner : AndroidJUnitRunner() {
-  override fun newApplication(cl: ClassLoader?, className: String?, context: Context?): Application {
-    return super.newApplication(cl, SignalInstrumentationApplicationContext::class.java.name, context)
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/TestUtils.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/TestUtils.kt
@@ -1,46 +0,0 @@
-package org.thoughtcrime.securesms.testing
-
-import org.hamcrest.MatcherAssert.assertThat
-import org.hamcrest.Matchers.hasSize
-import org.hamcrest.Matchers.`is`
-import org.hamcrest.Matchers.not
-import org.hamcrest.Matchers.notNullValue
-import org.hamcrest.Matchers.nullValue
-import java.util.concurrent.CountDownLatch
-
-/**
- * Run the given [runnable] on a new thread and wait for it to finish.
- */
-fun runSync(runnable: () -> Unit) {
-  val lock = CountDownLatch(1)
-  Thread {
-    try {
-      runnable.invoke()
-    } finally {
-      lock.countDown()
-    }
-  }.start()
-  lock.await()
-}
-
-/* Various kotlin-ifications of hamcrest matchers */
-
-fun <T : Any?> T.assertIsNull() {
-  assertThat(this, nullValue())
-}
-
-fun <T : Any?> T.assertIsNotNull() {
-  assertThat(this, notNullValue())
-}
-
-infix fun <T : Any> T.assertIs(expected: T) {
-  assertThat(this, `is`(expected))
-}
-
-infix fun <T : Any> T.assertIsNot(expected: T) {
-  assertThat(this, not(`is`(expected)))
-}
-
-infix fun <E, T : Collection<E>> T.assertIsSize(expected: Int) {
-  assertThat(this, hasSize(expected))
-}
--- a/app/src/instrumentation/AndroidManifest.xml
+++ b/app/src/instrumentation/AndroidManifest.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          package="org.thoughtcrime.securesms">
-
-    <application
-        android:usesCleartextTraffic="true"
-        tools:replace="android:usesCleartextTraffic"
-        tools:ignore="UnusedAttribute" />
-
-</manifest>
--- a/app/src/instrumentation/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/instrumentation/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +0,0 @@
-<?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>
--- a/app/src/instrumentation/res/values/strings.xml
+++ b/app/src/instrumentation/res/values/strings.xml
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="app_name">Signal (Instrumentation)</string>
-</resources>
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -109,7 +109,7 @@

    <meta-data
            android:name="com.google.android.geo.API_KEY"
-            android:value="${mapsKey}"/>
+            android:value="AIzaSyCSx9xea86GwDKGznCAULE9Y5a8b-TfN9U"/>

    <meta-data android:name="android.supports_size_changes"
               android:value="true" />
@@ -155,8 +155,7 @@
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

    <activity android:name=".DeviceProvisioningActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:exported="true">
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
        <intent-filter>
            <action android:name="android.intent.action.VIEW" />
            <category android:name="android.intent.category.DEFAULT" />
@@ -182,10 +181,10 @@

    <activity android:name=".sharing.v2.ShareActivity"
              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:exported="true"
              android:excludeFromRecents="true"
              android:taskAffinity=""
              android:windowSoftInputMode="stateHidden"
+              android:exported="true"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
        <intent-filter>
            <action android:name="android.intent.action.SEND" />
@@ -213,14 +212,13 @@
    </activity>

    <activity android:name=".stickers.StickerPackPreviewActivity"
-              android:exported="true"
              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
              android:launchMode="singleTask"
              android:noHistory="true"
              android:windowSoftInputMode="stateHidden"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
        <intent-filter>
-            <action android:name="android.intent.action.VIEW" android:exported="true" />
+            <action android:name="android.intent.action.VIEW" />
            <category android:name="android.intent.category.DEFAULT" />
            <category android:name="android.intent.category.BROWSABLE" />
            <data android:scheme="sgnl"
@@ -257,7 +255,6 @@
    </activity-alias>

    <activity android:name=".deeplinks.DeepLinkEntryActivity"
-              android:exported="true"
              android:noHistory="true"
              android:theme="@style/Signal.Transparent">

@@ -369,32 +366,20 @@
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

        <activity android:name=".mediasend.v2.MediaSelectionActivity"
-            android:theme="@style/TextSecure.DarkNoActionBar"
+            android:theme="@style/TextSecure.FullScreenMedia"
            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"/>

    <activity android:name=".verify.VerifyIdentityActivity"
-              android:exported="false"
              android:theme="@style/Signal.DayNight.NoActionBar"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

    <activity android:name=".components.settings.app.AppSettingsActivity"
-              android:exported="true"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
              android:theme="@style/Signal.DayNight.NoActionBar"
              android:windowSoftInputMode="adjustResize">
@@ -522,11 +507,10 @@
              android:finishOnTaskLaunch="true" />

    <activity android:name=".PlayServicesProblemActivity"
-              android:exported="false"
              android:theme="@style/TextSecure.DialogActivity"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

-    <activity android:name=".SmsSendtoActivity" android:exported="true">
+    <activity android:name=".SmsSendtoActivity">
        <intent-filter>
            <action android:name="android.intent.action.SENDTO" />
            <action android:name="android.intent.action.VIEW" />
@@ -545,7 +529,6 @@
    </activity>

    <activity android:name="org.thoughtcrime.securesms.webrtc.VoiceCallShare"
-              android:exported="true"
              android:excludeFromRecents="true"
              android:permission="android.permission.CALL_PHONE"
              android:theme="@style/NoAnimation.Theme.BlackScreen"
@@ -561,7 +544,7 @@
    </activity>

    <activity android:name=".mediasend.AvatarSelectionActivity"
-              android:theme="@style/TextSecure.DarkNoActionBar"
+              android:theme="@style/TextSecure.FullScreenMedia"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

    <activity android:name=".blocked.BlockedUsersActivity"
@@ -577,10 +560,6 @@
              android:theme="@style/TextSecure.LightRegistrationTheme"
              android:windowSoftInputMode="stateVisible|adjustResize" />

-    <activity android:name=".profiles.username.AddAUsernameActivity"
-              android:theme="@style/Signal.DayNight.NoActionBar"
-              android:windowSoftInputMode="stateVisible|adjustResize" />
-
    <activity android:name=".profiles.manage.ManageProfileActivity"
              android:theme="@style/TextSecure.LightTheme"
              android:windowSoftInputMode="stateVisible|adjustResize" />
@@ -670,7 +649,7 @@

    <activity android:name=".wallpaper.crop.WallpaperImageSelectionActivity"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:theme="@style/TextSecure.DarkNoActionBar" />
+              android:theme="@style/TextSecure.FullScreenMedia" />

    <activity android:name=".wallpaper.crop.WallpaperCropActivity"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
@@ -681,12 +660,6 @@
              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

-    <activity android:name=".exporter.flow.SmsExportActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:screenOrientation="portrait"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <service android:enabled="true" android:name=".exporter.SignalSmsExportService" android:foregroundServiceType="dataSync" />
    <service android:enabled="true" android:name=".service.webrtc.WebRtcCallService" android:foregroundServiceType="camera|microphone"/>
    <service android:enabled="true" android:name=".service.ApplicationMigrationService"/>
    <service android:enabled="true" android:exported="false" android:name=".service.KeyCachingService"/>
@@ -699,13 +672,13 @@
        </intent-filter>
    </service>

-    <service android:name=".components.voice.VoiceNotePlaybackService" android:exported="true">
+    <service android:name=".components.voice.VoiceNotePlaybackService">
        <intent-filter>
            <action android:name="android.media.browse.MediaBrowserService" />
        </intent-filter>
    </service>

-    <receiver android:name="androidx.media.session.MediaButtonReceiver" android:exported="true">
+    <receiver android:name="androidx.media.session.MediaButtonReceiver" >
        <intent-filter>
            <action android:name="android.intent.action.MEDIA_BUTTON" />
        </intent-filter>
@@ -745,7 +718,7 @@

    <service android:name=".gcm.FcmFetchForegroundService" />

-    <service android:name=".gcm.FcmReceiveService" android:exported="true">
+    <service android:name=".gcm.FcmReceiveService">
        <intent-filter>
            <action android:name="com.google.firebase.MESSAGING_EVENT" />
        </intent-filter>
@@ -836,51 +809,51 @@

    </provider>

-    <receiver android:name=".service.BootReceiver" android:exported="false">
+    <receiver android:name=".service.BootReceiver">
        <intent-filter>
            <action android:name="android.intent.action.BOOT_COMPLETED"/>
            <action android:name="org.thoughtcrime.securesms.RESTART"/>
        </intent-filter>
    </receiver>

-    <receiver android:name=".service.DirectoryRefreshListener" android:exported="false">
+    <receiver android:name=".service.DirectoryRefreshListener">
        <intent-filter>
            <action android:name="android.intent.action.BOOT_COMPLETED" />
        </intent-filter>
    </receiver>

-    <receiver android:name=".service.RotateSignedPreKeyListener" android:exported="false">
+    <receiver android:name=".service.RotateSignedPreKeyListener">
        <intent-filter>
            <action android:name="android.intent.action.BOOT_COMPLETED" />
        </intent-filter>
    </receiver>

-    <receiver android:name=".service.RotateSenderCertificateListener" android:exported="false">
+    <receiver android:name=".service.RotateSenderCertificateListener">
        <intent-filter>
            <action android:name="android.intent.action.BOOT_COMPLETED" />
        </intent-filter>
    </receiver>

-    <receiver android:name=".messageprocessingalarm.MessageProcessReceiver" android:exported="false">
+    <receiver android:name=".messageprocessingalarm.MessageProcessReceiver">
        <intent-filter>
            <action android:name="android.intent.action.BOOT_COMPLETED" />
            <action android:name="org.thoughtcrime.securesms.action.PROCESS_MESSAGES" />
        </intent-filter>
    </receiver>

-    <receiver android:name=".service.LocalBackupListener" android:exported="false">
+    <receiver android:name=".service.LocalBackupListener">
        <intent-filter>
            <action android:name="android.intent.action.BOOT_COMPLETED" />
        </intent-filter>
    </receiver>

-    <receiver android:name=".service.PersistentConnectionBootListener" android:exported="false">
+    <receiver android:name=".service.PersistentConnectionBootListener">
        <intent-filter>
            <action android:name="android.intent.action.BOOT_COMPLETED"/>
        </intent-filter>
    </receiver>

-    <receiver android:name=".notifications.LocaleChangedReceiver" android:exported="false">
+    <receiver android:name=".notifications.LocaleChangedReceiver">
        <intent-filter>
            <action android:name="android.intent.action.LOCALE_CHANGED"/>
        </intent-filter>
@@ -888,7 +861,7 @@

    <receiver android:name=".notifications.MessageNotifier$ReminderReceiver"/>

-    <receiver android:name=".notifications.DeleteNotificationReceiver" android:exported="false">
+    <receiver android:name=".notifications.DeleteNotificationReceiver">
        <intent-filter>
            <action android:name="org.thoughtcrime.securesms.DELETE_NOTIFICATION"/>
        </intent-filter>
@@ -916,19 +889,16 @@

    <service
        android:name=".jobmanager.KeepAliveService"
-        android:enabled="@bool/enable_alarm_manager"
-        android:exported="false"/>
+        android:enabled="@bool/enable_alarm_manager" />

    <receiver
        android:name=".jobmanager.AlarmManagerScheduler$RetryReceiver"
-        android:enabled="@bool/enable_alarm_manager"
-        android:exported="false"/>
+        android:enabled="@bool/enable_alarm_manager" />

    <!-- Probably don't need this one -->
    <receiver
        android:name=".jobmanager.BootReceiver"
-        android:enabled="true"
-        android:exported="false">
+        android:enabled="true">
        <intent-filter>
            <action android:name="android.intent.action.BOOT_COMPLETED" />
        </intent-filter>
--- a/app/src/main/java/androidx/camera/view/SignalCameraView.java
+++ b/app/src/main/java/androidx/camera/view/SignalCameraView.java
@@ -0,0 +1,848 @@
+/*
+ * 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) {
+    }
+  }
+}
--- a/app/src/main/java/androidx/camera/view/SignalCameraXModule.java
+++ b/app/src/main/java/androidx/camera/view/SignalCameraXModule.java
@@ -0,0 +1,699 @@
+/*
+ * 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;
+  }
+}
--- a/app/src/main/java/androidx/documentfile/provider/DocumentFileHelper.java
+++ b/app/src/main/java/androidx/documentfile/provider/DocumentFileHelper.java
@@ -1,41 +0,0 @@
-package androidx.documentfile.provider;
-
-import android.content.Context;
-import android.net.Uri;
-import android.provider.DocumentsContract;
-
-import androidx.annotation.RequiresApi;
-
-import org.signal.core.util.logging.Log;
-
-/**
- * Located in androidx package as {@link TreeDocumentFile} is package protected.
- */
-public class DocumentFileHelper {
-
-  private static final String TAG = Log.tag(DocumentFileHelper.class);
-
-  /**
-   * System implementation swallows the exception and we are having problems with the rename. This inlines the
-   * same call and logs the exception. Note this implementation does not update the passed in document file like
-   * the system implementation. Do not use the provided document file after calling this method.
-   *
-   * @return true if rename successful
-   */
-  @RequiresApi(21)
-  public static boolean renameTo(Context context, DocumentFile documentFile, String displayName) {
-    if (documentFile instanceof TreeDocumentFile) {
-      Log.d(TAG, "Renaming document directly");
-      try {
-        final Uri result = DocumentsContract.renameDocument(context.getContentResolver(), documentFile.getUri(), displayName);
-        return result != null;
-      } catch (Exception e) {
-        Log.w(TAG, "Unable to rename document file", e);
-        return false;
-      }
-    } else {
-      Log.d(TAG, "Letting OS rename document: " + documentFile.getClass().getSimpleName());
-      return documentFile.renameTo(displayName);
-    }
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.java
@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms;

-import org.thoughtcrime.securesms.stories.Stories;
 import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.whispersystems.signalservice.api.account.AccountAttributes;

@@ -21,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, Stories.isFeatureFlagEnabled(), FeatureFlags.giftBadgeReceiveSupport(), FeatureFlags.phoneNumberPrivacy());
+    return new AccountAttributes.Capabilities(UUID_CAPABLE, GV2_CAPABLE, storageCapable, GV1_MIGRATION, SENDER_KEY, ANNOUNCEMENT_GROUPS, CHANGE_NUMBER, FeatureFlags.stories(), FeatureFlags.giftBadges());
  }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
@@ -21,7 +21,6 @@ import android.os.Build;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
 import androidx.annotation.WorkerThread;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.multidex.MultiDexApplication;
@@ -50,21 +49,19 @@ import org.thoughtcrime.securesms.emoji.EmojiSource;
 import org.thoughtcrime.securesms.emoji.JumboEmoji;
 import org.thoughtcrime.securesms.gcm.FcmJobService;
 import org.thoughtcrime.securesms.jobs.CheckServiceReachabilityJob;
+import org.thoughtcrime.securesms.jobs.CreateSignedPreKeyJob;
 import org.thoughtcrime.securesms.jobs.DownloadLatestEmojiDataJob;
 import org.thoughtcrime.securesms.jobs.EmojiSearchIndexDownloadJob;
 import org.thoughtcrime.securesms.jobs.FcmRefreshJob;
 import org.thoughtcrime.securesms.jobs.FontDownloaderJob;
 import org.thoughtcrime.securesms.jobs.GroupV2UpdateSelfProfileKeyJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
-import org.thoughtcrime.securesms.jobs.PnpInitializeDevicesJob;
-import org.thoughtcrime.securesms.jobs.PreKeysSyncJob;
 import org.thoughtcrime.securesms.jobs.ProfileUploadJob;
 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.KeepMessagesDuration;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger;
 import org.thoughtcrime.securesms.logging.PersistentLogger;
@@ -181,12 +178,13 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                            .addNonBlocking(this::initializeRevealableMessageManager)
                            .addNonBlocking(this::initializePendingRetryReceiptManager)
                            .addNonBlocking(this::initializeFcmCheck)
-                            .addNonBlocking(PreKeysSyncJob::enqueueIfNeeded)
+                            .addNonBlocking(CreateSignedPreKeyJob::enqueueIfNeeded)
                            .addNonBlocking(this::initializePeriodicTasks)
                            .addNonBlocking(this::initializeCircumvention)
                            .addNonBlocking(this::initializePendingMessages)
                            .addNonBlocking(this::initializeCleanup)
                            .addNonBlocking(this::initializeGlideCodecs)
+                            .addNonBlocking(RefreshPreKeysJob::scheduleIfNecessary)
                            .addNonBlocking(StorageSyncHelper::scheduleRoutineSync)
                            .addNonBlocking(() -> ApplicationDependencies.getJobManager().beginJobLoop())
                            .addNonBlocking(EmojiSource::refresh)
@@ -196,7 +194,6 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                            .addPostRender(() -> RateLimitUtil.retryAllRateLimitedMessages(this))
                            .addPostRender(this::initializeExpiringMessageManager)
                            .addPostRender(() -> SignalStore.settings().setDefaultSms(Util.isDefaultSmsProvider(this)))
-                            .addPostRender(this::initializeTrimThreadsByDateManager)
                            .addPostRender(() -> DownloadLatestEmojiDataJob.scheduleIfNecessary(this))
                            .addPostRender(EmojiSearchIndexDownloadJob::scheduleIfNecessary)
                            .addPostRender(() -> SignalDatabase.messageLog().trimOldMessages(System.currentTimeMillis(), FeatureFlags.retryRespondMaxAge()))
@@ -206,8 +203,6 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                            .addPostRender(() -> ApplicationDependencies.getJobManager().add(new FontDownloaderJob()))
                            .addPostRender(CheckServiceReachabilityJob::enqueueIfNecessary)
                            .addPostRender(GroupV2UpdateSelfProfileKeyJob::enqueueForGroupsIfNecessary)
-                            .addPostRender(StoryOnboardingDownloadJob.Companion::enqueueIfNeeded)
-                            .addPostRender(PnpInitializeDevicesJob::enqueueIfNecessary)
                            .execute();

    Log.d(TAG, "onCreate() took " + (System.currentTimeMillis() - startTime) + " ms");
@@ -233,16 +228,6 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
      KeyCachingService.onAppForegrounded(this);
      ApplicationDependencies.getShakeToReport().enable();
      checkBuildExpiration();
-
-      long lastForegroundTime = SignalStore.misc().getLastForegroundTime();
-      long currentTime        = System.currentTimeMillis();
-      long timeDiff           = currentTime - lastForegroundTime;
-
-      if (timeDiff < 0) {
-        Log.w(TAG, "Time travel! The system clock has moved backwards. (currentTime: " + currentTime + " ms, lastForegroundTime: " + lastForegroundTime + " ms, diff: " + timeDiff + " ms)");
-      }
-
-      SignalStore.misc().setLastForegroundTime(currentTime);
    });

    Log.d(TAG, "onStart() took " + (System.currentTimeMillis() - startTime) + " ms");
@@ -342,8 +327,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
    ApplicationDependencies.getIncomingMessageObserver();
  }

-  @VisibleForTesting
-  void initializeAppDependencies() {
+  private void initializeAppDependencies() {
    ApplicationDependencies.init(this, new ApplicationDependencyProvider(this));
  }

@@ -387,13 +371,6 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
    ApplicationDependencies.getPendingRetryReceiptManager().scheduleIfNecessary();
  }

-  private void initializeTrimThreadsByDateManager() {
-    KeepMessagesDuration keepMessagesDuration = SignalStore.settings().getKeepMessagesDuration();
-    if (keepMessagesDuration != KeepMessagesDuration.FOREVER) {
-      ApplicationDependencies.getTrimThreadsByDateManager().scheduleIfNecessary();
-    }
-  }
-
  private void initializePeriodicTasks() {
    RotateSignedPreKeyListener.schedule(this);
    DirectoryRefreshListener.schedule(this);
--- a/app/src/main/java/org/thoughtcrime/securesms/AvatarPreviewActivity.java
+++ b/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)
+      ContactPhoto contactPhoto  = recipient.isSelf() ? new ProfileContactPhoto(recipient, recipient.getProfileAvatar())
                                                      : 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();
--- a/app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java
@@ -46,8 +46,7 @@ public interface BindableConversationItem extends Unbindable, GiphyMp4Playable,
            boolean hasWallpaper,
            boolean isMessageRequestAccepted,
            boolean canPlayInline,
-            @NonNull Colorizer colorizer,
-            boolean isCondensedMode);
+            @NonNull Colorizer colorizer);

  @NonNull ConversationMessage getConversationMessage();

@@ -62,13 +61,12 @@ public interface BindableConversationItem extends Unbindable, GiphyMp4Playable,
  }

  default void updateSelectedState() {
-    // Intentionally Blank.
+    // Intentionall Blank.
  }

  interface EventListener {
    void onQuoteClicked(MmsMessageRecord messageRecord);
    void onLinkPreviewClicked(@NonNull LinkPreview linkPreview);
-    void onQuotedIndicatorClicked(@NonNull MessageRecord messageRecord);
    void onMoreTextClicked(@NonNull RecipientId conversationRecipientId, long messageId, boolean isMms);
    void onStickerClicked(@NonNull StickerLocator stickerLocator);
    void onViewOnceMessageClicked(@NonNull MmsMessageRecord messageRecord);
--- a/app/src/main/java/org/thoughtcrime/securesms/BiometricDeviceAuthentication.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/BiometricDeviceAuthentication.kt
@@ -1,80 +0,0 @@
-package org.thoughtcrime.securesms
-
-import android.app.Activity
-import android.content.Context
-import android.content.Intent
-import android.os.Build
-import androidx.activity.result.contract.ActivityResultContract
-import androidx.annotation.RequiresApi
-import androidx.biometric.BiometricManager
-import androidx.biometric.BiometricPrompt
-import androidx.biometric.BiometricPrompt.PromptInfo
-import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.util.ServiceUtil
-
-/**
- * Authentication using phone biometric (face, fingerprint recognition) or device lock (pattern, pin or passphrase).
- */
-class BiometricDeviceAuthentication(
-  private val biometricManager: BiometricManager,
-  private val biometricPrompt: BiometricPrompt,
-  private val biometricPromptInfo: PromptInfo
-) {
-  companion object {
-    const val AUTHENTICATED = 1
-    const val NOT_AUTHENTICATED = -1
-    const val TAG: String = "BiometricDeviceAuth"
-    const val BIOMETRIC_AUTHENTICATORS = BiometricManager.Authenticators.BIOMETRIC_STRONG or BiometricManager.Authenticators.BIOMETRIC_WEAK
-    const val ALLOWED_AUTHENTICATORS = BIOMETRIC_AUTHENTICATORS or BiometricManager.Authenticators.DEVICE_CREDENTIAL
-  }
-
-  fun authenticate(context: Context, force: Boolean, showConfirmDeviceCredentialIntent: () -> Unit): Boolean {
-    val isKeyGuardSecure = ServiceUtil.getKeyguardManager(context).isKeyguardSecure
-
-    if (!isKeyGuardSecure) {
-      Log.w(TAG, "Keyguard not secure...")
-      return false
-    }
-
-    return if (Build.VERSION.SDK_INT != 29 && biometricManager.canAuthenticate(ALLOWED_AUTHENTICATORS) == BiometricManager.BIOMETRIC_SUCCESS) {
-      if (force) {
-        Log.i(TAG, "Listening for biometric authentication...")
-        biometricPrompt.authenticate(biometricPromptInfo)
-      } else {
-        Log.i(TAG, "Skipping show system biometric or device lock dialog unless forced")
-      }
-      true
-    } else if (Build.VERSION.SDK_INT >= 21) {
-      if (force) {
-        Log.i(TAG, "firing intent...")
-        showConfirmDeviceCredentialIntent()
-      } else {
-        Log.i(TAG, "Skipping firing intent unless forced")
-      }
-      true
-    } else {
-      Log.w(TAG, "Not compatible...")
-      false
-    }
-  }
-
-  fun cancelAuthentication() {
-    biometricPrompt.cancelAuthentication()
-  }
-}
-
-class BiometricDeviceLockContract : ActivityResultContract<String, Int>() {
-
-  @RequiresApi(api = 21)
-  override fun createIntent(context: Context, input: String): Intent {
-    val keyguardManager = ServiceUtil.getKeyguardManager(context)
-    return keyguardManager.createConfirmDeviceCredentialIntent(input, "")
-  }
-
-  override fun parseResult(resultCode: Int, intent: Intent?) =
-    if (resultCode != Activity.RESULT_OK) {
-      BiometricDeviceAuthentication.NOT_AUTHENTICATED
-    } else {
-      BiometricDeviceAuthentication.AUTHENTICATED
-    }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
@@ -18,6 +18,7 @@ package org.thoughtcrime.securesms;


 import android.Manifest;
+import android.animation.LayoutTransition;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
@@ -31,6 +32,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.Button;
+import android.widget.HorizontalScrollView;
 import android.widget.TextView;
 import android.widget.Toast;

@@ -41,7 +43,6 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.ConstraintSet;
 import androidx.fragment.app.FragmentActivity;
-import androidx.lifecycle.ViewModelProvider;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
 import androidx.recyclerview.widget.DefaultItemAnimator;
@@ -53,6 +54,7 @@ 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;

@@ -60,7 +62,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.ContactChipViewModel;
+import org.thoughtcrime.securesms.contacts.ContactChip;
 import org.thoughtcrime.securesms.contacts.ContactSelectionListAdapter;
 import org.thoughtcrime.securesms.contacts.ContactSelectionListItem;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader;
@@ -68,25 +70,21 @@ 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;
@@ -96,9 +94,6 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.function.Consumer;

-import io.reactivex.rxjava3.disposables.Disposable;
-import kotlin.Unit;
-
 /**
 * Fragment for selecting a one or more contacts from a list.
 *
@@ -110,7 +105,7 @@ public final class ContactSelectionListFragment extends LoggingFragment
  @SuppressWarnings("unused")
  private static final String TAG = Log.tag(ContactSelectionListFragment.class);

-  private static final int CHIP_GROUP_EMPTY_CHILD_COUNT  = 0;
+  private static final int CHIP_GROUP_EMPTY_CHILD_COUNT  = 1;
  private static final int CHIP_GROUP_REVEAL_DURATION_MS = 150;

  public static final int NO_LIMIT = Integer.MAX_VALUE;
@@ -138,26 +133,24 @@ public final class ContactSelectionListFragment extends LoggingFragment
  private RecyclerView                                recyclerView;
  private RecyclerViewFastScroller                    fastScroller;
  private ContactSelectionListAdapter                 cursorRecyclerViewAdapter;
-  private RecyclerView                                chipRecycler;
+  private ChipGroup                                   chipGroup;
+  private HorizontalScrollView                        chipGroupScrollContainer;
  private OnSelectionLimitReachedListener             onSelectionLimitReachedListener;
  private AbstractContactsCursorLoaderFactoryProvider cursorFactoryProvider;
-  private MappingAdapter                              contactChipAdapter;
-  private ContactChipViewModel                        contactChipViewModel;
-  private LifecycleDisposable                         lifecycleDisposable;
+
  private HeaderActionProvider                        headerActionProvider;
  private TextView                                    headerActionView;

-  @Nullable private FixedViewsAdapter       headerAdapter;
-  @Nullable private FixedViewsAdapter       footerAdapter;
-  @Nullable private ListCallback            listCallback;
-  @Nullable private ScrollCallback          scrollCallback;
-  @Nullable private OnItemLongClickListener onItemLongClickListener;
-  private           GlideRequests           glideRequests;
-  private           SelectionLimits         selectionLimit = SelectionLimits.NO_LIMITS;
-  private           Set<RecipientId>        currentSelection;
-  private           boolean                 isMulti;
-  private           boolean                 hideCount;
-  private           boolean                 canSelectSelf;
+  @Nullable private FixedViewsAdapter headerAdapter;
+  @Nullable private FixedViewsAdapter footerAdapter;
+  @Nullable private ListCallback      listCallback;
+  @Nullable private ScrollCallback    scrollCallback;
+  private           GlideRequests     glideRequests;
+  private           SelectionLimits   selectionLimit = SelectionLimits.NO_LIMITS;
+  private           Set<RecipientId>  currentSelection;
+  private           boolean           isMulti;
+  private           boolean           hideCount;
+  private           boolean           canSelectSelf;

  @Override
  public void onAttach(@NonNull Context context) {
@@ -206,14 +199,6 @@ public final class ContactSelectionListFragment extends LoggingFragment
    if (getParentFragment() instanceof HeaderActionProvider) {
      headerActionProvider = (HeaderActionProvider) getParentFragment();
    }
-
-    if (context instanceof OnItemLongClickListener) {
-      onItemLongClickListener = (OnItemLongClickListener) context;
-    }
-
-    if (getParentFragment() instanceof OnItemLongClickListener) {
-      onItemLongClickListener = (OnItemLongClickListener) getParentFragment();
-    }
  }

  @Override
@@ -263,7 +248,8 @@ public final class ContactSelectionListFragment extends LoggingFragment
    showContactsButton       = view.findViewById(R.id.show_contacts_button);
    showContactsDescription  = view.findViewById(R.id.show_contacts_description);
    showContactsProgress     = view.findViewById(R.id.progress);
-    chipRecycler             = view.findViewById(R.id.chipRecycler);
+    chipGroup                = view.findViewById(R.id.chipGroup);
+    chipGroupScrollContainer = view.findViewById(R.id.chipGroupScrollContainer);
    constraintLayout         = view.findViewById(R.id.container);
    headerActionView         = view.findViewById(R.id.header_action);

@@ -277,18 +263,6 @@ public final class ContactSelectionListFragment extends LoggingFragment
      }
    });

-    contactChipViewModel = new ViewModelProvider(this).get(ContactChipViewModel.class);
-    contactChipAdapter   = new MappingAdapter();
-    lifecycleDisposable  = new LifecycleDisposable();
-
-    lifecycleDisposable.bindTo(getViewLifecycleOwner());
-    SelectedContacts.register(contactChipAdapter, this::onChipCloseIconClicked);
-    chipRecycler.setAdapter(contactChipAdapter);
-
-    Disposable disposable = contactChipViewModel.getState().subscribe(this::handleSelectedContactsChanged);
-
-    lifecycleDisposable.add(disposable);
-
    Intent intent    = requireActivity().getIntent();
    Bundle arguments = safeArguments();

@@ -411,8 +385,7 @@ public final class ContactSelectionListFragment extends LoggingFragment
                                                                null,
                                                                new ListClickListener(),
                                                                isMulti,
-                                                                currentSelection,
-                                                                safeArguments().getInt(ContactSelectionArguments.CHECKBOX_RESOURCE, R.drawable.contact_selection_checkbox));
+                                                                currentSelection);

    RecyclerViewConcatenateAdapterStickyHeader concatenateAdapter = new RecyclerViewConcatenateAdapterStickyHeader();

@@ -728,15 +701,6 @@ public final class ContactSelectionListFragment extends LoggingFragment
        }
      }
    }
-
-    @Override
-    public boolean onItemLongClick(ContactSelectionListItem item) {
-      if (onItemLongClickListener != null) {
-        return onItemLongClickListener.onLongClick(item);
-      } else {
-        return false;
-      }
-    }
  }

  private boolean selectionHardLimitReached() {
@@ -764,22 +728,75 @@ public final class ContactSelectionListFragment extends LoggingFragment
  private void markContactUnselected(@NonNull SelectedContact selectedContact) {
    cursorRecyclerViewAdapter.removeFromSelectedContacts(selectedContact);
    cursorRecyclerViewAdapter.notifyItemRangeChanged(0, cursorRecyclerViewAdapter.getItemCount(), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
-    contactChipViewModel.remove(selectedContact);
+    removeChipForContact(selectedContact);

    if (onContactSelectedListener != null) {
      onContactSelectedListener.onSelectionChanged();
    }
  }

-  private void handleSelectedContactsChanged(@NonNull List<SelectedContacts.Model> selectedContacts) {
-    contactChipAdapter.submitList(new MappingModelList(selectedContacts), this::smoothScrollChipsToEnd);
+  private void removeChipForContact(@NonNull SelectedContact contact) {
+    for (int i = chipGroup.getChildCount() - 1; i >= 0; i--) {
+      View v = chipGroup.getChildAt(i);
+      if (v instanceof ContactChip && contact.matches(((ContactChip) v).getContact())) {
+        chipGroup.removeView(v);
+      }
+    }

-    if (selectedContacts.isEmpty()) {
+    if (getChipCount() == 0) {
      setChipGroupVisibility(ConstraintSet.GONE);
-    } else {
+    }
+  }
+
+  private void addChipForSelectedContact(@NonNull SelectedContact selectedContact) {
+    SimpleTask.run(getViewLifecycleOwner().getLifecycle(),
+                   () -> Recipient.resolved(selectedContact.getOrCreateRecipientId(requireContext())),
+                   resolved -> addChipForRecipient(resolved, selectedContact));
+  }
+
+  private void addChipForRecipient(@NonNull Recipient recipient, @NonNull SelectedContact selectedContact) {
+    final ContactChip chip = new ContactChip(requireContext());
+
+    if (getChipCount() == 0) {
      setChipGroupVisibility(ConstraintSet.VISIBLE);
    }

+    chip.setText(recipient.getShortDisplayName(requireContext()));
+    chip.setContact(selectedContact);
+    chip.setCloseIconVisible(true);
+    chip.setOnCloseIconClickListener(view -> {
+      markContactUnselected(selectedContact);
+
+      if (onContactSelectedListener != null) {
+        onContactSelectedListener.onContactDeselected(Optional.of(recipient.getId()), recipient.getE164().orElse(null));
+      }
+    });
+
+    chipGroup.getLayoutTransition().addTransitionListener(new LayoutTransition.TransitionListener() {
+      @Override
+      public void startTransition(LayoutTransition transition, ViewGroup container, View view, int transitionType) {
+      }
+
+      @Override
+      public void endTransition(LayoutTransition transition, ViewGroup container, View view, int transitionType) {
+        if (getView() == null || !requireView().isAttachedToWindow()) {
+          Log.w(TAG, "Fragment's view was detached before the animation completed.");
+          return;
+        }
+
+        if (view == chip && transitionType == LayoutTransition.APPEARING) {
+          chipGroup.getLayoutTransition().removeTransitionListener(this);
+          registerChipRecipientObserver(chip, recipient.live());
+          chipGroup.post(ContactSelectionListFragment.this::smoothScrollChipsToEnd);
+        }
+      }
+    });
+
+    chip.setAvatar(glideRequests, recipient, () -> addChip(chip));
+  }
+
+  private void addChip(@NonNull ContactChip chip) {
+    chipGroup.addView(chip);
    if (selectionWarningLimitReachedExactly()) {
      if (onSelectionLimitReachedListener != null) {
        onSelectionLimitReachedListener.onSuggestedLimitReached(selectionLimit.getRecommendedLimit());
@@ -789,27 +806,23 @@ public final class ContactSelectionListFragment extends LoggingFragment
    }
  }

-  private void addChipForSelectedContact(@NonNull SelectedContact selectedContact) {
-    SimpleTask.run(getViewLifecycleOwner().getLifecycle(),
-                   () -> Recipient.resolved(selectedContact.getOrCreateRecipientId(requireContext())),
-                   resolved -> contactChipViewModel.add(selectedContact));
-  }
-
-  private Unit onChipCloseIconClicked(SelectedContacts.Model model) {
-    markContactUnselected(model.getSelectedContact());
-    if (onContactSelectedListener != null) {
-      onContactSelectedListener.onContactDeselected(Optional.of(model.getRecipient().getId()), model.getRecipient().getE164().orElse(null));
-    }
-
-    return Unit.INSTANCE;
-  }
-
  private int getChipCount() {
-    int count = contactChipViewModel.getCount() - CHIP_GROUP_EMPTY_CHILD_COUNT;
+    int count = chipGroup.getChildCount() - CHIP_GROUP_EMPTY_CHILD_COUNT;
    if (count < 0) throw new AssertionError();
    return count;
  }

+  private void registerChipRecipientObserver(@NonNull ContactChip chip, @Nullable LiveRecipient recipient) {
+    if (recipient != null) {
+      recipient.observe(getViewLifecycleOwner(), resolved -> {
+        if (chip.isAttachedToWindow()) {
+          chip.setAvatar(glideRequests, resolved, null);
+          chip.setText(resolved.getShortDisplayName(chip.getContext()));
+        }
+      });
+    }
+  }
+
  private void setChipGroupVisibility(int visibility) {
    if (!safeArguments().getBoolean(DISPLAY_CHIPS, requireActivity().getIntent().getBooleanExtra(DISPLAY_CHIPS, true))) {
      return;
@@ -823,7 +836,7 @@ public final class ContactSelectionListFragment extends LoggingFragment

    ConstraintSet constraintSet = new ConstraintSet();
    constraintSet.clone(constraintLayout);
-    constraintSet.setVisibility(R.id.chipRecycler, visibility);
+    constraintSet.setVisibility(R.id.chipGroupScrollContainer, visibility);
    constraintSet.applyTo(constraintLayout);
  }

@@ -832,8 +845,8 @@ public final class ContactSelectionListFragment extends LoggingFragment
  }

  private void smoothScrollChipsToEnd() {
-    int x = ViewUtil.isLtr(chipRecycler) ? chipRecycler.getWidth() : 0;
-    chipRecycler.smoothScrollBy(x, 0);
+    int x = ViewUtil.isLtr(chipGroupScrollContainer) ? chipGroup.getWidth() : 0;
+    chipGroupScrollContainer.smoothScrollTo(x, 0);
  }

  public interface OnContactSelectedListener {
@@ -867,10 +880,6 @@ public final class ContactSelectionListFragment extends LoggingFragment
    @NonNull HeaderAction getHeaderAction();
  }

-  public interface OnItemLongClickListener {
-    boolean onLongClick(ContactSelectionListItem contactSelectionListItem);
-  }
-
  public interface AbstractContactsCursorLoaderFactoryProvider {
    @NonNull AbstractContactsCursorLoader.Factory get();
  }
--- a/app/src/main/java/org/thoughtcrime/securesms/DeviceAddFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/DeviceAddFragment.java
@@ -18,7 +18,6 @@ import androidx.core.view.ViewCompat;

 import org.signal.qr.QrScannerView;
 import org.signal.qr.kitkat.ScanListener;
-import org.thoughtcrime.securesms.mediasend.camerax.CameraXModelBlocklist;
 import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.LifecycleDisposable;
 import org.thoughtcrime.securesms.util.ViewUtil;
@@ -58,7 +57,7 @@ public class DeviceAddFragment extends LoggingFragment {
      });
    }

-    scannerView.start(getViewLifecycleOwner(), CameraXModelBlocklist.isBlocklisted());
+    scannerView.start(getViewLifecycleOwner(), FeatureFlags.useQrLegacyScan());

    lifecycleDisposable.bindTo(getViewLifecycleOwner());

--- a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
@@ -44,15 +44,13 @@ import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
-import androidx.lifecycle.ViewModelProvider;
+import androidx.lifecycle.ViewModelProviders;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
 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;
@@ -168,7 +166,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
    setSupportActionBar(findViewById(R.id.toolbar));

    voiceNoteMediaController = new VoiceNoteMediaController(this);
-    viewModel = new ViewModelProvider(this).get(MediaPreviewViewModel.class);
+    viewModel = ViewModelProviders.of(this).get(MediaPreviewViewModel.class);

    fullscreenHelper = new FullscreenHelper(this);

@@ -399,7 +397,6 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
    if (mediaItem != null) {
      MultiselectForwardFragmentArgs.create(
          this,
-          threadId,
          mediaItem.uri,
          mediaItem.type,
          args -> MultiselectForwardFragment.showBottomSheet(getSupportFragmentManager(), args)
@@ -466,7 +463,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
      return;
    }

-    AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
+    AlertDialog.Builder builder = new AlertDialog.Builder(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);
--- a/app/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java
@@ -20,27 +20,11 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.ViewGroup;

-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
-import androidx.lifecycle.ViewModelProvider;

-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.snackbar.Snackbar;
-
-import org.signal.core.util.DimensionUnit;
-import org.signal.core.util.concurrent.SimpleTask;
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.components.menu.ActionItem;
-import org.thoughtcrime.securesms.components.menu.SignalContextMenu;
-import org.thoughtcrime.securesms.contacts.ContactSelectionListItem;
-import org.thoughtcrime.securesms.contacts.management.ContactsManagementRepository;
-import org.thoughtcrime.securesms.contacts.management.ContactsManagementViewModel;
 import org.thoughtcrime.securesms.contacts.sync.ContactDiscovery;
 import org.thoughtcrime.securesms.conversation.ConversationIntents;
 import org.thoughtcrime.securesms.database.SignalDatabase;
@@ -49,57 +33,32 @@ import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.CommunicationActions;
-import org.thoughtcrime.securesms.util.FeatureFlags;
-import org.thoughtcrime.securesms.util.LifecycleDisposable;
+import org.signal.core.util.concurrent.SimpleTask;
 import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;

 import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;

 /**
 * Activity container for starting a new conversation.
 *
 * @author Moxie Marlinspike
+ *
 */
 public class NewConversationActivity extends ContactSelectionActivity
-    implements ContactSelectionListFragment.ListCallback, ContactSelectionListFragment.OnItemLongClickListener
+                                    implements ContactSelectionListFragment.ListCallback
 {

  @SuppressWarnings("unused")
  private static final String TAG = Log.tag(NewConversationActivity.class);

-  private ContactsManagementViewModel    viewModel;
-  private ActivityResultLauncher<Intent> contactLauncher;
-
-  private final LifecycleDisposable disposables = new LifecycleDisposable();
-
  @Override
  public void onCreate(Bundle bundle, boolean ready) {
    super.onCreate(bundle, ready);
    assert getSupportActionBar() != null;
    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
    getSupportActionBar().setTitle(R.string.NewConversationActivity__new_message);
-
-    disposables.bindTo(this);
-
-    ContactsManagementRepository        repository = new ContactsManagementRepository(this);
-    ContactsManagementViewModel.Factory factory    = new ContactsManagementViewModel.Factory(repository);
-
-    contactLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), activityResult -> {
-      if (activityResult.getResultCode() == RESULT_OK) {
-        handleManualRefresh();
-      }
-    });
-
-    viewModel = new ViewModelProvider(this, factory).get(ContactsManagementViewModel.class);
  }

  @Override
@@ -161,18 +120,10 @@ public class NewConversationActivity extends ContactSelectionActivity
    super.onOptionsItemSelected(item);

    switch (item.getItemId()) {
-      case android.R.id.home:
-        super.onBackPressed();
-        return true;
-      case R.id.menu_refresh:
-        handleManualRefresh();
-        return true;
-      case R.id.menu_new_group:
-        handleCreateGroup();
-        return true;
-      case R.id.menu_invite:
-        handleInvite();
-        return true;
+    case android.R.id.home:   super.onBackPressed(); return true;
+    case R.id.menu_refresh:   handleManualRefresh(); return true;
+    case R.id.menu_new_group: handleCreateGroup();   return true;
+    case R.id.menu_invite:    handleInvite();        return true;
    }

    return false;
@@ -211,143 +162,4 @@ public class NewConversationActivity extends ContactSelectionActivity
    handleCreateGroup();
    finish();
  }
-
-  @Override
-  public boolean onLongClick(ContactSelectionListItem contactSelectionListItem) {
-    RecipientId recipientId = contactSelectionListItem.getRecipientId().orElse(null);
-    if (recipientId == null) {
-      return false;
-    }
-
-    List<ActionItem> actions = generateContextualActionsForRecipient(recipientId);
-    if (actions.isEmpty()) {
-      return false;
-    }
-
-    new SignalContextMenu.Builder(contactSelectionListItem, (ViewGroup) contactSelectionListItem.getRootView())
-        .preferredVerticalPosition(SignalContextMenu.VerticalPosition.BELOW)
-        .preferredHorizontalPosition(SignalContextMenu.HorizontalPosition.START)
-        .offsetX((int) DimensionUnit.DP.toPixels(12))
-        .offsetY((int) DimensionUnit.DP.toPixels(12))
-        .show(actions);
-
-    return true;
-  }
-
-  private @NonNull List<ActionItem> generateContextualActionsForRecipient(@NonNull RecipientId recipientId) {
-    Recipient recipient = Recipient.resolved(recipientId);
-
-    return Stream.of(
-        createMessageActionItem(recipient),
-        createAudioCallActionItem(recipient),
-        createVideoCallActionItem(recipient),
-        createRemoveActionItem(recipient),
-        createBlockActionItem(recipient)
-    ).filter(Objects::nonNull).collect(Collectors.toList());
-  }
-
-  private @NonNull ActionItem createMessageActionItem(@NonNull Recipient recipient) {
-    return new ActionItem(
-        R.drawable.ic_message_24,
-        getString(R.string.NewConversationActivity__message),
-        R.color.signal_colorOnSurface,
-        () -> startActivity(ConversationIntents.createBuilder(this, recipient.getId(), -1L).build())
-    );
-  }
-
-  private @Nullable ActionItem createAudioCallActionItem(@NonNull Recipient recipient) {
-    if (recipient.isSelf() || recipient.isGroup()) {
-      return null;
-    }
-
-    return new ActionItem(
-        R.drawable.ic_phone_right_24,
-        getString(R.string.NewConversationActivity__audio_call),
-        R.color.signal_colorOnSurface,
-        () -> CommunicationActions.startVoiceCall(this, recipient)
-    );
-  }
-
-  private @Nullable ActionItem createVideoCallActionItem(@NonNull Recipient recipient) {
-    if (recipient.isSelf() || recipient.isMmsGroup()) {
-      return null;
-    }
-
-    return new ActionItem(
-        R.drawable.ic_video_call_24,
-        getString(R.string.NewConversationActivity__video_call),
-        R.color.signal_colorOnSurface,
-        () -> CommunicationActions.startVideoCall(this, recipient)
-    );
-  }
-
-  private @Nullable ActionItem createRemoveActionItem(@NonNull Recipient recipient) {
-    if (!FeatureFlags.hideContacts() || recipient.isSelf() || recipient.isGroup()) {
-      return null;
-    }
-
-    return new ActionItem(
-        R.drawable.ic_minus_circle_20, // TODO [alex] -- correct asset
-        getString(R.string.NewConversationActivity__remove),
-        R.color.signal_colorOnSurface,
-        () -> {
-          if (recipient.isSystemContact()) {
-            displayIsInSystemContactsDialog(recipient);
-          } else {
-            displayRemovalDialog(recipient);
-          }
-        }
-    );
-  }
-
-  @SuppressWarnings("CodeBlock2Expr")
-  private @Nullable ActionItem createBlockActionItem(@NonNull Recipient recipient) {
-    if (recipient.isSelf()) {
-      return null;
-    }
-
-    return new ActionItem(
-        R.drawable.ic_block_tinted_24,
-        getString(R.string.NewConversationActivity__block),
-        R.color.signal_colorError,
-        () -> BlockUnblockDialog.showBlockFor(this,
-                                              this.getLifecycle(),
-                                              recipient,
-                                              () -> {
-                                                disposables.add(viewModel.blockContact(recipient).subscribe(() -> {
-                                                  displaySnackbar(R.string.NewConversationActivity__s_has_been_removed);
-                                                }));
-                                              })
-    );
-  }
-
-  private void displayIsInSystemContactsDialog(@NonNull Recipient recipient) {
-    new MaterialAlertDialogBuilder(this)
-        .setTitle(getString(R.string.NewConversationActivity__unable_to_remove_s, recipient.getShortDisplayName(this)))
-        .setMessage(R.string.NewConversationActivity__this_person_is_saved_to_your)
-        .setPositiveButton(R.string.NewConversationActivity__view_contact,
-                           (dialog, which) -> contactLauncher.launch(new Intent(Intent.ACTION_VIEW, recipient.getContactUri()))
-        )
-        .setNegativeButton(android.R.string.cancel, null)
-        .show();
-  }
-
-  private void displayRemovalDialog(@NonNull Recipient recipient) {
-    new MaterialAlertDialogBuilder(this)
-        .setTitle(getString(R.string.NewConversationActivity__remove_s, recipient.getShortDisplayName(this)))
-        .setMessage(R.string.NewConversationActivity__you_wont_see_this_person)
-        .setPositiveButton(R.string.NewConversationActivity__remove,
-                           (dialog, which) -> {
-                             disposables.add(viewModel.hideContact(recipient).subscribe(() -> {
-                               displaySnackbar(R.string.NewConversationActivity__s_has_been_removed);
-                             }));
-                           }
-        )
-        .setNegativeButton(android.R.string.cancel, null)
-        .show();
-  }
-
-  private void displaySnackbar(@StringRes int message) {
-    Snackbar.make(findViewById(android.R.id.content), message, Snackbar.LENGTH_SHORT).show();
-  }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java
@@ -47,6 +47,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.Toolbar;
 import androidx.biometric.BiometricManager;
+import androidx.biometric.BiometricManager.Authenticators;
 import androidx.biometric.BiometricPrompt;

 import org.signal.core.util.ThreadUtil;
@@ -63,8 +64,6 @@ import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.SupportEmailUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;

-import kotlin.Unit;
-
 /**
 * Activity that prompts for a user's passphrase.
 *
@@ -73,6 +72,8 @@ import kotlin.Unit;
 public class PassphrasePromptActivity extends PassphraseActivity {

  private static final String TAG                       = Log.tag(PassphrasePromptActivity.class);
+  private static final int    BIOMETRIC_AUTHENTICATORS  = Authenticators.BIOMETRIC_STRONG | Authenticators.BIOMETRIC_WEAK;
+  private static final int    ALLOWED_AUTHENTICATORS    = BIOMETRIC_AUTHENTICATORS | Authenticators.DEVICE_CREDENTIAL;
  private static final short  AUTHENTICATE_REQUEST_CODE = 1007;
  private static final String BUNDLE_ALREADY_SHOWN      = "bundle_already_shown";
  public static final  String FROM_FOREGROUND           = "from_foreground";
@@ -89,9 +90,9 @@ public class PassphrasePromptActivity extends PassphraseActivity {
  private ImageButton     hideButton;
  private AnimatingToggle visibilityToggle;

-  private BiometricManager              biometricManager;
-  private BiometricPrompt               biometricPrompt;
-  private BiometricDeviceAuthentication biometricAuth;
+  private BiometricManager           biometricManager;
+  private BiometricPrompt            biometricPrompt;
+  private BiometricPrompt.PromptInfo biometricPromptInfo;

  private boolean authenticated;
  private boolean hadFailure;
@@ -248,12 +249,12 @@ public class PassphrasePromptActivity extends PassphraseActivity {
    lockScreenButton        = findViewById(R.id.lock_screen_auth_container);
    biometricManager        = BiometricManager.from(this);
    biometricPrompt         = new BiometricPrompt(this, new BiometricAuthenticationListener());
-    BiometricPrompt.PromptInfo biometricPromptInfo = new BiometricPrompt.PromptInfo
-                                                                        .Builder()
-                                                                        .setAllowedAuthenticators(BiometricDeviceAuthentication.ALLOWED_AUTHENTICATORS)
-                                                                        .setTitle(getString(R.string.PassphrasePromptActivity_unlock_signal))
-                                                                        .build();
-    biometricAuth = new BiometricDeviceAuthentication(biometricManager, biometricPrompt, biometricPromptInfo);
+    biometricPromptInfo     = new BiometricPrompt.PromptInfo
+                                                 .Builder()
+                                                 .setAllowedAuthenticators(ALLOWED_AUTHENTICATORS)
+                                                 .setTitle(getString(R.string.PassphrasePromptActivity_unlock_signal))
+                                                 .build();
+
    setSupportActionBar(toolbar);
    getSupportActionBar().setTitle("");

@@ -278,7 +279,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
  private void setLockTypeVisibility() {
    if (TextSecurePreferences.isScreenLockEnabled(this)) {
      passphraseAuthContainer.setVisibility(View.GONE);
-      fingerprintPrompt.setVisibility(biometricManager.canAuthenticate(BiometricDeviceAuthentication.BIOMETRIC_AUTHENTICATORS) == BiometricManager.BIOMETRIC_SUCCESS ? View.VISIBLE
+      fingerprintPrompt.setVisibility(biometricManager.canAuthenticate(BIOMETRIC_AUTHENTICATORS) == BiometricManager.BIOMETRIC_SUCCESS ? View.VISIBLE
                                                                                                                                       : View.GONE);
      lockScreenButton.setVisibility(View.VISIBLE);
    } else {
@@ -289,7 +290,33 @@ public class PassphrasePromptActivity extends PassphraseActivity {
  }

  private void resumeScreenLock(boolean force) {
-    if (!biometricAuth.authenticate(getApplicationContext(), force, this::showConfirmDeviceCredentialIntent)) {
+    KeyguardManager keyguardManager = (KeyguardManager) getSystemService(Context.KEYGUARD_SERVICE);
+
+    assert keyguardManager != null;
+
+    if (!keyguardManager.isKeyguardSecure()) {
+      Log.w(TAG ,"Keyguard not secure...");
+      handleAuthenticated();
+      return;
+    }
+
+    if (Build.VERSION.SDK_INT != 29 && biometricManager.canAuthenticate(ALLOWED_AUTHENTICATORS) == BiometricManager.BIOMETRIC_SUCCESS) {
+      if (force) {
+        Log.i(TAG, "Listening for biometric authentication...");
+        biometricPrompt.authenticate(biometricPromptInfo);
+      } else {
+        Log.i(TAG, "Skipping show system biometric dialog unless forced");
+      }
+    } else if (Build.VERSION.SDK_INT >= 21) {
+      if (force) {
+        Log.i(TAG, "firing intent...");
+        Intent intent = keyguardManager.createConfirmDeviceCredentialIntent(getString(R.string.PassphrasePromptActivity_unlock_signal), "");
+        startActivityForResult(intent, AUTHENTICATE_REQUEST_CODE);
+      } else {
+        Log.i(TAG, "Skipping firing intent unless forced");
+      }
+    } else {
+      Log.w(TAG, "Not compatible...");
      handleAuthenticated();
    }
  }
@@ -305,16 +332,6 @@ public class PassphrasePromptActivity extends PassphraseActivity {
                                   body);
  }

-  public Unit showConfirmDeviceCredentialIntent() {
-    KeyguardManager keyguardManager = (KeyguardManager) getSystemService(Context.KEYGUARD_SERVICE);
-    Intent          intent          = null;
-    if (Build.VERSION.SDK_INT >= 21) {
-      intent = keyguardManager.createConfirmDeviceCredentialIntent(getString(R.string.PassphrasePromptActivity_unlock_signal), "");
-    }
-    startActivityForResult(intent, AUTHENTICATE_REQUEST_CODE);
-    return Unit.INSTANCE;
-  }
-
  private class PassphraseActionListener implements TextView.OnEditorActionListener {
    @Override
    public boolean onEditorAction(TextView exampleView, int actionId, KeyEvent keyEvent) {
--- a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
@@ -20,20 +20,17 @@ import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.devicetransfer.olddevice.OldDeviceTransferActivity;
 import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
-import org.thoughtcrime.securesms.keyvalue.PhoneNumberPrivacyValues;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.lock.v2.CreateKbsPinActivity;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrationActivity;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
 import org.thoughtcrime.securesms.pin.PinRestoreActivity;
 import org.thoughtcrime.securesms.profiles.edit.EditProfileActivity;
-import org.thoughtcrime.securesms.profiles.username.AddAUsernameActivity;
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.util.AppStartup;
-import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;

 import java.util.Locale;
@@ -55,7 +52,6 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
  private static final int STATE_TRANSFER_ONGOING    = 8;
  private static final int STATE_TRANSFER_LOCKED     = 9;
  private static final int STATE_CHANGE_NUMBER_LOCK  = 10;
-  private static final int STATE_CREATE_USERNAME     = 11;

  private SignalServiceNetworkAccess networkAccess;
  private BroadcastReceiver          clearKeyReceiver;
@@ -160,7 +156,6 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
      case STATE_TRANSFER_ONGOING:    return getOldDeviceTransferIntent();
      case STATE_TRANSFER_LOCKED:     return getOldDeviceTransferLockedIntent();
      case STATE_CHANGE_NUMBER_LOCK:  return getChangeNumberLockIntent();
-      case STATE_CREATE_USERNAME:     return getCreateUsernameIntent();
      default:                        return null;
    }
  }
@@ -180,8 +175,6 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
      return STATE_CREATE_SIGNAL_PIN;
    } else if (userMustSetProfileName()) {
      return STATE_CREATE_PROFILE_NAME;
-    } else if (shouldAskUserToCreateUsername()) {
-      return STATE_CREATE_USERNAME;
    } else if (userMustCreateSignalPin()) {
      return STATE_CREATE_SIGNAL_PIN;
    } else if (EventBus.getDefault().getStickyEvent(TransferStatus.class) != null && getClass() != OldDeviceTransferActivity.class) {
@@ -207,13 +200,6 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
    return !SignalStore.registrationValues().isRegistrationComplete() && Recipient.self().getProfileName().isEmpty();
  }

-  private boolean shouldAskUserToCreateUsername() {
-    return FeatureFlags.usernames() &&
-           FeatureFlags.phoneNumberPrivacy() &&
-           !SignalStore.uiHints().hasSetOrSkippedUsernameCreation() &&
-           SignalStore.phoneNumberPrivacy().getPhoneNumberListingMode() == PhoneNumberPrivacyValues.PhoneNumberListingMode.UNLISTED;
-  }
-
  private Intent getCreatePassphraseIntent() {
    return getRoutedIntent(PassphraseCreateActivity.class, getIntent());
  }
@@ -252,8 +238,7 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
  }

  private Intent getCreateProfileNameIntent() {
-    Intent intent = EditProfileActivity.getIntentForUserProfile(this);
-    return getRoutedIntent(intent, getIntent());
+    return getRoutedIntent(EditProfileActivity.class, getIntent());
  }

  private Intent getOldDeviceTransferIntent() {
@@ -273,15 +258,6 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
    return ChangeNumberLockActivity.createIntent(this);
  }

-  private Intent getCreateUsernameIntent() {
-    return getRoutedIntent(AddAUsernameActivity.class, getIntent());
-  }
-
-  private Intent getRoutedIntent(Intent destination, @Nullable Intent nextIntent) {
-    if (nextIntent != null)   destination.putExtra("next_intent", nextIntent);
-    return destination;
-  }
-
  private Intent getRoutedIntent(Class<?> destination, @Nullable Intent nextIntent) {
    final Intent intent = new Intent(this, destination);
    if (nextIntent != null)   intent.putExtra("next_intent", nextIntent);
--- a/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
@@ -24,6 +24,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
+import android.content.res.Configuration;
 import android.graphics.Rect;
 import android.media.AudioManager;
 import android.os.Build;
@@ -39,18 +40,15 @@ import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.content.ContextCompat;
 import androidx.core.util.Consumer;
 import androidx.lifecycle.ViewModelProvider;
-import androidx.window.java.layout.WindowInfoTrackerCallbackAdapter;
-import androidx.window.layout.DisplayFeature;
-import androidx.window.layout.FoldingFeature;
-import androidx.window.layout.WindowInfoTracker;
-import androidx.window.layout.WindowLayoutInfo;
+import androidx.window.DisplayFeature;
+import androidx.window.FoldingFeature;
+import androidx.window.WindowLayoutInfo;

 import com.google.android.material.dialog.MaterialAlertDialogBuilder;

 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
-import org.signal.core.util.ThreadUtil;
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
 import org.signal.libsignal.protocol.IdentityKey;
@@ -64,7 +62,6 @@ 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;
@@ -73,7 +70,6 @@ import org.thoughtcrime.securesms.messagerequests.CalleeMustAcceptMessageRequest
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.safety.SafetyNumberBottomSheet;
 import org.thoughtcrime.securesms.service.webrtc.SignalCallManager;
 import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.util.EllapsedTimeFormatter;
@@ -109,21 +105,19 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
  public static final String END_CALL_ACTION = WebRtcCallActivity.class.getCanonicalName() + ".END_CALL_ACTION";

  public static final String EXTRA_ENABLE_VIDEO_IF_AVAILABLE = WebRtcCallActivity.class.getCanonicalName() + ".ENABLE_VIDEO_IF_AVAILABLE";
-  public static final String EXTRA_STARTED_FROM_FULLSCREEN   = WebRtcCallActivity.class.getCanonicalName() + ".STARTED_FROM_FULLSCREEN";

  private CallParticipantsListUpdatePopupWindow participantUpdateWindow;
-  private WifiToCellularPopupWindow             wifiToCellularPopupWindow;
  private DeviceOrientationMonitor              deviceOrientationMonitor;

-  private FullscreenHelper                 fullscreenHelper;
-  private WebRtcCallView                   callScreen;
-  private TooltipPopup                     videoTooltip;
-  private WebRtcCallViewModel              viewModel;
-  private boolean                          enableVideoIfAvailable;
-  private boolean                          hasWarnedAboutBluetooth;
-  private WindowLayoutInfoConsumer         windowLayoutInfoConsumer;
-  private WindowInfoTrackerCallbackAdapter windowInfoTrackerCallbackAdapter;
-  private ThrottledDebouncer               requestNewSizesThrottle;
+  private FullscreenHelper              fullscreenHelper;
+  private WebRtcCallView                callScreen;
+  private TooltipPopup                  videoTooltip;
+  private WebRtcCallViewModel           viewModel;
+  private boolean                       enableVideoIfAvailable;
+  private boolean                       hasWarnedAboutBluetooth;
+  private androidx.window.WindowManager windowManager;
+  private WindowLayoutInfoConsumer      windowLayoutInfoConsumer;
+  private ThrottledDebouncer            requestNewSizesThrottle;

  private Disposable ephemeralStateDisposable = Disposable.empty();

@@ -136,7 +130,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
  @SuppressLint("SourceLockedOrientationActivity")
  @Override
  public void onCreate(Bundle savedInstanceState) {
-    Log.i(TAG, "onCreate(" + getIntent().getBooleanExtra(EXTRA_STARTED_FROM_FULLSCREEN, false) + ")");
+    Log.i(TAG, "onCreate()");
    getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
    getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
    super.onCreate(savedInstanceState);
@@ -161,10 +155,10 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
    enableVideoIfAvailable = getIntent().getBooleanExtra(EXTRA_ENABLE_VIDEO_IF_AVAILABLE, false);
    getIntent().removeExtra(EXTRA_ENABLE_VIDEO_IF_AVAILABLE);

+    windowManager            = new androidx.window.WindowManager(this);
    windowLayoutInfoConsumer = new WindowLayoutInfoConsumer();

-    windowInfoTrackerCallbackAdapter = new WindowInfoTrackerCallbackAdapter(WindowInfoTracker.getOrCreate(this));
-    windowInfoTrackerCallbackAdapter.addWindowLayoutInfoListener(this, SignalExecutors.BOUNDED, windowLayoutInfoConsumer);
+    windowManager.registerLayoutChangeCallback(SignalExecutors.BOUNDED, windowLayoutInfoConsumer);

    requestNewSizesThrottle = new ThrottledDebouncer(TimeUnit.SECONDS.toMillis(1));
  }
@@ -188,25 +182,11 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
    if (!EventBus.getDefault().isRegistered(this)) {
      EventBus.getDefault().register(this);
    }
-
-    WebRtcViewModel rtcViewModel = EventBus.getDefault().getStickyEvent(WebRtcViewModel.class);
-    if (rtcViewModel == null) {
-      Log.w(TAG, "Activity resumed without service event, perform delay destroy");
-      ThreadUtil.runOnMainDelayed(() -> {
-        WebRtcViewModel delayRtcViewModel = EventBus.getDefault().getStickyEvent(WebRtcViewModel.class);
-        if (delayRtcViewModel == null) {
-          Log.w(TAG, "Activity still without service event, finishing activity");
-          finish();
-        } else {
-          Log.i(TAG, "Event found after delay");
-        }
-      }, TimeUnit.SECONDS.toMillis(1));
-    }
  }

  @Override
  public void onNewIntent(Intent intent) {
-    Log.i(TAG, "onNewIntent(" + intent.getBooleanExtra(EXTRA_STARTED_FROM_FULLSCREEN, false) + ")");
+    Log.i(TAG, "onNewIntent");
    super.onNewIntent(intent);
    processIntent(intent);
  }
@@ -251,7 +231,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
  @Override
  protected void onDestroy() {
    super.onDestroy();
-    windowInfoTrackerCallbackAdapter.removeWindowLayoutInfoListener(windowLayoutInfoConsumer);
+    windowManager.unregisterLayoutChangeCallback(windowLayoutInfoConsumer);
    EventBus.getDefault().unregister(this);
  }

@@ -273,6 +253,12 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
    }
  }

+  @Override
+  public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode, Configuration newConfig) {
+    viewModel.setIsInPipMode(isInPictureInPictureMode);
+    participantUpdateWindow.setEnabled(!isInPictureInPictureMode);
+  }
+
  private boolean enterPipModeIfPossible() {
    if (viewModel.canEnterPipMode() && isSystemPipEnabledAndAvailable()) {
      PictureInPictureParams params = new PictureInPictureParams.Builder()
@@ -312,8 +298,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
    callScreen = findViewById(R.id.callScreen);
    callScreen.setControlsListener(new ControlsListener());

-    participantUpdateWindow   = new CallParticipantsListUpdatePopupWindow(callScreen);
-    wifiToCellularPopupWindow = new WifiToCellularPopupWindow(callScreen);
+    participantUpdateWindow = new CallParticipantsListUpdatePopupWindow(callScreen);
  }

  private void initializeViewModel(boolean isLandscapeEnabled) {
@@ -352,11 +337,6 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan

    viewModel.getOrientationAndLandscapeEnabled().observe(this, pair -> ApplicationDependencies.getSignalCallManager().orientationChanged(pair.second, pair.first.getDegrees()));
    viewModel.getControlsRotation().observe(this, callScreen::rotateControls);
-
-    addOnPictureInPictureModeChangedListener(info -> {
-      viewModel.setIsInPipMode(info.isInPictureInPictureMode());
-      participantUpdateWindow.setEnabled(!info.isInPictureInPictureMode());
-    });
  }

  private void handleViewModelEvent(@NonNull WebRtcCallViewModel.Event event) {
@@ -364,8 +344,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
      startCall(((WebRtcCallViewModel.Event.StartCall) event).isVideoCall());
      return;
    } else if (event instanceof WebRtcCallViewModel.Event.ShowGroupCallSafetyNumberChange) {
-      SafetyNumberBottomSheet.forGroupCall(((WebRtcCallViewModel.Event.ShowGroupCallSafetyNumberChange) event).getIdentityRecords())
-                             .show(getSupportFragmentManager());
+      SafetyNumberChangeDialog.showForGroupCall(getSupportFragmentManager(), ((WebRtcCallViewModel.Event.ShowGroupCallSafetyNumberChange) event).getIdentityRecords());
      return;
    } else if (event instanceof WebRtcCallViewModel.Event.SwitchToSpeaker) {
      callScreen.switchToSpeakerView();
@@ -394,8 +373,6 @@ 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);
    }
@@ -580,10 +557,11 @@ 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.");
+      Log.w(TAG, "Untrusted identity without an identity key, terminating call.");
+      handleTerminate(recipient, HangupMessage.Type.NORMAL);
    }

-    SafetyNumberBottomSheet.forCall(recipient.getId()).show(getSupportFragmentManager());
+    SafetyNumberChangeDialog.showForCall(getSupportFragmentManager(), recipient.getId());
  }

  public void handleSafetyNumberChangeEvent(@NonNull WebRtcCallViewModel.SafetyNumberChangeEvent safetyNumberChangeEvent) {
@@ -592,7 +570,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
        GroupCallSafetyNumberChangeNotificationUtil.showNotification(this, viewModel.getRecipient().get());
      } else {
        GroupCallSafetyNumberChangeNotificationUtil.cancelNotification(this, viewModel.getRecipient().get());
-        SafetyNumberBottomSheet.forDuringGroupCall(safetyNumberChangeEvent.getRecipientIds()).show(getSupportFragmentManager());
+        SafetyNumberChangeDialog.showForDuringGroupCall(getSupportFragmentManager(), safetyNumberChangeEvent.getRecipientIds());
      }
    }
  }
--- a/app/src/main/java/org/thoughtcrime/securesms/avatar/photo/PhotoEditorFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/photo/PhotoEditorFragment.kt
@@ -61,9 +61,6 @@ class PhotoEditorFragment : Fragment(R.layout.avatar_photo_editor_fragment), Ima
    Navigation.findNavController(requireView()).popBackStack()
  }

-  override fun restoreState() {
-  }
-
  override fun onMainImageLoaded() {
  }

--- a/app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerRepository.kt
@@ -50,7 +50,7 @@ class AvatarPickerRepository(context: Context) {
  }

  fun getAvatarForGroup(groupId: GroupId): Single<Avatar> = Single.fromCallable {
-    val recipient = Recipient.externalGroupExact(groupId)
+    val recipient = Recipient.externalGroupExact(applicationContext, groupId)

    if (AvatarHelper.hasAvatar(applicationContext, recipient.id)) {
      try {
@@ -161,7 +161,7 @@ class AvatarPickerRepository(context: Context) {
  }

  fun getDefaultAvatarForGroup(groupId: GroupId): Avatar {
-    val recipient = Recipient.externalGroupExact(groupId)
+    val recipient = Recipient.externalGroupExact(applicationContext, groupId)

    return getDefaultAvatarForGroup(recipient.avatarColor)
  }
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupEvent.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupEvent.java
@@ -1,39 +0,0 @@
-package org.thoughtcrime.securesms.backup;
-
-public class BackupEvent {
-  public enum Type {
-    PROGRESS,
-    PROGRESS_VERIFYING,
-    FINISHED
-  }
-
-  private final Type type;
-  private final long count;
-  private final long estimatedTotalCount;
-
-  public BackupEvent(Type type, long count, long estimatedTotalCount) {
-    this.type                = type;
-    this.count               = count;
-    this.estimatedTotalCount = estimatedTotalCount;
-  }
-
-  public Type getType() {
-    return type;
-  }
-
-  public long getCount() {
-    return count;
-  }
-
-  public long getEstimatedTotalCount() {
-    return estimatedTotalCount;
-  }
-
-  public double getCompletionPercentage() {
-    if (estimatedTotalCount == 0) {
-      return 0;
-    }
-
-    return Math.min(99.9f, (double) count * 100L / (double) estimatedTotalCount);
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupFileIOError.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupFileIOError.java
@@ -10,7 +10,6 @@ import androidx.annotation.StringRes;
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;

-import org.signal.core.util.PendingIntentFlags;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity;
 import org.thoughtcrime.securesms.notifications.NotificationCancellationHelper;
@@ -22,8 +21,6 @@ public enum BackupFileIOError {
  ACCESS_ERROR(R.string.LocalBackupJobApi29_backup_failed, R.string.LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved),
  FILE_TOO_LARGE(R.string.LocalBackupJobApi29_backup_failed, R.string.LocalBackupJobApi29_your_backup_file_is_too_large),
  NOT_ENOUGH_SPACE(R.string.LocalBackupJobApi29_backup_failed, R.string.LocalBackupJobApi29_there_is_not_enough_space),
-  VERIFICATION_FAILED(R.string.LocalBackupJobApi29_backup_failed, R.string.LocalBackupJobApi29_your_backup_could_not_be_verified),
-  ATTACHMENT_TOO_LARGE(R.string.LocalBackupJobApi29_backup_failed, R.string.LocalBackupJobApi29_your_backup_contains_a_very_large_file),
  UNKNOWN(R.string.LocalBackupJobApi29_backup_failed, R.string.LocalBackupJobApi29_tap_to_manage_backups);

  private static final short BACKUP_FAILED_ID = 31321;
@@ -41,12 +38,11 @@ public enum BackupFileIOError {
  }

  public void postNotification(@NonNull Context context) {
-    PendingIntent pendingIntent           = PendingIntent.getActivity(context, -1, AppSettingsActivity.backups(context), PendingIntentFlags.mutable());
+    PendingIntent pendingIntent           = PendingIntent.getActivity(context, -1, AppSettingsActivity.backups(context), 0);
    Notification backupFailedNotification = new NotificationCompat.Builder(context, NotificationChannels.FAILURES)
                                                                  .setSmallIcon(R.drawable.ic_signal_backup)
                                                                  .setContentTitle(context.getString(titleId))
                                                                  .setContentText(context.getString(messageId))
-                                                                  .setStyle(new NotificationCompat.BigTextStyle().bigText(context.getString(messageId)))
                                                                  .setContentIntent(pendingIntent)
                                                                  .build();

@@ -54,25 +50,22 @@ public enum BackupFileIOError {
                             .notify(BACKUP_FAILED_ID, backupFailedNotification);
  }

-  public static void postNotificationForException(@NonNull Context context, @NonNull IOException e) {
+  public static void postNotificationForException(@NonNull Context context, @NonNull IOException e, int runAttempt) {
    BackupFileIOError error = getFromException(e);

    if (error != null) {
      error.postNotification(context);
-    } else {
+    }
+
+    if (error == null && runAttempt > 0) {
      UNKNOWN.postNotification(context);
    }
  }

  private static @Nullable BackupFileIOError getFromException(@NonNull IOException e) {
-    if (e instanceof FullBackupExporter.InvalidBackupStreamException) {
-      return ATTACHMENT_TOO_LARGE;
-    } else if (e.getMessage() != null) {
-      if (e.getMessage().contains("EFBIG")) {
-        return FILE_TOO_LARGE;
-      } else if (e.getMessage().contains("ENOSPC")) {
-        return NOT_ENOUGH_SPACE;
-      }
+    if (e.getMessage() != null) {
+           if (e.getMessage().contains("EFBIG"))  return FILE_TOO_LARGE;
+      else if (e.getMessage().contains("ENOSPC")) return NOT_ENOUGH_SPACE;
    }

    return null;
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupRecordInputStream.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupRecordInputStream.java
@@ -1,161 +0,0 @@
-package org.thoughtcrime.securesms.backup;
-
-import androidx.annotation.NonNull;
-
-import org.signal.core.util.Conversions;
-import org.signal.core.util.StreamUtil;
-import org.signal.libsignal.protocol.kdf.HKDF;
-import org.signal.libsignal.protocol.util.ByteUtil;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.Mac;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-class BackupRecordInputStream extends FullBackupBase.BackupStream {
-
-  private final InputStream in;
-  private final Cipher      cipher;
-  private final Mac         mac;
-
-  private final byte[] cipherKey;
-
-  private final byte[] iv;
-  private       int    counter;
-
-  BackupRecordInputStream(@NonNull InputStream in, @NonNull String passphrase) throws IOException {
-    try {
-      this.in = in;
-
-      byte[] headerLengthBytes = new byte[4];
-      StreamUtil.readFully(in, headerLengthBytes);
-
-      int    headerLength = Conversions.byteArrayToInt(headerLengthBytes);
-      byte[] headerFrame  = new byte[headerLength];
-      StreamUtil.readFully(in, headerFrame);
-
-      BackupProtos.BackupFrame frame = BackupProtos.BackupFrame.parseFrom(headerFrame);
-
-      if (!frame.hasHeader()) {
-        throw new IOException("Backup stream does not start with header!");
-      }
-
-      BackupProtos.Header header = frame.getHeader();
-
-      this.iv = header.getIv().toByteArray();
-
-      if (iv.length != 16) {
-        throw new IOException("Invalid IV length!");
-      }
-
-      byte[]   key     = getBackupKey(passphrase, header.hasSalt() ? header.getSalt().toByteArray() : null);
-      byte[]   derived = HKDF.deriveSecrets(key, "Backup Export".getBytes(), 64);
-      byte[][] split   = ByteUtil.split(derived, 32, 32);
-
-      this.cipherKey = split[0];
-      byte[] macKey  = split[1];
-
-      this.cipher = Cipher.getInstance("AES/CTR/NoPadding");
-      this.mac    = Mac.getInstance("HmacSHA256");
-      this.mac.init(new SecretKeySpec(macKey, "HmacSHA256"));
-
-      this.counter = Conversions.byteArrayToInt(iv);
-    } catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException e) {
-      throw new AssertionError(e);
-    }
-  }
-
-  BackupProtos.BackupFrame readFrame() throws IOException {
-    return readFrame(in);
-  }
-
-  void readAttachmentTo(OutputStream out, int length) throws IOException {
-    try {
-      Conversions.intToByteArray(iv, 0, counter++);
-      cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(cipherKey, "AES"), new IvParameterSpec(iv));
-      mac.update(iv);
-
-      byte[] buffer = new byte[8192];
-
-      while (length > 0) {
-        int read = in.read(buffer, 0, Math.min(buffer.length, length));
-        if (read == -1) throw new IOException("File ended early!");
-
-        mac.update(buffer, 0, read);
-
-        byte[] plaintext = cipher.update(buffer, 0, read);
-
-        if (plaintext != null) {
-          out.write(plaintext, 0, plaintext.length);
-        }
-
-        length -= read;
-      }
-
-      byte[] plaintext = cipher.doFinal();
-
-      if (plaintext != null) {
-        out.write(plaintext, 0, plaintext.length);
-      }
-
-      out.close();
-
-      byte[] ourMac   = ByteUtil.trim(mac.doFinal(), 10);
-      byte[] theirMac = new byte[10];
-
-      try {
-        StreamUtil.readFully(in, theirMac);
-      } catch (IOException e) {
-        throw new IOException(e);
-      }
-
-      if (!MessageDigest.isEqual(ourMac, theirMac)) {
-        throw new BadMacException();
-      }
-    } catch (InvalidKeyException | InvalidAlgorithmParameterException | IllegalBlockSizeException | BadPaddingException e) {
-      throw new AssertionError(e);
-    }
-  }
-
-  private BackupProtos.BackupFrame readFrame(InputStream in) throws IOException {
-    try {
-      byte[] length = new byte[4];
-      StreamUtil.readFully(in, length);
-
-      byte[] frame = new byte[Conversions.byteArrayToInt(length)];
-      StreamUtil.readFully(in, frame);
-
-      byte[] theirMac = new byte[10];
-      System.arraycopy(frame, frame.length - 10, theirMac, 0, theirMac.length);
-
-      mac.update(frame, 0, frame.length - 10);
-      byte[] ourMac = ByteUtil.trim(mac.doFinal(), 10);
-
-      if (!MessageDigest.isEqual(ourMac, theirMac)) {
-        throw new IOException("Bad MAC");
-      }
-
-      Conversions.intToByteArray(iv, 0, counter++);
-      cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(cipherKey, "AES"), new IvParameterSpec(iv));
-
-      byte[] plaintext = cipher.doFinal(frame, 0, frame.length - 10);
-
-      return BackupProtos.BackupFrame.parseFrom(plaintext);
-    } catch (InvalidKeyException | InvalidAlgorithmParameterException | IllegalBlockSizeException | BadPaddingException e) {
-      throw new AssertionError(e);
-    }
-  }
-
-  static class BadMacException extends IOException {}
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupVerifier.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupVerifier.kt
@@ -1,82 +0,0 @@
-package org.thoughtcrime.securesms.backup
-
-import org.greenrobot.eventbus.EventBus
-import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.backup.BackupProtos.BackupFrame
-import java.io.IOException
-import java.io.InputStream
-import java.io.OutputStream
-
-/**
- * Given a backup file, run over it and verify it will decrypt properly when attempting to import it.
- */
-object BackupVerifier {
-
-  private val TAG = Log.tag(BackupVerifier::class.java)
-
-  @JvmStatic
-  fun verifyFile(cipherStream: InputStream, passphrase: String, expectedCount: Long): Boolean {
-    val inputStream = BackupRecordInputStream(cipherStream, passphrase)
-
-    var count = 0L
-    var frame: BackupFrame = inputStream.readFrame()
-
-    while (!frame.end) {
-      val verified = when {
-        frame.hasAttachment() -> verifyAttachment(frame.attachment, inputStream)
-        frame.hasSticker() -> verifySticker(frame.sticker, inputStream)
-        frame.hasAvatar() -> verifyAvatar(frame.avatar, inputStream)
-        else -> true
-      }
-
-      if (!verified) {
-        return false
-      }
-
-      EventBus.getDefault().post(BackupEvent(BackupEvent.Type.PROGRESS_VERIFYING, ++count, expectedCount))
-
-      frame = inputStream.readFrame()
-    }
-
-    cipherStream.close()
-
-    return true
-  }
-
-  private fun verifyAttachment(attachment: BackupProtos.Attachment, inputStream: BackupRecordInputStream): Boolean {
-    try {
-      inputStream.readAttachmentTo(NullOutputStream, attachment.length)
-    } catch (e: IOException) {
-      Log.w(TAG, "Bad attachment: ${attachment.attachmentId}", e)
-      return false
-    }
-
-    return true
-  }
-
-  private fun verifySticker(sticker: BackupProtos.Sticker, inputStream: BackupRecordInputStream): Boolean {
-    try {
-      inputStream.readAttachmentTo(NullOutputStream, sticker.length)
-    } catch (e: IOException) {
-      Log.w(TAG, "Bad sticker: ${sticker.rowId}", e)
-      return false
-    }
-    return true
-  }
-
-  private fun verifyAvatar(avatar: BackupProtos.Avatar, inputStream: BackupRecordInputStream): Boolean {
-    try {
-      inputStream.readAttachmentTo(NullOutputStream, avatar.length)
-    } catch (e: IOException) {
-      Log.w(TAG, "Bad sticker: ${avatar.recipientId}", e)
-      return false
-    }
-    return true
-  }
-
-  private object NullOutputStream : OutputStream() {
-    override fun write(b: Int) = Unit
-    override fun write(b: ByteArray?) = Unit
-    override fun write(b: ByteArray?, off: Int, len: Int) = Unit
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupBase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupBase.java
@@ -17,6 +17,8 @@ public abstract class FullBackupBase {
  static class BackupStream {
    static @NonNull byte[] getBackupKey(@NonNull String passphrase, @Nullable byte[] salt) {
      try {
+        EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, 0, 0));
+
        MessageDigest digest = MessageDigest.getInstance("SHA-512");
        byte[]        input  = passphrase.replace(" ", "").getBytes();
        byte[]        hash   = input;
@@ -24,6 +26,7 @@ public abstract class FullBackupBase {
        if (salt != null) digest.update(salt);

        for (int i = 0; i < DIGEST_ROUNDS; i++) {
+          if (i % 1000 == 0) EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, 0, 0));
          digest.update(hash);
          hash = digest.digest(input);
        }
@@ -34,4 +37,42 @@ public abstract class FullBackupBase {
      }
    }
  }
+
+  public static class BackupEvent {
+    public enum Type {
+      PROGRESS,
+      FINISHED
+    }
+
+    private final Type type;
+    private final long count;
+    private final long estimatedTotalCount;
+
+    BackupEvent(Type type, long count, long estimatedTotalCount) {
+      this.type                = type;
+      this.count               = count;
+      this.estimatedTotalCount = estimatedTotalCount;
+    }
+
+    public Type getType() {
+      return type;
+    }
+
+    public long getCount() {
+      return count;
+    }
+
+    public long getEstimatedTotalCount() {
+      return estimatedTotalCount;
+    }
+
+    public double getCompletionPercentage() {
+      if (estimatedTotalCount == 0) {
+        return 0;
+      }
+
+      return Math.min(99.9f, (double) count * 100L / (double) estimatedTotalCount);
+    }
+  }
+
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java
@@ -17,11 +17,8 @@ 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.Stopwatch;
 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;
 import org.thoughtcrime.securesms.crypto.AttachmentSecret;
@@ -50,11 +47,14 @@ 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;

 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -79,25 +79,25 @@ public class FullBackupExporter extends FullBackupBase {

  private static final String TAG = Log.tag(FullBackupExporter.class);

-  private static final long DATABASE_VERSION_RECORD_COUNT    = 1L;
-  private static final long TABLE_RECORD_COUNT_MULTIPLIER    = 3L;
+  private static final long DATABASE_VERSION_RECORD_COUNT = 1L;
+  private static final long TABLE_RECORD_COUNT_MULTIPLIER = 3L;
  private static final long IDENTITY_KEY_BACKUP_RECORD_COUNT = 2L;
-  private static final long FINAL_MESSAGE_COUNT              = 1L;
+  private static final long FINAL_MESSAGE_COUNT = 1L;

  private static final Set<String> BLACKLISTED_TABLES = SetUtil.newHashSet(
-      SignedPreKeyDatabase.TABLE_NAME,
-      OneTimePreKeyDatabase.TABLE_NAME,
-      SessionDatabase.TABLE_NAME,
-      SearchDatabase.SMS_FTS_TABLE_NAME,
-      SearchDatabase.MMS_FTS_TABLE_NAME,
-      EmojiSearchDatabase.TABLE_NAME,
-      SenderKeyDatabase.TABLE_NAME,
-      SenderKeySharedDatabase.TABLE_NAME,
-      PendingRetryReceiptDatabase.TABLE_NAME,
-      AvatarPickerDatabase.TABLE_NAME
+    SignedPreKeyDatabase.TABLE_NAME,
+    OneTimePreKeyDatabase.TABLE_NAME,
+    SessionDatabase.TABLE_NAME,
+    SearchDatabase.SMS_FTS_TABLE_NAME,
+    SearchDatabase.MMS_FTS_TABLE_NAME,
+    EmojiSearchDatabase.TABLE_NAME,
+    SenderKeyDatabase.TABLE_NAME,
+    SenderKeySharedDatabase.TABLE_NAME,
+    PendingRetryReceiptDatabase.TABLE_NAME,
+    AvatarPickerDatabase.TABLE_NAME
  );

-  public static BackupEvent export(@NonNull Context context,
+  public static void export(@NonNull Context context,
                            @NonNull AttachmentSecret attachmentSecret,
                            @NonNull SQLiteDatabase input,
                            @NonNull File output,
@@ -106,12 +106,12 @@ public class FullBackupExporter extends FullBackupBase {
      throws IOException
  {
    try (OutputStream outputStream = new FileOutputStream(output)) {
-      return internalExport(context, attachmentSecret, input, outputStream, passphrase, true, cancellationSignal);
+      internalExport(context, attachmentSecret, input, outputStream, passphrase, true, cancellationSignal);
    }
  }

  @RequiresApi(29)
-  public static BackupEvent export(@NonNull Context context,
+  public static void export(@NonNull Context context,
                            @NonNull AttachmentSecret attachmentSecret,
                            @NonNull SQLiteDatabase input,
                            @NonNull DocumentFile output,
@@ -120,7 +120,7 @@ public class FullBackupExporter extends FullBackupBase {
      throws IOException
  {
    try (OutputStream outputStream = Objects.requireNonNull(context.getContentResolver().openOutputStream(output.getUri()))) {
-      return internalExport(context, attachmentSecret, input, outputStream, passphrase, true, cancellationSignal);
+      internalExport(context, attachmentSecret, input, outputStream, passphrase, true, cancellationSignal);
    }
  }

@@ -131,21 +131,21 @@ public class FullBackupExporter extends FullBackupBase {
                              @NonNull String passphrase)
      throws IOException
  {
-    EventBus.getDefault().post(internalExport(context, attachmentSecret, input, outputStream, passphrase, false, () -> false));
+    internalExport(context, attachmentSecret, input, outputStream, passphrase, false, () -> false);
  }

-  private static BackupEvent internalExport(@NonNull Context context,
-                                            @NonNull AttachmentSecret attachmentSecret,
-                                            @NonNull SQLiteDatabase input,
-                                            @NonNull OutputStream fileOutputStream,
-                                            @NonNull String passphrase,
-                                            boolean closeOutputStream,
-                                            @NonNull BackupCancellationSignal cancellationSignal)
+  private static void internalExport(@NonNull Context context,
+                                     @NonNull AttachmentSecret attachmentSecret,
+                                     @NonNull SQLiteDatabase input,
+                                     @NonNull OutputStream fileOutputStream,
+                                     @NonNull String passphrase,
+                                     boolean closeOutputStream,
+                                     @NonNull BackupCancellationSignal cancellationSignal)
      throws IOException
  {
    BackupFrameOutputStream outputStream          = new BackupFrameOutputStream(fileOutputStream, passphrase);
    int                     count                 = 0;
-    long                    estimatedCountOutside;
+    long                    estimatedCountOutside = 0L;

    try {
      outputStream.writeDatabaseVersion(input.getVersion());
@@ -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, FullBackupExporter::isNonExpiringMmsMessage, null, count, estimatedCount, cancellationSignal);
+          count = exportTable(table, input, outputStream, cursor -> isNonExpiringMmsMessage(cursor) && isNotReleaseChannel(cursor), null, count, estimatedCount, cancellationSignal);
        } else if (table.equals(SmsDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, FullBackupExporter::isNonExpiringSmsMessage, null, count, estimatedCount, cancellationSignal);
+          count = exportTable(table, input, outputStream, cursor -> isNonExpiringSmsMessage(cursor) && isNotReleaseChannel(cursor), null, count, estimatedCount, cancellationSignal);
        } else if (table.equals(ReactionDatabase.TABLE_NAME)) {
          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, new MessageId(CursorUtil.requireLong(cursor, ReactionDatabase.MESSAGE_ID), CursorUtil.requireBoolean(cursor, ReactionDatabase.IS_MMS))), null, count, estimatedCount, cancellationSignal);
        } else if (table.equals(MentionDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMmsMessage(input, CursorUtil.requireLong(cursor, MentionDatabase.MESSAGE_ID)), null, count, estimatedCount, cancellationSignal);
+          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMmsMessageAndNotReleaseChannel(input, CursorUtil.requireLong(cursor, MentionDatabase.MESSAGE_ID)), null, count, estimatedCount, cancellationSignal);
        } else if (table.equals(GroupReceiptDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMmsMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(GroupReceiptDatabase.MMS_ID))), null, count, estimatedCount, cancellationSignal);
+          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMmsMessageAndNotReleaseChannel(input, cursor.getLong(cursor.getColumnIndexOrThrow(GroupReceiptDatabase.MMS_ID))), null, count, estimatedCount, cancellationSignal);
        } else if (table.equals(AttachmentDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMmsMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.MMS_ID))), (cursor, innerCount) -> exportAttachment(attachmentSecret, cursor, outputStream, innerCount, estimatedCount), count, estimatedCount, cancellationSignal);
+          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);
        } 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_")) {
@@ -211,8 +211,8 @@ public class FullBackupExporter extends FullBackupBase {
      if (closeOutputStream) {
        outputStream.close();
      }
+      EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.FINISHED, ++count, estimatedCountOutside));
    }
-    return new BackupEvent(BackupEvent.Type.FINISHED, ++count, estimatedCountOutside);
  }

  private static long calculateCount(@NonNull Context context, @NonNull SQLiteDatabase input, List<String> tables) {
@@ -315,7 +315,7 @@ public class FullBackupExporter extends FullBackupBase {

          statement.append('(');

-          for (int i = 0; i < cursor.getColumnCount(); i++) {
+          for (int i=0;i<cursor.getColumnCount();i++) {
            statement.append('?');

            if (cursor.getType(i) == Cursor.FIELD_TYPE_STRING) {
@@ -329,10 +329,10 @@ public class FullBackupExporter extends FullBackupBase {
            } else if (cursor.getType(i) == Cursor.FIELD_TYPE_NULL) {
              statementBuilder.addParameters(BackupProtos.SqlStatement.SqlParameter.newBuilder().setNullparameter(true));
            } else {
-              throw new AssertionError("unknown type?" + cursor.getType(i));
+              throw new AssertionError("unknown type?"  + cursor.getType(i));
            }

-            if (i < cursor.getColumnCount() - 1) {
+            if (i < cursor.getColumnCount()-1) {
              statement.append(',');
            }
          }
@@ -352,96 +352,80 @@ public class FullBackupExporter extends FullBackupBase {
    return count;
  }

-  private static int exportAttachment(@NonNull AttachmentSecret attachmentSecret,
-                                      @NonNull Cursor cursor,
-                                      @NonNull BackupFrameOutputStream outputStream,
-                                      int count,
-                                      long estimatedCount)
-      throws IOException
-  {
-    long rowId    = cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.ROW_ID));
-    long uniqueId = cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.UNIQUE_ID));
-    long size     = cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.SIZE));
+  private static int exportAttachment(@NonNull AttachmentSecret attachmentSecret, @NonNull Cursor cursor, @NonNull BackupFrameOutputStream outputStream, int count, long estimatedCount) {
+    try {
+      long rowId    = cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.ROW_ID));
+      long uniqueId = cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.UNIQUE_ID));
+      long size     = cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.SIZE));

-    String data   = cursor.getString(cursor.getColumnIndexOrThrow(AttachmentDatabase.DATA));
-    byte[] random = cursor.getBlob(cursor.getColumnIndexOrThrow(AttachmentDatabase.DATA_RANDOM));
+      String data   = cursor.getString(cursor.getColumnIndexOrThrow(AttachmentDatabase.DATA));
+      byte[] random = cursor.getBlob(cursor.getColumnIndexOrThrow(AttachmentDatabase.DATA_RANDOM));

-    if (!TextUtils.isEmpty(data)) {
-      long fileLength = new File(data).length();
-      long dbLength   = size;
+      if (!TextUtils.isEmpty(data)) {
+        long fileLength = new File(data).length();
+        long dbLength   = size;

-      if (size <= 0 || fileLength != dbLength) {
-        size = calculateVeryOldStreamLength(attachmentSecret, random, data);
-        Log.w(TAG, "Needed size calculation! Manual: " + size + " File: " + fileLength + "  DB: " + dbLength + " ID: " + new AttachmentId(rowId, uniqueId));
+        if (size <= 0 || fileLength != dbLength) {
+          size = calculateVeryOldStreamLength(attachmentSecret, random, data);
+          Log.w(TAG, "Needed size calculation! Manual: " + size + " File: " + fileLength + "  DB: " + dbLength + " ID: " + new AttachmentId(rowId, uniqueId));
+        }
      }
-    }

-    EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count, estimatedCount));
-    if (!TextUtils.isEmpty(data) && size > 0) {
-      try (InputStream inputStream = openAttachmentStream(attachmentSecret, random, data)) {
+      if (!TextUtils.isEmpty(data) && size > 0) {
+        InputStream inputStream;
+
+        if (random != null && random.length == 32) inputStream = ModernDecryptingPartInputStream.createFor(attachmentSecret, random, new File(data), 0);
+        else                                       inputStream = ClassicDecryptingPartInputStream.createFor(attachmentSecret, new File(data));
+
+        EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count, estimatedCount));
        outputStream.write(new AttachmentId(rowId, uniqueId), inputStream, size);
-      } catch (FileNotFoundException e) {
-        Log.w(TAG, "Missing attachment: " + e.getMessage());
+        inputStream.close();
      }
-    }
-
-    return count;
-  }
-
-  private static int exportSticker(@NonNull AttachmentSecret attachmentSecret,
-                                   @NonNull Cursor cursor,
-                                   @NonNull BackupFrameOutputStream outputStream,
-                                   int count,
-                                   long estimatedCount)
-      throws IOException
-  {
-    long rowId = cursor.getLong(cursor.getColumnIndexOrThrow(StickerDatabase._ID));
-    long size  = cursor.getLong(cursor.getColumnIndexOrThrow(StickerDatabase.FILE_LENGTH));
-
-    String data   = cursor.getString(cursor.getColumnIndexOrThrow(StickerDatabase.FILE_PATH));
-    byte[] random = cursor.getBlob(cursor.getColumnIndexOrThrow(StickerDatabase.FILE_RANDOM));
-
-    if (!TextUtils.isEmpty(data) && size > 0) {
-      EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count, estimatedCount));
-      try (InputStream inputStream = ModernDecryptingPartInputStream.createFor(attachmentSecret, random, new File(data), 0)) {
-        outputStream.writeSticker(rowId, inputStream, size);
-      } catch (FileNotFoundException e) {
-        Log.w(TAG, "Missing sticker: " + e.getMessage());
-      }
-    }
-
-    return count;
-  }
-
-  private static long calculateVeryOldStreamLength(@NonNull AttachmentSecret attachmentSecret, @Nullable byte[] random, @NonNull String data) {
-    long result = 0;
-
-    try (InputStream inputStream = openAttachmentStream(attachmentSecret, random, data)) {
-      int    read;
-      byte[] buffer = new byte[8192];
-
-      while ((read = inputStream.read(buffer, 0, buffer.length)) != -1) {
-        result += read;
-      }
-    } catch (FileNotFoundException e) {
-      Log.w(TAG, "Missing attachment: " + e.getMessage());
-      return 0;
    } catch (IOException e) {
-      Log.w(TAG, "Failed to determine stream length", e);
-      return 0;
+      Log.w(TAG, e);
+    }
+
+    return count;
+  }
+
+  private static int exportSticker(@NonNull AttachmentSecret attachmentSecret, @NonNull Cursor cursor, @NonNull BackupFrameOutputStream outputStream, int count, long estimatedCount) {
+    try {
+      long rowId    = cursor.getLong(cursor.getColumnIndexOrThrow(StickerDatabase._ID));
+      long size     = cursor.getLong(cursor.getColumnIndexOrThrow(StickerDatabase.FILE_LENGTH));
+
+      String data   = cursor.getString(cursor.getColumnIndexOrThrow(StickerDatabase.FILE_PATH));
+      byte[] random = cursor.getBlob(cursor.getColumnIndexOrThrow(StickerDatabase.FILE_RANDOM));
+
+      if (!TextUtils.isEmpty(data) && size > 0) {
+        EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count, estimatedCount));
+        try (InputStream inputStream = ModernDecryptingPartInputStream.createFor(attachmentSecret, random, new File(data), 0)) {
+          outputStream.writeSticker(rowId, inputStream, size);
+        }
+      }
+    } catch (IOException e) {
+      Log.w(TAG, e);
+    }
+
+    return count;
+  }
+
+  private static long calculateVeryOldStreamLength(@NonNull AttachmentSecret attachmentSecret, @Nullable byte[] random, @NonNull String data) throws IOException {
+    long result = 0;
+    InputStream inputStream;
+
+    if (random != null && random.length == 32) inputStream = ModernDecryptingPartInputStream.createFor(attachmentSecret, random, new File(data), 0);
+    else                                       inputStream = ClassicDecryptingPartInputStream.createFor(attachmentSecret, new File(data));
+
+    int read;
+    byte[] buffer = new byte[8192];
+
+    while ((read = inputStream.read(buffer, 0, buffer.length)) != -1) {
+      result += read;
    }

    return result;
  }

-  private static InputStream openAttachmentStream(@NonNull AttachmentSecret attachmentSecret, @Nullable byte[] random, @NonNull String data) throws IOException {
-    if (random != null && random.length == 32) {
-      return ModernDecryptingPartInputStream.createFor(attachmentSecret, random, new File(data), 0);
-    } else {
-      return ClassicDecryptingPartInputStream.createFor(attachmentSecret, new File(data));
-    }
-  }
-
  private static int exportKeyValues(@NonNull BackupFrameOutputStream outputStream,
                                     @NonNull List<String> keysToIncludeInBackup,
                                     int count,
@@ -495,7 +479,7 @@ public class FullBackupExporter extends FullBackupBase {

  private static boolean isNonExpiringMmsMessage(@NonNull Cursor cursor) {
    return cursor.getLong(cursor.getColumnIndexOrThrow(MmsSmsColumns.EXPIRES_IN)) <= 0 &&
-           cursor.getLong(cursor.getColumnIndexOrThrow(MmsDatabase.VIEW_ONCE)) <= 0;
+           cursor.getLong(cursor.getColumnIndexOrThrow(MmsDatabase.VIEW_ONCE))    <= 0;
  }

  private static boolean isNonExpiringSmsMessage(@NonNull Cursor cursor) {
@@ -504,7 +488,7 @@ public class FullBackupExporter extends FullBackupBase {

  private static boolean isForNonExpiringMessage(@NonNull SQLiteDatabase db, @NonNull MessageId messageId) {
    if (messageId.isMms()) {
-      return isForNonExpiringMmsMessage(db, messageId.getId());
+      return isForNonExpiringMmsMessageAndNotReleaseChannel(db, messageId.getId());
    } else {
      return isForNonExpiringSmsMessage(db, messageId.getId());
    }
@@ -524,39 +508,46 @@ public class FullBackupExporter extends FullBackupBase {
    return false;
  }

-  private static boolean isForNonExpiringMmsMessage(@NonNull SQLiteDatabase db, long mmsId) {
-    String[] columns = new String[] { MmsDatabase.RECIPIENT_ID, MmsDatabase.EXPIRES_IN, MmsDatabase.VIEW_ONCE };
+  private static boolean isForNonExpiringMmsMessageAndNotReleaseChannel(@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);
+        return isNonExpiringMmsMessage(mmsCursor) && isNotReleaseChannel(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;
    private final Cipher       cipher;
    private final Mac          mac;

-    private final byte[] cipherKey;
-    private final byte[] iv;
-    private       int    counter;
+    private final byte[]       cipherKey;
+    private final byte[]       macKey;
+
+    private byte[] iv;
+    private int    counter;

    private BackupFrameOutputStream(@NonNull OutputStream output, @NonNull String passphrase) throws IOException {
      try {
        byte[]   salt    = Util.getSecretBytes(32);
        byte[]   key     = getBackupKey(passphrase, salt);
-        byte[]   derived = HKDF.deriveSecrets(key, "Backup Export".getBytes(), 64);
+        byte[]   derived = new HKDFv3().deriveSecrets(key, "Backup Export".getBytes(), 64);
        byte[][] split   = ByteUtil.split(derived, 32, 32);

        this.cipherKey = split[0];
-        byte[] macKey  = split[1];
+        this.macKey    = split[1];

        this.cipher       = Cipher.getInstance("AES/CTR/NoPadding");
        this.mac          = Mac.getInstance("HmacSHA256");
@@ -591,17 +582,12 @@ public class FullBackupExporter extends FullBackupBase {
    }

    public void write(@NonNull String avatarName, @NonNull InputStream in, long size) throws IOException {
-      try {
-        write(outputStream, BackupProtos.BackupFrame.newBuilder()
-                                                    .setAvatar(BackupProtos.Avatar.newBuilder()
-                                                                                  .setRecipientId(avatarName)
-                                                                                  .setLength(Util.toIntExact(size))
-                                                                                  .build())
-                                                    .build());
-      } catch (ArithmeticException e) {
-        Log.w(TAG, "Unable to write avatar to backup", e);
-        throw new InvalidBackupStreamException();
-      }
+      write(outputStream, BackupProtos.BackupFrame.newBuilder()
+                                                  .setAvatar(BackupProtos.Avatar.newBuilder()
+                                                                                .setRecipientId(avatarName)
+                                                                                .setLength(Util.toIntExact(size))
+                                                                                .build())
+                                                  .build());

      if (writeStream(in) != size) {
        throw new IOException("Size mismatch!");
@@ -609,18 +595,13 @@ public class FullBackupExporter extends FullBackupBase {
    }

    public void write(@NonNull AttachmentId attachmentId, @NonNull InputStream in, long size) throws IOException {
-      try {
-        write(outputStream, BackupProtos.BackupFrame.newBuilder()
-                                                    .setAttachment(BackupProtos.Attachment.newBuilder()
-                                                                                          .setRowId(attachmentId.getRowId())
-                                                                                          .setAttachmentId(attachmentId.getUniqueId())
-                                                                                          .setLength(Util.toIntExact(size))
-                                                                                          .build())
-                                                    .build());
-      } catch (ArithmeticException e) {
-        Log.w(TAG, "Unable to write " + attachmentId + " to backup", e);
-        throw new InvalidBackupStreamException();
-      }
+      write(outputStream, BackupProtos.BackupFrame.newBuilder()
+                                                  .setAttachment(BackupProtos.Attachment.newBuilder()
+                                                                                        .setRowId(attachmentId.getRowId())
+                                                                                        .setAttachmentId(attachmentId.getUniqueId())
+                                                                                        .setLength(Util.toIntExact(size))
+                                                                                        .build())
+                                                  .build());

      if (writeStream(in) != size) {
        throw new IOException("Size mismatch!");
@@ -628,17 +609,12 @@ public class FullBackupExporter extends FullBackupBase {
    }

    public void writeSticker(long rowId, @NonNull InputStream in, long size) throws IOException {
-      try {
-        write(outputStream, BackupProtos.BackupFrame.newBuilder()
-                                                    .setSticker(BackupProtos.Sticker.newBuilder()
-                                                                                    .setRowId(rowId)
-                                                                                    .setLength(Util.toIntExact(size))
-                                                                                    .build())
-                                                    .build());
-      } catch (ArithmeticException e) {
-        Log.w(TAG, "Unable to write sticker to backup", e);
-        throw new InvalidBackupStreamException();
-      }
+      write(outputStream, BackupProtos.BackupFrame.newBuilder()
+                                                  .setSticker(BackupProtos.Sticker.newBuilder()
+                                                                                  .setRowId(rowId)
+                                                                                  .setLength(Util.toIntExact(size))
+                                                                                  .build())
+                                                  .build());

      if (writeStream(in) != size) {
        throw new IOException("Size mismatch!");
@@ -712,20 +688,17 @@ public class FullBackupExporter extends FullBackupBase {


    public void close() throws IOException {
-      outputStream.flush();
      outputStream.close();
    }
  }

  public interface PostProcessor {
-    int postProcess(@NonNull Cursor cursor, int count) throws IOException;
+    int postProcess(@NonNull Cursor cursor, int count);
  }

  public interface BackupCancellationSignal {
    boolean isCanceled();
  }

-  public static final class BackupCanceledException extends IOException {}
-
-  public static final class InvalidBackupStreamException extends IOException {}
+  public static final class BackupCanceledException extends IOException { }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java
@@ -14,8 +14,11 @@ import androidx.annotation.NonNull;
 import net.zetetic.database.sqlcipher.SQLiteDatabase;

 import org.greenrobot.eventbus.EventBus;
-import org.signal.core.util.SqlUtil;
+import org.signal.core.util.Conversions;
+import org.signal.core.util.StreamUtil;
 import org.signal.core.util.logging.Log;
+import org.signal.libsignal.protocol.kdf.HKDFv3;
+import org.signal.libsignal.protocol.util.ByteUtil;
 import org.thoughtcrime.securesms.backup.BackupProtos.Attachment;
 import org.thoughtcrime.securesms.backup.BackupProtos.BackupFrame;
 import org.thoughtcrime.securesms.backup.BackupProtos.DatabaseVersion;
@@ -35,6 +38,7 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.BackupUtil;
+import org.signal.core.util.SqlUtil;

 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -42,12 +46,24 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;

+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.Mac;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
 public class FullBackupImporter extends FullBackupBase {

  @SuppressWarnings("unused")
@@ -169,7 +185,7 @@ public class FullBackupImporter extends FullBackupBase {

      contentValues.put(AttachmentDatabase.DATA, dataFile.getAbsolutePath());
      contentValues.put(AttachmentDatabase.DATA_RANDOM, output.first);
-    } catch (BackupRecordInputStream.BadMacException e) {
+    } catch (BadMacException e) {
      Log.w(TAG, "Bad MAC for attachment " + attachment.getAttachmentId() + "! Can't restore it.", e);
      dataFile.delete();
      contentValues.put(AttachmentDatabase.DATA, (String) null);
@@ -285,6 +301,144 @@ public class FullBackupImporter extends FullBackupBase {
    }
  }

+  private static class BackupRecordInputStream extends BackupStream {
+
+    private final InputStream in;
+    private final Cipher      cipher;
+    private final Mac         mac;
+
+    private final byte[] cipherKey;
+    private final byte[] macKey;
+
+    private byte[] iv;
+    private int    counter;
+
+    private BackupRecordInputStream(@NonNull InputStream in, @NonNull String passphrase) throws IOException {
+      try {
+        this.in = in;
+
+        byte[] headerLengthBytes = new byte[4];
+        StreamUtil.readFully(in, headerLengthBytes);
+
+        int headerLength = Conversions.byteArrayToInt(headerLengthBytes);
+        byte[] headerFrame = new byte[headerLength];
+        StreamUtil.readFully(in, headerFrame);
+
+        BackupFrame frame = BackupFrame.parseFrom(headerFrame);
+
+        if (!frame.hasHeader()) {
+          throw new IOException("Backup stream does not start with header!");
+        }
+
+        BackupProtos.Header header = frame.getHeader();
+
+        this.iv = header.getIv().toByteArray();
+
+        if (iv.length != 16) {
+          throw new IOException("Invalid IV length!");
+        }
+
+        byte[]   key     = getBackupKey(passphrase, header.hasSalt() ? header.getSalt().toByteArray() : null);
+        byte[]   derived = new HKDFv3().deriveSecrets(key, "Backup Export".getBytes(), 64);
+        byte[][] split   = ByteUtil.split(derived, 32, 32);
+
+        this.cipherKey = split[0];
+        this.macKey    = split[1];
+
+        this.cipher = Cipher.getInstance("AES/CTR/NoPadding");
+        this.mac    = Mac.getInstance("HmacSHA256");
+        this.mac.init(new SecretKeySpec(macKey, "HmacSHA256"));
+
+        this.counter = Conversions.byteArrayToInt(iv);
+      } catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException e) {
+        throw new AssertionError(e);
+      }
+    }
+
+    BackupFrame readFrame() throws IOException {
+      return readFrame(in);
+    }
+
+    void readAttachmentTo(OutputStream out, int length) throws IOException {
+      try {
+        Conversions.intToByteArray(iv, 0, counter++);
+        cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(cipherKey, "AES"), new IvParameterSpec(iv));
+        mac.update(iv);
+
+        byte[] buffer = new byte[8192];
+
+        while (length > 0) {
+          int read = in.read(buffer, 0, Math.min(buffer.length, length));
+          if (read == -1) throw new IOException("File ended early!");
+
+          mac.update(buffer, 0, read);
+
+          byte[] plaintext = cipher.update(buffer, 0, read);
+
+          if (plaintext != null) {
+            out.write(plaintext, 0, plaintext.length);
+          }
+
+          length -= read;
+        }
+
+        byte[] plaintext = cipher.doFinal();
+
+        if (plaintext != null) {
+          out.write(plaintext, 0, plaintext.length);
+        }
+
+        out.close();
+
+        byte[] ourMac   = ByteUtil.trim(mac.doFinal(), 10);
+        byte[] theirMac = new byte[10];
+
+        try {
+          StreamUtil.readFully(in, theirMac);
+        } catch (IOException e) {
+          throw new IOException(e);
+        }
+
+        if (!MessageDigest.isEqual(ourMac, theirMac)) {
+          throw new BadMacException();
+        }
+      } catch (InvalidKeyException | InvalidAlgorithmParameterException | IllegalBlockSizeException | BadPaddingException e) {
+        throw new AssertionError(e);
+      }
+    }
+
+    private BackupFrame readFrame(InputStream in) throws IOException {
+      try {
+        byte[] length = new byte[4];
+        StreamUtil.readFully(in, length);
+
+        byte[] frame = new byte[Conversions.byteArrayToInt(length)];
+        StreamUtil.readFully(in, frame);
+
+        byte[] theirMac = new byte[10];
+        System.arraycopy(frame, frame.length - 10, theirMac, 0, theirMac.length);
+
+        mac.update(frame, 0, frame.length - 10);
+        byte[] ourMac = ByteUtil.trim(mac.doFinal(), 10);
+
+        if (!MessageDigest.isEqual(ourMac, theirMac)) {
+          throw new IOException("Bad MAC");
+        }
+
+        Conversions.intToByteArray(iv, 0, counter++);
+        cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(cipherKey, "AES"), new IvParameterSpec(iv));
+
+        byte[] plaintext = cipher.doFinal(frame, 0, frame.length - 10);
+
+        return BackupFrame.parseFrom(plaintext);
+      } catch (InvalidKeyException | InvalidAlgorithmParameterException | IllegalBlockSizeException | BadPaddingException e) {
+        throw new AssertionError(e);
+      }
+    }
+  }
+
+  private static class BadMacException extends IOException {}
+
  public static class DatabaseDowngradeException extends IOException {
    DatabaseDowngradeException(int currentVersion, int backupVersion) {
      super("Tried to import a backup with version " + backupVersion + " into a database with version " + currentVersion);
--- a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/OpenableGift.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/OpenableGift.kt
@@ -25,31 +25,4 @@ 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
-        }
-      }
-    }
-  }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/OpenableGiftItemDecoration.kt
@@ -5,7 +5,6 @@ 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
@@ -14,10 +13,8 @@ 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
@@ -56,10 +53,6 @@ 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()
@@ -194,7 +187,7 @@ class OpenableGiftItemDecoration(context: Context) : RecyclerView.ItemDecoration
      }

      private fun getTranslation(progress: Float): Double {
-        val interpolated = TRANSLATION_X_INTERPOLATOR.getInterpolation(progress)
+        val interpolated = INTERPOLATOR.getInterpolation(progress)
        val evaluated = EVALUATOR.evaluate(interpolated, 0f, 360f)

        return 0.25f * sin(4 * evaluated * PI / 180f) * 180f / PI
@@ -202,60 +195,17 @@ class OpenableGiftItemDecoration(context: Context) : RecyclerView.ItemDecoration
    }

    class OpenAnimationState(openableGift: OpenableGift, startTime: Long) : GiftAnimationState(openableGift, startTime, OPEN_DURATION_MILLIS) {
-
-      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 interpolatedProgress = INTERPOLATOR.getInterpolation(progress)
+        val evaluatedValue = EVALUATOR.evaluate(interpolatedProgress, 0f, DimensionUnit.DP.toPixels(161f))

-        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 interpolatedY = TRANSLATION_Y_INTERPOLATOR.getInterpolation(progress)
        val evaluatedY = EVALUATOR.evaluate(interpolatedY, 0f, DimensionUnit.DP.toPixels(355f))

-        val interpolatedBowRotation = bowRotationInterpolator.getInterpolation(bowProgress)
-        val evaluatedBowRotation = EVALUATOR.evaluate(interpolatedBowRotation, 0f, 8f * sign)
+        canvas.translate(evaluatedValue, evaluatedY)

-        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)
-            }
-          }
-        }
+        drawBox(canvas, projection)
+        drawBow(canvas, projection)
      }
    }

@@ -295,13 +245,11 @@ class OpenableGiftItemDecoration(context: Context) : RecyclerView.ItemDecoration

  companion object {
    private val TRANSLATION_Y_INTERPOLATOR = AnticipateInterpolator(3f)
-    private val TRANSLATION_X_INTERPOLATOR = AccelerateDecelerateInterpolator()
+    private val INTERPOLATOR = AccelerateDecelerateInterpolator()
    private val EVALUATOR = FloatEvaluator()

    private const val SHAKE_DURATION_MILLIS = 1000L
-    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 OPEN_DURATION_MILLIS = 700L
    private const val ONE_FRAME_RELATIVE_TO_30_FPS_MILLIS = 33
  }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowConfirmationFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowConfirmationFragment.kt
@@ -18,6 +18,7 @@ import org.thoughtcrime.securesms.components.InputAwareLayout
 import org.thoughtcrime.securesms.components.emoji.EmojiEventListener
 import org.thoughtcrime.securesms.components.emoji.MediaKeyboard
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
+import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
 import org.thoughtcrime.securesms.components.settings.app.subscription.DonationEvent
@@ -35,7 +36,6 @@ import org.thoughtcrime.securesms.keyboard.emoji.EmojiKeyboardPageFragment
 import org.thoughtcrime.securesms.keyboard.emoji.search.EmojiSearchFragment
 import org.thoughtcrime.securesms.util.Debouncer
 import org.thoughtcrime.securesms.util.LifecycleDisposable
-import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import org.thoughtcrime.securesms.util.fragments.requireListener

 /**
@@ -75,7 +75,7 @@ class GiftFlowConfirmationFragment :
  private val eventPublisher = PublishSubject.create<TextInput.TextInputEvent>()
  private val debouncer = Debouncer(100L)

-  override fun bindAdapter(adapter: MappingAdapter) {
+  override fun bindAdapter(adapter: DSLSettingsAdapter) {
    RecipientPreference.register(adapter)
    GiftRowItem.register(adapter)

--- a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowRepository.kt
@@ -18,11 +18,8 @@ import java.util.Locale
 class GiftFlowRepository {

  fun getGiftBadge(): Single<Pair<Long, Badge>> {
-    return Single
-      .fromCallable {
-        ApplicationDependencies.getDonationsService()
-          .getGiftBadges(Locale.getDefault())
-      }
+    return 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() }
@@ -30,11 +27,8 @@ class GiftFlowRepository {
  }

  fun getGiftPricing(): Single<Map<Currency, FiatMoney>> {
-    return Single
-      .fromCallable {
-        ApplicationDependencies.getDonationsService()
-          .giftAmount
-      }
+    return ApplicationDependencies.getDonationsService()
+      .giftAmount
      .subscribeOn(Schedulers.io())
      .flatMap { it.flattenResult() }
      .map { result ->
--- a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowStartFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftFlowStartFragment.kt
@@ -4,20 +4,17 @@ import android.view.View
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import org.signal.core.util.DimensionUnit
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
+import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
-import org.thoughtcrime.securesms.components.settings.DSLSettingsText
 import org.thoughtcrime.securesms.components.settings.app.subscription.DonationPaymentComponent
 import org.thoughtcrime.securesms.components.settings.app.subscription.models.CurrencySelection
 import org.thoughtcrime.securesms.components.settings.app.subscription.models.NetworkFailure
 import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.components.settings.models.IndeterminateLoadingCircle
-import org.thoughtcrime.securesms.components.settings.models.SplashImage
 import org.thoughtcrime.securesms.util.LifecycleDisposable
 import org.thoughtcrime.securesms.util.ViewUtil
-import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import org.thoughtcrime.securesms.util.fragments.requireListener
 import org.thoughtcrime.securesms.util.navigation.safeNavigate

@@ -35,12 +32,11 @@ class GiftFlowStartFragment : DSLSettingsFragment(

  private val lifecycleDisposable = LifecycleDisposable()

-  override fun bindAdapter(adapter: MappingAdapter) {
+  override fun bindAdapter(adapter: DSLSettingsAdapter) {
    CurrencySelection.register(adapter)
    GiftRowItem.register(adapter)
    NetworkFailure.register(adapter)
    IndeterminateLoadingCircle.register(adapter)
-    SplashImage.register(adapter)

    val next = requireView().findViewById<View>(R.id.next)
    next.setOnClickListener {
@@ -62,28 +58,6 @@ class GiftFlowStartFragment : DSLSettingsFragment(

  private fun getConfiguration(state: GiftFlowState): DSLConfiguration {
    return configure {
-      customPref(
-        SplashImage.Model(
-          R.drawable.ic_gift_chat
-        )
-      )
-
-      noPadTextPref(
-        title = DSLSettingsText.from(
-          R.string.GiftFlowStartFragment__gift_a_badge,
-          DSLSettingsText.CenterModifier,
-          DSLSettingsText.TextAppearanceModifier(R.style.Signal_Text_Headline)
-        )
-      )
-
-      space(DimensionUnit.DP.toPixels(16f).toInt())
-
-      noPadTextPref(
-        title = DSLSettingsText.from(R.string.GiftFlowStartFragment__gift_someone_a_badge, DSLSettingsText.CenterModifier)
-      )
-
-      space(DimensionUnit.DP.toPixels(16f).toInt())
-
      customPref(
        CurrencySelection.Model(
          selectedCurrency = state.currency,
--- a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftRowItem.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/flow/GiftRowItem.kt
@@ -36,10 +36,6 @@ object GiftRowItem {
    private val taglineView = itemView.findViewById<TextView>(R.id.tagline)
    private val priceView = itemView.findViewById<TextView>(R.id.price)

-    init {
-      itemView.isSelected = true
-    }
-
    override fun bind(model: Model) {
      checkView.visible = false
      badgeView.setBadge(model.giftBadge)
--- a/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/ViewGiftRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/gifts/viewgift/ViewGiftRepository.kt
@@ -19,12 +19,9 @@ import java.util.Locale
 class ViewGiftRepository {
  fun getBadge(giftBadge: GiftBadge): Single<Badge> {
    val presentation = ReceiptCredentialPresentation(giftBadge.redemptionToken.toByteArray())
-    return Single
-      .fromCallable {
-        ApplicationDependencies
-          .getDonationsService()
-          .getGiftBadge(Locale.getDefault(), presentation.receiptLevel)
-      }
+    return ApplicationDependencies
+      .getDonationsService()
+      .getGiftBadge(Locale.getDefault(), presentation.receiptLevel)
      .flatMap { it.flattenResult() }
      .map { Badges.fromServiceBadge(it) }
      .subscribeOn(Schedulers.io())
--- a/app/src/main/java/org/thoughtcrime/securesms/badges/glide/BadgeSpriteTransformation.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/glide/BadgeSpriteTransformation.kt
@@ -5,7 +5,6 @@ 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

 /**
@@ -16,6 +15,7 @@ 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,29 +32,11 @@ 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 outCanvas = Canvas(outBitmap)
+    val outBounds = Rect(0, 0, outWidth, outHeight)

-    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)
-    }
+    canvas.drawBitmap(toTransform, inBounds, outBounds, null)

    return outBitmap
  }
@@ -167,8 +149,6 @@ 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 }
    }
--- a/app/src/main/java/org/thoughtcrime/securesms/badges/self/featured/SelectFeaturedBadgeFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/self/featured/SelectFeaturedBadgeFragment.kt
@@ -13,11 +13,11 @@ import org.thoughtcrime.securesms.badges.Badges.displayBadges
 import org.thoughtcrime.securesms.badges.models.Badge
 import org.thoughtcrime.securesms.badges.models.BadgePreview
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
+import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.util.LifecycleDisposable
 import org.thoughtcrime.securesms.util.Material3OnScrollHelper
-import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter

 /**
 * Fragment which allows user to select one of their badges to be their "Featured" badge.
@@ -50,7 +50,7 @@ class SelectFeaturedBadgeFragment : DSLSettingsFragment(
    return Material3OnScrollHelper(requireActivity(), scrollShadow)
  }

-  override fun bindAdapter(adapter: MappingAdapter) {
+  override fun bindAdapter(adapter: DSLSettingsAdapter) {
    Badge.register(adapter) { badge, isSelected, _ ->
      if (!isSelected) {
        viewModel.setSelectedBadge(badge)
--- a/app/src/main/java/org/thoughtcrime/securesms/badges/self/overview/BadgesOverviewFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/self/overview/BadgesOverviewFragment.kt
@@ -10,6 +10,7 @@ import org.thoughtcrime.securesms.badges.Badges.displayBadges
 import org.thoughtcrime.securesms.badges.models.Badge
 import org.thoughtcrime.securesms.badges.view.ViewBadgeBottomSheetDialogFragment
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
+import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
 import org.thoughtcrime.securesms.components.settings.app.subscription.SubscriptionsRepository
@@ -17,7 +18,6 @@ import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.LifecycleDisposable
-import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import org.thoughtcrime.securesms.util.navigation.safeNavigate

 /**
@@ -35,7 +35,7 @@ class BadgesOverviewFragment : DSLSettingsFragment(
    }
  )

-  override fun bindAdapter(adapter: MappingAdapter) {
+  override fun bindAdapter(adapter: DSLSettingsAdapter) {
    Badge.register(adapter) { badge, _, isFaded ->
      if (badge.isExpired() || isFaded) {
        findNavController().safeNavigate(BadgesOverviewFragmentDirections.actionBadgeManageFragmentToExpiredBadgeDialog(badge, null, null))
--- a/app/src/main/java/org/thoughtcrime/securesms/badges/view/ViewBadgeBottomSheetDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/badges/view/ViewBadgeBottomSheetDialogFragment.kt
@@ -23,6 +23,7 @@ import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.util.BottomSheetUtil
 import org.thoughtcrime.securesms.util.CommunicationActions
+import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.PlayServicesUtil
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
@@ -67,7 +68,10 @@ class ViewBadgeBottomSheetDialogFragment : FixedRoundedCornerBottomSheetDialogFr
      action.setOnClickListener {
        CommunicationActions.openBrowserLink(requireContext(), getString(R.string.donate_url))
      }
-    } else if (Recipient.self().badges.none { it.category == Badge.Category.Donor && !it.isBoost() && !it.isExpired() }) {
+    } else if (
+      FeatureFlags.donorBadges() &&
+      Recipient.self().badges.none { it.category == Badge.Category.Donor && !it.isBoost() && !it.isExpired() }
+    ) {
      action.setOnClickListener {
        startActivity(AppSettingsActivity.subscriptions(requireContext()))
      }
@@ -139,6 +143,10 @@ class ViewBadgeBottomSheetDialogFragment : FixedRoundedCornerBottomSheetDialogFr
      recipientId: RecipientId,
      startBadge: Badge? = null
    ) {
+      if (!FeatureFlags.displayDonorBadges() && recipientId != Recipient.self().id) {
+        return
+      }
+
      ViewBadgeBottomSheetDialogFragment().apply {
        arguments = Bundle().apply {
          putParcelable(ARG_START_BADGE, startBadge)
--- a/app/src/main/java/org/thoughtcrime/securesms/blocked/BlockedUsersActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/blocked/BlockedUsersActivity.java
@@ -10,7 +10,7 @@ import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
-import androidx.lifecycle.ViewModelProvider;
+import androidx.lifecycle.ViewModelProviders;

 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.snackbar.Snackbar;
@@ -48,7 +48,7 @@ public class BlockedUsersActivity extends PassphraseRequiredActivity implements
    BlockedUsersRepository        repository = new BlockedUsersRepository(this);
    BlockedUsersViewModel.Factory factory    = new BlockedUsersViewModel.Factory(repository);

-    viewModel = new ViewModelProvider(this, factory).get(BlockedUsersViewModel.class);
+    viewModel = ViewModelProviders.of(this, factory).get(BlockedUsersViewModel.class);

    Toolbar           toolbar           = findViewById(R.id.toolbar);
    ContactFilterView contactFilterView = findViewById(R.id.contact_filter_edit_text);
--- a/app/src/main/java/org/thoughtcrime/securesms/blocked/BlockedUsersFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/blocked/BlockedUsersFragment.java
@@ -9,7 +9,7 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import androidx.lifecycle.ViewModelProvider;
+import androidx.lifecycle.ViewModelProviders;
 import androidx.recyclerview.widget.RecyclerView;

 import org.thoughtcrime.securesms.BlockUnblockDialog;
@@ -59,7 +59,7 @@ public class BlockedUsersFragment extends Fragment {
      }
    });

-    viewModel = new ViewModelProvider(requireActivity()).get(BlockedUsersViewModel.class);
+    viewModel = ViewModelProviders.of(requireActivity()).get(BlockedUsersViewModel.class);
    viewModel.getRecipients().observe(getViewLifecycleOwner(), list -> {
      if (list.isEmpty()) {
        empty.setVisibility(View.VISIBLE);
--- a/app/src/main/java/org/thoughtcrime/securesms/components/AudioView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/AudioView.java
@@ -17,7 +17,6 @@ import android.widget.TextView;
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.lifecycle.Observer;

 import com.airbnb.lottie.LottieAnimationView;
@@ -88,8 +87,6 @@ public final class AudioView extends FrameLayout {

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

      setTint(typedArray.getColor(R.styleable.AudioView_foregroundTintColor, Color.WHITE));

-      int backgroundTintColor = typedArray.getColor(R.styleable.AudioView_backgroundTintColor, Color.TRANSPARENT);
-      if (getBackground() != null && backgroundTintColor != Color.TRANSPARENT) {
-        DrawableCompat.setTint(getBackground(), backgroundTintColor);
-      }
-
      this.waveFormPlayedBarsColor   = typedArray.getColor(R.styleable.AudioView_waveformPlayedBarsColor, Color.WHITE);
      this.waveFormUnplayedBarsColor = typedArray.getColor(R.styleable.AudioView_waveformUnplayedBarsColor, Color.WHITE);
      this.waveFormThumbTint         = typedArray.getColor(R.styleable.AudioView_waveformThumbTint, Color.WHITE);
--- a/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
@@ -64,7 +64,6 @@ public final class AvatarImageView extends AppCompatImageView {

  private @Nullable RecipientContactPhoto recipientContactPhoto;
  private @NonNull  Drawable              unknownRecipientDrawable;
-  private @Nullable AvatarColor           fallbackPhotoColor;

  public AvatarImageView(Context context) {
    super(context);
@@ -106,10 +105,6 @@ public final class AvatarImageView extends AppCompatImageView {
    this.fallbackPhotoProvider = fallbackPhotoProvider;
  }

-  public void setFallbackPhotoColor(@Nullable AvatarColor fallbackPhotoColor) {
-    this.fallbackPhotoColor = fallbackPhotoColor;
-  }
-
  /**
   * Shows self as the actual profile picture.
   */
@@ -165,7 +160,8 @@ 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()))
+                                                                                                                           new ProfileContactPhoto(Recipient.self(),
+                                                                                                                                                   Recipient.self().getProfileAvatar()))
                                                                                               : new RecipientContactPhoto(recipient);

      boolean    shouldBlur = recipient.shouldBlurAvatar();
@@ -218,7 +214,7 @@ public final class AvatarImageView extends AppCompatImageView {
      requestManager.clear(this);
      if (fallbackPhotoProvider != null) {
        setImageDrawable(fallbackPhotoProvider.getPhotoForRecipientWithoutName()
-                                              .asDrawable(getContext(), Util.firstNonNull(fallbackPhotoColor, AvatarColor.UNKNOWN), inverted));
+                                              .asDrawable(getContext(), AvatarColor.UNKNOWN, inverted));
      } else {
        setImageDrawable(unknownRecipientDrawable);
      }
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ClippedCardView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ClippedCardView.kt
@@ -1,35 +0,0 @@
-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)
-    }
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java
@@ -26,7 +26,6 @@ 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;
@@ -35,29 +34,19 @@ 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 java.util.regex.Matcher;
-import java.util.regex.Pattern;

 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 static final Pattern TIME_PATTERN = Pattern.compile("^[0-9]{1,2}:[0-9]{1,2}$");
-
  private CharSequence            hint;
  private SpannableString         subHint;
  private MentionRendererDelegate mentionRendererDelegate;
@@ -65,14 +54,7 @@ public class ComposeText extends EmojiEditText {

  @Nullable private InputPanel.MediaListener      mediaListener;
  @Nullable private CursorPositionChangedListener cursorPositionChangedListener;
-  @Nullable private InlineQueryChangedListener    inlineQueryChangedListener;
-
-  private final Runnable keywordSearchRunnable = () -> {
-    Editable text = getText();
-    if (text != null && enoughToFilter(text, true)) {
-      performFiltering(text, true);
-    }
-  };
+  @Nullable private MentionQueryChangedListener   mentionQueryChangedListener;

  public ComposeText(Context context) {
    super(context);
@@ -129,7 +111,7 @@ public class ComposeText extends EmojiEditText {
      if (selectionStart == selectionEnd) {
        doAfterCursorChange(getText());
      } else {
-        clearInlineQuery();
+        updateQuery(null);
      }
    }

@@ -207,8 +189,8 @@ public class ComposeText extends EmojiEditText {
    this.cursorPositionChangedListener = listener;
  }

-  public void setInlineQueryChangedListener(@Nullable InlineQueryChangedListener listener) {
-    this.inlineQueryChangedListener = listener;
+  public void setMentionQueryChangedListener(@Nullable MentionQueryChangedListener listener) {
+    this.mentionQueryChangedListener = listener;
  }

  public void setMentionValidator(@Nullable MentionValidatorWatcher.MentionValidator mentionValidator) {
@@ -244,23 +226,15 @@ 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 (Build.VERSION.SDK_INT < 21) return inputConnection;
+    if (mediaListener == null)      return inputConnection;
+    if (inputConnection == null)    return null;

-    if (mediaListener == null) {
-      return inputConnection;
-    }
-
-    if (inputConnection == null) {
-      return null;
-    }
-
-    EditorInfoCompat.setContentMimeTypes(editorInfo, new String[] { "image/jpeg", "image/png", "image/gif" });
+    EditorInfoCompat.setContentMimeTypes(editorInfo, new String[] {"image/jpeg", "image/png", "image/gif"});
    return InputConnectionCompat.createWrapper(inputConnection, editorInfo, new CommitContentListener(mediaListener));
  }

@@ -326,51 +300,35 @@ public class ComposeText extends EmojiEditText {
  }

  private void doAfterCursorChange(@NonNull Editable text) {
-    if (enoughToFilter(text, false)) {
-      performFiltering(text, false);
+    if (enoughToFilter(text)) {
+      performFiltering(text);
    } else {
-      clearInlineQuery();
+      updateQuery(null);
    }
  }

-  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 performFiltering(@NonNull Editable text) {
+    int          end   = getSelectionEnd();
+    int          start = findQueryStart(text, end);
+    CharSequence query = text.subSequence(start, end);
+    updateQuery(query.toString());
+  }

-    if (inlineQueryChangedListener != null) {
-      if (queryStart.isMentionQuery) {
-        inlineQueryChangedListener.onQueryChanged(new InlineQuery.Mention(query));
-      } else {
-        inlineQueryChangedListener.onQueryChanged(new InlineQuery.Emoji(query, keywordEmojiSearch));
-      }
+  private void updateQuery(@Nullable String query) {
+    if (mentionQueryChangedListener != null) {
+      mentionQueryChangedListener.onQueryChanged(query);
    }
  }

-  private void clearInlineQuery() {
-    if (inlineQueryChangedListener != null) {
-      inlineQueryChangedListener.clearQuery();
-    }
-  }
-
-  private boolean enoughToFilter(@NonNull Editable text, boolean keywordEmojiSearch) {
+  private boolean enoughToFilter(@NonNull Editable text) {
    int end = getSelectionEnd();
    if (end < 0) {
      return false;
    }
-    return findQueryStart(text, end, keywordEmojiSearch).index != -1;
+    return findQueryStart(text, end) != -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;
@@ -378,11 +336,10 @@ public class ComposeText extends EmojiEditText {

    clearComposingText();

-    int end   = getSelectionEnd();
-    int start = findQueryStart(text, end, keywordReplacement).index - (keywordReplacement ? 0 : 1);
+    int    end      = getSelectionEnd();
+    int    start    = findQueryStart(text, end) - 1;

-    text.replace(start, end, "");
-    text.insert(start, replacement);
+    text.replace(start, end, createReplacementToken(displayName, recipientId));
  }

  private @NonNull CharSequence createReplacementToken(@NonNull CharSequence text, @NonNull RecipientId recipientId) {
@@ -400,68 +357,22 @@ public class ComposeText extends EmojiEditText {
    return builder;
  }

-  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) {
+  private int findQueryStart(@NonNull CharSequence text, int inputCursorPosition) {
    if (inputCursorPosition == 0) {
      return -1;
    }

    int delimiterSearchIndex = inputCursorPosition - 1;
-    while (delimiterSearchIndex >= 0 && (text.charAt(delimiterSearchIndex) != starter && !Character.isWhitespace(text.charAt(delimiterSearchIndex)))) {
+    while (delimiterSearchIndex >= 0 && (text.charAt(delimiterSearchIndex) != MENTION_STARTER && text.charAt(delimiterSearchIndex) != ' ')) {
      delimiterSearchIndex--;
    }

-    if (delimiterSearchIndex >= 0 && text.charAt(delimiterSearchIndex) == starter) {
-      if (couldBeTimeEntry(text, delimiterSearchIndex)) {
-        return -1;
-      } else {
-        return delimiterSearchIndex + 1;
-      }
+    if (delimiterSearchIndex >= 0 && text.charAt(delimiterSearchIndex) == MENTION_STARTER) {
+      return delimiterSearchIndex + 1;
    }
    return -1;
  }

-  /**
-   * Return true if we think the user may be inputting a time.
-   */
-  private static boolean couldBeTimeEntry(@NonNull CharSequence text, int startIndex) {
-    if (startIndex <= 0 || startIndex + 1 >= text.length()) {
-      return false;
-    }
-
-    int startOfToken = startIndex;
-    while (startOfToken > 0 && !Character.isWhitespace(text.charAt(startOfToken))) {
-      startOfToken--;
-    }
-    startOfToken++;
-
-    int endOfToken = startIndex;
-    while (endOfToken < text.length() && !Character.isWhitespace(text.charAt(endOfToken))) {
-      endOfToken++;
-    }
-
-    return TIME_PATTERN.matcher(text.subSequence(startOfToken, endOfToken)).find();
-  }
-
  private static class CommitContentListener implements InputConnectionCompat.OnCommitContentListener {

    private static final String TAG = Log.tag(CommitContentListener.class);
@@ -494,18 +405,11 @@ 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);
+  }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java
@@ -10,7 +10,6 @@ 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;
@@ -36,7 +35,6 @@ public class ConversationItemThumbnail extends FrameLayout {
  private int[]                  normalBounds;
  private int[]                  gifBounds;
  private int                    minimumThumbnailWidth;
-  private int                    maximumThumbnailHeight;

  public ConversationItemThumbnail(Context context) {
    super(context);
@@ -85,8 +83,7 @@ public class ConversationItemThumbnail extends FrameLayout {
        Integer.MAX_VALUE
    };

-    minimumThumbnailWidth  = -1;
-    maximumThumbnailHeight = -1;
+    minimumThumbnailWidth = -1;
  }

  @SuppressWarnings("SuspiciousNameCombination")
@@ -146,16 +143,11 @@ public class ConversationItemThumbnail extends FrameLayout {
    cornerMask.setRadii(topLeft, topRight, bottomRight, bottomLeft);
  }

-  public void setMinimumThumbnailWidth(@Px int width) {
+  public void setMinimumThumbnailWidth(int width) {
    minimumThumbnailWidth = width;
    thumbnail.setMinimumThumbnailWidth(width);
  }

-  public void setMaximumThumbnailHeight(@Px int height) {
-    maximumThumbnailHeight = height;
-    thumbnail.setMaximumThumbnailHeight(height);
-  }
-
  public void setBorderless(boolean borderless) {
    this.borderless = borderless;
  }
@@ -178,10 +170,6 @@ public class ConversationItemThumbnail extends FrameLayout {
        if (minimumThumbnailWidth != -1) {
          thumbnail.setMinimumThumbnailWidth(minimumThumbnailWidth);
        }
-
-        if (maximumThumbnailHeight != -1) {
-          thumbnail.setMaximumThumbnailHeight(maximumThumbnailHeight);
-        }
      }

      thumbnail.setVisibility(VISIBLE);
--- a/app/src/main/java/org/thoughtcrime/securesms/components/FixedRoundedCornerBottomSheetDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/FixedRoundedCornerBottomSheetDialogFragment.kt
@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms.components

 import android.app.Dialog
-import android.content.res.ColorStateList
 import android.graphics.Color
 import android.os.Bundle
 import android.view.ContextThemeWrapper
@@ -32,8 +31,6 @@ abstract class FixedRoundedCornerBottomSheetDialogFragment : BottomSheetDialogFr
  @ColorInt
  protected var backgroundColor: Int = Color.TRANSPARENT

-  private lateinit var dialogBackground: MaterialShapeDrawable
-
  override fun onCreate(savedInstanceState: Bundle?) {
    super.onCreate(savedInstanceState)
    setStyle(STYLE_NORMAL, themeResId)
@@ -49,11 +46,11 @@ abstract class FixedRoundedCornerBottomSheetDialogFragment : BottomSheetDialogFr
      .setTopRightCorner(CornerFamily.ROUNDED, ViewUtil.dpToPx(requireContext(), 18).toFloat())
      .build()

-    dialogBackground = MaterialShapeDrawable(shapeAppearanceModel)
+    val dialogBackground = MaterialShapeDrawable(shapeAppearanceModel)

    val bottomSheetStyle = ThemeUtil.getThemedResourceId(ContextThemeWrapper(requireContext(), themeResId), R.attr.bottomSheetStyle)
    backgroundColor = ThemeUtil.getThemedColor(ContextThemeWrapper(requireContext(), bottomSheetStyle), R.attr.backgroundTint)
-    dialogBackground.fillColor = ColorStateList.valueOf(backgroundColor)
+    dialogBackground.setTint(backgroundColor)

    dialog.behavior.addBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() {
      override fun onStateChanged(bottomSheet: View, newState: Int) {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/FragmentWrapperActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/FragmentWrapperActivity.kt
@@ -13,11 +13,10 @@ 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(contentViewId)
+    setContentView(R.layout.fragment_container)
    dynamicTheme.onCreate(this)

    if (savedInstanceState == null) {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
@@ -50,7 +50,6 @@ import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.QuoteModel;
 import org.thoughtcrime.securesms.mms.SlideDeck;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.concurrent.AssertedSuccessListener;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
@@ -211,10 +210,6 @@ public class InputPanel extends LinearLayout
      int cornerRadius = readDimen(R.dimen.message_corner_collapse_radius);
      this.linkPreview.setCorners(cornerRadius, cornerRadius);
    }
-
-    if (listener != null) {
-      listener.onQuoteChanged(id, author.getId());
-    }
  }

  public void clearQuote() {
@@ -235,10 +230,6 @@ public class InputPanel extends LinearLayout
    });

    quoteAnimator.start();
-
-    if (listener != null) {
-      listener.onQuoteCleared();
-    }
  }

  private static ValueAnimator createHeightAnimator(@NonNull View view,
@@ -581,8 +572,6 @@ public class InputPanel extends LinearLayout
    void onEmojiToggle();
    void onLinkPreviewCanceled();
    void onStickerSuggestionSelected(@NonNull StickerRecord sticker);
-    void onQuoteChanged(long id, @NonNull RecipientId author);
-    void onQuoteCleared();
  }

  private static class SlideToCancel {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java
@@ -63,7 +63,8 @@ public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
  private int viewInset;

  private boolean keyboardOpen = false;
-  private int     rotation     = 0;
+  private int     rotation     = -1;
+  private boolean isFullscreen = false;
  private boolean isBubble     = false;

  public KeyboardAwareLinearLayout(Context context) {
@@ -107,10 +108,6 @@ 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);
@@ -130,18 +127,13 @@ public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
        onKeyboardOpen(keyboardHeight);
      }
    } else if (keyboardOpen) {
-      if (previousHeight == keyboardHeight) {
-        onKeyboardClose();
-      } else {
-        postDelayed(() -> updateKeyboardState(keyboardHeight), 100);
-      }
+      onKeyboardClose();
    }
  }

  @Override
  protected void onAttachedToWindow() {
    super.onAttachedToWindow();
-    rotation = getDeviceRotation();
    if (Build.VERSION.SDK_INT >= 23 && getRootWindowInsets() != null) {
      int          bottomInset;
      WindowInsets windowInsets = getRootWindowInsets();
@@ -307,6 +299,10 @@ public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
    shownListeners.remove(listener);
  }

+  public void setFullscreen(boolean isFullscreen) {
+    this.isFullscreen = isFullscreen;
+  }
+
  private void notifyHiddenListeners() {
    final Set<OnKeyboardHiddenListener> listeners = new HashSet<>(hiddenListeners);
    for (OnKeyboardHiddenListener listener : listeners) {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardEntryDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardEntryDialogFragment.kt
@@ -22,10 +22,8 @@ abstract class KeyboardEntryDialogFragment(@LayoutRes contentLayoutId: Int) :

  protected open val withDim: Boolean = false

-  protected open val themeResId: Int = R.style.Theme_Signal_RoundedBottomSheet
-
  override fun onCreate(savedInstanceState: Bundle?) {
-    setStyle(STYLE_NORMAL, themeResId)
+    setStyle(STYLE_NORMAL, R.style.Theme_Signal_RoundedBottomSheet)
    super.onCreate(savedInstanceState)
  }

--- a/app/src/main/java/org/thoughtcrime/securesms/components/LinkPreviewView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/LinkPreviewView.java
@@ -128,10 +128,6 @@ public class LinkPreviewView extends FrameLayout {
  }

  public void setLinkPreview(@NonNull GlideRequests glideRequests, @NonNull LinkPreview linkPreview, boolean showThumbnail) {
-    setLinkPreview(glideRequests, linkPreview, showThumbnail, true);
-  }
-
-  public void setLinkPreview(@NonNull GlideRequests glideRequests, @NonNull LinkPreview linkPreview, boolean showThumbnail, boolean showDescription) {
    spinner.setVisibility(GONE);
    noPreview.setVisibility(GONE);

@@ -142,7 +138,7 @@ public class LinkPreviewView extends FrameLayout {
      title.setVisibility(GONE);
    }

-    if (showDescription && !Util.isEmpty(linkPreview.getDescription())) {
+    if (!Util.isEmpty(linkPreview.getDescription())) {
      description.setText(linkPreview.getDescription());
      description.setVisibility(VISIBLE);
    } else {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/Material3SearchToolbar.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/Material3SearchToolbar.kt
@@ -80,10 +80,6 @@ class Material3SearchToolbar @JvmOverloads constructor(
    }
  }

-  fun clearText() {
-    input.setText("")
-  }
-
  interface Listener {
    fun onSearchTextChange(text: String)
    fun onSearchClosed()
--- a/app/src/main/java/org/thoughtcrime/securesms/components/NumericKeyboardView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/NumericKeyboardView.kt
@@ -1,75 +0,0 @@
-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)
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ProgressCard.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ProgressCard.kt
@@ -1,22 +0,0 @@
-package org.thoughtcrime.securesms.components
-
-import android.content.Context
-import android.util.AttributeSet
-import com.google.android.material.card.MaterialCardView
-import org.thoughtcrime.securesms.R
-
-/**
- * A small card with a circular progress indicator in it. Usable in place
- * of a ProgressDialog, which is deprecated.
- *
- * Remember to add this as the last UI element in your XML hierarchy so it'll
- * draw over top of other elements.
- */
-class ProgressCard @JvmOverloads constructor(
-  context: Context,
-  attrs: AttributeSet? = null
-) : MaterialCardView(context, attrs) {
-  init {
-    inflate(context, R.layout.progress_card, this)
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/components/SendButton.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/SendButton.kt
@@ -95,10 +95,15 @@ class SendButton(context: Context, attributeSet: AttributeSet?) : AppCompatImage

  fun resetAvailableTransports(isMediaMessage: Boolean) {
    availableSendTypes = MessageSendType.getAllAvailable(context, isMediaMessage)
-    activeMessageSendType = null
-    defaultTransportType = MessageSendType.TransportType.SMS
-    defaultSubscriptionId = null
-    onSelectionChanged(newType = selectedSendType, isManualSelection = false)
+
+    if (!availableSendTypes.contains(activeMessageSendType)) {
+      Log.w(TAG, "[resetAvailableTransports] The active send type is no longer available. Unsetting.")
+      setSendType(null)
+    } else {
+      defaultTransportType = MessageSendType.TransportType.SMS
+      defaultSubscriptionId = null
+      onSelectionChanged(newType = selectedSendType, isManualSelection = false)
+    }
  }

  fun disableTransportType(type: MessageSendType.TransportType) {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java
@@ -5,7 +5,6 @@ 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;
@@ -15,8 +14,6 @@ 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;
@@ -158,16 +155,11 @@ public class ThumbnailView extends FrameLayout {
    captionIcon.setScaleY(captionIconScale);
  }

-  public void setMinimumThumbnailWidth(@Px int width) {
+  public void setMinimumThumbnailWidth(int width) {
    bounds[MIN_WIDTH] = width;
    invalidate();
  }

-  public void setMaximumThumbnailHeight(@Px int height) {
-    bounds[MAX_HEIGHT] = height;
-    invalidate();
-  }
-
  @SuppressWarnings("SuspiciousNameCombination")
  private void fillTargetDimensions(int[] targetDimens, int[] dimens, int[] bounds) {
    int     dimensFilledCount = getNonZeroCount(dimens);
@@ -282,14 +274,6 @@ 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)
--- a/app/src/main/java/org/thoughtcrime/securesms/components/TooltipPopup.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/TooltipPopup.java
@@ -14,13 +14,11 @@ 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
@@ -38,8 +36,7 @@ public class TooltipPopup extends PopupWindow {

  private final View      anchor;
  private final ImageView arrow;
-  private final int position;
-  private final int startMargin;
+  private final int       position;

  public static Builder forTarget(@NonNull View anchor) {
    return new Builder(anchor);
@@ -47,7 +44,6 @@ public class TooltipPopup extends PopupWindow {

  private TooltipPopup(@NonNull View anchor,
                       int rawPosition,
-                       @Px int startMargin,
                       @NonNull String text,
                       @ColorInt int backgroundTint,
                       @ColorInt int textColor,
@@ -58,9 +54,8 @@ public class TooltipPopup extends PopupWindow {
          ViewGroup.LayoutParams.WRAP_CONTENT,
          ViewGroup.LayoutParams.WRAP_CONTENT);

-    this.anchor          = anchor;
-    this.position    = getRtlPosition(anchor.getContext(), rawPosition);
-    this.startMargin = startMargin;
+    this.anchor   = anchor;
+    this.position = getRtlPosition(anchor.getContext(), rawPosition);

    switch (rawPosition) {
      case POSITION_ABOVE: arrow = getContentView().findViewById(R.id.tooltip_arrow_bottom); break;
@@ -145,19 +140,6 @@ 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);
  }

@@ -210,7 +192,6 @@ 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;
@@ -241,14 +222,9 @@ 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, setStartMargin, text, backgroundTint, textColor, iconGlideModel, dismissListener);
+      TooltipPopup tooltip = new TooltipPopup(anchor, position, text, backgroundTint, textColor, iconGlideModel, dismissListener);

      tooltip.show();

--- a/app/src/main/java/org/thoughtcrime/securesms/components/ViewBinderDelegate.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ViewBinderDelegate.kt
@@ -1,43 +0,0 @@
-package org.thoughtcrime.securesms.components
-
-import android.view.View
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.DefaultLifecycleObserver
-import androidx.lifecycle.LifecycleOwner
-import androidx.viewbinding.ViewBinding
-import kotlin.reflect.KProperty
-
-/**
- * ViewBinderDelegate which enforces the "best practices" for maintaining a reference to a view binding given by
- * Android official documentation.
- */
-open class ViewBinderDelegate<T : ViewBinding>(
-  private val bindingFactory: (View) -> T,
-  private val onBindingWillBeDestroyed: (T) -> Unit = {}
-) : DefaultLifecycleObserver {
-
-  private var binding: T? = null
-  private var isBindingDestroyed = false
-
-  operator fun getValue(thisRef: Fragment, property: KProperty<*>): T {
-    if (isBindingDestroyed) {
-      error("Binding has been destroyed.")
-    }
-
-    if (binding == null) {
-      thisRef.viewLifecycleOwner.lifecycle.addObserver(this@ViewBinderDelegate)
-      binding = bindingFactory(thisRef.requireView())
-    }
-
-    return binding!!
-  }
-
-  override fun onDestroy(owner: LifecycleOwner) {
-    if (binding != null) {
-      onBindingWillBeDestroyed(binding!!)
-    }
-
-    binding = null
-    isBindingDestroyed = true
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/components/WrapperDialogFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/WrapperDialogFragment.kt
@@ -1,73 +0,0 @@
-package org.thoughtcrime.securesms.components
-
-import android.content.DialogInterface
-import android.os.Bundle
-import android.view.View
-import androidx.activity.OnBackPressedCallback
-import androidx.fragment.app.DialogFragment
-import androidx.fragment.app.Fragment
-import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.util.fragments.findListener
-
-/**
- * Convenience class for wrapping Fragments in full-screen dialogs. Due to how fragments work, they
- * must be public static classes. Therefore, this class should be subclassed as its own entity, rather
- * than via `object : WrapperDialogFragment`.
- *
- * Example usage:
- *
- * ```
- * class Dialog : WrapperDialogFragment() {
- *   override fun getWrappedFragment(): Fragment {
- *     return NavHostFragment.create(R.navigation.private_story_settings, requireArguments())
- *   }
- * }
- *
- * companion object {
- *   fun createAsDialog(distributionListId: DistributionListId): DialogFragment {
- *     return Dialog().apply {
- *       arguments = PrivateStorySettingsFragmentArgs.Builder(distributionListId).build().toBundle()
- *     }
- *   }
- * }
- * ```
- */
-abstract class WrapperDialogFragment : DialogFragment(R.layout.fragment_container) {
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-
-    setStyle(STYLE_NO_FRAME, R.style.Signal_DayNight_Dialog_FullScreen)
-  }
-
-  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-    requireActivity().onBackPressedDispatcher.addCallback(
-      viewLifecycleOwner,
-      object : OnBackPressedCallback(true) {
-        override fun handleOnBackPressed() {
-          onHandleBackPressed()
-        }
-      }
-    )
-
-    if (savedInstanceState == null) {
-      childFragmentManager.beginTransaction()
-        .replace(R.id.fragment_container, getWrappedFragment())
-        .commitAllowingStateLoss()
-    }
-  }
-
-  open fun onHandleBackPressed() {
-    dismissAllowingStateLoss()
-  }
-
-  override fun onDismiss(dialog: DialogInterface) {
-    findListener<WrapperDialogFragmentCallback>()?.onWrapperDialogFragmentDismissed()
-  }
-
-  abstract fun getWrappedFragment(): Fragment
-
-  interface WrapperDialogFragmentCallback {
-    fun onWrapperDialogFragmentDismissed()
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraSurfaceView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraSurfaceView.java
@@ -0,0 +1,33 @@
+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;
+  }
+}
--- a/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraUtils.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraUtils.java
@@ -0,0 +1,110 @@
+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);
+    }
+  }
+}
--- a/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java
@@ -0,0 +1,575 @@
+/***
+ 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
+  }
+}
--- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java
@@ -10,17 +10,14 @@ 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 final Set<OnFocusChangeListener> onFocusChangeListeners = new HashSet<>();
+  private static final String TAG = Log.tag(EmojiEditText.class);

  public EmojiEditText(Context context) {
    this(context, null);
@@ -41,12 +38,6 @@ 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) {
@@ -63,17 +54,6 @@ 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;

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Greyson Parrelli	fb06ec51f3	Bump version to 5.41.14	2022-07-05 14:12:03 -04:00
Greyson Parrelli	dda28f8c24	Improve resiliance of FCM fetch.	2022-07-05 14:10:36 -04:00
Cody Henthorne	236e3f7e81	Bump version to 5.41.13	2022-07-01 15:37:44 -04:00
Cody Henthorne	f772f98947	Fix clickable state bug with CircularProgressMaterialButton.	2022-07-01 15:22:12 -04:00
Cody Henthorne	597756122b	Bump version to 5.41.12	2022-07-01 13:03:20 -04:00
Cody Henthorne	edc7d4d696	Fix disable state bug with CircularProgressMaterialButton.	2022-07-01 12:57:24 -04:00