Bump version to 6.14.1

activity -> 1.6.1
appcompat -> 1.6.1
fragment -> 1.5.5
navigation -> 2.5.3
core-ktx -> 1.9.0
safe-args -> 2.5.3

.editorconfig

@@ -2,3 +2,4 @@ root = true
 
 [*.kt]
 indent_size = 2
+twitter_compose_allowed_composition_locals=LocalExtendedColors

.github/workflows/android.yml

@@ -8,10 +8,13 @@ on:
     - '4.**'
     - '5.**'
 
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-8-cores
 
     steps:
     - uses: actions/checkout@v3
@@ -21,15 +24,13 @@ jobs:
       with:
         distribution: temurin
         java-version: 11
+        cache: gradle
 
     - name: Validate Gradle Wrapper
       uses: gradle/wrapper-validation-action@v1
 
-    - name: Remove Android 31 (S)
-      run: $ANDROID_HOME/tools/bin/sdkmanager --uninstall "platforms;android-31"
-
     - name: Build with Gradle
-      run: ./gradlew qa
+      run: ./gradlew qa --parallel
 
     - name: Archive reports for failed build
       if: ${{ failure() }}

.github/workflows/docker.yml

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

.idea/codeStyles/Project.xml

@@ -43,10 +43,7 @@
     </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
+        <value />
       </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />

README.md

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

app/build.gradle

@@ -1,42 +1,21 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'com.google.protobuf'
-apply plugin: 'androidx.navigation.safeargs'
-apply plugin: 'org.jlleitschuh.gradle.ktlint'
-apply from: 'translations.gradle'
-apply plugin: 'org.jetbrains.kotlin.android'
-apply plugin: 'app.cash.exhaustive'
-apply plugin: 'kotlin-parcelize'
-apply from: 'static-ips.gradle'
+import com.android.build.api.dsl.ManagedVirtualDevice
 
-repositories {
-    maven {
-        url "https://raw.github.com/signalapp/maven/master/sqlcipher/release/"
-        content {
-            includeGroupByRegex "org\\.signal.*"
-        }
-    }
-    maven {
-        url "https://www.jitpack.io"
-    }
-
-    google()
-    mavenCentral()
-    mavenLocal()
-    maven {
-        url "https://dl.cloudsmith.io/qxAgwaeEE1vN8aLU/mobilecoin/mobilecoin/maven/"
-    }
-    jcenter {
-        content {
-            includeVersion "mobi.upod", "time-duration-picker", "1.1.3"
-            includeVersion "cn.carbswang.android", "NumberPickerView", "1.0.9"
-            includeVersion "com.takisoft.fix", "colorpicker", "0.9.1"
-            includeVersion "com.codewaves.stickyheadergrid", "stickyheadergrid", "0.9.4"
-            includeVersion "com.google.android", "flexbox", "0.3.0"
-        }
-    }
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'com.google.protobuf'
+    id 'androidx.navigation.safeargs'
+    id 'org.jlleitschuh.gradle.ktlint'
+    id 'org.jetbrains.kotlin.android'
+    id 'app.cash.exhaustive'
+    id 'kotlin-parcelize'
+    id 'com.squareup.wire'
+    id 'android-constants'
+    id 'translations'
 }
 
