Bump version to 6.19.1

Fixes #12894

.editorconfig

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

.github/workflows/android.yml

@@ -14,7 +14,7 @@ permissions:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-8-cores
 
     steps:
     - uses: actions/checkout@v3
@@ -24,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() }}

.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" />

app/build.gradle

@@ -1,37 +1,21 @@
 import com.android.build.api.dsl.ManagedVirtualDevice
 
-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'
-
-repositories {
-    maven {
-        url "https://raw.githubusercontent.com/signalapp/maven/master/sqlcipher/release/"
-        content {
-            includeGroupByRegex "org\\.signal.*"
-        }
-    }
-
-    google()
-    mavenCentral()
-    mavenLocal()
-    maven {
-        url "https://dl.cloudsmith.io/qxAgwaeEE1vN8aLU/mobilecoin/mobilecoin/maven/"
-    }
-    jcenter {
-        content {
-            includeVersion "mobi.upod", "time-duration-picker", "1.1.3"
-        }
-    }
+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'
@@ -47,13 +31,23 @@ 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 = 1199
-def canonicalVersionName = "6.9.2"
+ktlint {
+    // Use a newer version to resolve https://github.com/JLLeitschuh/ktlint-gradle/issues/507
+    version = "0.47.1"
+}
+
+def canonicalVersionCode = 1249
+def canonicalVersionName = "6.19.1"
 
 def postFixSize = 100
 def abiPostFix = ['universal'   : 0,
@@ -68,30 +62,40 @@ def selectableVariants = [
         'nightlyProdSpinner',
         'nightlyProdPerf',
         'nightlyProdRelease',
+        'nightlyStagingRelease',
+        'nightlyPnpPerf',
+        'nightlyPnpRelease',
         'playProdDebug',
         'playProdSpinner',
+        'playProdCanary',
         'playProdPerf',
+        'playProdBenchmark',
         'playProdInstrumentation',
         'playProdRelease',
         'playStagingDebug',
+        'playStagingCanary',
         '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"]
     }
 
@@ -125,12 +129,6 @@ android {
         }
     }
 
-    lintOptions {
-        checkReleaseBuilds false
-        abortOnError true
-        baseline file("lint-baseline.xml")
-        disable "LintError"
-    }
 
     sourceSets {
         test {
@@ -144,32 +142,32 @@ 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
 
@@ -203,8 +201,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\")"
@@ -225,6 +222,7 @@ android {
         buildConfigField "String", "BUILD_VARIANT_TYPE", "\"unset\""
         buildConfigField "String", "BADGE_STATIC_ROOT", "\"https://updates2.signal.org/static/badges/\""
         buildConfigField "String", "STRIPE_PUBLISHABLE_KEY", "\"pk_live_6cmGZopuTsV8novGgJJW9JpC00vLIgtQ1D\""
+        buildConfigField "boolean", "TRACING_ENABLED", "false"
 
         ndk {
             abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
@@ -234,7 +232,7 @@ android {
 
         splits {
             abi {
-                enable true
+                enable !project.hasProperty('generateBaselineProfile')
                 reset()
                 include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
                 universalApk true
@@ -296,11 +294,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
@@ -308,6 +308,25 @@ android {
             minifyEnabled true
             matchingFallbacks = ['debug']
             buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Perf\""
+            buildConfigField "boolean", "TRACING_ENABLED", "true"
+        }
+
+        benchmark {
+            initWith debug
+            isDefault false
+            debuggable false
+            minifyEnabled true
+            matchingFallbacks = ['debug']
+            buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Benchmark\""
+            buildConfigField "boolean", "TRACING_ENABLED", "true"
+        }
+
+        canary {
+            initWith debug
+            isDefault false
+            minifyEnabled false
+            matchingFallbacks = ['debug']
+            buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Canary\""
         }
     }
 
@@ -359,7 +378,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\")"
@@ -375,6 +393,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 ->
@@ -413,7 +447,6 @@ android {
 }
 
 dependencies {
-    implementation libs.androidx.core.ktx
     implementation libs.androidx.fragment.ktx
     lintChecks project(':lintchecks')
 
@@ -421,7 +454,7 @@ dependencies {
 
     implementation (libs.androidx.appcompat) {
         version {
-            strictly '1.5.1'
+            strictly '1.6.1'
         }
     }
     implementation libs.androidx.window.window
@@ -429,7 +462,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
@@ -452,6 +484,9 @@ dependencies {
     implementation libs.androidx.autofill
     implementation libs.androidx.biometric
     implementation libs.androidx.sharetarget
+    implementation libs.androidx.profileinstaller
+    implementation libs.androidx.asynclayoutinflater
+    implementation libs.androidx.asynclayoutinflater.appcompat
 
     implementation (libs.firebase.messaging) {
         exclude group: 'com.google.firebase', module: 'firebase-core'
@@ -506,7 +541,6 @@ dependencies {
     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) {
@@ -531,9 +565,11 @@ dependencies {
         exclude group: 'org.freemarker'
     }
     implementation libs.dnsjava
+    implementation libs.kotlinx.collections.immutable
 
     spinnerImplementation project(":spinner")
-    spinnerImplementation libs.square.leakcanary
+
+    canaryImplementation libs.square.leakcanary
 
     testImplementation testLibs.junit.junit
     testImplementation testLibs.assertj.core
@@ -560,6 +596,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) {
@@ -577,6 +614,9 @@ dependencies {
     implementation libs.rxdogtag
 
     androidTestUtil testLibs.androidx.test.orchestrator
+
+    implementation project(':core-ui')
+    ktlintRuleset libs.ktlint.twitter.compose
 }
 
 def getLastCommitTimestamp() {

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

@@ -22,6 +22,7 @@ import org.thoughtcrime.securesms.registration.VerifyAccountRepository
 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
@@ -82,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))
       },
@@ -95,6 +98,7 @@ class ChangeNumberViewModelTest {
     )
 
     // WHEN
+    viewModel.requestVerificationCode(VerifyAccountRepository.Mode.SMS_WITHOUT_LISTENER, null, null).blockingGet().resultOrThrow
     viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet().resultOrThrow
 
     // THEN
@@ -112,11 +116,14 @@ 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
+    viewModel.requestVerificationCode(VerifyAccountRepository.Mode.SMS_WITHOUT_LISTENER, null, null).blockingGet().resultOrThrow
     val processor: VerifyResponseProcessor = viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet()
 
     // THEN
@@ -142,12 +149,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().connectionFailure() },
+      Put("/v2/accounts/number") { MockResponse().connectionFailure() },
       Get("/v1/accounts/whoami") { MockResponse().success(MockProvider.createWhoAmIResponse(aci, oldPni, oldE164)) }
     )
 
     // WHEN
+    viewModel.requestVerificationCode(VerifyAccountRepository.Mode.SMS_WITHOUT_LISTENER, null, null).blockingGet().resultOrThrow
     val processor: VerifyResponseProcessor = viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet()
 
     // THEN
@@ -181,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()
       },
@@ -195,6 +207,7 @@ class ChangeNumberViewModelTest {
     )
 
     // WHEN
+    viewModel.requestVerificationCode(VerifyAccountRepository.Mode.SMS_WITHOUT_LISTENER, null, null).blockingGet().resultOrThrow
     val processor: VerifyResponseProcessor = viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet()
 
     // THEN
@@ -225,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)
@@ -242,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
@@ -263,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(
@@ -289,6 +307,7 @@ class ChangeNumberViewModelTest {
     )
 
     // WHEN
+    viewModel.requestVerificationCode(VerifyAccountRepository.Mode.SMS_WITHOUT_LISTENER, null, null).blockingGet().resultOrThrow
     viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet().resultOrThrow
 
     // THEN
@@ -307,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)
@@ -345,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

@@ -69,7 +69,7 @@ class ConversationItemPreviewer {
       sentTimeMillis = System.currentTimeMillis(),
       serverTimeMillis = System.currentTimeMillis(),
       receivedTimeMillis = System.currentTimeMillis(),
-      attachments = PointerAttachment.forPointers(Optional.of(attachments)),
+      attachments = PointerAttachment.forPointers(Optional.of(attachments))
     )
 
     SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get()
@@ -88,7 +88,7 @@ class ConversationItemPreviewer {
       sentTimeMillis = System.currentTimeMillis(),
       serverTimeMillis = System.currentTimeMillis(),
       receivedTimeMillis = System.currentTimeMillis(),
-      attachments = PointerAttachment.forPointers(Optional.of(attachments)),
+      attachments = PointerAttachment.forPointers(Optional.of(attachments))
     )
 
     val insert = SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get()

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

@@ -64,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
@@ -34,6 +35,7 @@ class AttachmentTableTest {
     assertEquals(attachment2.fileName, attachment.fileName)
   }
 
+  @FlakyTest
   @Test
   fun givenABlobAndDifferentTransformQuality_whenIInsert2AttachmentsForPreUpload_thenIExpectDifferentFileInfos() {
     val blob = BlobProvider.getInstance().forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory()
@@ -61,6 +63,7 @@ class AttachmentTableTest {
     assertNotEquals(attachment1Info, attachment2Info)
   }
 
+  @FlakyTest
   @Test
   fun givenIdenticalAttachmentsInsertedForPreUpload_whenIUpdateAttachmentDataAndSpecifyOnlyModifyThisAttachment_thenIExpectDifferentFileInfos() {
     val blob = BlobProvider.getInstance().forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory()

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

@@ -0,0 +1,781 @@
+package org.thoughtcrime.securesms.database
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.signal.ringrtc.CallId
+import org.signal.ringrtc.CallManager
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+
+@RunWith(AndroidJUnit4::class)
+class CallTableTest {
+
+  @get:Rule
+  val harness = SignalActivityRule()
+
+  @Test
+  fun givenACall_whenISetTimestamp_thenIExpectUpdatedTimestamp() {
+    val callId = 1L
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+    val now = System.currentTimeMillis()
+    SignalDatabase.calls.insertAcceptedGroupCall(
+      callId,
+      harness.others[0],
+      CallTable.Direction.INCOMING,
+      now
+    )
+
+    SignalDatabase.calls.setTimestamp(callId, conversationId, -1L)
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+    assertEquals(-1L, call?.timestamp)
+
+    val messageRecord = SignalDatabase.messages.getMessageRecord(call!!.messageId!!)
+    assertEquals(-1L, messageRecord.dateReceived)
+    assertEquals(-1L, messageRecord.dateSent)
+  }
+
+  @Test
+  fun givenPreExistingEvent_whenIDeleteGroupCall_thenIMarkDeletedAndSetTimestamp() {
+    val callId = 1L
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+    val now = System.currentTimeMillis()
+    SignalDatabase.calls.insertAcceptedGroupCall(
+      callId,
+      harness.others[0],
+      CallTable.Direction.INCOMING,
+      now
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    SignalDatabase.calls.deleteGroupCall(call!!)
+
+    val deletedCall = SignalDatabase.calls.getCallById(callId, conversationId)
+    val oldestDeletionTimestamp = SignalDatabase.calls.getOldestDeletionTimestamp()
+
+    assertEquals(CallTable.Event.DELETE, deletedCall?.event)
+    assertNotEquals(0L, oldestDeletionTimestamp)
+    assertNull(deletedCall!!.messageId)
+  }
+
+  @Test
+  fun givenNoPreExistingEvent_whenIDeleteGroupCall_thenIInsertAndMarkCallDeleted() {
+    val callId = 1L
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+    SignalDatabase.calls.insertDeletedGroupCallFromSyncEvent(
+      callId,
+      harness.others[0],
+      CallTable.Direction.OUTGOING,
+      System.currentTimeMillis()
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+
+    val oldestDeletionTimestamp = SignalDatabase.calls.getOldestDeletionTimestamp()
+
+    assertEquals(CallTable.Event.DELETE, call?.event)
+    assertNotEquals(oldestDeletionTimestamp, 0)
+    assertNull(call?.messageId)
+  }
+
+  @Test
+  fun givenNoPriorEvent_whenIInsertAcceptedOutgoingGroupCall_thenIExpectLocalRingerAndOutgoingRing() {
+    val callId = 1L
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+    SignalDatabase.calls.insertAcceptedGroupCall(
+      callId,
+      harness.others[0],
+      CallTable.Direction.OUTGOING,
+      System.currentTimeMillis()
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+    assertEquals(CallTable.Event.OUTGOING_RING, call?.event)
+    assertEquals(harness.self.id, call?.ringerRecipient)
+    assertNotNull(call?.messageId)
+  }
+
+  @Test
+  fun givenNoPriorEvent_whenIInsertAcceptedIncomingGroupCall_thenIExpectJoined() {
+    val callId = 1L
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+    SignalDatabase.calls.insertAcceptedGroupCall(
+      callId,
+      harness.others[0],
+      CallTable.Direction.INCOMING,
+      System.currentTimeMillis()
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+    assertEquals(CallTable.Event.JOINED, call?.event)
+    assertNull(call?.ringerRecipient)
+    assertNotNull(call?.messageId)
+  }
+
+  @Test
+  fun givenARingingCall_whenIAcceptedIncomingGroupCall_thenIExpectAccepted() {
+    val callId = 1L
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
+      ringId = callId,
+      groupRecipientId = harness.others[0],
+      ringerRecipient = harness.others[1],
+      dateReceived = System.currentTimeMillis(),
+      ringState = CallManager.RingUpdate.REQUESTED
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+    assertEquals(CallTable.Event.RINGING, call?.event)
+
+    SignalDatabase.calls.acceptIncomingGroupCall(
+      call!!
+    )
+
+    val acceptedCall = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertEquals(CallTable.Event.ACCEPTED, acceptedCall?.event)
+  }
+
+  @Test
+  fun givenAMissedCall_whenIAcceptedIncomingGroupCall_thenIExpectAccepted() {
+    val callId = 1L
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
+      ringId = callId,
+      groupRecipientId = harness.others[0],
+      ringerRecipient = harness.others[1],
+      dateReceived = System.currentTimeMillis(),
+      ringState = CallManager.RingUpdate.EXPIRED_REQUEST
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+    assertEquals(CallTable.Event.MISSED, call?.event)
+
+    SignalDatabase.calls.acceptIncomingGroupCall(
+      call!!
+    )
+
+    val acceptedCall = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertEquals(CallTable.Event.ACCEPTED, acceptedCall?.event)
+  }
+
+  @Test
+  fun givenADeclinedCall_whenIAcceptedIncomingGroupCall_thenIExpectAccepted() {
+    val callId = 1L
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
+      ringId = callId,
+      groupRecipientId = harness.others[0],
+      ringerRecipient = harness.others[1],
+      dateReceived = System.currentTimeMillis(),
+      ringState = CallManager.RingUpdate.DECLINED_ON_ANOTHER_DEVICE
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+    assertEquals(CallTable.Event.DECLINED, call?.event)
+
+    SignalDatabase.calls.acceptIncomingGroupCall(
+      call!!
+    )
+
+    val acceptedCall = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertEquals(CallTable.Event.ACCEPTED, acceptedCall?.event)
+  }
+
+  @Test
+  fun givenAGenericGroupCall_whenIAcceptedIncomingGroupCall_thenIExpectAccepted() {
+    val era = "aaa"
+    val callId = CallId.fromEra(era).longValue()
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+    SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
+      groupRecipientId = harness.others[0],
+      sender = harness.others[1],
+      timestamp = System.currentTimeMillis(),
+      peekGroupCallEraId = "aaa",
+      peekJoinedUuids = emptyList(),
+      isCallFull = false
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+    assertEquals(CallTable.Event.GENERIC_GROUP_CALL, call?.event)
+
+    SignalDatabase.calls.acceptIncomingGroupCall(
+      call!!
+    )
+
+    val acceptedCall = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertEquals(CallTable.Event.JOINED, acceptedCall?.event)
+  }
+
+  @Test
+  fun givenNoPriorCallEvent_whenIReceiveAGroupCallUpdateMessage_thenIExpectAGenericGroupCall() {
+    val era = "aaa"
+    val callId = CallId.fromEra(era).longValue()
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+    SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
+      groupRecipientId = harness.others[0],
+      sender = harness.others[1],
+      timestamp = System.currentTimeMillis(),
+      peekGroupCallEraId = "aaa",
+      peekJoinedUuids = emptyList(),
+      isCallFull = false
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+    assertEquals(CallTable.Event.GENERIC_GROUP_CALL, call?.event)
+  }
+
+  @Test
+  fun givenAPriorCallEventWithNewerTimestamp_whenIReceiveAGroupCallUpdateMessage_thenIExpectAnUpdatedTimestamp() {
+    val era = "aaa"
+    val callId = CallId.fromEra(era).longValue()
+    val now = System.currentTimeMillis()
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+    SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
+      groupRecipientId = harness.others[0],
+      sender = harness.others[1],
+      timestamp = now,
+      peekGroupCallEraId = "aaa",
+      peekJoinedUuids = emptyList(),
+      isCallFull = false
+    )
+
+    SignalDatabase.calls.getCallById(callId, conversationId).let {
+      assertNotNull(it)
+      assertEquals(now, it?.timestamp)
+    }
+
+    SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
+      groupRecipientId = harness.others[0],
+      sender = harness.others[1],
+      timestamp = 1L,
+      peekGroupCallEraId = "aaa",
+      peekJoinedUuids = emptyList(),
+      isCallFull = false
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+    assertEquals(CallTable.Event.GENERIC_GROUP_CALL, call?.event)
+    assertEquals(1L, call?.timestamp)
+  }
+
+  @Test
+  fun givenADeletedCallEvent_whenIReceiveARingUpdate_thenIIgnoreTheRingUpdate() {
+    val callId = 1L
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+    SignalDatabase.calls.insertDeletedGroupCallFromSyncEvent(
+      callId = callId,
+      recipientId = harness.others[0],
+      direction = CallTable.Direction.INCOMING,
+      timestamp = System.currentTimeMillis()
+    )
+
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
+      ringId = callId,
+      groupRecipientId = harness.others[0],
+      ringerRecipient = harness.others[1],
+      dateReceived = System.currentTimeMillis(),
+      ringState = CallManager.RingUpdate.REQUESTED
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+    assertEquals(CallTable.Event.DELETE, call?.event)
+  }
+
+  @Test
+  fun givenAGenericCallEvent_whenRingRequested_thenISetRingerAndMoveToRingingState() {
+    val era = "aaa"
+    val callId = CallId.fromEra(era).longValue()
+    val now = System.currentTimeMillis()
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+    SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
+      groupRecipientId = harness.others[0],
+      sender = harness.others[1],
+      timestamp = now,
+      peekGroupCallEraId = "aaa",
+      peekJoinedUuids = emptyList(),
+      isCallFull = false
+    )
+
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
+      callId,
+      harness.others[0],
+      harness.others[1],
+      System.currentTimeMillis(),
+      CallManager.RingUpdate.REQUESTED
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+    assertEquals(CallTable.Event.RINGING, call?.event)
+    assertEquals(harness.others[1], call?.ringerRecipient)
+  }
+
+  @Test
+  fun givenAJoinedCallEvent_whenRingRequested_thenISetRingerAndMoveToRingingState() {
+    val era = "aaa"
+    val callId = CallId.fromEra(era).longValue()
+    val now = System.currentTimeMillis()
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+    SignalDatabase.calls.insertAcceptedGroupCall(
+      callId,
+      harness.others[0],
+      CallTable.Direction.INCOMING,
+      now
+    )
+
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
+      callId,
+      harness.others[0],
+      harness.others[1],
+      System.currentTimeMillis(),
+      CallManager.RingUpdate.REQUESTED
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+    assertEquals(CallTable.Event.ACCEPTED, call?.event)
+    assertEquals(harness.others[1], call?.ringerRecipient)
+  }
+
+  @Test
+  fun givenAGenericCallEvent_whenRingExpired_thenISetRingerAndMoveToMissedState() {
+    val era = "aaa"
+    val callId = CallId.fromEra(era).longValue()
+    val now = System.currentTimeMillis()
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+    SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
+      groupRecipientId = harness.others[0],
+      sender = harness.others[1],
+      timestamp = now,
+      peekGroupCallEraId = "aaa",
+      peekJoinedUuids = emptyList(),
+      isCallFull = false
+    )
+
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
+      callId,
+      harness.others[0],
+      harness.others[1],
+      System.currentTimeMillis(),
+      CallManager.RingUpdate.EXPIRED_REQUEST
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+    assertEquals(CallTable.Event.MISSED, call?.event)
+    assertEquals(harness.others[1], call?.ringerRecipient)
+  }
+
+  @Test
+  fun givenARingingCallEvent_whenRingExpired_thenISetRingerAndMoveToMissedState() {
+    val era = "aaa"
+    val callId = CallId.fromEra(era).longValue()
+    val now = System.currentTimeMillis()
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+    SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
+      groupRecipientId = harness.others[0],
+      sender = harness.others[1],
+      timestamp = now,
+      peekGroupCallEraId = "aaa",
+      peekJoinedUuids = emptyList(),
+      isCallFull = false
+    )
+
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
+      callId,
+      harness.others[0],
+      harness.others[1],
+      System.currentTimeMillis(),
+      CallManager.RingUpdate.REQUESTED
+    )
+
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
+      callId,
+      harness.others[0],
+      harness.others[1],
+      System.currentTimeMillis(),
+      CallManager.RingUpdate.EXPIRED_REQUEST
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+    assertEquals(CallTable.Event.MISSED, call?.event)
+    assertEquals(harness.others[1], call?.ringerRecipient)
+  }
+
+  @Test
+  fun givenAJoinedCallEvent_whenRingIsCancelledBecauseUserIsBusyLocally_thenIMoveToAcceptedState() {
+    val era = "aaa"
+    val callId = CallId.fromEra(era).longValue()
+    val now = System.currentTimeMillis()
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+    SignalDatabase.calls.insertAcceptedGroupCall(
+      callId,
+      harness.others[0],
+      CallTable.Direction.INCOMING,
+      now
+    )
+
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
+      callId,
+      harness.others[0],
+      harness.others[1],
+      System.currentTimeMillis(),
+      CallManager.RingUpdate.BUSY_LOCALLY
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+    assertEquals(CallTable.Event.ACCEPTED, call?.event)
+  }
+
+  @Test
+  fun givenAJoinedCallEvent_whenRingIsCancelledBecauseUserIsBusyOnAnotherDevice_thenIMoveToAcceptedState() {
+    val era = "aaa"
+    val callId = CallId.fromEra(era).longValue()
+    val now = System.currentTimeMillis()
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+    SignalDatabase.calls.insertAcceptedGroupCall(
+      callId,
+      harness.others[0],
+      CallTable.Direction.INCOMING,
+      now
+    )
+
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
+      callId,
+      harness.others[0],
+      harness.others[1],
+      System.currentTimeMillis(),
+      CallManager.RingUpdate.BUSY_ON_ANOTHER_DEVICE
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+    assertEquals(CallTable.Event.ACCEPTED, call?.event)
+  }
+
+  @Test
+  fun givenARingingCallEvent_whenRingCancelledBecauseUserIsBusyLocally_thenIMoveToMissedState() {
+    val era = "aaa"
+    val callId = CallId.fromEra(era).longValue()
+    val now = System.currentTimeMillis()
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+    SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
+      groupRecipientId = harness.others[0],
+      sender = harness.others[1],
+      timestamp = now,
+      peekGroupCallEraId = "aaa",
+      peekJoinedUuids = emptyList(),
+      isCallFull = false
+    )
+
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
+      callId,
+      harness.others[0],
+      harness.others[1],
+      System.currentTimeMillis(),
+      CallManager.RingUpdate.REQUESTED
+    )
+
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
+      callId,
+      harness.others[0],
+      harness.others[1],
+      System.currentTimeMillis(),
+      CallManager.RingUpdate.BUSY_LOCALLY
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+    assertEquals(CallTable.Event.MISSED, call?.event)
+  }
+
+  @Test
+  fun givenARingingCallEvent_whenRingCancelledBecauseUserIsBusyOnAnotherDevice_thenIMoveToMissedState() {
+    val era = "aaa"
+    val callId = CallId.fromEra(era).longValue()
+    val now = System.currentTimeMillis()
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+    SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
+      groupRecipientId = harness.others[0],
+      sender = harness.others[1],
+      timestamp = now,
+      peekGroupCallEraId = "aaa",
+      peekJoinedUuids = emptyList(),
+      isCallFull = false
+    )
+
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
+      callId,
+      harness.others[0],
+      harness.others[1],
+      System.currentTimeMillis(),
+      CallManager.RingUpdate.REQUESTED
+    )
+
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
+      callId,
+      harness.others[0],
+      harness.others[1],
+      System.currentTimeMillis(),
+      CallManager.RingUpdate.BUSY_ON_ANOTHER_DEVICE
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+    assertEquals(CallTable.Event.MISSED, call?.event)
+  }
+
+  @Test
+  fun givenACallEvent_whenRingIsAcceptedOnAnotherDevice_thenIMoveToAcceptedState() {
+    val era = "aaa"
+    val callId = CallId.fromEra(era).longValue()
+    val now = System.currentTimeMillis()
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+    SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
+      groupRecipientId = harness.others[0],
+      sender = harness.others[1],
+      timestamp = now,
+      peekGroupCallEraId = "aaa",
+      peekJoinedUuids = emptyList(),
+      isCallFull = false
+    )
+
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
+      callId,
+      harness.others[0],
+      harness.others[1],
+      System.currentTimeMillis(),
+      CallManager.RingUpdate.ACCEPTED_ON_ANOTHER_DEVICE
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+    assertEquals(CallTable.Event.ACCEPTED, call?.event)
+  }
+
+  @Test
+  fun givenARingingCallEvent_whenRingDeclinedOnAnotherDevice_thenIMoveToDeclinedState() {
+    val era = "aaa"
+    val callId = CallId.fromEra(era).longValue()
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
+      callId,
+      harness.others[0],
+      harness.others[1],
+      System.currentTimeMillis(),
+      CallManager.RingUpdate.REQUESTED
+    )
+
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
+      callId,
+      harness.others[0],
+      harness.others[1],
+      System.currentTimeMillis(),
+      CallManager.RingUpdate.DECLINED_ON_ANOTHER_DEVICE
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+    assertEquals(CallTable.Event.DECLINED, call?.event)
+  }
+
+  @Test
+  fun givenAMissedCallEvent_whenRingDeclinedOnAnotherDevice_thenIMoveToDeclinedState() {
+    val era = "aaa"
+    val callId = CallId.fromEra(era).longValue()
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
+      callId,
+      harness.others[0],
+      harness.others[1],
+      System.currentTimeMillis(),
+      CallManager.RingUpdate.EXPIRED_REQUEST
+    )
+
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
+      callId,
+      harness.others[0],
+      harness.others[1],
+      System.currentTimeMillis(),
+      CallManager.RingUpdate.DECLINED_ON_ANOTHER_DEVICE
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+    assertEquals(CallTable.Event.DECLINED, call?.event)
+  }
+
+  @Test
+  fun givenAnOutgoingRingCallEvent_whenRingDeclinedOnAnotherDevice_thenIDoNotChangeState() {
+    val era = "aaa"
+    val callId = CallId.fromEra(era).longValue()
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+
+    SignalDatabase.calls.insertAcceptedGroupCall(
+      callId,
+      harness.others[0],
+      CallTable.Direction.OUTGOING,
+      System.currentTimeMillis()
+    )
+
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
+      callId,
+      harness.others[0],
+      harness.others[1],
+      System.currentTimeMillis(),
+      CallManager.RingUpdate.DECLINED_ON_ANOTHER_DEVICE
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+    assertEquals(CallTable.Event.OUTGOING_RING, call?.event)
+  }
+
+  @Test
+  fun givenNoPriorEvent_whenRingRequested_thenICreateAnEventInTheRingingStateAndSetRinger() {
+    val callId = 1L
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
+      callId,
+      harness.others[0],
+      harness.others[1],
+      System.currentTimeMillis(),
+      CallManager.RingUpdate.REQUESTED
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+    assertEquals(CallTable.Event.RINGING, call?.event)
+    assertEquals(harness.others[1], call?.ringerRecipient)
+    assertNotNull(call?.messageId)
+  }
+
+  @Test
+  fun givenNoPriorEvent_whenRingExpired_thenICreateAnEventInTheMissedStateAndSetRinger() {
+    val callId = 1L
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
+      callId,
+      harness.others[0],
+      harness.others[1],
+      System.currentTimeMillis(),
+      CallManager.RingUpdate.EXPIRED_REQUEST
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+    assertEquals(CallTable.Event.MISSED, call?.event)
+    assertEquals(harness.others[1], call?.ringerRecipient)
+    assertNotNull(call?.messageId)
+  }
+
+  @Test
+  fun givenNoPriorEvent_whenRingCancelledByRinger_thenICreateAnEventInTheMissedStateAndSetRinger() {
+    val callId = 1L
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
+      callId,
+      harness.others[0],
+      harness.others[1],
+      System.currentTimeMillis(),
+      CallManager.RingUpdate.CANCELLED_BY_RINGER
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+    assertEquals(CallTable.Event.MISSED, call?.event)
+    assertEquals(harness.others[1], call?.ringerRecipient)
+    assertNotNull(call?.messageId)
+  }
+
+  @Test
+  fun givenNoPriorEvent_whenRingCancelledBecauseUserIsBusyLocally_thenICreateAnEventInTheMissedState() {
+    val callId = 1L
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
+      callId,
+      harness.others[0],
+      harness.others[1],
+      System.currentTimeMillis(),
+      CallManager.RingUpdate.BUSY_LOCALLY
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+    assertEquals(CallTable.Event.MISSED, call?.event)
+    assertNotNull(call?.messageId)
+  }
+
+  @Test
+  fun givenNoPriorEvent_whenRingCancelledBecauseUserIsBusyOnAnotherDevice_thenICreateAnEventInTheMissedState() {
+    val callId = 1L
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
+      callId,
+      harness.others[0],
+      harness.others[1],
+      System.currentTimeMillis(),
+      CallManager.RingUpdate.BUSY_ON_ANOTHER_DEVICE
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+    assertEquals(CallTable.Event.MISSED, call?.event)
+    assertNotNull(call?.messageId)
+  }
+
+  @Test
+  fun givenNoPriorEvent_whenRingAcceptedOnAnotherDevice_thenICreateAnEventInTheAcceptedState() {
+    val callId = 1L
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
+      callId,
+      harness.others[0],
+      harness.others[1],
+      System.currentTimeMillis(),
+      CallManager.RingUpdate.ACCEPTED_ON_ANOTHER_DEVICE
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+    assertEquals(CallTable.Event.ACCEPTED, call?.event)
+    assertNotNull(call?.messageId)
+  }
+
+  @Test
+  fun givenNoPriorEvent_whenRingDeclinedOnAnotherDevice_thenICreateAnEventInTheDeclinedState() {
+    val callId = 1L
+    val conversationId = CallTable.CallConversationId.Peer(harness.others[0])
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
+      callId,
+      harness.others[0],
+      harness.others[1],
+      System.currentTimeMillis(),
+      CallManager.RingUpdate.DECLINED_ON_ANOTHER_DEVICE
+    )
+
+    val call = SignalDatabase.calls.getCallById(callId, conversationId)
+    assertNotNull(call)
+    assertEquals(CallTable.Event.DECLINED, call?.event)
+    assertNotNull(call?.messageId)
+  }
+}

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

@@ -0,0 +1,509 @@
+package org.thoughtcrime.securesms.database
+
+import android.app.Application
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import junit.framework.TestCase.assertTrue
+import net.zetetic.database.sqlcipher.SQLiteDatabase
+import net.zetetic.database.sqlcipher.SQLiteOpenHelper
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.signal.core.util.readToList
+import org.signal.core.util.requireNonNullString
+import org.thoughtcrime.securesms.database.helpers.SignalDatabaseMigrations
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+
+/**
+ * A test that guarantees that a freshly-created database looks the same as one that went through the upgrade path.
+ */
+@RunWith(AndroidJUnit4::class)
+class DatabaseConsistencyTest {
+
+  @get:Rule
+  val harness = SignalActivityRule()
+
+  @Test
+  fun test() {
+    val currentVersionStatements = SignalDatabase.rawDatabase.getAllCreateStatements()
+    val testHelper = InMemoryTestHelper(ApplicationDependencies.getApplication()).also {
+      it.onUpgrade(it.writableDatabase, 181, SignalDatabaseMigrations.DATABASE_VERSION)
+    }
+
+    val upgradedStatements = testHelper.readableDatabase.getAllCreateStatements()
+
+    if (currentVersionStatements != upgradedStatements) {
+      var message = "\n"
+
+      val currentByName = currentVersionStatements.associateBy { it.name }
+      val upgradedByName = upgradedStatements.associateBy { it.name }
+
+      if (currentByName.keys != upgradedByName.keys) {
+        val exclusiveToCurrent = currentByName.keys - upgradedByName.keys
+        val exclusiveToUpgrade = upgradedByName.keys - currentByName.keys
+
+        message += "SQL entities exclusive to the newly-created database: $exclusiveToCurrent\n"
+        message += "SQL entities exclusive to the upgraded database: $exclusiveToUpgrade\n\n"
+      } else {
+        for (currentEntry in currentByName) {
+          val upgradedValue: Statement = upgradedByName[currentEntry.key]!!
+          if (upgradedValue.sql != currentEntry.value.sql) {
+            message += "Statement differed:\n"
+            message += "newly-created:\n"
+            message += "${currentEntry.value.sql}\n\n"
+            message += "upgraded:\n"
+            message += "${upgradedValue.sql}\n\n"
+          }
+        }
+      }
+
+      assertTrue(message, false)
+    }
+  }
+
+  private data class Statement(
+    val name: String,
+    val sql: String
+  )
+
+  private fun SQLiteDatabase.getAllCreateStatements(): List<Statement> {
+    return this.rawQuery("SELECT name, sql FROM sqlite_schema WHERE sql NOT NULL AND name != 'sqlite_sequence'")
+      .readToList { cursor ->
+        Statement(
+          name = cursor.requireNonNullString("name"),
+          sql = cursor.requireNonNullString("sql").normalizeSql()
+        )
+      }
+      .sortedBy { it.name }
+  }
+
+  private fun String.normalizeSql(): String {
+    return this
+      .split("\n")
+      .map { it.trim() }
+      .joinToString(separator = " ")
+      .replace(Regex("\\s+"), " ")
+      .replace(Regex.fromLiteral("( "), "(")
+      .replace(Regex.fromLiteral(" )"), ")")
+      .replace(Regex("CREATE TABLE \"([a-z]+)\""), "CREATE TABLE $1") // for some reason SQLite will wrap table names in quotes for upgraded tables. This unwraps them.
+  }
+
+  private class InMemoryTestHelper(private val application: Application) : SQLiteOpenHelper(application, null, null, 1) {
+
+    override fun onCreate(db: SQLiteDatabase) {
+      for (statement in SNAPSHOT_V181) {
+        db.execSQL(statement.sql)
+      }
+    }
+
+    override fun onUpgrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
+      SignalDatabaseMigrations.migrate(application, db, 181, SignalDatabaseMigrations.DATABASE_VERSION)
+    }
+
+    /**
+     * This is the list of statements that existed at version 181. Never change this.
+     */
+    private val SNAPSHOT_V181 = listOf(
+      Statement(
+        name = "message",
+        sql = "CREATE TABLE message (\n        _id INTEGER PRIMARY KEY AUTOINCREMENT,\n        date_sent INTEGER NOT NULL,\n        date_received INTEGER NOT NULL,\n        date_server INTEGER DEFAULT -1,\n        thread_id INTEGER NOT NULL REFERENCES thread (_id) ON DELETE CASCADE,\n        recipient_id INTEGER NOT NULL REFERENCES recipient (_id) ON DELETE CASCADE,\n        recipient_device_id INTEGER,\n        type INTEGER NOT NULL,\n        body TEXT,\n        read INTEGER DEFAULT 0,\n        ct_l TEXT,\n        exp INTEGER,\n        m_type INTEGER,\n        m_size INTEGER,\n        st INTEGER,\n        tr_id TEXT,\n        subscription_id INTEGER DEFAULT -1, \n        receipt_timestamp INTEGER DEFAULT -1, \n        delivery_receipt_count INTEGER DEFAULT 0, \n        read_receipt_count INTEGER DEFAULT 0, \n        viewed_receipt_count INTEGER DEFAULT 0,\n        mismatched_identities TEXT DEFAULT NULL,\n        network_failures TEXT DEFAULT NULL,\n        expires_in INTEGER DEFAULT 0,\n        expire_started INTEGER DEFAULT 0,\n        notified INTEGER DEFAULT 0,\n        quote_id INTEGER DEFAULT 0,\n        quote_author INTEGER DEFAULT 0,\n        quote_body TEXT DEFAULT NULL,\n        quote_missing INTEGER DEFAULT 0,\n        quote_mentions BLOB DEFAULT NULL,\n        quote_type INTEGER DEFAULT 0,\n        shared_contacts TEXT DEFAULT NULL,\n        unidentified INTEGER DEFAULT 0,\n        link_previews TEXT DEFAULT NULL,\n        view_once INTEGER DEFAULT 0,\n        reactions_unread INTEGER DEFAULT 0,\n        reactions_last_seen INTEGER DEFAULT -1,\n        remote_deleted INTEGER DEFAULT 0,\n        mentions_self INTEGER DEFAULT 0,\n        notified_timestamp INTEGER DEFAULT 0,\n        server_guid TEXT DEFAULT NULL,\n        message_ranges BLOB DEFAULT NULL,\n        story_type INTEGER DEFAULT 0,\n        parent_story_id INTEGER DEFAULT 0,\n        export_state BLOB DEFAULT NULL,\n        exported INTEGER DEFAULT 0,\n        scheduled_date INTEGER DEFAULT -1\n      )"
+      ),
+      Statement(
+        name = "part",
+        sql = "CREATE TABLE part (_id INTEGER PRIMARY KEY, mid INTEGER, seq INTEGER DEFAULT 0, ct TEXT, name TEXT, chset INTEGER, cd TEXT, fn TEXT, cid TEXT, cl TEXT, ctt_s INTEGER, ctt_t TEXT, encrypted INTEGER, pending_push INTEGER, _data TEXT, data_size INTEGER, file_name TEXT, unique_id INTEGER NOT NULL, digest BLOB, fast_preflight_id TEXT, voice_note INTEGER DEFAULT 0, borderless INTEGER DEFAULT 0, video_gif INTEGER DEFAULT 0, data_random BLOB, quote INTEGER DEFAULT 0, width INTEGER DEFAULT 0, height INTEGER DEFAULT 0, caption TEXT DEFAULT NULL, sticker_pack_id TEXT DEFAULT NULL, sticker_pack_key DEFAULT NULL, sticker_id INTEGER DEFAULT -1, sticker_emoji STRING DEFAULT NULL, data_hash TEXT DEFAULT NULL, blur_hash TEXT DEFAULT NULL, transform_properties TEXT DEFAULT NULL, transfer_file TEXT DEFAULT NULL, display_order INTEGER DEFAULT 0, upload_timestamp INTEGER DEFAULT 0, cdn_number INTEGER DEFAULT 0)"
+      ),
+      Statement(
+        name = "thread",
+        sql = "CREATE TABLE thread (\n  _id INTEGER PRIMARY KEY AUTOINCREMENT, \n  date INTEGER DEFAULT 0, \n  meaningful_messages INTEGER DEFAULT 0,\n  recipient_id INTEGER NOT NULL UNIQUE REFERENCES recipient (_id) ON DELETE CASCADE,\n  read INTEGER DEFAULT 1, \n  type INTEGER DEFAULT 0, \n  error INTEGER DEFAULT 0, \n  snippet TEXT, \n  snippet_type INTEGER DEFAULT 0, \n  snippet_uri TEXT DEFAULT NULL, \n  snippet_content_type TEXT DEFAULT NULL, \n  snippet_extras TEXT DEFAULT NULL, \n  unread_count INTEGER DEFAULT 0, \n  archived INTEGER DEFAULT 0, \n  status INTEGER DEFAULT 0, \n  delivery_receipt_count INTEGER DEFAULT 0, \n  read_receipt_count INTEGER DEFAULT 0, \n  expires_in INTEGER DEFAULT 0, \n  last_seen INTEGER DEFAULT 0, \n  has_sent INTEGER DEFAULT 0, \n  last_scrolled INTEGER DEFAULT 0, \n  pinned INTEGER DEFAULT 0, \n  unread_self_mention_count INTEGER DEFAULT 0\n)"
+      ),
+      Statement(
+        name = "identities",
+        sql = "CREATE TABLE identities (\n        _id INTEGER PRIMARY KEY AUTOINCREMENT, \n        address INTEGER UNIQUE, \n        identity_key TEXT, \n        first_use INTEGER DEFAULT 0, \n        timestamp INTEGER DEFAULT 0, \n        verified INTEGER DEFAULT 0, \n        nonblocking_approval INTEGER DEFAULT 0\n      )"
+      ),
+      Statement(
+        name = "drafts",
+        sql = "CREATE TABLE drafts (\n        _id INTEGER PRIMARY KEY, \n        thread_id INTEGER, \n        type TEXT, \n        value TEXT\n      )"
+      ),
+      Statement(
+        name = "push",
+        sql = "CREATE TABLE push (_id INTEGER PRIMARY KEY, type INTEGER, source TEXT, source_uuid TEXT, device_id INTEGER, body TEXT, content TEXT, timestamp INTEGER, server_timestamp INTEGER DEFAULT 0, server_delivered_timestamp INTEGER DEFAULT 0, server_guid TEXT DEFAULT NULL)"
+      ),
+      Statement(
+        name = "groups",
+        sql = "CREATE TABLE groups (\n        _id INTEGER PRIMARY KEY, \n        group_id TEXT, \n        recipient_id INTEGER,\n        title TEXT,\n        avatar_id INTEGER, \n        avatar_key BLOB,\n        avatar_content_type TEXT, \n        avatar_relay TEXT,\n        timestamp INTEGER,\n        active INTEGER DEFAULT 1,\n        avatar_digest BLOB, \n        mms INTEGER DEFAULT 0, \n        master_key BLOB, \n        revision BLOB, \n        decrypted_group BLOB, \n        expected_v2_id TEXT DEFAULT NULL, \n        former_v1_members TEXT DEFAULT NULL, \n        distribution_id TEXT DEFAULT NULL, \n        display_as_story INTEGER DEFAULT 0, \n        auth_service_id TEXT DEFAULT NULL, \n        last_force_update_timestamp INTEGER DEFAULT 0\n      )"
+      ),
+      Statement(
+        name = "group_membership",
+        sql = "CREATE TABLE group_membership (     _id INTEGER PRIMARY KEY,     group_id TEXT NOT NULL,     recipient_id INTEGER NOT NULL,     UNIQUE(group_id, recipient_id) )"
+      ),
+      Statement(
+        name = "recipient",
+        sql = "CREATE TABLE recipient (\n  _id INTEGER PRIMARY KEY AUTOINCREMENT,\n  uuid TEXT UNIQUE DEFAULT NULL,\n  username TEXT UNIQUE DEFAULT NULL,\n  phone TEXT UNIQUE DEFAULT NULL,\n  email TEXT UNIQUE DEFAULT NULL,\n  group_id TEXT UNIQUE DEFAULT NULL,\n  group_type INTEGER DEFAULT 0,\n  blocked INTEGER DEFAULT 0,\n  message_ringtone TEXT DEFAULT NULL, \n  message_vibrate INTEGER DEFAULT 0, \n  call_ringtone TEXT DEFAULT NULL, \n  call_vibrate INTEGER DEFAULT 0, \n  notification_channel TEXT DEFAULT NULL, \n  mute_until INTEGER DEFAULT 0, \n  color TEXT DEFAULT NULL, \n  seen_invite_reminder INTEGER DEFAULT 0,\n  default_subscription_id INTEGER DEFAULT -1,\n  message_expiration_time INTEGER DEFAULT 0,\n  registered INTEGER DEFAULT 0,\n  system_given_name TEXT DEFAULT NULL, \n  system_family_name TEXT DEFAULT NULL, \n  system_display_name TEXT DEFAULT NULL, \n  system_photo_uri TEXT DEFAULT NULL, \n  system_phone_label TEXT DEFAULT NULL, \n  system_phone_type INTEGER DEFAULT -1, \n  system_contact_uri TEXT DEFAULT NULL, \n  system_info_pending INTEGER DEFAULT 0, \n  profile_key TEXT DEFAULT NULL, \n  profile_key_credential TEXT DEFAULT NULL, \n  signal_profile_name TEXT DEFAULT NULL, \n  profile_family_name TEXT DEFAULT NULL, \n  profile_joined_name TEXT DEFAULT NULL, \n  signal_profile_avatar TEXT DEFAULT NULL, \n  profile_sharing INTEGER DEFAULT 0, \n  last_profile_fetch INTEGER DEFAULT 0, \n  unidentified_access_mode INTEGER DEFAULT 0, \n  force_sms_selection INTEGER DEFAULT 0, \n  storage_service_key TEXT UNIQUE DEFAULT NULL, \n  mention_setting INTEGER DEFAULT 0, \n  storage_proto TEXT DEFAULT NULL,\n  capabilities INTEGER DEFAULT 0,\n  last_session_reset BLOB DEFAULT NULL,\n  wallpaper BLOB DEFAULT NULL,\n  wallpaper_file TEXT DEFAULT NULL,\n  about TEXT DEFAULT NULL,\n  about_emoji TEXT DEFAULT NULL,\n  extras BLOB DEFAULT NULL,\n  groups_in_common INTEGER DEFAULT 0,\n  chat_colors BLOB DEFAULT NULL,\n  custom_chat_colors_id INTEGER DEFAULT 0,\n  badges BLOB DEFAULT NULL,\n  pni TEXT DEFAULT NULL,\n  distribution_list_id INTEGER DEFAULT NULL,\n  needs_pni_signature INTEGER DEFAULT 0,\n  unregistered_timestamp INTEGER DEFAULT 0,\n  hidden INTEGER DEFAULT 0,\n  reporting_token BLOB DEFAULT NULL,\n  system_nickname TEXT DEFAULT NULL\n)"
+      ),
+      Statement(
+        name = "group_receipts",
+        sql = "CREATE TABLE group_receipts (\n        _id INTEGER PRIMARY KEY, \n        mms_id INTEGER, \n        address INTEGER, \n        status INTEGER, \n        timestamp INTEGER, \n        unidentified INTEGER DEFAULT 0\n      )"
+      ),
+      Statement(
+        name = "one_time_prekeys",
+        sql = "CREATE TABLE one_time_prekeys (\n        _id INTEGER PRIMARY KEY,\n        account_id TEXT NOT NULL,\n        key_id INTEGER UNIQUE, \n        public_key TEXT NOT NULL, \n        private_key TEXT NOT NULL,\n        UNIQUE(account_id, key_id)\n      )"
+      ),
+      Statement(
+        name = "signed_prekeys",
+        sql = "CREATE TABLE signed_prekeys (\n        _id INTEGER PRIMARY KEY,\n        account_id TEXT NOT NULL,\n        key_id INTEGER UNIQUE, \n        public_key TEXT NOT NULL,\n        private_key TEXT NOT NULL,\n        signature TEXT NOT NULL, \n        timestamp INTEGER DEFAULT 0,\n        UNIQUE(account_id, key_id)\n    )"
+      ),
+      Statement(
+        name = "sessions",
+        sql = "CREATE TABLE sessions (\n        _id INTEGER PRIMARY KEY AUTOINCREMENT,\n        account_id TEXT NOT NULL,\n        address TEXT NOT NULL,\n        device INTEGER NOT NULL,\n        record BLOB NOT NULL,\n        UNIQUE(account_id, address, device)\n      )"
+      ),
+      Statement(
+        name = "sender_keys",
+        sql = "CREATE TABLE sender_keys (\n        _id INTEGER PRIMARY KEY AUTOINCREMENT, \n        address TEXT NOT NULL, \n        device INTEGER NOT NULL, \n        distribution_id TEXT NOT NULL,\n        record BLOB NOT NULL, \n        created_at INTEGER NOT NULL, \n        UNIQUE(address,device, distribution_id) ON CONFLICT REPLACE\n      )"
+      ),
+      Statement(
+        name = "sender_key_shared",
+        sql = "CREATE TABLE sender_key_shared (\n        _id INTEGER PRIMARY KEY AUTOINCREMENT, \n        distribution_id TEXT NOT NULL, \n        address TEXT NOT NULL, \n        device INTEGER NOT NULL, \n        timestamp INTEGER DEFAULT 0, \n        UNIQUE(distribution_id,address, device) ON CONFLICT REPLACE\n      )"
+      ),
+      Statement(
+        name = "pending_retry_receipts",
+        sql = "CREATE TABLE pending_retry_receipts(_id INTEGER PRIMARY KEY AUTOINCREMENT, author TEXT NOT NULL, device INTEGER NOT NULL, sent_timestamp INTEGER NOT NULL, received_timestamp TEXT NOT NULL, thread_id INTEGER NOT NULL, UNIQUE(author,sent_timestamp) ON CONFLICT REPLACE)"
+      ),
+      Statement(
+        name = "sticker",
+        sql = "CREATE TABLE sticker (_id INTEGER PRIMARY KEY AUTOINCREMENT, pack_id TEXT NOT NULL, pack_key TEXT NOT NULL, pack_title TEXT NOT NULL, pack_author TEXT NOT NULL, sticker_id INTEGER, cover INTEGER, pack_order INTEGER, emoji TEXT NOT NULL, content_type TEXT DEFAULT NULL, last_used INTEGER, installed INTEGER,file_path TEXT NOT NULL, file_length INTEGER, file_random BLOB, UNIQUE(pack_id, sticker_id, cover) ON CONFLICT IGNORE)"
+      ),
+      Statement(
+        name = "storage_key",
+        sql = "CREATE TABLE storage_key (_id INTEGER PRIMARY KEY AUTOINCREMENT, type INTEGER, key TEXT UNIQUE)"
+      ),
+      Statement(
+        name = "mention",
+        sql = "CREATE TABLE mention(_id INTEGER PRIMARY KEY AUTOINCREMENT, thread_id INTEGER, message_id INTEGER, recipient_id INTEGER, range_start INTEGER, range_length INTEGER)"
+      ),
+      Statement(
+        name = "payments",
+        sql = "CREATE TABLE payments(_id INTEGER PRIMARY KEY, uuid TEXT DEFAULT NULL, recipient INTEGER DEFAULT 0, recipient_address TEXT DEFAULT NULL, timestamp INTEGER, note TEXT DEFAULT NULL, direction INTEGER, state INTEGER, failure_reason INTEGER, amount BLOB NOT NULL, fee BLOB NOT NULL, transaction_record BLOB DEFAULT NULL, receipt BLOB DEFAULT NULL, payment_metadata BLOB DEFAULT NULL, receipt_public_key TEXT DEFAULT NULL, block_index INTEGER DEFAULT 0, block_timestamp INTEGER DEFAULT 0, seen INTEGER, UNIQUE(uuid) ON CONFLICT ABORT)"
+      ),
+      Statement(
+        name = "chat_colors",
+        sql = "CREATE TABLE chat_colors (\n  _id INTEGER PRIMARY KEY AUTOINCREMENT,\n  chat_colors BLOB\n)"
+      ),
+      Statement(
+        name = "emoji_search",
+        sql = "CREATE TABLE emoji_search (\n        _id INTEGER PRIMARY KEY,\n        label TEXT NOT NULL,\n        emoji TEXT NOT NULL,\n        rank INTEGER DEFAULT 2147483647 \n      )"
+      ),
+      Statement(
+        name = "avatar_picker",
+        sql = "CREATE TABLE avatar_picker (\n  _id INTEGER PRIMARY KEY AUTOINCREMENT,\n  last_used INTEGER DEFAULT 0,\n  group_id TEXT DEFAULT NULL,\n  avatar BLOB NOT NULL\n)"
+      ),
+      Statement(
+        name = "group_call_ring",
+        sql = "CREATE TABLE group_call_ring (\n  _id INTEGER PRIMARY KEY,\n  ring_id INTEGER UNIQUE,\n  date_received INTEGER,\n  ring_state INTEGER\n)"
+      ),
+      Statement(
+        name = "reaction",
+        sql = "CREATE TABLE reaction (\n  _id INTEGER PRIMARY KEY,\n  message_id INTEGER NOT NULL REFERENCES message (_id) ON DELETE CASCADE,\n  author_id INTEGER NOT NULL REFERENCES recipient (_id) ON DELETE CASCADE,\n  emoji TEXT NOT NULL,\n  date_sent INTEGER NOT NULL,\n  date_received INTEGER NOT NULL,\n  UNIQUE(message_id, author_id) ON CONFLICT REPLACE\n)"
+      ),
+      Statement(
+        name = "donation_receipt",
+        sql = "CREATE TABLE donation_receipt (\n  _id INTEGER PRIMARY KEY AUTOINCREMENT,\n  receipt_type TEXT NOT NULL,\n  receipt_date INTEGER NOT NULL,\n  amount TEXT NOT NULL,\n  currency TEXT NOT NULL,\n  subscription_level INTEGER NOT NULL\n)"
+      ),
+      Statement(
+        name = "story_sends",
+        sql = "CREATE TABLE story_sends (\n  _id INTEGER PRIMARY KEY,\n  message_id INTEGER NOT NULL REFERENCES message (_id) ON DELETE CASCADE,\n  recipient_id INTEGER NOT NULL REFERENCES recipient (_id) ON DELETE CASCADE,\n  sent_timestamp INTEGER NOT NULL,\n  allows_replies INTEGER NOT NULL,\n  distribution_id TEXT NOT NULL REFERENCES distribution_list (distribution_id) ON DELETE CASCADE\n)"
+      ),
+      Statement(
+        name = "cds",
+        sql = "CREATE TABLE cds (\n        _id INTEGER PRIMARY KEY,\n        e164 TEXT NOT NULL UNIQUE ON CONFLICT IGNORE,\n        last_seen_at INTEGER DEFAULT 0\n      )"
+      ),
+      Statement(
+        name = "remote_megaphone",
+        sql = "CREATE TABLE remote_megaphone (\n  _id INTEGER PRIMARY KEY,\n  uuid TEXT UNIQUE NOT NULL,\n  priority INTEGER NOT NULL,\n  countries TEXT,\n  minimum_version INTEGER NOT NULL,\n  dont_show_before INTEGER NOT NULL,\n  dont_show_after INTEGER NOT NULL,\n  show_for_days INTEGER NOT NULL,\n  conditional_id TEXT,\n  primary_action_id TEXT,\n  secondary_action_id TEXT,\n  image_url TEXT,\n  image_uri TEXT DEFAULT NULL,\n  title TEXT NOT NULL,\n  body TEXT NOT NULL,\n  primary_action_text TEXT,\n  secondary_action_text TEXT,\n  shown_at INTEGER DEFAULT 0,\n  finished_at INTEGER DEFAULT 0,\n  primary_action_data TEXT DEFAULT NULL,\n  secondary_action_data TEXT DEFAULT NULL,\n  snoozed_at INTEGER DEFAULT 0,\n  seen_count INTEGER DEFAULT 0\n)"
+      ),
+      Statement(
+        name = "pending_pni_signature_message",
+        sql = "CREATE TABLE pending_pni_signature_message (\n        _id INTEGER PRIMARY KEY,\n        recipient_id INTEGER NOT NULL REFERENCES recipient (_id) ON DELETE CASCADE,\n        sent_timestamp INTEGER NOT NULL,\n        device_id INTEGER NOT NULL\n      )"
+      ),
+      Statement(
+        name = "call",
+        sql = "CREATE TABLE call (\n  _id INTEGER PRIMARY KEY,\n  call_id INTEGER NOT NULL UNIQUE,\n  message_id INTEGER NOT NULL REFERENCES message (_id) ON DELETE CASCADE,\n  peer INTEGER NOT NULL REFERENCES recipient (_id) ON DELETE CASCADE,\n  type INTEGER NOT NULL,\n  direction INTEGER NOT NULL,\n  event INTEGER NOT NULL\n)"
+      ),
+      Statement(
+        name = "message_fts",
+        sql = "CREATE VIRTUAL TABLE message_fts USING fts5(body, thread_id UNINDEXED, content=message, content_rowid=_id)"
+      ),
+      Statement(
+        name = "remapped_recipients",
+        sql = "CREATE TABLE remapped_recipients (\n        _id INTEGER PRIMARY KEY AUTOINCREMENT, \n        old_id INTEGER UNIQUE, \n        new_id INTEGER\n      )"
+      ),
+      Statement(
+        name = "remapped_threads",
+        sql = "CREATE TABLE remapped_threads (\n        _id INTEGER PRIMARY KEY AUTOINCREMENT, \n        old_id INTEGER UNIQUE, \n        new_id INTEGER\n      )"
+      ),
+      Statement(
+        name = "msl_payload",
+        sql = "CREATE TABLE msl_payload (\n        _id INTEGER PRIMARY KEY,\n        date_sent INTEGER NOT NULL,\n        content BLOB NOT NULL,\n        content_hint INTEGER NOT NULL,\n        urgent INTEGER NOT NULL DEFAULT 1\n      )"
+      ),
+      Statement(
+        name = "msl_recipient",
+        sql = "CREATE TABLE msl_recipient (\n        _id INTEGER PRIMARY KEY,\n        payload_id INTEGER NOT NULL REFERENCES msl_payload (_id) ON DELETE CASCADE,\n        recipient_id INTEGER NOT NULL, \n        device INTEGER NOT NULL\n      )"
+      ),
+      Statement(
+        name = "msl_message",
+        sql = "CREATE TABLE msl_message (\n        _id INTEGER PRIMARY KEY,\n        payload_id INTEGER NOT NULL REFERENCES msl_payload (_id) ON DELETE CASCADE,\n        message_id INTEGER NOT NULL\n      )"
+      ),
+      Statement(
+        name = "notification_profile",
+        sql = "CREATE TABLE notification_profile (\n  _id INTEGER PRIMARY KEY AUTOINCREMENT,\n  name TEXT NOT NULL UNIQUE,\n  emoji TEXT NOT NULL,\n  color TEXT NOT NULL,\n  created_at INTEGER NOT NULL,\n  allow_all_calls INTEGER NOT NULL DEFAULT 0,\n  allow_all_mentions INTEGER NOT NULL DEFAULT 0\n)"
+      ),
+      Statement(
+        name = "notification_profile_schedule",
+        sql = "CREATE TABLE notification_profile_schedule (\n  _id INTEGER PRIMARY KEY AUTOINCREMENT,\n  notification_profile_id INTEGER NOT NULL REFERENCES notification_profile (_id) ON DELETE CASCADE,\n  enabled INTEGER NOT NULL DEFAULT 0,\n  start INTEGER NOT NULL,\n  end INTEGER NOT NULL,\n  days_enabled TEXT NOT NULL\n)"
+      ),
+      Statement(
+        name = "notification_profile_allowed_members",
+        sql = "CREATE TABLE notification_profile_allowed_members (\n  _id INTEGER PRIMARY KEY AUTOINCREMENT,\n  notification_profile_id INTEGER NOT NULL REFERENCES notification_profile (_id) ON DELETE CASCADE,\n  recipient_id INTEGER NOT NULL,\n  UNIQUE(notification_profile_id, recipient_id) ON CONFLICT REPLACE\n)"
+      ),
+      Statement(
+        name = "distribution_list",
+        sql = "CREATE TABLE distribution_list (\n        _id INTEGER PRIMARY KEY AUTOINCREMENT,\n        name TEXT UNIQUE NOT NULL,\n        distribution_id TEXT UNIQUE NOT NULL,\n        recipient_id INTEGER UNIQUE REFERENCES recipient (_id),\n        allows_replies INTEGER DEFAULT 1,\n        deletion_timestamp INTEGER DEFAULT 0,\n        is_unknown INTEGER DEFAULT 0,\n        privacy_mode INTEGER DEFAULT 0\n      )"
+      ),
+      Statement(
+        name = "distribution_list_member",
+        sql = "CREATE TABLE distribution_list_member (\n        _id INTEGER PRIMARY KEY AUTOINCREMENT,\n        list_id INTEGER NOT NULL REFERENCES distribution_list (_id) ON DELETE CASCADE,\n        recipient_id INTEGER NOT NULL REFERENCES recipient (_id),\n        privacy_mode INTEGER DEFAULT 0\n      )"
+      ),
+      Statement(
+        name = "recipient_group_type_index",
+        sql = "CREATE INDEX recipient_group_type_index ON recipient (group_type)"
+      ),
+      Statement(
+        name = "recipient_pni_index",
+        sql = "CREATE UNIQUE INDEX recipient_pni_index ON recipient (pni)"
+      ),
+      Statement(
+        name = "recipient_service_id_profile_key",
+        sql = "CREATE INDEX recipient_service_id_profile_key ON recipient (uuid, profile_key) WHERE uuid NOT NULL AND profile_key NOT NULL"
+      ),
+      Statement(
+        name = "mms_read_and_notified_and_thread_id_index",
+        sql = "CREATE INDEX mms_read_and_notified_and_thread_id_index ON message (read, notified, thread_id)"
+      ),
+      Statement(
+        name = "mms_type_index",
+        sql = "CREATE INDEX mms_type_index ON message (type)"
+      ),
+      Statement(
+        name = "mms_date_sent_index",
+        sql = "CREATE INDEX mms_date_sent_index ON message (date_sent, recipient_id, thread_id)"
+      ),
+      Statement(
+        name = "mms_date_server_index",
+        sql = "CREATE INDEX mms_date_server_index ON message (date_server)"
+      ),
+      Statement(
+        name = "mms_thread_date_index",
+        sql = "CREATE INDEX mms_thread_date_index ON message (thread_id, date_received)"
+      ),
+      Statement(
+        name = "mms_reactions_unread_index",
+        sql = "CREATE INDEX mms_reactions_unread_index ON message (reactions_unread)"
+      ),
+      Statement(
+        name = "mms_story_type_index",
+        sql = "CREATE INDEX mms_story_type_index ON message (story_type)"
+      ),
+      Statement(
+        name = "mms_parent_story_id_index",
+        sql = "CREATE INDEX mms_parent_story_id_index ON message (parent_story_id)"
+      ),
+      Statement(
+        name = "mms_thread_story_parent_story_scheduled_date_index",
+        sql = "CREATE INDEX mms_thread_story_parent_story_scheduled_date_index ON message (thread_id, date_received, story_type, parent_story_id, scheduled_date)"
+      ),
+      Statement(
+        name = "message_quote_id_quote_author_scheduled_date_index",
+        sql = "CREATE INDEX message_quote_id_quote_author_scheduled_date_index ON message (quote_id, quote_author, scheduled_date)"
+      ),
+      Statement(
+        name = "mms_exported_index",
+        sql = "CREATE INDEX mms_exported_index ON message (exported)"
+      ),
+      Statement(
+        name = "mms_id_type_payment_transactions_index",
+        sql = "CREATE INDEX mms_id_type_payment_transactions_index ON message (_id,type) WHERE type & 12884901888 != 0"
+      ),
+      Statement(
+        name = "part_mms_id_index",
+        sql = "CREATE INDEX part_mms_id_index ON part (mid)"
+      ),
+      Statement(
+        name = "pending_push_index",
+        sql = "CREATE INDEX pending_push_index ON part (pending_push)"
+      ),
+      Statement(
+        name = "part_sticker_pack_id_index",
+        sql = "CREATE INDEX part_sticker_pack_id_index ON part (sticker_pack_id)"
+      ),
+      Statement(
+        name = "part_data_hash_index",
+        sql = "CREATE INDEX part_data_hash_index ON part (data_hash)"
+      ),
+      Statement(
+        name = "part_data_index",
+        sql = "CREATE INDEX part_data_index ON part (_data)"
+      ),
+      Statement(
+        name = "thread_recipient_id_index",
+        sql = "CREATE INDEX thread_recipient_id_index ON thread (recipient_id)"
+      ),
+      Statement(
+        name = "archived_count_index",
+        sql = "CREATE INDEX archived_count_index ON thread (archived, meaningful_messages)"
+      ),
+      Statement(
+        name = "thread_pinned_index",
+        sql = "CREATE INDEX thread_pinned_index ON thread (pinned)"
+      ),
+      Statement(
+        name = "thread_read",
+        sql = "CREATE INDEX thread_read ON thread (read)"
+      ),
+      Statement(
+        name = "draft_thread_index",
+        sql = "CREATE INDEX draft_thread_index ON drafts (thread_id)"
+      ),
+      Statement(
+        name = "group_id_index",
+        sql = "CREATE UNIQUE INDEX group_id_index ON groups (group_id)"
+      ),
+      Statement(
+        name = "group_recipient_id_index",
+        sql = "CREATE UNIQUE INDEX group_recipient_id_index ON groups (recipient_id)"
+      ),
+      Statement(
+        name = "expected_v2_id_index",
+        sql = "CREATE UNIQUE INDEX expected_v2_id_index ON groups (expected_v2_id)"
+      ),
+      Statement(
+        name = "group_distribution_id_index",
+        sql = "CREATE UNIQUE INDEX group_distribution_id_index ON groups(distribution_id)"
+      ),
+      Statement(
+        name = "group_receipt_mms_id_index",
+        sql = "CREATE INDEX group_receipt_mms_id_index ON group_receipts (mms_id)"
+      ),
+      Statement(
+        name = "sticker_pack_id_index",
+        sql = "CREATE INDEX sticker_pack_id_index ON sticker (pack_id)"
+      ),
+      Statement(
+        name = "sticker_sticker_id_index",
+        sql = "CREATE INDEX sticker_sticker_id_index ON sticker (sticker_id)"
+      ),
+      Statement(
+        name = "storage_key_type_index",
+        sql = "CREATE INDEX storage_key_type_index ON storage_key (type)"
+      ),
+      Statement(
+        name = "mention_message_id_index",
+        sql = "CREATE INDEX mention_message_id_index ON mention (message_id)"
+      ),
+      Statement(
+        name = "mention_recipient_id_thread_id_index",
+        sql = "CREATE INDEX mention_recipient_id_thread_id_index ON mention (recipient_id, thread_id)"
+      ),
+      Statement(
+        name = "timestamp_direction_index",
+        sql = "CREATE INDEX timestamp_direction_index ON payments (timestamp, direction)"
+      ),
+      Statement(
+        name = "timestamp_index",
+        sql = "CREATE INDEX timestamp_index ON payments (timestamp)"
+      ),
+      Statement(
+        name = "receipt_public_key_index",
+        sql = "CREATE UNIQUE INDEX receipt_public_key_index ON payments (receipt_public_key)"
+      ),
+      Statement(
+        name = "msl_payload_date_sent_index",
+        sql = "CREATE INDEX msl_payload_date_sent_index ON msl_payload (date_sent)"
+      ),
+      Statement(
+        name = "msl_recipient_recipient_index",
+        sql = "CREATE INDEX msl_recipient_recipient_index ON msl_recipient (recipient_id, device, payload_id)"
+      ),
+      Statement(
+        name = "msl_recipient_payload_index",
+        sql = "CREATE INDEX msl_recipient_payload_index ON msl_recipient (payload_id)"
+      ),
+      Statement(
+        name = "msl_message_message_index",
+        sql = "CREATE INDEX msl_message_message_index ON msl_message (message_id, payload_id)"
+      ),
+      Statement(
+        name = "date_received_index",
+        sql = "CREATE INDEX date_received_index on group_call_ring (date_received)"
+      ),
+      Statement(
+        name = "notification_profile_schedule_profile_index",
+        sql = "CREATE INDEX notification_profile_schedule_profile_index ON notification_profile_schedule (notification_profile_id)"
+      ),
+      Statement(
+        name = "notification_profile_allowed_members_profile_index",
+        sql = "CREATE INDEX notification_profile_allowed_members_profile_index ON notification_profile_allowed_members (notification_profile_id)"
+      ),
+      Statement(
+        name = "donation_receipt_type_index",
+        sql = "CREATE INDEX donation_receipt_type_index ON donation_receipt (receipt_type)"
+      ),
+      Statement(
+        name = "donation_receipt_date_index",
+        sql = "CREATE INDEX donation_receipt_date_index ON donation_receipt (receipt_date)"
+      ),
+      Statement(
+        name = "story_sends_recipient_id_sent_timestamp_allows_replies_index",
+        sql = "CREATE INDEX story_sends_recipient_id_sent_timestamp_allows_replies_index ON story_sends (recipient_id, sent_timestamp, allows_replies)"
+      ),
+      Statement(
+        name = "story_sends_message_id_distribution_id_index",
+        sql = "CREATE INDEX story_sends_message_id_distribution_id_index ON story_sends (message_id, distribution_id)"
+      ),
+      Statement(
+        name = "distribution_list_member_list_id_recipient_id_privacy_mode_index",
+        sql = "CREATE UNIQUE INDEX distribution_list_member_list_id_recipient_id_privacy_mode_index ON distribution_list_member (list_id, recipient_id, privacy_mode)"
+      ),
+      Statement(
+        name = "pending_pni_recipient_sent_device_index",
+        sql = "CREATE UNIQUE INDEX pending_pni_recipient_sent_device_index ON pending_pni_signature_message (recipient_id, sent_timestamp, device_id)"
+      ),
+      Statement(
+        name = "call_call_id_index",
+        sql = "CREATE INDEX call_call_id_index ON call (call_id)"
+      ),
+      Statement(
+        name = "call_message_id_index",
+        sql = "CREATE INDEX call_message_id_index ON call (message_id)"
+      ),
+      Statement(
+        name = "message_ai",
+        sql = "CREATE TRIGGER message_ai AFTER INSERT ON message BEGIN\n          INSERT INTO message_fts(rowid, body, thread_id) VALUES (new._id, new.body, new.thread_id);\n        END"
+      ),
+      Statement(
+        name = "message_ad",
+        sql = "CREATE TRIGGER message_ad AFTER DELETE ON message BEGIN\n          INSERT INTO message_fts(message_fts, rowid, body, thread_id) VALUES('delete', old._id, old.body, old.thread_id);\n        END"
+      ),
+      Statement(
+        name = "message_au",
+        sql = "CREATE TRIGGER message_au AFTER UPDATE ON message BEGIN\n          INSERT INTO message_fts(message_fts, rowid, body, thread_id) VALUES('delete', old._id, old.body, old.thread_id);\n          INSERT INTO message_fts(rowid, body, thread_id) VALUES (new._id, new.body, new.thread_id);\n        END"
+      ),
+      Statement(
+        name = "msl_message_delete",
+        sql = "CREATE TRIGGER msl_message_delete AFTER DELETE ON message \n        BEGIN \n        \tDELETE FROM msl_payload WHERE _id IN (SELECT payload_id FROM msl_message WHERE message_id = old._id);\n        END"
+      ),
+      Statement(
+        name = "msl_attachment_delete",
+        sql = "CREATE TRIGGER msl_attachment_delete AFTER DELETE ON part\n        BEGIN\n        \tDELETE FROM msl_payload WHERE _id IN (SELECT payload_id FROM msl_message WHERE message_id = old.mid);\n        END"
+      )
+    )
+  }
+}

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/MmsTableTest_stories.kt