+apply from: 'static-ips.gradle'
+
 protobuf {
     protoc {
         artifact = 'com.google.protobuf:protoc:3.18.0'
@@ -52,20 +31,30 @@ protobuf {
     }
 }
 
-ktlint {
-    // Use a newer version to resolve https://github.com/JLLeitschuh/ktlint-gradle/issues/507
-    version = "0.43.2"
+wire {
+    kotlin {
+        javaInterop = true
+    }
+
+    sourcePath {
+        srcDir 'src/main/protowire'
+    }
 }
 
-def canonicalVersionCode = 1149
-def canonicalVersionName = "5.53.7"
+ktlint {
+    // Use a newer version to resolve https://github.com/JLLeitschuh/ktlint-gradle/issues/507
+    version = "0.47.1"
+}
+
+def canonicalVersionCode = 1228
+def canonicalVersionName = "6.14.1"
 
 def postFixSize = 100
-def abiPostFix = ['universal'   : 5,
-                  'armeabi-v7a' : 6,
-                  'arm64-v8a'   : 7,
-                  'x86'         : 8,
-                  'x86_64'      : 9]
+def abiPostFix = ['universal'   : 0,
+                  'armeabi-v7a' : 1,
+                  'arm64-v8a'   : 2,
+                  'x86'         : 3,
+                  'x86_64'      : 4]
 
 def keystores = [ 'debug'  : loadKeystoreProperties('keystore.debug.properties') ]
 
@@ -73,6 +62,9 @@ def selectableVariants = [
         'nightlyProdSpinner',
         'nightlyProdPerf',
         'nightlyProdRelease',
+        'nightlyStagingRelease',
+        'nightlyPnpPerf',
+        'nightlyPnpRelease',
         'playProdDebug',
         'playProdSpinner',
         'playProdPerf',
@@ -82,28 +74,28 @@ def selectableVariants = [
         'playStagingSpinner',
         'playStagingPerf',
         'playStagingInstrumentation',
+        'playPnpDebug',
+        'playPnpSpinner',
         'playStagingRelease',
         'websiteProdSpinner',
         'websiteProdRelease',
 ]
 
 android {
-    buildToolsVersion BUILD_TOOL_VERSION
-    compileSdkVersion COMPILE_SDK
+    namespace 'org.thoughtcrime.securesms'
+
+    buildToolsVersion = signalBuildToolsVersion
+    compileSdkVersion = signalCompileSdkVersion
 
     flavorDimensions 'distribution', 'environment'
     useLibrary 'org.apache.http.legacy'
     testBuildType 'instrumentation'
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
         freeCompilerArgs = ["-Xallow-result-return-type"]
     }
 
-    dexOptions {
-        javaMaxHeapSize "4g"
-    }
-
     signingConfigs {
         if (keystores.debug != null) {
             debug {
@@ -121,14 +113,19 @@ android {
         unitTests {
             includeAndroidResources = true
         }
+
+        managedDevices {
+            devices {
+                pixel3api30 (ManagedVirtualDevice) {
+                    device = "Pixel 3"
+                    apiLevel = 30
+                    systemImageSource = "google-atd"
+                    require64Bit = false
+                }
+            }
+        }
     }
 
-    lintOptions {
-        checkReleaseBuilds false
-        abortOnError true
-        baseline file("lint-baseline.xml")
-        disable "LintError"
-    }
 
     sourceSets {
         test {
@@ -142,37 +139,37 @@ android {
 
     compileOptions {
         coreLibraryDesugaringEnabled true
-        sourceCompatibility JAVA_VERSION
-        targetCompatibility JAVA_VERSION
+        sourceCompatibility signalJavaVersion
+        targetCompatibility signalJavaVersion
     }
 
     packagingOptions {
-        exclude 'LICENSE.txt'
-        exclude 'LICENSE'
-        exclude 'NOTICE'
-        exclude 'asm-license.txt'
-        exclude 'META-INF/LICENSE'
-        exclude 'META-INF/NOTICE'
-        exclude 'META-INF/proguard/androidx-annotations.pro'
-        exclude 'libsignal_jni.dylib'
-        exclude 'signal_jni.dll'
+        resources {
+            excludes += ['LICENSE.txt', 'LICENSE', 'NOTICE', 'asm-license.txt', 'META-INF/LICENSE', 'META-INF/LICENSE.md', 'META-INF/NOTICE', 'META-INF/LICENSE-notice.md', 'META-INF/proguard/androidx-annotations.pro', 'libsignal_jni.dylib', 'signal_jni.dll']
+        }
     }
 
+
     buildFeatures {
         viewBinding true
+        compose true
+    }
+
+    composeOptions {
+        kotlinCompilerExtensionVersion = '1.3.2'
     }
 
     defaultConfig {
         versionCode canonicalVersionCode * postFixSize
         versionName canonicalVersionName
 
-        minSdkVersion MINIMUM_SDK
-        targetSdkVersion TARGET_SDK
+        minSdkVersion signalMinSdkVersion
+        targetSdkVersion signalTargetSdkVersion
 
         multiDexEnabled true
 
         vectorDrawables.useSupportLibrary = true
-        project.ext.set("archivesBaseName", "Signal");
+        project.ext.set("archivesBaseName", "Signal")
 
         manifestPlaceholders = [mapsKey:"AIzaSyCSx9xea86GwDKGznCAULE9Y5a8b-TfN9U"]
 
@@ -187,8 +184,9 @@ android {
         buildConfigField "String", "SIGNAL_SERVICE_STATUS_URL", "\"uptime.signal.org\""
         buildConfigField "String", "SIGNAL_KEY_BACKUP_URL", "\"https://api.backup.signal.org\""
         buildConfigField "String", "SIGNAL_SFU_URL", "\"https://sfu.voip.signal.org\""
-        buildConfigField "String[]", "SIGNAL_SFU_INTERNAL_NAMES", "new String[]{\"Test\", \"Staging\"}"
-        buildConfigField "String[]", "SIGNAL_SFU_INTERNAL_URLS", "new String[]{\"https://sfu.test.voip.signal.org\", \"https://sfu.staging.voip.signal.org\"}"
+        buildConfigField "String", "SIGNAL_STAGING_SFU_URL", "\"https://sfu.staging.voip.signal.org\""
+        buildConfigField "String[]", "SIGNAL_SFU_INTERNAL_NAMES", "new String[]{\"Test\", \"Staging\", \"Development\"}"
+        buildConfigField "String[]", "SIGNAL_SFU_INTERNAL_URLS", "new String[]{\"https://sfu.test.voip.signal.org\", \"https://sfu.staging.voip.signal.org\", \"https://sfu.staging.test.voip.signal.org\"}"
         buildConfigField "String", "CONTENT_PROXY_HOST", "\"contentproxy.signal.org\""
         buildConfigField "int", "CONTENT_PROXY_PORT", "443"
         buildConfigField "String[]", "SIGNAL_SERVICE_IPS", service_ips
@@ -200,8 +198,7 @@ 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 "String", "CDSI_MRENCLAVE", "\"0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57\""
         buildConfigField "org.thoughtcrime.securesms.KbsEnclave", "KBS_ENCLAVE", "new org.thoughtcrime.securesms.KbsEnclave(\"e18376436159cda3ad7a45d9320e382e4a497f26b0dca34d8eab0bd0139483b5\", " +
                                                                                                                            "\"3a485adb56e2058ef7737764c738c4069dd62bc457637eafb6bbce1ce29ddb89\", " +
                                                                                                                            "\"45627094b2ea4a66f4cf0b182858a8dcf4b8479122c3820fe7fd0551a6d4cf5c\")"
@@ -263,6 +260,7 @@ android {
                     'proguard/proguard-retrofit.pro',
                     'proguard/proguard-webrtc.pro',
                     'proguard/proguard-klinker.pro',
+                    'proguard/proguard-mobilecoin.pro',
                     'proguard/proguard-retrolambda.pro',
                     'proguard/proguard-okhttp.pro',
                     'proguard/proguard-ez-vcard.pro',
@@ -292,11 +290,13 @@ android {
             matchingFallbacks = ['debug']
             buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Spinner\""
         }
+
         release {
             minifyEnabled true
             proguardFiles = buildTypes.debug.proguardFiles
             buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Release\""
         }
+
         perf {
             initWith debug
             isDefault false
@@ -355,7 +355,6 @@ android {
             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\")"
@@ -371,6 +370,22 @@ android {
             buildConfigField "String", "BUILD_ENVIRONMENT_TYPE", "\"Staging\""
             buildConfigField "String", "STRIPE_PUBLISHABLE_KEY", "\"pk_test_sngOd8FnXNkpce9nPXawKrJD00kIDngZkD\""
         }
+
+        pnp {
+            dimension 'environment'
+
+            initWith staging
+            applicationIdSuffix ".pnp"
+
+            buildConfigField "String", "BUILD_ENVIRONMENT_TYPE", "\"Pnp\""
+        }
+    }
+
+    lint {
+        abortOnError true
+        baseline file('lint-baseline.xml')
+        checkReleaseBuilds false
+        disable 'LintError'
     }
 
     android.applicationVariants.all { variant ->
@@ -417,7 +432,7 @@ dependencies {
 
     implementation (libs.androidx.appcompat) {
         version {
-            strictly '1.5.1'
+            strictly '1.6.1'
         }
     }
     implementation libs.androidx.window.window
@@ -425,7 +440,6 @@ dependencies {
     implementation libs.androidx.recyclerview
     implementation libs.material.material
     implementation libs.androidx.legacy.support
-    implementation libs.androidx.cardview
     implementation libs.androidx.preference
     implementation libs.androidx.legacy.preference
     implementation libs.androidx.gridlayout
@@ -474,6 +488,8 @@ dependencies {
     implementation project(':contacts')
     implementation project(':qr')
     implementation project(':sms-exporter')
+    implementation project(':sticky-header-grid')
+    implementation project(':photoview')
 
     implementation libs.libsignal.android
     implementation libs.google.protobuf.javalite
@@ -494,21 +510,17 @@ dependencies {
     implementation libs.emilsjolander.stickylistheaders
     implementation libs.jpardogo.materialtabstrip
     implementation libs.apache.httpclient.android
-    implementation libs.photoview
     implementation libs.glide.glide
     implementation libs.roundedimageview
     implementation libs.materialish.progress
     implementation libs.greenrobot.eventbus
     implementation libs.waitingdots
     implementation libs.google.zxing.android.integration
-    implementation libs.time.duration.picker
     implementation libs.google.zxing.core
+    implementation libs.google.flexbox
     implementation (libs.subsampling.scale.image.view) {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
-    implementation (libs.numberpickerview) {
-        exclude group: 'com.android.support', module: 'appcompat-v7'
-    }
     implementation (libs.android.tooltips) {
         exclude group: 'com.android.support', module: 'appcompat-v7'
     }
@@ -517,15 +529,9 @@ dependencies {
         exclude group: 'com.squareup.okhttp', module: 'okhttp-urlconnection'
     }
     implementation libs.stream
-    implementation (libs.colorpicker) {
-        exclude group: 'com.android.support', module: 'appcompat-v7'
-        exclude group: 'com.android.support', module: 'recyclerview-v7'
-    }
 
     implementation libs.lottie
 
-    implementation libs.stickyheadergrid
-
     implementation libs.signal.android.database.sqlcipher
     implementation libs.androidx.sqlite
 
@@ -552,6 +558,7 @@ dependencies {
         force = true
     }
     testImplementation testLibs.hamcrest.hamcrest
+    testImplementation testLibs.mockk
 
     testImplementation(testFixtures(project(":libsignal-service")))
 
@@ -562,6 +569,7 @@ dependencies {
     androidTestImplementation testLibs.androidx.test.ext.junit.ktx
     androidTestImplementation testLibs.mockito.android
     androidTestImplementation testLibs.mockito.kotlin
+    androidTestImplementation testLibs.mockk.android
     androidTestImplementation testLibs.square.okhttp.mockserver
 
     instrumentationImplementation (libs.androidx.fragment.testing) {
@@ -579,6 +587,9 @@ dependencies {
     implementation libs.rxdogtag
 
     androidTestUtil testLibs.androidx.test.orchestrator
+
+    implementation project(':core-ui')
+    ktlintRuleset libs.ktlint.twitter.compose
 }
 
 def getLastCommitTimestamp() {
@@ -587,7 +598,7 @@ def getLastCommitTimestamp() {
     }
 
     new ByteArrayOutputStream().withStream { os ->
-        def result = exec {
+        exec {
             executable = 'git'
             args = ['log', '-1', '--pretty=format:%ct']
             standardOutput = os
@@ -599,20 +610,20 @@ def getLastCommitTimestamp() {
 
 def getGitHash() {
     if (!(new File('.git').exists())) {
-        return "abcd1234"
+        throw new IllegalStateException("Must be a git repository to guarantee reproducible builds! (git hash is part of APK)")
     }
 
     def stdout = new ByteArrayOutputStream()
     exec {
-        commandLine 'git', 'rev-parse', '--short', 'HEAD'
+        commandLine 'git', 'rev-parse', 'HEAD'
         standardOutput = stdout
     }
-    return stdout.toString().trim()
+    return stdout.toString().trim().substring(0, 12)
 }
 
 def getCurrentGitTag() {
     if (!(new File('.git').exists())) {
-        return ''
+        throw new IllegalStateException("Must be a git repository to guarantee reproducible builds! (git hash is part of APK)")
     }
 
     def stdout = new ByteArrayOutputStream()
@@ -646,13 +657,13 @@ def loadKeystoreProperties(filename) {
     if (keystorePropertiesFile.exists()) {
         def keystoreProperties = new Properties()
         keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-        return keystoreProperties;
+        return keystoreProperties
     } else {
-        return null;
+        return null
     }
 }
 
-def getDateSuffix() {
+static def getDateSuffix() {
     def date = new Date()
     def formattedDate = date.format('yyyy-MM-dd-HH:mm')
     return formattedDate

app/proguard/proguard-mobilecoin.pro

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

app/src/androidTest/java/org/thoughtcrime/securesms/SignalInstrumentationApplicationContext.kt

@@ -1,15 +1,40 @@
 package org.thoughtcrime.securesms
 
+import org.signal.core.util.concurrent.SignalExecutors
+import org.signal.core.util.logging.AndroidLogger
+import org.signal.core.util.logging.Log
+import org.signal.libsignal.protocol.logging.SignalProtocolLoggerProvider
+import org.thoughtcrime.securesms.database.LogDatabase
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencyProvider
 import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
+import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger
+import org.thoughtcrime.securesms.logging.PersistentLogger
+import org.thoughtcrime.securesms.testing.InMemoryLogger
 
 /**
  * Application context for running instrumentation tests (aka androidTests).
  */
 class SignalInstrumentationApplicationContext : ApplicationContext() {
+
+  val inMemoryLogger: InMemoryLogger = InMemoryLogger()
+
   override fun initializeAppDependencies() {
     val default = ApplicationDependencyProvider(this)
     ApplicationDependencies.init(this, InstrumentationApplicationDependencyProvider(this, default))
+    ApplicationDependencies.getDeadlockDetector().start()
+  }
+
+  override fun initializeLogging() {
+    persistentLogger = PersistentLogger(this)
+
+    Log.initialize({ true }, AndroidLogger(), persistentLogger, inMemoryLogger)
+
+    SignalProtocolLoggerProvider.setProvider(CustomSignalProtocolLogger())
+
+    SignalExecutors.UNBOUNDED.execute {
+      Log.blockUntilAllWritesFinished()
+      LogDatabase.getInstance(this).trimToSize()
+    }
   }
 }

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

@@ -2,9 +2,11 @@ package org.thoughtcrime.securesms.components.settings.app.changenumber
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.FlakyTest
 import okhttp3.mockwebserver.MockResponse
 import org.junit.After
 import org.junit.Before
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -17,9 +19,10 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.pin.KbsRepository
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.registration.VerifyAccountRepository
-import org.thoughtcrime.securesms.registration.VerifyAccountResponseProcessor
+import org.thoughtcrime.securesms.registration.VerifyResponseProcessor
 import org.thoughtcrime.securesms.testing.Get
 import org.thoughtcrime.securesms.testing.MockProvider
+import org.thoughtcrime.securesms.testing.Post
 import org.thoughtcrime.securesms.testing.Put
 import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.thoughtcrime.securesms.testing.assertIs
@@ -80,8 +83,10 @@ class ChangeNumberViewModelTest {
     lateinit var setPreKeysRequest: PreKeyState
 
     InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
+      Post("/v1/verification/session") { MockResponse().success(MockProvider.sessionMetadataJson.copy(verified = false)) },
+      Put("/v1/verification/session/${MockProvider.sessionMetadataJson.id}/code") { MockResponse().success(MockProvider.sessionMetadataJson) },
       Get("/v1/devices") { MockResponse().success(MockProvider.primaryOnlyDeviceList) },
-      Put("/v1/accounts/number") { r ->
+      Put("/v2/accounts/number") { r ->
         changeNumberRequest = r.parsedRequestBody()
         MockResponse().success(MockProvider.createVerifyAccountResponse(aci, newPni))
       },
@@ -93,6 +98,7 @@ class ChangeNumberViewModelTest {
     )
 
     // WHEN
+    viewModel.requestVerificationCode(VerifyAccountRepository.Mode.SMS_WITHOUT_LISTENER, null, null).blockingGet().resultOrThrow
     viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet().resultOrThrow
 
     // THEN
@@ -110,12 +116,15 @@ class ChangeNumberViewModelTest {
     val oldE164 = Recipient.self().requireE164()
 
     InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
+      Post("/v1/verification/session") { MockResponse().success(MockProvider.sessionMetadataJson.copy(verified = false)) },
+      Put("/v1/verification/session/${MockProvider.sessionMetadataJson.id}/code") { MockResponse().success(MockProvider.sessionMetadataJson) },
       Get("/v1/devices") { MockResponse().success(MockProvider.primaryOnlyDeviceList) },
-      Put("/v1/accounts/number") { MockResponse().failure(500) },
+      Put("/v2/accounts/number") { MockResponse().failure(500) }
     )
 
     // WHEN
-    val processor: VerifyAccountResponseProcessor = viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet()
+    viewModel.requestVerificationCode(VerifyAccountRepository.Mode.SMS_WITHOUT_LISTENER, null, null).blockingGet().resultOrThrow
+    val processor: VerifyResponseProcessor = viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet()
 
     // THEN
     processor.isServerSentError() assertIs true
@@ -140,13 +149,16 @@ class ChangeNumberViewModelTest {
     val oldE164 = Recipient.self().requireE164()
 
     InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
+      Post("/v1/verification/session") { MockResponse().success(MockProvider.sessionMetadataJson.copy(verified = false)) },
+      Put("/v1/verification/session/${MockProvider.sessionMetadataJson.id}/code") { MockResponse().success(MockProvider.sessionMetadataJson) },
       Get("/v1/devices") { MockResponse().success(MockProvider.primaryOnlyDeviceList) },
-      Put("/v1/accounts/number") { MockResponse().connectionFailure() },
+      Put("/v2/accounts/number") { MockResponse().connectionFailure() },
       Get("/v1/accounts/whoami") { MockResponse().success(MockProvider.createWhoAmIResponse(aci, oldPni, oldE164)) }
     )
 
     // WHEN
-    val processor: VerifyAccountResponseProcessor = viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet()
+    viewModel.requestVerificationCode(VerifyAccountRepository.Mode.SMS_WITHOUT_LISTENER, null, null).blockingGet().resultOrThrow
+    val processor: VerifyResponseProcessor = viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet()
 
     // THEN
     processor.isServerSentError() assertIs false
@@ -166,6 +178,8 @@ class ChangeNumberViewModelTest {
    * and apply the pending state after confirming the change on the server.
    */
   @Test
+  @FlakyTest
+  @Ignore("Test sometimes requires manual intervention to continue.")
   fun testChangeNumber_givenNetworkFailedApiCallEnRouteToClient() {
     // GIVEN
     val aci = Recipient.self().requireServiceId()
@@ -177,8 +191,10 @@ class ChangeNumberViewModelTest {
     lateinit var setPreKeysRequest: PreKeyState
 
     InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
+      Post("/v1/verification/session") { MockResponse().success(MockProvider.sessionMetadataJson.copy(verified = false)) },
+      Put("/v1/verification/session/${MockProvider.sessionMetadataJson.id}/code") { MockResponse().success(MockProvider.sessionMetadataJson) },
       Get("/v1/devices") { MockResponse().success(MockProvider.primaryOnlyDeviceList) },
-      Put("/v1/accounts/number") { r ->
+      Put("/v2/accounts/number") { r ->
         changeNumberRequest = r.parsedRequestBody()
         MockResponse().timeout()
       },
@@ -191,7 +207,8 @@ class ChangeNumberViewModelTest {
     )
 
     // WHEN
-    val processor: VerifyAccountResponseProcessor = viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet()
+    viewModel.requestVerificationCode(VerifyAccountRepository.Mode.SMS_WITHOUT_LISTENER, null, null).blockingGet().resultOrThrow
+    val processor: VerifyResponseProcessor = viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet()
 
     // THEN
     processor.isServerSentError() assertIs false
@@ -221,8 +238,10 @@ class ChangeNumberViewModelTest {
     MockProvider.mockGetRegistrationLockStringFlow(kbsRepository)
 
     InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
+      Post("/v1/verification/session") { MockResponse().success(MockProvider.sessionMetadataJson.copy(verified = false)) },
+      Put("/v1/verification/session/${MockProvider.sessionMetadataJson.id}/code") { MockResponse().success(MockProvider.sessionMetadataJson) },
       Get("/v1/devices") { MockResponse().success(MockProvider.primaryOnlyDeviceList) },
-      Put("/v1/accounts/number") { r ->
+      Put("/v2/accounts/number") { r ->
         changeNumberRequest = r.parsedRequestBody()
         if (changeNumberRequest.registrationLock.isNullOrEmpty()) {
           MockResponse().failure(423, MockProvider.lockedFailure)
@@ -238,6 +257,7 @@ class ChangeNumberViewModelTest {
     )
 
     // WHEN
+    viewModel.requestVerificationCode(VerifyAccountRepository.Mode.SMS_WITHOUT_LISTENER, null, null).blockingGet().resultOrThrow
     viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet().also { processor ->
       processor.registrationLock() assertIs true
       Recipient.self().requirePni() assertIsNot newPni
@@ -259,8 +279,10 @@ class ChangeNumberViewModelTest {
     lateinit var setPreKeysRequest: PreKeyState
 
     InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
+      Post("/v1/verification/session") { MockResponse().success(MockProvider.sessionMetadataJson.copy(verified = false)) },
+      Put("/v1/verification/session/${MockProvider.sessionMetadataJson.id}/code") { MockResponse().success(MockProvider.sessionMetadataJson) },
       Get("/v1/devices") { MockResponse().success(MockProvider.primaryOnlyDeviceList) },
-      Put("/v1/accounts/number") { r ->
+      Put("/v2/accounts/number") { r ->
         changeNumberRequest = r.parsedRequestBody()
         if (changeNumberRequest.deviceMessages.isEmpty()) {
           MockResponse().failure(
@@ -285,6 +307,7 @@ class ChangeNumberViewModelTest {
     )
 
     // WHEN
+    viewModel.requestVerificationCode(VerifyAccountRepository.Mode.SMS_WITHOUT_LISTENER, null, null).blockingGet().resultOrThrow
     viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet().resultOrThrow
 
     // THEN
@@ -303,7 +326,9 @@ class ChangeNumberViewModelTest {
     MockProvider.mockGetRegistrationLockStringFlow(kbsRepository)
 
     InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Put("/v1/accounts/number") { r ->
+      Post("/v1/verification/session") { MockResponse().success(MockProvider.sessionMetadataJson.copy(verified = false)) },
+      Put("/v1/verification/session/${MockProvider.sessionMetadataJson.id}/code") { MockResponse().success(MockProvider.sessionMetadataJson) },
+      Put("/v2/accounts/number") { r ->
         changeNumberRequest = r.parsedRequestBody()
         if (changeNumberRequest.registrationLock.isNullOrEmpty()) {
           MockResponse().failure(423, MockProvider.lockedFailure)
@@ -341,6 +366,7 @@ class ChangeNumberViewModelTest {
     )
 
     // WHEN
+    viewModel.requestVerificationCode(VerifyAccountRepository.Mode.SMS_WITHOUT_LISTENER, null, null).blockingGet().resultOrThrow
     viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet().also { processor ->
       processor.registrationLock() assertIs true
       Recipient.self().requirePni() assertIsNot newPni

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

@@ -0,0 +1,154 @@
+package org.thoughtcrime.securesms.conversation
+
+import androidx.test.core.app.ActivityScenario
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Ignore
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.signal.core.util.ThreadUtil
+import org.thoughtcrime.securesms.attachments.PointerAttachment
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.mms.IncomingMediaMessage
+import org.thoughtcrime.securesms.mms.OutgoingMessage
+import org.thoughtcrime.securesms.profiles.ProfileName
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.releasechannel.ReleaseChannel
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId
+import java.util.Optional
+
+/**
+ * Helper test for rendering conversation items for preview.
+ */
+@RunWith(AndroidJUnit4::class)
+@Ignore("For testing/previewing manually, no assertions")
+class ConversationItemPreviewer {
+
+  @get:Rule
+  val harness = SignalActivityRule(othersCount = 10)
+
+  @Test
+  fun testShowLongName() {
+    val other: Recipient = Recipient.resolved(harness.others.first())
+
+    SignalDatabase.recipients.setProfileName(other.id, ProfileName.fromParts("Seef", "$$$"))
+
+    insertFailedMediaMessage(other = other, attachmentCount = 1)
+    insertFailedMediaMessage(other = other, attachmentCount = 2)
+    insertFailedMediaMessage(other = other, body = "Test", attachmentCount = 1)
+//    insertFailedOutgoingMediaMessage(other = other, body = "Test", attachmentCount = 1)
+//    insertMediaMessage(other = other)
+//    insertMediaMessage(other = other)
+//    insertMediaMessage(other = other)
+//    insertMediaMessage(other = other)
+//    insertMediaMessage(other = other)
+//    insertMediaMessage(other = other)
+//    insertMediaMessage(other = other)
+//    insertMediaMessage(other = other)
+//    insertMediaMessage(other = other)
+//    insertMediaMessage(other = other)
+
+    val scenario: ActivityScenario<ConversationActivity> = harness.launchActivity { putExtra("recipient_id", other.id.serialize()) }
+    scenario.onActivity {
+    }
+
+    // Uncomment to make dialog stay on screen, otherwise will show/dismiss immediately
+//    ThreadUtil.sleep(45000)
+  }
+
+  private fun insertMediaMessage(other: Recipient, body: String? = null, attachmentCount: Int = 1) {
+    val attachments: List<SignalServiceAttachmentPointer> = (0 until attachmentCount).map {
+      attachment()
+    }
+
+    val message = IncomingMediaMessage(
+      from = other.id,
+      body = body,
+      sentTimeMillis = System.currentTimeMillis(),
+      serverTimeMillis = System.currentTimeMillis(),
+      receivedTimeMillis = System.currentTimeMillis(),
+      attachments = PointerAttachment.forPointers(Optional.of(attachments))
+    )
+
+    SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get()
+
+    ThreadUtil.sleep(1)
+  }
+
+  private fun insertFailedMediaMessage(other: Recipient, body: String? = null, attachmentCount: Int = 1) {
+    val attachments: List<SignalServiceAttachmentPointer> = (0 until attachmentCount).map {
+      attachment()
+    }
+
+    val message = IncomingMediaMessage(
+      from = other.id,
+      body = body,
+      sentTimeMillis = System.currentTimeMillis(),
+      serverTimeMillis = System.currentTimeMillis(),
+      receivedTimeMillis = System.currentTimeMillis(),
+      attachments = PointerAttachment.forPointers(Optional.of(attachments))
+    )
+
+    val insert = SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get()
+
+    SignalDatabase.attachments.getAttachmentsForMessage(insert.messageId).forEachIndexed { index, attachment ->
+//      if (index != 1) {
+      SignalDatabase.attachments.setTransferProgressPermanentFailure(attachment.attachmentId, insert.messageId)
+//      } else {
+//        SignalDatabase.attachments.setTransferState(insert.messageId, attachment, TRANSFER_PROGRESS_STARTED)
+//      }
+    }
+
+    ThreadUtil.sleep(1)
+  }
+
+  private fun insertFailedOutgoingMediaMessage(other: Recipient, body: String? = null, attachmentCount: Int = 1) {
+    val attachments: List<SignalServiceAttachmentPointer> = (0 until attachmentCount).map {
+      attachment()
+    }
+
+    val message = OutgoingMessage(
+      recipient = other,
+      body = body,
+      attachments = PointerAttachment.forPointers(Optional.of(attachments)),
+      timestamp = System.currentTimeMillis(),
+      isSecure = true
+    )
+
+    val insert = SignalDatabase.messages.insertMessageOutbox(
+      message,
+      SignalDatabase.threads.getOrCreateThreadIdFor(other),
+      false,
+      null
+    )
+
+    SignalDatabase.attachments.getAttachmentsForMessage(insert).forEachIndexed { index, attachment ->
+      SignalDatabase.attachments.setTransferProgressPermanentFailure(attachment.attachmentId, insert)
+    }
+
+    ThreadUtil.sleep(1)
+  }
+
+  private fun attachment(): SignalServiceAttachmentPointer {
+    return SignalServiceAttachmentPointer(
+      ReleaseChannel.CDN_NUMBER,
+      SignalServiceAttachmentRemoteId.from(""),
+      "image/webp",
+      null,
+      Optional.empty(),
+      Optional.empty(),
+      1024,
+      1024,
+      Optional.empty(),
+      Optional.of("/not-there.jpg"),
+      false,
+      false,
+      false,
+      Optional.empty(),
+      Optional.empty(),
+      System.currentTimeMillis()
+    )
+  }
+}

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

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

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

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.database
 
 import android.net.Uri
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.FlakyTest
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
 import org.junit.Before
@@ -15,7 +16,7 @@ import org.thoughtcrime.securesms.util.MediaUtil
 import java.util.Optional
 
 @RunWith(AndroidJUnit4::class)
-class AttachmentDatabaseTest {
+class AttachmentTableTest {
 
   @Before
   fun setUp() {
@@ -34,12 +35,13 @@ class AttachmentDatabaseTest {
     assertEquals(attachment2.fileName, attachment.fileName)
   }
 
+  @FlakyTest
   @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 lowQualityImage = createAttachment(1, blob, AttachmentTable.TransformProperties.empty())
     val attachment = SignalDatabase.attachments.insertAttachmentForPreUpload(highQualityImage)
     val attachment2 = SignalDatabase.attachments.insertAttachmentForPreUpload(lowQualityImage)
 
@@ -55,12 +57,13 @@ class AttachmentDatabaseTest {
       false
     )
 
-    val attachment1Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment.attachmentId, AttachmentDatabase.DATA)
-    val attachment2Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment2.attachmentId, AttachmentDatabase.DATA)
+    val attachment1Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment.attachmentId, AttachmentTable.DATA)
+    val attachment2Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment2.attachmentId, AttachmentTable.DATA)
 
     assertNotEquals(attachment1Info, attachment2Info)
   }
 
+  @FlakyTest
   @Test
   fun givenIdenticalAttachmentsInsertedForPreUpload_whenIUpdateAttachmentDataAndSpecifyOnlyModifyThisAttachment_thenIExpectDifferentFileInfos() {
     val blob = BlobProvider.getInstance().forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory()
@@ -81,13 +84,13 @@ class AttachmentDatabaseTest {
       true
     )
 
-    val attachment1Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment.attachmentId, AttachmentDatabase.DATA)
-    val attachment2Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment2.attachmentId, AttachmentDatabase.DATA)
+    val attachment1Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment.attachmentId, AttachmentTable.DATA)
+    val attachment2Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment2.attachmentId, AttachmentTable.DATA)
 
     assertNotEquals(attachment1Info, attachment2Info)
   }
 
-  private fun createAttachment(id: Long, uri: Uri, transformProperties: AttachmentDatabase.TransformProperties): UriAttachment {
+  private fun createAttachment(id: Long, uri: Uri, transformProperties: AttachmentTable.TransformProperties): UriAttachment {
     return UriAttachmentBuilder.build(
       id,
       uri = uri,
@@ -96,8 +99,8 @@ class AttachmentDatabaseTest {
     )
   }
 
-  private fun createHighQualityTransformProperties(): AttachmentDatabase.TransformProperties {
-    return AttachmentDatabase.TransformProperties.forSentMediaQuality(Optional.empty(), SentMediaQuality.HIGH)
+  private fun createHighQualityTransformProperties(): AttachmentTable.TransformProperties {
+    return AttachmentTable.TransformProperties.forSentMediaQuality(Optional.empty(), SentMediaQuality.HIGH)
   }
 
   private fun createMediaStream(byteArray: ByteArray): MediaStream {

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

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

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

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

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

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

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

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

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

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

app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest_getAndPossiblyMergeLegacy.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_getAndPossiblyMergeLegacy {
-
-  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.getAndPossiblyMergeLegacy(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.getAndPossiblyMergeLegacy(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.getAndPossiblyMergeLegacy(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.getAndPossiblyMergeLegacy(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.getAndPossiblyMergeLegacy(ACI_A, E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(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.getAndPossiblyMergeLegacy(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.getAndPossiblyMergeLegacy(ACI_A, E164_A)
-    recipientDatabase.setPni(existingId, PNI_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(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.getAndPossiblyMergeLegacy(ACI_A, E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(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.getAndPossiblyMergeLegacy(ACI_A, E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(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.getAndPossiblyMergeLegacy(ACI_A, null)
-    val existingE164Id: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(null, E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(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()
-    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.getAndPossiblyMergeLegacy(ACI_A, E164_B)
-    val existingE164Id: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(null, E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(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.getAndPossiblyMergeLegacy(ACI_A, E164_B)
-    val existingId2: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_B, E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(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.getAndPossiblyMergeLegacy(ACI_A, E164_B)
-    val existingId2: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(null, E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(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.getAndPossiblyMergeLegacy(ACI_B, E164_A)
-    val existingId2: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(ACI_A, null)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(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.getAndPossiblyMergeLegacy(ACI_A, E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(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.getAndPossiblyMergeLegacy(ACI_A, E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(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.getAndPossiblyMergeLegacy(ACI_A, E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMergeLegacy(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.getAndPossiblyMergeLegacy(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.getAndPossiblyMergeLegacy(null, null, true)
-  }
-
-  private fun ensureDbEmpty() {
-    SignalDatabase.rawDatabase.rawQuery("SELECT COUNT(*) FROM ${RecipientDatabase.TABLE_NAME} WHERE ${RecipientDatabase.DISTRIBUTION_LIST_ID} IS NULL ", null).use { cursor ->
-      assertTrue(cursor.moveToFirst())
-      assertEquals(0, cursor.getLong(0))
-    }
-  }
-
-  private fun smsMessage(sender: RecipientId, time: Long = 0, body: String = "", groupId: Optional<GroupId> = Optional.empty()): IncomingTextMessage {
-    return IncomingTextMessage(sender, 1, time, time, time, body, groupId, 0, true, null)
-  }
-
-  private fun mmsMessage(sender: RecipientId, time: Long = 0, body: String = "", groupId: Optional<GroupId> = Optional.empty()): IncomingMediaMessage {
-    return IncomingMediaMessage(sender, groupId, body, time, time, time, emptyList(), 0, 0, false, false, true, Optional.empty())
-  }
-
-  private fun identityKey(value: Byte): IdentityKey {
-    val bytes = ByteArray(33)
-    bytes[0] = 0x05
-    bytes[1] = value
-    return IdentityKey(bytes)
-  }
-
-  private fun notificationProfile(name: String): NotificationProfile {
-    return (notificationProfileDatabase.createProfile(name = name, emoji = "", color = AvatarColor.A210, System.currentTimeMillis()) as NotificationProfileDatabase.NotificationProfileChangeResult.Success).notificationProfile
-  }
-
-  private fun groupMasterKey(value: Byte): GroupMasterKey {
-    val bytes = ByteArray(32)
-    bytes[0] = value
-    return GroupMasterKey(bytes)
-  }
-
-  private fun decryptedGroup(members: Collection<UUID>): DecryptedGroup {
-    return DecryptedGroup.newBuilder()
-      .addAllMembers(members.map { DecryptedMember.newBuilder().setUuid(UuidUtil.toByteString(it)).build() })
-      .build()
-  }
-
-  private fun getMention(messageId: Long): MentionModel {
-    SignalDatabase.rawDatabase.rawQuery("SELECT * FROM ${MentionDatabase.TABLE_NAME} WHERE ${MentionDatabase.MESSAGE_ID} = $messageId").use { cursor ->
-      cursor.moveToFirst()
-      return MentionModel(
-        recipientId = RecipientId.from(CursorUtil.requireLong(cursor, MentionDatabase.RECIPIENT_ID)),
-        threadId = CursorUtil.requireLong(cursor, MentionDatabase.THREAD_ID)
-      )
-    }
-  }
-
-  /** The normal mention model doesn't have a threadId, so we need to do it ourselves for the test */
-  data class MentionModel(
-    val recipientId: RecipientId,
-    val threadId: Long
-  )
-
-  private class ChangeNumberListener {
-
-    var numberChangeWasEnqueued = false
-      private set
-
-    fun waitForJobManager() {
-      ApplicationDependencies.getJobManager().flush()
-      ThreadUtil.sleep(500)
-    }
-
-    fun enqueue() {
-      ApplicationDependencies.getJobManager().addListener(
-        { job -> job.factoryKey == RecipientChangedNumberJob.KEY },
-        { _, _ -> numberChangeWasEnqueued = true }
-      )
-    }
-  }
-
-  companion object {
-    val ACI_A = ACI.from(UUID.fromString("3436efbe-5a76-47fa-a98a-7e72c948a82e"))
-    val ACI_B = ACI.from(UUID.fromString("8de7f691-0b60-4a68-9cd9-ed2f8453f9ed"))
-
-    val PNI_A = PNI.from(UUID.fromString("154b8d92-c960-4f6c-8385-671ad2ffb999"))
-    val PNI_B = PNI.from(UUID.fromString("ba92b1fb-cd55-40bf-adda-c35a85375533"))
-
-    const val E164_A = "+12221234567"
-    const val E164_B = "+13331234567"
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest_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"
-  }
-}

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

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

app/src/androidTest/java/org/thoughtcrime/securesms/database/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"
-  }
-}

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

@@ -11,9 +11,14 @@ import org.signal.core.util.CursorUtil
 import org.thoughtcrime.securesms.profiles.ProfileName
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.testing.SignalActivityRule
+import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.FeatureFlagsAccessor
+import org.whispersystems.signalservice.api.push.ACI
+import org.whispersystems.signalservice.api.push.PNI
+import java.util.UUID
 
 @RunWith(AndroidJUnit4::class)
-class RecipientDatabaseTest {
+class RecipientTableTest {
 
   @get:Rule
   val harness = SignalActivityRule()
@@ -38,7 +43,7 @@ class RecipientDatabaseTest {
     val results: MutableList<RecipientId> = SignalDatabase.recipients.getSignalContacts(false)?.use {
       val ids = mutableListOf<RecipientId>()
       while (it.moveToNext()) {
-        ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientDatabase.ID)))
+        ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientTable.ID)))
       }
 
       ids
@@ -79,7 +84,7 @@ class RecipientDatabaseTest {
     val results: MutableList<RecipientId> = SignalDatabase.recipients.getNonGroupContacts(false)?.use {
       val ids = mutableListOf<RecipientId>()
       while (it.moveToNext()) {
-        ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientDatabase.ID)))
+        ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientTable.ID)))
       }
 
       ids
@@ -109,7 +114,7 @@ class RecipientDatabaseTest {
     val results: MutableList<RecipientId> = SignalDatabase.recipients.getSignalContacts(false)?.use {
       val ids = mutableListOf<RecipientId>()
       while (it.moveToNext()) {
-        ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientDatabase.ID)))
+        ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientTable.ID)))
       }
 
       ids
@@ -150,7 +155,7 @@ class RecipientDatabaseTest {
     val results: MutableList<RecipientId> = SignalDatabase.recipients.getNonGroupContacts(false)?.use {
       val ids = mutableListOf<RecipientId>()
       while (it.moveToNext()) {
-        ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientDatabase.ID)))
+        ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientTable.ID)))
       }
 
       ids
@@ -159,4 +164,47 @@ class RecipientDatabaseTest {
     assertNotEquals(0, results.size)
     assertFalse(blockedRecipient in results)
   }
+
+  @Test
+  fun givenARecipientWithPniAndAci_whenIMarkItUnregistered_thenIExpectItToBeSplit() {
+    FeatureFlagsAccessor.forceValue(FeatureFlags.PHONE_NUMBER_PRIVACY, true)
+
+    val mainId = SignalDatabase.recipients.getAndPossiblyMerge(ACI_A, PNI_A, E164_A)
+
+    SignalDatabase.recipients.markUnregistered(mainId)
+
+    val byAci: RecipientId = SignalDatabase.recipients.getByServiceId(ACI_A).get()
+
+    val byE164: RecipientId = SignalDatabase.recipients.getByE164(E164_A).get()
+    val byPni: RecipientId = SignalDatabase.recipients.getByServiceId(PNI_A).get()
+
+    assertEquals(mainId, byAci)
+    assertEquals(byE164, byPni)
+    assertNotEquals(byAci, byE164)
+  }
+
+  @Test
+  fun givenARecipientWithPniAndAci_whenISplitItForStorageSync_thenIExpectItToBeSplit() {
+    FeatureFlagsAccessor.forceValue(FeatureFlags.PHONE_NUMBER_PRIVACY, true)
+
+    val mainId = SignalDatabase.recipients.getAndPossiblyMerge(ACI_A, PNI_A, E164_A)
+    val mainRecord = SignalDatabase.recipients.getRecord(mainId)
+
+    SignalDatabase.recipients.splitForStorageSync(mainRecord.storageId!!)
+
+    val byAci: RecipientId = SignalDatabase.recipients.getByServiceId(ACI_A).get()
+
+    val byE164: RecipientId = SignalDatabase.recipients.getByE164(E164_A).get()
+    val byPni: RecipientId = SignalDatabase.recipients.getByServiceId(PNI_A).get()
+
+    assertEquals(mainId, byAci)
+    assertEquals(byE164, byPni)
+    assertNotEquals(byAci, byE164)
+  }
+
+  companion object {
+    val ACI_A = ACI.from(UUID.fromString("aaaa0000-5a76-47fa-a98a-7e72c948a82e"))
+    val PNI_A = PNI.from(UUID.fromString("aaaa1111-c960-4f6c-8385-671ad2ffb999"))
+    const val E164_A = "+12222222222"
+  }
 }

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

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

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

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

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

@@ -6,13 +6,14 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.signal.core.util.CursorUtil
+import org.thoughtcrime.securesms.conversationlist.model.ConversationFilter
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.testing.SignalDatabaseRule
 import org.whispersystems.signalservice.api.push.ServiceId
 import java.util.UUID
 
 @Suppress("ClassName")
-class ThreadDatabaseTest_pinned {
+class ThreadTableTest_pinned {
 
   @Rule
   @JvmField
@@ -33,10 +34,10 @@ class ThreadDatabaseTest_pinned {
     SignalDatabase.threads.pinConversations(listOf(threadId))
 
     // WHEN
-    SignalDatabase.mms.deleteMessage(messageId)
+    SignalDatabase.messages.deleteMessage(messageId)
 
     // THEN
-    val pinned = SignalDatabase.threads.pinnedThreadIds
+    val pinned = SignalDatabase.threads.getPinnedThreadIds()
     assertTrue(threadId in pinned)
   }
 
@@ -48,10 +49,10 @@ class ThreadDatabaseTest_pinned {
     SignalDatabase.threads.pinConversations(listOf(threadId))
 
     // WHEN
-    SignalDatabase.mms.deleteMessage(messageId)
+    SignalDatabase.messages.deleteMessage(messageId)
 
     // THEN
-    val unarchivedCount = SignalDatabase.threads.unarchivedConversationListCount
+    val unarchivedCount = SignalDatabase.threads.getUnarchivedConversationListCount(ConversationFilter.OFF)
     assertEquals(1, unarchivedCount)
   }
 
@@ -63,12 +64,12 @@ class ThreadDatabaseTest_pinned {
     SignalDatabase.threads.pinConversations(listOf(threadId))
 
     // WHEN
-    SignalDatabase.mms.deleteMessage(messageId)
+    SignalDatabase.messages.deleteMessage(messageId)
 
     // THEN
-    SignalDatabase.threads.getUnarchivedConversationList(true, 0, 1).use {
+    SignalDatabase.threads.getUnarchivedConversationList(ConversationFilter.OFF, true, 0, 1).use {
       it.moveToFirst()
-      assertEquals(threadId, CursorUtil.requireLong(it, ThreadDatabase.ID))
+      assertEquals(threadId, CursorUtil.requireLong(it, ThreadTable.ID))
     }
   }
 }

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

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

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

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

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

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

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

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.dependencies
 
 import android.app.Application
 import okhttp3.ConnectionSpec
+import okhttp3.WebSocketListener
 import okhttp3.mockwebserver.Dispatcher
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
@@ -13,15 +14,17 @@ import org.thoughtcrime.securesms.BuildConfig
 import org.thoughtcrime.securesms.KbsEnclave
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess
 import org.thoughtcrime.securesms.push.SignalServiceTrustStore
+import org.thoughtcrime.securesms.recipients.LiveRecipientCache
+import org.thoughtcrime.securesms.testing.Get
 import org.thoughtcrime.securesms.testing.Verb
 import org.thoughtcrime.securesms.testing.runSync
+import org.thoughtcrime.securesms.testing.success
 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
@@ -41,11 +44,18 @@ class InstrumentationApplicationDependencyProvider(application: Application, def
   private val uncensoredConfiguration: SignalServiceConfiguration
   private val serviceNetworkAccessMock: SignalServiceNetworkAccess
   private val keyBackupService: KeyBackupService
+  private val recipientCache: LiveRecipientCache
 
   init {
     runSync {
       webServer = MockWebServer()
       baseUrl = webServer.url("").toString()
+
+      addMockWebRequestHandlers(
+        Get("/v1/websocket/") {
+          MockResponse().success().withWebSocketUpgrade(object : WebSocketListener() {})
+        }
+      )
     }
 
     webServer.setDispatcher(object : Dispatcher() {
@@ -64,7 +74,6 @@ class InstrumentationApplicationDependencyProvider(application: Application, def
         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)),
@@ -81,6 +90,8 @@ class InstrumentationApplicationDependencyProvider(application: Application, def
     }
 
     keyBackupService = mock()
+
+    recipientCache = LiveRecipientCache(application) { r -> r.run() }
   }
 
   override fun provideSignalServiceNetworkAccess(): SignalServiceNetworkAccess {
@@ -91,6 +102,10 @@ class InstrumentationApplicationDependencyProvider(application: Application, def
     return keyBackupService
   }
 
+  override fun provideRecipientCache(): LiveRecipientCache {
+    return recipientCache
+  }
+
   companion object {
     lateinit var webServer: MockWebServer
       private set

app/src/androidTest/java/org/thoughtcrime/securesms/jobs/PreKeysSyncJobTest.kt

@@ -69,7 +69,7 @@ class PreKeysSyncJobTest {
       Put("/v2/keys/signed?identity=pni") { r ->
         pniSignedPreKey = r.parsedRequestBody()
         MockResponse().success()
-      },
+      }
     )
 
     // WHEN
@@ -107,7 +107,7 @@ class PreKeysSyncJobTest {
 
     InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
       Get("/v2/keys?identity=aci") { MockResponse().success(PreKeyStatus(100)) },
-      Get("/v2/keys?identity=pni") { MockResponse().success(PreKeyStatus(100)) },
+      Get("/v2/keys?identity=pni") { MockResponse().success(PreKeyStatus(100)) }
     )
 
     // WHEN
@@ -134,7 +134,7 @@ class PreKeysSyncJobTest {
 
     InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
       Get("/v2/keys?identity=aci") { MockResponse().success(PreKeyStatus(100)) },
-      Put("/v2/keys/signed?identity=pni") { MockResponse().success() },
+      Put("/v2/keys/signed?identity=pni") { MockResponse().success() }
     )
 
     // WHEN
@@ -173,7 +173,7 @@ class PreKeysSyncJobTest {
       Put("/v2/keys/?identity=pni") { r ->
         pniPreKeyStateRequest = r.parsedRequestBody()
         MockResponse().success()
-      },
+      }
     )
 
     // WHEN

app/src/androidTest/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob__checkUsernameIsInSyncTest.kt

@@ -0,0 +1,175 @@
+package org.thoughtcrime.securesms.jobs
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import okhttp3.mockwebserver.MockResponse
+import org.junit.After
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.signal.libsignal.usernames.Username
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
+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.failure
+import org.thoughtcrime.securesms.testing.success
+import org.whispersystems.signalservice.internal.push.ReserveUsernameResponse
+import org.whispersystems.signalservice.internal.push.WhoAmIResponse
+import org.whispersystems.util.Base64UrlSafe
+
+@Suppress("ClassName")
+@RunWith(AndroidJUnit4::class)
+class RefreshOwnProfileJob__checkUsernameIsInSyncTest {
+
+  @get:Rule
+  val harness = SignalActivityRule()
+
+  @After
+  fun tearDown() {
+    InstrumentationApplicationDependencyProvider.clearHandlers()
+    SignalStore.phoneNumberPrivacy().clearUsernameOutOfSync()
+  }
+
+  @Test
+  fun givenNoLocalUsername_whenICheckUsernameIsInSync_thenIExpectNoFailures() {
+    // WHEN
+    RefreshOwnProfileJob.checkUsernameIsInSync()
+  }
+
+  @Test
+  fun givenLocalUsernameDoesNotMatchServerUsername_whenICheckUsernameIsInSync_thenIExpectRetry() {
+    // GIVEN
+    var didReserve = false
+    var didConfirm = false
+    val username = "hello.32"
+    val serverUsername = "hello.3232"
+    SignalDatabase.recipients.setUsername(harness.self.id, username)
+    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
+      Get("/v1/accounts/whoami") { r ->
+        MockResponse().success(
+          WhoAmIResponse().apply {
+            usernameHash = Base64UrlSafe.encodeBytesWithoutPadding(Username.hash(serverUsername))
+          }
+        )
+      },
+      Put("/v1/accounts/username_hash/reserve") { r ->
+        didReserve = true
+        MockResponse().success(ReserveUsernameResponse(Base64UrlSafe.encodeBytesWithoutPadding(Username.hash(username))))
+      },
+      Put("/v1/accounts/username_hash/confirm") { r ->
+        didConfirm = true
+        MockResponse().success()
+      }
+    )
+
+    // WHEN
+    RefreshOwnProfileJob.checkUsernameIsInSync()
+
+    // THEN
+    assertTrue(didReserve)
+    assertTrue(didConfirm)
+    assertFalse(SignalStore.phoneNumberPrivacy().isUsernameOutOfSync)
+  }
+
+  @Test
+  fun givenLocalAndNoServer_whenICheckUsernameIsInSync_thenIExpectRetry() {
+    // GIVEN
+    var didReserve = false
+    var didConfirm = false
+    val username = "hello.32"
+    SignalDatabase.recipients.setUsername(harness.self.id, username)
+    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
+      Get("/v1/accounts/whoami") { r ->
+        MockResponse().success(WhoAmIResponse())
+      },
+      Put("/v1/accounts/username_hash/reserve") { r ->
+        didReserve = true
+        MockResponse().success(ReserveUsernameResponse(Base64UrlSafe.encodeBytesWithoutPadding(Username.hash(username))))
+      },
+      Put("/v1/accounts/username_hash/confirm") { r ->
+        didConfirm = true
+        MockResponse().success()
+      }
+    )
+
+    // WHEN
+    RefreshOwnProfileJob.checkUsernameIsInSync()
+
+    // THEN
+    assertTrue(didReserve)
+    assertTrue(didConfirm)
+    assertFalse(SignalStore.phoneNumberPrivacy().isUsernameOutOfSync)
+  }
+
+  @Test
+  fun givenLocalAndServerMatch_whenICheckUsernameIsInSync_thenIExpectNoRetry() {
+    // GIVEN
+    var didReserve = false
+    var didConfirm = false
+    val username = "hello.32"
+    SignalDatabase.recipients.setUsername(harness.self.id, username)
+    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
+      Get("/v1/accounts/whoami") { r ->
+        MockResponse().success(
+          WhoAmIResponse().apply {
+            usernameHash = Base64UrlSafe.encodeBytesWithoutPadding(Username.hash(username))
+          }
+        )
+      },
+      Put("/v1/accounts/username_hash/reserve") { r ->
+        didReserve = true
+        MockResponse().success(ReserveUsernameResponse(Base64UrlSafe.encodeBytesWithoutPadding(Username.hash(username))))
+      },
+      Put("/v1/accounts/username_hash/confirm") { r ->
+        didConfirm = true
+        MockResponse().success()
+      }
+    )
+
+    // WHEN
+    RefreshOwnProfileJob.checkUsernameIsInSync()
+
+    // THEN
+    assertFalse(didReserve)
+    assertFalse(didConfirm)
+    assertFalse(SignalStore.phoneNumberPrivacy().isUsernameOutOfSync)
+  }
+
+  @Test
+  fun givenMismatchAndReservationFails_whenICheckUsernameIsInSync_thenIExpectNoConfirm() {
+    // GIVEN
+    var didReserve = false
+    var didConfirm = false
+    val username = "hello.32"
+    SignalDatabase.recipients.setUsername(harness.self.id, username)
+    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
+      Get("/v1/accounts/whoami") { r ->
+        MockResponse().success(
+          WhoAmIResponse().apply {
+            usernameHash = Base64UrlSafe.encodeBytesWithoutPadding(Username.hash("${username}23"))
+          }
+        )
+      },
+      Put("/v1/accounts/username_hash/reserve") { r ->
+        didReserve = true
+        MockResponse().failure(418)
+      },
+      Put("/v1/accounts/username_hash/confirm") { r ->
+        didConfirm = true
+        MockResponse().success()
+      }
+    )
+
+    // WHEN
+    RefreshOwnProfileJob.checkUsernameIsInSync()
+
+    // THEN
+    assertTrue(didReserve)
+    assertFalse(didConfirm)
+    assertTrue(SignalStore.phoneNumberPrivacy().isUsernameOutOfSync)
+  }
+}

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

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

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

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

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

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

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

@@ -0,0 +1,163 @@
+package org.thoughtcrime.securesms.messages
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import io.mockk.every
+import io.mockk.mockkStatic
+import io.mockk.unmockkStatic
+import org.junit.After
+import org.junit.Before
+import org.junit.Ignore
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.signal.core.util.logging.Log
+import org.signal.libsignal.protocol.ecc.Curve
+import org.signal.libsignal.protocol.ecc.ECKeyPair
+import org.signal.libsignal.zkgroup.profiles.ProfileKey
+import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.testing.AliceClient
+import org.thoughtcrime.securesms.testing.BobClient
+import org.thoughtcrime.securesms.testing.Entry
+import org.thoughtcrime.securesms.testing.FakeClientHelpers
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+import org.thoughtcrime.securesms.testing.awaitFor
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.Envelope
+import kotlin.time.Duration.Companion.minutes
+import kotlin.time.Duration.Companion.seconds
+import android.util.Log as AndroidLog
+
+/**
+ * Sends N messages from Bob to Alice to track performance of Alice's processing of messages.
+ */
+@Ignore("Ignore test in normal testing as it's a performance test with no assertions")
+@RunWith(AndroidJUnit4::class)
+class MessageProcessingPerformanceTest {
+
+  companion object {
+    private val TAG = Log.tag(MessageProcessingPerformanceTest::class.java)
+    private val TIMING_TAG = "TIMING_$TAG".substring(0..23)
+  }
+
+  @get:Rule
+  val harness = SignalActivityRule()
+
+  private val trustRoot: ECKeyPair = Curve.generateKeyPair()
+
+  @Before
+  fun setup() {
+    mockkStatic(UnidentifiedAccessUtil::class)
+    every { UnidentifiedAccessUtil.getCertificateValidator() } returns FakeClientHelpers.noOpCertificateValidator
+
+    mockkStatic(MessageContentProcessor::class)
+    every { MessageContentProcessor.create(harness.application) } returns TimingMessageContentProcessor(harness.application)
+  }
+
+  @After
+  fun after() {
+    unmockkStatic(UnidentifiedAccessUtil::class)
+    unmockkStatic(MessageContentProcessor::class)
+  }
+
+  @Test
+  fun testPerformance() {
+    val aliceClient = AliceClient(
+      serviceId = harness.self.requireServiceId(),
+      e164 = harness.self.requireE164(),
+      trustRoot = trustRoot
+    )
+
+    val bob = Recipient.resolved(harness.others[0])
+    val bobClient = BobClient(
+      serviceId = bob.requireServiceId(),
+      e164 = bob.requireE164(),
+      identityKeyPair = harness.othersKeys[0],
+      trustRoot = trustRoot,
+      profileKey = ProfileKey(bob.profileKey)
+    )
+
+    // Send message from Bob to Alice (self)
+
+    val firstPreKeyMessageTimestamp = System.currentTimeMillis()
+    val encryptedEnvelope = bobClient.encrypt(firstPreKeyMessageTimestamp)
+
+    val aliceProcessFirstMessageLatch = harness
+      .inMemoryLogger
+      .getLockForUntil(TimingMessageContentProcessor.endTagPredicate(firstPreKeyMessageTimestamp))
+
+    Thread { aliceClient.process(encryptedEnvelope, System.currentTimeMillis()) }.start()
+    aliceProcessFirstMessageLatch.awaitFor(15.seconds)
+
+    // Send message from Alice to Bob
+    val aliceNow = System.currentTimeMillis()
+    bobClient.decrypt(aliceClient.encrypt(aliceNow, bob), aliceNow)
+
+    // Build N messages from Bob to Alice
+
+    val messageCount = 100
+    val envelopes = ArrayList<Envelope>(messageCount)
+    var now = System.currentTimeMillis()
+    for (i in 0..messageCount) {
+      envelopes += bobClient.encrypt(now)
+      now += 3
+    }
+
+    val firstTimestamp = envelopes.first().timestamp
+    val lastTimestamp = envelopes.last().timestamp
+
+    // Alice processes N messages
+
+    val aliceProcessLastMessageLatch = harness
+      .inMemoryLogger
+      .getLockForUntil(TimingMessageContentProcessor.endTagPredicate(lastTimestamp))
+
+    Thread {
+      for (envelope in envelopes) {
+        Log.i(TIMING_TAG, "Retrieved envelope! ${envelope.timestamp}")
+        aliceClient.process(envelope, envelope.timestamp)
+      }
+    }.start()
+
+    // Wait for Alice to finish processing messages
+    aliceProcessLastMessageLatch.awaitFor(1.minutes)
+    harness.inMemoryLogger.flush()
+
+    // Process logs for timing data
+    val entries = harness.inMemoryLogger.entries()
+
+    // Calculate decryption average
+
+    val decrypts = entries
+      .filter { it.tag == AliceClient.TAG }
+      .drop(1)
+
+    val totalDecryptDuration = decrypts.sumOf { it.message!!.toLong() }
+
+    AndroidLog.w(TAG, "Decryption: Average runtime: ${totalDecryptDuration.toFloat() / decrypts.size.toFloat()}ms")
+
+    // Calculate MessageContentProcessor
+
+    val takeLast: List<Entry> = entries.filter { it.tag == TimingMessageContentProcessor.TAG }.drop(2)
+    val iterator = takeLast.iterator()
+    var processCount = 0L
+    var processDuration = 0L
+    while (iterator.hasNext()) {
+      val start = iterator.next()
+      val end = iterator.next()
+      processCount++
+      processDuration += end.timestamp - start.timestamp
+    }
+
+    AndroidLog.w(TAG, "MessageContentProcessor.process: Average runtime: ${processDuration.toFloat() / processCount.toFloat()}ms")
+
+    // Calculate messages per second from "retrieving" first message post session initialization to processing last message
+
+    val start = entries.first { it.message == "Retrieved envelope! $firstTimestamp" }
+    val end = entries.first { it.message == TimingMessageContentProcessor.endTag(lastTimestamp) }
+
+    val duration = (end.timestamp - start.timestamp).toFloat() / 1000f
+    val messagePerSecond = messageCount.toFloat() / duration
+
+    AndroidLog.w(TAG, "Processing $messageCount messages took ${duration}s or ${messagePerSecond}m/s")
+  }
+}

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

@@ -0,0 +1,25 @@
+package org.thoughtcrime.securesms.messages
+
+import android.content.Context
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.testing.LogPredicate
+import org.whispersystems.signalservice.api.messages.SignalServiceContent
+
+class TimingMessageContentProcessor(context: Context) : MessageContentProcessor(context) {
+  companion object {
+    val TAG = Log.tag(TimingMessageContentProcessor::class.java)
+
+    fun endTagPredicate(timestamp: Long): LogPredicate = { entry ->
+      entry.tag == TAG && entry.message == endTag(timestamp)
+    }
+
+    private fun startTag(timestamp: Long) = "$timestamp start"
+    fun endTag(timestamp: Long) = "$timestamp end"
+  }
+
+  override fun process(messageState: MessageState?, content: SignalServiceContent?, exceptionMetadata: ExceptionMetadata?, envelopeTimestamp: Long, smsMessageId: Long) {
+    Log.d(TAG, startTag(envelopeTimestamp))
+    super.process(messageState, content, exceptionMetadata, envelopeTimestamp, smsMessageId)
+    Log.d(TAG, endTag(envelopeTimestamp))
+  }
+}

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

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

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

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

app/src/androidTest/java/org/thoughtcrime/securesms/storage/ContactRecordProcessorTest.kt

@@ -0,0 +1,127 @@
+package org.thoughtcrime.securesms.storage
+
+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.signal.core.util.update
+import org.thoughtcrime.securesms.database.RecipientTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.util.Base64
+import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.FeatureFlagsAccessor
+import org.whispersystems.signalservice.api.push.ACI
+import org.whispersystems.signalservice.api.push.PNI
+import org.whispersystems.signalservice.api.storage.SignalContactRecord
+import org.whispersystems.signalservice.api.storage.StorageId
+import org.whispersystems.signalservice.internal.storage.protos.ContactRecord
+import java.util.UUID
+
+@RunWith(AndroidJUnit4::class)
+class ContactRecordProcessorTest {
+
+  @Before
+  fun setup() {
+    SignalStore.account().setE164(E164_SELF)
+    SignalStore.account().setAci(ACI_SELF)
+    SignalStore.account().setPni(PNI_SELF)
+    FeatureFlagsAccessor.forceValue(FeatureFlags.PHONE_NUMBER_PRIVACY, true)
+  }
+
+  @Test
+  fun process_splitContact_normalSplit() {
+    // GIVEN
+    val originalId = SignalDatabase.recipients.getAndPossiblyMerge(ACI_A, PNI_A, E164_A)
+    setStorageId(originalId, STORAGE_ID_A)
+
+    val remote1 = buildRecord(STORAGE_ID_B) {
+      setServiceId(ACI_A.toString())
+      setUnregisteredAtTimestamp(100)
+    }
+
+    val remote2 = buildRecord(STORAGE_ID_C) {
+      setServiceId(PNI_A.toString())
+      setServicePni(PNI_A.toString())
+      setServiceE164(E164_A)
+    }
+
+    // WHEN
+    val subject = ContactRecordProcessor()
+    subject.process(listOf(remote1, remote2), StorageSyncHelper.KEY_GENERATOR)
+
+    // THEN
+    val byAci: RecipientId = SignalDatabase.recipients.getByServiceId(ACI_A).get()
+
+    val byE164: RecipientId = SignalDatabase.recipients.getByE164(E164_A).get()
+    val byPni: RecipientId = SignalDatabase.recipients.getByServiceId(PNI_A).get()
+
+    assertEquals(originalId, byAci)
+    assertEquals(byE164, byPni)
+    assertNotEquals(byAci, byE164)
+  }
+
+  @Test
+  fun process_splitContact_doNotSplitIfAciRecordIsRegistered() {
+    // GIVEN
+    val originalId = SignalDatabase.recipients.getAndPossiblyMerge(ACI_A, PNI_A, E164_A)
+    setStorageId(originalId, STORAGE_ID_A)
+
+    val remote1 = buildRecord(STORAGE_ID_B) {
+      setServiceId(ACI_A.toString())
+      setUnregisteredAtTimestamp(0)
+    }
+
+    val remote2 = buildRecord(STORAGE_ID_C) {
+      setServiceId(PNI_A.toString())
+      setServicePni(PNI_A.toString())
+      setServiceE164(E164_A)
+    }
+
+    // WHEN
+    val subject = ContactRecordProcessor()
+    subject.process(listOf(remote1, remote2), StorageSyncHelper.KEY_GENERATOR)
+
+    // THEN
+    val byAci: RecipientId = SignalDatabase.recipients.getByServiceId(ACI_A).get()
+    val byE164: RecipientId = SignalDatabase.recipients.getByE164(E164_A).get()
+    val byPni: RecipientId = SignalDatabase.recipients.getByPni(PNI_A).get()
+
+    assertEquals(originalId, byAci)
+    assertEquals(byE164, byPni)
+    assertEquals(byAci, byE164)
+  }
+
+  private fun buildRecord(id: StorageId, applyParams: ContactRecord.Builder.() -> ContactRecord.Builder): SignalContactRecord {
+    return SignalContactRecord(id, ContactRecord.getDefaultInstance().toBuilder().applyParams().build())
+  }
+
+  private fun setStorageId(recipientId: RecipientId, storageId: StorageId) {
+    SignalDatabase.rawDatabase
+      .update(RecipientTable.TABLE_NAME)
+      .values(RecipientTable.STORAGE_SERVICE_ID to Base64.encodeBytes(storageId.raw))
+      .where("${RecipientTable.ID} = ?", recipientId)
+      .run()
+  }
+
+  companion object {
+    val ACI_A = ACI.from(UUID.fromString("aaaa0000-5a76-47fa-a98a-7e72c948a82e"))
+    val ACI_B = ACI.from(UUID.fromString("bbbb0000-0b60-4a68-9cd9-ed2f8453f9ed"))
+    val ACI_SELF = ACI.from(UUID.fromString("77770000-b477-4f35-a824-d92987a63641"))
+
+    val PNI_A = PNI.from(UUID.fromString("aaaa1111-c960-4f6c-8385-671ad2ffb999"))
+    val PNI_B = PNI.from(UUID.fromString("bbbb1111-cd55-40bf-adda-c35a85375533"))
+    val PNI_SELF = PNI.from(UUID.fromString("77771111-b014-41fb-bf73-05cb2ec52910"))
+
+    const val E164_A = "+12222222222"
+    const val E164_B = "+13333333333"
+    const val E164_SELF = "+10000000000"
+
+    val STORAGE_ID_A: StorageId = StorageId.forContact(byteArrayOf(1, 2, 3, 4))
+    val STORAGE_ID_B: StorageId = StorageId.forContact(byteArrayOf(5, 6, 7, 8))
+    val STORAGE_ID_C: StorageId = StorageId.forContact(byteArrayOf(9, 10, 11, 12))
+  }
+}

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

@@ -0,0 +1,52 @@
+package org.thoughtcrime.securesms.testing
+
+import org.signal.core.util.logging.Log
+import org.signal.libsignal.protocol.ecc.ECKeyPair
+import org.signal.libsignal.zkgroup.profiles.ProfileKey
+import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.testing.FakeClientHelpers.toEnvelope
+import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.api.push.SignalServiceAddress
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.Envelope
+
+/**
+ * Welcome to Alice's Client.
+ *
+ * Alice represent the Android instrumentation test user. Unlike [BobClient] much less is needed here
+ * as it can make use of the standard Signal Android App infrastructure.
+ */
+class AliceClient(val serviceId: ServiceId, val e164: String, val trustRoot: ECKeyPair) {
+
+  companion object {
+    val TAG = Log.tag(AliceClient::class.java)
+  }
+
+  private val aliceSenderCertificate = FakeClientHelpers.createCertificateFor(
+    trustRoot = trustRoot,
+    uuid = serviceId.uuid(),
+    e164 = e164,
+    deviceId = 1,
+    identityKey = SignalStore.account().aciIdentityKey.publicKey.publicKey,
+    expires = 31337
+  )
+
+  fun process(envelope: Envelope, serverDeliveredTimestamp: Long) {
+    val start = System.currentTimeMillis()
+    ApplicationDependencies.getIncomingMessageObserver().processEnvelope(envelope, serverDeliveredTimestamp)
+    val end = System.currentTimeMillis()
+    Log.d(TAG, "${end - start}")
+  }
+
+  fun encrypt(now: Long, destination: Recipient): Envelope {
+    return ApplicationDependencies.getSignalServiceMessageSender().getEncryptedMessage(
+      SignalServiceAddress(destination.requireServiceId(), destination.requireE164()),
+      FakeClientHelpers.getTargetUnidentifiedAccess(ProfileKeyUtil.getSelfProfileKey(), ProfileKey(destination.profileKey), aliceSenderCertificate),
+      1,
+      FakeClientHelpers.encryptedTextMessage(now),
+      false
+    ).toEnvelope(now, destination.requireServiceId())
+  }
+}

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

@@ -0,0 +1,167 @@
+package org.thoughtcrime.securesms.testing
+
+import org.signal.core.util.readToSingleInt
+import org.signal.core.util.select
+import org.signal.libsignal.protocol.IdentityKey
+import org.signal.libsignal.protocol.IdentityKeyPair
+import org.signal.libsignal.protocol.SessionBuilder
+import org.signal.libsignal.protocol.SignalProtocolAddress
+import org.signal.libsignal.protocol.ecc.ECKeyPair
+import org.signal.libsignal.protocol.groups.state.SenderKeyRecord
+import org.signal.libsignal.protocol.state.IdentityKeyStore
+import org.signal.libsignal.protocol.state.PreKeyBundle
+import org.signal.libsignal.protocol.state.PreKeyRecord
+import org.signal.libsignal.protocol.state.SessionRecord
+import org.signal.libsignal.protocol.state.SignedPreKeyRecord
+import org.signal.libsignal.protocol.util.KeyHelper
+import org.signal.libsignal.zkgroup.profiles.ProfileKey
+import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
+import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil
+import org.thoughtcrime.securesms.database.OneTimePreKeyTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.SignedPreKeyTable
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.testing.FakeClientHelpers.toEnvelope
+import org.whispersystems.signalservice.api.SignalServiceAccountDataStore
+import org.whispersystems.signalservice.api.SignalSessionLock
+import org.whispersystems.signalservice.api.crypto.SignalServiceCipher
+import org.whispersystems.signalservice.api.crypto.SignalSessionBuilder
+import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess
+import org.whispersystems.signalservice.api.push.DistributionId
+import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.api.push.SignalServiceAddress
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos
+import java.util.Optional
+import java.util.UUID
+import java.util.concurrent.locks.ReentrantLock
+
+/**
+ * Welcome to Bob's Client.
+ *
+ * Bob is a "fake" client that can start a session with the Android instrumentation test user (Alice).
+ *
+ * Bob can create a new session using a prekey bundle created from Alice's prekeys, send a message, decrypt
+ * a return message from Alice, and that'll start a standard Signal session with normal keys/ratcheting.
+ */
+class BobClient(val serviceId: ServiceId, val e164: String, val identityKeyPair: IdentityKeyPair, val trustRoot: ECKeyPair, val profileKey: ProfileKey) {
+
+  private val serviceAddress = SignalServiceAddress(serviceId, e164)
+  private val registrationId = KeyHelper.generateRegistrationId(false)
+  private val aciStore = BobSignalServiceAccountDataStore(registrationId, identityKeyPair)
+  private val senderCertificate = FakeClientHelpers.createCertificateFor(trustRoot, serviceId.uuid(), e164, 1, identityKeyPair.publicKey.publicKey, 31337)
+  private val sessionLock = object : SignalSessionLock {
+    private val lock = ReentrantLock()
+
+    override fun acquire(): SignalSessionLock.Lock {
+      lock.lock()
+      return SignalSessionLock.Lock { lock.unlock() }
+    }
+  }
+
+  /** Inspired by SignalServiceMessageSender#getEncryptedMessage */
+  fun encrypt(now: Long): SignalServiceProtos.Envelope {
+    val envelopeContent = FakeClientHelpers.encryptedTextMessage(now)
+
+    val cipher = SignalServiceCipher(serviceAddress, 1, aciStore, sessionLock, null)
+
+    if (!aciStore.containsSession(getAliceProtocolAddress())) {
+      val sessionBuilder = SignalSessionBuilder(sessionLock, SessionBuilder(aciStore, getAliceProtocolAddress()))
+      sessionBuilder.process(getAlicePreKeyBundle())
+    }
+
+    return cipher.encrypt(getAliceProtocolAddress(), getAliceUnidentifiedAccess(), envelopeContent)
+      .toEnvelope(envelopeContent.content.get().dataMessage.timestamp, getAliceServiceId())
+  }
+
+  fun decrypt(envelope: SignalServiceProtos.Envelope, serverDeliveredTimestamp: Long) {
+    val cipher = SignalServiceCipher(serviceAddress, 1, aciStore, sessionLock, UnidentifiedAccessUtil.getCertificateValidator())
+    cipher.decrypt(envelope, serverDeliveredTimestamp)
+  }
+
+  private fun getAliceServiceId(): ServiceId {
+    return SignalStore.account().requireAci()
+  }
+
+  private fun getAlicePreKeyBundle(): PreKeyBundle {
+    val selfPreKeyId = SignalDatabase.rawDatabase
+      .select(OneTimePreKeyTable.KEY_ID)
+      .from(OneTimePreKeyTable.TABLE_NAME)
+      .where("${OneTimePreKeyTable.ACCOUNT_ID} = ?", getAliceServiceId().toString())
+      .run()
+      .readToSingleInt(-1)
+
+    val selfPreKeyRecord = SignalDatabase.oneTimePreKeys.get(getAliceServiceId(), selfPreKeyId)!!
+
+    val selfSignedPreKeyId = SignalDatabase.rawDatabase
+      .select(SignedPreKeyTable.KEY_ID)
+      .from(SignedPreKeyTable.TABLE_NAME)
+      .where("${SignedPreKeyTable.ACCOUNT_ID} = ?", getAliceServiceId().toString())
+      .run()
+      .readToSingleInt(-1)
+
+    val selfSignedPreKeyRecord = SignalDatabase.signedPreKeys.get(getAliceServiceId(), selfSignedPreKeyId)!!
+
+    return PreKeyBundle(
+      SignalStore.account().registrationId,
+      1,
+      selfPreKeyId,
+      selfPreKeyRecord.keyPair.publicKey,
+      selfSignedPreKeyId,
+      selfSignedPreKeyRecord.keyPair.publicKey,
+      selfSignedPreKeyRecord.signature,
+      getAlicePublicKey()
+    )
+  }
+
+  private fun getAliceProtocolAddress(): SignalProtocolAddress {
+    return SignalProtocolAddress(SignalStore.account().requireAci().toString(), 1)
+  }
+
+  private fun getAlicePublicKey(): IdentityKey {
+    return SignalStore.account().aciIdentityKey.publicKey
+  }
+
+  private fun getAliceProfileKey(): ProfileKey {
+    return ProfileKeyUtil.getSelfProfileKey()
+  }
+
+  private fun getAliceUnidentifiedAccess(): Optional<UnidentifiedAccess> {
+    return FakeClientHelpers.getTargetUnidentifiedAccess(profileKey, getAliceProfileKey(), senderCertificate)
+  }
+
+  private class BobSignalServiceAccountDataStore(private val registrationId: Int, private val identityKeyPair: IdentityKeyPair) : SignalServiceAccountDataStore {
+    private var aliceSessionRecord: SessionRecord? = null
+
+    override fun getIdentityKeyPair(): IdentityKeyPair = identityKeyPair
+
+    override fun getLocalRegistrationId(): Int = registrationId
+    override fun isTrustedIdentity(address: SignalProtocolAddress?, identityKey: IdentityKey?, direction: IdentityKeyStore.Direction?): Boolean = true
+    override fun loadSession(address: SignalProtocolAddress?): SessionRecord = aliceSessionRecord ?: SessionRecord()
+    override fun saveIdentity(address: SignalProtocolAddress?, identityKey: IdentityKey?): Boolean = false
+    override fun storeSession(address: SignalProtocolAddress?, record: SessionRecord?) { aliceSessionRecord = record }
+    override fun getSubDeviceSessions(name: String?): List<Int> = emptyList()
+    override fun containsSession(address: SignalProtocolAddress?): Boolean = aliceSessionRecord != null
+    override fun getIdentity(address: SignalProtocolAddress?): IdentityKey = SignalStore.account().aciIdentityKey.publicKey
+
+    override fun loadPreKey(preKeyId: Int): PreKeyRecord = throw UnsupportedOperationException()
+    override fun storePreKey(preKeyId: Int, record: PreKeyRecord?) = throw UnsupportedOperationException()
+    override fun containsPreKey(preKeyId: Int): Boolean = throw UnsupportedOperationException()
+    override fun removePreKey(preKeyId: Int) = throw UnsupportedOperationException()
+    override fun loadExistingSessions(addresses: MutableList<SignalProtocolAddress>?): MutableList<SessionRecord> = throw UnsupportedOperationException()
+    override fun deleteSession(address: SignalProtocolAddress?) = throw UnsupportedOperationException()
+    override fun deleteAllSessions(name: String?) = throw UnsupportedOperationException()
+    override fun loadSignedPreKey(signedPreKeyId: Int): SignedPreKeyRecord = throw UnsupportedOperationException()
+    override fun loadSignedPreKeys(): MutableList<SignedPreKeyRecord> = throw UnsupportedOperationException()
+    override fun storeSignedPreKey(signedPreKeyId: Int, record: SignedPreKeyRecord?) = throw UnsupportedOperationException()
+    override fun containsSignedPreKey(signedPreKeyId: Int): Boolean = throw UnsupportedOperationException()
+    override fun removeSignedPreKey(signedPreKeyId: Int) = throw UnsupportedOperationException()
+    override fun storeSenderKey(sender: SignalProtocolAddress?, distributionId: UUID?, record: SenderKeyRecord?) = throw UnsupportedOperationException()
+    override fun loadSenderKey(sender: SignalProtocolAddress?, distributionId: UUID?): SenderKeyRecord = throw UnsupportedOperationException()
+    override fun archiveSession(address: SignalProtocolAddress?) = throw UnsupportedOperationException()
+    override fun getAllAddressesWithActiveSessions(addressNames: MutableList<String>?): MutableSet<SignalProtocolAddress> = throw UnsupportedOperationException()
+    override fun getSenderKeySharedWith(distributionId: DistributionId?): MutableSet<SignalProtocolAddress> = throw UnsupportedOperationException()
+    override fun markSenderKeySharedWith(distributionId: DistributionId?, addresses: MutableCollection<SignalProtocolAddress>?) = throw UnsupportedOperationException()
+    override fun clearSenderKeySharedWith(addresses: MutableCollection<SignalProtocolAddress>?) = throw UnsupportedOperationException()
+    override fun isMultiDevice(): Boolean = throw UnsupportedOperationException()
+  }
+}

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

@@ -0,0 +1,79 @@
+package org.thoughtcrime.securesms.testing
+
+import org.signal.libsignal.internal.Native
+import org.signal.libsignal.internal.NativeHandleGuard
+import org.signal.libsignal.metadata.certificate.CertificateValidator
+import org.signal.libsignal.metadata.certificate.SenderCertificate
+import org.signal.libsignal.metadata.certificate.ServerCertificate
+import org.signal.libsignal.protocol.ecc.Curve
+import org.signal.libsignal.protocol.ecc.ECKeyPair
+import org.signal.libsignal.protocol.ecc.ECPublicKey
+import org.signal.libsignal.zkgroup.profiles.ProfileKey
+import org.thoughtcrime.securesms.database.model.toProtoByteString
+import org.whispersystems.signalservice.api.crypto.ContentHint
+import org.whispersystems.signalservice.api.crypto.EnvelopeContent
+import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess
+import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair
+import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.internal.push.OutgoingPushMessage
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.Envelope
+import org.whispersystems.util.Base64
+import java.util.Optional
+import java.util.UUID
+
+object FakeClientHelpers {
+
+  val noOpCertificateValidator = object : CertificateValidator(null) {
+    override fun validate(certificate: SenderCertificate, validationTime: Long) = Unit
+  }
+
+  fun createCertificateFor(trustRoot: ECKeyPair, uuid: UUID, e164: String, deviceId: Int, identityKey: ECPublicKey, expires: Long): SenderCertificate {
+    val serverKey: ECKeyPair = Curve.generateKeyPair()
+    NativeHandleGuard(serverKey.publicKey).use { serverPublicGuard ->
+      NativeHandleGuard(trustRoot.privateKey).use { trustRootPrivateGuard ->
+        val serverCertificate = ServerCertificate(Native.ServerCertificate_New(1, serverPublicGuard.nativeHandle(), trustRootPrivateGuard.nativeHandle()))
+        NativeHandleGuard(identityKey).use { identityGuard ->
+          NativeHandleGuard(serverCertificate).use { serverCertificateGuard ->
+            NativeHandleGuard(serverKey.privateKey).use { serverPrivateGuard ->
+              return SenderCertificate(Native.SenderCertificate_New(uuid.toString(), e164, deviceId, identityGuard.nativeHandle(), expires, serverCertificateGuard.nativeHandle(), serverPrivateGuard.nativeHandle()))
+            }
+          }
+        }
+      }
+    }
+  }
+
+  fun getTargetUnidentifiedAccess(myProfileKey: ProfileKey, theirProfileKey: ProfileKey, senderCertificate: SenderCertificate): Optional<UnidentifiedAccess> {
+    val selfUnidentifiedAccessKey = UnidentifiedAccess.deriveAccessKeyFrom(myProfileKey)
+    val themUnidentifiedAccessKey = UnidentifiedAccess.deriveAccessKeyFrom(theirProfileKey)
+
+    return UnidentifiedAccessPair(UnidentifiedAccess(selfUnidentifiedAccessKey, senderCertificate.serialized), UnidentifiedAccess(themUnidentifiedAccessKey, senderCertificate.serialized)).targetUnidentifiedAccess
+  }
+
+  fun encryptedTextMessage(now: Long, message: String = "Test body message"): EnvelopeContent {
+    val content = SignalServiceProtos.Content.newBuilder().apply {
+      setDataMessage(
+        SignalServiceProtos.DataMessage.newBuilder().apply {
+          body = message
+          timestamp = now
+        }
+      )
+    }
+    return EnvelopeContent.encrypted(content.build(), ContentHint.RESENDABLE, Optional.empty())
+  }
+
+  fun OutgoingPushMessage.toEnvelope(timestamp: Long, destination: ServiceId): Envelope {
+    return Envelope.newBuilder()
+      .setType(Envelope.Type.valueOf(this.type))
+      .setSourceDevice(1)
+      .setTimestamp(timestamp)
+      .setServerTimestamp(timestamp + 1)
+      .setDestinationUuid(destination.toString())
+      .setServerGuid(UUID.randomUUID().toString())
+      .setContent(Base64.decode(this.content).toProtoByteString())
+      .setUrgent(true)
+      .setStory(false)
+      .build()
+  }
+}

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

@@ -0,0 +1,86 @@
+package org.thoughtcrime.securesms.testing
+
+import org.signal.core.util.concurrent.SignalExecutors
+import org.signal.core.util.logging.Log
+import java.util.concurrent.CountDownLatch
+
+typealias LogPredicate = (Entry) -> Boolean
+
+/**
+ * Logging implementation that holds logs in memory as they are added to be retrieve at a later time by a test.
+ * Can also be used for multithreaded synchronization and waiting until certain logs are emitted before continuing
+ * a test.
+ */
+class InMemoryLogger : Log.Logger() {
+
+  private val executor = SignalExecutors.newCachedSingleThreadExecutor("inmemory-logger")
+  private val predicates = mutableListOf<LogPredicate>()
+  private val logEntries = mutableListOf<Entry>()
+
+  override fun v(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) = add(Verbose(tag, message, t, System.currentTimeMillis()))
+  override fun d(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) = add(Debug(tag, message, t, System.currentTimeMillis()))
+  override fun i(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) = add(Info(tag, message, t, System.currentTimeMillis()))
+  override fun w(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) = add(Warn(tag, message, t, System.currentTimeMillis()))
+  override fun e(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) = add(Error(tag, message, t, System.currentTimeMillis()))
+
+  override fun flush() {
+    val latch = CountDownLatch(1)
+    executor.execute { latch.countDown() }
+    latch.await()
+  }
+
+  private fun add(entry: Entry) {
+    executor.execute {
+      logEntries += entry
+
+      val iterator = predicates.iterator()
+      while (iterator.hasNext()) {
+        val predicate = iterator.next()
+        if (predicate(entry)) {
+          iterator.remove()
+        }
+      }
+    }
+  }
+
+  /** Blocks until a snapshot of all log entries can be taken in a thread-safe way. */
+  fun entries(): List<Entry> {
+    val latch = CountDownLatch(1)
+    var entries: List<Entry> = emptyList()
+    executor.execute {
+      entries = logEntries.toList()
+      latch.countDown()
+    }
+    latch.await()
+    return entries
+  }
+
+  /** Returns a countdown latch that'll fire at a future point when an [Entry] is received that matches the predicate. */
+  fun getLockForUntil(predicate: LogPredicate): CountDownLatch {
+    val latch = CountDownLatch(1)
+    executor.execute {
+      predicates += { entry ->
+        if (predicate(entry)) {
+          latch.countDown()
+          true
+        } else {
+          false
+        }
+      }
+    }
+    return latch
+  }
+}
+
+sealed interface Entry {
+  val tag: String
+  val message: String?
+  val throwable: Throwable?
+  val timestamp: Long
+}
+
+data class Verbose(override val tag: String, override val message: String?, override val throwable: Throwable?, override val timestamp: Long) : Entry
+data class Debug(override val tag: String, override val message: String?, override val throwable: Throwable?, override val timestamp: Long) : Entry
+data class Info(override val tag: String, override val message: String?, override val throwable: Throwable?, override val timestamp: Long) : Entry
+data class Warn(override val tag: String, override val message: String?, override val throwable: Throwable?, override val timestamp: Long) : Entry
+data class Error(override val tag: String, override val message: String?, override val throwable: Throwable?, override val timestamp: Long) : Entry

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

@@ -32,6 +32,7 @@ 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.RegistrationSessionMetadataJson
 import org.whispersystems.signalservice.internal.push.SenderCertificate
 import org.whispersystems.signalservice.internal.push.VerifyAccountResponse
 import org.whispersystems.signalservice.internal.push.WhoAmIResponse
@@ -56,6 +57,16 @@ object MockProvider {
     )
   }
 
+  val sessionMetadataJson = RegistrationSessionMetadataJson(
+    id = "asdfasdfasdfasdf",
+    nextCall = null,
+    nextSms = null,
+    nextVerificationAttempt = null,
+    allowedToRequestCode = true,
+    requestedInformation = emptyList(),
+    verified = true
+  )
+
   fun createVerifyAccountResponse(aci: ServiceId, newPni: ServiceId): VerifyAccountResponse {
     return VerifyAccountResponse().apply {
       uuid = aci.toString()
@@ -81,7 +92,7 @@ object MockProvider {
     }
 
     kbsRepository.stub {
-      on { getToken(any() as String) } doReturn Single.just(ServiceResponse.forResult(tokenData, 200, ""))
+      on { getToken(any() as? String) } doReturn Single.just(ServiceResponse.forResult(tokenData, 200, ""))
     }
 
     val session: KeyBackupService.RestoreSession = object : KeyBackupService.RestoreSession {

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

@@ -17,6 +17,8 @@ class Get(path: String, responseFactory: ResponseFactory) : Verb("GET", path, re
 
 class Put(path: String, responseFactory: ResponseFactory) : Verb("PUT", path, responseFactory)
 
+class Post(path: String, responseFactory: ResponseFactory) : Verb("POST", path, responseFactory)
+
 fun MockResponse.success(response: Any? = null): MockResponse {
   return setResponseCode(200).apply {
     if (response != null) {

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

@@ -13,7 +13,7 @@ class RxTestSchedulerRule(
   val ioTestScheduler: TestScheduler = defaultTestScheduler,
   val computationTestScheduler: TestScheduler = defaultTestScheduler,
   val singleTestScheduler: TestScheduler = defaultTestScheduler,
-  val newThreadTestScheduler: TestScheduler = defaultTestScheduler,
+  val newThreadTestScheduler: TestScheduler = defaultTestScheduler
 ) : ExternalResource() {
 
   override fun before() {

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

@@ -11,22 +11,24 @@ 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.IdentityKeyPair
 import org.signal.libsignal.protocol.SignalProtocolAddress
+import org.thoughtcrime.securesms.SignalInstrumentationApplicationContext
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
-import org.thoughtcrime.securesms.database.IdentityDatabase
+import org.thoughtcrime.securesms.database.IdentityTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.net.DeviceTransferBlockingInterceptor
 import org.thoughtcrime.securesms.profiles.ProfileName
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.registration.RegistrationData
 import org.thoughtcrime.securesms.registration.RegistrationRepository
 import org.thoughtcrime.securesms.registration.RegistrationUtil
+import org.thoughtcrime.securesms.registration.VerifyResponse
 import org.thoughtcrime.securesms.util.Util
 import org.whispersystems.signalservice.api.profiles.SignalServiceProfile
 import org.whispersystems.signalservice.api.push.ACI
@@ -53,18 +55,23 @@ class SignalActivityRule(private val othersCount: Int = 4) : ExternalResource()
     private set
   lateinit var others: List<RecipientId>
     private set
+  lateinit var othersKeys: List<IdentityKeyPair>
+
+  val inMemoryLogger: InMemoryLogger
+    get() = (application as SignalInstrumentationApplicationContext).inMemoryLogger
 
   override fun before() {
     context = InstrumentationRegistry.getInstrumentation().targetContext
     self = setupSelf()
-    others = setupOthers()
+
+    val setupOthers = setupOthers()
+    others = setupOthers.first
+    othersKeys = setupOthers.second
 
     InstrumentationApplicationDependencyProvider.clearHandlers()
   }
 
   private fun setupSelf(): Recipient {
-    DeviceTransferBlockingInterceptor.getInstance().blockNetwork()
-
     PreferenceManager.getDefaultSharedPreferences(application).edit().putBoolean("pref_prompted_push_registration", true).commit()
     val masterSecret = MasterSecretUtil.generateMasterSecret(application, MasterSecretUtil.UNENCRYPTED_PASSPHRASE)
     MasterSecretUtil.generateAsymmetricMasterSecret(application, masterSecret)
@@ -74,7 +81,7 @@ class SignalActivityRule(private val othersCount: Int = 4) : ExternalResource()
     val registrationRepository = RegistrationRepository(application)
 
     InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(Put("/v2/keys") { MockResponse().success() })
-    val response: ServiceResponse<VerifyAccountResponse> = registrationRepository.registerAccountWithoutRegistrationLock(
+    val response: ServiceResponse<VerifyResponse> = registrationRepository.registerAccount(
       RegistrationData(
         code = "123123",
         e164 = "+15555550101",
@@ -82,22 +89,25 @@ class SignalActivityRule(private val othersCount: Int = 4) : ExternalResource()
         registrationId = registrationRepository.registrationId,
         profileKey = registrationRepository.getProfileKey("+15555550101"),
         fcmToken = null,
-        pniRegistrationId = registrationRepository.pniRegistrationId
+        pniRegistrationId = registrationRepository.pniRegistrationId,
+        recoveryPassword = "asdfasdfasdfasdf"
       ),
-      VerifyAccountResponse(UUID.randomUUID().toString(), UUID.randomUUID().toString(), false)
+      VerifyResponse(VerifyAccountResponse(UUID.randomUUID().toString(), UUID.randomUUID().toString(), false), null, null),
+      false
     ).blockingGet()
 
     ServiceResponseProcessor.DefaultProcessor(response).resultOrThrow
 
     SignalStore.kbsValues().optOut()
-    RegistrationUtil.maybeMarkRegistrationComplete(application)
+    RegistrationUtil.maybeMarkRegistrationComplete()
     SignalDatabase.recipients.setProfileName(Recipient.self().id, ProfileName.fromParts("Tester", "McTesterson"))
 
     return Recipient.self()
   }
 
-  private fun setupOthers(): List<RecipientId> {
+  private fun setupOthers(): Pair<List<RecipientId>, List<IdentityKeyPair>> {
     val others = mutableListOf<RecipientId>()
+    val othersKeys = mutableListOf<IdentityKeyPair>()
 
     if (othersCount !in 0 until 1000) {
       throw IllegalArgumentException("$othersCount must be between 0 and 1000")
@@ -108,13 +118,16 @@ class SignalActivityRule(private val othersCount: Int = 4) : ExternalResource()
       val recipientId = RecipientId.from(SignalServiceAddress(aci, "+15555551%03d".format(i)))
       SignalDatabase.recipients.setProfileName(recipientId, ProfileName.fromParts("Buddy", "#$i"))
       SignalDatabase.recipients.setProfileKeyIfAbsent(recipientId, ProfileKeyUtil.createNew())
-      SignalDatabase.recipients.setCapabilities(recipientId, SignalServiceProfile.Capabilities(true, true, true, true, true, true, true, true))
+      SignalDatabase.recipients.setCapabilities(recipientId, SignalServiceProfile.Capabilities(true, true, true, true, true, true, true, true, true))
       SignalDatabase.recipients.setProfileSharing(recipientId, true)
-      ApplicationDependencies.getProtocolStore().aci().saveIdentity(SignalProtocolAddress(aci.toString(), 0), IdentityKeyUtil.generateIdentityKeyPair().publicKey)
+      SignalDatabase.recipients.markRegistered(recipientId, aci)
+      val otherIdentity = IdentityKeyUtil.generateIdentityKeyPair()
+      ApplicationDependencies.getProtocolStore().aci().saveIdentity(SignalProtocolAddress(aci.toString(), 0), otherIdentity.publicKey)
       others += recipientId
+      othersKeys += otherIdentity
     }
 
-    return others
+    return others to othersKeys
   }
 
   inline fun <reified T : Activity> launchActivity(initIntent: Intent.() -> Unit = {}): ActivityScenario<T> {
@@ -129,7 +142,7 @@ class SignalActivityRule(private val othersCount: Int = 4) : ExternalResource()
     return ApplicationDependencies.getProtocolStore().aci().identities().getIdentity(SignalProtocolAddress(recipient.requireServiceId().toString(), 0))
   }
 
-  fun setVerified(recipient: Recipient, status: IdentityDatabase.VerifiedStatus) {
-    ApplicationDependencies.getProtocolStore().aci().identities().setVerified(recipient.id, getIdentity(recipient), IdentityDatabase.VerifiedStatus.VERIFIED)
+  fun setVerified(recipient: Recipient, status: IdentityTable.VerifiedStatus) {
+    ApplicationDependencies.getProtocolStore().aci().identities().setVerified(recipient.id, getIdentity(recipient), IdentityTable.VerifiedStatus.VERIFIED)
   }
 }

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

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

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

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

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

@@ -7,6 +7,9 @@ import org.hamcrest.Matchers.not
 import org.hamcrest.Matchers.notNullValue
 import org.hamcrest.Matchers.nullValue
 import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.TimeoutException
+import kotlin.time.Duration
 
 /**
  * Run the given [runnable] on a new thread and wait for it to finish.
@@ -44,3 +47,9 @@ infix fun <T : Any> T.assertIsNot(expected: T) {
 infix fun <E, T : Collection<E>> T.assertIsSize(expected: Int) {
   assertThat(this, hasSize(expected))
 }
+
+fun CountDownLatch.awaitFor(duration: Duration) {
+  if (!await(duration.inWholeMilliseconds, TimeUnit.MILLISECONDS)) {
+    throw TimeoutException("Latch await took longer than ${duration.inWholeMilliseconds}ms")
+  }
+}

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

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

app/src/instrumentation/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?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">
+          xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:usesCleartextTraffic="true"

app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?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">
+          xmlns:tools="http://schemas.android.com/tools">
 
     <uses-sdk tools:overrideLibrary="androidx.camera.core,androidx.camera.camera2,androidx.camera.lifecycle,androidx.camera.view" />
 
@@ -22,7 +21,6 @@
     <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
     <uses-permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"/>
     <uses-permission android:name="android.permission.READ_PROFILE"/>
-    <uses-permission android:name="android.permission.WRITE_PROFILE"/>
     <uses-permission android:name="android.permission.BROADCAST_WAP_PUSH"
                      tools:ignore="ProtectedPermissions"/>
     <uses-permission android:name="android.permission.READ_CONTACTS"/>
@@ -99,9 +97,10 @@
                  android:icon="@mipmap/ic_launcher"
                  android:label="@string/app_name"
                  android:supportsRtl="true"
-                 tools:replace="android:allowBackup"
                  android:resizeableActivity="true"
-                 android:allowBackup="false"
+                 android:fullBackupOnly="false"
+                 android:allowBackup="true"
+                 android:backupAgent=".absbackup.SignalBackupAgent"
                  android:theme="@style/TextSecure.LightTheme"
                  android:largeHeap="true">
 
@@ -333,11 +332,6 @@
               android:theme="@style/Signal.DayNight.NoActionBar"
               android:windowSoftInputMode="adjustResize"/>
 
-    <activity android:name=".DatabaseMigrationActivity"
-              android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar"
-              android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
     <activity android:name=".migrations.ApplicationMigrationActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:launchMode="singleTask"
@@ -470,7 +464,7 @@
 
     <activity android:name=".registration.RegistrationNavigationActivity"
               android:launchMode="singleTask"
-              android:theme="@style/TextSecure.LightRegistrationTheme"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:windowSoftInputMode="stateHidden"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -496,10 +490,12 @@
               android:windowSoftInputMode="stateHidden"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".MediaPreviewActivity"
+    <activity android:name=".mediapreview.MediaPreviewV2Activity"
               android:label="@string/AndroidManifest__media_preview"
               android:windowSoftInputMode="stateHidden"
               android:launchMode="singleTask"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
+              android:exported="false"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".AvatarPreviewActivity"
@@ -695,15 +691,15 @@
               android:screenOrientation="portrait"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".mediapreview.MediaPreviewV2Activity"
-              android:exported="false"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
+    <activity android:name=".components.settings.app.subscription.donate.DonateToSignalActivity"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <service android:enabled="true" android:name=".exporter.SignalSmsExportService" android:foregroundServiceType="dataSync" />
     <service android:enabled="true" android:name=".service.webrtc.WebRtcCallService" android:foregroundServiceType="camera|microphone"/>
-    <service android:enabled="true" android:name=".service.ApplicationMigrationService"/>
     <service android:enabled="true" android:exported="false" android:name=".service.KeyCachingService"/>
     <service android:enabled="true" android:name=".messages.IncomingMessageObserver$ForegroundService"/>
+    <service android:enabled="true" android:name=".messages.IncomingMessageObserver$BackgroundService"/>
     <service android:name=".service.webrtc.AndroidCallConnectionService"
         android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE"
         android:exported="true">
@@ -819,6 +815,8 @@
 
     <receiver android:name=".revealable.ViewOnceMessageManager$ViewOnceAlarm" />
 
+    <receiver android:name=".service.ScheduledMessageManager$ScheduledMessagesAlarm" />
+
     <receiver android:name=".service.PendingRetryReceiptManager$PendingRetryReceiptAlarm" />
 
     <receiver android:name=".service.TrimThreadsByDateManager$TrimThreadsByDateAlarm" />
@@ -887,7 +885,7 @@
         </intent-filter>
     </receiver>
 
-    <receiver android:name="org.thoughtcrime.securesms.jobs.ForegroundUtil$Receiver" android:exported="false" />
+    <receiver android:name="org.thoughtcrime.securesms.jobs.ForegroundServiceUtil$Receiver" android:exported="false" />
 
     <receiver android:name=".service.PersistentConnectionBootListener" android:exported="false">
         <intent-filter>

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

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

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

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

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

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

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

@@ -16,6 +16,7 @@
  */
 package org.thoughtcrime.securesms;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Build;
 
@@ -23,7 +24,6 @@ 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;
 
 import com.google.android.gms.security.ProviderInstaller;
@@ -35,6 +35,8 @@ import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.AndroidLogger;
 import org.signal.core.util.logging.Log;
 import org.signal.core.util.tracing.Tracer;
+import org.signal.donations.GooglePayApi;
+import org.signal.donations.StripeApi;
 import org.signal.glide.SignalGlideCodecs;
 import org.signal.libsignal.protocol.logging.SignalProtocolLoggerProvider;
 import org.signal.ringrtc.CallManager;
@@ -60,6 +62,7 @@ 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.RefreshKbsCredentialsJob;
 import org.thoughtcrime.securesms.jobs.RetrieveProfileJob;
 import org.thoughtcrime.securesms.jobs.RetrieveRemoteAnnouncementsJob;
 import org.thoughtcrime.securesms.jobs.StoryOnboardingDownloadJob;
@@ -70,9 +73,9 @@ import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger;
 import org.thoughtcrime.securesms.logging.PersistentLogger;
 import org.thoughtcrime.securesms.messageprocessingalarm.MessageProcessReceiver;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
+import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.SignalGlideComponents;
 import org.thoughtcrime.securesms.mms.SignalGlideModule;
-import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.ratelimit.RateLimitUtil;
 import org.thoughtcrime.securesms.recipients.Recipient;
@@ -89,6 +92,7 @@ import org.thoughtcrime.securesms.storage.StorageSyncHelper;
 import org.thoughtcrime.securesms.util.AppForegroundObserver;
 import org.thoughtcrime.securesms.util.AppStartup;
 import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.Environment;
 import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.SignalLocalMetrics;
 import org.thoughtcrime.securesms.util.SignalUncaughtExceptionHandler;
@@ -100,6 +104,8 @@ import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWra
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
 import java.security.Security;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException;
@@ -120,7 +126,8 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
 
   private static final String TAG = Log.tag(ApplicationContext.class);
 
-  private PersistentLogger persistentLogger;
+  @VisibleForTesting
+  protected PersistentLogger persistentLogger;
 
   public static ApplicationContext getInstance(Context context) {
     return (ApplicationContext)context.getApplicationContext();
@@ -155,19 +162,12 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                             .addBlocking("rx-init", this::initializeRx)
                             .addBlocking("event-bus", () -> EventBus.builder().logNoSubscriberMessages(false).installDefaultEventBus())
                             .addBlocking("app-dependencies", this::initializeAppDependencies)
-                            .addBlocking("notification-channels", () -> NotificationChannels.create(this))
                             .addBlocking("first-launch", this::initializeFirstEverAppLaunch)
                             .addBlocking("app-migrations", this::initializeApplicationMigrations)
-                            .addBlocking("ring-rtc", this::initializeRingRtc)
-                            .addBlocking("mark-registration", () -> RegistrationUtil.maybeMarkRegistrationComplete(this))
+                            .addBlocking("mark-registration", () -> RegistrationUtil.maybeMarkRegistrationComplete())
                             .addBlocking("lifecycle-observer", () -> ApplicationDependencies.getAppForegroundObserver().addListener(this))
                             .addBlocking("message-retriever", this::initializeMessageRetrieval)
                             .addBlocking("dynamic-theme", () -> DynamicTheme.setDefaultDayNightMode(this))
-                            .addBlocking("vector-compat", () -> {
-                              if (Build.VERSION.SDK_INT < 21) {
-                                AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
-                              }
-                            })
                             .addBlocking("proxy-init", () -> {
                               if (SignalStore.proxy().isProxyEnabled()) {
                                 Log.w(TAG, "Proxy detected. Enabling Conscrypt.setUseEngineSocketByDefault()");
@@ -176,10 +176,14 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                             })
                             .addBlocking("blob-provider", this::initializeBlobProvider)
                             .addBlocking("feature-flags", FeatureFlags::init)
+                            .addBlocking("ring-rtc", this::initializeRingRtc)
                             .addBlocking("glide", () -> SignalGlideModule.setRegisterGlideComponents(new SignalGlideComponents()))
+                            .addNonBlocking(() -> GlideApp.get(this))
+                            .addNonBlocking(this::checkIsGooglePayReady)
                             .addNonBlocking(this::cleanAvatarStorage)
                             .addNonBlocking(this::initializeRevealableMessageManager)
                             .addNonBlocking(this::initializePendingRetryReceiptManager)
+                            .addNonBlocking(this::initializeScheduledMessageManager)
                             .addNonBlocking(this::initializeFcmCheck)
                             .addNonBlocking(PreKeysSyncJob::enqueueIfNeeded)
                             .addNonBlocking(this::initializePeriodicTasks)
@@ -197,6 +201,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                             .addPostRender(this::initializeExpiringMessageManager)
                             .addPostRender(() -> SignalStore.settings().setDefaultSms(Util.isDefaultSmsProvider(this)))
                             .addPostRender(this::initializeTrimThreadsByDateManager)
+                            .addPostRender(RefreshKbsCredentialsJob::enqueueIfNecessary)
                             .addPostRender(() -> DownloadLatestEmojiDataJob.scheduleIfNecessary(this))
                             .addPostRender(EmojiSearchIndexDownloadJob::scheduleIfNecessary)
                             .addPostRender(() -> SignalDatabase.messageLog().trimOldMessages(System.currentTimeMillis(), FeatureFlags.retryRespondMaxAge()))
@@ -208,6 +213,9 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                             .addPostRender(GroupV2UpdateSelfProfileKeyJob::enqueueForGroupsIfNecessary)
                             .addPostRender(StoryOnboardingDownloadJob.Companion::enqueueIfNeeded)
                             .addPostRender(PnpInitializeDevicesJob::enqueueIfNecessary)
+                            .addPostRender(() -> ApplicationDependencies.getExoPlayerPool().getPoolStats().getMaxUnreserved())
+                            .addPostRender(() -> SignalDatabase.groupCallRings().removeOldRings())
+                            .addPostRender(() -> ApplicationDependencies.getRecipientCache().warmUp())
                             .execute();
 
     Log.d(TAG, "onCreate() took " + (System.currentTimeMillis() - startTime) + " ms");
@@ -227,7 +235,6 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
 
     SignalExecutors.BOUNDED.execute(() -> {
       FeatureFlags.refreshIfNecessary();
-      ApplicationDependencies.getRecipientCache().warmUp();
       RetrieveProfileJob.enqueueRoutineFetchIfNecessary(this);
       executePendingContactSync();
       KeyCachingService.onAppForegrounded(this);
@@ -293,7 +300,8 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
     }
   }
 
-  private void initializeLogging() {
+  @VisibleForTesting
+  protected void initializeLogging() {
     persistentLogger = new PersistentLogger(this);
     org.signal.core.util.logging.Log.initialize(FeatureFlags::internalUser, new AndroidLogger(), persistentLogger);
 
@@ -387,6 +395,10 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
     ApplicationDependencies.getPendingRetryReceiptManager().scheduleIfNecessary();
   }
 
+  private void initializeScheduledMessageManager() {
+    ApplicationDependencies.getScheduledMessageManager().scheduleIfNecessary();
+  }
+
   private void initializeTrimThreadsByDateManager() {
     KeepMessagesDuration keepMessagesDuration = SignalStore.settings().getKeepMessagesDuration();
     if (keepMessagesDuration != KeepMessagesDuration.FOREVER) {
@@ -408,7 +420,11 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
 
   private void initializeRingRtc() {
     try {
-      CallManager.initialize(this, new RingRtcLogger());
+      Map<String, String> fieldTrials = new HashMap<>();
+      if (FeatureFlags.callingFieldTrialAnyAddressPortsKillSwitch()) {
+        fieldTrials.put("RingRTC-AnyAddressPortsKillSwitch", "Enabled");
+      }
+      CallManager.initialize(this, new RingRtcLogger(), fieldTrials);
     } catch (UnsatisfiedLinkError e) {
       throw new AssertionError("Unable to load ringrtc library", e);
     }
@@ -460,6 +476,18 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
     AvatarPickerStorage.cleanOrphans(this);
   }
 
+  @SuppressLint("CheckResult")
+  private void checkIsGooglePayReady() {
+    GooglePayApi.queryIsReadyToPay(
+        this,
+        new StripeApi.Gateway(Environment.Donations.getStripeConfiguration()),
+        Environment.Donations.getGooglePayConfiguration()
+    ).subscribe(
+        /* onComplete = */ () -> SignalStore.donationsValues().setGooglePayReady(true),
+        /* onError    = */ t -> SignalStore.donationsValues().setGooglePayReady(false)
+    );
+  }
+
   @WorkerThread
   private void initializeCleanup() {
     int deleted = SignalDatabase.attachments().deleteAbandonedPreuploadedAttachments();

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

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

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

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

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

@@ -10,10 +10,11 @@ import androidx.lifecycle.Observer;
 
 import org.thoughtcrime.securesms.components.voice.VoiceNotePlaybackState;
 import org.thoughtcrime.securesms.contactshare.Contact;
+import org.thoughtcrime.securesms.conversation.ConversationItem;
+import org.thoughtcrime.securesms.conversation.ConversationItemDisplayMode;
 import org.thoughtcrime.securesms.conversation.ConversationMessage;
 import org.thoughtcrime.securesms.conversation.colors.Colorizable;
 import org.thoughtcrime.securesms.conversation.colors.Colorizer;
-import org.thoughtcrime.securesms.conversation.ConversationItemDisplayMode;
 import org.thoughtcrime.securesms.conversation.mutiselect.MultiselectPart;
 import org.thoughtcrime.securesms.conversation.mutiselect.Multiselectable;
 import org.thoughtcrime.securesms.database.model.InMemoryMessageRecord;
@@ -23,6 +24,7 @@ import org.thoughtcrime.securesms.giph.mp4.GiphyMp4Playable;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.groups.GroupMigrationMembershipChange;
 import org.thoughtcrime.securesms.linkpreview.LinkPreview;
+import org.thoughtcrime.securesms.mediapreview.MediaIntentFactory;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
@@ -104,11 +106,16 @@ public interface BindableConversationItem extends Unbindable, GiphyMp4Playable,
     void onBlockJoinRequest(@NonNull Recipient recipient);
     void onRecipientNameClicked(@NonNull RecipientId target);
     void onInviteToSignalClicked();
+    void onActivatePaymentsClicked();
+    void onSendPaymentClicked(@NonNull RecipientId recipientId);
+    void onScheduledIndicatorClicked(@NonNull View view, @NonNull MessageRecord messageRecord);
 
     /** @return true if handled, false if you want to let the normal url handling continue */
     boolean onUrlClicked(@NonNull String url);
 
     void onViewGiftBadgeClicked(@NonNull MessageRecord messageRecord);
     void onGiftBadgeRevealed(@NonNull MessageRecord messageRecord);
+
+    void goToMediaPreview(ConversationItem parent, View sharedElement, MediaIntentFactory.MediaPreviewArgs args);
   }
 }

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

@@ -5,7 +5,6 @@ import android.content.Context
 import android.content.Intent
 import android.os.Build
 import androidx.activity.result.contract.ActivityResultContract
-import androidx.annotation.RequiresApi
 import androidx.biometric.BiometricManager
 import androidx.biometric.BiometricPrompt
 import androidx.biometric.BiometricPrompt.PromptInfo
@@ -26,6 +25,14 @@ class BiometricDeviceAuthentication(
     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
+
+    /**
+     * From the docs on [BiometricManager.canAuthenticate]
+     *
+     * > Note that not all combinations of authenticator types are supported prior to Android 11 (API 30). Specifically, DEVICE_CREDENTIAL alone is unsupported
+     * > prior to API 30, and BIOMETRIC_STRONG | DEVICE_CREDENTIAL is unsupported on API 28-29.
+     */
+    private val DISALLOWED_BIOMETRIC_VERSIONS = setOf(28, 29)
   }
 
   fun authenticate(context: Context, force: Boolean, showConfirmDeviceCredentialIntent: () -> Unit): Boolean {
@@ -36,7 +43,7 @@ class BiometricDeviceAuthentication(
       return false
     }
 
-    return if (Build.VERSION.SDK_INT != 29 && biometricManager.canAuthenticate(ALLOWED_AUTHENTICATORS) == BiometricManager.BIOMETRIC_SUCCESS) {
+    return if (!DISALLOWED_BIOMETRIC_VERSIONS.contains(Build.VERSION.SDK_INT) && biometricManager.canAuthenticate(ALLOWED_AUTHENTICATORS) == BiometricManager.BIOMETRIC_SUCCESS) {
       if (force) {
         Log.i(TAG, "Listening for biometric authentication...")
         biometricPrompt.authenticate(biometricPromptInfo)
@@ -44,7 +51,7 @@ class BiometricDeviceAuthentication(
         Log.i(TAG, "Skipping show system biometric or device lock dialog unless forced")
       }
       true
-    } else if (Build.VERSION.SDK_INT >= 21) {
+    } else {
       if (force) {
         Log.i(TAG, "firing intent...")
         showConfirmDeviceCredentialIntent()
@@ -52,9 +59,6 @@ class BiometricDeviceAuthentication(
         Log.i(TAG, "Skipping firing intent unless forced")
       }
       true
-    } else {
-      Log.w(TAG, "Not compatible...")
-      false
     }
   }
 
@@ -65,7 +69,6 @@ class BiometricDeviceAuthentication(
 
 class BiometricDeviceLockContract : ActivityResultContract<String, Int>() {
 
-  @RequiresApi(api = 21)
   override fun createIntent(context: Context, input: String): Intent {
     val keyguardManager = ServiceUtil.getKeyguardManager(context)
     return keyguardManager.createConfirmDeviceCredentialIntent(input, "")

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

@@ -26,7 +26,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.components.ContactFilterView;
-import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
+import org.thoughtcrime.securesms.contacts.ContactSelectionDisplayMode;
 import org.thoughtcrime.securesms.contacts.sync.ContactDiscovery;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.RecipientId;
@@ -71,7 +71,7 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActivit
   protected void onCreate(Bundle icicle, boolean ready) {
     if (!getIntent().hasExtra(ContactSelectionListFragment.DISPLAY_MODE)) {
       boolean includeSms  = Util.isDefaultSmsProvider(this) && SignalStore.misc().getSmsExportPhase().allowSmsFeatures();
-      int     displayMode = includeSms ? DisplayMode.FLAG_ALL : DisplayMode.FLAG_PUSH | DisplayMode.FLAG_ACTIVE_GROUPS | DisplayMode.FLAG_INACTIVE_GROUPS | DisplayMode.FLAG_SELF;
+      int     displayMode = includeSms ? ContactSelectionDisplayMode.FLAG_ALL : ContactSelectionDisplayMode.FLAG_PUSH | ContactSelectionDisplayMode.FLAG_ACTIVE_GROUPS | ContactSelectionDisplayMode.FLAG_INACTIVE_GROUPS | ContactSelectionDisplayMode.FLAG_SELF;
       getIntent().putExtra(ContactSelectionListFragment.DISPLAY_MODE, displayMode);
     }
 

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

@@ -0,0 +1,88 @@
+package org.thoughtcrime.securesms
+
+import android.content.Context
+import android.view.View
+import org.thoughtcrime.securesms.contacts.paged.ContactSearchAdapter
+import org.thoughtcrime.securesms.contacts.paged.ContactSearchConfiguration
+import org.thoughtcrime.securesms.contacts.paged.ContactSearchData
+import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey
+import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel
+import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
+
+class ContactSelectionListAdapter(
+  context: Context,
+  fixedContacts: Set<ContactSearchKey>,
+  displayCheckBox: Boolean,
+  displaySmsTag: DisplaySmsTag,
+  displaySecondaryInformation: DisplaySecondaryInformation,
+  onClickCallbacks: OnContactSelectionClick,
+  longClickCallbacks: LongClickCallbacks,
+  storyContextMenuCallbacks: StoryContextMenuCallbacks
+) : ContactSearchAdapter(context, fixedContacts, displayCheckBox, displaySmsTag, displaySecondaryInformation, onClickCallbacks, longClickCallbacks, storyContextMenuCallbacks) {
+
+  init {
+    registerFactory(NewGroupModel::class.java, LayoutFactory({ NewGroupViewHolder(it, onClickCallbacks::onNewGroupClicked) }, R.layout.contact_selection_new_group_item))
+    registerFactory(InviteToSignalModel::class.java, LayoutFactory({ InviteToSignalViewHolder(it, onClickCallbacks::onInviteToSignalClicked) }, R.layout.contact_selection_invite_action_item))
+  }
+
+  class NewGroupModel : MappingModel<NewGroupModel> {
+    override fun areItemsTheSame(newItem: NewGroupModel): Boolean = true
+    override fun areContentsTheSame(newItem: NewGroupModel): Boolean = true
+  }
+
+  class InviteToSignalModel : MappingModel<InviteToSignalModel> {
+    override fun areItemsTheSame(newItem: InviteToSignalModel): Boolean = true
+    override fun areContentsTheSame(newItem: InviteToSignalModel): Boolean = true
+  }
+
+  private class InviteToSignalViewHolder(itemView: View, onClickListener: () -> Unit) : MappingViewHolder<InviteToSignalModel>(itemView) {
+    init {
+      itemView.setOnClickListener { onClickListener() }
+    }
+
+    override fun bind(model: InviteToSignalModel) = Unit
+  }
+
+  private class NewGroupViewHolder(itemView: View, onClickListener: () -> Unit) : MappingViewHolder<NewGroupModel>(itemView) {
+    init {
+      itemView.setOnClickListener { onClickListener() }
+    }
+
+    override fun bind(model: NewGroupModel) = Unit
+  }
+
+  class ArbitraryRepository : org.thoughtcrime.securesms.contacts.paged.ArbitraryRepository {
+
+    enum class ArbitraryRow(val code: String) {
+      NEW_GROUP("new-group"),
+      INVITE_TO_SIGNAL("invite-to-signal");
+
+      companion object {
+        fun fromCode(code: String) = values().first { it.code == code }
+      }
+    }
+
+    override fun getSize(section: ContactSearchConfiguration.Section.Arbitrary, query: String?): Int {
+      return if (query.isNullOrEmpty()) section.types.size else 0
+    }
+
+    override fun getData(section: ContactSearchConfiguration.Section.Arbitrary, query: String?, startIndex: Int, endIndex: Int, totalSearchSize: Int): List<ContactSearchData.Arbitrary> {
+      check(section.types.size == 1)
+      return listOf(ContactSearchData.Arbitrary(section.types.first()))
+    }
+
+    override fun getMappingModel(arbitrary: ContactSearchData.Arbitrary): MappingModel<*> {
+      val code = ArbitraryRow.fromCode(arbitrary.type)
+      return when (code) {
+        ArbitraryRow.NEW_GROUP -> NewGroupModel()
+        ArbitraryRow.INVITE_TO_SIGNAL -> InviteToSignalModel()
+      }
+    }
+  }
+
+  interface OnContactSelectionClick : ClickCallbacks {
+    fun onNewGroupClicked()
+    fun onInviteToSignalClicked()
+  }
+}

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

@@ -21,7 +21,6 @@ import android.Manifest;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
-import android.database.Cursor;
 import android.graphics.Rect;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -40,10 +39,7 @@ import androidx.annotation.Px;
 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;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -59,38 +55,36 @@ import com.pnikosis.materialishprogress.ProgressWheel;
 import org.signal.core.util.concurrent.SimpleTask;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.components.RecyclerViewFastScroller;
-import org.thoughtcrime.securesms.contacts.AbstractContactsCursorLoader;
 import org.thoughtcrime.securesms.contacts.ContactChipViewModel;
-import org.thoughtcrime.securesms.contacts.ContactSelectionListAdapter;
-import org.thoughtcrime.securesms.contacts.ContactSelectionListItem;
-import org.thoughtcrime.securesms.contacts.ContactsCursorLoader;
-import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
+import org.thoughtcrime.securesms.contacts.ContactSelectionDisplayMode;
 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.paged.ContactSearchAdapter;
+import org.thoughtcrime.securesms.contacts.paged.ContactSearchConfiguration;
+import org.thoughtcrime.securesms.contacts.paged.ContactSearchData;
+import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey;
+import org.thoughtcrime.securesms.contacts.paged.ContactSearchMediator;
+import org.thoughtcrime.securesms.contacts.paged.ContactSearchSortOrder;
+import org.thoughtcrime.securesms.contacts.paged.ContactSearchState;
 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.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;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -105,7 +99,6 @@ import kotlin.Unit;
  * @author Moxie Marlinspike
  */
 public final class ContactSelectionListFragment extends LoggingFragment
-    implements LoaderManager.LoaderCallbacks<Cursor>
 {
   @SuppressWarnings("unused")
   private static final String TAG = Log.tag(ContactSelectionListFragment.class);
@@ -137,27 +130,23 @@ public final class ContactSelectionListFragment extends LoggingFragment
   private String                                      cursorFilter;
   private RecyclerView                                recyclerView;
   private RecyclerViewFastScroller                    fastScroller;
-  private ContactSelectionListAdapter                 cursorRecyclerViewAdapter;
   private RecyclerView                                chipRecycler;
   private OnSelectionLimitReachedListener             onSelectionLimitReachedListener;
-  private AbstractContactsCursorLoaderFactoryProvider cursorFactoryProvider;
   private MappingAdapter                              contactChipAdapter;
   private ContactChipViewModel                        contactChipViewModel;
   private LifecycleDisposable                         lifecycleDisposable;
   private HeaderActionProvider                        headerActionProvider;
   private TextView                                    headerActionView;
+  private ContactSearchMediator                       contactSearchMediator;
 
-  @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;
+  private           ListClickListener       listClickListener = new ListClickListener();
 
   @Override
   public void onAttach(@NonNull Context context) {
@@ -191,14 +180,6 @@ public final class ContactSelectionListFragment extends LoggingFragment
       onSelectionLimitReachedListener = (OnSelectionLimitReachedListener) getParentFragment();
     }
 
-    if (context instanceof AbstractContactsCursorLoaderFactoryProvider) {
-      cursorFactoryProvider = (AbstractContactsCursorLoaderFactoryProvider) context;
-    }
-
-    if (getParentFragment() instanceof AbstractContactsCursorLoaderFactoryProvider) {
-      cursorFactoryProvider = (AbstractContactsCursorLoaderFactoryProvider) getParentFragment();
-    }
-
     if (context instanceof HeaderActionProvider) {
       headerActionProvider = (HeaderActionProvider) context;
     }
@@ -234,16 +215,14 @@ public final class ContactSelectionListFragment extends LoggingFragment
                  if (!TextSecurePreferences.hasSuccessfullyRetrievedDirectory(getActivity())) {
                    handleContactPermissionGranted();
                  } else {
-                   LoaderManager.getInstance(this).initLoader(0, null, this);
+                   contactSearchMediator.refresh();
                  }
                })
                .onAnyDenied(() -> {
-                 FragmentActivity activity = requireActivity();
+                 requireActivity().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
 
-                 activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
-
-                 if (safeArguments().getBoolean(RECENTS, activity.getIntent().getBooleanExtra(RECENTS, false))) {
-                   LoaderManager.getInstance(this).initLoader(0, null, ContactSelectionListFragment.this);
+                 if (safeArguments().getBoolean(RECENTS, requireActivity().getIntent().getBooleanExtra(RECENTS, false))) {
+                   contactSearchMediator.refresh();
                  } else {
                    initializeNoContactsPermission();
                  }
@@ -305,7 +284,6 @@ public final class ContactSelectionListFragment extends LoggingFragment
     swipeRefresh.setNestedScrollingEnabled(isRefreshable);
     swipeRefresh.setEnabled(isRefreshable);
 
-    hideCount      = arguments.getBoolean(HIDE_COUNT, intent.getBooleanExtra(HIDE_COUNT, false));
     selectionLimit = arguments.getParcelable(SELECTION_LIMITS);
     if (selectionLimit == null) {
       selectionLimit = intent.getParcelableExtra(SELECTION_LIMITS);
@@ -353,9 +331,75 @@ public final class ContactSelectionListFragment extends LoggingFragment
       headerActionView.setEnabled(false);
     }
 
+    contactSearchMediator = new ContactSearchMediator(
+        this,
+        currentSelection.stream()
+                        .map(r -> new ContactSearchKey.RecipientSearchKey(r, false))
+                        .collect(java.util.stream.Collectors.toSet()),
+        selectionLimit,
+        isMulti,
+        ContactSearchAdapter.DisplaySmsTag.DEFAULT,
+        ContactSearchAdapter.DisplaySecondaryInformation.ALWAYS,
+        this::mapStateToConfiguration,
+        new ContactSearchMediator.SimpleCallbacks() {
+          @Override
+          public void onAdapterListCommitted(int size) {
+            onLoadFinished(size);
+          }
+        },
+        false,
+        (context, fixedContacts, displayCheckBox, displaySmsTag, displaySecondaryInformation, callbacks, longClickCallbacks, storyContextMenuCallbacks) -> new ContactSelectionListAdapter(
+            context,
+            fixedContacts,
+            displayCheckBox,
+            displaySmsTag,
+            displaySecondaryInformation,
+            new ContactSelectionListAdapter.OnContactSelectionClick() {
+              @Override
+              public void onNewGroupClicked() {
+                listCallback.onNewGroup(false);
+              }
+
+              @Override
+              public void onInviteToSignalClicked() {
+                listCallback.onInvite();
+              }
+
+              @Override
+              public void onStoryClicked(@NonNull View view1, @NonNull ContactSearchData.Story story, boolean isSelected) {
+                throw new UnsupportedOperationException();
+              }
+
+              @Override
+              public void onKnownRecipientClicked(@NonNull View view1, @NonNull ContactSearchData.KnownRecipient knownRecipient, boolean isSelected) {
+                listClickListener.onItemClick(knownRecipient.getContactSearchKey());
+              }
+
+              @Override
+              public void onExpandClicked(@NonNull ContactSearchData.Expand expand) {
+                callbacks.onExpandClicked(expand);
+              }
+
+              @Override
+              public void onUnknownRecipientClicked(@NonNull View view, @NonNull ContactSearchData.UnknownRecipient unknownRecipient, boolean isSelected) {
+                listClickListener.onItemClick(unknownRecipient.getContactSearchKey());
+              }
+            },
+            (anchorView, data) -> listClickListener.onItemLongClick(anchorView, data.getContactSearchKey()),
+            storyContextMenuCallbacks
+        ),
+        new ContactSelectionListAdapter.ArbitraryRepository()
+    );
+
     return view;
   }
 
+  @Override
+  public void onDestroyView() {
+    super.onDestroyView();
+    constraintLayout = null;
+  }
+
   private @NonNull Bundle safeArguments() {
     return getArguments() != null ? getArguments() : new Bundle();
   }
@@ -366,27 +410,30 @@ public final class ContactSelectionListFragment extends LoggingFragment
   }
 
   public @NonNull List<SelectedContact> getSelectedContacts() {
-    if (cursorRecyclerViewAdapter == null) {
+    if (contactSearchMediator == null) {
       return Collections.emptyList();
     }
 
-    return cursorRecyclerViewAdapter.getSelectedContacts();
+    return contactSearchMediator.getSelectedContacts()
+                                .stream()
+                                .map(ContactSearchKey::requireSelectedContact)
+                                .collect(java.util.stream.Collectors.toList());
   }
 
   public int getSelectedContactsCount() {
-    if (cursorRecyclerViewAdapter == null) {
+    if (contactSearchMediator == null) {
       return 0;
     }
 
-    return cursorRecyclerViewAdapter.getSelectedContactsCount();
+    return contactSearchMediator.getSelectedContacts().size();
   }
 
   public int getTotalMemberCount() {
-    if (cursorRecyclerViewAdapter == null) {
+    if (contactSearchMediator == null) {
       return 0;
     }
 
-    return cursorRecyclerViewAdapter.getSelectedContactsCount() + cursorRecyclerViewAdapter.getCurrentContactsCount();
+    return getSelectedContactsCount() + contactSearchMediator.getFixedContactsSize();
   }
 
   private Set<RecipientId> getCurrentSelection() {
@@ -396,7 +443,7 @@ public final class ContactSelectionListFragment extends LoggingFragment
     }
 
     return currentSelection == null ? Collections.emptySet()
-                                    : Collections.unmodifiableSet(Stream.of(currentSelection).collect(Collectors.toSet()));
+                                    : Collections.unmodifiableSet(new HashSet<>(currentSelection));
   }
 
   public boolean isMulti() {
@@ -404,34 +451,8 @@ public final class ContactSelectionListFragment extends LoggingFragment
   }
 
   private void initializeCursor() {
-    glideRequests = GlideApp.with(this);
-
-    cursorRecyclerViewAdapter = new ContactSelectionListAdapter(requireContext(),
-                                                                glideRequests,
-                                                                null,
-                                                                new ListClickListener(),
-                                                                isMulti,
-                                                                currentSelection,
-                                                                safeArguments().getInt(ContactSelectionArguments.CHECKBOX_RESOURCE, R.drawable.contact_selection_checkbox));
-
-    RecyclerViewConcatenateAdapterStickyHeader concatenateAdapter = new RecyclerViewConcatenateAdapterStickyHeader();
-
-    if (listCallback != null) {
-      headerAdapter = new FixedViewsAdapter(createNewGroupItem(listCallback));
-      headerAdapter.hide();
-      concatenateAdapter.addAdapter(headerAdapter);
-    }
-
-    concatenateAdapter.addAdapter(cursorRecyclerViewAdapter);
-
-    if (listCallback != null) {
-      footerAdapter = new FixedViewsAdapter(createInviteActionView(listCallback));
-      footerAdapter.hide();
-      concatenateAdapter.addAdapter(footerAdapter);
-    }
-
     recyclerView.addItemDecoration(new LetterHeaderDecoration(requireContext(), this::hideLetterHeaders));
-    recyclerView.setAdapter(concatenateAdapter);
+    recyclerView.setAdapter(contactSearchMediator.getAdapter());
     recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
       @Override
       public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
@@ -452,20 +473,6 @@ public final class ContactSelectionListFragment extends LoggingFragment
     return hasQueryFilter() || shouldDisplayRecents();
   }
 
-  private View createInviteActionView(@NonNull ListCallback listCallback) {
-    View view = LayoutInflater.from(requireContext())
-                              .inflate(R.layout.contact_selection_invite_action_item, (ViewGroup) requireView(), false);
-    view.setOnClickListener(v -> listCallback.onInvite());
-    return view;
-  }
-
-  private View createNewGroupItem(@NonNull ListCallback listCallback) {
-    View view = LayoutInflater.from(requireContext())
-                              .inflate(R.layout.contact_selection_new_group_item, (ViewGroup) requireView(), false);
-    view.setOnClickListener(v -> listCallback.onNewGroup(false));
-    return view;
-  }
-
   private void initializeNoContactsPermission() {
     swipeRefresh.setVisibility(View.GONE);
 
@@ -490,7 +497,7 @@ public final class ContactSelectionListFragment extends LoggingFragment
 
   public void setQueryFilter(String filter) {
     this.cursorFilter = filter;
-    LoaderManager.getInstance(this).restartLoader(0, null, this);
+    contactSearchMediator.onFilterChanged(filter);
   }
 
   public void resetQueryFilter() {
@@ -507,51 +514,21 @@ public final class ContactSelectionListFragment extends LoggingFragment
   }
 
   public void reset() {
-    cursorRecyclerViewAdapter.clearSelectedContacts();
-
-    if (!isDetached() && !isRemoving() && getActivity() != null && !getActivity().isFinishing()) {
-      LoaderManager.getInstance(this).restartLoader(0, null, this);
-    }
+    contactSearchMediator.clearSelection();
+    fastScroller.setVisibility(View.GONE);
+    headerActionView.setVisibility(View.GONE);
   }
 
   public void setRecyclerViewPaddingBottom(@Px int paddingBottom) {
     ViewUtil.setPaddingBottom(recyclerView, paddingBottom);
   }
 
-  @Override
-  public @NonNull Loader<Cursor> onCreateLoader(int id, Bundle args) {
-    FragmentActivity activity       = requireActivity();
-    int              displayMode    = safeArguments().getInt(DISPLAY_MODE, activity.getIntent().getIntExtra(DISPLAY_MODE, DisplayMode.FLAG_ALL));
-    boolean          displayRecents = shouldDisplayRecents();
-
-    if (cursorFactoryProvider != null) {
-      return cursorFactoryProvider.get().create();
-    } else {
-      return new ContactsCursorLoader.Factory(activity, displayMode, cursorFilter, displayRecents).create();
-    }
-  }
-
-  @Override
-  public void onLoadFinished(@NonNull Loader<Cursor> loader, @Nullable Cursor data) {
+  private void onLoadFinished(int count) {
     swipeRefresh.setVisibility(View.VISIBLE);
     showContactsLayout.setVisibility(View.GONE);
 
-    cursorRecyclerViewAdapter.changeCursor(data);
-
-    if (footerAdapter != null) {
-      footerAdapter.show();
-    }
-
-    if (headerAdapter != null) {
-      if (TextUtils.isEmpty(cursorFilter)) {
-        headerAdapter.show();
-      } else {
-        headerAdapter.hide();
-      }
-    }
-
     emptyText.setText(R.string.contact_selection_group_activity__no_contacts);
-    boolean useFastScroller = data != null && data.getCount() > 20;
+    boolean useFastScroller = count > 20;
     recyclerView.setVerticalScrollBarEnabled(!useFastScroller);
     if (useFastScroller) {
       fastScroller.setVisibility(View.VISIBLE);
@@ -568,13 +545,6 @@ public final class ContactSelectionListFragment extends LoggingFragment
     }
   }
 
-  @Override
-  public void onLoaderReset(@NonNull Loader<Cursor> loader) {
-    cursorRecyclerViewAdapter.changeCursor(null);
-    fastScroller.setVisibility(View.GONE);
-    headerActionView.setVisibility(View.GONE);
-  }
-
   private boolean shouldDisplayRecents() {
     return safeArguments().getBoolean(RECENTS, requireActivity().getIntent().getBooleanExtra(RECENTS, false));
   }
@@ -628,20 +598,15 @@ public final class ContactSelectionListFragment extends LoggingFragment
    *
    * @param contacts List of the contacts to select. This will not overwrite the current selection, but append to it.
    */
-  public void markSelected(@NonNull Set<ShareContact> contacts) {
+  public void markSelected(@NonNull Set<RecipientId> contacts) {
     if (contacts.isEmpty()) {
       return;
     }
 
     Set<SelectedContact> toMarkSelected = contacts.stream()
-                                                  .map(contact -> {
-                                                    if (contact.getRecipientId().isPresent()) {
-                                                      return SelectedContact.forRecipientId(contact.getRecipientId().get());
-                                                    } else {
-                                                      return SelectedContact.forPhone(null, contact.getNumber());
-                                                    }
-                                                  })
-                                                  .filter(c -> !cursorRecyclerViewAdapter.isSelectedContact(c))
+                                                  .filter(r -> !contactSearchMediator.getSelectedContacts()
+                                                                                     .contains(new ContactSearchKey.RecipientSearchKey(r, false)))
+                                                  .map(SelectedContact::forRecipientId)
                                                   .collect(java.util.stream.Collectors.toSet());
 
     if (toMarkSelected.isEmpty()) {
@@ -651,22 +616,18 @@ public final class ContactSelectionListFragment extends LoggingFragment
     for (final SelectedContact selectedContact : toMarkSelected) {
       markContactSelected(selectedContact);
     }
-
-    cursorRecyclerViewAdapter.notifyItemRangeChanged(0, cursorRecyclerViewAdapter.getItemCount());
   }
 
-  private class ListClickListener implements ContactSelectionListAdapter.ItemClickListener {
-    @Override
-    public void onItemClick(ContactSelectionListItem contact) {
-      SelectedContact selectedContact = contact.isUsernameType() ? SelectedContact.forUsername(contact.getRecipientId().orElse(null), contact.getNumber())
-                                                                 : SelectedContact.forPhone(contact.getRecipientId().orElse(null), contact.getNumber());
+  private class ListClickListener {
+    public void onItemClick(ContactSearchKey contact) {
+      SelectedContact selectedContact = contact.requireSelectedContact();
 
-      if (!canSelectSelf && Recipient.self().getId().equals(selectedContact.getOrCreateRecipientId(requireContext()))) {
+      if (!canSelectSelf && !selectedContact.hasUsername() && Recipient.self().getId().equals(selectedContact.getOrCreateRecipientId(requireContext()))) {
         Toast.makeText(requireContext(), R.string.ContactSelectionListFragment_you_do_not_need_to_add_yourself_to_the_group, Toast.LENGTH_SHORT).show();
         return;
       }
 
-      if (!isMulti || !cursorRecyclerViewAdapter.isSelectedContact(selectedContact)) {
+      if (!isMulti || !contactSearchMediator.getSelectedContacts().contains(selectedContact.toContactSearchKey())) {
         if (selectionHardLimitReached()) {
           if (onSelectionLimitReachedListener != null) {
             onSelectionLimitReachedListener.onHardLimitReached(selectionLimit.getHardLimit());
@@ -676,63 +637,58 @@ public final class ContactSelectionListFragment extends LoggingFragment
           return;
         }
 
-        if (contact.isUsernameType()) {
+        if (contact instanceof ContactSearchKey.UnknownRecipientKey && ((ContactSearchKey.UnknownRecipientKey) contact).getSectionKey() == ContactSearchConfiguration.SectionKey.USERNAME) {
+          String      username      = ((ContactSearchKey.UnknownRecipientKey) contact).getQuery();
           AlertDialog loadingDialog = SimpleProgressDialog.show(requireContext());
 
           SimpleTask.run(getViewLifecycleOwner().getLifecycle(), () -> {
-            return UsernameUtil.fetchAciForUsername(contact.getNumber());
+            return UsernameUtil.fetchAciForUsername(username);
           }, uuid -> {
             loadingDialog.dismiss();
             if (uuid.isPresent()) {
-              Recipient       recipient = Recipient.externalUsername(uuid.get(), contact.getNumber());
-              SelectedContact selected  = SelectedContact.forUsername(recipient.getId(), contact.getNumber());
+              Recipient       recipient = Recipient.externalUsername(uuid.get(), username);
+              SelectedContact selected  = SelectedContact.forUsername(recipient.getId(), username);
 
               if (onContactSelectedListener != null) {
                 onContactSelectedListener.onBeforeContactSelected(Optional.of(recipient.getId()), null, allowed -> {
                   if (allowed) {
                     markContactSelected(selected);
-                    cursorRecyclerViewAdapter.notifyItemRangeChanged(0, cursorRecyclerViewAdapter.getItemCount(), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
                   }
                 });
               } else {
                 markContactSelected(selected);
-                cursorRecyclerViewAdapter.notifyItemRangeChanged(0, cursorRecyclerViewAdapter.getItemCount(), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
               }
             } else {
               new MaterialAlertDialogBuilder(requireContext())
                   .setTitle(R.string.ContactSelectionListFragment_username_not_found)
-                  .setMessage(getString(R.string.ContactSelectionListFragment_s_is_not_a_signal_user, contact.getNumber()))
+                  .setMessage(getString(R.string.ContactSelectionListFragment_s_is_not_a_signal_user, username))
                   .setPositiveButton(android.R.string.ok, (dialog, which) -> dialog.dismiss())
                   .show();
             }
           });
         } else {
           if (onContactSelectedListener != null) {
-            onContactSelectedListener.onBeforeContactSelected(contact.getRecipientId(), contact.getNumber(), allowed -> {
+            onContactSelectedListener.onBeforeContactSelected(Optional.ofNullable(selectedContact.getRecipientId()), selectedContact.getNumber(), allowed -> {
               if (allowed) {
                 markContactSelected(selectedContact);
-                cursorRecyclerViewAdapter.notifyItemRangeChanged(0, cursorRecyclerViewAdapter.getItemCount(), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
               }
             });
           } else {
             markContactSelected(selectedContact);
-            cursorRecyclerViewAdapter.notifyItemRangeChanged(0, cursorRecyclerViewAdapter.getItemCount(), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
           }
         }
       } else {
         markContactUnselected(selectedContact);
-        cursorRecyclerViewAdapter.notifyItemRangeChanged(0, cursorRecyclerViewAdapter.getItemCount(), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
 
         if (onContactSelectedListener != null) {
-          onContactSelectedListener.onContactDeselected(contact.getRecipientId(), contact.getNumber());
+          onContactSelectedListener.onContactDeselected(Optional.ofNullable(selectedContact.getRecipientId()), selectedContact.getNumber());
         }
       }
     }
 
-    @Override
-    public boolean onItemLongClick(ContactSelectionListItem item) {
+    public boolean onItemLongClick(View anchorView, ContactSearchKey item) {
       if (onItemLongClickListener != null) {
-        return onItemLongClickListener.onLongClick(item, recyclerView);
+        return onItemLongClickListener.onLongClick(anchorView, item, recyclerView);
       } else {
         return false;
       }
@@ -752,7 +708,7 @@ public final class ContactSelectionListFragment extends LoggingFragment
   }
 
   private void markContactSelected(@NonNull SelectedContact selectedContact) {
-    cursorRecyclerViewAdapter.addSelectedContact(selectedContact);
+    contactSearchMediator.setKeysSelected(Collections.singleton(selectedContact.toContactSearchKey()));
     if (isMulti) {
       addChipForSelectedContact(selectedContact);
     }
@@ -762,8 +718,7 @@ public final class ContactSelectionListFragment extends LoggingFragment
   }
 
   private void markContactUnselected(@NonNull SelectedContact selectedContact) {
-    cursorRecyclerViewAdapter.removeFromSelectedContacts(selectedContact);
-    cursorRecyclerViewAdapter.notifyItemRangeChanged(0, cursorRecyclerViewAdapter.getItemCount(), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
+    contactSearchMediator.setKeysNotSelected(Collections.singleton(selectedContact.toContactSearchKey()));
     contactChipViewModel.remove(selectedContact);
 
     if (onContactSelectedListener != null) {
@@ -836,6 +791,116 @@ public final class ContactSelectionListFragment extends LoggingFragment
     chipRecycler.smoothScrollBy(x, 0);
   }
 
+  private @NonNull ContactSearchConfiguration mapStateToConfiguration(@NonNull ContactSearchState contactSearchState) {
+    int displayMode = safeArguments().getInt(DISPLAY_MODE, requireActivity().getIntent().getIntExtra(DISPLAY_MODE, ContactSelectionDisplayMode.FLAG_ALL));
+
+    boolean includeRecents             = safeArguments().getBoolean(RECENTS, requireActivity().getIntent().getBooleanExtra(RECENTS, false));
+    boolean includePushContacts        = flagSet(displayMode, ContactSelectionDisplayMode.FLAG_PUSH);
+    boolean includeSmsContacts         = flagSet(displayMode, ContactSelectionDisplayMode.FLAG_SMS);
+    boolean includeActiveGroups        = flagSet(displayMode, ContactSelectionDisplayMode.FLAG_ACTIVE_GROUPS);
+    boolean includeInactiveGroups      = flagSet(displayMode, ContactSelectionDisplayMode.FLAG_INACTIVE_GROUPS);
+    boolean includeSelf                = flagSet(displayMode, ContactSelectionDisplayMode.FLAG_SELF);
+    boolean includeV1Groups            = !flagSet(displayMode, ContactSelectionDisplayMode.FLAG_HIDE_GROUPS_V1);
+    boolean includeNew                 = !flagSet(displayMode, ContactSelectionDisplayMode.FLAG_HIDE_NEW);
+    boolean includeRecentsHeader       = !flagSet(displayMode, ContactSelectionDisplayMode.FLAG_HIDE_RECENT_HEADER);
+    boolean includeGroupsAfterContacts = flagSet(displayMode, ContactSelectionDisplayMode.FLAG_GROUPS_AFTER_CONTACTS);
+    boolean blocked                    = flagSet(displayMode, ContactSelectionDisplayMode.FLAG_BLOCK);
+
+    ContactSearchConfiguration.TransportType        transportType = resolveTransportType(includePushContacts, includeSmsContacts);
+    ContactSearchConfiguration.Section.Recents.Mode mode          = resolveRecentsMode(transportType, includeActiveGroups);
+    ContactSearchConfiguration.NewRowMode           newRowMode    = resolveNewRowMode(blocked, includeActiveGroups);
+
+    return ContactSearchConfiguration.build(builder -> {
+      builder.setQuery(contactSearchState.getQuery());
+
+      if (listCallback != null) {
+        builder.arbitrary(ContactSelectionListAdapter.ArbitraryRepository.ArbitraryRow.NEW_GROUP.getCode());
+      }
+
+      if (transportType != null) {
+        if (TextUtils.isEmpty(contactSearchState.getQuery()) && includeRecents) {
+          builder.addSection(new ContactSearchConfiguration.Section.Recents(
+              25,
+              mode,
+              includeInactiveGroups,
+              includeV1Groups,
+              includeSmsContacts,
+              includeSelf,
+              includeRecentsHeader,
+              null
+          ));
+        }
+
+        builder.addSection(new ContactSearchConfiguration.Section.Individuals(
+            includeSelf,
+            transportType,
+            true,
+            null,
+            !hideLetterHeaders()
+        ));
+      }
+
+      if ((includeGroupsAfterContacts || !TextUtils.isEmpty(contactSearchState.getQuery())) && includeActiveGroups) {
+        builder.addSection(new ContactSearchConfiguration.Section.Groups(
+            includeSmsContacts,
+            includeV1Groups,
+            includeInactiveGroups,
+            false,
+            ContactSearchSortOrder.NATURAL,
+            false,
+            true,
+            null
+        ));
+      }
+
+      if (listCallback != null) {
+        builder.arbitrary(ContactSelectionListAdapter.ArbitraryRepository.ArbitraryRow.INVITE_TO_SIGNAL.getCode());
+      }
+
+      if (includeNew) {
+        builder.phone(newRowMode);
+        builder.username(newRowMode);
+      }
+      return Unit.INSTANCE;
+    });
+  }
+
+  private static @Nullable ContactSearchConfiguration.TransportType resolveTransportType(boolean includePushContacts, boolean includeSmsContacts) {
+    if (includePushContacts && includeSmsContacts) {
+      return ContactSearchConfiguration.TransportType.ALL;
+    } else if (includePushContacts) {
+      return ContactSearchConfiguration.TransportType.PUSH;
+    } else if (includeSmsContacts) {
+      return ContactSearchConfiguration.TransportType.SMS;
+    } else {
+      return null;
+    }
+  }
+
+  private static @NonNull ContactSearchConfiguration.Section.Recents.Mode resolveRecentsMode(ContactSearchConfiguration.TransportType transportType, boolean includeGroupContacts) {
+    if (transportType != null && includeGroupContacts) {
+      return ContactSearchConfiguration.Section.Recents.Mode.ALL;
+    } else if (includeGroupContacts) {
+      return ContactSearchConfiguration.Section.Recents.Mode.GROUPS;
+    } else {
+      return ContactSearchConfiguration.Section.Recents.Mode.INDIVIDUALS;
+    }
+  }
+
+  private static @NonNull ContactSearchConfiguration.NewRowMode resolveNewRowMode(boolean isBlocked, boolean isActiveGroups) {
+    if (isBlocked) {
+      return ContactSearchConfiguration.NewRowMode.BLOCK;
+    } else if (isActiveGroups) {
+      return ContactSearchConfiguration.NewRowMode.NEW_CONVERSATION;
+    } else {
+      return ContactSearchConfiguration.NewRowMode.ADD_TO_GROUP;
+    }
+  }
+
+  private static boolean flagSet(int mode, int flag) {
+    return (mode & flag) > 0;
+  }
+
   public interface OnContactSelectedListener {
     /**
      * Provides an opportunity to disallow selecting an item. Call the callback with false to disallow, or true to allow it.
@@ -868,10 +933,6 @@ public final class ContactSelectionListFragment extends LoggingFragment
   }
 
   public interface OnItemLongClickListener {
-    boolean onLongClick(ContactSelectionListItem contactSelectionListItem, RecyclerView recyclerView);
-  }
-
-  public interface AbstractContactsCursorLoaderFactoryProvider {
-    @NonNull AbstractContactsCursorLoader.Factory get();
+    boolean onLongClick(View anchorView, ContactSearchKey contactSearchKey, RecyclerView recyclerView);
   }
 }

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

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

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

@@ -10,6 +10,8 @@ import android.os.Bundle;
 import android.os.Vibrator;
 import android.text.TextUtils;
 import android.transition.TransitionInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
@@ -54,6 +56,7 @@ public class DeviceActivity extends PassphraseRequiredActivity
   private DeviceAddFragment  deviceAddFragment;
   private DeviceListFragment deviceListFragment;
   private DeviceLinkFragment deviceLinkFragment;
+  private MenuItem           cameraSwitchItem = null;
 
   @Override
   public void onPreCreate() {
@@ -102,6 +105,18 @@ public class DeviceActivity extends PassphraseRequiredActivity
     return false;
   }
 
+  @Override
+  public boolean onCreateOptionsMenu(Menu menu) {
+    getMenuInflater().inflate(R.menu.device_add, menu);
+    cameraSwitchItem = menu.findItem(R.id.device_add_camera_switch);
+    cameraSwitchItem.setVisible(false);
+    return super.onCreateOptionsMenu(menu);
+  }
+
+  public MenuItem getCameraSwitchItem() {
+    return cameraSwitchItem;
+  }
+
   @Override
   public void onClick(View v) {
     Permissions.with(this)
@@ -125,27 +140,18 @@ public class DeviceActivity extends PassphraseRequiredActivity
       Uri uri = Uri.parse(data);
       deviceLinkFragment.setLinkClickedListener(uri, DeviceActivity.this);
 
-      if (Build.VERSION.SDK_INT >= 21) {
-        deviceAddFragment.setSharedElementReturnTransition(TransitionInflater.from(DeviceActivity.this).inflateTransition(R.transition.fragment_shared));
-        deviceAddFragment.setExitTransition(TransitionInflater.from(DeviceActivity.this).inflateTransition(android.R.transition.fade));
+      deviceAddFragment.setSharedElementReturnTransition(TransitionInflater.from(DeviceActivity.this).inflateTransition(R.transition.fragment_shared));
+      deviceAddFragment.setExitTransition(TransitionInflater.from(DeviceActivity.this).inflateTransition(android.R.transition.fade));
 
-        deviceLinkFragment.setSharedElementEnterTransition(TransitionInflater.from(DeviceActivity.this).inflateTransition(R.transition.fragment_shared));
-        deviceLinkFragment.setEnterTransition(TransitionInflater.from(DeviceActivity.this).inflateTransition(android.R.transition.fade));
+      deviceLinkFragment.setSharedElementEnterTransition(TransitionInflater.from(DeviceActivity.this).inflateTransition(R.transition.fragment_shared));
+      deviceLinkFragment.setEnterTransition(TransitionInflater.from(DeviceActivity.this).inflateTransition(android.R.transition.fade));
 
-        getSupportFragmentManager().beginTransaction()
-                                   .addToBackStack(null)
-                                   .addSharedElement(deviceAddFragment.getDevicesImage(), "devices")
-                                   .replace(R.id.fragment_container, deviceLinkFragment)
-                                   .commit();
+      getSupportFragmentManager().beginTransaction()
+                                 .addToBackStack(null)
+                                 .addSharedElement(deviceAddFragment.getDevicesImage(), "devices")
+                                 .replace(R.id.fragment_container, deviceLinkFragment)
+                                 .commit();
 
-      } else {
-        getSupportFragmentManager().beginTransaction()
-                                   .setCustomAnimations(R.anim.slide_from_bottom, R.anim.slide_to_bottom,
-                                                        R.anim.slide_from_bottom, R.anim.slide_to_bottom)
-                                   .replace(R.id.fragment_container, deviceLinkFragment)
-                                   .addToBackStack(null)
-                                   .commit();
-      }
     });
   }
 

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

@@ -2,24 +2,23 @@ package org.thoughtcrime.securesms;
 
 import android.animation.Animator;
 import android.annotation.TargetApi;
-import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewAnimationUtils;
 import android.view.ViewGroup;
 import android.view.animation.DecelerateInterpolator;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 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;
 
@@ -32,31 +31,29 @@ public class DeviceAddFragment extends LoggingFragment {
 
   private ImageView     devicesImage;
   private ScanListener  scanListener;
+  private QrScannerView scannerView;
 
   @Override
   public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup viewGroup, Bundle bundle) {
     ViewGroup container = ViewUtil.inflate(inflater, viewGroup, R.layout.device_add_fragment);
 
-    QrScannerView scannerView = container.findViewById(R.id.scanner);
+    this.scannerView = container.findViewById(R.id.scanner);
     this.devicesImage = container.findViewById(R.id.devices);
     ViewCompat.setTransitionName(devicesImage, "devices");
 
-    if (Build.VERSION.SDK_INT >= 21) {
-      container.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
-        @TargetApi(21)
-        @Override
-        public void onLayoutChange(View v, int left, int top, int right, int bottom,
-                                   int oldLeft, int oldTop, int oldRight, int oldBottom)
-        {
-          v.removeOnLayoutChangeListener(this);
+    container.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
+      @Override
+      public void onLayoutChange(View v, int left, int top, int right, int bottom,
+                                 int oldLeft, int oldTop, int oldRight, int oldBottom)
+      {
+        v.removeOnLayoutChangeListener(this);
 
-          Animator reveal = ViewAnimationUtils.createCircularReveal(v, right, bottom, 0, (int) Math.hypot(right, bottom));
-          reveal.setInterpolator(new DecelerateInterpolator(2f));
-          reveal.setDuration(800);
-          reveal.start();
-        }
-      });
-    }
+        Animator reveal = ViewAnimationUtils.createCircularReveal(v, right, bottom, 0, (int) Math.hypot(right, bottom));
+        reveal.setInterpolator(new DecelerateInterpolator(2f));
+        reveal.setDuration(800);
+        reveal.start();
+      }
+    });
 
     scannerView.start(getViewLifecycleOwner(), CameraXModelBlocklist.isBlocklisted());
 
@@ -77,6 +74,19 @@ public class DeviceAddFragment extends LoggingFragment {
     return container;
   }
 
+  @Override
+  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+    MenuItem switchCamera = ((DeviceActivity) requireActivity()).getCameraSwitchItem();
+
+    if (switchCamera != null) {
+      switchCamera.setVisible(true);
+      switchCamera.setOnMenuItemClickListener(v -> {
+        scannerView.toggleCamera();
+        return true;
+      });
+    }
+  }
+
   public ImageView getDevicesImage() {
     return devicesImage;
   }

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

@@ -23,15 +23,15 @@ import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 
 import org.thoughtcrime.securesms.components.ContactFilterView;
 import org.thoughtcrime.securesms.components.ContactFilterView.OnFilterChangedListener;
-import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
+import org.thoughtcrime.securesms.contacts.ContactSelectionDisplayMode;
 import org.thoughtcrime.securesms.contacts.SelectedContact;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.groups.SelectionLimits;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
+import org.thoughtcrime.securesms.mms.OutgoingMessage;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.sms.MessageSender;
-import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarInviteTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.Util;
@@ -62,7 +62,7 @@ public class InviteActivity extends PassphraseRequiredActivity implements Contac
 
   @Override
   protected void onCreate(Bundle savedInstanceState, boolean ready) {
-    getIntent().putExtra(ContactSelectionListFragment.DISPLAY_MODE, DisplayMode.FLAG_SMS);
+    getIntent().putExtra(ContactSelectionListFragment.DISPLAY_MODE, ContactSelectionDisplayMode.FLAG_SMS);
     getIntent().putExtra(ContactSelectionListFragment.SELECTION_LIMITS, SelectionLimits.NO_LIMITS);
     getIntent().putExtra(ContactSelectionListFragment.HIDE_COUNT, true);
     getIntent().putExtra(ContactSelectionListFragment.REFRESHABLE, false);
@@ -254,7 +254,7 @@ public class InviteActivity extends PassphraseRequiredActivity implements Contac
         Recipient   recipient      = Recipient.resolved(recipientId);
         int         subscriptionId = recipient.getDefaultSubscriptionId().orElse(-1);
 
-        MessageSender.send(context, new OutgoingTextMessage(recipient, message, subscriptionId), -1L, true, null, null);
+        MessageSender.send(context, OutgoingMessage.sms(recipient, message, subscriptionId), -1L, MessageSender.SendType.SMS, null, null);
 
         if (recipient.getContactUri() != null) {
           SignalDatabase.recipients().setHasSentInvite(recipient.getId());

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

@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
+import android.view.ViewTreeObserver;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -14,6 +15,7 @@ import androidx.lifecycle.ViewModelProvider;
 
 import org.thoughtcrime.securesms.components.voice.VoiceNoteMediaController;
 import org.thoughtcrime.securesms.components.voice.VoiceNoteMediaControllerOwner;
+import org.thoughtcrime.securesms.conversationlist.RelinkDevicesReminderBottomSheetFragment;
 import org.thoughtcrime.securesms.devicetransfer.olddevice.OldDeviceTransferLockedDialog;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.stories.Stories;
@@ -37,6 +39,8 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
   private VoiceNoteMediaController      mediaController;
   private ConversationListTabsViewModel conversationListTabsViewModel;
 
+  private boolean onFirstRender = false;
+
   public static @NonNull Intent clearTop(@NonNull Context context) {
     Intent intent = new Intent(context, MainActivity.class);
 
@@ -53,8 +57,23 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
     super.onCreate(savedInstanceState, ready);
 
     setContentView(R.layout.main_activity);
+    final View content = findViewById(android.R.id.content);
+    content.getViewTreeObserver().addOnPreDrawListener(
+        new ViewTreeObserver.OnPreDrawListener() {
+          @Override
+          public boolean onPreDraw() {
+            // Use pre draw listener to delay drawing frames till conversation list is ready
+            if (onFirstRender) {
+              content.getViewTreeObserver().removeOnPreDrawListener(this);
+              return true;
+            } else {
+              return false;
+            }
+          }
+        });
 
-    mediaController = new VoiceNoteMediaController(this);
+
+    mediaController = new VoiceNoteMediaController(this, true);
 
     ConversationListTabRepository         repository = new ConversationListTabRepository();
     ConversationListTabsViewModel.Factory factory    = new ConversationListTabsViewModel.Factory(repository);
@@ -98,6 +117,11 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
       OldDeviceTransferLockedDialog.show(getSupportFragmentManager());
     }
 
+    if (SignalStore.misc().getShouldShowLinkedDevicesReminder()) {
+      SignalStore.misc().setShouldShowLinkedDevicesReminder(false);
+      RelinkDevicesReminderBottomSheetFragment.show(getSupportFragmentManager());
+    }
+
     updateTabVisibility();
   }
 
@@ -158,6 +182,10 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
     }
   }
 
+  public void onFirstRender() {
+    onFirstRender = true;
+  }
+
   @Override
   public @NonNull VoiceNoteMediaController getVoiceNoteMediaController() {
     return mediaController;

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

@@ -1,882 +0,0 @@
-/*
- * Copyright (C) 2014 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package org.thoughtcrime.securesms;
-
-import android.Manifest;
-import android.annotation.SuppressLint;
-import android.content.ActivityNotFoundException;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Build;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatDelegate;
-import androidx.core.app.ShareCompat;
-import androidx.core.util.Pair;
-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.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;
-import org.thoughtcrime.securesms.components.viewpager.ExtendedOnPageChangedListener;
-import org.thoughtcrime.securesms.components.voice.VoiceNoteMediaController;
-import org.thoughtcrime.securesms.components.voice.VoiceNoteMediaControllerOwner;
-import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectForwardFragment;
-import org.thoughtcrime.securesms.conversation.mutiselect.forward.MultiselectForwardFragmentArgs;
-import org.thoughtcrime.securesms.database.MediaDatabase;
-import org.thoughtcrime.securesms.database.MediaDatabase.MediaRecord;
-import org.thoughtcrime.securesms.database.loaders.PagingMediaLoader;
-import org.thoughtcrime.securesms.mediaoverview.MediaOverviewActivity;
-import org.thoughtcrime.securesms.mediapreview.MediaIntentFactory;
-import org.thoughtcrime.securesms.mediapreview.MediaPreviewFragment;
-import org.thoughtcrime.securesms.mediapreview.MediaPreviewViewModel;
-import org.thoughtcrime.securesms.mediapreview.MediaRailAdapter;
-import org.thoughtcrime.securesms.mms.GlideApp;
-import org.thoughtcrime.securesms.mms.PartAuthority;
-import org.thoughtcrime.securesms.permissions.Permissions;
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.AttachmentUtil;
-import org.thoughtcrime.securesms.util.DateUtils;
-import org.thoughtcrime.securesms.util.FullscreenHelper;
-import org.thoughtcrime.securesms.util.MediaUtil;
-import org.thoughtcrime.securesms.util.SaveAttachmentTask;
-import org.thoughtcrime.securesms.util.SaveAttachmentTask.Attachment;
-import org.thoughtcrime.securesms.util.StorageUtil;
-
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * Activity for displaying media attachments in-app
- */
-public final class MediaPreviewActivity extends PassphraseRequiredActivity
-  implements LoaderManager.LoaderCallbacks<Pair<Cursor, Integer>>,
-             MediaRailAdapter.RailItemListener,
-             MediaPreviewFragment.Events,
-             VoiceNoteMediaControllerOwner
-{
-
-  private final static String TAG = Log.tag(MediaPreviewActivity.class);
-
-  private ViewPager             mediaPager;
-  private View                  detailsContainer;
-  private TextView              caption;
-  private View                  captionContainer;
-  private RecyclerView          albumRail;
-  private MediaRailAdapter      albumRailAdapter;
-  private ViewGroup             playbackControlsContainer;
-  private Uri                   initialMediaUri;
-  private String                initialMediaType;
-  private long                  initialMediaSize;
-  private String                initialCaption;
-  private boolean               initialMediaIsVideoGif;
-  private boolean               leftIsRecent;
-  private MediaPreviewViewModel viewModel;
-  private ViewPagerListener     viewPagerListener;
-
-  private int                   restartItem      = -1;
-  private long                  threadId         = MediaIntentFactory.NOT_IN_A_THREAD;
-  private boolean               cameFromAllMedia;
-  private boolean               showThread;
-  private MediaDatabase.Sorting sorting;
-  private FullscreenHelper      fullscreenHelper;
-
-  private VoiceNoteMediaController voiceNoteMediaController;
-
-  private @Nullable Cursor cursor = null;
-
-  public static @NonNull Intent intentFromMediaRecord(@NonNull Context context,
-                                                      @NonNull MediaRecord mediaRecord,
-                                                      boolean leftIsRecent)
-  {
-    DatabaseAttachment attachment = Objects.requireNonNull(mediaRecord.getAttachment());
-    Intent intent = new Intent(context, MediaPreviewActivity.class);
-    intent.putExtra(MediaIntentFactory.THREAD_ID_EXTRA, mediaRecord.getThreadId());
-    intent.putExtra(MediaIntentFactory.DATE_EXTRA, mediaRecord.getDate());
-    intent.putExtra(MediaIntentFactory.SIZE_EXTRA, attachment.getSize());
-    intent.putExtra(MediaIntentFactory.CAPTION_EXTRA, attachment.getCaption());
-    intent.putExtra(MediaIntentFactory.LEFT_IS_RECENT_EXTRA, leftIsRecent);
-    intent.putExtra(MediaIntentFactory.IS_VIDEO_GIF, attachment.isVideoGif());
-    intent.setDataAndType(attachment.getUri(), mediaRecord.getContentType());
-    return intent;
-  }
-
-  @Override
-  protected void attachBaseContext(@NonNull Context newBase) {
-    getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-    super.attachBaseContext(newBase);
-  }
-
-  @SuppressWarnings("ConstantConditions")
-  @Override
-  protected void onCreate(Bundle bundle, boolean ready) {
-    this.setTheme(R.style.TextSecure_MediaPreview);
-    setContentView(R.layout.media_preview_activity);
-
-    setSupportActionBar(findViewById(R.id.toolbar));
-
-    voiceNoteMediaController = new VoiceNoteMediaController(this);
-    viewModel = new ViewModelProvider(this).get(MediaPreviewViewModel.class);
-
-    fullscreenHelper = new FullscreenHelper(this);
-
-    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-    initializeViews();
-    initializeResources();
-    initializeObservers();
-  }
-
-  @SuppressLint("MissingSuperCall")
-  @Override
-  public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-    Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
-  }
-
-  @Override
-  public void onRailItemClicked(int distanceFromActive) {
-    mediaPager.setCurrentItem(mediaPager.getCurrentItem() + distanceFromActive);
-  }
-
-  @Override
-  public void onRailItemDeleteClicked(int distanceFromActive) {
-    throw new UnsupportedOperationException("Callback unsupported.");
-  }
-
-  @SuppressWarnings("ConstantConditions")
-  private void initializeActionBar() {
-    MediaItem mediaItem = getCurrentMediaItem();
-
-    if (mediaItem != null) {
-      getSupportActionBar().setTitle(getTitleText(mediaItem));
-      getSupportActionBar().setSubtitle(getSubTitleText(mediaItem));
-    }
-  }
-
-  private @NonNull String getTitleText(@NonNull MediaItem mediaItem) {
-    String from;
-    if      (mediaItem.outgoing)          from = getString(R.string.MediaPreviewActivity_you);
-    else if (mediaItem.recipient != null) from = mediaItem.recipient.getDisplayName(this);
-    else                                  from = "";
-
-    if (showThread) {
-      String    titleText       = null;
-      Recipient threadRecipient = mediaItem.threadRecipient;
-
-      if (threadRecipient != null) {
-        if (mediaItem.outgoing) {
-          if (threadRecipient.isSelf()) {
-            titleText = getString(R.string.note_to_self);
-          } else {
-            titleText = getString(R.string.MediaPreviewActivity_you_to_s, threadRecipient.getDisplayName(this));
-          }
-        } else {
-          if (threadRecipient.isGroup()) {
-            titleText = getString(R.string.MediaPreviewActivity_s_to_s, from, threadRecipient.getDisplayName(this));
-          } else {
-            titleText = getString(R.string.MediaPreviewActivity_s_to_you, from);
-          }
-        }
-      }
-      return titleText != null ? titleText : from;
-    } else {
-      return from;
-    }
-  }
-
-  private @NonNull String getSubTitleText(@NonNull MediaItem mediaItem) {
-    if (mediaItem.date > 0) {
-      return DateUtils.getExtendedRelativeTimeSpanString(this, Locale.getDefault(), mediaItem.date);
-    } else {
-      return getString(R.string.MediaPreviewActivity_draft);
-    }
-  }
-
-  @Override
-  public void onResume() {
-    super.onResume();
-
-    initializeMedia();
-  }
-
-  @Override
-  public void onPause() {
-    super.onPause();
-    restartItem = cleanupMedia();
-  }
-
-  @Override
-  protected void onDestroy() {
-    if (cursor != null) {
-      cursor.close();
-      cursor = null;
-    }
-    super.onDestroy();
-  }
-
-  @Override
-  protected void onNewIntent(Intent intent) {
-    super.onNewIntent(intent);
-    setIntent(intent);
-    initializeResources();
-  }
-
-  private void initializeViews() {
-    mediaPager = findViewById(R.id.media_pager);
-    mediaPager.setOffscreenPageLimit(1);
-    mediaPager.setPageTransformer(true, new DepthPageTransformer());
-
-    viewPagerListener = new ViewPagerListener();
-    mediaPager.addOnPageChangeListener(viewPagerListener);
-
-    albumRail        = findViewById(R.id.media_preview_album_rail);
-    albumRailAdapter = new MediaRailAdapter(GlideApp.with(this), this, false);
-
-    albumRail.setItemAnimator(null); // Or can crash when set to INVISIBLE while animating by FullscreenHelper https://issuetracker.google.com/issues/148720682
-    albumRail.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false));
-    albumRail.setAdapter(albumRailAdapter);
-
-    detailsContainer          = findViewById(R.id.media_preview_details_container);
-    caption                   = findViewById(R.id.media_preview_caption);
-    captionContainer          = findViewById(R.id.media_preview_caption_container);
-    playbackControlsContainer = findViewById(R.id.media_preview_playback_controls_container);
-
-    View toolbarLayout = findViewById(R.id.toolbar_layout);
-
-    anchorMarginsToBottomInsets(detailsContainer);
-
-    fullscreenHelper.configureToolbarLayout(findViewById(R.id.toolbar_cutout_spacer), findViewById(R.id.toolbar));
-
-    fullscreenHelper.showAndHideWithSystemUI(getWindow(), detailsContainer, toolbarLayout);
-  }
-
-  private void initializeResources() {
-    Intent intent = getIntent();
-
-    threadId         = intent.getLongExtra(MediaIntentFactory.THREAD_ID_EXTRA, MediaIntentFactory.NOT_IN_A_THREAD);
-    cameFromAllMedia = intent.getBooleanExtra(MediaIntentFactory.HIDE_ALL_MEDIA_EXTRA, false);
-    showThread       = intent.getBooleanExtra(MediaIntentFactory.SHOW_THREAD_EXTRA, false);
-    sorting          = MediaDatabase.Sorting.values()[intent.getIntExtra(MediaIntentFactory.SORTING_EXTRA, 0)];
-
-    initialMediaUri        = intent.getData();
-    initialMediaType       = intent.getType();
-    initialMediaSize       = intent.getLongExtra(MediaIntentFactory.SIZE_EXTRA, 0);
-    initialCaption         = intent.getStringExtra(MediaIntentFactory.CAPTION_EXTRA);
-    leftIsRecent           = intent.getBooleanExtra(MediaIntentFactory.LEFT_IS_RECENT_EXTRA, false);
-    initialMediaIsVideoGif = intent.getBooleanExtra(MediaIntentFactory.IS_VIDEO_GIF, false);
-    restartItem            = -1;
-  }
-
-  private void initializeObservers() {
-    viewModel.getPreviewData().observe(this, previewData -> {
-      if (previewData == null || mediaPager == null || mediaPager.getAdapter() == null) {
-        return;
-      }
-
-      if (!((MediaItemAdapter) mediaPager.getAdapter()).hasFragmentFor(mediaPager.getCurrentItem())) {
-        Log.d(TAG, "MediaItemAdapter wasn't ready. Posting again...");
-        viewModel.resubmitPreviewData();
-      }
-
-      View playbackControls = ((MediaItemAdapter) mediaPager.getAdapter()).getPlaybackControls(mediaPager.getCurrentItem());
-
-      if (previewData.getAlbumThumbnails().isEmpty() && previewData.getCaption() == null && playbackControls == null) {
-        detailsContainer.setVisibility(View.GONE);
-      } else {
-        detailsContainer.setVisibility(View.VISIBLE);
-      }
-
-      albumRail.setVisibility(previewData.getAlbumThumbnails().isEmpty() ? View.GONE : View.VISIBLE);
-      albumRailAdapter.setMedia(previewData.getAlbumThumbnails(), previewData.getActivePosition());
-      albumRail.smoothScrollToPosition(previewData.getActivePosition());
-
-      captionContainer.setVisibility(previewData.getCaption() == null ? View.GONE : View.VISIBLE);
-      caption.setText(previewData.getCaption());
-
-      if (playbackControls != null) {
-        ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-        playbackControls.setLayoutParams(params);
-
-        playbackControlsContainer.removeAllViews();
-        playbackControlsContainer.addView(playbackControls);
-      } else {
-        playbackControlsContainer.removeAllViews();
-      }
-    });
-  }
-
-  private void initializeMedia() {
-    if (!isContentTypeSupported(initialMediaType)) {
-      Log.w(TAG, "Unsupported media type sent to MediaPreviewActivity, finishing.");
-      Toast.makeText(getApplicationContext(), R.string.MediaPreviewActivity_unssuported_media_type, Toast.LENGTH_LONG).show();
-      finish();
-    }
-
-    Log.i(TAG, "Loading Part URI: " + initialMediaUri);
-
-    if (isMediaInDb()) {
-      LoaderManager.getInstance(this).restartLoader(0, null, this);
-    } else {
-      mediaPager.setAdapter(new SingleItemPagerAdapter(getSupportFragmentManager(), initialMediaUri, initialMediaType, initialMediaSize, initialMediaIsVideoGif));
-
-      if (initialCaption != null) {
-        detailsContainer.setVisibility(View.VISIBLE);
-        captionContainer.setVisibility(View.VISIBLE);
-        caption.setText(initialCaption);
-      }
-    }
-  }
-
-  private int cleanupMedia() {
-    int restartItem = mediaPager.getCurrentItem();
-
-    mediaPager.removeAllViews();
-    mediaPager.setAdapter(null);
-    viewModel.setCursor(this, null, leftIsRecent);
-
-    return restartItem;
-  }
-
-  private void showOverview() {
-    startActivity(MediaOverviewActivity.forThread(this, threadId));
-  }
-
-  private void forward() {
-    MediaItem mediaItem = getCurrentMediaItem();
-
-    if (mediaItem != null) {
-      MultiselectForwardFragmentArgs.create(
-          this,
-          threadId,
-          mediaItem.uri,
-          mediaItem.type,
-          args -> MultiselectForwardFragment.showBottomSheet(getSupportFragmentManager(), args)
-      );
-    }
-  }
-
-  private void share() {
-    MediaItem mediaItem = getCurrentMediaItem();
-
-    if (mediaItem != null) {
-      Uri    publicUri   = PartAuthority.getAttachmentPublicUri(mediaItem.uri);
-      String mimeType    = Intent.normalizeMimeType(mediaItem.type);
-      Intent shareIntent = ShareCompat.IntentBuilder.from(this)
-                                                    .setStream(publicUri)
-                                                    .setType(mimeType)
-                                                    .createChooserIntent()
-                                                    .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-
-      try {
-        startActivity(shareIntent);
-      } catch (ActivityNotFoundException e) {
-        Log.w(TAG, "No activity existed to share the media.", e);
-        Toast.makeText(this, R.string.MediaPreviewActivity_cant_find_an_app_able_to_share_this_media, Toast.LENGTH_LONG).show();
-      }
-    }
-  }
-
-  @SuppressWarnings("CodeBlock2Expr")
-  @SuppressLint("InlinedApi")
-  private void saveToDisk() {
-    MediaItem mediaItem = getCurrentMediaItem();
-
-    if (mediaItem != null) {
-      SaveAttachmentTask.showWarningDialog(this, (dialogInterface, i) -> {
-        if (StorageUtil.canWriteToMediaStore()) {
-          performSavetoDisk(mediaItem);
-          return;
-        }
-
-        Permissions.with(this)
-                   .request(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                   .ifNecessary()
-                   .withPermanentDenialDialog(getString(R.string.MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied))
-                   .onAnyDenied(() -> Toast.makeText(this, R.string.MediaPreviewActivity_unable_to_write_to_external_storage_without_permission, Toast.LENGTH_LONG).show())
-                   .onAllGranted(() -> {
-                     performSavetoDisk(mediaItem);
-                   })
-                   .execute();
-      });
-    }
-  }
-
-  private void performSavetoDisk(@NonNull MediaItem mediaItem) {
-    SaveAttachmentTask saveTask = new SaveAttachmentTask(MediaPreviewActivity.this);
-    long               saveDate = (mediaItem.date > 0) ? mediaItem.date : System.currentTimeMillis();
-    saveTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Attachment(mediaItem.uri, mediaItem.type, saveDate, null));
-  }
-
-  @SuppressLint("StaticFieldLeak")
-  private void deleteMedia() {
-    MediaItem mediaItem = getCurrentMediaItem();
-    if (mediaItem == null || mediaItem.attachment == null) {
-      return;
-    }
-
-    AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
-    builder.setIcon(R.drawable.ic_warning);
-    builder.setTitle(R.string.MediaPreviewActivity_media_delete_confirmation_title);
-    builder.setMessage(R.string.MediaPreviewActivity_media_delete_confirmation_message);
-    builder.setCancelable(true);
-
-    builder.setPositiveButton(R.string.delete, (dialogInterface, which) -> {
-      new AsyncTask<Void, Void, Void>() {
-        @Override
-        protected Void doInBackground(Void... voids) {
-          AttachmentUtil.deleteAttachment(MediaPreviewActivity.this.getApplicationContext(),
-                                          mediaItem.attachment);
-          return null;
-        }
-      }.execute();
-
-      finish();
-    });
-    builder.setNegativeButton(android.R.string.cancel, null);
-    builder.show();
-  }
-
-  @Override
-  public boolean onCreateOptionsMenu(Menu menu) {
-    menu.clear();
-    MenuInflater inflater = this.getMenuInflater();
-    inflater.inflate(R.menu.media_preview, menu);
-
-    super.onCreateOptionsMenu(menu);
-    return true;
-  }
-
-  @Override
-  public boolean onPrepareOptionsMenu(Menu menu) {
-    if (!isMediaInDb()) {
-      menu.findItem(R.id.media_preview__overview).setVisible(false);
-      menu.findItem(R.id.delete).setVisible(false);
-    }
-
-    // Restricted to API26 because of MemoryFileUtil not supporting lower API levels well
-    menu.findItem(R.id.media_preview__share).setVisible(Build.VERSION.SDK_INT >= 26);
-
-    if (cameFromAllMedia) {
-      menu.findItem(R.id.media_preview__overview).setVisible(false);
-    }
-
-    super.onPrepareOptionsMenu(menu);
-    return true;
-  }
-
-  @Override
-  public boolean onOptionsItemSelected(@NonNull MenuItem item) {
-    super.onOptionsItemSelected(item);
-
-    int itemId = item.getItemId();
-
-    if (itemId == R.id.media_preview__overview) { showOverview(); return true; }
-    if (itemId == R.id.media_preview__forward)  { forward();      return true; }
-    if (itemId == R.id.media_preview__share)    { share();        return true; }
-    if (itemId == R.id.save)                    { saveToDisk();   return true; }
-    if (itemId == R.id.delete)                  { deleteMedia();  return true; }
-    if (itemId == android.R.id.home)            { finish();       return true; }
-
-    return false;
-  }
-
-  private boolean isMediaInDb() {
-    return threadId != MediaIntentFactory.NOT_IN_A_THREAD;
-  }
-
-  private @Nullable MediaItem getCurrentMediaItem() {
-    MediaItemAdapter adapter = (MediaItemAdapter)mediaPager.getAdapter();
-
-    if (adapter != null) {
-      return adapter.getMediaItemFor(mediaPager.getCurrentItem());
-    } else {
-      return null;
-    }
-  }
-
-  public static boolean isContentTypeSupported(final String contentType) {
-    return MediaUtil.isImageType(contentType) || MediaUtil.isVideoType(contentType);
-  }
-
-  @Override
-  public @NonNull Loader<Pair<Cursor, Integer>> onCreateLoader(int id, Bundle args) {
-    return new PagingMediaLoader(this, threadId, initialMediaUri, leftIsRecent, sorting);
-  }
-
-  @Override
-  public void onLoadFinished(@NonNull Loader<Pair<Cursor, Integer>> loader, @Nullable Pair<Cursor, Integer> data) {
-    if (data != null) {
-      if (data.first == cursor) {
-        return;
-      }
-
-      if (cursor != null) {
-        cursor.close();
-      }
-      cursor = Objects.requireNonNull(data.first);
-
-      viewModel.setCursor(this, cursor, leftIsRecent);
-
-      int mediaPosition = Objects.requireNonNull(data.second);
-
-      CursorPagerAdapter oldAdapter = (CursorPagerAdapter) mediaPager.getAdapter();
-      if (oldAdapter == null) {
-        CursorPagerAdapter adapter = new CursorPagerAdapter(getSupportFragmentManager(), this, cursor, mediaPosition, leftIsRecent);
-        mediaPager.setAdapter(adapter);
-        adapter.setActive(true);
-      } else {
-        oldAdapter.setCursor(cursor, mediaPosition);
-        oldAdapter.setActive(true);
-      }
-
-      if (oldAdapter == null || restartItem >= 0) {
-        int item = restartItem >= 0 ? restartItem : mediaPosition;
-        mediaPager.setCurrentItem(item);
-
-        if (item == 0) {
-          viewPagerListener.onPageSelected(0);
-        }
-      }
-    } else {
-      mediaNotAvailable();
-    }
-  }
-
-  @Override
-  public void onLoaderReset(@NonNull Loader<Pair<Cursor, Integer>> loader) {
-
-  }
-
-  @Override
-  public boolean singleTapOnMedia() {
-    fullscreenHelper.toggleUiVisibility();
-    return true;
-  }
-
-  @Override
-  public void mediaNotAvailable() {
-    Toast.makeText(this, R.string.MediaPreviewActivity_media_no_longer_available, Toast.LENGTH_LONG).show();
-    finish();
-  }
-
-  @Override
-  public void onMediaReady() {
-  }
-
-  @Override
-  public @NonNull VoiceNoteMediaController getVoiceNoteMediaController() {
-    return voiceNoteMediaController;
-  }
-
-  private class ViewPagerListener extends ExtendedOnPageChangedListener {
-
-    @Override
-    public void onPageSelected(int position) {
-      super.onPageSelected(position);
-
-      MediaItemAdapter adapter = (MediaItemAdapter)mediaPager.getAdapter();
-
-      if (adapter != null) {
-        MediaItem item = adapter.getMediaItemFor(position);
-        if (item != null && item.recipient != null) {
-          item.recipient.live().observe(MediaPreviewActivity.this, r -> initializeActionBar());
-        }
-
-        viewModel.setActiveAlbumRailItem(MediaPreviewActivity.this, position);
-        initializeActionBar();
-      }
-    }
-
-
-    @Override
-    public void onPageUnselected(int position) {
-      MediaItemAdapter adapter = (MediaItemAdapter)mediaPager.getAdapter();
-
-      if (adapter != null) {
-        MediaItem item = adapter.getMediaItemFor(position);
-        if (item != null && item.recipient != null) {
-          item.recipient.live().removeObservers(MediaPreviewActivity.this);
-        }
-
-        adapter.pause(position);
-      }
-    }
-  }
-
-  private static class SingleItemPagerAdapter extends FragmentStatePagerAdapter implements MediaItemAdapter {
-
-    private final Uri     uri;
-    private final String  mediaType;
-    private final long    size;
-    private final boolean isVideoGif;
-
-    private MediaPreviewFragment mediaPreviewFragment;
-
-    SingleItemPagerAdapter(@NonNull FragmentManager fragmentManager,
-                           @NonNull Uri uri,
-                           @NonNull String mediaType,
-                           long size,
-                           boolean isVideoGif)
-    {
-      super(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
-      this.uri        = uri;
-      this.mediaType  = mediaType;
-      this.size       = size;
-      this.isVideoGif = isVideoGif;
-    }
-
-    @Override
-    public int getCount() {
-      return 1;
-    }
-
-    @NonNull
-    @Override
-    public Fragment getItem(int position) {
-      mediaPreviewFragment = MediaPreviewFragment.newInstance(uri, mediaType, size, true, isVideoGif);
-      return mediaPreviewFragment;
-    }
-
-    @Override
-    public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
-      if (mediaPreviewFragment != null) {
-        mediaPreviewFragment.cleanUp();
-        mediaPreviewFragment = null;
-      }
-    }
-
-    @Override
-    public @Nullable MediaItem getMediaItemFor(int position) {
-      return new MediaItem(null, null, null, uri, mediaType, -1, true);
-    }
-
-    @Override
-    public void pause(int position) {
-      if (mediaPreviewFragment != null) {
-        mediaPreviewFragment.pause();
-      }
-    }
-
-    @Override
-    public @Nullable View getPlaybackControls(int position) {
-      if (mediaPreviewFragment != null) {
-        return mediaPreviewFragment.getPlaybackControls();
-      }
-      return null;
-    }
-
-    @Override
-    public boolean hasFragmentFor(int position) {
-      return mediaPreviewFragment != null;
-    }
-  }
-
-  private static void anchorMarginsToBottomInsets(@NonNull View viewToAnchor) {
-    ViewCompat.setOnApplyWindowInsetsListener(viewToAnchor, (view, insets) -> {
-      ViewGroup.MarginLayoutParams layoutParams = (ViewGroup.MarginLayoutParams) view.getLayoutParams();
-
-      layoutParams.setMargins(insets.getSystemWindowInsetLeft(),
-                              layoutParams.topMargin,
-                              insets.getSystemWindowInsetRight(),
-                              insets.getSystemWindowInsetBottom());
-
-      view.setLayoutParams(layoutParams);
-
-      return insets;
-    });
-  }
-
-  private static class CursorPagerAdapter extends FragmentStatePagerAdapter implements MediaItemAdapter {
-
-    @SuppressLint("UseSparseArrays")
-    private final Map<Integer, MediaPreviewFragment> mediaFragments = new HashMap<>();
-
-    private final Context context;
-    private final boolean leftIsRecent;
-
-    private boolean active;
-    private Cursor  cursor;
-    private int     autoPlayPosition;
-
-    CursorPagerAdapter(@NonNull FragmentManager fragmentManager,
-                       @NonNull Context context,
-                       @NonNull Cursor cursor,
-                       int autoPlayPosition,
-                       boolean leftIsRecent)
-    {
-      super(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
-      this.context          = context.getApplicationContext();
-      this.cursor           = cursor;
-      this.autoPlayPosition = autoPlayPosition;
-      this.leftIsRecent     = leftIsRecent;
-    }
-
-    public void setActive(boolean active) {
-      this.active = active;
-      notifyDataSetChanged();
-    }
-
-    public void setCursor(@NonNull Cursor cursor, int autoPlayPosition) {
-      this.cursor           = cursor;
-      this.autoPlayPosition = autoPlayPosition;
-    }
-
-    @Override
-    public int getCount() {
-      if (!active) return 0;
-      else         return cursor.getCount();
-    }
-
-    @NonNull
-    @Override
-    public Fragment getItem(int position) {
-      boolean autoPlay = autoPlayPosition == position;
-      int cursorPosition = getCursorPosition(position);
-
-      autoPlayPosition = -1;
-
-      cursor.moveToPosition(cursorPosition);
-
-      MediaDatabase.MediaRecord mediaRecord = MediaDatabase.MediaRecord.from(cursor);
-      DatabaseAttachment        attachment  = Objects.requireNonNull(mediaRecord.getAttachment());
-      MediaPreviewFragment      fragment    = MediaPreviewFragment.newInstance(attachment, autoPlay);
-
-      mediaFragments.put(position, fragment);
-
-      return fragment;
-    }
-
-    @Override
-    public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
-      MediaPreviewFragment removed = mediaFragments.remove(position);
-
-      if (removed != null) {
-        removed.cleanUp();
-      }
-
-      super.destroyItem(container, position, object);
-    }
-
-    public @Nullable MediaItem getMediaItemFor(int position) {
-      int cursorPosition = getCursorPosition(position);
-
-      if (cursor.isClosed() || cursorPosition < 0) {
-        Log.w(TAG, "Invalid cursor state! Closed: " + cursor.isClosed() + " Position: " + cursorPosition);
-        return null;
-      }
-
-      cursor.moveToPosition(cursorPosition);
-
-      MediaRecord        mediaRecord       = MediaRecord.from(cursor);
-      DatabaseAttachment attachment        = Objects.requireNonNull(mediaRecord.getAttachment());
-      RecipientId        recipientId       = mediaRecord.getRecipientId();
-      RecipientId        threadRecipientId = mediaRecord.getThreadRecipientId();
-
-      return new MediaItem(Recipient.live(recipientId).get(),
-                           Recipient.live(threadRecipientId).get(),
-                           attachment,
-                           Objects.requireNonNull(attachment.getUri()),
-                           mediaRecord.getContentType(),
-                           mediaRecord.getDate(),
-                           mediaRecord.isOutgoing());
-    }
-
-    @Override
-    public void pause(int position) {
-      MediaPreviewFragment mediaView = mediaFragments.get(position);
-      if (mediaView != null) mediaView.pause();
-    }
-
-    @Override
-    public @Nullable View getPlaybackControls(int position) {
-      MediaPreviewFragment mediaView = mediaFragments.get(position);
-      if (mediaView != null) return mediaView.getPlaybackControls();
-      return null;
-    }
-
-    @Override
-    public boolean hasFragmentFor(int position) {
-      return mediaFragments.containsKey(position);
-    }
-
-    private int getCursorPosition(int position) {
-      if (leftIsRecent) return position;
-      else              return cursor.getCount() - 1 - position;
-    }
-  }
-
-  private static class MediaItem {
-    private final @Nullable Recipient          recipient;
-    private final @Nullable Recipient          threadRecipient;
-    private final @Nullable DatabaseAttachment attachment;
-    private final @NonNull  Uri                uri;
-    private final @NonNull  String             type;
-    private final           long               date;
-    private final           boolean            outgoing;
-
-    private MediaItem(@Nullable Recipient recipient,
-                      @Nullable Recipient threadRecipient,
-                      @Nullable DatabaseAttachment attachment,
-                      @NonNull Uri uri,
-                      @NonNull String type,
-                      long date,
-                      boolean outgoing)
-    {
-      this.recipient       = recipient;
-      this.threadRecipient = threadRecipient;
-      this.attachment      = attachment;
-      this.uri             = uri;
-      this.type            = type;
-      this.date            = date;
-      this.outgoing        = outgoing;
-    }
-  }
-
-  interface MediaItemAdapter {
-    @Nullable MediaItem getMediaItemFor(int position);
-    void pause(int position);
-    @Nullable View getPlaybackControls(int position);
-    boolean hasFragmentFor(int position);
-  }
-}

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

@@ -20,6 +20,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.activity.result.ActivityResultLauncher;
@@ -39,26 +40,22 @@ 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.paged.ContactSearchKey;
 import org.thoughtcrime.securesms.contacts.sync.ContactDiscovery;
 import org.thoughtcrime.securesms.conversation.ConversationIntents;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.groups.ui.creategroup.CreateGroupActivity;
-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.thoughtcrime.securesms.util.Util;
 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;
@@ -180,22 +177,23 @@ public class NewConversationActivity extends ContactSelectionActivity
   public boolean onOptionsItemSelected(MenuItem item) {
     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;
-    }
+    int itemId = item.getItemId();
 
-    return false;
+    if (itemId == android.R.id.home) {
+      super.onBackPressed();
+      return true;
+    } else if (itemId == R.id.menu_refresh) {
+      handleManualRefresh();
+      return true;
+    } else if (itemId == R.id.menu_new_group) {
+      handleCreateGroup();
+      return true;
+    } else if (itemId == R.id.menu_invite) {
+      handleInvite();
+      return true;
+    } else {
+      return false;
+    }
   }
 
   private void handleManualRefresh() {
@@ -233,18 +231,14 @@ public class NewConversationActivity extends ContactSelectionActivity
   }
 
   @Override
-  public boolean onLongClick(ContactSelectionListItem contactSelectionListItem, RecyclerView recyclerView) {
-    RecipientId recipientId = contactSelectionListItem.getRecipientId().orElse(null);
-    if (recipientId == null) {
-      return false;
-    }
-
+  public boolean onLongClick(View anchorView, ContactSearchKey contactSearchKey, RecyclerView recyclerView) {
+    RecipientId recipientId = contactSearchKey.requireRecipientSearchKey().getRecipientId();
     List<ActionItem> actions = generateContextualActionsForRecipient(recipientId);
     if (actions.isEmpty()) {
       return false;
     }
 
-    new SignalContextMenu.Builder(contactSelectionListItem, (ViewGroup) contactSelectionListItem.getRootView())
+    new SignalContextMenu.Builder(anchorView, (ViewGroup) anchorView.getRootView())
         .preferredVerticalPosition(SignalContextMenu.VerticalPosition.BELOW)
         .preferredHorizontalPosition(SignalContextMenu.HorizontalPosition.START)
         .offsetX((int) DimensionUnit.DP.toPixels(12))
@@ -342,7 +336,8 @@ public class NewConversationActivity extends ContactSelectionActivity
                                               recipient,
                                               () -> {
                                                 disposables.add(viewModel.blockContact(recipient).subscribe(() -> {
-                                                  displaySnackbar(R.string.NewConversationActivity__s_has_been_removed);
+                                                  displaySnackbar(R.string.NewConversationActivity__s_has_been_blocked, recipient.getDisplayName(this));
+                                                  contactsFragment.reset();
                                                 }));
                                               })
     );
@@ -366,7 +361,7 @@ public class NewConversationActivity extends ContactSelectionActivity
         .setPositiveButton(R.string.NewConversationActivity__remove,
                            (dialog, which) -> {
                              disposables.add(viewModel.hideContact(recipient).subscribe(() -> {
-                               displaySnackbar(R.string.NewConversationActivity__s_has_been_removed);
+                               displaySnackbar(R.string.NewConversationActivity__s_has_been_removed, recipient.getDisplayName(this));
                              }));
                            }
         )
@@ -374,7 +369,7 @@ public class NewConversationActivity extends ContactSelectionActivity
         .show();
   }
 
-  private void displaySnackbar(@StringRes int message) {
-    Snackbar.make(findViewById(android.R.id.content), message, Snackbar.LENGTH_SHORT).show();
+  private void displaySnackbar(@StringRes int message, Object ... formatArgs) {
+    Snackbar.make(findViewById(android.R.id.content), getString(message, formatArgs), Snackbar.LENGTH_SHORT).show();
   }
 }

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

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

app/src/main/java/org/thoughtcrime/securesms/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());
   }
@@ -273,10 +259,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;

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

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

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

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

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

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

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

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

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

@@ -11,7 +11,7 @@ public abstract class AnimationCompleteListener implements Animator.AnimatorList
   public abstract void onAnimationEnd(Animator animation);
 
   @Override
-  public final void onAnimationCancel(Animator animation) {}
+  public void onAnimationCancel(Animator animation) {}
   @Override
   public final void onAnimationRepeat(Animator animation) {}
 }

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

@@ -0,0 +1,9 @@
+package org.thoughtcrime.securesms.animation
+
+import android.animation.Animator
+
+abstract class AnimationStartListener : Animator.AnimatorListener {
+  override fun onAnimationEnd(animation: Animator) = Unit
+  override fun onAnimationCancel(animation: Animator) = Unit
+  override fun onAnimationRepeat(animation: Animator) = Unit
+}

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

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

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

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

app/src/main/java/org/thoughtcrime/securesms/animation/transitions/CircleSquareImageViewTransition.java

@@ -13,7 +13,6 @@ import android.widget.ImageView;
 
 import androidx.core.graphics.drawable.RoundedBitmapDrawable;
 
-@TargetApi(21)
 abstract class CircleSquareImageViewTransition extends Transition {
 
   private static final String CIRCLE_RATIO = "CIRCLE_RATIO";

app/src/main/java/org/thoughtcrime/securesms/animation/transitions/CircleToSquareImageViewTransition.java

@@ -7,7 +7,6 @@ import android.util.AttributeSet;
 /**
  * Will only transition {@link android.widget.ImageView}s that contain a {@link androidx.core.graphics.drawable.RoundedBitmapDrawable}.
  */
-@TargetApi(21)
 public final class CircleToSquareImageViewTransition extends CircleSquareImageViewTransition {
   public CircleToSquareImageViewTransition(Context context, AttributeSet attrs) {
     super(false);

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

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

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

@@ -3,15 +3,14 @@ package org.thoughtcrime.securesms.animation.transitions
 import android.animation.Animator
 import android.animation.ValueAnimator
 import android.content.Context
-import android.transition.Transition
-import android.transition.TransitionValues
 import android.util.AttributeSet
 import android.view.ViewGroup
-import androidx.annotation.RequiresApi
+import androidx.core.view.ViewCompat
+import androidx.transition.Transition
+import androidx.transition.TransitionValues
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 
-@RequiresApi(21)
-class FabElevationFadeTransform(context: Context, attrs: AttributeSet?) : Transition(context, attrs) {
+class FabElevationFadeTransform(context: Context, attrs: AttributeSet) : Transition(context, attrs) {
 
   companion object {
     private const val ELEVATION = "CrossfaderTransition.ELEVATION"
@@ -19,23 +18,23 @@ class FabElevationFadeTransform(context: Context, attrs: AttributeSet?) : Transi
 
   override fun captureStartValues(transitionValues: TransitionValues) {
     if (transitionValues.view is FloatingActionButton) {
-      transitionValues.values[ELEVATION] = transitionValues.view.elevation
+      transitionValues.values[ELEVATION] = ViewCompat.getElevation(transitionValues.view)
     }
   }
 
   override fun captureEndValues(transitionValues: TransitionValues) {
     if (transitionValues.view is FloatingActionButton) {
-      transitionValues.values[ELEVATION] = transitionValues.view.elevation
+      transitionValues.values[ELEVATION] = ViewCompat.getElevation(transitionValues.view)
     }
   }
 
-  override fun createAnimator(sceneRoot: ViewGroup?, startValues: TransitionValues?, endValues: TransitionValues?): Animator? {
+  override fun createAnimator(sceneRoot: ViewGroup, startValues: TransitionValues?, endValues: TransitionValues?): Animator? {
     if (startValues?.view !is FloatingActionButton || endValues?.view !is FloatingActionButton) {
       return null
     }
 
-    val startElevation = startValues.view.elevation
-    val endElevation = endValues.view.elevation
+    val startElevation = ViewCompat.getElevation(startValues.view)
+    val endElevation = ViewCompat.getElevation(endValues.view)
     if (startElevation == endElevation) {
       return null
     }
@@ -46,7 +45,7 @@ class FabElevationFadeTransform(context: Context, attrs: AttributeSet?) : Transi
     ).apply {
       addUpdateListener {
         val elevation = it.animatedValue as Float
-        endValues.view.elevation = elevation
+        ViewCompat.setElevation(endValues.view, elevation)
       }
     }
   }

app/src/main/java/org/thoughtcrime/securesms/animation/transitions/SquareToCircleImageViewTransition.java

@@ -7,7 +7,6 @@ import android.util.AttributeSet;
 /**
  * Will only transition {@link android.widget.ImageView}s that contain a {@link androidx.core.graphics.drawable.RoundedBitmapDrawable}.
  */
-@TargetApi(21)
 public final class SquareToCircleImageViewTransition extends CircleSquareImageViewTransition {
   public SquareToCircleImageViewTransition(Context context, AttributeSet attrs) {
     super(true);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,45 @@
+package org.thoughtcrime.securesms.audio;
+
+import androidx.annotation.NonNull;
+
+import com.google.protobuf.ByteString;
+
+import org.thoughtcrime.securesms.database.model.databaseprotos.AudioWaveFormData;
+
+import java.util.concurrent.TimeUnit;
+
+public class AudioFileInfo {
+  private final long    durationUs;
+  private final byte[]  waveFormBytes;
+  private final float[] waveForm;
+
+  public static @NonNull AudioFileInfo fromDatabaseProtobuf(@NonNull AudioWaveFormData audioWaveForm) {
+    return new AudioFileInfo(audioWaveForm.getDurationUs(), audioWaveForm.getWaveForm().toByteArray());
+  }
+
+  AudioFileInfo(long durationUs, byte[] waveFormBytes) {
+    this.durationUs    = durationUs;
+    this.waveFormBytes = waveFormBytes;
+    this.waveForm      = new float[waveFormBytes.length];
+
+    for (int i = 0; i < waveFormBytes.length; i++) {
+      int unsigned = waveFormBytes[i] & 0xff;
+      this.waveForm[i] = unsigned / 255f;
+    }
+  }
+
+  public long getDuration(@NonNull TimeUnit timeUnit) {
+    return timeUnit.convert(durationUs, TimeUnit.MICROSECONDS);
+  }
+
+  public float[] getWaveForm() {
+    return waveForm;
+  }
+
+  public @NonNull AudioWaveFormData toDatabaseProtobuf() {
+    return AudioWaveFormData.newBuilder()
+                            .setDurationUs(durationUs)
+                            .setWaveForm(ByteString.copyFrom(waveFormBytes))
+                            .build();
+  }
+}

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

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

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

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

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

@@ -0,0 +1,10 @@
+package org.thoughtcrime.securesms.audio
+
+interface AudioRecordingHandler {
+  fun onRecordPressed()
+  fun onRecordReleased()
+  fun onRecordCanceled(byUser: Boolean)
+  fun onRecordLocked()
+  fun onRecordMoved(offsetX: Float, absoluteX: Float)
+  fun onRecordPermissionRequired()
+}

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

@@ -1,325 +0,0 @@
-package org.thoughtcrime.securesms.audio;
-
-import android.content.Context;
-import android.media.MediaCodec;
-import android.media.MediaExtractor;
-import android.media.MediaFormat;
-import android.net.Uri;
-import android.os.Build;
-import android.util.LruCache;
-
-import androidx.annotation.AnyThread;
-import androidx.annotation.NonNull;
-import androidx.annotation.RequiresApi;
-import androidx.annotation.WorkerThread;
-import androidx.core.util.Consumer;
-
-import com.google.protobuf.ByteString;
-
-import org.signal.core.util.ThreadUtil;
-import org.signal.core.util.concurrent.SignalExecutors;
-import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.attachments.Attachment;
-import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
-import org.thoughtcrime.securesms.database.AttachmentDatabase;
-import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.database.model.databaseprotos.AudioWaveFormData;
-import org.thoughtcrime.securesms.media.DecryptableUriMediaInput;
-import org.thoughtcrime.securesms.media.MediaInput;
-import org.thoughtcrime.securesms.mms.AudioSlide;
-import org.thoughtcrime.securesms.util.concurrent.SerialExecutor;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Locale;
-import java.util.concurrent.Executor;
-import java.util.concurrent.TimeUnit;
-
-@RequiresApi(api = Build.VERSION_CODES.M)
-public final class AudioWaveForm {
-
-  private static final String TAG = Log.tag(AudioWaveForm.class);
-
-  private static final int BAR_COUNT       = 46;
-  private static final int SAMPLES_PER_BAR =  4;
-
-  private final Context    context;
-  private final AudioSlide slide;
-
-  public AudioWaveForm(@NonNull Context context, @NonNull AudioSlide slide) {
-    this.context = context.getApplicationContext();
-    this.slide   = slide;
-  }
-
-  private static final LruCache<String, AudioFileInfo> WAVE_FORM_CACHE        = new LruCache<>(200);
-  private static final Executor                        AUDIO_DECODER_EXECUTOR = new SerialExecutor(SignalExecutors.BOUNDED);
-
-  @AnyThread
-  public void getWaveForm(@NonNull Consumer<AudioFileInfo> onSuccess, @NonNull Runnable onFailure) {
-    Uri        uri        = slide.getUri();
-    Attachment attachment = slide.asAttachment();
-
-    if (uri == null) {
-      Log.w(TAG, "No uri");
-      ThreadUtil.runOnMain(onFailure);
-      return;
-    }
-
-    String        cacheKey = uri.toString();
-    AudioFileInfo cached   = WAVE_FORM_CACHE.get(cacheKey);
-    if (cached != null) {
-      Log.i(TAG, "Loaded wave form from cache " + cacheKey);
-      ThreadUtil.runOnMain(() -> onSuccess.accept(cached));
-      return;
-    }
-
-    AUDIO_DECODER_EXECUTOR.execute(() -> {
-      AudioFileInfo cachedInExecutor = WAVE_FORM_CACHE.get(cacheKey);
-      if (cachedInExecutor != null) {
-        Log.i(TAG, "Loaded wave form from cache inside executor" + cacheKey);
-        ThreadUtil.runOnMain(() -> onSuccess.accept(cachedInExecutor));
-        return;
-      }
-
-      AudioHash audioHash = attachment.getAudioHash();
-      if (audioHash != null) {
-        AudioFileInfo audioFileInfo = AudioFileInfo.fromDatabaseProtobuf(audioHash.getAudioWaveForm());
-        if (audioFileInfo.waveForm.length == 0) {
-          Log.w(TAG, "Recovering from a wave form generation error  " + cacheKey);
-          ThreadUtil.runOnMain(onFailure);
-          return;
-        } else if (audioFileInfo.waveForm.length != BAR_COUNT) {
-          Log.w(TAG, "Wave form from database does not match bar count, regenerating " + cacheKey);
-        } else {
-          WAVE_FORM_CACHE.put(cacheKey, audioFileInfo);
-          Log.i(TAG, "Loaded wave form from DB " + cacheKey);
-          ThreadUtil.runOnMain(() -> onSuccess.accept(audioFileInfo));
-          return;
-        }
-      }
-
-      if (attachment instanceof DatabaseAttachment) {
-        try {
-          AttachmentDatabase attachmentDatabase = SignalDatabase.attachments();
-          DatabaseAttachment dbAttachment       = (DatabaseAttachment) attachment;
-          long               startTime          = System.currentTimeMillis();
-
-          attachmentDatabase.writeAudioHash(dbAttachment.getAttachmentId(), AudioWaveFormData.getDefaultInstance());
-
-          Log.i(TAG, String.format("Starting wave form generation (%s)", cacheKey));
-
-          AudioFileInfo fileInfo = generateWaveForm(uri);
-
-          Log.i(TAG, String.format(Locale.US, "Audio wave form generation time %d ms (%s)", System.currentTimeMillis() - startTime, cacheKey));
-
-          attachmentDatabase.writeAudioHash(dbAttachment.getAttachmentId(), fileInfo.toDatabaseProtobuf());
-
-          WAVE_FORM_CACHE.put(cacheKey, fileInfo);
-          ThreadUtil.runOnMain(() -> onSuccess.accept(fileInfo));
-        } catch (Throwable e) {
-          Log.w(TAG, "Failed to create audio wave form for " + cacheKey, e);
-          ThreadUtil.runOnMain(onFailure);
-        }
-      } else {
-        try {
-          Log.i(TAG, "Not in database and not cached. Generating wave form on-the-fly.");
-
-          long startTime = System.currentTimeMillis();
-
-          Log.i(TAG, String.format("Starting wave form generation (%s)", cacheKey));
-
-          AudioFileInfo fileInfo = generateWaveForm(uri);
-
-          Log.i(TAG, String.format(Locale.US, "Audio wave form generation time %d ms (%s)", System.currentTimeMillis() - startTime, cacheKey));
-
-          WAVE_FORM_CACHE.put(cacheKey, fileInfo);
-          ThreadUtil.runOnMain(() -> onSuccess.accept(fileInfo));
-        } catch (IOException e) {
-          Log.w(TAG, "Failed to create audio wave form for " + cacheKey, e);
-          ThreadUtil.runOnMain(onFailure);
-        }
-      }
-    });
-  }
-
-  /**
-   * Based on decode sample from:
-   * <p>
-   * https://android.googlesource.com/platform/cts/+/jb-mr2-release/tests/tests/media/src/android/media/cts/DecoderTest.java
-   */
-  @WorkerThread
-  @RequiresApi(api = 23)
-  private @NonNull AudioFileInfo generateWaveForm(@NonNull Uri uri) throws IOException {
-    try (MediaInput dataSource = DecryptableUriMediaInput.createForUri(context, uri)) {
-      long[] wave        = new long[BAR_COUNT];
-      int[]  waveSamples = new int[BAR_COUNT];
-
-      MediaExtractor extractor = dataSource.createExtractor();
-
-      if (extractor.getTrackCount() == 0) {
-        throw new IOException("No audio track");
-      }
-
-      MediaFormat format = extractor.getTrackFormat(0);
-
-      if (!format.containsKey(MediaFormat.KEY_DURATION)) {
-        throw new IOException("Unknown duration");
-      }
-
-      long   totalDurationUs = format.getLong(MediaFormat.KEY_DURATION);
-      String mime            = format.getString(MediaFormat.KEY_MIME);
-
-      if (!mime.startsWith("audio/")) {
-        throw new IOException("Mime not audio");
-      }
-
-      MediaCodec codec = MediaCodec.createDecoderByType(mime);
-
-      if (totalDurationUs == 0) {
-        throw new IOException("Zero duration");
-      }
-
-      codec.configure(format, null, null, 0);
-      codec.start();
-
-      ByteBuffer[] codecInputBuffers  = codec.getInputBuffers();
-      ByteBuffer[] codecOutputBuffers = codec.getOutputBuffers();
-
-      extractor.selectTrack(0);
-
-      long                  kTimeOutUs      = 5000;
-      MediaCodec.BufferInfo info            = new MediaCodec.BufferInfo();
-      boolean               sawInputEOS     = false;
-      boolean               sawOutputEOS    = false;
-      int                   noOutputCounter = 0;
-
-      while (!sawOutputEOS && noOutputCounter < 50) {
-        noOutputCounter++;
-        if (!sawInputEOS) {
-          int inputBufIndex = codec.dequeueInputBuffer(kTimeOutUs);
-          if (inputBufIndex >= 0) {
-            ByteBuffer dstBuf             = codecInputBuffers[inputBufIndex];
-            int        sampleSize         = extractor.readSampleData(dstBuf, 0);
-            long       presentationTimeUs = 0;
-
-            if (sampleSize < 0) {
-              sawInputEOS = true;
-              sampleSize  = 0;
-            } else {
-              presentationTimeUs = extractor.getSampleTime();
-            }
-
-            codec.queueInputBuffer(
-              inputBufIndex,
-              0,
-              sampleSize,
-              presentationTimeUs,
-              sawInputEOS ? MediaCodec.BUFFER_FLAG_END_OF_STREAM : 0);
-
-            if (!sawInputEOS) {
-              int barSampleIndex = (int) (SAMPLES_PER_BAR * (wave.length * extractor.getSampleTime()) / totalDurationUs);
-              sawInputEOS = !extractor.advance();
-              int nextBarSampleIndex = (int) (SAMPLES_PER_BAR * (wave.length * extractor.getSampleTime()) / totalDurationUs);
-              while (!sawInputEOS && nextBarSampleIndex == barSampleIndex) {
-                sawInputEOS = !extractor.advance();
-                if (!sawInputEOS) {
-                  nextBarSampleIndex = (int) (SAMPLES_PER_BAR * (wave.length * extractor.getSampleTime()) / totalDurationUs);
-                }
-              }
-            }
-          }
-        }
-
-        int outputBufferIndex;
-        do {
-          outputBufferIndex = codec.dequeueOutputBuffer(info, kTimeOutUs);
-          if (outputBufferIndex >= 0) {
-            if (info.size > 0) {
-              noOutputCounter = 0;
-            }
-
-            ByteBuffer buf = codecOutputBuffers[outputBufferIndex];
-            int barIndex = (int) ((wave.length * info.presentationTimeUs) / totalDurationUs);
-            long total = 0;
-            for (int i = 0; i < info.size; i += 2 * 4) {
-              short aShort = buf.getShort(i);
-              total += Math.abs(aShort);
-            }
-            if (barIndex >= 0 && barIndex < wave.length) {
-              wave[barIndex] += total;
-              waveSamples[barIndex] += info.size / 2;
-            }
-            codec.releaseOutputBuffer(outputBufferIndex, false);
-            if ((info.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
-              sawOutputEOS = true;
-            }
-          } else if (outputBufferIndex == MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED) {
-            codecOutputBuffers = codec.getOutputBuffers();
-          } else if (outputBufferIndex == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
-            Log.d(TAG, "output format has changed to " + codec.getOutputFormat());
-          }
-        } while (outputBufferIndex >= 0);
-      }
-
-      codec.stop();
-      codec.release();
-      extractor.release();
-
-      float[] floats = new float[BAR_COUNT];
-      byte[]  bytes  = new byte[BAR_COUNT];
-      float   max    = 0;
-
-      for (int i = 0; i < BAR_COUNT; i++) {
-        if (waveSamples[i] == 0) continue;
-
-        floats[i] = wave[i] / (float) waveSamples[i];
-        if (floats[i] > max) {
-          max = floats[i];
-        }
-      }
-
-      for (int i = 0; i < BAR_COUNT; i++) {
-        float normalized = floats[i] / max;
-        bytes[i] = (byte) (255 * normalized);
-      }
-
-      return new AudioFileInfo(totalDurationUs, bytes);
-    }
-  }
-
-  public static class AudioFileInfo {
-    private final long    durationUs;
-    private final byte[]  waveFormBytes;
-    private final float[] waveForm;
-
-    private static @NonNull AudioFileInfo fromDatabaseProtobuf(@NonNull AudioWaveFormData audioWaveForm) {
-      return new AudioFileInfo(audioWaveForm.getDurationUs(), audioWaveForm.getWaveForm().toByteArray());
-    }
-
-    private AudioFileInfo(long durationUs, byte[] waveFormBytes) {
-      this.durationUs    = durationUs;
-      this.waveFormBytes = waveFormBytes;
-      this.waveForm      = new float[waveFormBytes.length];
-
-      for (int i = 0; i < waveFormBytes.length; i++) {
-        int unsigned = waveFormBytes[i] & 0xff;
-        this.waveForm[i] = unsigned / 255f;
-      }
-    }
-
-    public long getDuration(@NonNull TimeUnit timeUnit) {
-      return timeUnit.convert(durationUs, TimeUnit.MICROSECONDS);
-    }
-
-    public float[] getWaveForm() {
-      return waveForm;
-    }
-
-    private @NonNull AudioWaveFormData toDatabaseProtobuf() {
-      return AudioWaveFormData.newBuilder()
-                              .setDurationUs(durationUs)
-                              .setWaveForm(ByteString.copyFrom(waveFormBytes))
-                              .build();
-    }
-  }
-}

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

@@ -0,0 +1,168 @@
+package org.thoughtcrime.securesms.audio;
+
+import android.content.Context;
+import android.media.MediaCodec;
+import android.media.MediaExtractor;
+import android.media.MediaFormat;
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.WorkerThread;
+
+import org.signal.core.util.logging.Log;
+import org.thoughtcrime.securesms.media.DecryptableUriMediaInput;
+import org.thoughtcrime.securesms.media.MediaInput;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+@RequiresApi(api = 23)
+public final class AudioWaveFormGenerator {
+
+  private static final String TAG = Log.tag(AudioWaveFormGenerator.class);
+
+  public static final  int BAR_COUNT       = 46;
+  private static final int SAMPLES_PER_BAR = 4;
+
+  private AudioWaveFormGenerator() {}
+
+  /**
+   * Based on decode sample from:
+   * <p>
+   * https://android.googlesource.com/platform/cts/+/jb-mr2-release/tests/tests/media/src/android/media/cts/DecoderTest.java
+   */
+  @WorkerThread
+  public static @NonNull AudioFileInfo generateWaveForm(@NonNull Context context, @NonNull Uri uri) throws IOException {
+    try (MediaInput dataSource = DecryptableUriMediaInput.createForUri(context, uri)) {
+      long[] wave        = new long[BAR_COUNT];
+      int[]  waveSamples = new int[BAR_COUNT];
+
+      MediaExtractor extractor = dataSource.createExtractor();
+
+      if (extractor.getTrackCount() == 0) {
+        throw new IOException("No audio track");
+      }
+
+      MediaFormat format = extractor.getTrackFormat(0);
+
+      if (!format.containsKey(MediaFormat.KEY_DURATION)) {
+        throw new IOException("Unknown duration");
+      }
+
+      long   totalDurationUs = format.getLong(MediaFormat.KEY_DURATION);
+      String mime            = format.getString(MediaFormat.KEY_MIME);
+
+      if (!mime.startsWith("audio/")) {
+        throw new IOException("Mime not audio");
+      }
+
+      MediaCodec codec = MediaCodec.createDecoderByType(mime);
+
+      if (totalDurationUs == 0) {
+        throw new IOException("Zero duration");
+      }
+
+      codec.configure(format, null, null, 0);
+      codec.start();
+
+      extractor.selectTrack(0);
+
+      long                  kTimeOutUs      = 5000;
+      MediaCodec.BufferInfo info            = new MediaCodec.BufferInfo();
+      boolean               sawInputEOS     = false;
+      boolean               sawOutputEOS    = false;
+      int                   noOutputCounter = 0;
+
+      while (!sawOutputEOS && noOutputCounter < 50) {
+        noOutputCounter++;
+        if (!sawInputEOS) {
+          int inputBufIndex = codec.dequeueInputBuffer(kTimeOutUs);
+          if (inputBufIndex >= 0) {
+            ByteBuffer dstBuf             = codec.getInputBuffer(inputBufIndex);
+            int        sampleSize         = extractor.readSampleData(dstBuf, 0);
+            long       presentationTimeUs = 0;
+
+            if (sampleSize < 0) {
+              sawInputEOS = true;
+              sampleSize  = 0;
+            } else {
+              presentationTimeUs = extractor.getSampleTime();
+            }
+
+            codec.queueInputBuffer(
+              inputBufIndex,
+              0,
+              sampleSize,
+              presentationTimeUs,
+              sawInputEOS ? MediaCodec.BUFFER_FLAG_END_OF_STREAM : 0);
+
+            if (!sawInputEOS) {
+              int barSampleIndex = (int) (SAMPLES_PER_BAR * (wave.length * extractor.getSampleTime()) / totalDurationUs);
+              sawInputEOS = !extractor.advance();
+              int nextBarSampleIndex = (int) (SAMPLES_PER_BAR * (wave.length * extractor.getSampleTime()) / totalDurationUs);
+              while (!sawInputEOS && nextBarSampleIndex == barSampleIndex) {
+                sawInputEOS = !extractor.advance();
+                if (!sawInputEOS) {
+                  nextBarSampleIndex = (int) (SAMPLES_PER_BAR * (wave.length * extractor.getSampleTime()) / totalDurationUs);
+                }
+              }
+            }
+          }
+        }
+
+        int outputBufferIndex;
+        do {
+          outputBufferIndex = codec.dequeueOutputBuffer(info, kTimeOutUs);
+          if (outputBufferIndex >= 0) {
+            if (info.size > 0) {
+              noOutputCounter = 0;
+            }
+
+            ByteBuffer buf = codec.getOutputBuffer(outputBufferIndex);
+            int barIndex = (int) ((wave.length * info.presentationTimeUs) / totalDurationUs);
+            long total = 0;
+            for (int i = 0; i < info.size; i += 2 * 4) {
+              short aShort = buf.getShort(i);
+              total += Math.abs(aShort);
+            }
+            if (barIndex >= 0 && barIndex < wave.length) {
+              wave[barIndex] += total;
+              waveSamples[barIndex] += info.size / 2;
+            }
+            codec.releaseOutputBuffer(outputBufferIndex, false);
+            if ((info.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
+              sawOutputEOS = true;
+            }
+          } else if (outputBufferIndex == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
+            Log.d(TAG, "output format has changed to " + codec.getOutputFormat());
+          }
+        } while (outputBufferIndex >= 0);
+      }
+
+      codec.stop();
+      codec.release();
+      extractor.release();
+
+      float[] floats = new float[BAR_COUNT];
+      byte[]  bytes  = new byte[BAR_COUNT];
+      float   max    = 0;
+
+      for (int i = 0; i < BAR_COUNT; i++) {
+        if (waveSamples[i] == 0) continue;
+
+        floats[i] = wave[i] / (float) waveSamples[i];
+        if (floats[i] > max) {
+          max = floats[i];
+        }
+      }
+
+      for (int i = 0; i < BAR_COUNT; i++) {
+        float normalized = floats[i] / max;
+        bytes[i] = (byte) (255 * normalized);
+      }
+
+      return new AudioFileInfo(totalDurationUs, bytes);
+    }
+  }
+}