@@ -128,7 +128,7 @@ class MmsTableTest_stories {
           sentTimeMillis = 2,
           serverTimeMillis = 2,
           receivedTimeMillis = 2,
-          storyType = StoryType.STORY_WITH_REPLIES,
+          storyType = StoryType.STORY_WITH_REPLIES
         ),
         -1L
       ).get().messageId
@@ -160,7 +160,7 @@ class MmsTableTest_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 MmsTableTest_stories {
           sentTimeMillis = System.currentTimeMillis(),
           serverTimeMillis = 2,
           receivedTimeMillis = 2,
-          storyType = StoryType.STORY_WITH_REPLIES,
+          storyType = StoryType.STORY_WITH_REPLIES
         ),
         -1L
       ).get().messageId
@@ -219,7 +219,7 @@ class MmsTableTest_stories {
         sentTimeMillis = 200,
         serverTimeMillis = 2,
         receivedTimeMillis = 2,
-        storyType = StoryType.STORY_WITH_REPLIES,
+        storyType = StoryType.STORY_WITH_REPLIES
       ),
       -1L
     )

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

@@ -11,6 +11,11 @@ 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 RecipientTableTest {
@@ -159,4 +164,47 @@ class RecipientTableTest {
     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/RecipientTableTest_getAndPossiblyMerge.kt

@@ -1,17 +1,21 @@
 package org.thoughtcrime.securesms.database
 
+import android.database.Cursor
 import androidx.core.content.contentValuesOf
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.hamcrest.MatcherAssert
 import org.hamcrest.Matchers
 import org.junit.Assert
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.signal.core.util.CursorUtil
 import org.signal.core.util.SqlUtil
+import org.signal.core.util.requireLong
+import org.signal.core.util.requireNonNullString
 import org.signal.core.util.select
 import org.signal.libsignal.protocol.IdentityKey
 import org.signal.libsignal.protocol.SignalProtocolAddress
@@ -23,6 +27,8 @@ import org.thoughtcrime.securesms.database.model.Mention
 import org.thoughtcrime.securesms.database.model.MessageId
 import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.ReactionRecord
+import org.thoughtcrime.securesms.database.model.databaseprotos.SessionSwitchoverEvent
+import org.thoughtcrime.securesms.database.model.databaseprotos.ThreadMergeEvent
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -32,6 +38,9 @@ import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.sms.IncomingEncryptedMessage
 import org.thoughtcrime.securesms.sms.IncomingTextMessage
+import org.thoughtcrime.securesms.util.Base64
+import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.FeatureFlagsAccessor
 import org.whispersystems.signalservice.api.push.ACI
 import org.whispersystems.signalservice.api.push.PNI
 import org.whispersystems.signalservice.api.push.ServiceId
@@ -46,6 +55,34 @@ class RecipientTableTest_getAndPossiblyMerge {
     SignalStore.account().setE164(E164_SELF)
     SignalStore.account().setAci(ACI_SELF)
     SignalStore.account().setPni(PNI_SELF)
+    FeatureFlagsAccessor.forceValue(FeatureFlags.PHONE_NUMBER_PRIVACY, true)
+  }
+
+  @Test
+  fun allNonMergeTests() {
+    test("e164-only insert") {
+      val id = process(E164_A, null, null)
+      expect(E164_A, null, null)
+
+      val record = SignalDatabase.recipients.getRecord(id)
+      assertEquals(RecipientTable.RegisteredState.UNKNOWN, record.registered)
+    }
+
+    test("pni-only insert") {
+      val id = process(null, PNI_A, null)
+      expect(null, PNI_A, null)
+
+      val record = SignalDatabase.recipients.getRecord(id)
+      assertEquals(RecipientTable.RegisteredState.REGISTERED, record.registered)
+    }
+
+    test("aci-only insert") {
+      val id = process(null, null, ACI_A)
+      expect(null, null, ACI_A)
+
+      val record = SignalDatabase.recipients.getRecord(id)
+      assertEquals(RecipientTable.RegisteredState.REGISTERED, record.registered)
+    }
   }
 
   @Test
@@ -115,24 +152,40 @@ class RecipientTableTest_getAndPossiblyMerge {
       expect(E164_A, null, ACI_B)
     }
 
-    test("e164 and pni matches, all provided, new aci") {
+    test("e164 and pni matches, all provided, new aci, no pni session") {
       given(E164_A, PNI_A, null)
       process(E164_A, PNI_A, ACI_A)
       expect(E164_A, PNI_A, ACI_A)
     }
 
+    test("e164 and pni matches, all provided, new aci, existing pni session") {
+      given(E164_A, PNI_A, null, pniSession = true)
+      process(E164_A, PNI_A, ACI_A)
+      expect(E164_A, PNI_A, ACI_A)
+
+      expectSessionSwitchoverEvent(E164_A)
+    }
+
     test("e164 and aci matches, all provided, new pni") {
       given(E164_A, null, ACI_A)
       process(E164_A, PNI_A, ACI_A)
       expect(E164_A, PNI_A, ACI_A)
     }
 
-    test("pni matches, all provided, new e164 and aci") {
+    test("pni matches, all provided, new e164 and aci, no pni session") {
       given(null, PNI_A, null)
       process(E164_A, PNI_A, ACI_A)
       expect(E164_A, PNI_A, ACI_A)
     }
 
+    test("pni matches, all provided, new e164 and aci, existing pni session") {
+      given(null, PNI_A, null, pniSession = true)
+      process(E164_A, PNI_A, ACI_A)
+      expect(E164_A, PNI_A, ACI_A)
+
+      expectSessionSwitchoverEvent(E164_A)
+    }
+
     test("pni and aci matches, all provided, new e164") {
       given(null, PNI_A, ACI_A)
       process(E164_A, PNI_A, ACI_A)
@@ -172,20 +225,48 @@ class RecipientTableTest_getAndPossiblyMerge {
       expect(E164_A, PNI_A, null)
     }
 
-    test("e164 and pni matches, all provided, no existing session") {
+    test("e164 matches, e164 and pni provided, pni changes, existing pni session") {
+      given(E164_A, PNI_B, null, pniSession = true)
+      process(E164_A, PNI_A, null)
+      expect(E164_A, PNI_A, null)
+
+      expectSessionSwitchoverEvent(E164_A)
+    }
+
+    test("e164 and pni matches, all provided, no pni session") {
       given(E164_A, PNI_A, null)
       process(E164_A, PNI_A, ACI_A)
       expect(E164_A, PNI_A, ACI_A)
     }
 
-    test("pni matches, all provided, no existing session") {
+    test("e164 and pni matches, all provided, existing pni session") {
+      given(E164_A, PNI_A, null, pniSession = true)
+      process(E164_A, PNI_A, ACI_A)
+      expect(E164_A, PNI_A, ACI_A)
+
+      expectSessionSwitchoverEvent(E164_A)
+    }
+
+    test("e164 matches, e164 + aci provided") {
+      given(E164_A, PNI_A, null)
+      process(E164_A, null, ACI_A)
+      expect(E164_A, PNI_A, ACI_A)
+    }
+
+    test("pni matches, all provided, no pni session") {
       given(null, PNI_A, null)
       process(E164_A, PNI_A, ACI_A)
       expect(E164_A, PNI_A, ACI_A)
     }
 
-    // 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.
+    test("pni matches, all provided, existing pni session") {
+      given(null, PNI_A, null, pniSession = true)
+      process(E164_A, PNI_A, ACI_A)
+      expect(E164_A, PNI_A, ACI_A)
+
+      expectSessionSwitchoverEvent(E164_A)
+    }
+
     test("pni matches, no existing pni session, changes number") {
       given(E164_B, PNI_A, null)
       process(E164_A, PNI_A, ACI_A)
@@ -194,8 +275,15 @@ class RecipientTableTest_getAndPossiblyMerge {
       expectChangeNumberEvent()
     }
 
-    // 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.
+    test("pni matches, existing pni session, changes number") {
+      given(E164_B, PNI_A, null, pniSession = true)
+      process(E164_A, PNI_A, ACI_A)
+      expect(E164_A, PNI_A, ACI_A)
+
+      expectSessionSwitchoverEvent(E164_B)
+      expectChangeNumberEvent()
+    }
+
     test("pni and aci matches, change number") {
       given(E164_B, PNI_A, ACI_A)
       process(E164_A, PNI_A, ACI_A)
@@ -220,7 +308,7 @@ class RecipientTableTest_getAndPossiblyMerge {
       expectChangeNumberEvent()
     }
 
-    test("steal, e164+pni & e164+pni, no aci provided, no sessions") {
+    test("steal, e164+pni & e164+pni, no aci provided, no pni session") {
       given(E164_A, PNI_B, null)
       given(E164_B, PNI_A, null)
 
@@ -230,6 +318,18 @@ class RecipientTableTest_getAndPossiblyMerge {
       expect(E164_B, null, null)
     }
 
+    test("steal, e164+pni & e164+pni, no aci provided, existing pni session") {
+      given(E164_A, PNI_B, null, pniSession = true)
+      given(E164_B, PNI_A, null) // TODO How to handle if this user had a session? They just end up losing the PNI, meaning it would become unregistered, but it could register again later with a different PNI?
+
+      process(E164_A, PNI_A, null)
+
+      expect(E164_A, PNI_A, null)
+      expect(E164_B, null, null)
+
+      expectSessionSwitchoverEvent(E164_A)
+    }
+
     test("steal, e164+pni & aci, e164 record has separate e164") {
       given(E164_B, PNI_A, null)
       given(null, null, ACI_A)
@@ -252,6 +352,31 @@ class RecipientTableTest_getAndPossiblyMerge {
       expectChangeNumberEvent()
     }
 
+    test("steal, e164 & pni+e164, no aci provided") {
+      val id1 = given(E164_A, null, null)
+      val id2 = given(E164_B, PNI_A, null, pniSession = true)
+
+      process(E164_A, PNI_A, null)
+
+      expect(E164_A, PNI_A, null)
+      expect(E164_B, null, null)
+
+      expectSessionSwitchoverEvent(id1, E164_A)
+      expectSessionSwitchoverEvent(id2, E164_B)
+    }
+
+    test("steal, e164+pni+aci & e164+aci, no pni provided, change number") {
+      given(E164_A, PNI_A, ACI_A)
+      given(E164_B, null, ACI_B)
+
+      process(E164_A, null, ACI_B)
+
+      expect(null, PNI_A, ACI_A)
+      expect(E164_A, null, ACI_B)
+
+      expectChangeNumberEvent()
+    }
+
     test("merge, e164 & pni & aci, all provided") {
       given(E164_A, null, null)
       given(null, PNI_A, null)
@@ -262,6 +387,34 @@ class RecipientTableTest_getAndPossiblyMerge {
       expectDeleted()
       expectDeleted()
       expect(E164_A, PNI_A, ACI_A)
+
+      expectThreadMergeEvent(E164_A)
+    }
+
+    test("merge, e164 & pni & aci, all provided, no threads") {
+      given(E164_A, null, null, createThread = false)
+      given(null, PNI_A, null, createThread = false)
+      given(null, null, ACI_A, createThread = false)
+
+      process(E164_A, PNI_A, ACI_A)
+
+      expectDeleted()
+      expectDeleted()
+      expect(E164_A, PNI_A, ACI_A)
+    }
+
+    test("merge, e164 & pni & aci, all provided, pni session no threads") {
+      given(E164_A, null, null, createThread = false)
+      given(null, PNI_A, null, createThread = true, pniSession = true)
+      given(null, null, ACI_A, createThread = false)
+
+      process(E164_A, PNI_A, ACI_A)
+
+      expectDeleted()
+      expectDeleted()
+      expect(E164_A, PNI_A, ACI_A)
+
+      expectSessionSwitchoverEvent(E164_A)
     }
 
     test("merge, e164 & pni, no aci provided") {
@@ -272,9 +425,11 @@ class RecipientTableTest_getAndPossiblyMerge {
 
       expect(E164_A, PNI_A, null)
       expectDeleted()
+
+      expectThreadMergeEvent("")
     }
 
-    test("merge, e164 & pni, aci provided but no aci record") {
+    test("merge, e164 & pni, aci provided, no pni session") {
       given(E164_A, null, null)
       given(null, PNI_A, null)
 
@@ -282,16 +437,44 @@ class RecipientTableTest_getAndPossiblyMerge {
 
       expect(E164_A, PNI_A, ACI_A)
       expectDeleted()
+
+      expectThreadMergeEvent("")
     }
 
-    test("merge, e164 & pni+e164, no aci provided") {
+    test("merge, e164 & pni, aci provided, no pni session") {
       given(E164_A, null, null)
-      given(E164_B, PNI_A, null)
+      given(null, PNI_A, null)
 
-      process(E164_A, PNI_A, null)
+      process(E164_A, PNI_A, ACI_A)
 
-      expect(E164_A, PNI_A, null)
-      expect(E164_B, null, null)
+      expect(E164_A, PNI_A, ACI_A)
+      expectDeleted()
+
+      expectThreadMergeEvent("")
+    }
+
+    test("merge, e164 & pni, aci provided, existing pni session, thread merge shadows") {
+      given(E164_A, null, null)
+      given(null, PNI_A, null, pniSession = true)
+
+      process(E164_A, PNI_A, ACI_A)
+
+      expect(E164_A, PNI_A, ACI_A)
+      expectDeleted()
+
+      expectThreadMergeEvent("")
+    }
+
+    test("merge, e164 & pni, aci provided, existing pni session, no thread merge") {
+      given(E164_A, null, null, createThread = true)
+      given(null, PNI_A, null, createThread = false, pniSession = true)
+
+      process(E164_A, PNI_A, ACI_A)
+
+      expect(E164_A, PNI_A, ACI_A)
+      expectDeleted()
+
+      expectSessionSwitchoverEvent(E164_A)
     }
 
     test("merge, e164+pni & pni, no aci provided") {
@@ -302,9 +485,11 @@ class RecipientTableTest_getAndPossiblyMerge {
 
       expect(E164_A, PNI_A, null)
       expectDeleted()
+
+      expectThreadMergeEvent("")
     }
 
-    test("merge, e164+pni & aci") {
+    test("merge, e164+pni & aci, no pni session") {
       given(E164_A, PNI_A, null)
       given(null, null, ACI_A)
 
@@ -312,6 +497,54 @@ class RecipientTableTest_getAndPossiblyMerge {
 
       expectDeleted()
       expect(E164_A, PNI_A, ACI_A)
+
+      expectThreadMergeEvent(E164_A)
+    }
+
+    test("merge, e164+pni & aci, pni session, thread merge shadows") {
+      given(E164_A, PNI_A, null, pniSession = true)
+      given(null, null, ACI_A)
+
+      process(E164_A, PNI_A, ACI_A)
+
+      expectDeleted()
+      expect(E164_A, PNI_A, ACI_A)
+
+      expectThreadMergeEvent(E164_A)
+    }
+
+    test("merge, e164+pni & aci, pni session, no thread merge") {
+      given(E164_A, PNI_A, null, createThread = true, pniSession = true)
+      given(null, null, ACI_A, createThread = false)
+
+      process(E164_A, PNI_A, ACI_A)
+
+      expectDeleted()
+      expect(E164_A, PNI_A, ACI_A)
+
+      expectSessionSwitchoverEvent(E164_A)
+    }
+
+    test("merge, e164+pni & aci, pni session, no thread merge, pni verified") {
+      given(E164_A, PNI_A, null, createThread = true, pniSession = true)
+      given(null, null, ACI_A, createThread = false)
+
+      process(E164_A, PNI_A, ACI_A, pniVerified = true)
+
+      expectDeleted()
+      expect(E164_A, PNI_A, ACI_A)
+    }
+
+    test("merge, e164+pni & aci, pni session, pni verified") {
+      given(E164_A, PNI_A, null, pniSession = true)
+      given(null, null, ACI_A)
+
+      process(E164_A, PNI_A, ACI_A, pniVerified = true)
+
+      expectDeleted()
+      expect(E164_A, PNI_A, ACI_A)
+
+      expectThreadMergeEvent(E164_A)
     }
 
     test("merge, e164+pni & e164+pni+aci, change number") {
@@ -324,6 +557,7 @@ class RecipientTableTest_getAndPossiblyMerge {
       expect(E164_A, PNI_A, ACI_A)
 
       expectChangeNumberEvent()
+      expectThreadMergeEvent(E164_A)
     }
 
     test("merge, e164+pni & e164+aci, change number") {
@@ -336,6 +570,7 @@ class RecipientTableTest_getAndPossiblyMerge {
       expect(E164_A, PNI_A, ACI_A)
 
       expectChangeNumberEvent()
+      expectThreadMergeEvent(E164_A)
     }
 
     test("merge, e164 & aci") {
@@ -346,6 +581,8 @@ class RecipientTableTest_getAndPossiblyMerge {
 
       expectDeleted()
       expect(E164_A, null, ACI_A)
+
+      expectThreadMergeEvent(E164_A)
     }
 
     test("merge, e164 & e164+aci, change number") {
@@ -358,6 +595,8 @@ class RecipientTableTest_getAndPossiblyMerge {
       expect(E164_A, null, ACI_A)
 
       expectChangeNumberEvent()
+
+      expectThreadMergeEvent(E164_A)
     }
 
     test("local user, local e164 and aci provided, changeSelf=false, leave e164 alone") {
@@ -454,9 +693,9 @@ class RecipientTableTest_getAndPossiblyMerge {
     val sms2: MessageRecord = SignalDatabase.messages.getMessageRecord(smsId2)!!
     val sms3: MessageRecord = SignalDatabase.messages.getMessageRecord(smsId3)!!
 
-    assertEquals(retrievedId, sms1.recipient.id)
-    assertEquals(retrievedId, sms2.recipient.id)
-    assertEquals(retrievedId, sms3.recipient.id)
+    assertEquals(retrievedId, sms1.fromRecipient.id)
+    assertEquals(retrievedId, sms2.fromRecipient.id)
+    assertEquals(retrievedId, sms3.fromRecipient.id)
 
     assertEquals(retrievedThreadId, sms1.threadId)
     assertEquals(retrievedThreadId, sms2.threadId)
@@ -467,9 +706,9 @@ class RecipientTableTest_getAndPossiblyMerge {
     val mms2: MessageRecord = SignalDatabase.messages.getMessageRecord(mmsId2)!!
     val mms3: MessageRecord = SignalDatabase.messages.getMessageRecord(mmsId3)!!
 
-    assertEquals(retrievedId, mms1.recipient.id)
-    assertEquals(retrievedId, mms2.recipient.id)
-    assertEquals(retrievedId, mms3.recipient.id)
+    assertEquals(retrievedId, mms1.fromRecipient.id)
+    assertEquals(retrievedId, mms2.fromRecipient.id)
+    assertEquals(retrievedId, mms3.fromRecipient.id)
 
     assertEquals(retrievedThreadId, mms1.threadId)
     assertEquals(retrievedThreadId, mms2.threadId)
@@ -539,11 +778,11 @@ class RecipientTableTest_getAndPossiblyMerge {
   }
 
   private fun getMention(messageId: Long): MentionModel {
-    SignalDatabase.rawDatabase.rawQuery("SELECT * FROM ${MentionTable.TABLE_NAME} WHERE ${MentionTable.MESSAGE_ID} = $messageId").use { cursor ->
+    return SignalDatabase.rawDatabase.rawQuery("SELECT * FROM ${MentionTable.TABLE_NAME} WHERE ${MentionTable.MESSAGE_ID} = $messageId").use { cursor ->
       cursor.moveToFirst()
-      return MentionModel(
-        recipientId = RecipientId.from(CursorUtil.requireLong(cursor, MentionTable.RECIPIENT_ID)),
-        threadId = CursorUtil.requireLong(cursor, MentionTable.THREAD_ID)
+      MentionModel(
+        recipientId = RecipientId.from(cursor.requireLong(MentionTable.RECIPIENT_ID)),
+        threadId = cursor.requireLong(MentionTable.THREAD_ID)
       )
     }
   }
@@ -577,6 +816,14 @@ class RecipientTableTest_getAndPossiblyMerge {
       if (!test.changeNumberExpected) {
         test.expectNoChangeNumberEvent()
       }
+
+      if (!test.threadMergeExpected) {
+        test.expectNoThreadMergeEvent()
+      }
+
+      if (!test.sessionSwitchoverExpected) {
+        test.expectNoSessionSwitchoverEvent()
+      }
     } catch (e: Throwable) {
       if (e.javaClass != exception) {
         val error = java.lang.AssertionError("[$name] ${e.message}")
@@ -594,6 +841,8 @@ class RecipientTableTest_getAndPossiblyMerge {
     private lateinit var outputRecipientId: RecipientId
 
     var changeNumberExpected = false
+    var threadMergeExpected = false
+    var sessionSwitchoverExpected = false
 
     init {
       // Need to delete these first to prevent foreign key crash
@@ -616,9 +865,8 @@ class RecipientTableTest_getAndPossiblyMerge {
       pni: PNI?,
       aci: ACI?,
       createThread: Boolean = true,
-      sms: List<String> = emptyList(),
-      mms: List<String> = emptyList()
-    ) {
+      pniSession: Boolean = false
+    ): RecipientId {
       val id = insert(e164, pni, aci)
       generatedIds += id
       if (createThread) {
@@ -626,11 +874,22 @@ class RecipientTableTest_getAndPossiblyMerge {
         SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(id))
         SignalDatabase.messages.insertMessageInbox(IncomingEncryptedMessage(IncomingTextMessage(id, 1, 0, 0, 0, "", Optional.empty(), 0, false, ""), ""))
       }
+
+      if (pniSession) {
+        if (pni == null) {
+          throw IllegalArgumentException("pniSession = true but pni is null!")
+        }
+
+        SignalDatabase.sessions.store(pni, SignalProtocolAddress(pni.toString(), 1), SessionRecord())
+      }
+
+      return id
     }
 
-    fun process(e164: String?, pni: PNI?, aci: ACI?, changeSelf: Boolean = false) {
-      outputRecipientId = SignalDatabase.recipients.getAndPossiblyMerge(serviceId = aci ?: pni, pni = pni, e164 = e164, pniVerified = false, changeSelf = changeSelf)
+    fun process(e164: String?, pni: PNI?, aci: ACI?, changeSelf: Boolean = false, pniVerified: Boolean = false): RecipientId {
+      outputRecipientId = SignalDatabase.recipients.getAndPossiblyMerge(serviceId = aci ?: pni, pni = pni, e164 = e164, pniVerified = pniVerified, changeSelf = changeSelf)
       generatedIds += outputRecipientId
+      return outputRecipientId
     }
 
     fun expect(e164: String?, pni: PNI?, aci: ACI?) {
@@ -676,6 +935,32 @@ class RecipientTableTest_getAndPossiblyMerge {
       changeNumberExpected = false
     }
 
+    fun expectSessionSwitchoverEvent(e164: String) {
+      expectSessionSwitchoverEvent(outputRecipientId, e164)
+    }
+
+    fun expectSessionSwitchoverEvent(recipientId: RecipientId, e164: String) {
+      val event: SessionSwitchoverEvent? = getLatestSessionSwitchoverEvent(recipientId)
+      assertNotNull(event)
+      assertEquals(e164, event!!.e164)
+      sessionSwitchoverExpected = true
+    }
+
+    fun expectNoSessionSwitchoverEvent() {
+      assertNull(getLatestSessionSwitchoverEvent(outputRecipientId))
+    }
+
+    fun expectThreadMergeEvent(previousE164: String) {
+      val event: ThreadMergeEvent? = getLatestThreadMergeEvent(outputRecipientId)
+      assertNotNull(event)
+      assertEquals(previousE164, event!!.previousE164)
+      threadMergeExpected = true
+    }
+
+    fun expectNoThreadMergeEvent() {
+      assertNull(getLatestThreadMergeEvent(outputRecipientId))
+    }
+
     private fun insert(e164: String?, pni: PNI?, aci: ACI?): RecipientId {
       val serviceIdString: String? = (aci ?: pni)?.toString()
       val pniString: String? = pni?.toString()
@@ -746,6 +1031,42 @@ class RecipientTableTest_getAndPossiblyMerge {
     }
   }
 
+  private fun getLatestThreadMergeEvent(recipientId: RecipientId): ThreadMergeEvent? {
+    return SignalDatabase.rawDatabase
+      .select(MessageTable.BODY)
+      .from(MessageTable.TABLE_NAME)
+      .where("${MessageTable.FROM_RECIPIENT_ID} = ? AND ${MessageTable.TYPE} = ?", recipientId, MessageTypes.THREAD_MERGE_TYPE)
+      .orderBy("${MessageTable.DATE_RECEIVED} DESC")
+      .limit(1)
+      .run()
+      .use { cursor: Cursor ->
+        if (cursor.moveToFirst()) {
+          val bytes = Base64.decode(cursor.requireNonNullString(MessageTable.BODY))
+          ThreadMergeEvent.parseFrom(bytes)
+        } else {
+          null
+        }
+      }
+  }
+
+  private fun getLatestSessionSwitchoverEvent(recipientId: RecipientId): SessionSwitchoverEvent? {
+    return SignalDatabase.rawDatabase
+      .select(MessageTable.BODY)
+      .from(MessageTable.TABLE_NAME)
+      .where("${MessageTable.FROM_RECIPIENT_ID} = ? AND ${MessageTable.TYPE} = ?", recipientId, MessageTypes.SESSION_SWITCHOVER_TYPE)
+      .orderBy("${MessageTable.DATE_RECEIVED} DESC")
+      .limit(1)
+      .run()
+      .use { cursor: Cursor ->
+        if (cursor.moveToFirst()) {
+          val bytes = Base64.decode(cursor.requireNonNullString(MessageTable.BODY))
+          SessionSwitchoverEvent.parseFrom(bytes)
+        } else {
+          null
+        }
+      }
+  }
+
   companion object {
     val ACI_A = ACI.from(UUID.fromString("aaaa0000-5a76-47fa-a98a-7e72c948a82e"))
     val ACI_B = ACI.from(UUID.fromString("bbbb0000-0b60-4a68-9cd9-ed2f8453f9ed"))

app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_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 RecipientTableTest_processPnpTupleToChangeSet {
-
-  @Rule
-  @JvmField
-  val databaseRule = SignalDatabaseRule(deleteAllThreadsOnEachRun = false)
-
-  private lateinit var db: RecipientTable
-
-  @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(
-      RecipientTable.TABLE_NAME,
-      null,
-      contentValuesOf(
-        RecipientTable.PHONE to e164,
-        RecipientTable.SERVICE_ID to (aci ?: pni)?.toString(),
-        RecipientTable.PNI_COLUMN to pni?.toString(),
-        RecipientTable.REGISTERED to RecipientTable.RegisteredState.REGISTERED.id
-      )
-    )
-
-    return RecipientId.from(id)
-  }
-
-  private fun insertMockSessionFor(account: ServiceId, address: ServiceId) {
-    SignalDatabase.rawDatabase.insert(
-      SessionTable.TABLE_NAME, null,
-      contentValuesOf(
-        SessionTable.ACCOUNT_ID to account.toString(),
-        SessionTable.ADDRESS to address.toString(),
-        SessionTable.DEVICE to 1,
-        SessionTable.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 [RecipientTable.processPnpTupleToChangeSet] with your params,
-   * and then verify your output matches what you expect.
-   *
-   * It results the inserted ID's and changeset for additional verification.
-   *
-   * 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/StorySendTableTest.kt

@@ -65,17 +65,17 @@ class StorySendTableTest {
 
     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)

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

@@ -2,27 +2,33 @@ package org.thoughtcrime.securesms.dependencies
 
 import android.app.Application
 import okhttp3.ConnectionSpec
+import okhttp3.Response
+import okhttp3.WebSocket
+import okhttp3.WebSocketListener
 import okhttp3.mockwebserver.Dispatcher
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
 import okhttp3.mockwebserver.RecordedRequest
+import okio.ByteString
 import org.mockito.kotlin.any
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
+import org.signal.core.util.logging.Log
 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
@@ -48,13 +54,20 @@ class InstrumentationApplicationDependencyProvider(application: Application, def
     runSync {
       webServer = MockWebServer()
       baseUrl = webServer.url("").toString()
+
+      addMockWebRequestHandlers(
+        Get("/v1/websocket/?login=") {
+          MockResponse().success().withWebSocketUpgrade(mockIdentifiedWebSocket)
+        },
+        Get("/v1/websocket", { !it.path.contains("login") }) {
+          MockResponse().success().withWebSocketUpgrade(object : WebSocketListener() {})
+        }
+      )
     }
 
     webServer.setDispatcher(object : Dispatcher() {
       override fun dispatch(request: RecordedRequest): MockResponse {
-        val handler = handlers.firstOrNull {
-          request.method == it.verb && request.path.startsWith("/${it.path}")
-        }
+        val handler = handlers.firstOrNull { it.requestPredicate(request) }
         return handler?.responseFactory?.invoke(request) ?: MockResponse().setResponseCode(500)
       }
     })
@@ -66,15 +79,13 @@ 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)),
       emptyList(),
       Optional.of(SignalServiceNetworkAccess.DNS),
       Optional.empty(),
-      Base64.decode(BuildConfig.ZKGROUP_SERVER_PUBLIC_PARAMS),
-      true
+      Base64.decode(BuildConfig.ZKGROUP_SERVER_PUBLIC_PARAMS)
     )
 
     serviceNetworkAccessMock = mock {
@@ -100,18 +111,51 @@ class InstrumentationApplicationDependencyProvider(application: Application, def
     return recipientCache
   }
 
+  class MockWebSocket : WebSocketListener() {
+    private val TAG = "MockWebSocket"
+
+    var webSocket: WebSocket? = null
+      private set
+
+    override fun onOpen(webSocket: WebSocket, response: Response) {
+      Log.i(TAG, "onOpen(${webSocket.hashCode()})")
+      this.webSocket = webSocket
+    }
+
+    override fun onClosing(webSocket: WebSocket, code: Int, reason: String) {
+      Log.i(TAG, "onClosing(${webSocket.hashCode()}): $code, $reason")
+      this.webSocket = null
+    }
+
+    override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
+      Log.i(TAG, "onClosed(${webSocket.hashCode()}): $code, $reason")
+      this.webSocket = null
+    }
+
+    override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
+      Log.w(TAG, "onFailure(${webSocket.hashCode()})", t)
+      this.webSocket = null
+    }
+  }
+
   companion object {
     lateinit var webServer: MockWebServer
       private set
     lateinit var baseUrl: String
       private set
 
+    val mockIdentifiedWebSocket = MockWebSocket()
+
     private val handlers: MutableList<Verb> = mutableListOf()
 
     fun addMockWebRequestHandlers(vararg verbs: Verb) {
       handlers.addAll(verbs)
     }
 
+    fun injectWebSocketMessage(value: ByteString) {
+      mockIdentifiedWebSocket.webSocket!!.send(value)
+    }
+
     fun clearHandlers() {
       handlers.clear()
     }

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/EditMessageSyncProcessorTest.kt

@@ -0,0 +1,250 @@
+package org.thoughtcrime.securesms.messages
+
+import android.database.Cursor
+import android.util.Base64
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.signal.core.util.ThreadUtil
+import org.signal.core.util.readToList
+import org.signal.core.util.select
+import org.signal.core.util.withinTransaction
+import org.thoughtcrime.securesms.database.AttachmentTable
+import org.thoughtcrime.securesms.database.MessageTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.ThreadTable
+import org.thoughtcrime.securesms.database.model.toBodyRangeList
+import org.thoughtcrime.securesms.mms.OutgoingMessage
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.testing.MessageContentFuzzer
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+import org.thoughtcrime.securesms.testing.assertIs
+import org.thoughtcrime.securesms.util.MessageTableUtils
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.EditMessage
+import kotlin.time.Duration.Companion.seconds
+
+@RunWith(AndroidJUnit4::class)
+class EditMessageSyncProcessorTest {
+
+  companion object {
+    private val IGNORE_MESSAGE_COLUMNS = listOf(
+      MessageTable.DATE_RECEIVED,
+      MessageTable.NOTIFIED_TIMESTAMP,
+      MessageTable.REACTIONS_LAST_SEEN,
+      MessageTable.NOTIFIED
+    )
+
+    private val IGNORE_ATTACHMENT_COLUMNS = listOf(
+      AttachmentTable.UNIQUE_ID,
+      AttachmentTable.TRANSFER_FILE
+    )
+  }
+
+  @get:Rule
+  val harness = SignalActivityRule()
+
+  private lateinit var processorV2: MessageContentProcessorV2
+  private lateinit var testResult: TestResults
+  private var envelopeTimestamp: Long = 0
+
+  @Before
+  fun setup() {
+    processorV2 = MessageContentProcessorV2(harness.context)
+    envelopeTimestamp = System.currentTimeMillis()
+    testResult = TestResults()
+  }
+
+  @Test
+  fun textMessage() {
+    var originalTimestamp = envelopeTimestamp + 200
+    for (i in 1..10) {
+      originalTimestamp += 400
+
+      val toRecipient = Recipient.resolved(harness.others[0])
+
+      val content = MessageContentFuzzer.fuzzTextMessage()
+      val metadata = MessageContentFuzzer.envelopeMetadata(harness.self.id, toRecipient.id)
+      val syncContent = SignalServiceProtos.Content.newBuilder().setSyncMessage(
+        SignalServiceProtos.SyncMessage.newBuilder().setSent(
+          SignalServiceProtos.SyncMessage.Sent.newBuilder()
+            .setDestinationUuid(metadata.destinationServiceId.toString())
+            .setTimestamp(originalTimestamp)
+            .setExpirationStartTimestamp(originalTimestamp)
+            .setMessage(content.dataMessage)
+        )
+      ).build()
+      SignalDatabase.recipients.setExpireMessages(toRecipient.id, content.dataMessage.expireTimer)
+      val syncTextMessage = TestMessage(
+        envelope = MessageContentFuzzer.envelope(originalTimestamp),
+        content = syncContent,
+        metadata = metadata,
+        serverDeliveredTimestamp = MessageContentFuzzer.fuzzServerDeliveredTimestamp(originalTimestamp)
+      )
+
+      val editTimestamp = originalTimestamp + 200
+      val editedContent = MessageContentFuzzer.fuzzTextMessage()
+      val editSyncContent = SignalServiceProtos.Content.newBuilder().setSyncMessage(
+        SignalServiceProtos.SyncMessage.newBuilder().setSent(
+          SignalServiceProtos.SyncMessage.Sent.newBuilder()
+            .setDestinationUuid(metadata.destinationServiceId.toString())
+            .setTimestamp(editTimestamp)
+            .setExpirationStartTimestamp(editTimestamp)
+            .setEditMessage(
+              EditMessage.newBuilder()
+                .setDataMessage(editedContent.dataMessage)
+                .setTargetSentTimestamp(originalTimestamp)
+            )
+        )
+      ).build()
+
+      val syncEditMessage = TestMessage(
+        envelope = MessageContentFuzzer.envelope(editTimestamp),
+        content = editSyncContent,
+        metadata = metadata,
+        serverDeliveredTimestamp = MessageContentFuzzer.fuzzServerDeliveredTimestamp(editTimestamp)
+      )
+
+      testResult.runSync(listOf(syncTextMessage, syncEditMessage))
+
+      SignalDatabase.recipients.setExpireMessages(toRecipient.id, content.dataMessage.expireTimer / 1000)
+      val originalTextMessage = OutgoingMessage(
+        threadRecipient = toRecipient,
+        sentTimeMillis = originalTimestamp,
+        body = content.dataMessage.body,
+        expiresIn = content.dataMessage.expireTimer.seconds.inWholeMilliseconds,
+        isUrgent = true,
+        isSecure = true,
+        bodyRanges = content.dataMessage.bodyRangesList.toBodyRangeList()
+      )
+      val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(toRecipient)
+      val originalMessageId = SignalDatabase.messages.insertMessageOutbox(originalTextMessage, threadId, false, null)
+      SignalDatabase.messages.markAsSent(originalMessageId, true)
+      if (content.dataMessage.expireTimer > 0) {
+        SignalDatabase.messages.markExpireStarted(originalMessageId, originalTimestamp)
+      }
+
+      val editMessage = OutgoingMessage(
+        threadRecipient = toRecipient,
+        sentTimeMillis = editTimestamp,
+        body = editedContent.dataMessage.body,
+        expiresIn = content.dataMessage.expireTimer.seconds.inWholeMilliseconds,
+        isUrgent = true,
+        isSecure = true,
+        bodyRanges = editedContent.dataMessage.bodyRangesList.toBodyRangeList(),
+        messageToEdit = originalMessageId
+      )
+
+      val editMessageId = SignalDatabase.messages.insertMessageOutbox(editMessage, threadId, false, null)
+      SignalDatabase.messages.markAsSent(editMessageId, true)
+
+      if (content.dataMessage.expireTimer > 0) {
+        SignalDatabase.messages.markExpireStarted(editMessageId, originalTimestamp)
+      }
+      testResult.collectLocal()
+      testResult.assert()
+    }
+  }
+
+  private inner class TestResults {
+
+    private lateinit var localMessages: List<List<Pair<String, String?>>>
+    private lateinit var localAttachments: List<List<Pair<String, String?>>>
+
+    private lateinit var syncMessages: List<List<Pair<String, String?>>>
+    private lateinit var syncAttachments: List<List<Pair<String, String?>>>
+
+    fun collectLocal() {
+      harness.inMemoryLogger.clear()
+
+      localMessages = dumpMessages()
+      localAttachments = dumpAttachments()
+
+      cleanup()
+    }
+
+    fun runSync(messages: List<TestMessage>) {
+      messages.forEach { (envelope, content, metadata, serverDeliveredTimestamp) ->
+        if (content.hasSyncMessage()) {
+          processorV2.process(
+            envelope,
+            content,
+            metadata,
+            serverDeliveredTimestamp,
+            false
+          )
+          ThreadUtil.sleep(1)
+        }
+      }
+      harness.inMemoryLogger.clear()
+
+      syncMessages = dumpMessages()
+      syncAttachments = dumpAttachments()
+
+      cleanup()
+    }
+
+    fun cleanup() {
+      SignalDatabase.rawDatabase.withinTransaction { db ->
+        SignalDatabase.threads.deleteAllConversations()
+        db.execSQL("DELETE FROM sqlite_sequence WHERE name = '${MessageTable.TABLE_NAME}'")
+        db.execSQL("DELETE FROM sqlite_sequence WHERE name = '${ThreadTable.TABLE_NAME}'")
+        db.execSQL("DELETE FROM sqlite_sequence WHERE name = '${AttachmentTable.TABLE_NAME}'")
+      }
+    }
+
+    fun assert() {
+      syncMessages.zip(localMessages)
+        .forEach { (v2, v1) ->
+          v2.assertIs(v1)
+        }
+
+      syncAttachments.zip(localAttachments)
+        .forEach { (v2, v1) ->
+          v2.assertIs(v1)
+        }
+    }
+
+    private fun dumpMessages(): List<List<Pair<String, String?>>> {
+      return dumpTable(MessageTable.TABLE_NAME)
+        .map { row ->
+          val newRow = row.toMutableList()
+          newRow.removeIf { IGNORE_MESSAGE_COLUMNS.contains(it.first) }
+          newRow
+        }
+    }
+
+    private fun dumpAttachments(): List<List<Pair<String, String?>>> {
+      return dumpTable(AttachmentTable.TABLE_NAME)
+        .map { row ->
+          val newRow = row.toMutableList()
+          newRow.removeIf { IGNORE_ATTACHMENT_COLUMNS.contains(it.first) }
+          newRow
+        }
+    }
+
+    private fun dumpTable(table: String): List<List<Pair<String, String?>>> {
+      return SignalDatabase.rawDatabase
+        .select()
+        .from(table)
+        .run()
+        .readToList { cursor ->
+          val map: List<Pair<String, String?>> = cursor.columnNames.map { column ->
+            val index = cursor.getColumnIndex(column)
+            var data: String? = when (cursor.getType(index)) {
+              Cursor.FIELD_TYPE_BLOB -> Base64.encodeToString(cursor.getBlob(index), 0)
+              else -> cursor.getString(index)
+            }
+            if (table == MessageTable.TABLE_NAME && column == MessageTable.TYPE) {
+              data = MessageTableUtils.typeColumnToString(cursor.getLong(index))
+            }
+
+            column to data
+          }
+          map
+        }
+    }
+  }
+}

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

@@ -30,7 +30,7 @@ abstract class MessageContentProcessorTest {
   protected fun createNormalContentTestSubject(): MessageContentProcessor {
     val context = ApplicationProvider.getApplicationContext<Application>()
 
-    return MessageContentProcessor.forNormalContent(context)
+    return MessageContentProcessor.create(context)
   }
 
   /**

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

@@ -0,0 +1,313 @@
+package org.thoughtcrime.securesms.messages
+
+import android.database.Cursor
+import android.util.Base64
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.signal.core.util.ThreadUtil
+import org.signal.core.util.readToList
+import org.signal.core.util.select
+import org.signal.core.util.withinTransaction
+import org.thoughtcrime.securesms.database.AttachmentTable
+import org.thoughtcrime.securesms.database.MessageTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.ThreadTable
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.testing.Entry
+import org.thoughtcrime.securesms.testing.InMemoryLogger
+import org.thoughtcrime.securesms.testing.MessageContentFuzzer
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+import org.thoughtcrime.securesms.testing.assertIs
+import org.thoughtcrime.securesms.util.MessageTableUtils
+import org.whispersystems.signalservice.api.crypto.EnvelopeMetadata
+import org.whispersystems.signalservice.api.messages.SignalServiceContent
+import org.whispersystems.signalservice.api.messages.SignalServiceMetadata
+import org.whispersystems.signalservice.api.push.SignalServiceAddress
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos
+import org.whispersystems.signalservice.internal.serialize.SignalServiceAddressProtobufSerializer
+import org.whispersystems.signalservice.internal.serialize.SignalServiceMetadataProtobufSerializer
+import org.whispersystems.signalservice.internal.serialize.protos.SignalServiceContentProto
+import java.util.Optional
+
+@RunWith(AndroidJUnit4::class)
+class MessageContentProcessorTestV2 {
+
+  companion object {
+    private val TAGS = listOf(MessageContentProcessor.TAG, MessageContentProcessorV2.TAG, AttachmentTable.TAG)
+
+    private val GENERALIZE_TAG = mapOf(
+      MessageContentProcessor.TAG to "MCP",
+      MessageContentProcessorV2.TAG to "MCP",
+      AttachmentTable.TAG to AttachmentTable.TAG
+    )
+
+    private val IGNORE_MESSAGE_COLUMNS = listOf(
+      MessageTable.DATE_RECEIVED,
+      MessageTable.NOTIFIED_TIMESTAMP,
+      MessageTable.REACTIONS_LAST_SEEN,
+      MessageTable.NOTIFIED
+    )
+
+    private val IGNORE_ATTACHMENT_COLUMNS = listOf(
+      AttachmentTable.UNIQUE_ID,
+      AttachmentTable.TRANSFER_FILE
+    )
+  }
+
+  @get:Rule
+  val harness = SignalActivityRule()
+
+  private lateinit var processorV1: MessageContentProcessor
+  private lateinit var processorV2: MessageContentProcessorV2
+  private lateinit var testResult: TestResults
+  private var envelopeTimestamp: Long = 0
+
+  @Before
+  fun setup() {
+    processorV1 = MessageContentProcessor(harness.context)
+    processorV2 = MessageContentProcessorV2(harness.context)
+    envelopeTimestamp = System.currentTimeMillis()
+    testResult = TestResults()
+  }
+
+  @Test
+  fun textMessage() {
+    var start = envelopeTimestamp
+
+    val messages: List<TestMessage> = (0 until 100).map {
+      start += 200
+      TestMessage(
+        envelope = MessageContentFuzzer.envelope(start),
+        content = MessageContentFuzzer.fuzzTextMessage(),
+        metadata = MessageContentFuzzer.envelopeMetadata(harness.others[0], harness.self.id),
+        serverDeliveredTimestamp = MessageContentFuzzer.fuzzServerDeliveredTimestamp(start)
+      )
+    }
+
+    testResult.runV2(messages)
+    testResult.runV1(messages)
+
+    testResult.assert()
+  }
+
+  @Test
+  fun mediaMessage() {
+    var start = envelopeTimestamp
+
+    val textMessages: List<TestMessage> = (0 until 10).map {
+      start += 200
+      TestMessage(
+        envelope = MessageContentFuzzer.envelope(start),
+        content = MessageContentFuzzer.fuzzTextMessage(),
+        metadata = MessageContentFuzzer.envelopeMetadata(harness.others[0], harness.self.id),
+        serverDeliveredTimestamp = MessageContentFuzzer.fuzzServerDeliveredTimestamp(start)
+      )
+    }
+
+    val firstBatchMediaMessages: List<TestMessage> = (0 until 10).map {
+      start += 200
+      TestMessage(
+        envelope = MessageContentFuzzer.envelope(start),
+        content = MessageContentFuzzer.fuzzMediaMessageWithBody(textMessages),
+        metadata = MessageContentFuzzer.envelopeMetadata(harness.others[0], harness.self.id),
+        serverDeliveredTimestamp = MessageContentFuzzer.fuzzServerDeliveredTimestamp(start)
+      )
+    }
+
+    val secondBatchNoContentMediaMessages: List<TestMessage> = (0 until 10).map {
+      start += 200
+      TestMessage(
+        envelope = MessageContentFuzzer.envelope(start),
+        content = MessageContentFuzzer.fuzzMediaMessageNoContent(textMessages + firstBatchMediaMessages),
+        metadata = MessageContentFuzzer.envelopeMetadata(harness.others[0], harness.self.id),
+        serverDeliveredTimestamp = MessageContentFuzzer.fuzzServerDeliveredTimestamp(start)
+      )
+    }
+
+    val thirdBatchNoTextMediaMessagesMessages: List<TestMessage> = (0 until 10).map {
+      start += 200
+      TestMessage(
+        envelope = MessageContentFuzzer.envelope(start),
+        content = MessageContentFuzzer.fuzzMediaMessageNoText(textMessages + firstBatchMediaMessages),
+        metadata = MessageContentFuzzer.envelopeMetadata(harness.others[0], harness.self.id),
+        serverDeliveredTimestamp = MessageContentFuzzer.fuzzServerDeliveredTimestamp(start)
+      )
+    }
+
+    testResult.runV2(textMessages + firstBatchMediaMessages + secondBatchNoContentMediaMessages + thirdBatchNoTextMediaMessagesMessages)
+    testResult.runV1(textMessages + firstBatchMediaMessages + secondBatchNoContentMediaMessages + thirdBatchNoTextMediaMessagesMessages)
+
+    testResult.assert()
+  }
+
+  private inner class TestResults {
+
+    private lateinit var v1Logs: List<Entry>
+    private lateinit var v1Messages: List<List<Pair<String, String?>>>
+    private lateinit var v1Attachments: List<List<Pair<String, String?>>>
+    private lateinit var v2Logs: List<Entry>
+    private lateinit var v2Messages: List<List<Pair<String, String?>>>
+    private lateinit var v2Attachments: List<List<Pair<String, String?>>>
+
+    fun runV1(messages: List<TestMessage>) {
+      messages.forEach { (envelope, content, metadata, serverDeliveredTimestamp) ->
+        if (content.hasDataMessage()) {
+          processorV1.process(
+            MessageContentProcessor.MessageState.DECRYPTED_OK,
+            toSignalServiceContent(envelope, content, metadata, serverDeliveredTimestamp),
+            null,
+            envelope.timestamp,
+            -1
+          )
+          ThreadUtil.sleep(1)
+        }
+      }
+
+      v1Logs = harness.inMemoryLogger.logs()
+      harness.inMemoryLogger.clear()
+
+      v1Messages = dumpMessages()
+      v1Attachments = dumpAttachments()
+    }
+
+    fun runV2(messages: List<TestMessage>) {
+      messages.forEach { (envelope, content, metadata, serverDeliveredTimestamp) ->
+        if (content.hasDataMessage()) {
+          processorV2.process(
+            envelope,
+            content,
+            metadata,
+            serverDeliveredTimestamp,
+            false
+          )
+          ThreadUtil.sleep(1)
+        }
+      }
+
+      v2Logs = harness.inMemoryLogger.logs()
+      harness.inMemoryLogger.clear()
+
+      v2Messages = dumpMessages()
+      v2Attachments = dumpAttachments()
+
+      cleanup()
+    }
+
+    fun cleanup() {
+      SignalDatabase.rawDatabase.withinTransaction { db ->
+        SignalDatabase.threads.deleteAllConversations()
+        db.execSQL("DELETE FROM sqlite_sequence WHERE name = '${MessageTable.TABLE_NAME}'")
+        db.execSQL("DELETE FROM sqlite_sequence WHERE name = '${ThreadTable.TABLE_NAME}'")
+        db.execSQL("DELETE FROM sqlite_sequence WHERE name = '${AttachmentTable.TABLE_NAME}'")
+      }
+    }
+
+    fun assert() {
+      v2Logs.zip(v1Logs)
+        .forEach { (v2, v1) ->
+          GENERALIZE_TAG[v2.tag]!!.assertIs(GENERALIZE_TAG[v1.tag]!!)
+
+          if (v2.tag != AttachmentTable.TAG) {
+            if (v2.message?.startsWith("[") == true && v1.message?.startsWith("[") == false) {
+              v2.message!!.substring(v2.message!!.indexOf(']') + 2).assertIs(v1.message)
+            } else {
+              v2.message.assertIs(v1.message)
+            }
+          } else {
+            if (v2.message?.startsWith("Inserted attachment at ID: AttachmentId::") == true) {
+              v2.message!!
+                .substring(0, v2.message!!.indexOf(','))
+                .assertIs(
+                  v1.message!!
+                    .substring(0, v1.message!!.indexOf(','))
+                )
+            } else {
+              v2.message.assertIs(v1.message)
+            }
+          }
+          v2.throwable.assertIs(v1.throwable)
+        }
+
+      v2Messages.zip(v1Messages)
+        .forEach { (v2, v1) ->
+          v2.assertIs(v1)
+        }
+
+      v2Attachments.zip(v1Attachments)
+        .forEach { (v2, v1) ->
+          v2.assertIs(v1)
+        }
+    }
+
+    private fun InMemoryLogger.logs(): List<Entry> {
+      return entries()
+        .filter { TAGS.contains(it.tag) }
+    }
+
+    private fun dumpMessages(): List<List<Pair<String, String?>>> {
+      return dumpTable(MessageTable.TABLE_NAME)
+        .map { row ->
+          val newRow = row.toMutableList()
+          newRow.removeIf { IGNORE_MESSAGE_COLUMNS.contains(it.first) }
+          newRow
+        }
+    }
+
+    private fun dumpAttachments(): List<List<Pair<String, String?>>> {
+      return dumpTable(AttachmentTable.TABLE_NAME)
+        .map { row ->
+          val newRow = row.toMutableList()
+          newRow.removeIf { IGNORE_ATTACHMENT_COLUMNS.contains(it.first) }
+          newRow
+        }
+    }
+
+    private fun dumpTable(table: String): List<List<Pair<String, String?>>> {
+      return SignalDatabase.rawDatabase
+        .select()
+        .from(table)
+        .run()
+        .readToList { cursor ->
+          val map: List<Pair<String, String?>> = cursor.columnNames.map { column ->
+            val index = cursor.getColumnIndex(column)
+            var data: String? = when (cursor.getType(index)) {
+              Cursor.FIELD_TYPE_BLOB -> Base64.encodeToString(cursor.getBlob(index), 0)
+              else -> cursor.getString(index)
+            }
+            if (table == MessageTable.TABLE_NAME && column == MessageTable.TYPE) {
+              data = MessageTableUtils.typeColumnToString(cursor.getLong(index))
+            }
+
+            column to data
+          }
+          map
+        }
+    }
+  }
+
+  private fun toSignalServiceContent(envelope: SignalServiceProtos.Envelope, content: SignalServiceProtos.Content, metadata: EnvelopeMetadata, serverDeliveredTimestamp: Long): SignalServiceContent {
+    val localAddress = SignalServiceAddress(metadata.destinationServiceId, Optional.ofNullable(SignalStore.account().e164))
+    val signalServiceMetadata = SignalServiceMetadata(
+      SignalServiceAddress(metadata.sourceServiceId, Optional.ofNullable(metadata.sourceE164)),
+      metadata.sourceDeviceId,
+      envelope.timestamp,
+      envelope.serverTimestamp,
+      serverDeliveredTimestamp,
+      metadata.sealedSender,
+      envelope.serverGuid,
+      Optional.ofNullable(metadata.groupId),
+      metadata.destinationServiceId.toString()
+    )
+
+    val contentProto = SignalServiceContentProto.newBuilder()
+      .setLocalAddress(SignalServiceAddressProtobufSerializer.toProtobuf(localAddress))
+      .setMetadata(SignalServiceMetadataProtobufSerializer.toProtobuf(signalServiceMetadata))
+      .setContent(content)
+      .build()
+
+    return SignalServiceContent.createFromProto(contentProto)!!
+  }
+}

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

@@ -0,0 +1,209 @@
+package org.thoughtcrime.securesms.messages
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import io.mockk.every
+import io.mockk.mockkObject
+import io.mockk.mockkStatic
+import io.mockk.unmockkStatic
+import okio.ByteString
+import okio.ByteString.Companion.toByteString
+import org.junit.After
+import org.junit.Before
+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.dependencies.InstrumentationApplicationDependencyProvider
+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 org.whispersystems.signalservice.internal.websocket.WebSocketProtos.WebSocketMessage
+import org.whispersystems.signalservice.internal.websocket.WebSocketProtos.WebSocketRequestMessage
+import java.util.regex.Pattern
+import kotlin.random.Random
+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)
+
+    private val DECRYPTION_TIME_PATTERN = Pattern.compile("^Decrypted (?<count>\\d+) envelopes in (?<duration>\\d+) ms.*$")
+  }
+
+  @get:Rule
+  val harness = SignalActivityRule()
+
+  private val trustRoot: ECKeyPair = Curve.generateKeyPair()
+
+  @Before
+  fun setup() {
+    mockkStatic(UnidentifiedAccessUtil::class)
+    every { UnidentifiedAccessUtil.getCertificateValidator() } returns FakeClientHelpers.noOpCertificateValidator
+
+    mockkObject(MessageContentProcessorV2)
+    every { MessageContentProcessorV2.create(harness.application) } returns TimingMessageContentProcessorV2(harness.application)
+  }
+
+  @After
+  fun after() {
+    unmockkStatic(UnidentifiedAccessUtil::class)
+    unmockkStatic(MessageContentProcessorV2::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 the initial messages to get past the prekey phase
+    establishSession(aliceClient, bobClient, bob)
+
+    // Have Bob generate N messages that will be received by Alice
+    val messageCount = 100
+    val envelopes = generateInboundEnvelopes(bobClient, messageCount)
+    val firstTimestamp = envelopes.first().timestamp
+    val lastTimestamp = envelopes.last().timestamp
+
+    // Inject the envelopes into the websocket
+    Thread {
+      for (envelope in envelopes) {
+        Log.i(TIMING_TAG, "Retrieved envelope! ${envelope.timestamp}")
+        InstrumentationApplicationDependencyProvider.injectWebSocketMessage(envelope.toWebSocketPayload())
+      }
+      InstrumentationApplicationDependencyProvider.injectWebSocketMessage(webSocketTombstone())
+    }.start()
+
+    // Wait until they've all been fully decrypted + processed
+    harness
+      .inMemoryLogger
+      .getLockForUntil(TimingMessageContentProcessorV2.endTagPredicate(lastTimestamp))
+      .awaitFor(1.minutes)
+
+    harness.inMemoryLogger.flush()
+
+    // Process logs for timing data
+    val entries = harness.inMemoryLogger.entries()
+
+    // Calculate decryption average
+    val totalDecryptDuration: Long = entries
+      .mapNotNull { entry -> entry.message?.let { DECRYPTION_TIME_PATTERN.matcher(it) } }
+      .filter { it.matches() }
+      .drop(1) // Ignore the first message, which represents the prekey exchange
+      .sumOf { it.group("duration")!!.toLong() }
+
+    AndroidLog.w(TAG, "Decryption: Average runtime: ${totalDecryptDuration.toFloat() / messageCount.toFloat()}ms")
+
+    // Calculate MessageContentProcessor
+
+    val takeLast: List<Entry> = entries.filter { it.tag == TimingMessageContentProcessorV2.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 == TimingMessageContentProcessorV2.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")
+  }
+
+  private fun establishSession(aliceClient: AliceClient, bobClient: BobClient, bob: Recipient) {
+    // Send message from Bob to Alice (self)
+    val firstPreKeyMessageTimestamp = System.currentTimeMillis()
+    val encryptedEnvelope = bobClient.encrypt(firstPreKeyMessageTimestamp)
+
+    val aliceProcessFirstMessageLatch = harness
+      .inMemoryLogger
+      .getLockForUntil(TimingMessageContentProcessorV2.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)
+  }
+
+  private fun generateInboundEnvelopes(bobClient: BobClient, count: Int): List<Envelope> {
+    val envelopes = ArrayList<Envelope>(count)
+    var now = System.currentTimeMillis()
+    for (i in 0..count) {
+      envelopes += bobClient.encrypt(now)
+      now += 3
+    }
+
+    return envelopes
+  }
+
+  private fun webSocketTombstone(): ByteString {
+    return WebSocketMessage
+      .newBuilder()
+      .setRequest(
+        WebSocketRequestMessage.newBuilder()
+          .setVerb("PUT")
+          .setPath("/api/v1/queue/empty")
+      )
+      .build()
+      .toByteArray()
+      .toByteString()
+  }
+
+  private fun Envelope.toWebSocketPayload(): ByteString {
+    return WebSocketMessage
+      .newBuilder()
+      .setType(WebSocketMessage.Type.REQUEST)
+      .setRequest(
+        WebSocketRequestMessage.newBuilder()
+          .setVerb("PUT")
+          .setPath("/api/v1/message")
+          .setId(Random(System.currentTimeMillis()).nextLong())
+          .addHeaders("X-Signal-Timestamp: ${this.timestamp}")
+          .setBody(this.toByteString())
+      )
+      .build()
+      .toByteArray()
+      .toByteString()
+  }
+}

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

@@ -0,0 +1,11 @@
+package org.thoughtcrime.securesms.messages
+
+import org.whispersystems.signalservice.api.crypto.EnvelopeMetadata
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos
+
+data class TestMessage(
+  val envelope: SignalServiceProtos.Envelope,
+  val content: SignalServiceProtos.Content,
+  val metadata: EnvelopeMetadata,
+  val serverDeliveredTimestamp: Long
+)

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

@@ -0,0 +1,26 @@
+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.crypto.EnvelopeMetadata
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos
+
+class TimingMessageContentProcessorV2(context: Context) : MessageContentProcessorV2(context) {
+  companion object {
+    val TAG = Log.tag(TimingMessageContentProcessorV2::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(envelope: SignalServiceProtos.Envelope, content: SignalServiceProtos.Content, metadata: EnvelopeMetadata, serverDeliveredTimestamp: Long, processingEarlyContent: Boolean) {
+    Log.d(TAG, startTag(envelope.timestamp))
+    super.process(envelope, content, metadata, serverDeliveredTimestamp, processingEarlyContent)
+    Log.d(TAG, endTag(envelope.timestamp))
+  }
+}

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

@@ -100,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,7 +27,7 @@ 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()
 
@@ -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,59 @@
+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.messages.protocol.BufferedProtocolStore
+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()
+    val bufferedStore = BufferedProtocolStore.create()
+    ApplicationDependencies.getIncomingMessageObserver()
+      .processEnvelope(bufferedStore, envelope, serverDeliveredTimestamp)
+      ?.mapNotNull { it.run() }
+      ?.forEach { ApplicationDependencies.getJobManager().add(it) }
+
+    bufferedStore.flushToDisk()
+    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,97 @@
+package org.thoughtcrime.securesms.testing
+
+import org.signal.core.util.ThreadUtil
+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", ThreadUtil.PRIORITY_BACKGROUND_THREAD)
+  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()
+  }
+
+  fun clear() {
+    val latch = CountDownLatch(1)
+    executor.execute {
+      predicates.clear()
+      logEntries.clear()
+      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/MessageContentFuzzer.kt

@@ -0,0 +1,234 @@
+package org.thoughtcrime.securesms.testing
+
+import com.google.protobuf.ByteString
+import org.thoughtcrime.securesms.database.model.toProtoByteString
+import org.thoughtcrime.securesms.messages.TestMessage
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.whispersystems.signalservice.api.crypto.EnvelopeMetadata
+import org.whispersystems.signalservice.api.util.UuidUtil
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.AttachmentPointer
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.Content
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.DataMessage
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.Envelope
+import java.util.UUID
+import kotlin.random.Random
+import kotlin.random.nextInt
+import kotlin.time.Duration.Companion.days
+
+/**
+ * Random but deterministic fuzzer for create various message content protos.
+ */
+object MessageContentFuzzer {
+
+  private val mediaTypes = listOf("image/png", "image/jpeg", "image/heic", "image/heif", "image/avif", "image/webp", "image/gif", "audio/aac", "audio/*", "video/mp4", "video/*", "text/x-vcard", "text/x-signal-plain", "application/x-signal-view-once", "*/*", "application/octet-stream")
+  private val emojis = listOf("😂", "❤️", "🔥", "😍", "👀", "🤔", "🙏", "👍", "🤷", "🥺")
+
+  private val random = Random(1)
+
+  /**
+   * Create an [Envelope].
+   */
+  fun envelope(timestamp: Long): Envelope {
+    return Envelope.newBuilder()
+      .setTimestamp(timestamp)
+      .setServerTimestamp(timestamp + 5)
+      .setServerGuidBytes(UuidUtil.toByteString(UUID.randomUUID()))
+      .build()
+  }
+
+  /**
+   * Create metadata to match an [Envelope].
+   */
+  fun envelopeMetadata(source: RecipientId, destination: RecipientId): EnvelopeMetadata {
+    return EnvelopeMetadata(
+      sourceServiceId = Recipient.resolved(source).requireServiceId(),
+      sourceE164 = null,
+      sourceDeviceId = 1,
+      sealedSender = true,
+      groupId = null,
+      destinationServiceId = Recipient.resolved(destination).requireServiceId()
+    )
+  }
+
+  /**
+   * Create a random text message that will contain a body but may also contain
+   * - An expire timer value
+   * - Bold style body ranges
+   */
+  fun fuzzTextMessage(): Content {
+    return Content.newBuilder()
+      .setDataMessage(
+        DataMessage.newBuilder().run {
+          body = string()
+          if (random.nextBoolean()) {
+            expireTimer = random.nextInt(0..28.days.inWholeSeconds.toInt())
+          }
+          if (random.nextBoolean()) {
+            addBodyRanges(
+              SignalServiceProtos.BodyRange.newBuilder().run {
+                start = 0
+                length = 1
+                style = SignalServiceProtos.BodyRange.Style.BOLD
+                build()
+              }
+            )
+          }
+          build()
+        }
+      )
+      .build()
+  }
+
+  /**
+   * Create a random media message that may be:
+   * - A text body
+   * - A text body with a quote that references an existing message
+   * - A text body with a quote that references a non existing message
+   * - A message with 0-2 attachment pointers and may contain a text body
+   */
+  fun fuzzMediaMessageWithBody(quoteAble: List<TestMessage> = emptyList()): Content {
+    return Content.newBuilder()
+      .setDataMessage(
+        DataMessage.newBuilder().run {
+          if (random.nextBoolean()) {
+            body = string()
+          }
+
+          if (random.nextBoolean() && quoteAble.isNotEmpty()) {
+            body = string()
+            val quoted = quoteAble.random(random)
+            quote = DataMessage.Quote.newBuilder().run {
+              id = quoted.envelope.timestamp
+              authorUuid = quoted.metadata.sourceServiceId.toString()
+              text = quoted.content.dataMessage.body
+              addAllAttachments(quoted.content.dataMessage.attachmentsList)
+              addAllBodyRanges(quoted.content.dataMessage.bodyRangesList)
+              type = DataMessage.Quote.Type.NORMAL
+              build()
+            }
+          }
+
+          if (random.nextFloat() < 0.1 && quoteAble.isNotEmpty()) {
+            val quoted = quoteAble.random(random)
+            quote = DataMessage.Quote.newBuilder().run {
+              id = random.nextLong(quoted.envelope.timestamp - 1000000, quoted.envelope.timestamp)
+              authorUuid = quoted.metadata.sourceServiceId.toString()
+              text = quoted.content.dataMessage.body
+              build()
+            }
+          }
+
+          if (random.nextFloat() < 0.25) {
+            val total = random.nextInt(1, 2)
+            (0..total).forEach { _ -> addAttachments(attachmentPointer()) }
+          }
+
+          build()
+        }
+      )
+      .build()
+  }
+
+  /**
+   * Creates a random media message that contains no traditional media content. It may be:
+   * - A reaction to a prior message
+   */
+  fun fuzzMediaMessageNoContent(previousMessages: List<TestMessage> = emptyList()): Content {
+    return Content.newBuilder()
+      .setDataMessage(
+        DataMessage.newBuilder().run {
+          if (random.nextFloat() < 0.25) {
+            val reactTo = previousMessages.random(random)
+            reaction = DataMessage.Reaction.newBuilder().run {
+              emoji = emojis.random(random)
+              remove = false
+              targetAuthorUuid = reactTo.metadata.sourceServiceId.toString()
+              targetSentTimestamp = reactTo.envelope.timestamp
+              build()
+            }
+          }
+
+          build()
+        }
+      ).build()
+  }
+
+  /**
+   * Create a random media message that can never contain a text body. It may be:
+   * - A sticker
+   */
+  fun fuzzMediaMessageNoText(previousMessages: List<TestMessage> = emptyList()): Content {
+    return Content.newBuilder()
+      .setDataMessage(
+        DataMessage.newBuilder().run {
+          if (random.nextFloat() < 0.9) {
+            sticker = DataMessage.Sticker.newBuilder().run {
+              packId = byteString(length = 24)
+              packKey = byteString(length = 128)
+              stickerId = random.nextInt()
+              data = attachmentPointer()
+              emoji = emojis.random(random)
+              build()
+            }
+          }
+          build()
+        }
+      ).build()
+  }
+
+  /**
+   * Generate a random [String].
+   */
+  fun string(length: Int = 10, allowNullString: Boolean = false): String {
+    var string = ""
+
+    if (allowNullString && random.nextBoolean()) {
+      return string
+    }
+
+    for (i in 0 until length) {
+      string += random.nextInt(65..90).toChar()
+    }
+    return string
+  }
+
+  /**
+   * Generate a random [ByteString].
+   */
+  fun byteString(length: Int = 512): ByteString {
+    return random.nextBytes(length).toProtoByteString()
+  }
+
+  /**
+   * Generate a random [AttachmentPointer].
+   */
+  fun attachmentPointer(): AttachmentPointer {
+    return AttachmentPointer.newBuilder().run {
+      cdnKey = string()
+      contentType = mediaTypes.random(random)
+      key = byteString()
+      size = random.nextInt(1024 * 1024 * 50)
+      thumbnail = byteString()
+      digest = byteString()
+      fileName = string()
+      flags = 0
+      width = random.nextInt(until = 1024)
+      height = random.nextInt(until = 1024)
+      caption = string(allowNullString = true)
+      blurHash = string()
+      uploadTimestamp = random.nextLong()
+      cdnNumber = 1
+
+      build()
+    }
+  }
+
+  /**
+   * Creates a server delivered timestamp that is always later than the envelope and server "received" timestamp.
+   */
+  fun fuzzServerDeliveredTimestamp(envelopeTimestamp: Long): Long {
+    return envelopeTimestamp + 10
+  }
+}

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()

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

@@ -7,15 +7,20 @@ import org.thoughtcrime.securesms.util.JsonUtils
 import java.util.concurrent.TimeUnit
 
 typealias ResponseFactory = (request: RecordedRequest) -> MockResponse
+typealias RequestPredicate = (request: RecordedRequest) -> Boolean
 
 /**
  * Represent an HTTP verb for mocking web requests.
  */
-sealed class Verb(val verb: String, val path: String, val responseFactory: ResponseFactory)
+sealed class Verb(val requestPredicate: RequestPredicate, val responseFactory: ResponseFactory)
 
-class Get(path: String, responseFactory: ResponseFactory) : Verb("GET", path, responseFactory)
+class Get(path: String, predicate: RequestPredicate, responseFactory: ResponseFactory) : Verb(defaultRequestPredicate("GET", path, predicate), responseFactory) {
+  constructor(path: String, responseFactory: ResponseFactory) : this(path, { true }, responseFactory)
+}
 
-class Put(path: String, responseFactory: ResponseFactory) : Verb("PUT", path, responseFactory)
+class Put(path: String, responseFactory: ResponseFactory) : Verb(defaultRequestPredicate("PUT", path), responseFactory)
+
+class Post(path: String, responseFactory: ResponseFactory) : Verb(defaultRequestPredicate("POST", path), responseFactory)
 
 fun MockResponse.success(response: Any? = null): MockResponse {
   return setResponseCode(200).apply {
@@ -46,3 +51,7 @@ inline fun <reified T> RecordedRequest.parsedRequestBody(): T {
   val bodyString = String(body.readByteArray())
   return JsonUtils.fromJson(bodyString, T::class.java)
 }
+
+private fun defaultRequestPredicate(verb: String, path: String, predicate: RequestPredicate = { true }): RequestPredicate = { request ->
+  request.method == verb && request.path.startsWith("/$path") && predicate(request)
+}

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,7 +11,9 @@ 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
@@ -20,7 +22,6 @@ 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
@@ -54,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)
@@ -83,22 +89,27 @@ 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"
       ),
-      VerifyResponse(VerifyAccountResponse(UUID.randomUUID().toString(), UUID.randomUUID().toString(), false), null, null)
+      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"))
 
+    SignalStore.settings().isMessageNotificationsEnabled = false
+
     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")
@@ -112,11 +123,13 @@ class SignalActivityRule(private val othersCount: Int = 4) : ExternalResource()
       SignalDatabase.recipients.setCapabilities(recipientId, SignalServiceProfile.Capabilities(true, true, true, true, true, true, true, true, true))
       SignalDatabase.recipients.setProfileSharing(recipientId, true)
       SignalDatabase.recipients.markRegistered(recipientId, aci)
-      ApplicationDependencies.getProtocolStore().aci().saveIdentity(SignalProtocolAddress(aci.toString(), 0), IdentityKeyUtil.generateIdentityKeyPair().publicKey)
+      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> {

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

@@ -21,7 +21,7 @@ class TestProtos private constructor() {
   }
 
   fun metadata(
-    address: AddressProto = address().build(),
+    address: AddressProto = address().build()
   ): MetadataProto.Builder {
     return MetadataProto.newBuilder()
       .setAddress(address)

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.
@@ -33,7 +36,7 @@ fun <T : Any?> T.assertIsNotNull() {
   assertThat(this, notNullValue())
 }
 
-infix fun <T : Any> T.assertIs(expected: T) {
+infix fun <T : Any?> T.assertIs(expected: T) {
   assertThat(this, `is`(expected))
 }
 
@@ -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/androidTest/java/org/thoughtcrime/securesms/util/MessageTableUtils.kt

@@ -0,0 +1,65 @@
+package org.thoughtcrime.securesms.util
+
+import org.thoughtcrime.securesms.database.MessageTypes
+
+object MessageTableUtils {
+  fun typeColumnToString(type: Long): String {
+    return """
+      isOutgoingMessageType:${MessageTypes.isOutgoingMessageType(type)}
+      isForcedSms:${type and MessageTypes.MESSAGE_FORCE_SMS_BIT != 0L}
+      isDraftMessageType:${type and MessageTypes.BASE_TYPE_MASK == MessageTypes.BASE_DRAFT_TYPE}
+      isFailedMessageType:${type and MessageTypes.BASE_TYPE_MASK == MessageTypes.BASE_SENT_FAILED_TYPE}
+      isPendingMessageType:${type and MessageTypes.BASE_TYPE_MASK == MessageTypes.BASE_OUTBOX_TYPE || type and MessageTypes.BASE_TYPE_MASK == MessageTypes.BASE_SENDING_TYPE}
+      isSentType:${type and MessageTypes.BASE_TYPE_MASK == MessageTypes.BASE_SENT_TYPE}
+      isPendingSmsFallbackType:${type and MessageTypes.BASE_TYPE_MASK == MessageTypes.BASE_PENDING_INSECURE_SMS_FALLBACK || type and MessageTypes.BASE_TYPE_MASK == MessageTypes.BASE_PENDING_SECURE_SMS_FALLBACK}
+      isPendingSecureSmsFallbackType:${type and MessageTypes.BASE_TYPE_MASK == MessageTypes.BASE_PENDING_SECURE_SMS_FALLBACK}
+      isPendingInsecureSmsFallbackType:${type and MessageTypes.BASE_TYPE_MASK == MessageTypes.BASE_PENDING_INSECURE_SMS_FALLBACK}
+      isInboxType:${type and MessageTypes.BASE_TYPE_MASK == MessageTypes.BASE_INBOX_TYPE}
+      isJoinedType:${type and MessageTypes.BASE_TYPE_MASK == MessageTypes.JOINED_TYPE}
+      isUnsupportedMessageType:${type and MessageTypes.BASE_TYPE_MASK == MessageTypes.UNSUPPORTED_MESSAGE_TYPE}
+      isInvalidMessageType:${type and MessageTypes.BASE_TYPE_MASK == MessageTypes.INVALID_MESSAGE_TYPE}
+      isBadDecryptType:${type and MessageTypes.BASE_TYPE_MASK == MessageTypes.BAD_DECRYPT_TYPE}
+      isSecureType:${type and MessageTypes.SECURE_MESSAGE_BIT != 0L}
+      isPushType:${type and MessageTypes.PUSH_MESSAGE_BIT != 0L}
+      isEndSessionType:${type and MessageTypes.END_SESSION_BIT != 0L}
+      isKeyExchangeType:${type and MessageTypes.KEY_EXCHANGE_BIT != 0L}
+      isIdentityVerified:${type and MessageTypes.KEY_EXCHANGE_IDENTITY_VERIFIED_BIT != 0L}
+      isIdentityDefault:${type and MessageTypes.KEY_EXCHANGE_IDENTITY_DEFAULT_BIT != 0L}
+      isCorruptedKeyExchange:${type and MessageTypes.KEY_EXCHANGE_CORRUPTED_BIT != 0L}
+      isInvalidVersionKeyExchange:${type and MessageTypes.KEY_EXCHANGE_INVALID_VERSION_BIT != 0L}
+      isBundleKeyExchange:${type and MessageTypes.KEY_EXCHANGE_BUNDLE_BIT != 0L}
+      isContentBundleKeyExchange:${type and MessageTypes.KEY_EXCHANGE_CONTENT_FORMAT != 0L}
+      isIdentityUpdate:${type and MessageTypes.KEY_EXCHANGE_IDENTITY_UPDATE_BIT != 0L}
+      isRateLimited:${type and MessageTypes.MESSAGE_RATE_LIMITED_BIT != 0L}
+      isExpirationTimerUpdate:${type and MessageTypes.EXPIRATION_TIMER_UPDATE_BIT != 0L}
+      isIncomingAudioCall:${type == MessageTypes.INCOMING_AUDIO_CALL_TYPE}
+      isIncomingVideoCall:${type == MessageTypes.INCOMING_VIDEO_CALL_TYPE}
+      isOutgoingAudioCall:${type == MessageTypes.OUTGOING_AUDIO_CALL_TYPE}
+      isOutgoingVideoCall:${type == MessageTypes.OUTGOING_VIDEO_CALL_TYPE}
+      isMissedAudioCall:${type == MessageTypes.MISSED_AUDIO_CALL_TYPE}
+      isMissedVideoCall:${type == MessageTypes.MISSED_VIDEO_CALL_TYPE}
+      isGroupCall:${type == MessageTypes.GROUP_CALL_TYPE}
+      isGroupUpdate:${type and MessageTypes.GROUP_UPDATE_BIT != 0L}
+      isGroupV2:${type and MessageTypes.GROUP_V2_BIT != 0L}
+      isGroupQuit:${type and MessageTypes.GROUP_LEAVE_BIT != 0L && type and MessageTypes.GROUP_V2_BIT == 0L}
+      isChatSessionRefresh:${type and MessageTypes.ENCRYPTION_REMOTE_FAILED_BIT != 0L}
+      isDuplicateMessageType:${type and MessageTypes.ENCRYPTION_REMOTE_DUPLICATE_BIT != 0L}
+      isDecryptInProgressType:${type and 0x40000000 != 0L}
+      isNoRemoteSessionType:${type and MessageTypes.ENCRYPTION_REMOTE_NO_SESSION_BIT != 0L}
+      isLegacyType:${type and MessageTypes.ENCRYPTION_REMOTE_LEGACY_BIT != 0L || type and MessageTypes.ENCRYPTION_REMOTE_BIT != 0L}
+      isProfileChange:${type == MessageTypes.PROFILE_CHANGE_TYPE}
+      isGroupV1MigrationEvent:${type == MessageTypes.GV1_MIGRATION_TYPE}
+      isChangeNumber:${type == MessageTypes.CHANGE_NUMBER_TYPE}
+      isBoostRequest:${type == MessageTypes.BOOST_REQUEST_TYPE}
+      isThreadMerge:${type == MessageTypes.THREAD_MERGE_TYPE}
+      isSmsExport:${type == MessageTypes.SMS_EXPORT_TYPE}
+      isGroupV2LeaveOnly:${type and MessageTypes.GROUP_V2_LEAVE_BITS == MessageTypes.GROUP_V2_LEAVE_BITS}
+      isSpecialType:${type and MessageTypes.SPECIAL_TYPES_MASK != 0L}
+      isStoryReaction:${type and MessageTypes.SPECIAL_TYPES_MASK == MessageTypes.SPECIAL_TYPE_STORY_REACTION}
+      isGiftBadge:${type and MessageTypes.SPECIAL_TYPES_MASK == MessageTypes.SPECIAL_TYPE_GIFT_BADGE}
+      isPaymentsNotificaiton:${type and MessageTypes.SPECIAL_TYPES_MASK == MessageTypes.SPECIAL_TYPE_PAYMENTS_NOTIFICATION}
+      isRequestToActivatePayments:${type and MessageTypes.SPECIAL_TYPES_MASK == MessageTypes.SPECIAL_TYPE_PAYMENTS_ACTIVATE_REQUEST}
+      isPaymentsActivated:${type and MessageTypes.SPECIAL_TYPES_MASK == MessageTypes.SPECIAL_TYPE_PAYMENTS_ACTIVATED}
+    """.trimIndent().replace(Regex("is[A-Z][A-Za-z0-9]*:false\n?"), "").replace("\n", "")
+  }
+}

app/src/benchmark/AndroidManifest.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application>
+        <profileable android:shell="true" />
+
+        <activity android:name="org.signal.benchmark.BenchmarkSetupActivity"
+            android:launchMode="singleTask"
+            android:theme="@style/Theme.Signal.DayNight.NoActionBar"
+            android:windowSoftInputMode="stateHidden"
+            android:exported="true"
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    </application>
+
+</manifest>

app/src/benchmark/java/org/signal/benchmark/BenchmarkSetupActivity.kt

@@ -0,0 +1,66 @@
+package org.signal.benchmark
+
+import android.os.Bundle
+import android.widget.TextView
+import org.signal.benchmark.setup.TestMessages
+import org.signal.benchmark.setup.TestUsers
+import org.thoughtcrime.securesms.BaseActivity
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord
+import org.thoughtcrime.securesms.mms.QuoteModel
+import org.thoughtcrime.securesms.recipients.Recipient
+
+class BenchmarkSetupActivity : BaseActivity() {
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+
+    when (intent.extras!!.getString("setup-type")) {
+      "cold-start" -> setupColdStart()
+      "conversation-open" -> setupConversationOpen()
+    }
+
+    val textView: TextView = TextView(this).apply {
+      text = "done"
+    }
+    setContentView(textView)
+  }
+
+  private fun setupColdStart() {
+    TestUsers.setupSelf()
+    TestUsers.setupTestRecipients(50).forEach {
+      val recipient: Recipient = Recipient.resolved(it)
+
+      TestMessages.insertIncomingTextMessage(other = recipient, body = "Cool text message?!?!")
+      TestMessages.insertIncomingImageMessage(other = recipient, attachmentCount = 1)
+      TestMessages.insertIncomingImageMessage(other = recipient, attachmentCount = 2, body = "Album")
+      TestMessages.insertIncomingImageMessage(other = recipient, body = "Test", attachmentCount = 1, failed = true)
+
+      SignalDatabase.messages.setAllMessagesRead()
+
+      SignalDatabase.threads.update(SignalDatabase.threads.getOrCreateThreadIdFor(recipient = recipient), true)
+    }
+  }
+
+  private fun setupConversationOpen() {
+    TestUsers.setupSelf()
+    TestUsers.setupTestRecipient().let {
+      val recipient: Recipient = Recipient.resolved(it)
+      val messagesToAdd = 1000
+      val generator: TestMessages.TimestampGenerator = TestMessages.TimestampGenerator(System.currentTimeMillis() - (messagesToAdd * 2000L) - 60_000L)
+
+      for (i in 0 until messagesToAdd) {
+        TestMessages.insertIncomingTextMessage(other = recipient, body = "Test message $i", timestamp = generator.nextTimestamp())
+        TestMessages.insertOutgoingTextMessage(other = recipient, body = "Test message $i", timestamp = generator.nextTimestamp())
+      }
+
+      val voiceMessageId = TestMessages.insertIncomingVoiceMessage(other = recipient, timestamp = generator.nextTimestamp())
+      val mmsRecord = SignalDatabase.messages.getMessageRecord(voiceMessageId) as MediaMmsMessageRecord
+      TestMessages.insertOutgoingImageMessage(other = recipient, body = "test", 2, generator.nextTimestamp())
+      TestMessages.insertIncomingTextMessage(other = recipient, "reply to the test message", generator.nextTimestamp())
+      TestMessages.insertIncomingQuoteTextMessage(other = recipient, quote = QuoteModel(mmsRecord.timestamp, recipient.id, "Fake voice message text", false, mmsRecord.slideDeck.asAttachments(), null, QuoteModel.Type.NORMAL, null), body = "Here is a cool quote", timestamp = generator.nextTimestamp())
+      TestMessages.insertOutgoingTextMessage(other = recipient, body = "longaweorijoaijwerijoiajwer", timestamp = generator.nextTimestamp())
+
+      SignalDatabase.threads.update(SignalDatabase.threads.getOrCreateThreadIdFor(recipient = recipient), true)
+    }
+  }
+}

app/src/benchmark/java/org/signal/benchmark/DummyAccountManagerFactory.kt

@@ -0,0 +1,43 @@
+package org.signal.benchmark
+
+import android.content.Context
+import org.signal.libsignal.protocol.IdentityKey
+import org.signal.libsignal.protocol.state.PreKeyRecord
+import org.signal.libsignal.protocol.state.SignedPreKeyRecord
+import org.thoughtcrime.securesms.BuildConfig
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.push.AccountManagerFactory
+import org.thoughtcrime.securesms.util.FeatureFlags
+import org.whispersystems.signalservice.api.SignalServiceAccountManager
+import org.whispersystems.signalservice.api.push.ACI
+import org.whispersystems.signalservice.api.push.PNI
+import org.whispersystems.signalservice.api.push.ServiceIdType
+import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration
+import java.io.IOException
+import java.util.Optional
+
+class DummyAccountManagerFactory : AccountManagerFactory() {
+  override fun createAuthenticated(context: Context, aci: ACI, pni: PNI, number: String, deviceId: Int, password: String): SignalServiceAccountManager {
+    return DummyAccountManager(
+      ApplicationDependencies.getSignalServiceNetworkAccess().getConfiguration(number),
+      aci,
+      pni,
+      number,
+      deviceId,
+      password,
+      BuildConfig.SIGNAL_AGENT,
+      FeatureFlags.okHttpAutomaticRetry(),
+      FeatureFlags.groupLimits().hardLimit
+    )
+  }
+
+  private class DummyAccountManager(configuration: SignalServiceConfiguration?, aci: ACI?, pni: PNI?, e164: String?, deviceId: Int, password: String?, signalAgent: String?, automaticNetworkRetry: Boolean, maxGroupSize: Int) : SignalServiceAccountManager(configuration, aci, pni, e164, deviceId, password, signalAgent, automaticNetworkRetry, maxGroupSize) {
+    @Throws(IOException::class)
+    override fun setGcmId(gcmRegistrationId: Optional<String>) {
+    }
+
+    @Throws(IOException::class)
+    override fun setPreKeys(serviceIdType: ServiceIdType, identityKey: IdentityKey, signedPreKey: SignedPreKeyRecord, oneTimePreKeys: List<PreKeyRecord>) {
+    }
+  }
+}

app/src/benchmark/java/org/signal/benchmark/setup/TestMessages.kt

@@ -0,0 +1,189 @@
+package org.signal.benchmark.setup
+
+import org.thoughtcrime.securesms.attachments.PointerAttachment
+import org.thoughtcrime.securesms.database.AttachmentTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.TestDbUtils
+import org.thoughtcrime.securesms.mms.IncomingMediaMessage
+import org.thoughtcrime.securesms.mms.OutgoingMessage
+import org.thoughtcrime.securesms.mms.QuoteModel
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.releasechannel.ReleaseChannel
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachment
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId
+import java.util.Collections
+import java.util.Optional
+
+object TestMessages {
+  fun insertOutgoingTextMessage(other: Recipient, body: String, timestamp: Long = System.currentTimeMillis()) {
+    insertOutgoingMessage(
+      recipient = other,
+      message = OutgoingMessage(
+        recipient = other,
+        body = body,
+        timestamp = timestamp,
+        isSecure = true
+      ),
+      timestamp = timestamp
+    )
+  }
+
+  fun insertOutgoingImageMessage(other: Recipient, body: String? = null, attachmentCount: Int, timestamp: Long = System.currentTimeMillis()): Long {
+    val attachments: List<SignalServiceAttachmentPointer> = (0 until attachmentCount).map {
+      imageAttachment()
+    }
+    val message = OutgoingMessage(
+      recipient = other,
+      body = body,
+      attachments = PointerAttachment.forPointers(Optional.of(attachments)),
+      timestamp = timestamp,
+      isSecure = true
+    )
+    return insertOutgoingMediaMessage(recipient = other, message = message, timestamp = timestamp)
+  }
+
+  private fun insertOutgoingMediaMessage(recipient: Recipient, message: OutgoingMessage, timestamp: Long): Long {
+    val insert = insertOutgoingMessage(recipient, message = message, timestamp = timestamp)
+    setMessageMediaTransfered(insert)
+
+    return insert
+  }
+
+  private fun insertOutgoingMessage(recipient: Recipient, message: OutgoingMessage, timestamp: Long? = null): Long {
+    val insert = SignalDatabase.messages.insertMessageOutbox(
+      message,
+      SignalDatabase.threads.getOrCreateThreadIdFor(recipient),
+      false,
+      null
+    )
+    if (timestamp != null) {
+      TestDbUtils.setMessageReceived(insert, timestamp)
+    }
+    SignalDatabase.messages.markAsSent(insert, true)
+
+    return insert
+  }
+  fun insertIncomingTextMessage(other: Recipient, body: String, timestamp: Long? = null) {
+    val message = IncomingMediaMessage(
+      from = other.id,
+      body = body,
+      sentTimeMillis = timestamp ?: System.currentTimeMillis(),
+      serverTimeMillis = timestamp ?: System.currentTimeMillis(),
+      receivedTimeMillis = timestamp ?: System.currentTimeMillis()
+    )
+
+    SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get().messageId
+  }
+  fun insertIncomingQuoteTextMessage(other: Recipient, body: String, quote: QuoteModel, timestamp: Long?) {
+    val message = IncomingMediaMessage(
+      from = other.id,
+      body = body,
+      sentTimeMillis = timestamp ?: System.currentTimeMillis(),
+      serverTimeMillis = timestamp ?: System.currentTimeMillis(),
+      receivedTimeMillis = timestamp ?: System.currentTimeMillis(),
+      quote = quote
+    )
+    insertIncomingMessage(other, message = message)
+  }
+  fun insertIncomingImageMessage(other: Recipient, body: String? = null, attachmentCount: Int, timestamp: Long? = null, failed: Boolean = false): Long {
+    val attachments: List<SignalServiceAttachmentPointer> = (0 until attachmentCount).map {
+      imageAttachment()
+    }
+    val message = IncomingMediaMessage(
+      from = other.id,
+      sentTimeMillis = timestamp ?: System.currentTimeMillis(),
+      serverTimeMillis = timestamp ?: System.currentTimeMillis(),
+      receivedTimeMillis = timestamp ?: System.currentTimeMillis(),
+      attachments = PointerAttachment.forPointers(Optional.of(attachments))
+    )
+    return insertIncomingMediaMessage(recipient = other, message = message, failed = failed)
+  }
+
+  fun insertIncomingVoiceMessage(other: Recipient, timestamp: Long? = null): Long {
+    val message = IncomingMediaMessage(
+      from = other.id,
+      sentTimeMillis = timestamp ?: System.currentTimeMillis(),
+      serverTimeMillis = timestamp ?: System.currentTimeMillis(),
+      receivedTimeMillis = timestamp ?: System.currentTimeMillis(),
+      attachments = PointerAttachment.forPointers(Optional.of(Collections.singletonList(voiceAttachment()) as List<SignalServiceAttachment>))
+    )
+    return insertIncomingMediaMessage(recipient = other, message = message, failed = false)
+  }
+
+  private fun insertIncomingMediaMessage(recipient: Recipient, message: IncomingMediaMessage, failed: Boolean = false): Long {
+    val id = insertIncomingMessage(recipient = recipient, message = message)
+    if (failed) {
+      setMessageMediaFailed(id)
+    } else {
+      setMessageMediaTransfered(id)
+    }
+
+    return id
+  }
+
+  private fun insertIncomingMessage(recipient: Recipient, message: IncomingMediaMessage): Long {
+    return SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(recipient)).get().messageId
+  }
+
+  private fun setMessageMediaFailed(messageId: Long) {
+    SignalDatabase.attachments.getAttachmentsForMessage(messageId).forEachIndexed { index, attachment ->
+      SignalDatabase.attachments.setTransferProgressPermanentFailure(attachment.attachmentId, messageId)
+    }
+  }
+
+  private fun setMessageMediaTransfered(messageId: Long) {
+    SignalDatabase.attachments.getAttachmentsForMessage(messageId).forEachIndexed { _, attachment ->
+      SignalDatabase.attachments.setTransferState(messageId, attachment.attachmentId, AttachmentTable.TRANSFER_PROGRESS_DONE)
+    }
+  }
+  private fun imageAttachment(): 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()
+    )
+  }
+
+  private fun voiceAttachment(): SignalServiceAttachmentPointer {
+    return SignalServiceAttachmentPointer(
+      ReleaseChannel.CDN_NUMBER,
+      SignalServiceAttachmentRemoteId.from(""),
+      "audio/aac",
+      null,
+      Optional.empty(),
+      Optional.empty(),
+      1024,
+      1024,
+      Optional.empty(),
+      Optional.of("/not-there.aac"),
+      true,
+      false,
+      false,
+      Optional.empty(),
+      Optional.empty(),
+      System.currentTimeMillis()
+    )
+  }
+
+  class TimestampGenerator(private var start: Long = System.currentTimeMillis()) {
+    fun nextTimestamp(): Long {
+      start += 500L
+
+      return start
+    }
+  }
+}

app/src/benchmark/java/org/signal/benchmark/setup/TestUsers.kt

@@ -0,0 +1,103 @@
+package org.signal.benchmark.setup
+
+import android.app.Application
+import android.content.SharedPreferences
+import android.preference.PreferenceManager
+import org.signal.benchmark.DummyAccountManagerFactory
+import org.signal.libsignal.protocol.SignalProtocolAddress
+import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
+import org.thoughtcrime.securesms.crypto.MasterSecretUtil
+import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.net.DeviceTransferBlockingInterceptor
+import org.thoughtcrime.securesms.profiles.ProfileName
+import org.thoughtcrime.securesms.push.AccountManagerFactory
+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
+import org.whispersystems.signalservice.api.push.SignalServiceAddress
+import org.whispersystems.signalservice.internal.ServiceResponse
+import org.whispersystems.signalservice.internal.ServiceResponseProcessor
+import org.whispersystems.signalservice.internal.push.VerifyAccountResponse
+import java.util.UUID
+
+object TestUsers {
+
+  private var generatedOthers: Int = 0
+
+  fun setupSelf(): Recipient {
+    val application: Application = ApplicationDependencies.getApplication()
+    DeviceTransferBlockingInterceptor.getInstance().blockNetwork()
+
+    PreferenceManager.getDefaultSharedPreferences(application).edit().putBoolean("pref_prompted_push_registration", true).commit()
+    val masterSecret = MasterSecretUtil.generateMasterSecret(application, MasterSecretUtil.UNENCRYPTED_PASSPHRASE)
+    MasterSecretUtil.generateAsymmetricMasterSecret(application, masterSecret)
+    val preferences: SharedPreferences = application.getSharedPreferences(MasterSecretUtil.PREFERENCES_NAME, 0)
+    preferences.edit().putBoolean("passphrase_initialized", true).commit()
+
+    val registrationRepository = RegistrationRepository(application)
+    val registrationData = RegistrationData(
+      code = "123123",
+      e164 = "+15555550101",
+      password = Util.getSecret(18),
+      registrationId = registrationRepository.registrationId,
+      profileKey = registrationRepository.getProfileKey("+15555550101"),
+      fcmToken = "fcm-token",
+      pniRegistrationId = registrationRepository.pniRegistrationId,
+      recoveryPassword = "asdfasdfasdfasdf"
+    )
+    val verifyResponse = VerifyResponse(VerifyAccountResponse(UUID.randomUUID().toString(), UUID.randomUUID().toString(), false), null, null)
+    AccountManagerFactory.setInstance(DummyAccountManagerFactory())
+    val response: ServiceResponse<VerifyResponse> = registrationRepository.registerAccount(
+      registrationData,
+      verifyResponse,
+      false
+    ).blockingGet()
+    ServiceResponseProcessor.DefaultProcessor(response).resultOrThrow
+
+    SignalStore.kbsValues().optOut()
+    RegistrationUtil.maybeMarkRegistrationComplete()
+    SignalDatabase.recipients.setProfileName(Recipient.self().id, ProfileName.fromParts("Tester", "McTesterson"))
+
+    return Recipient.self()
+  }
+
+  fun setupTestRecipient(): RecipientId {
+    return setupTestRecipients(1).first()
+  }
+
+  fun setupTestRecipients(othersCount: Int): List<RecipientId> {
+    val others = mutableListOf<RecipientId>()
+    synchronized(this) {
+      if (generatedOthers + othersCount !in 0 until 1000) {
+        throw IllegalArgumentException("$othersCount must be between 0 and 1000")
+      }
+
+      for (i in generatedOthers until generatedOthers + othersCount) {
+        val aci = ACI.from(UUID.randomUUID())
+        val recipientId = RecipientId.from(SignalServiceAddress(aci, "+15555551%03d".format(i)))
+        SignalDatabase.recipients.setProfileName(recipientId, ProfileName.fromParts("Buddy", "#$i"))
+        SignalDatabase.recipients.setProfileKeyIfAbsent(recipientId, ProfileKeyUtil.createNew())
+        SignalDatabase.recipients.setCapabilities(recipientId, SignalServiceProfile.Capabilities(true, true, true, true, true, true, true, true, true))
+        SignalDatabase.recipients.setProfileSharing(recipientId, true)
+        SignalDatabase.recipients.markRegistered(recipientId, aci)
+        val otherIdentity = IdentityKeyUtil.generateIdentityKeyPair()
+        ApplicationDependencies.getProtocolStore().aci().saveIdentity(SignalProtocolAddress(aci.toString(), 0), otherIdentity.publicKey)
+
+        others += recipientId
+      }
+
+      generatedOthers += othersCount
+    }
+
+    return others
+  }
+}

app/src/benchmark/java/org/thoughtcrime/securesms/database/TestDbUtils.kt

@@ -0,0 +1,14 @@
+package org.thoughtcrime.securesms.database
+
+import android.content.ContentValues
+import org.signal.core.util.SqlUtil.buildArgs
+
+object TestDbUtils {
+
+  fun setMessageReceived(messageId: Long, timestamp: Long) {
+    val database: SQLiteDatabase = SignalDatabase.messages.databaseHelper.signalWritableDatabase
+    val contentValues = ContentValues()
+    contentValues.put(MessageTable.DATE_RECEIVED, timestamp)
+    val rowsUpdated = database.update(MessageTable.TABLE_NAME, contentValues, DatabaseTable.ID_WHERE, buildArgs(messageId))
+  }
+}

app/src/canary/AndroidManifest.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools">
+
+    <application
+        android:name=".CanaryApplicationContext"
+        tools:replace="android:name" />
+
+</manifest>

app/src/canary/java/org/thoughtcrime/securesms/CanaryApplicationContext.kt

@@ -0,0 +1,65 @@
+package org.thoughtcrime.securesms
+
+import android.os.StrictMode
+import android.os.StrictMode.ThreadPolicy
+import leakcanary.LeakCanary
+import shark.AndroidReferenceMatchers
+
+class CanaryApplicationContext : ApplicationContext() {
+  override fun onCreate() {
+    super.onCreate()
+
+    StrictMode.setThreadPolicy(
+      ThreadPolicy.Builder()
+        .detectDiskReads()
+        .detectDiskWrites()
+        .detectNetwork()
+        .penaltyLog()
+        .build()
+    )
+
+    try {
+      Class.forName("dalvik.system.CloseGuard")
+        .getMethod("setEnabled", Boolean::class.javaPrimitiveType)
+        .invoke(null, true)
+    } catch (e: ReflectiveOperationException) {
+      throw RuntimeException(e)
+    }
+
+    LeakCanary.config = LeakCanary.config.copy(
+      referenceMatchers = AndroidReferenceMatchers.appDefaults +
+        AndroidReferenceMatchers.ignoredInstanceField(
+          className = "android.service.media.MediaBrowserService\$ServiceBinder",
+          fieldName = "this\$0"
+        ) +
+        AndroidReferenceMatchers.ignoredInstanceField(
+          className = "androidx.media.MediaBrowserServiceCompat\$MediaBrowserServiceImplApi26\$MediaBrowserServiceApi26",
+          fieldName = "mBase"
+        ) +
+        AndroidReferenceMatchers.ignoredInstanceField(
+          className = "android.support.v4.media.MediaBrowserCompat",
+          fieldName = "mImpl"
+        ) +
+        AndroidReferenceMatchers.ignoredInstanceField(
+          className = "android.support.v4.media.session.MediaControllerCompat",
+          fieldName = "mToken"
+        ) +
+        AndroidReferenceMatchers.ignoredInstanceField(
+          className = "android.support.v4.media.session.MediaControllerCompat",
+          fieldName = "mImpl"
+        ) +
+        AndroidReferenceMatchers.ignoredInstanceField(
+          className = "org.thoughtcrime.securesms.components.voice.VoiceNotePlaybackService",
+          fieldName = "mApplication"
+        ) +
+        AndroidReferenceMatchers.ignoredInstanceField(
+          className = "org.thoughtcrime.securesms.service.GenericForegroundService\$LocalBinder",
+          fieldName = "this\$0"
+        ) +
+        AndroidReferenceMatchers.ignoredInstanceField(
+          className = "org.thoughtcrime.securesms.contacts.ContactsSyncAdapter",
+          fieldName = "mContext"
+        )
+    )
+  }
+}

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" />
 
@@ -301,6 +300,16 @@
         </intent-filter>
     </activity>
 
+    <activity android:name=".conversation.v2.ConversationActivity"
+              android:windowSoftInputMode="stateUnchanged"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:parentActivityName=".MainActivity">
+        <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.thoughtcrime.securesms.MainActivity" />
+    </activity>
+
     <activity android:name=".conversation.ConversationActivity"
               android:windowSoftInputMode="stateUnchanged"
               android:launchMode="singleTask"
@@ -355,6 +364,11 @@
               android:windowSoftInputMode="stateAlwaysVisible"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
+    <activity android:name=".calls.new.NewCallActivity"
+            android:theme="@style/Theme.Signal.DayNight.NoActionBar"
+            android:windowSoftInputMode="stateAlwaysVisible"
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
     <activity android:name=".PushContactSelectionActivity"
           android:label="@string/AndroidManifest__select_contacts"
           android:windowSoftInputMode="stateHidden"
@@ -369,7 +383,7 @@
             android:theme="@style/TextSecure.DarkNoActionBar"
             android:windowSoftInputMode="stateAlwaysHidden|adjustNothing"
             android:launchMode="singleTop"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
 
         <activity android:name=".conversation.mutiselect.forward.MultiselectForwardActivity"
             android:theme="@style/Signal.DayNight.NoActionBar"
@@ -437,6 +451,12 @@
             android:windowSoftInputMode="stateAlwaysHidden">
         </activity>
 
+        <activity android:name=".components.settings.conversation.CallInfoActivity"
+            android:configChanges="touchscreen|keyboard|keyboardHidden|screenLayout|screenSize"
+            android:theme="@style/Signal.DayNight.NoActionBar"
+            android:windowSoftInputMode="stateAlwaysHidden">
+        </activity>
+
         <activity android:name=".badges.gifts.flow.GiftFlowActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|screenLayout|screenSize"
             android:theme="@style/Signal.DayNight.NoActionBar"
@@ -465,7 +485,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"/>
 
@@ -504,6 +524,13 @@
               android:windowSoftInputMode="stateHidden"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
+    <activity
+              android:name=".avatar.photo.PhotoEditorActivity"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
+              android:label="@string/AndroidManifest__media_preview"
+              android:theme="@style/TextSecure.DarkNoActionBar"
+              android:windowSoftInputMode="stateHidden" />
+
     <activity android:name=".mediaoverview.MediaOverviewActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:windowSoftInputMode="stateHidden"
@@ -598,12 +625,6 @@
             android:windowSoftInputMode="adjustResize"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".ClearAvatarPromptActivity"
-              android:theme="@style/Theme.AppCompat.Dialog.Alert"
-              android:icon="@drawable/clear_profile_avatar"
-              android:label="@string/AndroidManifest_remove_photo"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
     <activity android:name=".contacts.TurnOffContactJoinedNotificationsActivity"
               android:theme="@style/Theme.AppCompat.Dialog.Alert" />
 
@@ -700,6 +721,7 @@
     <service android:enabled="true" android:name=".service.webrtc.WebRtcCallService" android:foregroundServiceType="camera|microphone"/>
     <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">
@@ -815,6 +837,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" />

app/src/main/java/org/signal/glide/common/executor/FrameDecoderExecutor.java

@@ -8,6 +8,8 @@ package org.signal.glide.common.executor;
 import android.os.HandlerThread;
 import android.os.Looper;
 
+import org.signal.core.util.ThreadUtil;
+
 import java.util.ArrayList;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -39,7 +41,7 @@ public class FrameDecoderExecutor {
     public Looper getLooper(int taskId) {
         int idx = taskId % sPoolNumber;
         if (idx >= mHandlerThreadGroup.size()) {
-            HandlerThread handlerThread = new HandlerThread("FrameDecoderExecutor-" + idx);
+            HandlerThread handlerThread = new HandlerThread("FrameDecoderExecutor-" + idx, ThreadUtil.PRIORITY_BACKGROUND_THREAD);
             handlerThread.start();
 
             mHandlerThreadGroup.add(handlerThread);

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

@@ -11,16 +11,16 @@ object AppCapabilities {
   @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(),
+      uuid = false,
+      gv2 = true,
+      storage = storageCapable,
+      gv1Migration = true,
+      senderKey = true,
+      announcementGroup = true,
+      changeNumber = true,
+      stories = true,
+      giftBadges = true,
+      pni = FeatureFlags.phoneNumberPrivacy(),
       paymentActivation = true
     )
   }

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

@@ -16,7 +16,6 @@
  */
 package org.thoughtcrime.securesms;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Build;
 
@@ -24,7 +23,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;
@@ -36,8 +34,6 @@ 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;
@@ -63,6 +59,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;
@@ -73,9 +70,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;
@@ -92,7 +89,6 @@ 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;
@@ -104,10 +100,10 @@ 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.core.CompletableObserver;
-import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException;
 import io.reactivex.rxjava3.exceptions.UndeliverableException;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -126,7 +122,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();
@@ -163,8 +160,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                             .addBlocking("app-dependencies", this::initializeAppDependencies)
                             .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))
@@ -176,11 +172,13 @@ 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(this::checkIsGooglePayReady)
+                            .addNonBlocking(() -> GlideApp.get(this))
                             .addNonBlocking(this::cleanAvatarStorage)
                             .addNonBlocking(this::initializeRevealableMessageManager)
                             .addNonBlocking(this::initializePendingRetryReceiptManager)
+                            .addNonBlocking(this::initializeScheduledMessageManager)
                             .addNonBlocking(this::initializeFcmCheck)
                             .addNonBlocking(PreKeysSyncJob::enqueueIfNeeded)
                             .addNonBlocking(this::initializePeriodicTasks)
@@ -194,10 +192,12 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                             .addNonBlocking(() -> ApplicationDependencies.getGiphyMp4Cache().onAppStart(this))
                             .addNonBlocking(this::ensureProfileUploaded)
                             .addNonBlocking(() -> ApplicationDependencies.getExpireStoriesManager().scheduleIfNecessary())
+                            .addPostRender(() -> ApplicationDependencies.getDeletedCallEventManager().scheduleIfNecessary())
                             .addPostRender(() -> RateLimitUtil.retryAllRateLimitedMessages(this))
                             .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()))
@@ -210,6 +210,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                             .addPostRender(StoryOnboardingDownloadJob.Companion::enqueueIfNeeded)
                             .addPostRender(PnpInitializeDevicesJob::enqueueIfNecessary)
                             .addPostRender(() -> ApplicationDependencies.getExoPlayerPool().getPoolStats().getMaxUnreserved())
+                            .addPostRender(() -> ApplicationDependencies.getRecipientCache().warmUp())
                             .execute();
 
     Log.d(TAG, "onCreate() took " + (System.currentTimeMillis() - startTime) + " ms");
@@ -229,7 +230,6 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
 
     SignalExecutors.BOUNDED.execute(() -> {
       FeatureFlags.refreshIfNecessary();
-      ApplicationDependencies.getRecipientCache().warmUp();
       RetrieveProfileJob.enqueueRoutineFetchIfNecessary(this);
       executePendingContactSync();
       KeyCachingService.onAppForegrounded(this);
@@ -295,7 +295,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);
 
@@ -389,6 +390,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) {
@@ -410,7 +415,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);
     }
@@ -462,18 +471,6 @@ 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/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;
@@ -106,11 +108,12 @@ public interface BindableConversationItem extends Unbindable, GiphyMp4Playable,
     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);
+    void onEditedIndicatorClicked(@NonNull MessageRecord messageRecord);
   }
 }

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

@@ -25,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 {
@@ -35,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)

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

@@ -1,48 +0,0 @@
-package org.thoughtcrime.securesms;
-
-
-import android.app.Activity;
-import android.content.Intent;
-import android.view.ContextThemeWrapper;
-
-import androidx.appcompat.app.AlertDialog;
-
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.util.DynamicTheme;
-
-public final class ClearAvatarPromptActivity extends Activity {
-
-  private static final String ARG_TITLE = "arg_title";
-
-  public static Intent createForUserProfilePhoto() {
-    Intent intent = new Intent(ApplicationDependencies.getApplication(), ClearAvatarPromptActivity.class);
-    intent.putExtra(ARG_TITLE, R.string.ClearProfileActivity_remove_profile_photo);
-    return intent;
-  }
-
-  public static Intent createForGroupProfilePhoto() {
-    Intent intent = new Intent(ApplicationDependencies.getApplication(), ClearAvatarPromptActivity.class);
-    intent.putExtra(ARG_TITLE, R.string.ClearProfileActivity_remove_group_photo);
-    return intent;
-  }
-
-  @Override
-  public void onResume() {
-    super.onResume();
-
-    int message = getIntent().getIntExtra(ARG_TITLE, 0);
-
-    new AlertDialog.Builder(new ContextThemeWrapper(this, DynamicTheme.isDarkTheme(this) ? R.style.TextSecure_DarkTheme : R.style.TextSecure_LightTheme))
-                   .setMessage(message)
-                   .setNegativeButton(android.R.string.cancel, (dialog, which) -> finish())
-                   .setPositiveButton(R.string.ClearProfileActivity_remove, (dialog, which) -> {
-                     Intent result = new Intent();
-                     result.putExtra("delete", true);
-                     setResult(Activity.RESULT_OK, result);
-                     finish();
-                   })
-                   .setOnCancelListener(dialog -> finish())
-                   .show();
-  }
-
-}

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);
     }
 
@@ -125,7 +125,7 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActivit
   }
 
   @Override
-  public void onBeforeContactSelected(@NonNull Optional<RecipientId> recipientId, String number, @NonNull Consumer<Boolean> callback) {
+  public void onBeforeContactSelected(boolean isFromUnknownSearchKey, @NonNull Optional<RecipientId> recipientId, String number, @NonNull Consumer<Boolean> callback) {
     callback.accept(true);
   }
 

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

@@ -0,0 +1,132 @@
+package org.thoughtcrime.securesms
+
+import android.content.Context
+import android.view.View
+import android.widget.TextView
+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>,
+  displayOptions: DisplayOptions,
+  onClickCallbacks: OnContactSelectionClick,
+  longClickCallbacks: LongClickCallbacks,
+  storyContextMenuCallbacks: StoryContextMenuCallbacks,
+  callButtonClickCallbacks: CallButtonClickCallbacks
+) : ContactSearchAdapter(context, fixedContacts, displayOptions, onClickCallbacks, longClickCallbacks, storyContextMenuCallbacks, callButtonClickCallbacks) {
+
+  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))
+    registerFactory(RefreshContactsModel::class.java, LayoutFactory({ RefreshContactsViewHolder(it, onClickCallbacks::onRefreshContactsClicked) }, R.layout.contact_selection_refresh_action_item))
+    registerFactory(MoreHeaderModel::class.java, LayoutFactory({ MoreHeaderViewHolder(it) }, R.layout.contact_search_section_header))
+    registerFactory(EmptyModel::class.java, LayoutFactory({ EmptyViewHolder(it) }, R.layout.contact_selection_empty_state))
+  }
+
+  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
+  }
+
+  class RefreshContactsModel : MappingModel<RefreshContactsModel> {
+    override fun areItemsTheSame(newItem: RefreshContactsModel): Boolean = true
+    override fun areContentsTheSame(newItem: RefreshContactsModel): Boolean = true
+  }
+
+  class MoreHeaderModel : MappingModel<MoreHeaderModel> {
+    override fun areItemsTheSame(newItem: MoreHeaderModel): Boolean = true
+
+    override fun areContentsTheSame(newItem: MoreHeaderModel): 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
+  }
+
+  private class RefreshContactsViewHolder(itemView: View, onClickListener: () -> Unit) : MappingViewHolder<RefreshContactsModel>(itemView) {
+    init {
+      itemView.setOnClickListener { onClickListener() }
+    }
+
+    override fun bind(model: RefreshContactsModel) = Unit
+  }
+
+  private class MoreHeaderViewHolder(itemView: View) : MappingViewHolder<MoreHeaderModel>(itemView) {
+
+    private val headerTextView: TextView = itemView.findViewById(R.id.section_header)
+
+    override fun bind(model: MoreHeaderModel) {
+      headerTextView.setText(R.string.contact_selection_activity__more)
+    }
+  }
+
+  private class EmptyViewHolder(itemView: View) : MappingViewHolder<EmptyModel>(itemView) {
+
+    private val emptyText: TextView = itemView.findViewById(R.id.search_no_results)
+
+    override fun bind(model: EmptyModel) {
+      emptyText.text = context.getString(R.string.SearchFragment_no_results, model.empty.query)
+    }
+  }
+
+  class ArbitraryRepository : org.thoughtcrime.securesms.contacts.paged.ArbitraryRepository {
+
+    enum class ArbitraryRow(val code: String) {
+      NEW_GROUP("new-group"),
+      INVITE_TO_SIGNAL("invite-to-signal"),
+      MORE_HEADING("more-heading"),
+      REFRESH_CONTACTS("refresh-contacts");
+
+      companion object {
+        fun fromCode(code: String) = values().first { it.code == code }
+      }
+    }
+
+    override fun getSize(section: ContactSearchConfiguration.Section.Arbitrary, query: String?): Int {
+      return section.types.size
+    }
+
+    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<*> {
+      return when (ArbitraryRow.fromCode(arbitrary.type)) {
+        ArbitraryRow.NEW_GROUP -> NewGroupModel()
+        ArbitraryRow.INVITE_TO_SIGNAL -> InviteToSignalModel()
+        ArbitraryRow.MORE_HEADING -> MoreHeaderModel()
+        ArbitraryRow.REFRESH_CONTACTS -> RefreshContactsModel()
+      }
+    }
+  }
+
+  interface OnContactSelectionClick : ClickCallbacks {
+    fun onNewGroupClicked()
+    fun onInviteToSignalClicked()
+    fun onRefreshContactsClicked()
+  }
+}

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;
@@ -51,46 +47,43 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import androidx.transition.AutoTransition;
 import androidx.transition.TransitionManager;
 
-import com.annimon.stream.Collectors;
-import com.annimon.stream.Stream;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.pnikosis.materialishprogress.ProgressWheel;
 
 import org.signal.core.util.concurrent.SimpleTask;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.components.RecyclerViewFastScroller;
-import org.thoughtcrime.securesms.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.CommunicationActions;
+import org.signal.core.util.concurrent.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;
@@ -104,9 +97,7 @@ import kotlin.Unit;
  *
  * @author Moxie Marlinspike
  */
-public final class ContactSelectionListFragment extends LoggingFragment
-    implements LoaderManager.LoaderCallbacks<Cursor>
-{
+public final class ContactSelectionListFragment extends LoggingFragment {
   @SuppressWarnings("unused")
   private static final String TAG = Log.tag(ContactSelectionListFragment.class);
 
@@ -126,45 +117,47 @@ public final class ContactSelectionListFragment extends LoggingFragment
   public static final String RV_PADDING_BOTTOM = "recycler_view_padding_bottom";
   public static final String RV_CLIP           = "recycler_view_clipping";
 
-  private ConstraintLayout                            constraintLayout;
-  private TextView                                    emptyText;
-  private OnContactSelectedListener                   onContactSelectedListener;
-  private SwipeRefreshLayout                          swipeRefresh;
-  private View                                        showContactsLayout;
-  private Button                                      showContactsButton;
-  private TextView                                    showContactsDescription;
-  private ProgressWheel                               showContactsProgress;
-  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 ConstraintLayout                constraintLayout;
+  private TextView                        emptyText;
+  private OnContactSelectedListener       onContactSelectedListener;
+  private SwipeRefreshLayout              swipeRefresh;
+  private View                            showContactsLayout;
+  private Button                          showContactsButton;
+  private TextView                        showContactsDescription;
+  private ProgressWheel                   showContactsProgress;
+  private String                          cursorFilter;
+  private RecyclerView                    recyclerView;
+  private RecyclerViewFastScroller        fastScroller;
+  private RecyclerView                    chipRecycler;
+  private OnSelectionLimitReachedListener onSelectionLimitReachedListener;
+  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;
+  @Nullable private NewConversationCallback              newConversationCallback;
+  @Nullable private NewCallCallback                      newCallCallback;
+  @Nullable private ScrollCallback                       scrollCallback;
+  @Nullable private OnItemLongClickListener              onItemLongClickListener;
+  private           SelectionLimits                      selectionLimit    = SelectionLimits.NO_LIMITS;
+  private           Set<RecipientId>                     currentSelection;
+  private           boolean                              isMulti;
+  private           boolean                              canSelectSelf;
+  private           ListClickListener                    listClickListener = new ListClickListener();
+  @Nullable private SwipeRefreshLayout.OnRefreshListener onRefreshListener;
 
   @Override
   public void onAttach(@NonNull Context context) {
     super.onAttach(context);
 
-    if (context instanceof ListCallback) {
-      listCallback = (ListCallback) context;
+    if (context instanceof NewConversationCallback) {
+      newConversationCallback = (NewConversationCallback) context;
+    }
+
+    if (context instanceof NewCallCallback) {
+      newCallCallback = (NewCallCallback) context;
     }
 
     if (getParentFragment() instanceof ScrollCallback) {
@@ -191,14 +184,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 +219,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();
                  }
@@ -255,17 +238,17 @@ public final class ContactSelectionListFragment extends LoggingFragment
   public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
     View view = inflater.inflate(R.layout.contact_selection_list_fragment, container, false);
 
-    emptyText                = view.findViewById(android.R.id.empty);
-    recyclerView             = view.findViewById(R.id.recycler_view);
-    swipeRefresh             = view.findViewById(R.id.swipe_refresh);
-    fastScroller             = view.findViewById(R.id.fast_scroller);
-    showContactsLayout       = view.findViewById(R.id.show_contacts_container);
-    showContactsButton       = view.findViewById(R.id.show_contacts_button);
-    showContactsDescription  = view.findViewById(R.id.show_contacts_description);
-    showContactsProgress     = view.findViewById(R.id.progress);
-    chipRecycler             = view.findViewById(R.id.chipRecycler);
-    constraintLayout         = view.findViewById(R.id.container);
-    headerActionView         = view.findViewById(R.id.header_action);
+    emptyText               = view.findViewById(android.R.id.empty);
+    recyclerView            = view.findViewById(R.id.recycler_view);
+    swipeRefresh            = view.findViewById(R.id.swipe_refresh);
+    fastScroller            = view.findViewById(R.id.fast_scroller);
+    showContactsLayout      = view.findViewById(R.id.show_contacts_container);
+    showContactsButton      = view.findViewById(R.id.show_contacts_button);
+    showContactsDescription = view.findViewById(R.id.show_contacts_description);
+    showContactsProgress    = view.findViewById(R.id.progress);
+    chipRecycler            = view.findViewById(R.id.chipRecycler);
+    constraintLayout        = view.findViewById(R.id.container);
+    headerActionView        = view.findViewById(R.id.header_action);
 
     final LinearLayoutManager layoutManager = new LinearLayoutManager(requireContext());
 
@@ -305,7 +288,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,6 +335,84 @@ 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,
+        new ContactSearchAdapter.DisplayOptions(
+            isMulti,
+            ContactSearchAdapter.DisplaySmsTag.DEFAULT,
+            ContactSearchAdapter.DisplaySecondaryInformation.ALWAYS,
+            newCallCallback != null,
+            false
+        ),
+        this::mapStateToConfiguration,
+        new ContactSearchMediator.SimpleCallbacks() {
+          @Override
+          public void onAdapterListCommitted(int size) {
+            onLoadFinished(size);
+          }
+        },
+        false,
+        (context, fixedContacts, displayOptions, callbacks, longClickCallbacks, storyContextMenuCallbacks, callButtonClickCallbacks) -> new ContactSelectionListAdapter(
+            context,
+            fixedContacts,
+            displayOptions,
+            new ContactSelectionListAdapter.OnContactSelectionClick() {
+              @Override
+              public void onRefreshContactsClicked() {
+                if (onRefreshListener != null) {
+                  setRefreshing(true);
+                  onRefreshListener.onRefresh();
+                }
+              }
+
+              @Override
+              public void onNewGroupClicked() {
+                newConversationCallback.onNewGroup(false);
+              }
+
+              @Override
+              public void onInviteToSignalClicked() {
+                if (newConversationCallback != null) {
+                  newConversationCallback.onInvite();
+                }
+
+                if (newCallCallback != null) {
+                  newCallCallback.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 CallButtonClickCallbacks()
+
+        ),
+        new ContactSelectionListAdapter.ArbitraryRepository()
+    );
+
     return view;
   }
 
@@ -360,6 +420,7 @@ public final class ContactSelectionListFragment extends LoggingFragment
   public void onDestroyView() {
     super.onDestroyView();
     constraintLayout = null;
+    onRefreshListener = null;
   }
 
   private @NonNull Bundle safeArguments() {
@@ -372,27 +433,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() {
@@ -402,7 +466,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() {
@@ -410,34 +474,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) {
@@ -458,20 +496,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);
 
@@ -496,7 +520,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() {
@@ -513,51 +537,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);
@@ -574,13 +568,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));
   }
@@ -634,20 +621,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()) {
@@ -657,22 +639,19 @@ 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) {
+      boolean         isUnknown       = contact instanceof ContactSearchKey.UnknownRecipientKey;
+      SelectedContact selectedContact = contact.requireSelectedContact();
 
       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());
@@ -682,63 +661,62 @@ 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 -> {
+                onContactSelectedListener.onBeforeContactSelected(true, 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(
+                isUnknown,
+                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;
       }
@@ -758,7 +736,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);
     }
@@ -768,8 +746,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) {
@@ -834,6 +811,7 @@ public final class ContactSelectionListFragment extends LoggingFragment
   }
 
   public void setOnRefreshListener(SwipeRefreshLayout.OnRefreshListener onRefreshListener) {
+    this.onRefreshListener = onRefreshListener;
     this.swipeRefresh.setOnRefreshListener(onRefreshListener);
   }
 
@@ -842,11 +820,153 @@ 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);
+    boolean includeGroupMembers        = flagSet(displayMode, ContactSelectionDisplayMode.FLAG_GROUP_MEMBERS);
+    boolean hasQuery                   = !TextUtils.isEmpty(contactSearchState.getQuery());
+
+    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 (newConversationCallback != null) {
+        builder.arbitrary(ContactSelectionListAdapter.ArbitraryRepository.ArbitraryRow.NEW_GROUP.getCode());
+      }
+
+      if (transportType != null) {
+        if (!hasQuery && includeRecents) {
+          builder.addSection(new ContactSearchConfiguration.Section.Recents(
+              25,
+              mode,
+              includeInactiveGroups,
+              includeV1Groups,
+              includeSmsContacts,
+              includeSelf,
+              includeRecentsHeader,
+              null
+          ));
+        }
+
+        builder.addSection(new ContactSearchConfiguration.Section.Individuals(
+            includeSelf,
+            transportType,
+            newCallCallback == null,
+            null,
+            !hideLetterHeaders()
+        ));
+      }
+
+      if ((includeGroupsAfterContacts || hasQuery) && includeActiveGroups) {
+        builder.addSection(new ContactSearchConfiguration.Section.Groups(
+            includeSmsContacts,
+            includeV1Groups,
+            includeInactiveGroups,
+            false,
+            ContactSearchSortOrder.NATURAL,
+            false,
+            true,
+            null
+        ));
+      }
+
+      if (hasQuery && includeGroupMembers) {
+        builder.addSection(new ContactSearchConfiguration.Section.GroupMembers());
+      }
+
+      if (includeNew) {
+        builder.phone(newRowMode);
+        builder.username(newRowMode);
+      }
+
+      if (newCallCallback != null || newConversationCallback != null) {
+        addMoreSection(builder);
+        builder.withEmptyState(emptyBuilder -> {
+          emptyBuilder.addSection(ContactSearchConfiguration.Section.Empty.INSTANCE);
+          addMoreSection(emptyBuilder);
+          return Unit.INSTANCE;
+        });
+      }
+
+      return Unit.INSTANCE;
+    });
+  }
+
+  private void addMoreSection(@NonNull ContactSearchConfiguration.Builder builder) {
+    builder.arbitrary(ContactSelectionListAdapter.ArbitraryRepository.ArbitraryRow.MORE_HEADING.getCode());
+    builder.arbitrary(ContactSelectionListAdapter.ArbitraryRepository.ArbitraryRow.REFRESH_CONTACTS.getCode());
+    builder.arbitrary(ContactSelectionListAdapter.ArbitraryRepository.ArbitraryRow.INVITE_TO_SIGNAL.getCode());
+  }
+
+  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 @NonNull ContactSearchConfiguration.NewRowMode resolveNewRowMode(boolean isBlocked, boolean isActiveGroups) {
+    if (isBlocked) {
+      return ContactSearchConfiguration.NewRowMode.BLOCK;
+    } else if (newCallCallback != null) {
+      return ContactSearchConfiguration.NewRowMode.NEW_CALL;
+    } 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;
+  }
+
+  private class CallButtonClickCallbacks implements ContactSearchAdapter.CallButtonClickCallbacks {
+    @Override
+    public void onVideoCallButtonClicked(@NonNull Recipient recipient) {
+      CommunicationActions.startVideoCall(ContactSelectionListFragment.this, recipient);
+    }
+
+    @Override
+    public void onAudioCallButtonClicked(@NonNull Recipient recipient) {
+      CommunicationActions.startVoiceCall(ContactSelectionListFragment.this, recipient);
+    }
+  }
+
   public interface OnContactSelectedListener {
     /**
      * Provides an opportunity to disallow selecting an item. Call the callback with false to disallow, or true to allow it.
      */
-    void onBeforeContactSelected(@NonNull Optional<RecipientId> recipientId, @Nullable String number, @NonNull Consumer<Boolean> callback);
+    void onBeforeContactSelected(boolean isFromUnknownSearchKey, @NonNull Optional<RecipientId> recipientId, @Nullable String number, @NonNull Consumer<Boolean> callback);
 
     void onContactDeselected(@NonNull Optional<RecipientId> recipientId, @Nullable String number);
 
@@ -859,12 +979,16 @@ public final class ContactSelectionListFragment extends LoggingFragment
     void onHardLimitReached(int limit);
   }
 
-  public interface ListCallback {
+  public interface NewConversationCallback {
     void onInvite();
 
     void onNewGroup(boolean forceV1);
   }
 
+  public interface NewCallCallback {
+    void onInvite();
+  }
+
   public interface ScrollCallback {
     void onBeginScroll();
   }
@@ -874,10 +998,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/DeviceAddFragment.java

@@ -1,8 +1,6 @@
 package org.thoughtcrime.securesms;
 
 import android.animation.Animator;
-import android.annotation.TargetApi;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
@@ -19,7 +17,7 @@ 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.LifecycleDisposable;
+import org.signal.core.util.concurrent.LifecycleDisposable;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;

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

@@ -23,7 +23,7 @@ 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;
@@ -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);
@@ -136,7 +136,7 @@ public class InviteActivity extends PassphraseRequiredActivity implements Contac
   }
 
   @Override
-  public void onBeforeContactSelected(@NonNull Optional<RecipientId> recipientId, String number, @NonNull Consumer<Boolean> callback) {
+  public void onBeforeContactSelected(boolean isFromUnknownSearchKey, @NonNull Optional<RecipientId> recipientId, String number, @NonNull Consumer<Boolean> callback) {
     updateSmsButtonText(contactsFragment.getSelectedContacts().size() + 1);
     callback.accept(true);
   }

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;
@@ -24,6 +26,7 @@ import org.thoughtcrime.securesms.util.CachedInflater;
 import org.thoughtcrime.securesms.util.CommunicationActions;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.SplashScreenUtil;
 import org.thoughtcrime.securesms.util.WindowUtil;
 
@@ -37,6 +40,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 +58,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 +118,11 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
       OldDeviceTransferLockedDialog.show(getSupportFragmentManager());
     }
 
+    if (SignalStore.misc().getShouldShowLinkedDevicesReminder()) {
+      SignalStore.misc().setShouldShowLinkedDevicesReminder(false);
+      RelinkDevicesReminderBottomSheetFragment.show(getSupportFragmentManager());
+    }
+
     updateTabVisibility();
   }
 
@@ -123,7 +148,7 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
   }
 
   private void updateTabVisibility() {
-    if (Stories.isFeatureEnabled()) {
+    if (Stories.isFeatureEnabled() || FeatureFlags.callsTab()) {
       findViewById(R.id.conversation_list_tabs).setVisibility(View.VISIBLE);
       WindowUtil.setNavigationBarColor(this, ContextCompat.getColor(this, R.color.signal_colorSurface2));
     } else {
@@ -158,6 +183,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/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.signal.core.util.concurrent.LifecycleDisposable;
 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;
@@ -72,7 +69,7 @@ import java.util.stream.Stream;
  * @author Moxie Marlinspike
  */
 public class NewConversationActivity extends ContactSelectionActivity
-    implements ContactSelectionListFragment.ListCallback, ContactSelectionListFragment.OnItemLongClickListener
+    implements ContactSelectionListFragment.NewConversationCallback, ContactSelectionListFragment.OnItemLongClickListener
 {
 
   @SuppressWarnings("unused")
@@ -96,7 +93,7 @@ public class NewConversationActivity extends ContactSelectionActivity
     ContactsManagementViewModel.Factory factory    = new ContactsManagementViewModel.Factory(repository);
 
     contactLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), activityResult -> {
-      if (activityResult.getResultCode() == RESULT_OK) {
+      if (activityResult.getResultCode() != RESULT_CANCELED) {
         handleManualRefresh();
       }
     });
@@ -105,7 +102,7 @@ public class NewConversationActivity extends ContactSelectionActivity
   }
 
   @Override
-  public void onBeforeContactSelected(@NonNull Optional<RecipientId> recipientId, String number, @NonNull Consumer<Boolean> callback) {
+  public void onBeforeContactSelected(boolean isFromUnknownSearchKey, @NonNull Optional<RecipientId> recipientId, String number, @NonNull Consumer<Boolean> callback) {
     boolean smsSupported = SignalStore.misc().getSmsExportPhase().allowSmsFeatures();
 
     if (recipientId.isPresent()) {
@@ -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))

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

@@ -31,11 +31,11 @@ import android.os.Bundle;
 import android.util.Rational;
 import android.view.Window;
 import android.view.WindowManager;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
+import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatDelegate;
+import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.util.Consumer;
 import androidx.lifecycle.ViewModelProvider;
@@ -58,6 +58,7 @@ import org.thoughtcrime.securesms.components.TooltipPopup;
 import org.thoughtcrime.securesms.components.sensors.DeviceOrientationMonitor;
 import org.thoughtcrime.securesms.components.webrtc.CallParticipantsListUpdatePopupWindow;
 import org.thoughtcrime.securesms.components.webrtc.CallParticipantsState;
+import org.thoughtcrime.securesms.components.webrtc.CallStateUpdatePopupWindow;
 import org.thoughtcrime.securesms.components.webrtc.CallToastPopupWindow;
 import org.thoughtcrime.securesms.components.webrtc.GroupCallSafetyNumberChangeNotificationUtil;
 import org.thoughtcrime.securesms.components.webrtc.WebRtcAudioOutput;
@@ -112,6 +113,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
   public static final String EXTRA_STARTED_FROM_FULLSCREEN   = WebRtcCallActivity.class.getCanonicalName() + ".STARTED_FROM_FULLSCREEN";
 
   private CallParticipantsListUpdatePopupWindow participantUpdateWindow;
+  private CallStateUpdatePopupWindow            callStateUpdatePopupWindow;
   private WifiToCellularPopupWindow             wifiToCellularPopupWindow;
   private DeviceOrientationMonitor              deviceOrientationMonitor;
 
@@ -124,6 +126,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
   private WindowLayoutInfoConsumer         windowLayoutInfoConsumer;
   private WindowInfoTrackerCallbackAdapter windowInfoTrackerCallbackAdapter;
   private ThrottledDebouncer               requestNewSizesThrottle;
+  private PictureInPictureParams.Builder   pipBuilderParams;
 
   private Disposable ephemeralStateDisposable = Disposable.empty();
 
@@ -155,6 +158,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
 
     initializeResources();
     initializeViewModel(isLandscapeEnabled);
+    initializePictureInPictureParams();
 
     processIntent(getIntent());
 
@@ -274,14 +278,22 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
   }
 
   private boolean enterPipModeIfPossible() {
-    if (viewModel.canEnterPipMode() && isSystemPipEnabledAndAvailable()) {
-      PictureInPictureParams params = new PictureInPictureParams.Builder()
-          .setAspectRatio(new Rational(9, 16))
-          .build();
-      enterPictureInPictureMode(params);
-      CallParticipantsListDialog.dismiss(getSupportFragmentManager());
+    if (isSystemPipEnabledAndAvailable()) {
+      if (viewModel.canEnterPipMode()) {
+        try {
+          enterPictureInPictureMode(pipBuilderParams.build());
+        } catch (IllegalStateException e) {
+          Log.w(TAG, "Device lied to us about supporting PiP.", e);
+          return false;
+        }
 
-      return true;
+        CallParticipantsListDialog.dismiss(getSupportFragmentManager());
+
+        return true;
+      }
+      if (Build.VERSION.SDK_INT >= 31) {
+        pipBuilderParams.setAutoEnterEnabled(false);
+      }
     }
     return false;
   }
@@ -312,8 +324,9 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
     callScreen = findViewById(R.id.callScreen);
     callScreen.setControlsListener(new ControlsListener());
 
-    participantUpdateWindow   = new CallParticipantsListUpdatePopupWindow(callScreen);
-    wifiToCellularPopupWindow = new WifiToCellularPopupWindow(callScreen);
+    participantUpdateWindow    = new CallParticipantsListUpdatePopupWindow(callScreen);
+    callStateUpdatePopupWindow = new CallStateUpdatePopupWindow(callScreen);
+    wifiToCellularPopupWindow  = new WifiToCellularPopupWindow(callScreen);
   }
 
   private void initializeViewModel(boolean isLandscapeEnabled) {
@@ -356,9 +369,23 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
     addOnPictureInPictureModeChangedListener(info -> {
       viewModel.setIsInPipMode(info.isInPictureInPictureMode());
       participantUpdateWindow.setEnabled(!info.isInPictureInPictureMode());
+      callStateUpdatePopupWindow.setEnabled(!info.isInPictureInPictureMode());
     });
   }
 
+  private void initializePictureInPictureParams() {
+    if (isSystemPipEnabledAndAvailable()) {
+      pipBuilderParams = new PictureInPictureParams.Builder();
+      pipBuilderParams.setAspectRatio(new Rational(9, 16));
+      if (Build.VERSION.SDK_INT >= 31) {
+        pipBuilderParams.setAutoEnterEnabled(true);
+      }
+      if (Build.VERSION.SDK_INT >= 26) {
+        setPictureInPictureParams(pipBuilderParams.build());
+      }
+    }
+  }
+
   private void handleViewModelEvent(@NonNull WebRtcCallViewModel.Event event) {
     if (event instanceof WebRtcCallViewModel.Event.StartCall) {
       startCall(((WebRtcCallViewModel.Event.StartCall) event).isVideoCall());
@@ -412,15 +439,19 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
   }
 
   private void handleSetAudioHandset() {
-    ApplicationDependencies.getSignalCallManager().selectAudioDevice(SignalAudioManager.AudioDevice.EARPIECE);
+    ApplicationDependencies.getSignalCallManager().selectAudioDevice(new SignalAudioManager.ChosenAudioDeviceIdentifier(SignalAudioManager.AudioDevice.EARPIECE));
   }
 
   private void handleSetAudioSpeaker() {
-    ApplicationDependencies.getSignalCallManager().selectAudioDevice(SignalAudioManager.AudioDevice.SPEAKER_PHONE);
+    ApplicationDependencies.getSignalCallManager().selectAudioDevice(new SignalAudioManager.ChosenAudioDeviceIdentifier(SignalAudioManager.AudioDevice.SPEAKER_PHONE));
   }
 
   private void handleSetAudioBluetooth() {
-    ApplicationDependencies.getSignalCallManager().selectAudioDevice(SignalAudioManager.AudioDevice.BLUETOOTH);
+    ApplicationDependencies.getSignalCallManager().selectAudioDevice(new SignalAudioManager.ChosenAudioDeviceIdentifier(SignalAudioManager.AudioDevice.BLUETOOTH));
+  }
+
+  private void handleSetAudioWiredHeadset() {
+    ApplicationDependencies.getSignalCallManager().selectAudioDevice(new SignalAudioManager.ChosenAudioDeviceIdentifier(SignalAudioManager.AudioDevice.WIRED_HEADSET));
   }
 
   private void handleSetMuteAudio(boolean enabled) {
@@ -565,7 +596,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
 
   private void handleNoSuchUser(final @NonNull WebRtcViewModel event) {
     if (isFinishing()) return; // XXX Stuart added this check above, not sure why, so I'm repeating in ignorance. - moxie
-    new AlertDialog.Builder(this)
+    new MaterialAlertDialogBuilder(this)
         .setTitle(R.string.RedPhone_number_not_registered)
         .setIcon(R.drawable.ic_warning)
         .setMessage(R.string.RedPhone_the_number_you_dialed_does_not_support_secure_voice)
@@ -782,17 +813,26 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
         case HANDSET:
           handleSetAudioHandset();
           break;
-        case HEADSET:
+        case BLUETOOTH_HEADSET:
           handleSetAudioBluetooth();
           break;
         case SPEAKER:
           handleSetAudioSpeaker();
           break;
+        case WIRED_HEADSET:
+          handleSetAudioWiredHeadset();
+          break;
         default:
           throw new IllegalStateException("Unknown output: " + audioOutput);
       }
     }
 
+    @RequiresApi(31)
+    @Override
+    public void onAudioOutputChanged31(@NonNull int audioDeviceInfo) {
+      ApplicationDependencies.getSignalCallManager().selectAudioDevice(new SignalAudioManager.ChosenAudioDeviceIdentifier(audioDeviceInfo));
+    }
+
     @Override
     public void onVideoChanged(boolean isVideoEnabled) {
       handleSetMuteVideo(!isVideoEnabled);
@@ -800,6 +840,8 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
 
     @Override
     public void onMicChanged(boolean isMicEnabled) {
+      callStateUpdatePopupWindow.onCallStateUpdate(isMicEnabled ? CallStateUpdatePopupWindow.CallStateUpdate.MIC_ON
+                                                                : CallStateUpdatePopupWindow.CallStateUpdate.MIC_OFF);
       handleSetMuteAudio(!isMicEnabled);
     }
 
@@ -832,11 +874,6 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
       }
     }
 
-    @Override
-    public void onShowParticipantsList() {
-      CallParticipantsListDialog.show(getSupportFragmentManager());
-    }
-
     @Override
     public void onPageChanged(@NonNull CallParticipantsState.SelectedPage page) {
       viewModel.setIsViewingFocusedParticipant(page);
@@ -851,11 +888,23 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
     public void onRingGroupChanged(boolean ringGroup, boolean ringingAllowed) {
       if (ringingAllowed) {
         ApplicationDependencies.getSignalCallManager().setRingGroup(ringGroup);
+        callStateUpdatePopupWindow.onCallStateUpdate(ringGroup ? CallStateUpdatePopupWindow.CallStateUpdate.RINGING_ON
+                                                               : CallStateUpdatePopupWindow.CallStateUpdate.RINGING_OFF);
       } else {
         ApplicationDependencies.getSignalCallManager().setRingGroup(false);
-        Toast.makeText(WebRtcCallActivity.this, R.string.WebRtcCallActivity__group_is_too_large_to_ring_the_participants, Toast.LENGTH_SHORT).show();
+        callStateUpdatePopupWindow.onCallStateUpdate(CallStateUpdatePopupWindow.CallStateUpdate.RINGING_DISABLED);
       }
     }
+
+    @Override
+    public void onCallInfoClicked() {
+      CallParticipantsListDialog.show(getSupportFragmentManager());
+    }
+
+    @Override
+    public void onNavigateUpClicked() {
+      onBackPressed();
+    }
   }
 
   private class WindowLayoutInfoConsumer implements Consumer<WindowLayoutInfo> {

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

@@ -17,7 +17,7 @@ import java.io.IOException
  */
 class SignalBackupAgent : BackupAgent() {
   private val items: List<AndroidBackupItem> = listOf(
-    KbsAuthTokens,
+    KbsAuthTokens
   )
 
   override fun onBackup(oldState: ParcelFileDescriptor?, data: BackupDataOutput, newState: ParcelFileDescriptor) {
@@ -47,6 +47,7 @@ class SignalBackupAgent : BackupAgent() {
   }
 
   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)

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

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.absbackup.backupables
 import com.google.protobuf.InvalidProtocolBufferException
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.absbackup.AndroidBackupItem
-import org.thoughtcrime.securesms.absbackup.ExternalBackupProtos
+import org.thoughtcrime.securesms.absbackup.protos.KbsAuthToken
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 
 /**
@@ -17,11 +17,8 @@ object KbsAuthTokens : AndroidBackupItem {
   }
 
   override fun getDataForBackup(): ByteArray {
-    val registrationRecoveryTokenList = SignalStore.kbsValues().kbsAuthTokenList
-    val proto = ExternalBackupProtos.KbsAuthToken.newBuilder()
-      .addAllToken(registrationRecoveryTokenList)
-      .build()
-    return proto.toByteArray()
+    val proto = KbsAuthToken(tokens = SignalStore.kbsValues().kbsAuthTokenList)
+    return proto.encode()
   }
 
   override fun restoreData(data: ByteArray) {
@@ -30,9 +27,9 @@ object KbsAuthTokens : AndroidBackupItem {
     }
 
     try {
-      val proto = ExternalBackupProtos.KbsAuthToken.parseFrom(data)
+      val proto = KbsAuthToken.ADAPTER.decode(data)
 
-      SignalStore.kbsValues().putAuthTokenList(proto.tokenList)
+      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/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/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/attachments/PointerAttachment.java

@@ -9,8 +9,11 @@ import org.thoughtcrime.securesms.blurhash.BlurHash;
 import org.thoughtcrime.securesms.database.AttachmentTable;
 import org.thoughtcrime.securesms.stickers.StickerLocator;
 import org.thoughtcrime.securesms.util.Base64;
+import org.whispersystems.signalservice.api.InvalidMessageStructureException;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
+import org.whispersystems.signalservice.api.util.AttachmentPointerUtil;
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -145,4 +148,33 @@ public class PointerAttachment extends Attachment {
                                              null,
                                              null));
   }
+
+  public static Optional<Attachment> forPointer(SignalServiceProtos.DataMessage.Quote.QuotedAttachment quotedAttachment) {
+    SignalServiceAttachment thumbnail;
+    try {
+      thumbnail = quotedAttachment.hasThumbnail() ? AttachmentPointerUtil.createSignalAttachmentPointer(quotedAttachment.getThumbnail()) : null;
+    } catch (InvalidMessageStructureException e) {
+      return Optional.empty();
+    }
+
+    return Optional.of(new PointerAttachment(quotedAttachment.getContentType(),
+                                             AttachmentTable.TRANSFER_PROGRESS_PENDING,
+                                             thumbnail != null ? thumbnail.asPointer().getSize().orElse(0) : 0,
+                                             quotedAttachment.getFileName(),
+                                             thumbnail != null ? thumbnail.asPointer().getCdnNumber() : 0,
+                                             thumbnail != null ? thumbnail.asPointer().getRemoteId().toString() : "0",
+                                             thumbnail != null && thumbnail.asPointer().getKey() != null ? Base64.encodeBytes(thumbnail.asPointer().getKey()) : null,
+                                             null,
+                                             thumbnail != null ? thumbnail.asPointer().getDigest().orElse(null) : null,
+                                             null,
+                                             false,
+                                             false,
+                                             false,
+                                             thumbnail != null ? thumbnail.asPointer().getWidth() : 0,
+                                             thumbnail != null ? thumbnail.asPointer().getHeight() : 0,
+                                             thumbnail != null ? thumbnail.asPointer().getUploadTimestamp() : 0,
+                                             thumbnail != null ? thumbnail.asPointer().getCaption().orElse(null) : null,
+                                             null,
+                                             null));
+  }
 }

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

@@ -7,6 +7,7 @@ import android.media.MediaCodecInfo;
 import android.media.MediaFormat;
 import android.media.MediaRecorder;
 import android.os.ParcelFileDescriptor;
+import android.os.Process;
 
 import org.signal.core.util.StreamUtil;
 import org.signal.core.util.logging.Log;
@@ -65,6 +66,7 @@ public class AudioCodec implements Recorder {
     new Thread(new Runnable() {
       @Override
       public void run() {
+        Process.setThreadPriority(Process.THREAD_PRIORITY_AUDIO);
         MediaCodec.BufferInfo bufferInfo         = new MediaCodec.BufferInfo();
         byte[]                audioRecordData    = new byte[bufferSize];
         ByteBuffer[]          codecInputBuffers  = mediaCodec.getInputBuffers();

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

@@ -7,6 +7,7 @@ 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;
@@ -14,45 +15,72 @@ 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.ExecutionException;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+
+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 static final ExecutorService executor = SignalExecutors.newCachedSingleThreadExecutor("signal-AudioRecorder", ThreadUtil.PRIORITY_UI_BLOCKING_THREAD);
 
   private final Context                   context;
+  private final AudioRecordingHandler     uiHandler;
   private final AudioRecorderFocusManager audioFocusManager;
 
-  private Recorder recorder;
-  private Uri      captureUri;
+  private Recorder    recorder;
+  private Future<Uri> recordingUriFuture;
 
-  public AudioRecorder(@NonNull Context context) {
-    this.context = context;
-    audioFocusManager = AudioRecorderFocusManager.create(context, focusChange -> stopRecording());
+  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 {
         if (recorder != null) {
-          throw new AssertionError("We can only record once at a time.");
+          recordingSingle.onError(new IllegalStateException("We can only do one recording at a time!"));
+          return;
         }
 
         ParcelFileDescriptor fds[] = ParcelFileDescriptor.createPipe();
 
-        captureUri = BlobProvider.getInstance()
-                                 .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));
+        recordingUriFuture = BlobProvider.getInstance()
+                                       .forData(new ParcelFileDescriptor.AutoCloseInputStream(fds[0]), 0)
+                                       .withMimeType(MediaUtil.AUDIO_AAC)
+                                       .createForDraftAttachmentAsync(context);
 
         recorder = Build.VERSION.SDK_INT >= 26 ? new MediaRecorderWrapper() : new AudioCodec();
         int focusResult = audioFocusManager.requestAudioFocus();
@@ -60,20 +88,23 @@ public class AudioRecorder {
           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;
       }
 
@@ -81,25 +112,17 @@ public class AudioRecorder {
       recorder.stop();
 
       try {
-        long size = MediaUtil.getMediaSize(context, captureUri);
-        sendToFuture(future, new VoiceNoteDraft(captureUri, size));
-      } catch (IOException ioe) {
+        Uri uri = recordingUriFuture.get();
+        long size = MediaUtil.getMediaSize(context, uri);
+        recordingSubject.onSuccess(new VoiceNoteDraft(uri, size));
+      } catch (IOException | ExecutionException | InterruptedException ioe) {
         Log.w(TAG, ioe);
-        sendToFuture(future, ioe);
+        recordingSubject.onError(ioe);
       }
 
-      recorder   = null;
-      captureUri = null;
+      recordingSubject   = null;
+      recorder           = null;
+      recordingUriFuture = 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/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.AttachmentTable;
-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 {
-          AttachmentTable    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);
+    }
+  }
+}

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

@@ -0,0 +1,152 @@
+package org.thoughtcrime.securesms.audio
+
+import android.content.Context
+import android.net.Uri
+import android.util.LruCache
+import androidx.annotation.AnyThread
+import androidx.annotation.RequiresApi
+import io.reactivex.rxjava3.core.Single
+import io.reactivex.rxjava3.schedulers.Schedulers
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.attachments.Attachment
+import org.thoughtcrime.securesms.attachments.AttachmentId
+import org.thoughtcrime.securesms.attachments.DatabaseAttachment
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.databaseprotos.AudioWaveFormData
+import java.io.IOException
+import java.util.concurrent.locks.ReentrantReadWriteLock
+import kotlin.concurrent.read
+import kotlin.concurrent.write
+
+/**
+ * Uses [AudioWaveFormGenerator] to generate audio wave forms.
+ *
+ * Maintains an in-memory cache of recently requested wave forms.
+ */
+@RequiresApi(23)
+object AudioWaveForms {
+
+  private val TAG = Log.tag(AudioWaveForms::class.java)
+
+  private val cache = ThreadSafeLruCache(200)
+
+  @AnyThread
+  @JvmStatic
+  fun getWaveForm(context: Context, attachment: Attachment): Single<AudioFileInfo> {
+    val uri = attachment.uri
+    if (uri == null) {
+      Log.i(TAG, "No uri")
+      return Single.error(IllegalArgumentException("No uri from attachment"))
+    }
+
+    val cacheKey = uri.toString()
+    val cachedInfo = cache.get(cacheKey)
+    if (cachedInfo != null) {
+      Log.i(TAG, "Loaded wave form from cache $cacheKey")
+      return Single.just(cachedInfo)
+    }
+
+    val databaseCache = Single.fromCallable {
+      val audioHash = attachment.audioHash
+      return@fromCallable if (audioHash != null) {
+        checkDatabaseCache(cacheKey, audioHash.audioWaveForm)
+      } else {
+        Miss
+      }
+    }.subscribeOn(Schedulers.io())
+
+    val generateWaveForm: Single<CacheCheckResult> = if (attachment is DatabaseAttachment) {
+      Single.fromCallable { generateWaveForm(context, uri, cacheKey, attachment.attachmentId) }
+    } else {
+      Single.fromCallable { generateWaveForm(context, uri, cacheKey) }
+    }.subscribeOn(Schedulers.io())
+
+    return databaseCache
+      .flatMap { r ->
+        if (r is Miss) {
+          generateWaveForm
+        } else {
+          Single.just(r)
+        }
+      }
+      .map { r ->
+        if (r is Success) {
+          r.audioFileInfo
+        } else {
+          throw IOException("Unable to generate wave form")
+        }
+      }
+  }
+
+  private fun checkDatabaseCache(cacheKey: String, audioWaveForm: AudioWaveFormData): CacheCheckResult {
+    val audioFileInfo = AudioFileInfo.fromDatabaseProtobuf(audioWaveForm)
+    if (audioFileInfo.waveForm.isEmpty()) {
+      Log.w(TAG, "Recovering from a wave form generation error  $cacheKey")
+      return Failure
+    } else if (audioFileInfo.waveForm.size != AudioWaveFormGenerator.BAR_COUNT) {
+      Log.w(TAG, "Wave form from database does not match bar count, regenerating $cacheKey")
+    } else {
+      cache.put(cacheKey, audioFileInfo)
+      Log.i(TAG, "Loaded wave form from DB $cacheKey")
+      return Success(audioFileInfo)
+    }
+
+    return Miss
+  }
+
+  private fun generateWaveForm(context: Context, uri: Uri, cacheKey: String, attachmentId: AttachmentId): CacheCheckResult {
+    try {
+      val startTime = System.currentTimeMillis()
+      SignalDatabase.attachments.writeAudioHash(attachmentId, AudioWaveFormData.getDefaultInstance())
+
+      Log.i(TAG, "Starting wave form generation ($cacheKey)")
+      val fileInfo: AudioFileInfo = AudioWaveFormGenerator.generateWaveForm(context, uri)
+      Log.i(TAG, "Audio wave form generation time ${System.currentTimeMillis() - startTime} ms ($cacheKey)")
+
+      SignalDatabase.attachments.writeAudioHash(attachmentId, fileInfo.toDatabaseProtobuf())
+      cache.put(cacheKey, fileInfo)
+
+      return Success(fileInfo)
+    } catch (e: Throwable) {
+      Log.w(TAG, "Failed to create audio wave form for $cacheKey", e)
+      return Failure
+    }
+  }
+
+  private fun generateWaveForm(context: Context, uri: Uri, cacheKey: String): CacheCheckResult {
+    try {
+      Log.i(TAG, "Not in database and not cached. Generating wave form on-the-fly.")
+
+      val startTime = System.currentTimeMillis()
+
+      Log.i(TAG, "Starting wave form generation ($cacheKey)")
+      val fileInfo: AudioFileInfo = AudioWaveFormGenerator.generateWaveForm(context, uri)
+      Log.i(TAG, "Audio wave form generation time ${System.currentTimeMillis() - startTime} ms ($cacheKey)")
+
+      cache.put(cacheKey, fileInfo)
+
+      return Success(fileInfo)
+    } catch (e: Throwable) {
+      Log.w(TAG, "Failed to create audio wave form for $cacheKey", e)
+      return Failure
+    }
+  }
+
+  private class ThreadSafeLruCache(maxSize: Int) {
+    private val cache = LruCache<String, AudioFileInfo>(maxSize)
+    private val lock = ReentrantReadWriteLock()
+
+    fun put(key: String, info: AudioFileInfo) {
+      lock.write { cache.put(key, info) }
+    }
+
+    fun get(key: String): AudioFileInfo? {
+      return lock.read { cache.get(key) }
+    }
+  }
+
+  private sealed class CacheCheckResult
+  private class Success(val audioFileInfo: AudioFileInfo) : CacheCheckResult()
+  private object Failure : CacheCheckResult()
+  private object Miss : CacheCheckResult()
+}

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

@@ -1,8 +1,10 @@
 package org.thoughtcrime.securesms.audio;
 
 import android.media.MediaRecorder;
+import android.os.Build;
 import android.os.ParcelFileDescriptor;
 
+import org.signal.core.util.StreamUtil;
 import org.signal.core.util.logging.Log;
 
 import java.io.IOException;
@@ -19,10 +21,14 @@ public class MediaRecorderWrapper implements Recorder {
   private static final int    BIT_RATE          = 32000;
 
   private MediaRecorder recorder = null;
+  
+  private ParcelFileDescriptor outputFileDescriptor;
 
   @Override
   public void start(ParcelFileDescriptor fileDescriptor) throws IOException {
     Log.i(TAG, "Recording voice note using MediaRecorderWrapper.");
+    this.outputFileDescriptor = fileDescriptor;
+
     recorder = new MediaRecorder();
 
     try {
@@ -30,7 +36,7 @@ public class MediaRecorderWrapper implements Recorder {
       recorder.setOutputFormat(MediaRecorder.OutputFormat.AAC_ADTS);
       recorder.setOutputFile(fileDescriptor.getFileDescriptor());
       recorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC);
-      recorder.setAudioSamplingRate(SAMPLE_RATE);
+      recorder.setAudioSamplingRate(getSampleRate());
       recorder.setAudioEncodingBitRate(BIT_RATE);
       recorder.setAudioChannels(CHANNELS);
       recorder.prepare();
@@ -39,6 +45,8 @@ public class MediaRecorderWrapper implements Recorder {
       Log.w(TAG, "Unable to start recording", e);
       recorder.release();
       recorder = null;
+      StreamUtil.close(outputFileDescriptor);
+      outputFileDescriptor = null;
       throw new IOException(e);
     }
   }
@@ -60,6 +68,16 @@ public class MediaRecorderWrapper implements Recorder {
     } finally {
       recorder.release();
       recorder = null;
+      StreamUtil.close(outputFileDescriptor);
+      outputFileDescriptor = null;
     }
   }
+
+  private static int getSampleRate() {
+    if ("Xiaomi".equals(Build.MANUFACTURER) && "Mi 9T".equals(Build.MODEL)) {
+      // Recordings sound robotic with the standard sample rate.
+      return 44000;
+    }
+    return SAMPLE_RATE;
+  }
 }

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

@@ -21,7 +21,7 @@ sealed class Avatar(
   data class Text(
     val text: String,
     val color: Avatars.ColorPair,
-    override val databaseId: DatabaseId,
+    override val databaseId: DatabaseId
   ) : Avatar(databaseId) {
     override fun withDatabaseId(databaseId: DatabaseId): Avatar {
       return copy(databaseId = databaseId)
@@ -35,7 +35,7 @@ sealed class Avatar(
   data class Vector(
     val key: String,
     val color: Avatars.ColorPair,
-    override val databaseId: DatabaseId,
+    override val databaseId: DatabaseId
   ) : Avatar(databaseId) {
     override fun withDatabaseId(databaseId: DatabaseId): Avatar {
       return copy(databaseId = databaseId)

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

@@ -1,6 +1,8 @@
 package org.thoughtcrime.securesms.avatar
 
+import android.net.Uri
 import android.os.Bundle
+import org.signal.core.util.getParcelableCompat
 
 /**
  * Utility class which encapsulates reading and writing Avatar objects to and from Bundles.
@@ -33,7 +35,7 @@ object AvatarBundler {
   }
 
   fun extractPhoto(bundle: Bundle): Avatar.Photo = Avatar.Photo(
-    uri = requireNotNull(bundle.getParcelable(URI)),
+    uri = requireNotNull(bundle.getParcelableCompat(URI, Uri::class.java)),
     size = bundle.getLong(SIZE),
     databaseId = bundle.getDatabaseId()
   )

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

@@ -6,6 +6,7 @@ import android.graphics.Canvas
 import android.graphics.Typeface
 import android.graphics.drawable.Drawable
 import android.net.Uri
+import androidx.annotation.MainThread
 import androidx.appcompat.content.res.AppCompatResources
 import com.airbnb.lottie.SimpleColorFilter
 import org.signal.core.util.concurrent.SignalExecutors
@@ -28,8 +29,13 @@ object AvatarRenderer {
 
   val DIMENSIONS = AvatarHelper.AVATAR_DIMENSIONS
 
+  private var typeface: Typeface? = null
+
+  @MainThread
   fun getTypeface(context: Context): Typeface {
-    return Typeface.createFromAsset(context.assets, "fonts/Inter-Medium.otf")
+    val interMedium = typeface ?: Typeface.createFromAsset(context.assets, "fonts/Inter-Medium.otf")
+    typeface = interMedium
+    return interMedium
   }
 
   fun renderAvatar(context: Context, avatar: Avatar, onAvatarRendered: (Media) -> Unit, onRenderFailed: (Throwable?) -> Unit) {

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

@@ -74,7 +74,7 @@ object Avatars {
     "avatar_sunset" to DefaultAvatar(R.drawable.ic_avatar_sunset, "A120"),
     "avatar_surfboard" to DefaultAvatar(R.drawable.ic_avatar_surfboard, "A110"),
     "avatar_soccerball" to DefaultAvatar(R.drawable.ic_avatar_soccerball, "A130"),
-    "avatar_football" to DefaultAvatar(R.drawable.ic_avatar_football, "A220"),
+    "avatar_football" to DefaultAvatar(R.drawable.ic_avatar_football, "A220")
   )
 
   @DrawableRes

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

@@ -0,0 +1,50 @@
+package org.thoughtcrime.securesms.avatar.photo
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.activity.result.contract.ActivityResultContract
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.fragment.app.Fragment
+import org.thoughtcrime.securesms.avatar.Avatar
+import org.thoughtcrime.securesms.avatar.AvatarBundler
+import org.thoughtcrime.securesms.components.FragmentWrapperActivity
+
+class PhotoEditorActivity : FragmentWrapperActivity() {
+
+  override fun attachBaseContext(newBase: Context) {
+    delegate.localNightMode = AppCompatDelegate.MODE_NIGHT_YES
+    super.attachBaseContext(newBase)
+  }
+
+  override fun onCreate(savedInstanceState: Bundle?, ready: Boolean) {
+    super.onCreate(savedInstanceState, ready)
+
+    supportFragmentManager.setFragmentResultListener(PhotoEditorFragment.REQUEST_KEY_EDIT, this) { _, bundle ->
+      setResult(Activity.RESULT_OK, Intent().putExtras(bundle))
+      finishAfterTransition()
+    }
+  }
+
+  override fun getFragment(): Fragment = PhotoEditorFragment().apply {
+    arguments = intent.extras
+  }
+
+  class Contract : ActivityResultContract<Avatar.Photo, Avatar.Photo?>() {
+    override fun createIntent(context: Context, input: Avatar.Photo): Intent {
+      return Intent(context, PhotoEditorActivity::class.java).apply {
+        putExtras(PhotoEditorActivityArgs.Builder(AvatarBundler.bundlePhoto(input)).build().toBundle())
+      }
+    }
+
+    override fun parseResult(resultCode: Int, intent: Intent?): Avatar.Photo? {
+      val extras = intent?.extras
+      if (resultCode != Activity.RESULT_OK || extras == null) {
+        return null
+      }
+
+      return AvatarBundler.extractPhoto(extras)
+    }
+  }
+}

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

@@ -5,7 +5,6 @@ import android.view.View
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.commit
 import androidx.fragment.app.setFragmentResult
-import androidx.navigation.Navigation
 import org.signal.core.util.ThreadUtil
 import org.signal.core.util.concurrent.SignalExecutors
 import org.thoughtcrime.securesms.R
@@ -18,7 +17,7 @@ import org.thoughtcrime.securesms.scribbles.ImageEditorFragment
 class PhotoEditorFragment : Fragment(R.layout.avatar_photo_editor_fragment), ImageEditorFragment.Controller {
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-    val args = PhotoEditorFragmentArgs.fromBundle(requireArguments())
+    val args = PhotoEditorActivityArgs.fromBundle(requireArguments())
     val photo = AvatarBundler.extractPhoto(args.photoAvatar)
     val imageEditorFragment = ImageEditorFragment.newInstanceForAvatarEdit(photo.uri)
 
@@ -34,7 +33,7 @@ class PhotoEditorFragment : Fragment(R.layout.avatar_photo_editor_fragment), Ima
   }
 
   override fun onDoneEditing() {
-    val args = PhotoEditorFragmentArgs.fromBundle(requireArguments())
+    val args = PhotoEditorActivityArgs.fromBundle(requireArguments())
     val applicationContext = requireContext().applicationContext
     val imageEditorFragment: ImageEditorFragment = childFragmentManager.findFragmentByTag(IMAGE_EDITOR) as ImageEditorFragment
 
@@ -52,13 +51,12 @@ class PhotoEditorFragment : Fragment(R.layout.avatar_photo_editor_fragment), Ima
 
       ThreadUtil.runOnMain {
         setFragmentResult(REQUEST_KEY_EDIT, AvatarBundler.bundlePhoto(newPhoto))
-        Navigation.findNavController(requireView()).popBackStack()
       }
     }
   }
 
   override fun onCancelEditing() {
-    Navigation.findNavController(requireView()).popBackStack()
+    requireActivity().finishAfterTransition()
   }
 
   override fun restoreState() {

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

@@ -8,6 +8,7 @@ import android.view.Gravity
 import android.view.View
 import android.widget.PopupMenu
 import android.widget.Toast
+import androidx.activity.result.ActivityResultLauncher
 import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.setFragmentResult
@@ -16,9 +17,11 @@ import androidx.fragment.app.viewModels
 import androidx.navigation.Navigation
 import androidx.recyclerview.widget.RecyclerView
 import org.signal.core.util.ThreadUtil
+import org.signal.core.util.getParcelableExtraCompat
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.avatar.Avatar
 import org.thoughtcrime.securesms.avatar.AvatarBundler
+import org.thoughtcrime.securesms.avatar.photo.PhotoEditorActivity
 import org.thoughtcrime.securesms.avatar.photo.PhotoEditorFragment
 import org.thoughtcrime.securesms.avatar.text.TextAvatarCreationFragment
 import org.thoughtcrime.securesms.avatar.vector.VectorAvatarCreationFragment
@@ -49,6 +52,7 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) {
   private val viewModel: AvatarPickerViewModel by viewModels(factoryProducer = this::createFactory)
 
   private lateinit var recycler: RecyclerView
+  private lateinit var photoEditorLauncher: ActivityResultLauncher<Avatar.Photo>
 
   private fun createFactory(): AvatarPickerViewModel.Factory {
     val args = AvatarPickerFragmentArgs.fromBundle(requireArguments())
@@ -87,8 +91,9 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) {
       val selectedPosition = items.indexOfFirst { it.isSelected }
 
       adapter.submitList(items) {
-        if (selectedPosition > -1)
+        if (selectedPosition > -1) {
           recycler.smoothScrollToPosition(selectedPosition)
+        }
       }
     }
 
@@ -136,8 +141,12 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) {
     }
 
     setFragmentResultListener(PhotoEditorFragment.REQUEST_KEY_EDIT) { _, bundle ->
-      val photo = AvatarBundler.extractPhoto(bundle)
-      viewModel.onAvatarEditCompleted(photo)
+    }
+
+    photoEditorLauncher = registerForActivityResult(PhotoEditorActivity.Contract()) { photo ->
+      if (photo != null) {
+        viewModel.onAvatarEditCompleted(photo)
+      }
     }
   }
 
@@ -146,10 +155,9 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) {
     ViewUtil.hideKeyboard(requireContext(), requireView())
   }
 
-  @Suppress("DEPRECATION")
   override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
     if (requestCode == REQUEST_CODE_SELECT_IMAGE && resultCode == Activity.RESULT_OK && data != null) {
-      val media: Media = requireNotNull(data.getParcelableExtra(AvatarSelectionActivity.EXTRA_MEDIA))
+      val media: Media = requireNotNull(data.getParcelableExtraCompat(AvatarSelectionActivity.EXTRA_MEDIA, Media::class.java))
       viewModel.onAvatarPhotoSelectionCompleted(media)
     } else {
       super.onActivityResult(requestCode, resultCode, data)
@@ -196,8 +204,7 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) {
   }
 
   private fun openPhotoEditor(photo: Avatar.Photo) {
-    Navigation.findNavController(requireView())
-      .safeNavigate(AvatarPickerFragmentDirections.actionAvatarPickerFragmentToAvatarPhotoEditorFragment(AvatarBundler.bundlePhoto(photo)))
+    photoEditorLauncher.launch(photo)
   }
 
   private fun openVectorEditor(vector: Avatar.Vector) {

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

@@ -5,7 +5,7 @@ import org.thoughtcrime.securesms.avatar.AvatarColorItem
 import org.thoughtcrime.securesms.avatar.Avatars
 
 data class TextAvatarCreationState(
-  val currentAvatar: Avatar.Text,
+  val currentAvatar: Avatar.Text
 ) {
   fun colors(): List<AvatarColorItem> = Avatars.colors.map { AvatarColorItem(it, currentAvatar.color == it) }
 }

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

@@ -5,7 +5,7 @@ import org.thoughtcrime.securesms.avatar.AvatarColorItem
 import org.thoughtcrime.securesms.avatar.Avatars
 
 data class VectorAvatarCreationState(
-  val currentAvatar: Avatar.Vector,
+  val currentAvatar: Avatar.Vector
 ) {
   fun colors(): List<AvatarColorItem> = Avatars.colors.map { AvatarColorItem(it, currentAvatar.color == it) }
 }

app/src/main/java/org/thoughtcrime/securesms/avatar/view/AvatarView.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import android.widget.FrameLayout
+import androidx.core.content.res.use
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.AvatarImageView
 import org.thoughtcrime.securesms.database.model.StoryViewState
@@ -20,10 +21,12 @@ class AvatarView @JvmOverloads constructor(
   attrs: AttributeSet? = null
 ) : FrameLayout(context, attrs) {
 
+  private var storyRingScale = 0.8f
   init {
     inflate(context, R.layout.avatar_view, this)
 
     isClickable = false
+    storyRingScale = context.theme.obtainStyledAttributes(attrs, R.styleable.AvatarView, 0, 0).use { it.getFloat(R.styleable.AvatarView_storyRingScale, storyRingScale) }
   }
 
   private val avatar: AvatarImageView = findViewById<AvatarImageView>(R.id.avatar_image_view).apply {
@@ -40,8 +43,8 @@ class AvatarView @JvmOverloads constructor(
     storyRing.visible = true
     storyRing.isActivated = hasUnreadStory
 
-    avatar.scaleX = 0.8f
-    avatar.scaleY = 0.8f
+    avatar.scaleX = storyRingScale
+    avatar.scaleY = storyRingScale
   }
 
   private fun hideStoryRing() {

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

@@ -16,12 +16,12 @@ object BackupCountQueries {
       SELECT COUNT(*) FROM ${GroupReceiptTable.TABLE_NAME} 
       INNER JOIN ${MessageTable.TABLE_NAME} ON ${GroupReceiptTable.TABLE_NAME}.${GroupReceiptTable.MMS_ID} = ${MessageTable.TABLE_NAME}.${MessageTable.ID} 
       WHERE ${MessageTable.TABLE_NAME}.${MessageTable.EXPIRES_IN} <= 0 AND ${MessageTable.TABLE_NAME}.${MessageTable.VIEW_ONCE} <= 0
-  """.trimIndent()
+  """
 
   @get:JvmStatic
   val attachmentCount: String = """
       SELECT COUNT(*) FROM ${AttachmentTable.TABLE_NAME} 
       INNER JOIN ${MessageTable.TABLE_NAME} ON ${AttachmentTable.TABLE_NAME}.${AttachmentTable.MMS_ID} = ${MessageTable.TABLE_NAME}.${MessageTable.ID} 
       WHERE ${MessageTable.TABLE_NAME}.${MessageTable.EXPIRES_IN} <= 0 AND ${MessageTable.TABLE_NAME}.${MessageTable.VIEW_ONCE} <= 0
-  """.trimIndent()
+  """
 }

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

@@ -130,6 +130,7 @@ public class BackupDialog {
                                      Intent.FLAG_GRANT_READ_URI_PERMISSION);
 
                     try {
+                       Log.d(TAG, "Starting choose backup location dialog");
                        fragment.startActivityForResult(intent, requestCode);
                      } catch (ActivityNotFoundException e) {
                        Toast.makeText(fragment.requireContext(), R.string.BackupDialog_no_file_picker_available, Toast.LENGTH_LONG)

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

@@ -6,6 +6,8 @@ import org.signal.core.util.Conversions;
 import org.signal.core.util.StreamUtil;
 import org.signal.libsignal.protocol.kdf.HKDF;
 import org.signal.libsignal.protocol.util.ByteUtil;
+import org.thoughtcrime.securesms.backup.proto.BackupFrame;
+import org.thoughtcrime.securesms.backup.proto.Header;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -45,21 +47,21 @@ class BackupRecordInputStream extends FullBackupBase.BackupStream {
       byte[] headerFrame  = new byte[headerLength];
       StreamUtil.readFully(in, headerFrame);
 
-      BackupProtos.BackupFrame frame = BackupProtos.BackupFrame.parseFrom(headerFrame);
+      BackupFrame frame = BackupFrame.ADAPTER.decode(headerFrame);
 
-      if (!frame.hasHeader()) {
+      if (frame.header_ == null) {
         throw new IOException("Backup stream does not start with header!");
       }
 
-      BackupProtos.Header header = frame.getHeader();
+      Header header = frame.header_;
 
-      this.iv = header.getIv().toByteArray();
+      this.iv = header.iv.toByteArray();
 
       if (iv.length != 16) {
         throw new IOException("Invalid IV length!");
       }
 
-      byte[]   key     = getBackupKey(passphrase, header.hasSalt() ? header.getSalt().toByteArray() : null);
+      byte[]   key     = getBackupKey(passphrase, header.salt != null ? header.salt.toByteArray() : null);
       byte[]   derived = HKDF.deriveSecrets(key, "Backup Export".getBytes(), 64);
       byte[][] split   = ByteUtil.split(derived, 32, 32);
 
@@ -76,7 +78,7 @@ class BackupRecordInputStream extends FullBackupBase.BackupStream {
     }
   }
 
-  BackupProtos.BackupFrame readFrame() throws IOException {
+  BackupFrame readFrame() throws IOException {
     return readFrame(in);
   }
 
@@ -128,7 +130,7 @@ class BackupRecordInputStream extends FullBackupBase.BackupStream {
     }
   }
 
-  private BackupProtos.BackupFrame readFrame(InputStream in) throws IOException {
+  private BackupFrame readFrame(InputStream in) throws IOException {
     try {
       byte[] length = new byte[4];
       StreamUtil.readFully(in, length);
@@ -151,7 +153,7 @@ class BackupRecordInputStream extends FullBackupBase.BackupStream {
 
       byte[] plaintext = cipher.doFinal(frame, 0, frame.length - 10);
 
-      return BackupProtos.BackupFrame.parseFrom(plaintext);
+      return BackupFrame.ADAPTER.decode(plaintext);
     } catch (InvalidKeyException | InvalidAlgorithmParameterException | IllegalBlockSizeException | BadPaddingException e) {
       throw new AssertionError(e);
     }

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

@@ -2,7 +2,10 @@ package org.thoughtcrime.securesms.backup
 
 import org.greenrobot.eventbus.EventBus
 import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.backup.BackupProtos.BackupFrame
+import org.thoughtcrime.securesms.backup.proto.Attachment
+import org.thoughtcrime.securesms.backup.proto.Avatar
+import org.thoughtcrime.securesms.backup.proto.BackupFrame
+import org.thoughtcrime.securesms.backup.proto.Sticker
 import java.io.IOException
 import java.io.InputStream
 import java.io.OutputStream
@@ -15,38 +18,42 @@ object BackupVerifier {
   private val TAG = Log.tag(BackupVerifier::class.java)
 
   @JvmStatic
-  @Throws(IOException::class)
-  fun verifyFile(cipherStream: InputStream, passphrase: String, expectedCount: Long): Boolean {
+  @Throws(IOException::class, FullBackupExporter.BackupCanceledException::class)
+  fun verifyFile(cipherStream: InputStream, passphrase: String, expectedCount: Long, cancellationSignal: FullBackupExporter.BackupCancellationSignal): Boolean {
     val inputStream = BackupRecordInputStream(cipherStream, passphrase)
 
     var count = 0L
     var frame: BackupFrame = inputStream.readFrame()
 
-    while (!frame.end) {
-      val verified = when {
-        frame.hasAttachment() -> verifyAttachment(frame.attachment, inputStream)
-        frame.hasSticker() -> verifySticker(frame.sticker, inputStream)
-        frame.hasAvatar() -> verifyAvatar(frame.avatar, inputStream)
-        else -> true
+    cipherStream.use {
+      while (frame.end != true && !cancellationSignal.isCanceled) {
+        val verified = when {
+          frame.attachment != null -> verifyAttachment(frame.attachment!!, inputStream)
+          frame.sticker != null -> verifySticker(frame.sticker!!, inputStream)
+          frame.avatar != null -> verifyAvatar(frame.avatar!!, inputStream)
+          else -> true
+        }
+
+        if (!verified) {
+          return false
+        }
+
+        EventBus.getDefault().post(BackupEvent(BackupEvent.Type.PROGRESS_VERIFYING, ++count, expectedCount))
+
+        frame = inputStream.readFrame()
       }
-
-      if (!verified) {
-        return false
-      }
-
-      EventBus.getDefault().post(BackupEvent(BackupEvent.Type.PROGRESS_VERIFYING, ++count, expectedCount))
-
-      frame = inputStream.readFrame()
     }
 
-    cipherStream.close()
+    if (cancellationSignal.isCanceled) {
+      throw FullBackupExporter.BackupCanceledException()
+    }
 
     return true
   }
 
-  private fun verifyAttachment(attachment: BackupProtos.Attachment, inputStream: BackupRecordInputStream): Boolean {
+  private fun verifyAttachment(attachment: Attachment, inputStream: BackupRecordInputStream): Boolean {
     try {
-      inputStream.readAttachmentTo(NullOutputStream, attachment.length)
+      inputStream.readAttachmentTo(NullOutputStream, attachment.length ?: 0)
     } catch (e: IOException) {
       Log.w(TAG, "Bad attachment id: ${attachment.attachmentId} len: ${attachment.length}", e)
       return false
@@ -55,9 +62,9 @@ object BackupVerifier {
     return true
   }
 
-  private fun verifySticker(sticker: BackupProtos.Sticker, inputStream: BackupRecordInputStream): Boolean {
+  private fun verifySticker(sticker: Sticker, inputStream: BackupRecordInputStream): Boolean {
     try {
-      inputStream.readAttachmentTo(NullOutputStream, sticker.length)
+      inputStream.readAttachmentTo(NullOutputStream, sticker.length ?: 0)
     } catch (e: IOException) {
       Log.w(TAG, "Bad sticker id: ${sticker.rowId} len: ${sticker.length}", e)
       return false
@@ -65,9 +72,9 @@ object BackupVerifier {
     return true
   }
 
-  private fun verifyAvatar(avatar: BackupProtos.Avatar, inputStream: BackupRecordInputStream): Boolean {
+  private fun verifyAvatar(avatar: Avatar, inputStream: BackupRecordInputStream): Boolean {
     try {
-      inputStream.readAttachmentTo(NullOutputStream, avatar.length)
+      inputStream.readAttachmentTo(NullOutputStream, avatar.length ?: 0)
     } catch (e: IOException) {
       Log.w(TAG, "Bad avatar id: ${avatar.recipientId} len: ${avatar.length}", e)
       return false