Bump version to 6.28.6

Fix bug when changing number.
2026-02-20 17:57:29 +00:00 · 2023-08-11 17:25:02 -04:00 · 2023-08-11 17:22:48 -04:00
2568 changed files with 79461 additions and 129604 deletions
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -18,8 +18,6 @@ jobs:

    steps:
    - uses: actions/checkout@v3
-      with:
-          submodules: true

    - name: set up JDK 17
      uses: actions/setup-java@v3
--- a/.github/workflows/diffuse.yml
+++ b/.github/workflows/diffuse.yml
@@ -15,7 +15,6 @@ jobs:
    steps:
    - uses: actions/checkout@v3
      with:
-        submodules: true
        ref: ${{ github.event.pull_request.base.sha }}

    - name: set up JDK 17
@@ -46,7 +45,6 @@ jobs:

    - uses: actions/checkout@v3
      with:
-        submodules: true
        clean: 'false'

    - name: Build with Gradle
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,6 @@ captures/
 project.properties
 keystore.debug.properties
 keystore.staging.properties
-nightly-url.txt
 .project
 .settings
 bin/
@@ -29,4 +28,4 @@ jni/libspeex/.deps/
 pkcs11.password
 dev.keystore
 maps.key
-local/
+local/
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "libwebp"]
-	path = libwebp
-	url = https://github.com/webmproject/libwebp.git
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -15,12 +15,6 @@ Truths which we believe to be self-evident:
 1. **There is no such thing as time.**  Protocol ideas that require synchronized clocks are doomed to failure.


-## Building
-
-1. You'll need to get the `libwebp` submodule after checking out the repository with `git submodule init && git submodule update`
-1. Most things are pretty straightforward, and opening the project in Android Studio should get you most of the way there.
-1. Depending on your configuration, you'll also likely need to install additional SDK Tool components, namely the versions of NDK and CMake we are currently using in our [Docker](https://github.com/signalapp/Signal-Android/blob/main/reproducible-builds/Dockerfile#L30) configuration.
-
 ## Issues

 ### Useful bug reports
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -0,0 +1,711 @@
+import com.android.build.api.dsl.ManagedVirtualDevice
+
+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'
+    }
+    generateProtoTasks {
+        all().each { task ->
+            task.builtins {
+                java {
+                    option "lite"
+                }
+            }
+        }
+    }
+}
+
+wire {
+    kotlin {
+        javaInterop = true
+    }
+
+    sourcePath {
+        srcDir 'src/main/protowire'
+    }
+}
+
+ktlint {
+    version = "0.49.1"
+}
+
+def canonicalVersionCode = 1310
+def canonicalVersionName = "6.28.6"
+
+def postFixSize = 100
+def abiPostFix = ['universal'   : 5,
+                  'armeabi-v7a' : 6,
+                  'arm64-v8a'   : 7,
+                  'x86'         : 8,
+                  'x86_64'      : 9]
+
+def keystores = [ 'debug'  : loadKeystoreProperties('keystore.debug.properties') ]
+
+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 {
+    namespace 'org.thoughtcrime.securesms'
+
+    buildToolsVersion = signalBuildToolsVersion
+    compileSdkVersion = signalCompileSdkVersion
+
+    flavorDimensions 'distribution', 'environment'
+    useLibrary 'org.apache.http.legacy'
+    testBuildType 'instrumentation'
+
+    kotlinOptions {
+        jvmTarget = "11"
+        freeCompilerArgs = ["-Xallow-result-return-type"]
+    }
+
+    signingConfigs {
+        if (keystores.debug != null) {
+            debug {
+                storeFile file("${project.rootDir}/${keystores.debug.storeFile}")
+                storePassword keystores.debug.storePassword
+                keyAlias keystores.debug.keyAlias
+                keyPassword keystores.debug.keyPassword
+            }
+        }
+    }
+
+    testOptions {
+        execution 'ANDROIDX_TEST_ORCHESTRATOR'
+
+        unitTests {
+            includeAndroidResources = true
+        }
+
+        managedDevices {
+            devices {
+                pixel3api30 (ManagedVirtualDevice) {
+                    device = "Pixel 3"
+                    apiLevel = 30
+                    systemImageSource = "google-atd"
+                    require64Bit = false
+                }
+            }
+        }
+    }
+
+
+    sourceSets {
+        test {
+            java.srcDirs += "$projectDir/src/testShared"
+        }
+
+        androidTest {
+            java.srcDirs += "$projectDir/src/testShared"
+        }
+    }
+
+    compileOptions {
+        coreLibraryDesugaringEnabled true
+        sourceCompatibility signalJavaVersion
+        targetCompatibility signalJavaVersion
+    }
+
+    packagingOptions {
+        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.4.4'
+    }
+
+    defaultConfig {
+        versionCode canonicalVersionCode * postFixSize
+        versionName canonicalVersionName
+
+        minSdkVersion signalMinSdkVersion
+        targetSdkVersion signalTargetSdkVersion
+
+        multiDexEnabled true
+
+        vectorDrawables.useSupportLibrary = true
+        project.ext.set("archivesBaseName", "Signal")
+
+        manifestPlaceholders = [mapsKey:"AIzaSyCSx9xea86GwDKGznCAULE9Y5a8b-TfN9U"]
+
+        buildConfigField "long", "BUILD_TIMESTAMP", getLastCommitTimestamp() + "L"
+        buildConfigField "String", "GIT_HASH", "\"${getGitHash()}\""
+        buildConfigField "String", "SIGNAL_URL", "\"https://chat.signal.org\""
+        buildConfigField "String", "STORAGE_URL", "\"https://storage.signal.org\""
+        buildConfigField "String", "SIGNAL_CDN_URL", "\"https://cdn.signal.org\""
+        buildConfigField "String", "SIGNAL_CDN2_URL", "\"https://cdn2.signal.org\""
+        buildConfigField "String", "SIGNAL_CDSI_URL", "\"https://cdsi.signal.org\""
+        buildConfigField "String", "SIGNAL_SERVICE_STATUS_URL", "\"uptime.signal.org\""
+        buildConfigField "String", "SIGNAL_KEY_BACKUP_URL", "\"https://api.backup.signal.org\""
+        buildConfigField "String", "SIGNAL_SVR2_URL", "\"https://svr2.signal.org\""
+        buildConfigField "String", "SIGNAL_SFU_URL", "\"https://sfu.voip.signal.org\""
+        buildConfigField "String", "SIGNAL_STAGING_SFU_URL", "\"https://sfu.staging.voip.signal.org\""
+        buildConfigField "String[]", "SIGNAL_SFU_INTERNAL_NAMES", "new String[]{\"Test\", \"Staging\", \"Development\"}"
+        buildConfigField "String[]", "SIGNAL_SFU_INTERNAL_URLS", "new String[]{\"https://sfu.test.voip.signal.org\", \"https://sfu.staging.voip.signal.org\", \"https://sfu.staging.test.voip.signal.org\"}"
+        buildConfigField "String", "CONTENT_PROXY_HOST", "\"contentproxy.signal.org\""
+        buildConfigField "int", "CONTENT_PROXY_PORT", "443"
+        buildConfigField "String[]", "SIGNAL_SERVICE_IPS", service_ips
+        buildConfigField "String[]", "SIGNAL_STORAGE_IPS", storage_ips
+        buildConfigField "String[]", "SIGNAL_CDN_IPS", cdn_ips
+        buildConfigField "String[]", "SIGNAL_CDN2_IPS", cdn2_ips
+        buildConfigField "String[]", "SIGNAL_KBS_IPS", kbs_ips
+        buildConfigField "String[]", "SIGNAL_SFU_IPS", sfu_ips
+        buildConfigField "String[]", "SIGNAL_CONTENT_PROXY_IPS", content_proxy_ips
+        buildConfigField "String[]", "SIGNAL_CDSI_IPS", cdsi_ips
+        buildConfigField "String[]", "SIGNAL_SVR2_IPS", svr2_ips
+        buildConfigField "String", "SIGNAL_AGENT", "\"OWA\""
+        buildConfigField "String", "CDSI_MRENCLAVE", "\"0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57\""
+        buildConfigField "String", "SVR2_MRENCLAVE", "\"6ee1042f9e20f880326686dd4ba50c25359f01e9f733eeba4382bca001d45094\""
+        buildConfigField "org.thoughtcrime.securesms.KbsEnclave", "KBS_ENCLAVE", "new org.thoughtcrime.securesms.KbsEnclave(\"e18376436159cda3ad7a45d9320e382e4a497f26b0dca34d8eab0bd0139483b5\", " +
+                                                                                                                           "\"3a485adb56e2058ef7737764c738c4069dd62bc457637eafb6bbce1ce29ddb89\", " +
+                                                                                                                           "\"45627094b2ea4a66f4cf0b182858a8dcf4b8479122c3820fe7fd0551a6d4cf5c\")"
+        buildConfigField "org.thoughtcrime.securesms.KbsEnclave[]", "KBS_FALLBACKS", "new org.thoughtcrime.securesms.KbsEnclave[] { new org.thoughtcrime.securesms.KbsEnclave(\"0cedba03535b41b67729ce9924185f831d7767928a1d1689acb689bc079c375f\", " +
+                                                                                                                                                                             "\"187d2739d22be65e74b65f0055e74d31310e4267e5fac2b1246cc8beba81af39\", " +
+                                                                                                                                                                             "\"ee19f1965b1eefa3dc4204eb70c04f397755f771b8c1909d080c04dad2a6a9ba\") }"
+        buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF\""
+        buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY/JYJHRooo5CEqYKBqdFnmbTVGEkCvJKxLnjwKWf+fEPoWeQFj5ObDjcKMZf2Jm2Ae69x+ikU5gBXsRmoF94GXTLfN0/vLt98KDPnxwAQL9j5V1jGOY8jQl6MLxEs56cwXN0dqCnImzVH3TZT1cJ8SW1BRX6qIVxEzjsSGx3yxF3suAilPMqGRp4ffyopjMD1JXiKR2RwLKzizUe5e8XyGOy9fplzhw3jVzTRyUZTRSZKkMLWcQ/gv0E4aONNqs4P\""
+        buildConfigField "String", "GENERIC_SERVER_PUBLIC_PARAMS", "\"AByD873dTilmOSG0TjKrvpeaKEsUmIO8Vx9BeMmftwUs9v7ikPwM8P3OHyT0+X3EUMZrSe9VUp26Wai51Q9I8mdk0hX/yo7CeFGJyzoOqn8e/i4Ygbn5HoAyXJx5eXfIbqpc0bIxzju4H/HOQeOpt6h742qii5u/cbwOhFZCsMIbElZTaeU+BWMBQiZHIGHT5IE0qCordQKZ5iPZom0HeFa8Yq0ShuEyAl0WINBiY6xE3H/9WnvzXBbMuuk//eRxXgzO8ieCeK8FwQNxbfXqZm6Ro1cMhCOF3u7xoX83QhpN\""
+        buildConfigField "String[]", "LANGUAGES", "new String[]{\"" + autoResConfig().collect { s -> s.replace('-r', '_') }.join('", "') + '"}'
+        buildConfigField "int", "CANONICAL_VERSION_CODE", "$canonicalVersionCode"
+        buildConfigField "String", "DEFAULT_CURRENCIES", "\"EUR,AUD,GBP,CAD,CNY\""
+        buildConfigField "String", "GIPHY_API_KEY", "\"3o6ZsYH6U6Eri53TXy\""
+        buildConfigField "String", "SIGNAL_CAPTCHA_URL", "\"https://signalcaptchas.org/registration/generate.html\""
+        buildConfigField "String", "RECAPTCHA_PROOF_URL", "\"https://signalcaptchas.org/challenge/generate.html\""
+
+        buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"unset\""
+        buildConfigField "String", "BUILD_ENVIRONMENT_TYPE", "\"unset\""
+        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'
+        }
+        resourceConfigurations += []
+
+
+        splits {
+            abi {
+                enable !project.hasProperty('generateBaselineProfile')
+                reset()
+                include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+                universalApk true
+            }
+        }
+
+        testInstrumentationRunner "org.thoughtcrime.securesms.testing.SignalTestRunner"
+        testInstrumentationRunnerArguments clearPackageData: 'true'
+    }
+
+    buildTypes {
+        debug {
+            if (keystores['debug'] != null) {
+                signingConfig signingConfigs.debug
+            }
+            isDefault true
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'),
+                    'proguard/proguard-firebase-messaging.pro',
+                    'proguard/proguard-google-play-services.pro',
+                    'proguard/proguard-jackson.pro',
+                    'proguard/proguard-sqlite.pro',
+                    'proguard/proguard-appcompat-v7.pro',
+                    'proguard/proguard-square-okhttp.pro',
+                    'proguard/proguard-square-okio.pro',
+                    'proguard/proguard-rounded-image-view.pro',
+                    'proguard/proguard-glide.pro',
+                    'proguard/proguard-shortcutbadger.pro',
+                    'proguard/proguard-retrofit.pro',
+                    'proguard/proguard-webrtc.pro',
+                    'proguard/proguard-klinker.pro',
+                    'proguard/proguard-mobilecoin.pro',
+                    'proguard/proguard-retrolambda.pro',
+                    'proguard/proguard-okhttp.pro',
+                    'proguard/proguard-ez-vcard.pro',
+                    'proguard/proguard.cfg'
+            testProguardFiles 'proguard/proguard-automation.pro',
+                    'proguard/proguard.cfg'
+
+            manifestPlaceholders = [mapsKey:getMapsKey()]
+
+            buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Debug\""
+        }
+
+        instrumentation {
+            initWith debug
+            isDefault false
+            minifyEnabled false
+            matchingFallbacks = ['debug']
+            applicationIdSuffix ".instrumentation"
+
+            buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Instrumentation\""
+        }
+
+        spinner {
+            initWith debug
+            isDefault false
+            minifyEnabled false
+            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
+            debuggable false
+            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\""
+        }
+    }
+
+    productFlavors {
+        play {
+            dimension 'distribution'
+            isDefault true
+            ext.websiteUpdateUrl = "null"
+            buildConfigField "boolean", "PLAY_STORE_DISABLED", "false"
+            buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
+            buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"play\""
+        }
+
+        website {
+            dimension 'distribution'
+            ext.websiteUpdateUrl = "https://updates.signal.org/android"
+            buildConfigField "boolean", "PLAY_STORE_DISABLED", "true"
+            buildConfigField "String", "NOPLAY_UPDATE_URL", "\"$ext.websiteUpdateUrl\""
+            buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"website\""
+        }
+
+        nightly {
+            dimension 'distribution'
+            versionNameSuffix "-nightly-untagged-${getDateSuffix()}"
+            ext.websiteUpdateUrl = "null"
+            buildConfigField "boolean", "PLAY_STORE_DISABLED", "false"
+            buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
+            buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"nightly\""
+        }
+
+        prod {
+            dimension 'environment'
+
+            isDefault true
+
+            buildConfigField "String", "MOBILE_COIN_ENVIRONMENT", "\"mainnet\""
+            buildConfigField "String", "BUILD_ENVIRONMENT_TYPE", "\"Prod\""
+        }
+
+        staging {
+            dimension 'environment'
+
+            applicationIdSuffix ".staging"
+
+            buildConfigField "String", "SIGNAL_URL", "\"https://chat.staging.signal.org\""
+            buildConfigField "String", "STORAGE_URL", "\"https://storage-staging.signal.org\""
+            buildConfigField "String", "SIGNAL_CDN_URL", "\"https://cdn-staging.signal.org\""
+            buildConfigField "String", "SIGNAL_CDN2_URL", "\"https://cdn2-staging.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", "SIGNAL_SVR2_URL", "\"https://svr2.staging.signal.org\""
+            buildConfigField "String", "SVR2_MRENCLAVE", "\"a8a261420a6bb9b61aa25bf8a79e8bd20d7652531feb3381cbffd446d270be95\""
+            buildConfigField "org.thoughtcrime.securesms.KbsEnclave", "KBS_ENCLAVE", "new org.thoughtcrime.securesms.KbsEnclave(\"39963b736823d5780be96ab174869a9499d56d66497aa8f9b2244f777ebc366b\", " +
+                                                                                                                               "\"ee1d0d972b7ea903615670de43ab1b6e7a825e811c70a29bb5fe0f819e0975fa\", " +
+                                                                                                                               "\"45627094b2ea4a66f4cf0b182858a8dcf4b8479122c3820fe7fd0551a6d4cf5c\")"
+            buildConfigField "org.thoughtcrime.securesms.KbsEnclave[]", "KBS_FALLBACKS", "new org.thoughtcrime.securesms.KbsEnclave[] { new org.thoughtcrime.securesms.KbsEnclave(\"dd6f66d397d9e8cf6ec6db238e59a7be078dd50e9715427b9c89b409ffe53f99\", " +
+                                                                                                                                                                                 "\"4200003414528c151e2dccafbc87aa6d3d66a5eb8f8c05979a6e97cb33cd493a\", " +
+                                                                                                                                                                                 "\"ee19f1965b1eefa3dc4204eb70c04f397755f771b8c1909d080c04dad2a6a9ba\") }"
+            buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx\""
+            buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXZSSsOZ6s7M1+rTJN0bI5CKY2PX29y5Ok3jSWufIKcgKOnWoP67d5b2du2ZVJjpjfibNIHbT/cegy/sBLoFwtHogVYUewANUAXIaMPyCLRArsKhfJ5wBtTminG/PAvuBdJ70Z/bXVPf8TVsR292zQ65xwvWTejROW6AZX6aqucUj\""
+            buildConfigField "String", "GENERIC_SERVER_PUBLIC_PARAMS", "\"AHILOIrFPXX9laLbalbA9+L1CXpSbM/bTJXZGZiuyK1JaI6dK5FHHWL6tWxmHKYAZTSYmElmJ5z2A5YcirjO/yfoemE03FItyaf8W1fE4p14hzb5qnrmfXUSiAIVrhaXVwIwSzH6RL/+EO8jFIjJ/YfExfJ8aBl48CKHgu1+A6kWynhttonvWWx6h7924mIzW0Czj2ROuh4LwQyZypex4GuOPW8sgIT21KNZaafgg+KbV7XM1x1tF3XA17B4uGUaDbDw2O+nR1+U5p6qHPzmJ7ggFjSN6Utu+35dS1sS0P9N\""
+            buildConfigField "String", "MOBILE_COIN_ENVIRONMENT", "\"testnet\""
+            buildConfigField "String", "SIGNAL_CAPTCHA_URL", "\"https://signalcaptchas.org/staging/registration/generate.html\""
+            buildConfigField "String", "RECAPTCHA_PROOF_URL", "\"https://signalcaptchas.org/staging/challenge/generate.html\""
+
+            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 ->
+        variant.outputs.each { output ->
+            if (output.baseName.contains('nightly')) {
+                output.versionCodeOverride = canonicalVersionCode * postFixSize + 5
+                def tag = getCurrentGitTag()
+                if (tag != null && tag.length() > 0) {
+                    if (tag.startsWith("v")) {
+                        tag = tag.substring(1)
+                    }
+                    output.versionNameOverride = tag
+                }
+            } else {
+                output.outputFileName = output.outputFileName.replace(".apk", "-${variant.versionName}.apk")
+                def abiName = output.getFilter("ABI") ?: 'universal'
+                def postFix = abiPostFix.get(abiName, 0)
+
+                if (postFix >= postFixSize) throw new AssertionError("postFix is too large")
+
+                output.versionCodeOverride = canonicalVersionCode * postFixSize + postFix
+            }
+        }
+    }
+
+    android.variantFilter { variant ->
+        def distribution = variant.getFlavors().get(0).name
+        def environment  = variant.getFlavors().get(1).name
+        def buildType    = variant.buildType.name
+        def fullName     = distribution + environment.capitalize() + buildType.capitalize()
+
+        if (!selectableVariants.contains(fullName)) {
+            variant.setIgnore(true)
+        }
+    }
+
+    android.buildTypes.each {
+        if (it.name != 'release') {
+            sourceSets.findByName(it.name).java.srcDirs += "$projectDir/src/debug/java"
+        } else {
+            sourceSets.findByName(it.name).java.srcDirs += "$projectDir/src/release/java"
+        }
+    }
+}
+
+dependencies {
+    implementation libs.androidx.fragment.ktx
+    lintChecks project(':lintchecks')
+
+    coreLibraryDesugaring libs.android.tools.desugar
+
+    implementation (libs.androidx.appcompat) {
+        version {
+            strictly '1.6.1'
+        }
+    }
+    implementation libs.androidx.window.window
+    implementation libs.androidx.window.java
+    implementation libs.androidx.recyclerview
+    implementation libs.material.material
+    implementation libs.androidx.legacy.support
+    implementation libs.androidx.preference
+    implementation libs.androidx.legacy.preference
+    implementation libs.androidx.gridlayout
+    implementation libs.androidx.exifinterface
+    implementation libs.androidx.compose.rxjava3
+    implementation libs.androidx.compose.runtime.livedata
+    implementation libs.androidx.constraintlayout
+    implementation libs.androidx.multidex
+    implementation libs.androidx.navigation.fragment.ktx
+    implementation libs.androidx.navigation.ui.ktx
+    implementation libs.androidx.lifecycle.viewmodel.ktx
+    implementation libs.androidx.lifecycle.livedata.ktx
+    implementation libs.androidx.lifecycle.process
+    implementation libs.androidx.lifecycle.viewmodel.savedstate
+    implementation libs.androidx.lifecycle.common.java8
+    implementation libs.androidx.lifecycle.reactivestreams.ktx
+    implementation libs.androidx.camera.core
+    implementation libs.androidx.camera.camera2
+    implementation libs.androidx.camera.lifecycle
+    implementation libs.androidx.camera.view
+    implementation libs.androidx.concurrent.futures
+    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'
+        exclude group: 'com.google.firebase', module: 'firebase-analytics'
+        exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
+    }
+
+    implementation libs.google.play.services.maps
+    implementation libs.google.play.services.auth
+
+    implementation libs.bundles.exoplayer
+
+    implementation libs.conscrypt.android
+    implementation libs.signal.aesgcmprovider
+
+    implementation project(':libsignal-service')
+    implementation project(':paging')
+    implementation project(':core-util')
+    implementation project(':glide-config')
+    implementation project(':video')
+    implementation project(':device-transfer')
+    implementation project(':image-editor')
+    implementation project(':donations')
+    implementation project(':contacts')
+    implementation project(':qr')
+    implementation project(':sms-exporter')
+    implementation project(':sticky-header-grid')
+    implementation project(':photoview')
+
+    implementation libs.libsignal.android
+    implementation libs.google.protobuf.javalite
+
+    implementation(libs.mobilecoin) {
+        exclude group: 'com.google.protobuf'
+    }
+
+    implementation libs.signal.ringrtc
+
+    implementation libs.leolin.shortcutbadger
+    implementation libs.emilsjolander.stickylistheaders
+    implementation libs.apache.httpclient.android
+    implementation libs.glide.glide
+    implementation libs.roundedimageview
+    implementation libs.materialish.progress
+    implementation libs.greenrobot.eventbus
+    implementation libs.google.zxing.android.integration
+    implementation libs.google.zxing.core
+    implementation libs.google.flexbox
+    implementation (libs.subsampling.scale.image.view) {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    }
+    implementation (libs.android.tooltips) {
+        exclude group: 'com.android.support', module: 'appcompat-v7'
+    }
+    implementation (libs.android.smsmms) {
+        exclude group: 'com.squareup.okhttp', module: 'okhttp'
+        exclude group: 'com.squareup.okhttp', module: 'okhttp-urlconnection'
+    }
+    implementation libs.stream
+
+    implementation libs.lottie
+
+    implementation libs.signal.android.database.sqlcipher
+    implementation libs.androidx.sqlite
+
+    implementation (libs.google.ez.vcard) {
+        exclude group: 'com.fasterxml.jackson.core'
+        exclude group: 'org.freemarker'
+    }
+    implementation libs.dnsjava
+    implementation libs.kotlinx.collections.immutable
+    implementation libs.accompanist.permissions
+
+    spinnerImplementation project(":spinner")
+
+    canaryImplementation libs.square.leakcanary
+
+    testImplementation testLibs.junit.junit
+    testImplementation testLibs.assertj.core
+    testImplementation testLibs.mockito.core
+    testImplementation testLibs.mockito.kotlin
+
+    testImplementation testLibs.androidx.test.core
+    testImplementation (testLibs.robolectric.robolectric) {
+        exclude group: 'com.google.protobuf', module: 'protobuf-java'
+    }
+    testImplementation testLibs.robolectric.shadows.multidex
+    testImplementation (testLibs.bouncycastle.bcprov.jdk15on) { version { strictly "1.70" } } // Used by roboelectric
+    testImplementation (testLibs.bouncycastle.bcpkix.jdk15on) { version { strictly "1.70" } } // Used by roboelectric
+    testImplementation testLibs.hamcrest.hamcrest
+    testImplementation testLibs.mockk
+
+    testImplementation(testFixtures(project(":libsignal-service")))
+
+    androidTestImplementation testLibs.androidx.test.ext.junit
+    androidTestImplementation testLibs.espresso.core
+    androidTestImplementation testLibs.androidx.test.core
+    androidTestImplementation testLibs.androidx.test.core.ktx
+    androidTestImplementation testLibs.androidx.test.ext.junit.ktx
+    androidTestImplementation testLibs.mockito.android
+    androidTestImplementation testLibs.mockito.kotlin
+    androidTestImplementation testLibs.mockk.android
+    androidTestImplementation testLibs.square.okhttp.mockserver
+
+    instrumentationImplementation (libs.androidx.fragment.testing) {
+        exclude group: 'androidx.test', module: 'core'
+    }
+
+    testImplementation testLibs.espresso.core
+
+    implementation libs.kotlin.stdlib.jdk8
+    implementation libs.kotlin.reflect
+    implementation libs.jackson.module.kotlin
+
+    implementation libs.rxjava3.rxandroid
+    implementation libs.rxjava3.rxkotlin
+    implementation libs.rxdogtag
+
+    androidTestUtil testLibs.androidx.test.orchestrator
+
+    implementation project(':core-ui')
+    ktlintRuleset libs.ktlint.twitter.compose
+}
+
+def getLastCommitTimestamp() {
+    if (!(new File('.git').exists())) {
+        return System.currentTimeMillis().toString()
+    }
+
+    new ByteArrayOutputStream().withStream { os ->
+        exec {
+            executable = 'git'
+            args = ['log', '-1', '--pretty=format:%ct']
+            standardOutput = os
+        }
+
+        return os.toString() + "000"
+    }
+}
+
+def getGitHash() {
+    if (!(new File('.git').exists())) {
+        throw new IllegalStateException("Must be a git repository to guarantee reproducible builds! (git hash is part of APK)")
+    }
+
+    def stdout = new ByteArrayOutputStream()
+    exec {
+        commandLine 'git', 'rev-parse', 'HEAD'
+        standardOutput = stdout
+    }
+    return stdout.toString().trim().substring(0, 12)
+}
+
+def getCurrentGitTag() {
+    if (!(new File('.git').exists())) {
+        throw new IllegalStateException("Must be a git repository to guarantee reproducible builds! (git hash is part of APK)")
+    }
+
+    def stdout = new ByteArrayOutputStream()
+    exec {
+        commandLine 'git', 'tag', '--points-at', 'HEAD'
+        standardOutput = stdout
+    }
+
+    def output = stdout.toString().trim()
+
+    if (output != null && output.size() > 0) {
+        def tags = output.split('\n').toList()
+        return tags.stream().filter(t -> t.contains('nightly')).findFirst().orElse(tags.get(0))
+    } else {
+        return null
+    }
+}
+
+tasks.withType(Test) {
+    testLogging {
+        events "failed"
+        exceptionFormat "full"
+        showCauses true
+        showExceptions true
+        showStackTraces true
+    }
+}
+
+def loadKeystoreProperties(filename) {
+    def keystorePropertiesFile = file("${project.rootDir}/${filename}")
+    if (keystorePropertiesFile.exists()) {
+        def keystoreProperties = new Properties()
+        keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+        return keystoreProperties
+    } else {
+        return null
+    }
+}
+
+static def getDateSuffix() {
+    def date = new Date()
+    def formattedDate = date.format('yyyy-MM-dd-HH:mm')
+    return formattedDate
+}
+
+def getMapsKey() {
+    def mapKey = file("${project.rootDir}/maps.key")
+    if (mapKey.exists()) {
+        return mapKey.readLines()[0]
+    }
+    return "AIzaSyCSx9xea86GwDKGznCAULE9Y5a8b-TfN9U"
+}
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,743 +0,0 @@
-import com.android.build.api.dsl.ManagedVirtualDevice
-import org.gradle.api.tasks.testing.logging.TestExceptionFormat
-import java.io.ByteArrayOutputStream
-import java.io.FileInputStream
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Properties
-
-plugins {
-  id("com.android.application")
-  id("kotlin-android")
-  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("translations")
-  id("licenses")
-}
-
-apply(from = "static-ips.gradle.kts")
-
-val canonicalVersionCode = 1374
-val canonicalVersionName = "6.44.0"
-
-val postFixSize = 100
-val abiPostFix: Map<String, Int> = mapOf(
-  "universal" to 0,
-  "armeabi-v7a" to 1,
-  "arm64-v8a" to 2,
-  "x86" to 3,
-  "x86_64" to 4
-)
-
-val keystores: Map<String, Properties?> = mapOf("debug" to loadKeystoreProperties("keystore.debug.properties"))
-
-val selectableVariants = listOf(
-  "nightlyProdSpinner",
-  "nightlyProdPerf",
-  "nightlyProdRelease",
-  "nightlyStagingRelease",
-  "nightlyPnpPerf",
-  "nightlyPnpRelease",
-  "playProdDebug",
-  "playProdSpinner",
-  "playProdCanary",
-  "playProdPerf",
-  "playProdBenchmark",
-  "playProdInstrumentation",
-  "playProdRelease",
-  "playStagingDebug",
-  "playStagingCanary",
-  "playStagingSpinner",
-  "playStagingPerf",
-  "playStagingInstrumentation",
-  "playPnpDebug",
-  "playPnpSpinner",
-  "playStagingRelease",
-  "websiteProdSpinner",
-  "websiteProdRelease"
-)
-
-val signalBuildToolsVersion: String by rootProject.extra
-val signalCompileSdkVersion: String by rootProject.extra
-val signalTargetSdkVersion: Int by rootProject.extra
-val signalMinSdkVersion: Int by rootProject.extra
-val signalJavaVersion: JavaVersion by rootProject.extra
-val signalKotlinJvmTarget: String by rootProject.extra
-
-wire {
-  kotlin {
-    javaInterop = true
-  }
-
-  sourcePath {
-    srcDir("src/main/protowire")
-  }
-
-  protoPath {
-    srcDir("${project.rootDir}/libsignal-service/src/main/protowire")
-  }
-}
-
-ktlint {
-  version.set("0.49.1")
-}
-
-android {
-  namespace = "org.thoughtcrime.securesms"
-
-  buildToolsVersion = signalBuildToolsVersion
-  compileSdkVersion = signalCompileSdkVersion
-
-  flavorDimensions += listOf("distribution", "environment")
-  useLibrary("org.apache.http.legacy")
-  testBuildType = "instrumentation"
-
-  kotlinOptions {
-    jvmTarget = signalKotlinJvmTarget
-    freeCompilerArgs = listOf("-Xallow-result-return-type")
-  }
-
-  keystores["debug"]?.let { properties ->
-    signingConfigs.getByName("debug").apply {
-      storeFile = file("${project.rootDir}/${properties.getProperty("storeFile")}")
-      storePassword = properties.getProperty("storePassword")
-      keyAlias = properties.getProperty("keyAlias")
-      keyPassword = properties.getProperty("keyPassword")
-    }
-  }
-
-  testOptions {
-    execution = "ANDROIDX_TEST_ORCHESTRATOR"
-
-    unitTests {
-      isIncludeAndroidResources = true
-    }
-
-    managedDevices {
-      devices {
-        create<ManagedVirtualDevice>("pixel3api30") {
-          device = "Pixel 3"
-          apiLevel = 30
-          systemImageSource = "google-atd"
-          require64Bit = false
-        }
-      }
-    }
-  }
-
-  sourceSets {
-    getByName("test") {
-      java.srcDir("$projectDir/src/testShared")
-    }
-
-    getByName("androidTest") {
-      java.srcDir("$projectDir/src/testShared")
-    }
-  }
-
-  compileOptions {
-    isCoreLibraryDesugaringEnabled = true
-    sourceCompatibility = signalJavaVersion
-    targetCompatibility = signalJavaVersion
-  }
-
-  packagingOptions {
-    resources {
-      excludes += setOf("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.4.4"
-  }
-
-  defaultConfig {
-    versionCode = canonicalVersionCode * postFixSize
-    versionName = canonicalVersionName
-
-    minSdkVersion(signalMinSdkVersion)
-    targetSdkVersion(signalTargetSdkVersion)
-
-    multiDexEnabled = true
-
-    vectorDrawables.useSupportLibrary = true
-    project.ext.set("archivesBaseName", "Signal")
-
-    manifestPlaceholders["mapsKey"] = "AIzaSyCSx9xea86GwDKGznCAULE9Y5a8b-TfN9U"
-
-    buildConfigField("long", "BUILD_TIMESTAMP", getLastCommitTimestamp() + "L")
-    buildConfigField("String", "GIT_HASH", "\"${getGitHash()}\"")
-    buildConfigField("String", "SIGNAL_URL", "\"https://chat.signal.org\"")
-    buildConfigField("String", "STORAGE_URL", "\"https://storage.signal.org\"")
-    buildConfigField("String", "SIGNAL_CDN_URL", "\"https://cdn.signal.org\"")
-    buildConfigField("String", "SIGNAL_CDN2_URL", "\"https://cdn2.signal.org\"")
-    buildConfigField("String", "SIGNAL_CDN3_URL", "\"https://cdn3.signal.org\"")
-    buildConfigField("String", "SIGNAL_CDSI_URL", "\"https://cdsi.signal.org\"")
-    buildConfigField("String", "SIGNAL_SERVICE_STATUS_URL", "\"uptime.signal.org\"")
-    buildConfigField("String", "SIGNAL_KEY_BACKUP_URL", "\"https://api.backup.signal.org\"")
-    buildConfigField("String", "SIGNAL_SVR2_URL", "\"https://svr2.signal.org\"")
-    buildConfigField("String", "SIGNAL_SFU_URL", "\"https://sfu.voip.signal.org\"")
-    buildConfigField("String", "SIGNAL_STAGING_SFU_URL", "\"https://sfu.staging.voip.signal.org\"")
-    buildConfigField("String[]", "SIGNAL_SFU_INTERNAL_NAMES", "new String[]{\"Test\", \"Staging\", \"Development\"}")
-    buildConfigField("String[]", "SIGNAL_SFU_INTERNAL_URLS", "new String[]{\"https://sfu.test.voip.signal.org\", \"https://sfu.staging.voip.signal.org\", \"https://sfu.staging.test.voip.signal.org\"}")
-    buildConfigField("String", "CONTENT_PROXY_HOST", "\"contentproxy.signal.org\"")
-    buildConfigField("int", "CONTENT_PROXY_PORT", "443")
-    buildConfigField("String[]", "SIGNAL_SERVICE_IPS", rootProject.extra["service_ips"] as String)
-    buildConfigField("String[]", "SIGNAL_STORAGE_IPS", rootProject.extra["storage_ips"] as String)
-    buildConfigField("String[]", "SIGNAL_CDN_IPS", rootProject.extra["cdn_ips"] as String)
-    buildConfigField("String[]", "SIGNAL_CDN2_IPS", rootProject.extra["cdn2_ips"] as String)
-    buildConfigField("String[]", "SIGNAL_CDN3_IPS", rootProject.extra["cdn3_ips"] as String)
-    buildConfigField("String[]", "SIGNAL_SFU_IPS", rootProject.extra["sfu_ips"] as String)
-    buildConfigField("String[]", "SIGNAL_CONTENT_PROXY_IPS", rootProject.extra["content_proxy_ips"] as String)
-    buildConfigField("String[]", "SIGNAL_CDSI_IPS", rootProject.extra["cdsi_ips"] as String)
-    buildConfigField("String[]", "SIGNAL_SVR2_IPS", rootProject.extra["svr2_ips"] as String)
-    buildConfigField("String", "SIGNAL_AGENT", "\"OWA\"")
-    buildConfigField("String", "CDSI_MRENCLAVE", "\"0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57\"")
-    buildConfigField("String", "SVR2_MRENCLAVE_DEPRECATED", "\"6ee1042f9e20f880326686dd4ba50c25359f01e9f733eeba4382bca001d45094\"")
-    buildConfigField("String", "SVR2_MRENCLAVE", "\"a6622ad4656e1abcd0bc0ff17c229477747d2ded0495c4ebee7ed35c1789fa97\"")
-    buildConfigField("String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF\"")
-    buildConfigField("String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY/JYJHRooo5CEqYKBqdFnmbTVGEkCvJKxLnjwKWf+fEPoWeQFj5ObDjcKMZf2Jm2Ae69x+ikU5gBXsRmoF94GXTLfN0/vLt98KDPnxwAQL9j5V1jGOY8jQl6MLxEs56cwXN0dqCnImzVH3TZT1cJ8SW1BRX6qIVxEzjsSGx3yxF3suAilPMqGRp4ffyopjMD1JXiKR2RwLKzizUe5e8XyGOy9fplzhw3jVzTRyUZTRSZKkMLWcQ/gv0E4aONNqs4P+NameAZYOD12qRkxosQQP5uux6B2nRyZ7sAV54DgFyLiRcq1FvwKw2EPQdk4HDoePrO/RNUbyNddnM/mMgj4FW65xCoT1LmjrIjsv/Ggdlx46ueczhMgtBunx1/w8k8V+l8LVZ8gAT6wkU5J+DPQalQguMg12Jzug3q4TbdHiGCmD9EunCwOmsLuLJkz6EcSYXtrlDEnAM+hicw7iergYLLlMXpfTdGxJCWJmP4zqUFeTTmsmhsjGBt7NiEB/9pFFEB3pSbf4iiUukw63Eo8Aqnf4iwob6X1QviCWuc8t0I=\"")
-    buildConfigField("String", "GENERIC_SERVER_PUBLIC_PARAMS", "\"AByD873dTilmOSG0TjKrvpeaKEsUmIO8Vx9BeMmftwUs9v7ikPwM8P3OHyT0+X3EUMZrSe9VUp26Wai51Q9I8mdk0hX/yo7CeFGJyzoOqn8e/i4Ygbn5HoAyXJx5eXfIbqpc0bIxzju4H/HOQeOpt6h742qii5u/cbwOhFZCsMIbElZTaeU+BWMBQiZHIGHT5IE0qCordQKZ5iPZom0HeFa8Yq0ShuEyAl0WINBiY6xE3H/9WnvzXBbMuuk//eRxXgzO8ieCeK8FwQNxbfXqZm6Ro1cMhCOF3u7xoX83QhpN\"")
-    buildConfigField("String", "BACKUP_SERVER_PUBLIC_PARAMS", "\"AJwNSU55fsFCbgaxGRD11wO1juAs8Yr5GF8FPlGzzvdJJIKH5/4CC7ZJSOe3yL2vturVaRU2Cx0n751Vt8wkj1bozK3CBV1UokxV09GWf+hdVImLGjXGYLLhnI1J2TWEe7iWHyb553EEnRb5oxr9n3lUbNAJuRmFM7hrr0Al0F0wrDD4S8lo2mGaXe0MJCOM166F8oYRQqpFeEHfiLnxA1O8ZLh7vMdv4g9jI5phpRBTsJ5IjiJrWeP0zdIGHEssUeprDZ9OUJ14m0v61eYJMKsf59Bn+mAT2a7YfB+Don9O\"")
-    buildConfigField("String[]", "LANGUAGES", "new String[]{ ${languageList().map { "\"$it\"" }.joinToString(separator = ", ")} }")
-    buildConfigField("int", "CANONICAL_VERSION_CODE", "$canonicalVersionCode")
-    buildConfigField("String", "DEFAULT_CURRENCIES", "\"EUR,AUD,GBP,CAD,CNY\"")
-    buildConfigField("String", "GIPHY_API_KEY", "\"3o6ZsYH6U6Eri53TXy\"")
-    buildConfigField("String", "SIGNAL_CAPTCHA_URL", "\"https://signalcaptchas.org/registration/generate.html\"")
-    buildConfigField("String", "RECAPTCHA_PROOF_URL", "\"https://signalcaptchas.org/challenge/generate.html\"")
-
-    buildConfigField("String", "BUILD_DISTRIBUTION_TYPE", "\"unset\"")
-    buildConfigField("String", "BUILD_ENVIRONMENT_TYPE", "\"unset\"")
-    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 += listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
-    }
-    resourceConfigurations += listOf()
-
-    splits {
-      abi {
-        isEnable = !project.hasProperty("generateBaselineProfile")
-        reset()
-        include("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
-        isUniversalApk = true
-      }
-    }
-
-    testInstrumentationRunner = "org.thoughtcrime.securesms.testing.SignalTestRunner"
-    testInstrumentationRunnerArguments["clearPackageData"] = "true"
-  }
-
-  buildTypes {
-    getByName("debug") {
-      if (keystores["debug"] != null) {
-        signingConfig = signingConfigs["debug"]
-      }
-      isDefault = true
-      isMinifyEnabled = false
-      proguardFiles(
-        getDefaultProguardFile("proguard-android.txt"),
-        "proguard/proguard-firebase-messaging.pro",
-        "proguard/proguard-google-play-services.pro",
-        "proguard/proguard-jackson.pro",
-        "proguard/proguard-sqlite.pro",
-        "proguard/proguard-appcompat-v7.pro",
-        "proguard/proguard-square-okhttp.pro",
-        "proguard/proguard-square-okio.pro",
-        "proguard/proguard-rounded-image-view.pro",
-        "proguard/proguard-glide.pro",
-        "proguard/proguard-shortcutbadger.pro",
-        "proguard/proguard-retrofit.pro",
-        "proguard/proguard-webrtc.pro",
-        "proguard/proguard-klinker.pro",
-        "proguard/proguard-mobilecoin.pro",
-        "proguard/proguard-retrolambda.pro",
-        "proguard/proguard-okhttp.pro",
-        "proguard/proguard-ez-vcard.pro",
-        "proguard/proguard.cfg"
-      )
-      testProguardFiles(
-        "proguard/proguard-automation.pro",
-        "proguard/proguard.cfg"
-      )
-
-      manifestPlaceholders["mapsKey"] = getMapsKey()
-
-      buildConfigField("String", "BUILD_VARIANT_TYPE", "\"Debug\"")
-    }
-
-    getByName("release") {
-      isMinifyEnabled = true
-      proguardFiles(*buildTypes["debug"].proguardFiles.toTypedArray())
-      buildConfigField("String", "BUILD_VARIANT_TYPE", "\"Release\"")
-    }
-
-    create("instrumentation") {
-      initWith(getByName("debug"))
-      isDefault = false
-      isMinifyEnabled = false
-      matchingFallbacks += "debug"
-      applicationIdSuffix = ".instrumentation"
-
-      buildConfigField("String", "BUILD_VARIANT_TYPE", "\"Instrumentation\"")
-    }
-
-    create("spinner") {
-      initWith(getByName("debug"))
-      isDefault = false
-      isMinifyEnabled = false
-      matchingFallbacks += "debug"
-      buildConfigField("String", "BUILD_VARIANT_TYPE", "\"Spinner\"")
-    }
-
-    create("perf") {
-      initWith(getByName("debug"))
-      isDefault = false
-      isDebuggable = false
-      isMinifyEnabled = true
-      matchingFallbacks += "debug"
-      buildConfigField("String", "BUILD_VARIANT_TYPE", "\"Perf\"")
-      buildConfigField("boolean", "TRACING_ENABLED", "true")
-    }
-
-    create("benchmark") {
-      initWith(getByName("debug"))
-      isDefault = false
-      isDebuggable = false
-      isMinifyEnabled = true
-      matchingFallbacks += "debug"
-      buildConfigField("String", "BUILD_VARIANT_TYPE", "\"Benchmark\"")
-      buildConfigField("boolean", "TRACING_ENABLED", "true")
-    }
-
-    create("canary") {
-      initWith(getByName("debug"))
-      isDefault = false
-      isMinifyEnabled = false
-      matchingFallbacks += "debug"
-      buildConfigField("String", "BUILD_VARIANT_TYPE", "\"Canary\"")
-    }
-  }
-
-  productFlavors {
-    create("play") {
-      dimension = "distribution"
-      isDefault = true
-      buildConfigField("boolean", "MANAGES_APP_UPDATES", "false")
-      buildConfigField("String", "APK_UPDATE_MANIFEST_URL", "null")
-      buildConfigField("String", "BUILD_DISTRIBUTION_TYPE", "\"play\"")
-    }
-
-    create("website") {
-      dimension = "distribution"
-      buildConfigField("boolean", "MANAGES_APP_UPDATES", "true")
-      buildConfigField("String", "APK_UPDATE_MANIFEST_URL", "\"https://updates.signal.org/android/latest.json\"")
-      buildConfigField("String", "BUILD_DISTRIBUTION_TYPE", "\"website\"")
-    }
-
-    create("nightly") {
-      val apkUpdateManifestUrl = if (file("${project.rootDir}/nightly-url.txt").exists()) {
-        file("${project.rootDir}/nightly-url.txt").readText().trim()
-      } else {
-        "<unset>"
-      }
-
-      dimension = "distribution"
-      versionNameSuffix = "-nightly-untagged-${getDateSuffix()}"
-      buildConfigField("boolean", "MANAGES_APP_UPDATES", "true")
-      buildConfigField("String", "APK_UPDATE_MANIFEST_URL", "\"${apkUpdateManifestUrl}\"")
-      buildConfigField("String", "BUILD_DISTRIBUTION_TYPE", "\"nightly\"")
-    }
-
-    create("prod") {
-      dimension = "environment"
-
-      isDefault = true
-
-      buildConfigField("String", "MOBILE_COIN_ENVIRONMENT", "\"mainnet\"")
-      buildConfigField("String", "BUILD_ENVIRONMENT_TYPE", "\"Prod\"")
-    }
-
-    create("staging") {
-      dimension = "environment"
-
-      applicationIdSuffix = ".staging"
-
-      buildConfigField("String", "SIGNAL_URL", "\"https://chat.staging.signal.org\"")
-      buildConfigField("String", "STORAGE_URL", "\"https://storage-staging.signal.org\"")
-      buildConfigField("String", "SIGNAL_CDN_URL", "\"https://cdn-staging.signal.org\"")
-      buildConfigField("String", "SIGNAL_CDN2_URL", "\"https://cdn2-staging.signal.org\"")
-      buildConfigField("String", "SIGNAL_CDN3_URL", "\"https://cdn3-staging.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", "SIGNAL_SVR2_URL", "\"https://svr2.staging.signal.org\"")
-      buildConfigField("String", "SVR2_MRENCLAVE_DEPRECATED", "\"a8a261420a6bb9b61aa25bf8a79e8bd20d7652531feb3381cbffd446d270be95\"")
-      buildConfigField("String", "SVR2_MRENCLAVE", "\"acb1973aa0bbbd14b3b4e06f145497d948fd4a98efc500fcce363b3b743ec482\"")
-      buildConfigField("String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx\"")
-      buildConfigField("String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXZSSsOZ6s7M1+rTJN0bI5CKY2PX29y5Ok3jSWufIKcgKOnWoP67d5b2du2ZVJjpjfibNIHbT/cegy/sBLoFwtHogVYUewANUAXIaMPyCLRArsKhfJ5wBtTminG/PAvuBdJ70Z/bXVPf8TVsR292zQ65xwvWTejROW6AZX6aqucUjlENAErBme1YHmOSpU6tr6doJ66dPzVAWIanmO/5mgjNEDeK7DDqQdB1xd03HT2Qs2TxY3kCK8aAb/0iM0HQiXjxZ9HIgYhbtvGEnDKW5ILSUydqH/KBhW4Pb0jZWnqN/YgbWDKeJxnDbYcUob5ZY5Lt5ZCMKuaGUvCJRrCtuugSMaqjowCGRempsDdJEt+cMaalhZ6gczklJB/IbdwENW9KeVFPoFNFzhxWUIS5ML9riVYhAtE6JE5jX0xiHNVIIPthb458cfA8daR0nYfYAUKogQArm0iBezOO+mPk5vCM=\"")
-      buildConfigField("String", "GENERIC_SERVER_PUBLIC_PARAMS", "\"AHILOIrFPXX9laLbalbA9+L1CXpSbM/bTJXZGZiuyK1JaI6dK5FHHWL6tWxmHKYAZTSYmElmJ5z2A5YcirjO/yfoemE03FItyaf8W1fE4p14hzb5qnrmfXUSiAIVrhaXVwIwSzH6RL/+EO8jFIjJ/YfExfJ8aBl48CKHgu1+A6kWynhttonvWWx6h7924mIzW0Czj2ROuh4LwQyZypex4GuOPW8sgIT21KNZaafgg+KbV7XM1x1tF3XA17B4uGUaDbDw2O+nR1+U5p6qHPzmJ7ggFjSN6Utu+35dS1sS0P9N\"")
-      buildConfigField("String", "BACKUP_SERVER_PUBLIC_PARAMS", "\"AHYrGb9IfugAAJiPKp+mdXUx+OL9zBolPYHYQz6GI1gWjpEu5me3zVNSvmYY4zWboZHif+HG1sDHSuvwFd0QszSwuSF4X4kRP3fJREdTZ5MCR0n55zUppTwfHRW2S4sdQ0JGz7YDQIJCufYSKh0pGNEHL6hv79Agrdnr4momr3oXdnkpVBIp3HWAQ6IbXQVSG18X36GaicI1vdT0UFmTwU2KTneluC2eyL9c5ff8PcmiS+YcLzh0OKYQXB5ZfQ06d6DiINvDQLy75zcfUOniLAj0lGJiHxGczin/RXisKSR8\"")
-      buildConfigField("String", "MOBILE_COIN_ENVIRONMENT", "\"testnet\"")
-      buildConfigField("String", "SIGNAL_CAPTCHA_URL", "\"https://signalcaptchas.org/staging/registration/generate.html\"")
-      buildConfigField("String", "RECAPTCHA_PROOF_URL", "\"https://signalcaptchas.org/staging/challenge/generate.html\"")
-
-      buildConfigField("String", "BUILD_ENVIRONMENT_TYPE", "\"Staging\"")
-      buildConfigField("String", "STRIPE_PUBLISHABLE_KEY", "\"pk_test_sngOd8FnXNkpce9nPXawKrJD00kIDngZkD\"")
-    }
-
-    create("pnp") {
-      dimension = "environment"
-
-      initWith(getByName("staging"))
-      applicationIdSuffix = ".pnp"
-
-      buildConfigField("String", "BUILD_ENVIRONMENT_TYPE", "\"Pnp\"")
-    }
-  }
-
-  lint {
-    abortOnError = true
-    baseline = file("lint-baseline.xml")
-    checkReleaseBuilds = false
-    disable += "LintError"
-  }
-
-  applicationVariants.all {
-    val variant = this
-
-    variant.outputs
-      .map { it as com.android.build.gradle.internal.api.ApkVariantOutputImpl }
-      .forEach { output ->
-        if (output.baseName.contains("nightly")) {
-          output.versionCodeOverride = canonicalVersionCode * postFixSize + 5
-          var tag = getCurrentGitTag()
-          if (!tag.isNullOrEmpty()) {
-            if (tag.startsWith("v")) {
-              tag = tag.substring(1)
-            }
-            output.versionNameOverride = tag
-            output.outputFileName = output.outputFileName.replace(".apk", "-${output.versionNameOverride}.apk")
-          } else {
-            output.outputFileName = output.outputFileName.replace(".apk", "-${variant.versionName}.apk")
-          }
-        } else {
-          output.outputFileName = output.outputFileName.replace(".apk", "-${variant.versionName}.apk")
-
-          val abiName: String = output.getFilter("ABI") ?: "universal"
-          val postFix: Int = abiPostFix[abiName]!!
-
-          if (postFix >= postFixSize) {
-            throw AssertionError("postFix is too large")
-          }
-
-          output.versionCodeOverride = canonicalVersionCode * postFixSize + postFix
-        }
-      }
-  }
-
-  android.variantFilter {
-    val distribution: String = flavors[0].name
-    val environment: String = flavors[1].name
-    val buildType: String = buildType.name
-    val fullName: String = distribution + environment.capitalize() + buildType.capitalize()
-
-    if (!selectableVariants.contains(fullName)) {
-      ignore = true
-    }
-  }
-
-  android.buildTypes.forEach {
-    val path: String = if (it.name == "release") {
-      "$projectDir/src/release/java"
-    } else {
-      "$projectDir/src/debug/java"
-    }
-
-    sourceSets.findByName(it.name)!!.java.srcDir(path)
-  }
-}
-
-dependencies {
-  lintChecks(project(":lintchecks"))
-  ktlintRuleset(libs.ktlint.twitter.compose)
-  coreLibraryDesugaring(libs.android.tools.desugar)
-
-  implementation(project(":libsignal-service"))
-  implementation(project(":paging"))
-  implementation(project(":core-util"))
-  implementation(project(":glide-config"))
-  implementation(project(":video"))
-  implementation(project(":device-transfer"))
-  implementation(project(":image-editor"))
-  implementation(project(":donations"))
-  implementation(project(":contacts"))
-  implementation(project(":qr"))
-  implementation(project(":sms-exporter"))
-  implementation(project(":sticky-header-grid"))
-  implementation(project(":photoview"))
-  implementation(project(":glide-webp"))
-  implementation(project(":core-ui"))
-
-  implementation(libs.androidx.fragment.ktx)
-  implementation(libs.androidx.appcompat) {
-    version {
-      strictly("1.6.1")
-    }
-  }
-  implementation(libs.androidx.window.window)
-  implementation(libs.androidx.window.java)
-  implementation(libs.androidx.recyclerview)
-  implementation(libs.material.material)
-  implementation(libs.androidx.legacy.support)
-  implementation(libs.androidx.preference)
-  implementation(libs.androidx.legacy.preference)
-  implementation(libs.androidx.gridlayout)
-  implementation(libs.androidx.exifinterface)
-  implementation(libs.androidx.compose.rxjava3)
-  implementation(libs.androidx.compose.runtime.livedata)
-  implementation(libs.androidx.constraintlayout)
-  implementation(libs.androidx.multidex)
-  implementation(libs.androidx.navigation.fragment.ktx)
-  implementation(libs.androidx.navigation.ui.ktx)
-  implementation(libs.androidx.lifecycle.viewmodel.ktx)
-  implementation(libs.androidx.lifecycle.livedata.ktx)
-  implementation(libs.androidx.lifecycle.process)
-  implementation(libs.androidx.lifecycle.viewmodel.savedstate)
-  implementation(libs.androidx.lifecycle.common.java8)
-  implementation(libs.androidx.lifecycle.reactivestreams.ktx)
-  implementation(libs.androidx.camera.core)
-  implementation(libs.androidx.camera.camera2)
-  implementation(libs.androidx.camera.lifecycle)
-  implementation(libs.androidx.camera.view)
-  implementation(libs.androidx.concurrent.futures)
-  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")
-    exclude(group = "com.google.firebase", module = "firebase-analytics")
-    exclude(group = "com.google.firebase", module = "firebase-measurement-connector")
-  }
-  implementation(libs.google.play.services.maps)
-  implementation(libs.google.play.services.auth)
-  implementation(libs.bundles.media3)
-  implementation(libs.conscrypt.android)
-  implementation(libs.signal.aesgcmprovider)
-  implementation(libs.libsignal.android)
-  implementation(libs.mobilecoin)
-  implementation(libs.signal.ringrtc)
-  implementation(libs.leolin.shortcutbadger)
-  implementation(libs.emilsjolander.stickylistheaders)
-  implementation(libs.apache.httpclient.android)
-  implementation(libs.glide.glide)
-  implementation(libs.roundedimageview)
-  implementation(libs.materialish.progress)
-  implementation(libs.greenrobot.eventbus)
-  implementation(libs.google.zxing.android.integration)
-  implementation(libs.google.zxing.core)
-  implementation(libs.google.flexbox)
-  implementation(libs.subsampling.scale.image.view) {
-    exclude(group = "com.android.support", module = "support-annotations")
-  }
-  implementation(libs.android.tooltips) {
-    exclude(group = "com.android.support", module = "appcompat-v7")
-  }
-  implementation(libs.android.smsmms) {
-    exclude(group = "com.squareup.okhttp", module = "okhttp")
-    exclude(group = "com.squareup.okhttp", module = "okhttp-urlconnection")
-  }
-  implementation(libs.stream)
-  implementation(libs.lottie)
-  implementation(libs.signal.android.database.sqlcipher)
-  implementation(libs.androidx.sqlite)
-  implementation(libs.google.ez.vcard) {
-    exclude(group = "com.fasterxml.jackson.core")
-    exclude(group = "org.freemarker")
-  }
-  implementation(libs.dnsjava)
-  implementation(libs.kotlinx.collections.immutable)
-  implementation(libs.accompanist.permissions)
-  implementation(libs.kotlin.stdlib.jdk8)
-  implementation(libs.kotlin.reflect)
-  implementation(libs.jackson.module.kotlin)
-  implementation(libs.rxjava3.rxandroid)
-  implementation(libs.rxjava3.rxkotlin)
-  implementation(libs.rxdogtag)
-
-  "spinnerImplementation"(project(":spinner"))
-
-  "canaryImplementation"(libs.square.leakcanary)
-
-  "instrumentationImplementation"(libs.androidx.fragment.testing) {
-    exclude(group = "androidx.test", module = "core")
-  }
-
-  testImplementation(testLibs.junit.junit)
-  testImplementation(testLibs.assertj.core)
-  testImplementation(testLibs.mockito.core)
-  testImplementation(testLibs.mockito.kotlin)
-  testImplementation(testLibs.androidx.test.core)
-  testImplementation(testLibs.robolectric.robolectric) {
-    exclude(group = "com.google.protobuf", module = "protobuf-java")
-  }
-  testImplementation(testLibs.robolectric.shadows.multidex)
-  testImplementation(testLibs.bouncycastle.bcprov.jdk15on) {
-    version {
-      strictly("1.70")
-    }
-  }
-  testImplementation(testLibs.bouncycastle.bcpkix.jdk15on) {
-    version {
-      strictly("1.70")
-    }
-  }
-  testImplementation(testLibs.conscrypt.openjdk.uber)
-  testImplementation(testLibs.hamcrest.hamcrest)
-  testImplementation(testLibs.mockk)
-  testImplementation(testFixtures(project(":libsignal-service")))
-  testImplementation(testLibs.espresso.core)
-
-  androidTestImplementation(testLibs.androidx.test.ext.junit)
-  androidTestImplementation(testLibs.espresso.core)
-  androidTestImplementation(testLibs.androidx.test.core)
-  androidTestImplementation(testLibs.androidx.test.core.ktx)
-  androidTestImplementation(testLibs.androidx.test.ext.junit.ktx)
-  androidTestImplementation(testLibs.mockito.android)
-  androidTestImplementation(testLibs.mockito.kotlin)
-  androidTestImplementation(testLibs.mockk.android)
-  androidTestImplementation(testLibs.square.okhttp.mockserver)
-
-  androidTestUtil(testLibs.androidx.test.orchestrator)
-}
-
-fun assertIsGitRepo() {
-  if (!file("${project.rootDir}/.git").exists()) {
-    throw IllegalStateException("Must be a git repository to guarantee reproducible builds! (git hash is part of APK)")
-  }
-}
-
-fun getLastCommitTimestamp(): String {
-  assertIsGitRepo()
-
-  ByteArrayOutputStream().use { os ->
-    exec {
-      executable = "git"
-      args = listOf("log", "-1", "--pretty=format:%ct")
-      standardOutput = os
-    }
-
-    return os.toString() + "000"
-  }
-}
-
-fun getGitHash(): String {
-  assertIsGitRepo()
-
-  val stdout = ByteArrayOutputStream()
-  exec {
-    commandLine = listOf("git", "rev-parse", "HEAD")
-    standardOutput = stdout
-  }
-
-  return stdout.toString().trim().substring(0, 12)
-}
-
-fun getCurrentGitTag(): String? {
-  assertIsGitRepo()
-
-  val stdout = ByteArrayOutputStream()
-  exec {
-    commandLine = listOf("git", "tag", "--points-at", "HEAD")
-    standardOutput = stdout
-  }
-
-  val output: String = stdout.toString().trim()
-
-  return if (output.isNotEmpty()) {
-    val tags = output.split("\n").toList()
-    tags.firstOrNull { it.contains("nightly") } ?: tags[0]
-  } else {
-    null
-  }
-}
-
-tasks.withType<Test>().configureEach {
-  testLogging {
-    events("failed")
-    exceptionFormat = TestExceptionFormat.FULL
-    showCauses = true
-    showExceptions = true
-    showStackTraces = true
-  }
-}
-
-project.tasks.configureEach {
-  if (name.lowercase().contains("nightly") && name != "checkNightlyParams") {
-    dependsOn(tasks.getByName("checkNightlyParams"))
-  }
-}
-
-tasks.register("checkNightlyParams") {
-  doFirst {
-    if (project.gradle.startParameter.taskNames.any { it.lowercase().contains("nightly") }) {
-
-      if (!file("${project.rootDir}/nightly-url.txt").exists()) {
-        throw GradleException("Cannot find 'nightly-url.txt' for nightly build! It must exist in the root of this project and contain the location of the nightly manifest.")
-      }
-    }
-  }
-}
-
-fun loadKeystoreProperties(filename: String): Properties? {
-  val keystorePropertiesFile = file("${project.rootDir}/$filename")
-
-  return if (keystorePropertiesFile.exists()) {
-    val keystoreProperties = Properties()
-    keystoreProperties.load(FileInputStream(keystorePropertiesFile))
-    keystoreProperties
-  } else {
-    null
-  }
-}
-
-fun getDateSuffix(): String {
-  return SimpleDateFormat("yyyy-MM-dd-HH:mm").format(Date())
-}
-
-fun getMapsKey(): String {
-  val mapKey = file("${project.rootDir}/maps.key")
-
-  return if (mapKey.exists()) {
-    mapKey.readLines()[0]
-  } else {
-    "AIzaSyCSx9xea86GwDKGznCAULE9Y5a8b-TfN9U"
-  }
-}
-
-fun Project.languageList(): List<String> {
-  return fileTree("src/main/res") { include("**/strings.xml") }
-    .map { stringFile -> stringFile.parentFile.name }
-    .map { valuesFolderName -> valuesFolderName.replace("values-", "") }
-    .filter { valuesFolderName -> valuesFolderName != "values" }
-    .map { languageCode -> languageCode.replace("-r", "_") }
-    .distinct() + "en"
-}
-
-fun String.capitalize(): String {
-  return this.replaceFirstChar { it.uppercase() }
-}
--- a/app/proguard/proguard.cfg
+++ b/app/proguard/proguard.cfg
@@ -4,7 +4,6 @@
 -keep class org.whispersystems.** { *; }
 -keep class org.signal.libsignal.protocol.** { *; }
 -keep class org.thoughtcrime.securesms.** { *; }
-keep class org.signal.donations.json.** { *; }
 -keepclassmembers class ** {
    public void onEvent*(**);
 }
--- a/app/src/androidTest/assets/images/sample_image.png
+++ b/app/src/androidTest/assets/images/sample_image.png
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/SignalInstrumentationApplicationContext.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/SignalInstrumentationApplicationContext.kt
@@ -26,13 +26,15 @@ class SignalInstrumentationApplicationContext : ApplicationContext() {
  }

  override fun initializeLogging() {
-    Log.initialize({ true }, AndroidLogger(), PersistentLogger(this), inMemoryLogger)
+    persistentLogger = PersistentLogger(this)
+
+    Log.initialize({ true }, AndroidLogger(), persistentLogger, inMemoryLogger)

    SignalProtocolLoggerProvider.setProvider(CustomSignalProtocolLogger())

    SignalExecutors.UNBOUNDED.execute {
      Log.blockUntilAllWritesFinished()
-      LogDatabase.getInstance(this).logs.trimToSize()
+      LogDatabase.getInstance(this).trimToSize()
    }
  }
 }
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/BackupTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/BackupTest.kt
@@ -1,675 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.backup.v2
-
-import android.content.ContentValues
-import android.database.Cursor
-import androidx.core.content.contentValuesOf
-import net.zetetic.database.sqlcipher.SQLiteDatabase
-import org.junit.Before
-import org.junit.Test
-import org.signal.core.util.Hex
-import org.signal.core.util.SqlUtil
-import org.signal.core.util.insertInto
-import org.signal.core.util.readToList
-import org.signal.core.util.readToSingleObject
-import org.signal.core.util.requireBlob
-import org.signal.core.util.requireLong
-import org.signal.core.util.requireString
-import org.signal.core.util.select
-import org.signal.core.util.toInt
-import org.signal.core.util.withinTransaction
-import org.signal.libsignal.zkgroup.profiles.ProfileKey
-import org.thoughtcrime.securesms.backup.v2.database.clearAllDataForBackupRestore
-import org.thoughtcrime.securesms.database.CallTable
-import org.thoughtcrime.securesms.database.EmojiSearchTable
-import org.thoughtcrime.securesms.database.MessageTable
-import org.thoughtcrime.securesms.database.MessageTypes
-import org.thoughtcrime.securesms.database.RecipientTable
-import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.keyvalue.PhoneNumberPrivacyValues
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.mms.QuoteModel
-import org.thoughtcrime.securesms.profiles.ProfileName
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.subscription.Subscriber
-import org.thoughtcrime.securesms.testing.assertIs
-import org.thoughtcrime.securesms.util.TextSecurePreferences
-import org.whispersystems.signalservice.api.push.ServiceId.ACI
-import org.whispersystems.signalservice.api.push.ServiceId.PNI
-import org.whispersystems.signalservice.api.subscriptions.SubscriberId
-import java.io.ByteArrayInputStream
-import java.util.UUID
-import kotlin.random.Random
-
-typealias DatabaseData = Map<String, List<Map<String, Any?>>>
-
-class BackupTest {
-  companion object {
-    val SELF_ACI = ACI.from(UUID.fromString("77770000-b477-4f35-a824-d92987a63641"))
-    val SELF_PNI = PNI.from(UUID.fromString("77771111-b014-41fb-bf73-05cb2ec52910"))
-    const val SELF_E164 = "+10000000000"
-    val SELF_PROFILE_KEY = ProfileKey(Random.nextBytes(32))
-
-    val ALICE_ACI = ACI.from(UUID.fromString("aaaa0000-5a76-47fa-a98a-7e72c948a82e"))
-    val ALICE_PNI = PNI.from(UUID.fromString("aaaa1111-c960-4f6c-8385-671ad2ffb999"))
-    val ALICE_E164 = "+12222222222"
-
-    /** Columns that we don't need to check equality of */
-    private val IGNORED_COLUMNS: Map<String, Set<String>> = mapOf(
-      RecipientTable.TABLE_NAME to setOf(RecipientTable.STORAGE_SERVICE_ID),
-      MessageTable.TABLE_NAME to setOf(MessageTable.FROM_DEVICE_ID)
-    )
-
-    /** Tables we don't need to check equality of */
-    private val IGNORED_TABLES: Set<String> = setOf(
-      EmojiSearchTable.TABLE_NAME,
-      "sqlite_sequence",
-      "message_fts_data",
-      "message_fts_idx",
-      "message_fts_docsize"
-    )
-  }
-
-  @Before
-  fun setup() {
-    SignalStore.account().setE164(SELF_E164)
-    SignalStore.account().setAci(SELF_ACI)
-    SignalStore.account().setPni(SELF_PNI)
-    SignalStore.account().generateAciIdentityKeyIfNecessary()
-    SignalStore.account().generatePniIdentityKeyIfNecessary()
-  }
-
-  @Test
-  fun emptyDatabase() {
-    backupTest { }
-  }
-
-  @Test
-  fun noteToSelf() {
-    backupTest {
-      individualChat(aci = SELF_ACI, givenName = "Note to Self") {
-        standardMessage(outgoing = true, body = "A")
-        standardMessage(outgoing = true, body = "B")
-        standardMessage(outgoing = true, body = "C")
-      }
-    }
-  }
-
-  @Test
-  fun individualChat() {
-    backupTest {
-      individualChat(aci = ALICE_ACI, givenName = "Alice") {
-        val m1 = standardMessage(outgoing = true, body = "Outgoing 1")
-        val m2 = standardMessage(outgoing = false, body = "Incoming 1", read = true)
-        standardMessage(outgoing = true, body = "Outgoing 2", quotes = m2)
-        standardMessage(outgoing = false, body = "Incoming 2", quotes = m1, quoteTargetMissing = true, read = false)
-        standardMessage(outgoing = true, body = "Outgoing 3, with mention", randomMention = true)
-        standardMessage(outgoing = false, body = "Incoming 3, with style", read = false, randomStyling = true)
-        remoteDeletedMessage(outgoing = true)
-        remoteDeletedMessage(outgoing = false)
-      }
-    }
-  }
-
-  @Test
-  fun individualRecipients() {
-    backupTest {
-      // Comprehensive example
-      individualRecipient(
-        aci = ALICE_ACI,
-        pni = ALICE_PNI,
-        e164 = ALICE_E164,
-        givenName = "Alice",
-        familyName = "Smith",
-        username = "alice.99",
-        hidden = false,
-        registeredState = RecipientTable.RegisteredState.REGISTERED,
-        profileKey = ProfileKey(Random.nextBytes(32)),
-        profileSharing = true,
-        hideStory = false
-      )
-
-      // Trying to get coverage of all the various values
-      individualRecipient(aci = ACI.from(UUID.randomUUID()), registeredState = RecipientTable.RegisteredState.NOT_REGISTERED)
-      individualRecipient(aci = ACI.from(UUID.randomUUID()), registeredState = RecipientTable.RegisteredState.UNKNOWN)
-      individualRecipient(pni = PNI.from(UUID.randomUUID()))
-      individualRecipient(e164 = "+15551234567")
-      individualRecipient(aci = ACI.from(UUID.randomUUID()), givenName = "Bob")
-      individualRecipient(aci = ACI.from(UUID.randomUUID()), familyName = "Smith")
-      individualRecipient(aci = ACI.from(UUID.randomUUID()), profileSharing = false)
-      individualRecipient(aci = ACI.from(UUID.randomUUID()), hideStory = true)
-      individualRecipient(aci = ACI.from(UUID.randomUUID()), hidden = true)
-    }
-  }
-
-  @Test
-  fun individualCallLogs() {
-    backupTest {
-      val aliceId = individualRecipient(
-        aci = ALICE_ACI,
-        pni = ALICE_PNI,
-        e164 = ALICE_E164,
-        givenName = "Alice",
-        familyName = "Smith",
-        username = "alice.99",
-        hidden = false,
-        registeredState = RecipientTable.RegisteredState.REGISTERED,
-        profileKey = ProfileKey(Random.nextBytes(32)),
-        profileSharing = true,
-        hideStory = false
-      )
-      insertOneToOneCallVariations(1, 1, aliceId)
-    }
-  }
-
-  private fun insertOneToOneCallVariations(callId: Long, timestamp: Long, id: RecipientId): Long {
-    val directions = arrayOf(CallTable.Direction.INCOMING, CallTable.Direction.OUTGOING)
-    val callTypes = arrayOf(CallTable.Type.AUDIO_CALL, CallTable.Type.VIDEO_CALL)
-    val events = arrayOf(
-      CallTable.Event.MISSED,
-      CallTable.Event.OUTGOING_RING,
-      CallTable.Event.ONGOING,
-      CallTable.Event.ACCEPTED,
-      CallTable.Event.NOT_ACCEPTED
-    )
-    var callTimestamp: Long = timestamp
-    var currentCallId = callId
-    for (direction in directions) {
-      for (event in events) {
-        for (type in callTypes) {
-          insertOneToOneCall(callId = currentCallId, callTimestamp, id, type, direction, event)
-          callTimestamp++
-          currentCallId++
-        }
-      }
-    }
-
-    return currentCallId
-  }
-
-  private fun insertOneToOneCall(callId: Long, timestamp: Long, peer: RecipientId, type: CallTable.Type, direction: CallTable.Direction, event: CallTable.Event) {
-    val messageType: Long = CallTable.Call.getMessageType(type, direction, event)
-
-    SignalDatabase.rawDatabase.withinTransaction {
-      val recipient = Recipient.resolved(peer)
-      val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
-      val outgoing = direction == CallTable.Direction.OUTGOING
-
-      val messageValues = contentValuesOf(
-        MessageTable.FROM_RECIPIENT_ID to if (outgoing) Recipient.self().id.serialize() else peer.serialize(),
-        MessageTable.FROM_DEVICE_ID to 1,
-        MessageTable.TO_RECIPIENT_ID to if (outgoing) peer.serialize() else Recipient.self().id.serialize(),
-        MessageTable.DATE_RECEIVED to timestamp,
-        MessageTable.DATE_SENT to timestamp,
-        MessageTable.READ to 1,
-        MessageTable.TYPE to messageType,
-        MessageTable.THREAD_ID to threadId
-      )
-
-      val messageId = SignalDatabase.rawDatabase.insert(MessageTable.TABLE_NAME, null, messageValues)
-
-      val values = contentValuesOf(
-        CallTable.CALL_ID to callId,
-        CallTable.MESSAGE_ID to messageId,
-        CallTable.PEER to peer.serialize(),
-        CallTable.TYPE to CallTable.Type.serialize(type),
-        CallTable.DIRECTION to CallTable.Direction.serialize(direction),
-        CallTable.EVENT to CallTable.Event.serialize(event),
-        CallTable.TIMESTAMP to timestamp
-      )
-
-      SignalDatabase.rawDatabase.insert(CallTable.TABLE_NAME, null, values)
-
-      SignalDatabase.threads.update(threadId, true)
-    }
-  }
-
-  @Test
-  fun accountData() {
-    val context = ApplicationDependencies.getApplication()
-
-    backupTest(validateKeyValue = true) {
-      val self = Recipient.self()
-
-      // TODO note-to-self archived
-      // TODO note-to-self unread
-
-      SignalStore.account().setAci(SELF_ACI)
-      SignalStore.account().setPni(SELF_PNI)
-      SignalStore.account().setE164(SELF_E164)
-      SignalStore.account().generateAciIdentityKeyIfNecessary()
-      SignalStore.account().generatePniIdentityKeyIfNecessary()
-
-      SignalDatabase.recipients.setProfileKey(self.id, ProfileKey(Random.nextBytes(32)))
-      SignalDatabase.recipients.setProfileName(self.id, ProfileName.fromParts("Peter", "Parker"))
-      SignalDatabase.recipients.setProfileAvatar(self.id, "https://example.com/")
-
-      SignalStore.donationsValues().markUserManuallyCancelled()
-      SignalStore.donationsValues().setSubscriber(Subscriber(SubscriberId.generate(), "USD"))
-      SignalStore.donationsValues().setDisplayBadgesOnProfile(false)
-
-      SignalStore.phoneNumberPrivacy().phoneNumberListingMode = PhoneNumberPrivacyValues.PhoneNumberListingMode.UNLISTED
-      SignalStore.phoneNumberPrivacy().phoneNumberSharingMode = PhoneNumberPrivacyValues.PhoneNumberSharingMode.NOBODY
-
-      SignalStore.settings().isLinkPreviewsEnabled = false
-      SignalStore.settings().isPreferSystemContactPhotos = true
-      SignalStore.settings().universalExpireTimer = 42
-      SignalStore.settings().setKeepMutedChatsArchived(true)
-
-      SignalStore.storyValues().viewedReceiptsEnabled = false
-      SignalStore.storyValues().userHasViewedOnboardingStory = true
-      SignalStore.storyValues().isFeatureDisabled = false
-      SignalStore.storyValues().userHasBeenNotifiedAboutStories = true
-      SignalStore.storyValues().userHasSeenGroupStoryEducationSheet = true
-
-      SignalStore.emojiValues().reactions = listOf("a", "b", "c")
-
-      TextSecurePreferences.setTypingIndicatorsEnabled(context, false)
-      TextSecurePreferences.setReadReceiptsEnabled(context, false)
-      TextSecurePreferences.setShowUnidentifiedDeliveryIndicatorsEnabled(context, true)
-    }
-
-    // Have to check TextSecurePreferences ourselves, since they're not in a database
-    TextSecurePreferences.isTypingIndicatorsEnabled(context) assertIs false
-    TextSecurePreferences.isReadReceiptsEnabled(context) assertIs false
-    TextSecurePreferences.isShowUnidentifiedDeliveryIndicatorsEnabled(context) assertIs true
-  }
-
-  /**
-   * Sets up the database, then executes your setup code, then compares snapshots of the database
-   * before an after an import to ensure that no data was lost/changed.
-   *
-   * @param validateKeyValue If true, this will also validate the KeyValueDatabase. You only want to do this if you
-   *    intend on setting most of the values. Otherwise stuff tends to not match since values are lazily written.
-   */
-  private fun backupTest(validateKeyValue: Boolean = false, content: () -> Unit) {
-    // Under normal circumstances, My Story ends up being the first recipient in the table, and is added automatically.
-    // This screws with the tests by offsetting all the recipientIds in the initial state.
-    // Easiest way to get around this is to make the DB a true clean slate by clearing everything.
-    // (We only really need to clear Recipient/dlists, but doing everything to be consistent.)
-    SignalDatabase.distributionLists.clearAllDataForBackupRestore()
-    SignalDatabase.recipients.clearAllDataForBackupRestore()
-    SignalDatabase.messages.clearAllDataForBackupRestore()
-    SignalDatabase.threads.clearAllDataForBackupRestore()
-
-    // Again, for comparison purposes, because we always import self first, we want to ensure it's the first item
-    // in the table when we export.
-    individualRecipient(
-      aci = SELF_ACI,
-      pni = SELF_PNI,
-      e164 = SELF_E164,
-      profileKey = SELF_PROFILE_KEY,
-      profileSharing = true
-    )
-
-    content()
-
-    val startingMainData: DatabaseData = SignalDatabase.rawDatabase.readAllContents()
-    val startingKeyValueData: DatabaseData = if (validateKeyValue) SignalDatabase.rawDatabase.readAllContents() else emptyMap()
-
-    val exported: ByteArray = BackupRepository.export()
-    BackupRepository.import(length = exported.size.toLong(), inputStreamFactory = { ByteArrayInputStream(exported) }, selfData = BackupRepository.SelfData(SELF_ACI, SELF_PNI, SELF_E164, SELF_PROFILE_KEY))
-
-    val endingData: DatabaseData = SignalDatabase.rawDatabase.readAllContents()
-    val endingKeyValueData: DatabaseData = if (validateKeyValue) SignalDatabase.rawDatabase.readAllContents() else emptyMap()
-
-    assertDatabaseMatches(startingMainData, endingData)
-    assertDatabaseMatches(startingKeyValueData, endingKeyValueData)
-  }
-
-  private fun individualChat(aci: ACI, givenName: String, familyName: String? = null, init: IndividualChatCreator.() -> Unit) {
-    val recipientId = individualRecipient(aci = aci, givenName = givenName, familyName = familyName, profileSharing = true)
-
-    val threadId: Long = SignalDatabase.threads.getOrCreateThreadIdFor(recipientId, false)
-
-    IndividualChatCreator(SignalDatabase.rawDatabase, recipientId, threadId).init()
-
-    SignalDatabase.threads.update(threadId, false)
-  }
-
-  private fun individualRecipient(
-    aci: ACI? = null,
-    pni: PNI? = null,
-    e164: String? = null,
-    givenName: String? = null,
-    familyName: String? = null,
-    username: String? = null,
-    hidden: Boolean = false,
-    registeredState: RecipientTable.RegisteredState = RecipientTable.RegisteredState.UNKNOWN,
-    profileKey: ProfileKey? = null,
-    profileSharing: Boolean = false,
-    hideStory: Boolean = false
-  ): RecipientId {
-    check(aci != null || pni != null || e164 != null)
-
-    val recipientId = SignalDatabase.recipients.getAndPossiblyMerge(aci, pni, e164, pniVerified = true, changeSelf = true)
-
-    if (givenName != null || familyName != null) {
-      SignalDatabase.recipients.setProfileName(recipientId, ProfileName.fromParts(givenName, familyName))
-    }
-
-    if (username != null) {
-      SignalDatabase.recipients.setUsername(recipientId, username)
-    }
-
-    if (registeredState == RecipientTable.RegisteredState.REGISTERED) {
-      SignalDatabase.recipients.markRegistered(recipientId, aci ?: pni!!)
-    } else if (registeredState == RecipientTable.RegisteredState.NOT_REGISTERED) {
-      SignalDatabase.recipients.markUnregistered(recipientId)
-    }
-
-    if (profileKey != null) {
-      SignalDatabase.recipients.setProfileKey(recipientId, profileKey)
-    }
-
-    SignalDatabase.recipients.setProfileSharing(recipientId, profileSharing)
-    SignalDatabase.recipients.setHideStory(recipientId, hideStory)
-
-    if (hidden) {
-      SignalDatabase.recipients.markHidden(recipientId)
-    }
-
-    return recipientId
-  }
-
-  private inner class IndividualChatCreator(
-    private val db: SQLiteDatabase,
-    private val recipientId: RecipientId,
-    private val threadId: Long
-  ) {
-    fun standardMessage(
-      outgoing: Boolean,
-      sentTimestamp: Long = System.currentTimeMillis(),
-      receivedTimestamp: Long = if (outgoing) sentTimestamp else sentTimestamp + 1,
-      serverTimestamp: Long = sentTimestamp,
-      body: String? = null,
-      read: Boolean = true,
-      quotes: Long? = null,
-      quoteTargetMissing: Boolean = false,
-      randomMention: Boolean = false,
-      randomStyling: Boolean = false
-    ): Long {
-      return db.insertMessage(
-        from = if (outgoing) Recipient.self().id else recipientId,
-        to = if (outgoing) recipientId else Recipient.self().id,
-        outgoing = outgoing,
-        threadId = threadId,
-        sentTimestamp = sentTimestamp,
-        receivedTimestamp = receivedTimestamp,
-        serverTimestamp = serverTimestamp,
-        body = body,
-        read = read,
-        quotes = quotes,
-        quoteTargetMissing = quoteTargetMissing,
-        randomMention = randomMention,
-        randomStyling = randomStyling
-      )
-    }
-
-    fun remoteDeletedMessage(
-      outgoing: Boolean,
-      sentTimestamp: Long = System.currentTimeMillis(),
-      receivedTimestamp: Long = if (outgoing) sentTimestamp else sentTimestamp + 1,
-      serverTimestamp: Long = sentTimestamp
-    ): Long {
-      return db.insertMessage(
-        from = if (outgoing) Recipient.self().id else recipientId,
-        to = if (outgoing) recipientId else Recipient.self().id,
-        outgoing = outgoing,
-        threadId = threadId,
-        sentTimestamp = sentTimestamp,
-        receivedTimestamp = receivedTimestamp,
-        serverTimestamp = serverTimestamp,
-        remoteDeleted = true
-      )
-    }
-  }
-
-  private fun SQLiteDatabase.insertMessage(
-    from: RecipientId,
-    to: RecipientId,
-    outgoing: Boolean,
-    threadId: Long,
-    sentTimestamp: Long = System.currentTimeMillis(),
-    receivedTimestamp: Long = if (outgoing) sentTimestamp else sentTimestamp + 1,
-    serverTimestamp: Long = sentTimestamp,
-    body: String? = null,
-    read: Boolean = true,
-    quotes: Long? = null,
-    quoteTargetMissing: Boolean = false,
-    randomMention: Boolean = false,
-    randomStyling: Boolean = false,
-    remoteDeleted: Boolean = false
-  ): Long {
-    val type = if (outgoing) {
-      MessageTypes.BASE_SENT_TYPE
-    } else {
-      MessageTypes.BASE_INBOX_TYPE
-    } or MessageTypes.SECURE_MESSAGE_BIT or MessageTypes.PUSH_MESSAGE_BIT
-
-    val contentValues = ContentValues()
-    contentValues.put(MessageTable.DATE_SENT, sentTimestamp)
-    contentValues.put(MessageTable.DATE_RECEIVED, receivedTimestamp)
-    contentValues.put(MessageTable.FROM_RECIPIENT_ID, from.serialize())
-    contentValues.put(MessageTable.TO_RECIPIENT_ID, to.serialize())
-    contentValues.put(MessageTable.THREAD_ID, threadId)
-    contentValues.put(MessageTable.BODY, body)
-    contentValues.put(MessageTable.TYPE, type)
-    contentValues.put(MessageTable.READ, if (read) 1 else 0)
-
-    if (!outgoing) {
-      contentValues.put(MessageTable.DATE_SERVER, serverTimestamp)
-    }
-
-    if (remoteDeleted) {
-      contentValues.put(MessageTable.REMOTE_DELETED, 1)
-      return this
-        .insertInto(MessageTable.TABLE_NAME)
-        .values(contentValues)
-        .run()
-    }
-
-    if (quotes != null) {
-      val quoteDetails = this.getQuoteDetailsFor(quotes)
-      contentValues.put(MessageTable.QUOTE_ID, if (quoteTargetMissing) MessageTable.QUOTE_TARGET_MISSING_ID else quoteDetails.quotedSentTimestamp)
-      contentValues.put(MessageTable.QUOTE_AUTHOR, quoteDetails.authorId.serialize())
-      contentValues.put(MessageTable.QUOTE_BODY, quoteDetails.body)
-      contentValues.put(MessageTable.QUOTE_BODY_RANGES, quoteDetails.bodyRanges)
-      contentValues.put(MessageTable.QUOTE_TYPE, quoteDetails.type)
-      contentValues.put(MessageTable.QUOTE_MISSING, quoteTargetMissing.toInt())
-    }
-
-    if (body != null && (randomMention || randomStyling)) {
-      val ranges: MutableList<BodyRangeList.BodyRange> = mutableListOf()
-
-      if (randomMention) {
-        ranges += BodyRangeList.BodyRange(
-          start = 0,
-          length = Random.nextInt(body.length),
-          mentionUuid = if (outgoing) Recipient.resolved(to).requireAci().toString() else Recipient.resolved(from).requireAci().toString()
-        )
-      }
-
-      if (randomStyling) {
-        ranges += BodyRangeList.BodyRange(
-          start = 0,
-          length = Random.nextInt(body.length),
-          style = BodyRangeList.BodyRange.Style.fromValue(Random.nextInt(BodyRangeList.BodyRange.Style.values().size))
-        )
-      }
-
-      contentValues.put(MessageTable.MESSAGE_RANGES, BodyRangeList(ranges = ranges).encode())
-    }
-
-    return this
-      .insertInto(MessageTable.TABLE_NAME)
-      .values(contentValues)
-      .run()
-  }
-
-  private fun assertDatabaseMatches(expected: DatabaseData, actual: DatabaseData) {
-    assert(expected.keys.size == actual.keys.size) { "Mismatched table count! Expected: ${expected.keys} || Actual: ${actual.keys}" }
-    assert(expected.keys.containsAll(actual.keys)) { "Table names differ! Expected: ${expected.keys} || Actual: ${actual.keys}" }
-
-    val tablesToCheck = expected.keys.filter { !IGNORED_TABLES.contains(it) }
-
-    for (table in tablesToCheck) {
-      val expectedTable: List<Map<String, Any?>> = expected[table]!!
-      val actualTable: List<Map<String, Any?>> = actual[table]!!
-
-      assert(expectedTable.size == actualTable.size) { "Mismatched number of rows for table '$table'! Expected: ${expectedTable.size} || Actual: ${actualTable.size}\n $actualTable" }
-
-      val expectedFiltered: List<Map<String, Any?>> = expectedTable.withoutExcludedColumns(IGNORED_COLUMNS[table])
-      val actualFiltered: List<Map<String, Any?>> = actualTable.withoutExcludedColumns(IGNORED_COLUMNS[table])
-
-      assert(contentEquals(expectedFiltered, actualFiltered)) { "Data did not match for table '$table'!\n${prettyDiff(expectedFiltered, actualFiltered)}" }
-    }
-  }
-
-  private fun contentEquals(expectedRows: List<Map<String, Any?>>, actualRows: List<Map<String, Any?>>): Boolean {
-    if (expectedRows == actualRows) {
-      return true
-    }
-
-    assert(expectedRows.size == actualRows.size)
-
-    for (i in expectedRows.indices) {
-      val expectedRow = expectedRows[i]
-      val actualRow = actualRows[i]
-
-      for (key in expectedRow.keys) {
-        val expectedValue = expectedRow[key]
-        val actualValue = actualRow[key]
-
-        if (!contentEquals(expectedValue, actualValue)) {
-          return false
-        }
-      }
-    }
-
-    return true
-  }
-
-  private fun contentEquals(lhs: Any?, rhs: Any?): Boolean {
-    return if (lhs is ByteArray && rhs is ByteArray) {
-      lhs.contentEquals(rhs)
-    } else {
-      lhs == rhs
-    }
-  }
-
-  private fun prettyDiff(expectedRows: List<Map<String, Any?>>, actualRows: List<Map<String, Any?>>): String {
-    val builder = StringBuilder()
-
-    assert(expectedRows.size == actualRows.size)
-
-    for (i in expectedRows.indices) {
-      val expectedRow = expectedRows[i]
-      val actualRow = actualRows[i]
-      var describedRow = false
-
-      for (key in expectedRow.keys) {
-        val expectedValue = expectedRow[key]
-        val actualValue = actualRow[key]
-
-        if (!contentEquals(expectedValue, actualValue)) {
-          if (!describedRow) {
-            builder.append("-- ROW ${i + 1}\n")
-            describedRow = true
-          }
-          builder.append("  [$key] Expected: ${expectedValue.prettyPrint()} || Actual: ${actualValue.prettyPrint()} \n")
-        }
-      }
-
-      if (describedRow) {
-        builder.append("\n")
-        builder.append("Expected: $expectedRow\n")
-        builder.append("Actual: $actualRow\n")
-      }
-    }
-
-    return builder.toString()
-  }
-
-  private fun Any?.prettyPrint(): String {
-    return when (this) {
-      is ByteArray -> "Bytes(${Hex.toString(this)})"
-      else -> this.toString()
-    }
-  }
-
-  private fun List<Map<String, Any?>>.withoutExcludedColumns(ignored: Set<String>?): List<Map<String, Any?>> {
-    return if (ignored != null) {
-      this.map { row ->
-        row.filterKeys { !ignored.contains(it) }
-      }
-    } else {
-      this
-    }
-  }
-
-  private fun SQLiteDatabase.getQuoteDetailsFor(messageId: Long): QuoteDetails {
-    return this
-      .select(
-        MessageTable.DATE_SENT,
-        MessageTable.FROM_RECIPIENT_ID,
-        MessageTable.BODY,
-        MessageTable.MESSAGE_RANGES
-      )
-      .from(MessageTable.TABLE_NAME)
-      .where("${MessageTable.ID} = ?", messageId)
-      .run()
-      .readToSingleObject { cursor ->
-        QuoteDetails(
-          quotedSentTimestamp = cursor.requireLong(MessageTable.DATE_SENT),
-          authorId = RecipientId.from(cursor.requireLong(MessageTable.FROM_RECIPIENT_ID)),
-          body = cursor.requireString(MessageTable.BODY),
-          bodyRanges = cursor.requireBlob(MessageTable.MESSAGE_RANGES),
-          type = QuoteModel.Type.NORMAL.code
-        )
-      }!!
-  }
-
-  private fun SQLiteDatabase.readAllContents(): DatabaseData {
-    return SqlUtil.getAllTables(this).associateWith { table -> this.getAllTableData(table) }
-  }
-
-  private fun SQLiteDatabase.getAllTableData(table: String): List<Map<String, Any?>> {
-    return this
-      .select()
-      .from(table)
-      .run()
-      .readToList { cursor ->
-        val map: MutableMap<String, Any?> = mutableMapOf()
-
-        for (i in 0 until cursor.columnCount) {
-          val column = cursor.getColumnName(i)
-
-          when (cursor.getType(i)) {
-            Cursor.FIELD_TYPE_INTEGER -> map[column] = cursor.getInt(i)
-            Cursor.FIELD_TYPE_FLOAT -> map[column] = cursor.getFloat(i)
-            Cursor.FIELD_TYPE_STRING -> map[column] = cursor.getString(i)
-            Cursor.FIELD_TYPE_BLOB -> map[column] = cursor.getBlob(i)
-            Cursor.FIELD_TYPE_NULL -> map[column] = null
-          }
-        }
-
-        map
-      }
-  }
-
-  private data class QuoteDetails(
-    val quotedSentTimestamp: Long,
-    val authorId: RecipientId,
-    val body: String?,
-    val bodyRanges: ByteArray?,
-    val type: Int
-  )
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModelTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModelTest.kt
@@ -50,6 +50,7 @@ class ChangeNumberViewModelTest {

  @Before
  fun setUp() {
+    ApplicationDependencies.getSignalServiceAccountManager().setSoTimeoutMillis(1000)
    ThreadUtil.runOnMainSync {
      viewModel = ChangeNumberViewModel(
        localNumber = harness.self.requireE164(),
@@ -230,6 +231,8 @@ class ChangeNumberViewModelTest {
    lateinit var changeNumberRequest: ChangePhoneNumberRequest
    lateinit var setPreKeysRequest: PreKeyState

+    MockProvider.mockGetRegistrationLockStringFlow()
+
    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) },
@@ -316,6 +319,8 @@ class ChangeNumberViewModelTest {
    lateinit var changeNumberRequest: ChangePhoneNumberRequest
    lateinit var setPreKeysRequest: PreKeyState

+    MockProvider.mockGetRegistrationLockStringFlow()
+
    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) },
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/ConversationItemPreviewer.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/ConversationItemPreviewer.kt
@@ -9,9 +9,8 @@ import org.junit.runner.RunWith
 import org.signal.core.util.ThreadUtil
 import org.thoughtcrime.securesms.attachments.PointerAttachment
 import org.thoughtcrime.securesms.conversation.v2.ConversationActivity
-import org.thoughtcrime.securesms.database.MessageType
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.mms.IncomingMessage
+import org.thoughtcrime.securesms.mms.IncomingMediaMessage
 import org.thoughtcrime.securesms.mms.OutgoingMessage
 import org.thoughtcrime.securesms.profiles.ProfileName
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -65,8 +64,7 @@ class ConversationItemPreviewer {
      attachment()
    }

-    val message = IncomingMessage(
-      type = MessageType.NORMAL,
+    val message = IncomingMediaMessage(
      from = other.id,
      body = body,
      sentTimeMillis = System.currentTimeMillis(),
@@ -75,7 +73,7 @@ class ConversationItemPreviewer {
      attachments = PointerAttachment.forPointers(Optional.of(attachments))
    )

-    SignalDatabase.messages.insertMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get()
+    SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get()

    ThreadUtil.sleep(1)
  }
@@ -85,8 +83,7 @@ class ConversationItemPreviewer {
      attachment()
    }

-    val message = IncomingMessage(
-      type = MessageType.NORMAL,
+    val message = IncomingMediaMessage(
      from = other.id,
      body = body,
      sentTimeMillis = System.currentTimeMillis(),
@@ -95,7 +92,7 @@ class ConversationItemPreviewer {
      attachments = PointerAttachment.forPointers(Optional.of(attachments))
    )

-    val insert = SignalDatabase.messages.insertMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get()
+    val insert = SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get()

    SignalDatabase.attachments.getAttachmentsForMessage(insert.messageId).forEachIndexed { index, attachment ->
 //      if (index != 1) {
@@ -147,7 +144,6 @@ class ConversationItemPreviewer {
      1024,
      Optional.empty(),
      Optional.empty(),
-      0,
      Optional.of("/not-there.jpg"),
      false,
      false,
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShapeTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShapeTest.kt
@@ -8,7 +8,6 @@ package org.thoughtcrime.securesms.conversation.v2.items
 import android.net.Uri
 import android.view.View
 import androidx.lifecycle.Observer
-import io.mockk.mockk
 import org.junit.Assert.assertEquals
 import org.junit.Rule
 import org.junit.Test
@@ -29,7 +28,6 @@ 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
 import org.thoughtcrime.securesms.stickers.StickerLocator
@@ -47,6 +45,7 @@ class V2ConversationItemShapeTest {

    val expected = V2ConversationItemShape.MessageShape.SINGLE
    val actual = testSubject.setMessageShape(
+      isLtr = true,
      currentMessage = getMessageRecord(),
      isGroupThread = false,
      adapterPosition = 5
@@ -68,6 +67,7 @@ class V2ConversationItemShapeTest {

    val expected = V2ConversationItemShape.MessageShape.END
    val actual = testSubject.setMessageShape(
+      isLtr = true,
      currentMessage = getMessageRecord(now),
      isGroupThread = false,
      adapterPosition = 5
@@ -89,6 +89,7 @@ class V2ConversationItemShapeTest {

    val expected = V2ConversationItemShape.MessageShape.START
    val actual = testSubject.setMessageShape(
+      isLtr = true,
      currentMessage = getMessageRecord(prev),
      isGroupThread = false,
      adapterPosition = 5
@@ -112,6 +113,7 @@ class V2ConversationItemShapeTest {

    val expected = V2ConversationItemShape.MessageShape.MIDDLE
    val actual = testSubject.setMessageShape(
+      isLtr = true,
      currentMessage = getMessageRecord(now),
      isGroupThread = false,
      adapterPosition = 5
@@ -133,6 +135,7 @@ class V2ConversationItemShapeTest {

    val expected = V2ConversationItemShape.MessageShape.SINGLE
    val actual = testSubject.setMessageShape(
+      isLtr = true,
      currentMessage = getMessageRecord(now),
      isGroupThread = false,
      adapterPosition = 5
@@ -154,6 +157,7 @@ class V2ConversationItemShapeTest {

    val expected = V2ConversationItemShape.MessageShape.SINGLE
    val actual = testSubject.setMessageShape(
+      isLtr = true,
      currentMessage = getMessageRecord(prev),
      isGroupThread = false,
      adapterPosition = 5
@@ -177,6 +181,7 @@ class V2ConversationItemShapeTest {

    val expected = V2ConversationItemShape.MessageShape.SINGLE
    val actual = testSubject.setMessageShape(
+      isLtr = true,
      currentMessage = getMessageRecord(now),
      isGroupThread = false,
      adapterPosition = 5
@@ -203,14 +208,12 @@ class V2ConversationItemShapeTest {

    private val colorizer = Colorizer()

-    override val displayMode: ConversationItemDisplayMode = ConversationItemDisplayMode.Standard
+    override val displayMode: ConversationItemDisplayMode = ConversationItemDisplayMode.STANDARD

    override val clickListener: ConversationAdapter.ItemClickListener = FakeConversationItemClickListener
    override val selectedItems: Set<MultiselectPart> = emptySet()
    override val isMessageRequestAccepted: Boolean = true
    override val searchQuery: String? = null
-    override val glideRequests: GlideRequests = mockk()
-    override val isParentInScroll: Boolean = false

    override fun onStartExpirationTimeout(messageRecord: MessageRecord) = Unit

--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTest.kt
@@ -61,8 +61,8 @@ class AttachmentTableTest {
      false
    )

-    val attachment1Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment.attachmentId, AttachmentTable.DATA_FILE)
-    val attachment2Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment2.attachmentId, AttachmentTable.DATA_FILE)
+    val attachment1Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment.attachmentId, AttachmentTable.DATA)
+    val attachment2Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment2.attachmentId, AttachmentTable.DATA)

    assertNotEquals(attachment1Info, attachment2Info)
  }
@@ -89,8 +89,8 @@ class AttachmentTableTest {
      true
    )

-    val attachment1Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment.attachmentId, AttachmentTable.DATA_FILE)
-    val attachment2Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment2.attachmentId, AttachmentTable.DATA_FILE)
+    val attachment1Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment.attachmentId, AttachmentTable.DATA)
+    val attachment2Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment2.attachmentId, AttachmentTable.DATA)

    assertNotEquals(attachment1Info, attachment2Info)
  }
@@ -124,9 +124,9 @@ class AttachmentTableTest {
    SignalDatabase.attachments.updateAttachmentData(standardDatabaseAttachment, createMediaStream(compressedData), false)

    // THEN
-    val previousInfo = SignalDatabase.attachments.getAttachmentDataFileInfo(previousDatabaseAttachmentId, AttachmentTable.DATA_FILE)!!
-    val standardInfo = SignalDatabase.attachments.getAttachmentDataFileInfo(standardDatabaseAttachment.attachmentId, AttachmentTable.DATA_FILE)!!
-    val highInfo = SignalDatabase.attachments.getAttachmentDataFileInfo(highDatabaseAttachment.attachmentId, AttachmentTable.DATA_FILE)!!
+    val previousInfo = SignalDatabase.attachments.getAttachmentDataFileInfo(previousDatabaseAttachmentId, AttachmentTable.DATA)!!
+    val standardInfo = SignalDatabase.attachments.getAttachmentDataFileInfo(standardDatabaseAttachment.attachmentId, AttachmentTable.DATA)!!
+    val highInfo = SignalDatabase.attachments.getAttachmentDataFileInfo(highDatabaseAttachment.attachmentId, AttachmentTable.DATA)!!

    assertNotEquals(standardInfo, highInfo)
    standardInfo.file assertIs previousInfo.file
@@ -134,40 +134,6 @@ class AttachmentTableTest {
    highInfo.file.exists() assertIs true
  }

-  /**
-   * Given: Three pre-upload attachments with the same data but different transform properties (1x standard and 2x high).
-   *
-   * When inserting content of high pre-upload attachment.
-   *
-   * Then do not deduplicate with standard pre-upload attachment, but do deduplicate second high insert.
-   */
-  @Test
-  fun doNotDedupedFileIfUsedByAnotherAttachmentWithADifferentTransformProperties() {
-    // GIVEN
-    val uncompressData = byteArrayOf(1, 2, 3, 4, 5)
-    val blobUncompressed = BlobProvider.getInstance().forData(uncompressData).createForSingleSessionInMemory()
-
-    val standardQualityPreUpload = createAttachment(1, blobUncompressed, AttachmentTable.TransformProperties.empty())
-    val standardDatabaseAttachment = SignalDatabase.attachments.insertAttachmentForPreUpload(standardQualityPreUpload)
-
-    // WHEN
-    val highQualityPreUpload = createAttachment(1, blobUncompressed, AttachmentTable.TransformProperties.forSentMediaQuality(Optional.empty(), SentMediaQuality.HIGH))
-    val highDatabaseAttachment = SignalDatabase.attachments.insertAttachmentForPreUpload(highQualityPreUpload)
-
-    val secondHighQualityPreUpload = createAttachment(1, blobUncompressed, AttachmentTable.TransformProperties.forSentMediaQuality(Optional.empty(), SentMediaQuality.HIGH))
-    val secondHighDatabaseAttachment = SignalDatabase.attachments.insertAttachmentForPreUpload(secondHighQualityPreUpload)
-
-    // THEN
-    val standardInfo = SignalDatabase.attachments.getAttachmentDataFileInfo(standardDatabaseAttachment.attachmentId, AttachmentTable.DATA_FILE)!!
-    val highInfo = SignalDatabase.attachments.getAttachmentDataFileInfo(highDatabaseAttachment.attachmentId, AttachmentTable.DATA_FILE)!!
-    val secondHighInfo = SignalDatabase.attachments.getAttachmentDataFileInfo(secondHighDatabaseAttachment.attachmentId, AttachmentTable.DATA_FILE)!!
-
-    highInfo.file assertIsNot standardInfo.file
-    secondHighInfo.file assertIs highInfo.file
-    standardInfo.file.exists() assertIs true
-    highInfo.file.exists() assertIs true
-  }
-
  private fun createAttachment(id: Long, uri: Uri, transformProperties: AttachmentTable.TransformProperties): UriAttachment {
    return UriAttachmentBuilder.build(
      id,
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/CallTableTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/CallTableTest.kt
@@ -214,175 +214,6 @@ class CallTableTest {
    assertEquals(CallTable.Event.JOINED, acceptedCall?.event)
  }

-  @Test
-  fun givenAnOutgoingRingCall_whenIAcceptedOutgoingGroupCall_thenIExpectOutgoingRing() {
-    val callId = 1L
-    SignalDatabase.calls.insertAcceptedGroupCall(
-      callId = callId,
-      recipientId = groupRecipientId,
-      direction = CallTable.Direction.OUTGOING,
-      timestamp = 1
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.OUTGOING_RING, call?.event)
-
-    SignalDatabase.calls.acceptOutgoingGroupCall(
-      call!!
-    )
-
-    val acceptedCall = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertEquals(CallTable.Event.OUTGOING_RING, acceptedCall?.event)
-  }
-
-  @Test
-  fun givenARingingCall_whenIAcceptedOutgoingGroupCall_thenIExpectAccepted() {
-    val callId = 1L
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      ringId = callId,
-      groupRecipientId = groupRecipientId,
-      ringerRecipient = harness.others[1],
-      dateReceived = System.currentTimeMillis(),
-      ringState = CallManager.RingUpdate.REQUESTED
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.RINGING, call?.event)
-
-    SignalDatabase.calls.acceptOutgoingGroupCall(
-      call!!
-    )
-
-    val acceptedCall = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertEquals(CallTable.Event.ACCEPTED, acceptedCall?.event)
-  }
-
-  @Test
-  fun givenAMissedCall_whenIAcceptedOutgoingGroupCall_thenIExpectAccepted() {
-    val callId = 1L
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      ringId = callId,
-      groupRecipientId = groupRecipientId,
-      ringerRecipient = harness.others[1],
-      dateReceived = System.currentTimeMillis(),
-      ringState = CallManager.RingUpdate.EXPIRED_REQUEST
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.MISSED, call?.event)
-
-    SignalDatabase.calls.acceptOutgoingGroupCall(
-      call!!
-    )
-
-    val acceptedCall = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertEquals(CallTable.Event.ACCEPTED, acceptedCall?.event)
-  }
-
-  @Test
-  fun givenADeclinedCall_whenIAcceptedOutgoingGroupCall_thenIExpectAccepted() {
-    val callId = 1L
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      ringId = callId,
-      groupRecipientId = groupRecipientId,
-      ringerRecipient = harness.others[1],
-      dateReceived = System.currentTimeMillis(),
-      ringState = CallManager.RingUpdate.DECLINED_ON_ANOTHER_DEVICE
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.DECLINED, call?.event)
-
-    SignalDatabase.calls.acceptOutgoingGroupCall(
-      call!!
-    )
-
-    val acceptedCall = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertEquals(CallTable.Event.ACCEPTED, acceptedCall?.event)
-  }
-
-  @Test
-  fun givenAnAcceptedCall_whenIAcceptedOutgoingGroupCall_thenIExpectAccepted() {
-    val callId = 1L
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      ringId = callId,
-      groupRecipientId = groupRecipientId,
-      ringerRecipient = harness.others[1],
-      dateReceived = System.currentTimeMillis(),
-      ringState = CallManager.RingUpdate.REQUESTED
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.RINGING, call?.event)
-
-    SignalDatabase.calls.acceptIncomingGroupCall(
-      call!!
-    )
-
-    SignalDatabase.calls.acceptOutgoingGroupCall(
-      SignalDatabase.calls.getCallById(callId, groupRecipientId)!!
-    )
-
-    val acceptedCall = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertEquals(CallTable.Event.ACCEPTED, acceptedCall?.event)
-  }
-
-  @Test
-  fun givenAGenericGroupCall_whenIAcceptedOutgoingGroupCall_thenIExpectOutgoingRing() {
-    val era = "aaa"
-    val callId = CallId.fromEra(era).longValue()
-    SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
-      groupRecipientId = groupRecipientId,
-      sender = harness.others[1],
-      timestamp = System.currentTimeMillis(),
-      peekGroupCallEraId = "aaa",
-      peekJoinedUuids = emptyList(),
-      isCallFull = false
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.GENERIC_GROUP_CALL, call?.event)
-
-    SignalDatabase.calls.acceptOutgoingGroupCall(
-      call!!
-    )
-
-    val acceptedCall = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertEquals(CallTable.Event.OUTGOING_RING, acceptedCall?.event)
-  }
-
-  @Test
-  fun givenAJoinedGroupCall_whenIAcceptedOutgoingGroupCall_thenIExpectOutgoingRing() {
-    val era = "aaa"
-    val callId = CallId.fromEra(era).longValue()
-    SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
-      groupRecipientId = groupRecipientId,
-      sender = harness.others[1],
-      timestamp = System.currentTimeMillis(),
-      peekGroupCallEraId = "aaa",
-      peekJoinedUuids = emptyList(),
-      isCallFull = false
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.GENERIC_GROUP_CALL, call?.event)
-
-    SignalDatabase.calls.acceptIncomingGroupCall(
-      call!!
-    )
-
-    SignalDatabase.calls.acceptOutgoingGroupCall(SignalDatabase.calls.getCallById(callId, groupRecipientId)!!)
-    val acceptedCall = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertEquals(CallTable.Event.OUTGOING_RING, acceptedCall?.event)
-  }
-
  @Test
  fun givenNoPriorCallEvent_whenIReceiveAGroupCallUpdateMessage_thenIExpectAGenericGroupCall() {
    val era = "aaa"
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/GroupTableTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/GroupTableTest.kt
@@ -293,22 +293,22 @@ class GroupTableTest {

  private fun insertPushGroup(
    members: List<DecryptedMember> = listOf(
-      DecryptedMember.Builder()
-        .aciBytes(harness.self.requireAci().toByteString())
-        .joinedAtRevision(0)
-        .role(Member.Role.DEFAULT)
+      DecryptedMember.newBuilder()
+        .setUuid(harness.self.requireServiceId().toByteString())
+        .setJoinedAtRevision(0)
+        .setRole(Member.Role.DEFAULT)
        .build(),
-      DecryptedMember.Builder()
-        .aciBytes(Recipient.resolved(harness.others[0]).requireAci().toByteString())
-        .joinedAtRevision(0)
-        .role(Member.Role.DEFAULT)
+      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.Builder()
-      .members(members)
-      .revision(0)
+    val decryptedGroupState = DecryptedGroup.newBuilder()
+      .addAllMembers(members)
+      .setRevision(0)
      .build()

    return groupTable.create(groupMasterKey, decryptedGroupState)!!
@@ -317,23 +317,23 @@ class GroupTableTest {
  private fun insertPushGroupWithSelfAndOthers(others: List<RecipientId>): GroupId {
    val groupMasterKey = GroupMasterKey(Random.nextBytes(GroupMasterKey.SIZE))

-    val selfMember: DecryptedMember = DecryptedMember.Builder()
-      .aciBytes(harness.self.requireAci().toByteString())
-      .joinedAtRevision(0)
-      .role(Member.Role.DEFAULT)
+    val selfMember: DecryptedMember = DecryptedMember.newBuilder()
+      .setUuid(harness.self.requireServiceId().toByteString())
+      .setJoinedAtRevision(0)
+      .setRole(Member.Role.DEFAULT)
      .build()

    val otherMembers: List<DecryptedMember> = others.map { id ->
-      DecryptedMember.Builder()
-        .aciBytes(Recipient.resolved(id).requireAci().toByteString())
-        .joinedAtRevision(0)
-        .role(Member.Role.DEFAULT)
+      DecryptedMember.newBuilder()
+        .setUuid(Recipient.resolved(id).requireServiceId().toByteString())
+        .setJoinedAtRevision(0)
+        .setRole(Member.Role.DEFAULT)
        .build()
    }

-    val decryptedGroupState = DecryptedGroup.Builder()
-      .members(listOf(selfMember) + otherMembers)
-      .revision(0)
+    val decryptedGroupState = DecryptedGroup.newBuilder()
+      .addAllMembers(listOf(selfMember) + otherMembers)
+      .setRevision(0)
      .build()

    return groupTable.create(groupMasterKey, decryptedGroupState)!!
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/KyberPreKeyTableTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/KyberPreKeyTableTest.kt
@@ -1,176 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.database
-
-import junit.framework.TestCase.assertEquals
-import junit.framework.TestCase.assertNotNull
-import junit.framework.TestCase.assertNull
-import org.junit.Test
-import org.signal.core.util.readToSingleObject
-import org.signal.core.util.requireLongOrNull
-import org.signal.core.util.select
-import org.signal.core.util.update
-import org.signal.libsignal.protocol.ecc.Curve
-import org.signal.libsignal.protocol.kem.KEMKeyPair
-import org.signal.libsignal.protocol.kem.KEMKeyType
-import org.signal.libsignal.protocol.state.KyberPreKeyRecord
-import org.whispersystems.signalservice.api.push.ServiceId
-import org.whispersystems.signalservice.api.push.ServiceId.ACI
-import org.whispersystems.signalservice.api.push.ServiceId.PNI
-import java.util.UUID
-
-class KyberPreKeyTableTest {
-
-  private val aci: ACI = ACI.from(UUID.randomUUID())
-  private val pni: PNI = PNI.from(UUID.randomUUID())
-
-  @Test
-  fun markAllStaleIfNecessary_onlyUpdatesMatchingAccountAndZeroValues() {
-    insertTestRecord(aci, id = 1)
-    insertTestRecord(aci, id = 2)
-    insertTestRecord(aci, id = 3, staleTime = 42)
-    insertTestRecord(pni, id = 4)
-
-    val now = System.currentTimeMillis()
-    SignalDatabase.kyberPreKeys.markAllStaleIfNecessary(aci, now)
-
-    assertEquals(now, getStaleTime(aci, 1))
-    assertEquals(now, getStaleTime(aci, 2))
-    assertEquals(42L, getStaleTime(aci, 3))
-    assertEquals(0L, getStaleTime(pni, 4))
-  }
-
-  @Test
-  fun deleteAllStaleBefore_deleteOldBeforeThreshold() {
-    insertTestRecord(aci, id = 1, staleTime = 10)
-    insertTestRecord(aci, id = 2, staleTime = 10)
-    insertTestRecord(aci, id = 3, staleTime = 10)
-    insertTestRecord(aci, id = 4, staleTime = 15)
-    insertTestRecord(aci, id = 5, staleTime = 0)
-
-    SignalDatabase.kyberPreKeys.deleteAllStaleBefore(aci, threshold = 11, minCount = 0)
-
-    assertNull(getStaleTime(aci, 1))
-    assertNull(getStaleTime(aci, 2))
-    assertNull(getStaleTime(aci, 3))
-    assertNotNull(getStaleTime(aci, 4))
-    assertNotNull(getStaleTime(aci, 5))
-  }
-
-  @Test
-  fun deleteAllStaleBefore_neverDeleteStaleOfZero() {
-    insertTestRecord(aci, id = 1, staleTime = 0)
-    insertTestRecord(aci, id = 2, staleTime = 0)
-    insertTestRecord(aci, id = 3, staleTime = 0)
-    insertTestRecord(aci, id = 4, staleTime = 0)
-    insertTestRecord(aci, id = 5, staleTime = 0)
-
-    SignalDatabase.kyberPreKeys.deleteAllStaleBefore(aci, threshold = 10, minCount = 1)
-
-    assertNotNull(getStaleTime(aci, 1))
-    assertNotNull(getStaleTime(aci, 2))
-    assertNotNull(getStaleTime(aci, 3))
-    assertNotNull(getStaleTime(aci, 4))
-    assertNotNull(getStaleTime(aci, 5))
-  }
-
-  @Test
-  fun deleteAllStaleBefore_respectMinCount() {
-    insertTestRecord(aci, id = 1, staleTime = 10)
-    insertTestRecord(aci, id = 2, staleTime = 10)
-    insertTestRecord(aci, id = 3, staleTime = 10)
-    insertTestRecord(aci, id = 4, staleTime = 10)
-    insertTestRecord(aci, id = 5, staleTime = 10)
-
-    SignalDatabase.kyberPreKeys.deleteAllStaleBefore(aci, threshold = 11, minCount = 3)
-
-    assertNull(getStaleTime(aci, 1))
-    assertNull(getStaleTime(aci, 2))
-    assertNotNull(getStaleTime(aci, 3))
-    assertNotNull(getStaleTime(aci, 4))
-    assertNotNull(getStaleTime(aci, 5))
-  }
-
-  @Test
-  fun deleteAllStaleBefore_respectAccount() {
-    insertTestRecord(aci, id = 1, staleTime = 10)
-    insertTestRecord(aci, id = 2, staleTime = 10)
-    insertTestRecord(aci, id = 3, staleTime = 10)
-
-    insertTestRecord(pni, id = 4, staleTime = 10)
-    insertTestRecord(pni, id = 5, staleTime = 10)
-
-    SignalDatabase.kyberPreKeys.deleteAllStaleBefore(aci, threshold = 11, minCount = 2)
-
-    assertNull(getStaleTime(aci, 1))
-    assertNotNull(getStaleTime(aci, 2))
-    assertNotNull(getStaleTime(aci, 3))
-    assertNotNull(getStaleTime(pni, 4))
-    assertNotNull(getStaleTime(pni, 5))
-  }
-
-  @Test
-  fun deleteAllStaleBefore_ignoreLastResortForMinCount() {
-    insertTestRecord(aci, id = 1, staleTime = 10)
-    insertTestRecord(aci, id = 2, staleTime = 10)
-    insertTestRecord(aci, id = 3, staleTime = 10)
-    insertTestRecord(aci, id = 4, staleTime = 10)
-    insertTestRecord(aci, id = 5, staleTime = 10, lastResort = true)
-
-    SignalDatabase.kyberPreKeys.deleteAllStaleBefore(aci, threshold = 11, minCount = 3)
-
-    assertNull(getStaleTime(aci, 1))
-    assertNotNull(getStaleTime(aci, 2))
-    assertNotNull(getStaleTime(aci, 3))
-    assertNotNull(getStaleTime(aci, 4))
-    assertNotNull(getStaleTime(aci, 5))
-  }
-
-  @Test
-  fun deleteAllStaleBefore_neverDeleteLastResort() {
-    insertTestRecord(aci, id = 1, staleTime = 10, lastResort = true)
-    insertTestRecord(aci, id = 2, staleTime = 10, lastResort = true)
-    insertTestRecord(aci, id = 3, staleTime = 10, lastResort = true)
-
-    SignalDatabase.oneTimePreKeys.deleteAllStaleBefore(aci, threshold = 11, minCount = 0)
-
-    assertNotNull(getStaleTime(aci, 1))
-    assertNotNull(getStaleTime(aci, 2))
-    assertNotNull(getStaleTime(aci, 3))
-  }
-
-  private fun insertTestRecord(account: ServiceId, id: Int, staleTime: Long = 0, lastResort: Boolean = false) {
-    val kemKeyPair = KEMKeyPair.generate(KEMKeyType.KYBER_1024)
-    SignalDatabase.kyberPreKeys.insert(
-      serviceId = account,
-      keyId = id,
-      record = KyberPreKeyRecord(
-        id,
-        System.currentTimeMillis(),
-        kemKeyPair,
-        Curve.generateKeyPair().privateKey.calculateSignature(kemKeyPair.publicKey.serialize())
-      ),
-      lastResort = lastResort
-    )
-
-    val count = SignalDatabase.rawDatabase
-      .update(KyberPreKeyTable.TABLE_NAME)
-      .values(KyberPreKeyTable.STALE_TIMESTAMP to staleTime)
-      .where("${KyberPreKeyTable.ACCOUNT_ID} = ? AND ${KyberPreKeyTable.KEY_ID} = $id", account)
-      .run()
-
-    assertEquals(1, count)
-  }
-
-  private fun getStaleTime(account: ServiceId, id: Int): Long? {
-    return SignalDatabase.rawDatabase
-      .select(KyberPreKeyTable.STALE_TIMESTAMP)
-      .from(KyberPreKeyTable.TABLE_NAME)
-      .where("${KyberPreKeyTable.ACCOUNT_ID} = ? AND ${KyberPreKeyTable.KEY_ID} = $id", account)
-      .run()
-      .readToSingleObject { it.requireLongOrNull(KyberPreKeyTable.STALE_TIMESTAMP) }
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/LogDatabaseTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/LogDatabaseTest.kt
@@ -1,288 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.database
-
-import org.junit.Test
-import org.signal.core.util.forEach
-import org.signal.core.util.requireLong
-import org.signal.core.util.requireNonNullString
-import org.signal.core.util.select
-import org.signal.core.util.update
-import org.thoughtcrime.securesms.crash.CrashConfig
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.testing.assertIs
-
-class LogDatabaseTest {
-
-  private val db: LogDatabase = LogDatabase.getInstance(ApplicationDependencies.getApplication())
-
-  @Test
-  fun crashTable_matchesNamePattern() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Test")
-      ),
-      promptThreshold = currentTime
-    )
-
-    foundMatch assertIs true
-  }
-
-  @Test
-  fun crashTable_matchesMessagePattern() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(messagePattern = "Message")
-      ),
-      promptThreshold = currentTime
-    )
-
-    foundMatch assertIs true
-  }
-
-  @Test
-  fun crashTable_matchesStackTracePattern() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(stackTracePattern = "stack")
-      ),
-      promptThreshold = currentTime
-    )
-
-    foundMatch assertIs true
-  }
-
-  @Test
-  fun crashTable_matchesNameAndMessagePattern() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Test", messagePattern = "Message")
-      ),
-      promptThreshold = currentTime
-    )
-
-    foundMatch assertIs true
-  }
-
-  @Test
-  fun crashTable_matchesNameAndStackTracePattern() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Test", stackTracePattern = "stack")
-      ),
-      promptThreshold = currentTime
-    )
-
-    foundMatch assertIs true
-  }
-
-  @Test
-  fun crashTable_matchesNameAndMessageAndStackTracePattern() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Test", messagePattern = "Message", stackTracePattern = "stack")
-      ),
-      promptThreshold = currentTime
-    )
-
-    foundMatch assertIs true
-  }
-
-  @Test
-  fun crashTable_doesNotMatchNamePattern() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Blah")
-      ),
-      promptThreshold = currentTime
-    )
-
-    foundMatch assertIs false
-  }
-
-  @Test
-  fun crashTable_matchesNameButNotMessagePattern() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Test", messagePattern = "Blah")
-      ),
-      promptThreshold = currentTime
-    )
-
-    foundMatch assertIs false
-  }
-
-  @Test
-  fun crashTable_matchesNameButNotStackTracePattern() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Test", stackTracePattern = "Blah")
-      ),
-      promptThreshold = currentTime
-    )
-
-    foundMatch assertIs false
-  }
-
-  @Test
-  fun crashTable_matchesNamePatternButPromptedTooRecently() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    db.writableDatabase
-      .update(LogDatabase.CrashTable.TABLE_NAME)
-      .values(LogDatabase.CrashTable.LAST_PROMPTED_AT to currentTime)
-      .run()
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Test")
-      ),
-      promptThreshold = currentTime - 100
-    )
-
-    foundMatch assertIs false
-  }
-
-  @Test
-  fun crashTable_noMatches() {
-    val currentTime = System.currentTimeMillis()
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Test")
-      ),
-      promptThreshold = currentTime - 100
-    )
-
-    foundMatch assertIs false
-  }
-
-  @Test
-  fun crashTable_updatesLastPromptTime() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "XXX",
-      message = "XXX",
-      stackTrace = "XXX"
-    )
-
-    db.crashes.markAsPrompted(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Test")
-      ),
-      promptedAt = currentTime
-    )
-
-    db.writableDatabase
-      .select(LogDatabase.CrashTable.NAME, LogDatabase.CrashTable.LAST_PROMPTED_AT)
-      .from(LogDatabase.CrashTable.TABLE_NAME)
-      .run()
-      .forEach {
-        if (it.requireNonNullString(LogDatabase.CrashTable.NAME) == "TestName") {
-          it.requireLong(LogDatabase.CrashTable.LAST_PROMPTED_AT) assertIs currentTime
-        } else {
-          it.requireLong(LogDatabase.CrashTable.LAST_PROMPTED_AT) assertIs 0
-        }
-      }
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/MessageTableTest_gifts.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/MessageTableTest_gifts.kt
@@ -48,7 +48,7 @@ class MessageTableTest_gifts {
    val messageId = MmsHelper.insert(
      recipient = Recipient.resolved(recipients[0]),
      sentTimeMillis = 1,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
    )

    val result = mms.setOutgoingGiftsRevealed(listOf(messageId))
@@ -62,7 +62,7 @@ class MessageTableTest_gifts {
    val messageId = MmsHelper.insert(
      recipient = Recipient.resolved(recipients[0]),
      sentTimeMillis = 1,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
    )
    mms.setOutgoingGiftsRevealed(listOf(messageId))

@@ -76,13 +76,13 @@ class MessageTableTest_gifts {
    val messageId = MmsHelper.insert(
      recipient = Recipient.resolved(recipients[0]),
      sentTimeMillis = 1,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
    )

    MmsHelper.insert(
      recipient = Recipient.resolved(recipients[0]),
      sentTimeMillis = 2,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
    )

    val result = mms.setOutgoingGiftsRevealed(listOf(messageId))
@@ -96,13 +96,13 @@ class MessageTableTest_gifts {
    val messageId = MmsHelper.insert(
      recipient = Recipient.resolved(recipients[0]),
      sentTimeMillis = 1,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
    )

    val messageId2 = MmsHelper.insert(
      recipient = Recipient.resolved(recipients[0]),
      sentTimeMillis = 2,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
    )

    val result = mms.setOutgoingGiftsRevealed(listOf(messageId, messageId2))
@@ -115,13 +115,13 @@ class MessageTableTest_gifts {
    val messageId = MmsHelper.insert(
      recipient = Recipient.resolved(recipients[0]),
      sentTimeMillis = 1,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
    )

    val messageId2 = MmsHelper.insert(
      recipient = Recipient.resolved(recipients[0]),
      sentTimeMillis = 2,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
    )

    MmsHelper.insert(
@@ -140,13 +140,13 @@ class MessageTableTest_gifts {
    val messageId = MmsHelper.insert(
      recipient = Recipient.resolved(recipients[0]),
      sentTimeMillis = 1,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
    )

    val messageId2 = MmsHelper.insert(
      recipient = Recipient.resolved(recipients[0]),
      sentTimeMillis = 2,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
    )

    val messageId3 = MmsHelper.insert(
@@ -165,13 +165,13 @@ class MessageTableTest_gifts {
    MmsHelper.insert(
      recipient = Recipient.resolved(recipients[0]),
      sentTimeMillis = 1,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
    )

    MmsHelper.insert(
      recipient = Recipient.resolved(recipients[0]),
      sentTimeMillis = 2,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
    )

    val messageId3 = MmsHelper.insert(
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsHelper.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsHelper.kt
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.database
 import org.thoughtcrime.securesms.database.model.ParentStoryId
 import org.thoughtcrime.securesms.database.model.StoryType
 import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
-import org.thoughtcrime.securesms.mms.IncomingMessage
+import org.thoughtcrime.securesms.mms.IncomingMediaMessage
 import org.thoughtcrime.securesms.mms.OutgoingMessage
 import org.thoughtcrime.securesms.recipients.Recipient
 import java.util.Optional
@@ -55,9 +55,9 @@ object MmsHelper {
  }

  fun insert(
-    message: IncomingMessage,
+    message: IncomingMediaMessage,
    threadId: Long
  ): Optional<MessageTable.InsertResult> {
-    return SignalDatabase.messages.insertMessageInbox(message, threadId)
+    return SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, threadId)
  }
 }
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsTableTest_stories.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsTableTest_stories.kt
@@ -13,7 +13,7 @@ import org.thoughtcrime.securesms.database.model.DistributionListId
 import org.thoughtcrime.securesms.database.model.ParentStoryId
 import org.thoughtcrime.securesms.database.model.StoryType
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.mms.IncomingMessage
+import org.thoughtcrime.securesms.mms.IncomingMediaMessage
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.whispersystems.signalservice.api.push.ServiceId.ACI
@@ -73,8 +73,7 @@ class MmsTableTest_stories {
    )

    MmsHelper.insert(
-      IncomingMessage(
-        type = MessageType.NORMAL,
+      IncomingMediaMessage(
        from = sender,
        sentTimeMillis = 2,
        serverTimeMillis = 2,
@@ -96,8 +95,7 @@ class MmsTableTest_stories {
    // GIVEN
    val sender = recipients[0]
    val messageId = MmsHelper.insert(
-      IncomingMessage(
-        type = MessageType.NORMAL,
+      IncomingMediaMessage(
        from = sender,
        sentTimeMillis = 2,
        serverTimeMillis = 2,
@@ -124,8 +122,7 @@ class MmsTableTest_stories {
    // GIVEN
    val messageIds = recipients.take(5).map {
      MmsHelper.insert(
-        IncomingMessage(
-          type = MessageType.NORMAL,
+        IncomingMediaMessage(
          from = it,
          sentTimeMillis = 2,
          serverTimeMillis = 2,
@@ -157,8 +154,7 @@ class MmsTableTest_stories {
    val unviewedIds: List<Long> = (0 until 5).map {
      Thread.sleep(5)
      MmsHelper.insert(
-        IncomingMessage(
-          type = MessageType.NORMAL,
+        IncomingMediaMessage(
          from = recipients[it],
          sentTimeMillis = System.currentTimeMillis(),
          serverTimeMillis = 2,
@@ -172,8 +168,7 @@ class MmsTableTest_stories {
    val viewedIds: List<Long> = (0 until 5).map {
      Thread.sleep(5)
      MmsHelper.insert(
-        IncomingMessage(
-          type = MessageType.NORMAL,
+        IncomingMediaMessage(
          from = recipients[it],
          sentTimeMillis = System.currentTimeMillis(),
          serverTimeMillis = 2,
@@ -218,8 +213,7 @@ class MmsTableTest_stories {
  fun givenNoOutgoingStories_whenICheckIsOutgoingStoryAlreadyInDatabase_thenIExpectFalse() {
    // GIVEN
    MmsHelper.insert(
-      IncomingMessage(
-        type = MessageType.NORMAL,
+      IncomingMediaMessage(
        from = recipients[0],
        sentTimeMillis = 200,
        serverTimeMillis = 2,
@@ -327,8 +321,7 @@ class MmsTableTest_stories {
    )

    MmsHelper.insert(
-      IncomingMessage(
-        type = MessageType.NORMAL,
+      IncomingMediaMessage(
        from = myStory.id,
        sentTimeMillis = 201,
        serverTimeMillis = 201,
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/OneTimePreKeyTableTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/OneTimePreKeyTableTest.kt
@@ -1,137 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.database
-
-import junit.framework.TestCase.assertEquals
-import junit.framework.TestCase.assertNotNull
-import junit.framework.TestCase.assertNull
-import org.junit.Test
-import org.signal.core.util.readToSingleObject
-import org.signal.core.util.requireLongOrNull
-import org.signal.core.util.select
-import org.signal.core.util.update
-import org.signal.libsignal.protocol.ecc.Curve
-import org.signal.libsignal.protocol.state.PreKeyRecord
-import org.whispersystems.signalservice.api.push.ServiceId
-import org.whispersystems.signalservice.api.push.ServiceId.ACI
-import org.whispersystems.signalservice.api.push.ServiceId.PNI
-import java.util.UUID
-
-class OneTimePreKeyTableTest {
-
-  private val aci: ACI = ACI.from(UUID.randomUUID())
-  private val pni: PNI = PNI.from(UUID.randomUUID())
-
-  @Test
-  fun markAllStaleIfNecessary_onlyUpdatesMatchingAccountAndZeroValues() {
-    insertTestRecord(aci, id = 1)
-    insertTestRecord(aci, id = 2)
-    insertTestRecord(aci, id = 3, staleTime = 42)
-    insertTestRecord(pni, id = 4)
-
-    val now = System.currentTimeMillis()
-    SignalDatabase.oneTimePreKeys.markAllStaleIfNecessary(aci, now)
-
-    assertEquals(now, getStaleTime(aci, 1))
-    assertEquals(now, getStaleTime(aci, 2))
-    assertEquals(42L, getStaleTime(aci, 3))
-    assertEquals(0L, getStaleTime(pni, 4))
-  }
-
-  @Test
-  fun deleteAllStaleBefore_deleteOldBeforeThreshold() {
-    insertTestRecord(aci, id = 1, staleTime = 10)
-    insertTestRecord(aci, id = 2, staleTime = 10)
-    insertTestRecord(aci, id = 3, staleTime = 10)
-    insertTestRecord(aci, id = 4, staleTime = 15)
-    insertTestRecord(aci, id = 5, staleTime = 0)
-
-    SignalDatabase.oneTimePreKeys.deleteAllStaleBefore(aci, threshold = 11, minCount = 0)
-
-    assertNull(getStaleTime(aci, 1))
-    assertNull(getStaleTime(aci, 2))
-    assertNull(getStaleTime(aci, 3))
-    assertNotNull(getStaleTime(aci, 4))
-    assertNotNull(getStaleTime(aci, 5))
-  }
-
-  @Test
-  fun deleteAllStaleBefore_neverDeleteStaleOfZero() {
-    insertTestRecord(aci, id = 1, staleTime = 0)
-    insertTestRecord(aci, id = 2, staleTime = 0)
-    insertTestRecord(aci, id = 3, staleTime = 0)
-    insertTestRecord(aci, id = 4, staleTime = 0)
-    insertTestRecord(aci, id = 5, staleTime = 0)
-
-    SignalDatabase.oneTimePreKeys.deleteAllStaleBefore(aci, threshold = 10, minCount = 0)
-
-    assertNotNull(getStaleTime(aci, 1))
-    assertNotNull(getStaleTime(aci, 2))
-    assertNotNull(getStaleTime(aci, 3))
-    assertNotNull(getStaleTime(aci, 4))
-    assertNotNull(getStaleTime(aci, 5))
-  }
-
-  @Test
-  fun deleteAllStaleBefore_respectMinCount() {
-    insertTestRecord(aci, id = 1, staleTime = 10)
-    insertTestRecord(aci, id = 2, staleTime = 10)
-    insertTestRecord(aci, id = 3, staleTime = 10)
-    insertTestRecord(aci, id = 4, staleTime = 10)
-    insertTestRecord(aci, id = 5, staleTime = 10)
-
-    SignalDatabase.oneTimePreKeys.deleteAllStaleBefore(aci, threshold = 11, minCount = 3)
-
-    assertNull(getStaleTime(aci, 1))
-    assertNull(getStaleTime(aci, 2))
-    assertNotNull(getStaleTime(aci, 3))
-    assertNotNull(getStaleTime(aci, 4))
-    assertNotNull(getStaleTime(aci, 5))
-  }
-
-  @Test
-  fun deleteAllStaleBefore_respectAccount() {
-    insertTestRecord(aci, id = 1, staleTime = 10)
-    insertTestRecord(aci, id = 2, staleTime = 10)
-    insertTestRecord(aci, id = 3, staleTime = 10)
-
-    insertTestRecord(pni, id = 4, staleTime = 10)
-    insertTestRecord(pni, id = 5, staleTime = 10)
-
-    SignalDatabase.oneTimePreKeys.deleteAllStaleBefore(aci, threshold = 11, minCount = 2)
-
-    assertNull(getStaleTime(aci, 1))
-    assertNotNull(getStaleTime(aci, 2))
-    assertNotNull(getStaleTime(aci, 3))
-    assertNotNull(getStaleTime(pni, 4))
-    assertNotNull(getStaleTime(pni, 5))
-  }
-
-  private fun insertTestRecord(account: ServiceId, id: Int, staleTime: Long = 0) {
-    SignalDatabase.oneTimePreKeys.insert(
-      serviceId = account,
-      keyId = id,
-      record = PreKeyRecord(id, Curve.generateKeyPair())
-    )
-
-    val count = SignalDatabase.rawDatabase
-      .update(OneTimePreKeyTable.TABLE_NAME)
-      .values(OneTimePreKeyTable.STALE_TIMESTAMP to staleTime)
-      .where("${OneTimePreKeyTable.ACCOUNT_ID} = ? AND ${OneTimePreKeyTable.KEY_ID} = $id", account)
-      .run()
-
-    assertEquals(1, count)
-  }
-
-  private fun getStaleTime(account: ServiceId, id: Int): Long? {
-    return SignalDatabase.rawDatabase
-      .select(OneTimePreKeyTable.STALE_TIMESTAMP)
-      .from(OneTimePreKeyTable.TABLE_NAME)
-      .where("${OneTimePreKeyTable.ACCOUNT_ID} = ? AND ${OneTimePreKeyTable.KEY_ID} = $id", account)
-      .run()
-      .readToSingleObject { it.requireLongOrNull(OneTimePreKeyTable.STALE_TIMESTAMP) }
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest.kt
@@ -24,14 +24,14 @@ class RecipientTableTest {
  val harness = SignalActivityRule()

  @Test
-  fun givenAHiddenRecipient_whenIQueryAllContacts_thenIExpectHiddenToBeReturned() {
+  fun givenAHiddenRecipient_whenIQueryAllContacts_thenIDoNotExpectHiddenToBeReturned() {
    val hiddenRecipient = harness.others[0]
    SignalDatabase.recipients.setProfileName(hiddenRecipient, ProfileName.fromParts("Hidden", "Person"))
    SignalDatabase.recipients.markHidden(hiddenRecipient)

    val results = SignalDatabase.recipients.queryAllContacts("Hidden")!!

-    assertEquals(1, results.count)
+    assertEquals(0, results.count)
  }

  @Test
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_applyStorageSyncContactUpdate.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_applyStorageSyncContactUpdate.kt
@@ -38,8 +38,8 @@ class RecipientTableTest_applyStorageSyncContactUpdate {

    val newProto = oldRecord
      .toProto()
-      .newBuilder()
-      .identityState(ContactRecord.IdentityState.DEFAULT)
+      .toBuilder()
+      .setIdentityState(ContactRecord.IdentityState.DEFAULT)
      .build()
    val newRecord = SignalContactRecord(oldRecord.id, newProto)

--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_getAndPossiblyMerge.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_getAndPossiblyMerge.kt
@@ -14,10 +14,8 @@ import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.signal.core.util.Base64
 import org.signal.core.util.SqlUtil
 import org.signal.core.util.exists
-import org.signal.core.util.orNull
 import org.signal.core.util.requireLong
 import org.signal.core.util.requireNonNullString
 import org.signal.core.util.select
@@ -36,10 +34,12 @@ 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
-import org.thoughtcrime.securesms.mms.IncomingMessage
+import org.thoughtcrime.securesms.mms.IncomingMediaMessage
 import org.thoughtcrime.securesms.notifications.profiles.NotificationProfile
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.sms.IncomingTextMessage
+import org.thoughtcrime.securesms.util.Base64
 import org.thoughtcrime.securesms.util.FeatureFlags
 import org.thoughtcrime.securesms.util.FeatureFlagsAccessor
 import org.thoughtcrime.securesms.util.Util
@@ -60,6 +60,21 @@ class RecipientTableTest_getAndPossiblyMerge {
    FeatureFlagsAccessor.forceValue(FeatureFlags.PHONE_NUMBER_PRIVACY, true)
  }

+  @Test
+  fun single() {
+    test("merge, e164 + pni reassigned, aci abandoned") {
+      given(E164_A, PNI_A, ACI_A)
+      given(E164_B, PNI_B, ACI_B)
+
+      process(E164_A, PNI_A, ACI_B)
+
+      expect(null, null, ACI_A)
+      expect(E164_A, PNI_A, ACI_B)
+
+      expectChangeNumberEvent()
+    }
+  }
+
  @Test
  fun allNonMergeTests() {
    test("e164-only insert") {
@@ -70,7 +85,7 @@ class RecipientTableTest_getAndPossiblyMerge {
      assertEquals(RecipientTable.RegisteredState.UNKNOWN, record.registered)
    }

-    test("pni-only insert") {
+    test("pni-only insert", exception = IllegalArgumentException::class.java) {
      val id = process(null, PNI_A, null)
      expect(null, PNI_A, null)

@@ -87,27 +102,18 @@ class RecipientTableTest_getAndPossiblyMerge {
    }

    test("e164+pni insert") {
-      val id = process(E164_A, PNI_A, null)
+      process(E164_A, PNI_A, null)
      expect(E164_A, PNI_A, null)
-
-      val record = SignalDatabase.recipients.getRecord(id)
-      assertEquals(RecipientTable.RegisteredState.REGISTERED, record.registered)
    }

    test("e164+aci insert") {
-      val id = process(E164_A, null, ACI_A)
+      process(E164_A, null, ACI_A)
      expect(E164_A, null, ACI_A)
-
-      val record = SignalDatabase.recipients.getRecord(id)
-      assertEquals(RecipientTable.RegisteredState.REGISTERED, record.registered)
    }

    test("e164+pni+aci insert") {
-      val id = process(E164_A, PNI_A, ACI_A)
+      process(E164_A, PNI_A, ACI_A)
      expect(E164_A, PNI_A, ACI_A)
-
-      val record = SignalDatabase.recipients.getRecord(id)
-      assertEquals(RecipientTable.RegisteredState.REGISTERED, record.registered)
    }
  }

@@ -118,9 +124,9 @@ class RecipientTableTest_getAndPossiblyMerge {
      expect(E164_A, null, null)
    }

-    test("no match, pni-only") {
-      process(null, PNI_A, null)
-      expect(null, PNI_A, null)
+    test("no match, e164 and pni") {
+      process(E164_A, PNI_A, null)
+      expect(E164_A, PNI_A, null)
    }

    test("no match, aci-only") {
@@ -128,11 +134,6 @@ class RecipientTableTest_getAndPossiblyMerge {
      expect(null, null, ACI_A)
    }

-    test("no match, e164 and pni") {
-      process(E164_A, PNI_A, null)
-      expect(E164_A, PNI_A, null)
-    }
-
    test("no match, e164 and aci") {
      process(E164_A, null, ACI_A)
      expect(E164_A, null, ACI_A)
@@ -142,30 +143,6 @@ class RecipientTableTest_getAndPossiblyMerge {
      process(null, null, null)
    }

-    test("pni matches, pni+aci provided, no pni session") {
-      given(E164_A, PNI_A, null)
-      process(null, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-
-      expectNoSessionSwitchoverEvent()
-    }
-
-    test("pni matches, pni+aci provided, pni session") {
-      given(E164_A, PNI_A, null, pniSession = true)
-      process(null, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-
-      expectSessionSwitchoverEvent(E164_A)
-    }
-
-    test("pni matches, pni+aci provided, pni session, pni-verified") {
-      given(E164_A, PNI_A, null, pniSession = true)
-      process(null, PNI_A, ACI_A, pniVerified = true)
-      expect(E164_A, PNI_A, ACI_A)
-
-      expectNoSessionSwitchoverEvent()
-    }
-
    test("no match, all fields") {
      process(E164_A, PNI_A, ACI_A)
      expect(E164_A, PNI_A, ACI_A)
@@ -433,7 +410,7 @@ class RecipientTableTest_getAndPossiblyMerge {
      expectChangeNumberEvent()
    }

-    test("steal, e164 & pni+e164, no aci provided, pni session exists") {
+    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)

@@ -446,16 +423,6 @@ class RecipientTableTest_getAndPossiblyMerge {
      expectSessionSwitchoverEvent(id2, E164_B)
    }

-    test("steal, e164 & pni+e164, no aci provided, no pni session") {
-      given(E164_A, null, null)
-      given(E164_B, PNI_A, null)
-
-      process(E164_A, PNI_A, null)
-
-      expect(E164_A, PNI_A, null)
-      expect(E164_B, null, null)
-    }
-
    test("steal, e164+pni+aci & e164+aci, no pni provided, change number") {
      given(E164_A, PNI_A, ACI_A)
      given(E164_B, null, ACI_B)
@@ -468,76 +435,6 @@ class RecipientTableTest_getAndPossiblyMerge {
      expectChangeNumberEvent()
    }

-    test("steal, e164+aci & aci, no pni provided, existing aci session") {
-      given(E164_A, null, ACI_A, aciSession = true)
-      given(null, null, ACI_B)
-
-      process(E164_A, null, ACI_B)
-
-      expect(null, null, ACI_A)
-      expect(E164_A, null, ACI_B)
-
-      expectNoSessionSwitchoverEvent()
-    }
-
-    test("steal, e164+pni+aci & aci, no pni provided, existing aci session") {
-      given(E164_A, PNI_A, ACI_A, aciSession = true)
-      given(null, null, ACI_B)
-
-      process(E164_A, null, ACI_B)
-
-      expect(null, PNI_A, ACI_A)
-      expect(E164_A, null, ACI_B)
-
-      expectNoSessionSwitchoverEvent()
-    }
-
-    test("steal, e164+pni+aci & aci, no pni provided, existing pni session") {
-      given(E164_A, PNI_A, ACI_A, pniSession = true)
-      given(null, null, ACI_B)
-
-      process(E164_A, null, ACI_B)
-
-      expect(null, PNI_A, ACI_A)
-      expect(E164_A, null, ACI_B)
-
-      expectNoSessionSwitchoverEvent()
-    }
-
-    test("steal, e164+pni & aci, no pni provided, no pni session") {
-      given(E164_A, PNI_A, null)
-      given(null, null, ACI_A)
-
-      process(E164_A, null, ACI_A)
-
-      expect(null, PNI_A, null)
-      expect(E164_A, null, ACI_A)
-    }
-
-    test("steal, e164+pni & aci, no pni provided, pni session") {
-      given(E164_A, PNI_A, null, pniSession = true)
-      given(null, null, ACI_A)
-
-      process(E164_A, null, ACI_A)
-
-      expect(null, PNI_A, null)
-      expect(E164_A, null, ACI_A)
-
-      expectNoSessionSwitchoverEvent()
-    }
-
-    test("steal, e164+pni+aci * pni+aci, all provided, aci sessions but not pni sessions, no SSE expected") {
-      given(E164_A, PNI_A, ACI_A, createThread = true, aciSession = true, pniSession = false)
-      given(null, PNI_B, ACI_B, createThread = false, aciSession = true, pniSession = false)
-
-      process(E164_A, PNI_B, ACI_A)
-
-      expect(E164_A, PNI_B, ACI_A)
-      expect(null, null, ACI_B)
-
-      expectNoSessionSwitchoverEvent()
-    }
-
    test("merge, e164 & pni & aci, all provided") {
      given(E164_A, null, null)
      given(null, PNI_A, null)
@@ -793,22 +690,6 @@ class RecipientTableTest_getAndPossiblyMerge {
      process(E164_A, null, ACI_SELF, changeSelf = true)
      expect(E164_A, null, ACI_SELF)
    }
-
-    test("local user, local e164+aci provided, changeSelf=false, leave pni alone") {
-      given(E164_SELF, PNI_SELF, ACI_SELF)
-
-      process(E164_SELF, PNI_A, ACI_A)
-
-      expect(E164_SELF, PNI_SELF, ACI_SELF)
-    }
-
-    test("local user, local e164+aci provided, changeSelf=false, leave pni alone") {
-      given(E164_SELF, PNI_A, ACI_SELF)
-
-      process(E164_SELF, PNI_SELF, ACI_A)
-
-      expect(E164_SELF, PNI_A, ACI_SELF)
-    }
  }

  /**
@@ -825,9 +706,9 @@ class RecipientTableTest_getAndPossiblyMerge {
    val smsId2: Long = SignalDatabase.messages.insertMessageInbox(smsMessage(sender = recipientIdE164, time = 1, body = "1")).get().messageId
    val smsId3: Long = SignalDatabase.messages.insertMessageInbox(smsMessage(sender = recipientIdAci, time = 2, body = "2")).get().messageId

-    val mmsId1: Long = SignalDatabase.messages.insertMessageInbox(mmsMessage(sender = recipientIdAci, time = 3, body = "3"), -1).get().messageId
-    val mmsId2: Long = SignalDatabase.messages.insertMessageInbox(mmsMessage(sender = recipientIdE164, time = 4, body = "4"), -1).get().messageId
-    val mmsId3: Long = SignalDatabase.messages.insertMessageInbox(mmsMessage(sender = recipientIdAci, time = 5, body = "5"), -1).get().messageId
+    val mmsId1: Long = SignalDatabase.messages.insertSecureDecryptedMessageInbox(mmsMessage(sender = recipientIdAci, time = 3, body = "3"), -1).get().messageId
+    val mmsId2: Long = SignalDatabase.messages.insertSecureDecryptedMessageInbox(mmsMessage(sender = recipientIdE164, time = 4, body = "4"), -1).get().messageId
+    val mmsId3: Long = SignalDatabase.messages.insertSecureDecryptedMessageInbox(mmsMessage(sender = recipientIdAci, time = 5, body = "5"), -1).get().messageId

    val threadIdAci: Long = SignalDatabase.threads.getThreadIdFor(recipientIdAci)!!
    val threadIdE164: Long = SignalDatabase.threads.getThreadIdFor(recipientIdE164)!!
@@ -947,30 +828,12 @@ class RecipientTableTest_getAndPossiblyMerge {
    MatcherAssert.assertThat("Distribution list should have updated $recipientIdE164 to $recipientIdAci", updatedList.members, Matchers.containsInAnyOrder(recipientIdAci, recipientIdAciB))
  }

-  private fun smsMessage(sender: RecipientId, time: Long = 0, body: String = "", groupId: Optional<GroupId> = Optional.empty()): IncomingMessage {
-    return IncomingMessage(
-      type = MessageType.NORMAL,
-      from = sender,
-      sentTimeMillis = time,
-      serverTimeMillis = time,
-      receivedTimeMillis = time,
-      body = body,
-      groupId = groupId.orNull(),
-      isUnidentified = true
-    )
+  private fun smsMessage(sender: RecipientId, time: Long = 0, body: String = "", groupId: Optional<GroupId> = Optional.empty()): IncomingTextMessage {
+    return IncomingTextMessage(sender, 1, time, time, time, body, groupId, 0, true, null)
  }

-  private fun mmsMessage(sender: RecipientId, time: Long = 0, body: String = "", groupId: Optional<GroupId> = Optional.empty()): IncomingMessage {
-    return IncomingMessage(
-      type = MessageType.NORMAL,
-      from = sender,
-      groupId = groupId.orNull(),
-      body = body,
-      sentTimeMillis = time,
-      receivedTimeMillis = time,
-      serverTimeMillis = time,
-      isUnidentified = true
-    )
+  private fun mmsMessage(sender: RecipientId, time: Long = 0, body: String = "", groupId: Optional<GroupId> = Optional.empty()): IncomingMediaMessage {
+    return IncomingMediaMessage(sender, groupId, body, time, time, time, emptyList(), 0, 0, false, false, true, Optional.empty(), false, false)
  }

  private fun identityKey(value: Byte): IdentityKey {
@@ -1079,8 +942,7 @@ class RecipientTableTest_getAndPossiblyMerge {
      pni: PNI?,
      aci: ACI?,
      createThread: Boolean = true,
-      pniSession: Boolean = false,
-      aciSession: Boolean = false
+      pniSession: Boolean = false
    ): RecipientId {
      val id = insert(e164, pni, aci)
      generatedIds += id
@@ -1098,14 +960,6 @@ class RecipientTableTest_getAndPossiblyMerge {
        SignalDatabase.sessions.store(pni, SignalProtocolAddress(pni.toString(), 1), SessionRecord())
      }

-      if (aciSession) {
-        if (aci == null) {
-          throw IllegalArgumentException("aciSession = true but aci is null!")
-        }
-
-        SignalDatabase.sessions.store(aci, SignalProtocolAddress(aci.toString(), 1), SessionRecord())
-      }
-
      if (aci != null) {
        SignalDatabase.identities.saveIdentity(
          addressName = aci.toString(),
@@ -1282,7 +1136,7 @@ class RecipientTableTest_getAndPossiblyMerge {
      .use { cursor: Cursor ->
        if (cursor.moveToFirst()) {
          val bytes = Base64.decode(cursor.requireNonNullString(MessageTable.BODY))
-          ThreadMergeEvent.ADAPTER.decode(bytes)
+          ThreadMergeEvent.parseFrom(bytes)
        } else {
          null
        }
@@ -1300,7 +1154,7 @@ class RecipientTableTest_getAndPossiblyMerge {
      .use { cursor: Cursor ->
        if (cursor.moveToFirst()) {
          val bytes = Base64.decode(cursor.requireNonNullString(MessageTable.BODY))
-          SessionSwitchoverEvent.ADAPTER.decode(bytes)
+          SessionSwitchoverEvent.parseFrom(bytes)
        } else {
          null
        }
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/SmsDatabaseTest_collapseJoinRequestEventsIfPossible.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/SmsDatabaseTest_collapseJoinRequestEventsIfPossible.kt
@@ -18,10 +18,12 @@ import org.thoughtcrime.securesms.database.model.databaseprotos.groupChange
 import org.thoughtcrime.securesms.database.model.databaseprotos.groupContext
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.mms.IncomingMessage
 import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.sms.IncomingGroupUpdateMessage
+import org.thoughtcrime.securesms.sms.IncomingTextMessage
 import org.whispersystems.signalservice.api.push.ServiceId.ACI
 import org.whispersystems.signalservice.api.push.ServiceId.PNI
+import java.util.Optional
 import java.util.UUID

@Suppress("ClassName", "TestFunctionName")
@@ -270,28 +272,13 @@ class SmsDatabaseTest_collapseJoinRequestEventsIfPossible {
    assertThat("latest message should be deleted", sms.getMessageRecordOrNull(latestMessage.messageId), nullValue())
  }

-  private fun smsMessage(sender: RecipientId, body: String? = ""): IncomingMessage {
+  private fun smsMessage(sender: RecipientId, body: String? = ""): IncomingTextMessage {
    wallClock++
-    return IncomingMessage(
-      type = MessageType.NORMAL,
-      from = sender,
-      sentTimeMillis = wallClock,
-      serverTimeMillis = wallClock,
-      receivedTimeMillis = wallClock,
-      body = body,
-      groupId = groupId,
-      isUnidentified = true
-    )
+    return IncomingTextMessage(sender, 1, wallClock, wallClock, wallClock, body, Optional.of(groupId), 0, true, null)
  }

-  private fun groupUpdateMessage(sender: RecipientId, groupContext: DecryptedGroupV2Context): IncomingMessage {
-    wallClock++
-    return IncomingMessage.groupUpdate(
-      from = sender,
-      timestamp = wallClock,
-      groupId = groupId,
-      groupContext = groupContext
-    )
+  private fun groupUpdateMessage(sender: RecipientId, groupContext: DecryptedGroupV2Context): IncomingGroupUpdateMessage {
+    return IncomingGroupUpdateMessage(smsMessage(sender, null), groupContext)
  }

  companion object {
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/dependencies/InstrumentationApplicationDependencyProvider.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/dependencies/InstrumentationApplicationDependencyProvider.kt
@@ -13,9 +13,9 @@ import okio.ByteString
 import org.mockito.kotlin.any
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
-import org.signal.core.util.Base64
 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
@@ -23,25 +23,32 @@ 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.SignalKeyBackupServiceUrl
 import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration
 import org.whispersystems.signalservice.internal.configuration.SignalServiceUrl
 import org.whispersystems.signalservice.internal.configuration.SignalStorageUrl
 import org.whispersystems.signalservice.internal.configuration.SignalSvr2Url
+import java.security.KeyStore
 import java.util.Optional

 /**
 * Dependency provider used for instrumentation tests (aka androidTests).
 *
- * Handles setting up a mock web server for API calls, and provides mockable versions of [SignalServiceNetworkAccess].
+ * Handles setting up a mock web server for API calls, and provides mockable versions of [SignalServiceNetworkAccess] and
+ * [KeyBackupService].
 */
 class InstrumentationApplicationDependencyProvider(application: Application, default: ApplicationDependencyProvider) : ApplicationDependencies.Provider by default {

  private val serviceTrustStore: TrustStore
  private val uncensoredConfiguration: SignalServiceConfiguration
  private val serviceNetworkAccessMock: SignalServiceNetworkAccess
+  private val keyBackupService: KeyBackupService
  private val recipientCache: LiveRecipientCache

  init {
@@ -73,6 +80,7 @@ class InstrumentationApplicationDependencyProvider(application: Application, def
        0 to arrayOf(SignalCdnUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT)),
        2 to arrayOf(SignalCdnUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT))
      ),
+      signalKeyBackupServiceUrls = arrayOf(SignalKeyBackupServiceUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT)),
      signalStorageUrls = arrayOf(SignalStorageUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT)),
      signalCdsiUrls = arrayOf(SignalCdsiUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT)),
      signalSvr2Urls = arrayOf(SignalSvr2Url(baseUrl, serviceTrustStore, "localhost", ConnectionSpec.CLEARTEXT)),
@@ -80,8 +88,7 @@ class InstrumentationApplicationDependencyProvider(application: Application, def
      dns = Optional.of(SignalServiceNetworkAccess.DNS),
      signalProxy = Optional.empty(),
      zkGroupServerPublicParams = Base64.decode(BuildConfig.ZKGROUP_SERVER_PUBLIC_PARAMS),
-      genericServerPublicParams = Base64.decode(BuildConfig.GENERIC_SERVER_PUBLIC_PARAMS),
-      backupServerPublicParams = Base64.decode(BuildConfig.BACKUP_SERVER_PUBLIC_PARAMS)
+      genericServerPublicParams = Base64.decode(BuildConfig.GENERIC_SERVER_PUBLIC_PARAMS)
    )

    serviceNetworkAccessMock = mock {
@@ -90,6 +97,8 @@ class InstrumentationApplicationDependencyProvider(application: Application, def
      on { uncensoredConfiguration } doReturn uncensoredConfiguration
    }

+    keyBackupService = mock()
+
    recipientCache = LiveRecipientCache(application) { r -> r.run() }
  }

@@ -97,6 +106,10 @@ class InstrumentationApplicationDependencyProvider(application: Application, def
    return serviceNetworkAccessMock
  }

+  override fun provideKeyBackupService(signalServiceAccountManager: SignalServiceAccountManager, keyStore: KeyStore, enclave: KbsEnclave): KeyBackupService {
+    return keyBackupService
+  }
+
  override fun provideRecipientCache(): LiveRecipientCache {
    return recipientCache
  }
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJobTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJobTest.kt
@@ -1,84 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.jobs
-
-import android.net.Uri
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.core.util.StreamUtil
-import org.thoughtcrime.securesms.attachments.UriAttachment
-import org.thoughtcrime.securesms.database.AttachmentTable
-import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.database.UriAttachmentBuilder
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.jobmanager.Job
-import org.thoughtcrime.securesms.mms.SentMediaQuality
-import org.thoughtcrime.securesms.providers.BlobProvider
-import org.thoughtcrime.securesms.testing.SignalActivityRule
-import org.thoughtcrime.securesms.testing.assertIs
-import org.thoughtcrime.securesms.util.MediaUtil
-import java.util.Optional
-import java.util.concurrent.CountDownLatch
-
-@RunWith(AndroidJUnit4::class)
-class AttachmentCompressionJobTest {
-
-  @get:Rule
-  val harness = SignalActivityRule()
-
-  @Test
-  fun testCompressionJobsWithDifferentTransformPropertiesCompleteSuccessfully() {
-    val imageBytes: ByteArray = InstrumentationRegistry.getInstrumentation().context.resources.assets.open("images/sample_image.png").use {
-      StreamUtil.readFully(it)
-    }
-
-    val blob = BlobProvider.getInstance().forData(imageBytes).createForSingleSessionOnDisk(ApplicationDependencies.getApplication())
-
-    val firstPreUpload = createAttachment(1, blob, AttachmentTable.TransformProperties.empty())
-    val firstDatabaseAttachment = SignalDatabase.attachments.insertAttachmentForPreUpload(firstPreUpload)
-
-    val firstCompressionJob: AttachmentCompressionJob = AttachmentCompressionJob.fromAttachment(firstDatabaseAttachment, false, -1)
-
-    var secondCompressionJob: AttachmentCompressionJob? = null
-    var firstJobResult: Job.Result? = null
-    var secondJobResult: Job.Result? = null
-
-    val secondJobLatch = CountDownLatch(1)
-    val jobThread = Thread {
-      firstCompressionJob.setContext(ApplicationDependencies.getApplication())
-      firstJobResult = firstCompressionJob.run()
-
-      secondJobLatch.await()
-
-      secondCompressionJob!!.setContext(ApplicationDependencies.getApplication())
-      secondJobResult = secondCompressionJob!!.run()
-    }
-
-    jobThread.start()
-    val secondPreUpload = createAttachment(1, blob, AttachmentTable.TransformProperties.forSentMediaQuality(Optional.empty(), SentMediaQuality.HIGH))
-    val secondDatabaseAttachment = SignalDatabase.attachments.insertAttachmentForPreUpload(secondPreUpload)
-    secondCompressionJob = AttachmentCompressionJob.fromAttachment(secondDatabaseAttachment, false, -1)
-
-    secondJobLatch.countDown()
-
-    jobThread.join()
-
-    firstJobResult!!.isSuccess assertIs true
-    secondJobResult!!.isSuccess assertIs true
-  }
-
-  private fun createAttachment(id: Long, uri: Uri, transformProperties: AttachmentTable.TransformProperties): UriAttachment {
-    return UriAttachmentBuilder.build(
-      id,
-      uri = uri,
-      contentType = MediaUtil.IMAGE_JPEG,
-      transformProperties = transformProperties
-    )
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob__checkUsernameIsInSyncTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/jobs/RefreshOwnProfileJob__checkUsernameIsInSyncTest.kt
@@ -0,0 +1,181 @@
+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.Delete
+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() {
+    // GIVEN
+    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
+      Delete("/v1/accounts/username_hash") { MockResponse().success() }
+    )
+
+    // 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)
+  }
+}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/messages/EditMessageSyncProcessorTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/messages/EditMessageSyncProcessorTest.kt
@@ -22,9 +22,8 @@ import org.thoughtcrime.securesms.testing.MessageContentFuzzer
 import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.thoughtcrime.securesms.testing.assertIs
 import org.thoughtcrime.securesms.util.MessageTableTestUtils
-import org.whispersystems.signalservice.internal.push.Content
-import org.whispersystems.signalservice.internal.push.EditMessage
-import org.whispersystems.signalservice.internal.push.SyncMessage
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.EditMessage
 import kotlin.time.Duration.Companion.seconds

@RunWith(AndroidJUnit4::class)
@@ -39,6 +38,7 @@ class EditMessageSyncProcessorTest {
    )

    private val IGNORE_ATTACHMENT_COLUMNS = listOf(
+      AttachmentTable.UNIQUE_ID,
      AttachmentTable.TRANSFER_FILE
    )
  }
@@ -46,13 +46,13 @@ class EditMessageSyncProcessorTest {
  @get:Rule
  val harness = SignalActivityRule()

-  private lateinit var processorV2: MessageContentProcessor
+  private lateinit var processorV2: MessageContentProcessorV2
  private lateinit var testResult: TestResults
  private var envelopeTimestamp: Long = 0

  @Before
  fun setup() {
-    processorV2 = MessageContentProcessor(harness.context)
+    processorV2 = MessageContentProcessorV2(harness.context)
    envelopeTimestamp = System.currentTimeMillis()
    testResult = TestResults()
  }
@@ -67,17 +67,16 @@ class EditMessageSyncProcessorTest {

      val content = MessageContentFuzzer.fuzzTextMessage()
      val metadata = MessageContentFuzzer.envelopeMetadata(harness.self.id, toRecipient.id)
-      val syncContent = Content.Builder().syncMessage(
-        SyncMessage.Builder().sent(
-          SyncMessage.Sent.Builder()
-            .destinationServiceId(metadata.destinationServiceId.toString())
-            .timestamp(originalTimestamp)
-            .expirationStartTimestamp(originalTimestamp)
-            .message(content.dataMessage)
-            .build()
-        ).build()
+      val syncContent = SignalServiceProtos.Content.newBuilder().setSyncMessage(
+        SignalServiceProtos.SyncMessage.newBuilder().setSent(
+          SignalServiceProtos.SyncMessage.Sent.newBuilder()
+            .setDestinationServiceId(metadata.destinationServiceId.toString())
+            .setTimestamp(originalTimestamp)
+            .setExpirationStartTimestamp(originalTimestamp)
+            .setMessage(content.dataMessage)
+        )
      ).build()
-      SignalDatabase.recipients.setExpireMessages(toRecipient.id, content.dataMessage?.expireTimer ?: 0)
+      SignalDatabase.recipients.setExpireMessages(toRecipient.id, content.dataMessage.expireTimer)
      val syncTextMessage = TestMessage(
        envelope = MessageContentFuzzer.envelope(originalTimestamp),
        content = syncContent,
@@ -87,20 +86,18 @@ class EditMessageSyncProcessorTest {

      val editTimestamp = originalTimestamp + 200
      val editedContent = MessageContentFuzzer.fuzzTextMessage()
-      val editSyncContent = Content.Builder().syncMessage(
-        SyncMessage.Builder().sent(
-          SyncMessage.Sent.Builder()
-            .destinationServiceId(metadata.destinationServiceId.toString())
-            .timestamp(editTimestamp)
-            .expirationStartTimestamp(editTimestamp)
-            .editMessage(
-              EditMessage.Builder()
-                .dataMessage(editedContent.dataMessage)
-                .targetSentTimestamp(originalTimestamp)
-                .build()
+      val editSyncContent = SignalServiceProtos.Content.newBuilder().setSyncMessage(
+        SignalServiceProtos.SyncMessage.newBuilder().setSent(
+          SignalServiceProtos.SyncMessage.Sent.newBuilder()
+            .setDestinationServiceId(metadata.destinationServiceId.toString())
+            .setTimestamp(editTimestamp)
+            .setExpirationStartTimestamp(editTimestamp)
+            .setEditMessage(
+              EditMessage.newBuilder()
+                .setDataMessage(editedContent.dataMessage)
+                .setTargetSentTimestamp(originalTimestamp)
            )
-            .build()
-        ).build()
+        )
      ).build()

      val syncEditMessage = TestMessage(
@@ -112,38 +109,38 @@ class EditMessageSyncProcessorTest {

      testResult.runSync(listOf(syncTextMessage, syncEditMessage))

-      SignalDatabase.recipients.setExpireMessages(toRecipient.id, (content.dataMessage?.expireTimer ?: 0) / 1000)
+      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 ?: 0,
+        body = content.dataMessage.body,
+        expiresIn = content.dataMessage.expireTimer.seconds.inWholeMilliseconds,
        isUrgent = true,
        isSecure = true,
-        bodyRanges = content.dataMessage?.bodyRanges.toBodyRangeList()
+        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) > 0) {
+      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 ?: 0,
+        body = editedContent.dataMessage.body,
+        expiresIn = content.dataMessage.expireTimer.seconds.inWholeMilliseconds,
        isUrgent = true,
        isSecure = true,
-        bodyRanges = editedContent.dataMessage?.bodyRanges.toBodyRangeList(),
+        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) > 0) {
+      if (content.dataMessage.expireTimer > 0) {
        SignalDatabase.messages.markExpireStarted(editMessageId, originalTimestamp)
      }
      testResult.collectLocal()
@@ -170,7 +167,7 @@ class EditMessageSyncProcessorTest {

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

 import androidx.test.ext.junit.runners.AndroidJUnit4
-import okio.ByteString.Companion.toByteString
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.thoughtcrime.securesms.database.GroupReceiptTable
 import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.toProtoByteString
 import org.thoughtcrime.securesms.messages.SignalServiceProtoUtil.buildWith
 import org.thoughtcrime.securesms.testing.GroupTestingUtils
 import org.thoughtcrime.securesms.testing.GroupTestingUtils.asMember
@@ -15,22 +15,22 @@ import org.thoughtcrime.securesms.testing.MessageContentFuzzer
 import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.thoughtcrime.securesms.testing.assertIs
 import org.thoughtcrime.securesms.util.MessageTableTestUtils
-import org.whispersystems.signalservice.internal.push.DataMessage
-import org.whispersystems.signalservice.internal.push.GroupContextV2
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.DataMessage
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.GroupContextV2

@Suppress("ClassName")
@RunWith(AndroidJUnit4::class)
-class MessageContentProcessor__recipientStatusTest {
+class MessageContentProcessorV2__recipientStatusTest {

  @get:Rule
  val harness = SignalActivityRule()

-  private lateinit var processor: MessageContentProcessor
+  private lateinit var processorV2: MessageContentProcessorV2
  private var envelopeTimestamp: Long = 0

  @Before
  fun setup() {
-    processor = MessageContentProcessor(harness.context)
+    processorV2 = MessageContentProcessorV2(harness.context)
    envelopeTimestamp = System.currentTimeMillis()
  }

@@ -41,15 +41,15 @@ class MessageContentProcessor__recipientStatusTest {
  @Test
  fun syncGroupSentTextMessageWithRecipientUpdateFollowup() {
    val (groupId, masterKey, groupRecipientId) = GroupTestingUtils.insertGroup(revision = 0, harness.self.asMember(), harness.others[0].asMember(), harness.others[1].asMember())
-    val groupContextV2 = GroupContextV2.Builder().revision(0).masterKey(masterKey.serialize().toByteString()).build()
+    val groupContextV2 = GroupContextV2.newBuilder().setRevision(0).setMasterKey(masterKey.serialize().toProtoByteString()).build()

-    val initialTextMessage = DataMessage.Builder().buildWith {
+    val initialTextMessage = DataMessage.newBuilder().buildWith {
      body = MessageContentFuzzer.string()
      groupV2 = groupContextV2
      timestamp = envelopeTimestamp
    }

-    processor.process(
+    processorV2.process(
      envelope = MessageContentFuzzer.envelope(envelopeTimestamp),
      content = MessageContentFuzzer.syncSentTextMessage(initialTextMessage, deliveredTo = listOf(harness.others[0])),
      metadata = MessageContentFuzzer.envelopeMetadata(harness.self.id, harness.self.id, groupId),
@@ -61,7 +61,7 @@ class MessageContentProcessor__recipientStatusTest {
    val firstMessageId = firstSyncMessages[0].id
    val firstReceiptInfo = SignalDatabase.groupReceipts.getGroupReceiptInfo(firstMessageId)

-    processor.process(
+    processorV2.process(
      envelope = MessageContentFuzzer.envelope(envelopeTimestamp),
      content = MessageContentFuzzer.syncSentTextMessage(initialTextMessage, deliveredTo = listOf(harness.others[0], harness.others[1]), recipientUpdate = true),
      metadata = MessageContentFuzzer.envelopeMetadata(harness.self.id, harness.self.id, groupId),
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessor__handleStoryMessageTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessor__handleStoryMessageTest.kt
@@ -0,0 +1,181 @@
+package org.thoughtcrime.securesms.messages
+
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.signal.core.util.requireLong
+import org.signal.libsignal.zkgroup.groups.GroupMasterKey
+import org.signal.storageservice.protos.groups.Member
+import org.signal.storageservice.protos.groups.local.DecryptedGroup
+import org.signal.storageservice.protos.groups.local.DecryptedMember
+import org.thoughtcrime.securesms.database.MessageTable
+import org.thoughtcrime.securesms.database.MmsHelper
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.DistributionListId
+import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord
+import org.thoughtcrime.securesms.database.model.ParentStoryId
+import org.thoughtcrime.securesms.database.model.StoryType
+import org.thoughtcrime.securesms.mms.IncomingMediaMessage
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.testing.TestProtos
+import org.whispersystems.signalservice.api.messages.SignalServiceContent
+import org.whispersystems.signalservice.api.push.DistributionId
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.DataMessage
+import org.whispersystems.signalservice.internal.serialize.protos.SignalServiceContentProto
+import kotlin.random.Random
+
+@Suppress("ClassName")
+class MessageContentProcessor__handleStoryMessageTest : MessageContentProcessorTest() {
+
+  @Before
+  fun setUp() {
+    SignalDatabase.messages.deleteAllThreads()
+  }
+
+  @After
+  fun tearDown() {
+    SignalDatabase.messages.deleteAllThreads()
+  }
+
+  @Test
+  fun givenContentWithADirectStoryReplyWhenIProcessThenIInsertAReplyInTheCorrectThread() {
+    val sender = Recipient.resolved(harness.others.first())
+    val senderThreadId = SignalDatabase.threads.getOrCreateThreadIdFor(sender)
+    val myStory = Recipient.resolved(SignalDatabase.distributionLists.getRecipientId(DistributionListId.MY_STORY)!!)
+    val myStoryThread = SignalDatabase.threads.getOrCreateThreadIdFor(myStory)
+    val expectedSentTime = 200L
+    val storyMessageId = MmsHelper.insert(
+      sentTimeMillis = expectedSentTime,
+      recipient = myStory,
+      storyType = StoryType.STORY_WITH_REPLIES,
+      threadId = myStoryThread
+    )
+
+    SignalDatabase.storySends.insert(
+      messageId = storyMessageId,
+      recipientIds = listOf(sender.id),
+      sentTimestamp = expectedSentTime,
+      allowsReplies = true,
+      distributionId = DistributionId.MY_STORY
+    )
+
+    val expectedBody = "Hello!"
+
+    val storyContent: SignalServiceContentProto = createServiceContentWithStoryContext(
+      messageSender = sender,
+      storyAuthor = harness.self,
+      storySentTimestamp = expectedSentTime
+    ) {
+      body = expectedBody
+    }
+
+    runTestWithContent(contentProto = storyContent)
+
+    val replyId = SignalDatabase.messages.getConversation(senderThreadId, 0, 1).use {
+      it.moveToFirst()
+      it.requireLong(MessageTable.ID)
+    }
+
+    val replyRecord = SignalDatabase.messages.getMessageRecord(replyId) as MediaMmsMessageRecord
+    assertEquals(ParentStoryId.DirectReply(storyMessageId).serialize(), replyRecord.parentStoryId!!.serialize())
+    assertEquals(expectedBody, replyRecord.body)
+
+    SignalDatabase.messages.deleteAllThreads()
+  }
+
+  @Test
+  fun givenContentWithAGroupStoryReplyWhenIProcessThenIInsertAReplyToTheCorrectStory() {
+    val sender = Recipient.resolved(harness.others[0])
+    val groupMasterKey = GroupMasterKey(Random.nextBytes(GroupMasterKey.SIZE))
+    val decryptedGroupState = DecryptedGroup.newBuilder()
+      .addAllMembers(
+        listOf(
+          DecryptedMember.newBuilder()
+            .setUuid(harness.self.requireServiceId().toByteString())
+            .setJoinedAtRevision(0)
+            .setRole(Member.Role.DEFAULT)
+            .build(),
+          DecryptedMember.newBuilder()
+            .setUuid(sender.requireServiceId().toByteString())
+            .setJoinedAtRevision(0)
+            .setRole(Member.Role.DEFAULT)
+            .build()
+        )
+      )
+      .setRevision(0)
+      .build()
+
+    val group = SignalDatabase.groups.create(
+      groupMasterKey,
+      decryptedGroupState
+    )
+
+    val groupRecipient = Recipient.externalGroupExact(group!!)
+    val threadForGroup = SignalDatabase.threads.getOrCreateThreadIdFor(groupRecipient)
+
+    val insertResult = MmsHelper.insert(
+      message = IncomingMediaMessage(
+        from = sender.id,
+        sentTimeMillis = 100L,
+        serverTimeMillis = 101L,
+        receivedTimeMillis = 102L,
+        storyType = StoryType.STORY_WITH_REPLIES
+      ),
+      threadId = threadForGroup
+    )
+
+    val expectedBody = "Hello, World!"
+    val storyContent: SignalServiceContentProto = createServiceContentWithStoryContext(
+      messageSender = sender,
+      storyAuthor = sender,
+      storySentTimestamp = 100L
+    ) {
+      groupV2 = TestProtos.build { groupContextV2(masterKeyBytes = groupMasterKey.serialize()).build() }
+      body = expectedBody
+    }
+
+    runTestWithContent(storyContent)
+
+    val replyId = SignalDatabase.messages.getStoryReplies(insertResult.get().messageId).use { cursor ->
+      assertEquals(1, cursor.count)
+      cursor.moveToFirst()
+      cursor.requireLong(MessageTable.ID)
+    }
+
+    val replyRecord = SignalDatabase.messages.getMessageRecord(replyId) as MediaMmsMessageRecord
+    assertEquals(ParentStoryId.GroupReply(insertResult.get().messageId).serialize(), replyRecord.parentStoryId?.serialize())
+    assertEquals(threadForGroup, replyRecord.threadId)
+    assertEquals(expectedBody, replyRecord.body)
+
+    SignalDatabase.messages.deleteGroupStoryReplies(insertResult.get().messageId)
+    SignalDatabase.messages.deleteAllThreads()
+  }
+
+  /**
+   * Creates a ServiceContent proto with a StoryContext, and then
+   * uses `injectDataMessage` to fill in the data message object.
+   */
+  private fun createServiceContentWithStoryContext(
+    messageSender: Recipient,
+    storyAuthor: Recipient,
+    storySentTimestamp: Long,
+    injectDataMessage: DataMessage.Builder.() -> Unit
+  ): SignalServiceContentProto {
+    return createServiceContentWithDataMessage(messageSender) {
+      storyContext = TestProtos.build {
+        storyContext(
+          sentTimestamp = storySentTimestamp,
+          authorUuid = storyAuthor.requireServiceId().toString()
+        ).build()
+      }
+      injectDataMessage()
+    }
+  }
+
+  private fun runTestWithContent(contentProto: SignalServiceContentProto) {
+    val content = SignalServiceContent.createFromProto(contentProto)
+    val testSubject = createNormalContentTestSubject()
+    testSubject.doProcess(content = content!!)
+  }
+}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessor__handleTextMessageTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessor__handleTextMessageTest.kt
@@ -0,0 +1,33 @@
+package org.thoughtcrime.securesms.messages
+
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.whispersystems.signalservice.api.messages.SignalServiceContent
+import org.whispersystems.signalservice.internal.serialize.protos.SignalServiceContentProto
+
+@Suppress("ClassName")
+class MessageContentProcessor__handleTextMessageTest : MessageContentProcessorTest() {
+  @Test
+  fun givenContentWithATextMessageWhenIProcessThenIInsertTheTextMessage() {
+    val testSubject: MessageContentProcessor = createNormalContentTestSubject()
+    val expectedBody = "Hello, World!"
+    val contentProto: SignalServiceContentProto = createServiceContentWithDataMessage {
+      body = expectedBody
+    }
+
+    val content = SignalServiceContent.createFromProto(contentProto)
+
+    // WHEN
+    testSubject.doProcess(content = content!!)
+
+    // THEN
+    val record = SignalDatabase.messages.getMessageRecord(1)
+    val threadSize = SignalDatabase.messages.getMessageCountForThread(record.threadId)
+    assertEquals(1, threadSize)
+
+    assertTrue(record.isSecure)
+    assertEquals(expectedBody, record.body)
+  }
+}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageProcessingPerformanceTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageProcessingPerformanceTest.kt
@@ -6,6 +6,7 @@ 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.Ignore
@@ -25,9 +26,9 @@ 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.Envelope
-import org.whispersystems.signalservice.internal.websocket.WebSocketMessage
-import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage
+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
@@ -58,14 +59,14 @@ class MessageProcessingPerformanceTest {
    mockkStatic(UnidentifiedAccessUtil::class)
    every { UnidentifiedAccessUtil.getCertificateValidator() } returns FakeClientHelpers.noOpCertificateValidator

-    mockkObject(MessageContentProcessor)
-    every { MessageContentProcessor.create(harness.application) } returns TimingMessageContentProcessor(harness.application)
+    mockkObject(MessageContentProcessorV2)
+    every { MessageContentProcessorV2.create(harness.application) } returns TimingMessageContentProcessorV2(harness.application)
  }

  @After
  fun after() {
    unmockkStatic(UnidentifiedAccessUtil::class)
-    unmockkStatic(MessageContentProcessor::class)
+    unmockkStatic(MessageContentProcessorV2::class)
  }

  @Test
@@ -92,7 +93,7 @@ class MessageProcessingPerformanceTest {
    val messageCount = 100
    val envelopes = generateInboundEnvelopes(bobClient, messageCount)
    val firstTimestamp = envelopes.first().timestamp
-    val lastTimestamp = envelopes.last().timestamp ?: 0
+    val lastTimestamp = envelopes.last().timestamp

    // Inject the envelopes into the websocket
    Thread {
@@ -106,7 +107,7 @@ class MessageProcessingPerformanceTest {
    // Wait until they've all been fully decrypted + processed
    harness
      .inMemoryLogger
-      .getLockForUntil(TimingMessageContentProcessor.endTagPredicate(lastTimestamp))
+      .getLockForUntil(TimingMessageContentProcessorV2.endTagPredicate(lastTimestamp))
      .awaitFor(1.minutes)

    harness.inMemoryLogger.flush()
@@ -125,7 +126,7 @@ class MessageProcessingPerformanceTest {

    // Calculate MessageContentProcessor

-    val takeLast: List<Entry> = entries.filter { it.tag == TimingMessageContentProcessor.TAG }.drop(2)
+    val takeLast: List<Entry> = entries.filter { it.tag == TimingMessageContentProcessorV2.TAG }.drop(2)
    val iterator = takeLast.iterator()
    var processCount = 0L
    var processDuration = 0L
@@ -141,7 +142,7 @@ class MessageProcessingPerformanceTest {
    // Calculate messages per second from "retrieving" first message post session initialization to processing last message

    val start = entries.first { it.message == "Retrieved envelope! $firstTimestamp" }
-    val end = entries.first { it.message == TimingMessageContentProcessor.endTag(lastTimestamp) }
+    val end = entries.first { it.message == TimingMessageContentProcessorV2.endTag(lastTimestamp) }

    val duration = (end.timestamp - start.timestamp).toFloat() / 1000f
    val messagePerSecond = messageCount.toFloat() / duration
@@ -156,7 +157,7 @@ class MessageProcessingPerformanceTest {

    val aliceProcessFirstMessageLatch = harness
      .inMemoryLogger
-      .getLockForUntil(TimingMessageContentProcessor.endTagPredicate(firstPreKeyMessageTimestamp))
+      .getLockForUntil(TimingMessageContentProcessorV2.endTagPredicate(firstPreKeyMessageTimestamp))

    Thread { aliceClient.process(encryptedEnvelope, System.currentTimeMillis()) }.start()
    aliceProcessFirstMessageLatch.awaitFor(15.seconds)
@@ -178,19 +179,32 @@ class MessageProcessingPerformanceTest {
  }

  private fun webSocketTombstone(): ByteString {
-    return WebSocketMessage(request = WebSocketRequestMessage(verb = "PUT", path = "/api/v1/queue/empty")).encodeByteString()
+    return WebSocketMessage
+      .newBuilder()
+      .setRequest(
+        WebSocketRequestMessage.newBuilder()
+          .setVerb("PUT")
+          .setPath("/api/v1/queue/empty")
+      )
+      .build()
+      .toByteArray()
+      .toByteString()
  }

  private fun Envelope.toWebSocketPayload(): ByteString {
-    return WebSocketMessage(
-      type = WebSocketMessage.Type.REQUEST,
-      request = WebSocketRequestMessage(
-        verb = "PUT",
-        path = "/api/v1/message",
-        id = Random(System.currentTimeMillis()).nextLong(),
-        headers = listOf("X-Signal-Timestamp: ${this.timestamp}"),
-        body = this.encodeByteString()
+    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())
      )
-    ).encodeByteString()
+      .build()
+      .toByteArray()
+      .toByteString()
  }
 }
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/messages/TestMessage.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/messages/TestMessage.kt
@@ -1,12 +1,11 @@
 package org.thoughtcrime.securesms.messages

 import org.whispersystems.signalservice.api.crypto.EnvelopeMetadata
-import org.whispersystems.signalservice.internal.push.Content
-import org.whispersystems.signalservice.internal.push.Envelope
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos

 data class TestMessage(
-  val envelope: Envelope,
-  val content: Content,
+  val envelope: SignalServiceProtos.Envelope,
+  val content: SignalServiceProtos.Content,
  val metadata: EnvelopeMetadata,
  val serverDeliveredTimestamp: Long
 )
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/messages/TimingMessageContentProcessorV2.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/messages/TimingMessageContentProcessorV2.kt
@@ -5,12 +5,11 @@ import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.testing.LogPredicate
 import org.thoughtcrime.securesms.util.SignalLocalMetrics
 import org.whispersystems.signalservice.api.crypto.EnvelopeMetadata
-import org.whispersystems.signalservice.internal.push.Content
-import org.whispersystems.signalservice.internal.push.Envelope
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos

-class TimingMessageContentProcessor(context: Context) : MessageContentProcessor(context) {
+class TimingMessageContentProcessorV2(context: Context) : MessageContentProcessorV2(context) {
  companion object {
-    val TAG = Log.tag(TimingMessageContentProcessor::class.java)
+    val TAG = Log.tag(TimingMessageContentProcessorV2::class.java)

    fun endTagPredicate(timestamp: Long): LogPredicate = { entry ->
      entry.tag == TAG && entry.message == endTag(timestamp)
@@ -20,9 +19,9 @@ class TimingMessageContentProcessor(context: Context) : MessageContentProcessor(
    fun endTag(timestamp: Long) = "$timestamp end"
  }

-  override fun process(envelope: Envelope, content: Content, metadata: EnvelopeMetadata, serverDeliveredTimestamp: Long, processingEarlyContent: Boolean, localMetric: SignalLocalMetrics.MessageReceive?) {
-    Log.d(TAG, startTag(envelope.timestamp!!))
+  override fun process(envelope: SignalServiceProtos.Envelope, content: SignalServiceProtos.Content, metadata: EnvelopeMetadata, serverDeliveredTimestamp: Long, processingEarlyContent: Boolean, localMetric: SignalLocalMetrics.MessageReceive?) {
+    Log.d(TAG, startTag(envelope.timestamp))
    super.process(envelope, content, metadata, serverDeliveredTimestamp, processingEarlyContent, localMetric)
-    Log.d(TAG, endTag(envelope.timestamp!!))
+    Log.d(TAG, endTag(envelope.timestamp))
  }
 }
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditFragmentTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditFragmentTest.kt
@@ -33,7 +33,6 @@ import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.thoughtcrime.securesms.testing.assertIsNotNull
 import org.thoughtcrime.securesms.testing.assertIsNull
 import org.thoughtcrime.securesms.testing.success
-import org.whispersystems.signalservice.api.util.Usernames
 import org.whispersystems.signalservice.internal.push.ReserveUsernameResponse
 import java.util.concurrent.TimeUnit

@@ -97,7 +96,7 @@ class UsernameEditFragmentTest {
  fun testNicknameUpdateHappyPath() {
    val nickname = "Spiderman"
    val discriminator = "4578"
-    val username = "$nickname${Usernames.DELIMITER}$discriminator"
+    val username = "$nickname${UsernameState.DELIMITER}$discriminator"

    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
      Put("/v1/accounts/username/reserved") {
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/storage/ContactRecordProcessorTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/storage/ContactRecordProcessorTest.kt
@@ -6,12 +6,12 @@ import org.junit.Assert.assertNotEquals
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.signal.core.util.Base64
 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.ServiceId.ACI
@@ -38,21 +38,16 @@ class ContactRecordProcessorTest {
    val originalId = SignalDatabase.recipients.getAndPossiblyMerge(ACI_A, PNI_A, E164_A)
    setStorageId(originalId, STORAGE_ID_A)

-    val remote1 = buildRecord(
-      STORAGE_ID_B,
-      ContactRecord(
-        aci = ACI_A.toString(),
-        unregisteredAtTimestamp = 100
-      )
-    )
+    val remote1 = buildRecord(STORAGE_ID_B) {
+      setAci(ACI_A.toString())
+      setUnregisteredAtTimestamp(100)
+    }

-    val remote2 = buildRecord(
-      STORAGE_ID_C,
-      ContactRecord(
-        pni = PNI_A.toString(),
-        e164 = E164_A
-      )
-    )
+    val remote2 = buildRecord(STORAGE_ID_C) {
+      setAci(PNI_A.toString())
+      setPni(PNI_A.toString())
+      setE164(E164_A)
+    }

    // WHEN
    val subject = ContactRecordProcessor()
@@ -75,22 +70,16 @@ class ContactRecordProcessorTest {
    val originalId = SignalDatabase.recipients.getAndPossiblyMerge(ACI_A, PNI_A, E164_A)
    setStorageId(originalId, STORAGE_ID_A)

-    val remote1 = buildRecord(
-      STORAGE_ID_B,
-      ContactRecord(
-        aci = ACI_A.toString(),
-        unregisteredAtTimestamp = 0
-      )
-    )
+    val remote1 = buildRecord(STORAGE_ID_B) {
+      setAci(ACI_A.toString())
+      setUnregisteredAtTimestamp(0)
+    }

-    val remote2 = buildRecord(
-      STORAGE_ID_C,
-      ContactRecord(
-        aci = PNI_A.toString(),
-        pni = PNI_A.toString(),
-        e164 = E164_A
-      )
-    )
+    val remote2 = buildRecord(STORAGE_ID_C) {
+      setAci(PNI_A.toString())
+      setPni(PNI_A.toString())
+      setE164(E164_A)
+    }

    // WHEN
    val subject = ContactRecordProcessor()
@@ -106,14 +95,14 @@ class ContactRecordProcessorTest {
    assertEquals(byAci, byE164)
  }

-  private fun buildRecord(id: StorageId, record: ContactRecord): SignalContactRecord {
-    return SignalContactRecord(id, record)
+  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.encodeWithPadding(storageId.raw))
+      .values(RecipientTable.STORAGE_SERVICE_ID to Base64.encodeBytes(storageId.raw))
      .where("${RecipientTable.ID} = ?", recipientId)
      .run()
  }
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/AliceClient.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/AliceClient.kt
@@ -11,7 +11,7 @@ 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.Envelope
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.Envelope

 /**
 * Welcome to Alice's Client.
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/BobClient.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/BobClient.kt
@@ -31,7 +31,8 @@ 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.Envelope
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos
+import java.lang.UnsupportedOperationException
 import java.util.Optional
 import java.util.UUID
 import java.util.concurrent.locks.ReentrantLock
@@ -60,7 +61,7 @@ class BobClient(val serviceId: ServiceId, val e164: String, val identityKeyPair:
  }

  /** Inspired by SignalServiceMessageSender#getEncryptedMessage */
-  fun encrypt(now: Long): Envelope {
+  fun encrypt(now: Long): SignalServiceProtos.Envelope {
    val envelopeContent = FakeClientHelpers.encryptedTextMessage(now)

    val cipher = SignalServiceCipher(serviceAddress, 1, aciStore, sessionLock, null)
@@ -71,10 +72,10 @@ class BobClient(val serviceId: ServiceId, val e164: String, val identityKeyPair:
    }

    return cipher.encrypt(getAliceProtocolAddress(), getAliceUnidentifiedAccess(), envelopeContent)
-      .toEnvelope(envelopeContent.content.get().dataMessage!!.timestamp!!, getAliceServiceId())
+      .toEnvelope(envelopeContent.content.get().dataMessage.timestamp, getAliceServiceId())
  }

-  fun decrypt(envelope: Envelope, serverDeliveredTimestamp: Long) {
+  fun decrypt(envelope: SignalServiceProtos.Envelope, serverDeliveredTimestamp: Long) {
    val cipher = SignalServiceCipher(serviceAddress, 1, aciStore, sessionLock, UnidentifiedAccessUtil.getCertificateValidator())
    cipher.decrypt(envelope, serverDeliveredTimestamp)
  }
@@ -143,6 +144,7 @@ class BobClient(val serviceId: ServiceId, val e164: String, val identityKeyPair:
    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()
@@ -160,20 +162,17 @@ class BobClient(val serviceId: ServiceId, val e164: String, val identityKeyPair:
    override fun storeKyberPreKey(kyberPreKeyId: Int, record: KyberPreKeyRecord?) = throw UnsupportedOperationException()
    override fun containsKyberPreKey(kyberPreKeyId: Int): Boolean = throw UnsupportedOperationException()
    override fun markKyberPreKeyUsed(kyberPreKeyId: Int) = throw UnsupportedOperationException()
-    override fun deleteAllStaleOneTimeEcPreKeys(threshold: Long, minCount: Int) = throw UnsupportedOperationException()
-    override fun markAllOneTimeEcPreKeysStaleIfNecessary(staleTime: Long) = 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>?): MutableMap<SignalProtocolAddress, SessionRecord> = 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 storeLastResortKyberPreKey(kyberPreKeyId: Int, kyberPreKeyRecord: KyberPreKeyRecord) = throw UnsupportedOperationException()
    override fun removeKyberPreKey(kyberPreKeyId: Int) = throw UnsupportedOperationException()
-    override fun markAllOneTimeKyberPreKeysStaleIfNecessary(staleTime: Long) = throw UnsupportedOperationException()
-    override fun deleteAllStaleOneTimeKyberPreKeys(threshold: Long, minCount: Int) = throw UnsupportedOperationException()
    override fun loadLastResortKyberPreKeys(): List<KyberPreKeyRecord> = throw UnsupportedOperationException()
+
    override fun isMultiDevice(): Boolean = throw UnsupportedOperationException()
  }
 }
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/FakeClientHelpers.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/FakeClientHelpers.kt
@@ -1,7 +1,5 @@
 package org.thoughtcrime.securesms.testing

-import okio.ByteString.Companion.toByteString
-import org.signal.core.util.Base64
 import org.signal.libsignal.internal.Native
 import org.signal.libsignal.internal.NativeHandleGuard
 import org.signal.libsignal.metadata.certificate.CertificateValidator
@@ -11,16 +9,16 @@ 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.messages.SignalServiceProtoUtil.buildWith
+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.Content
-import org.whispersystems.signalservice.internal.push.DataMessage
-import org.whispersystems.signalservice.internal.push.Envelope
 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

@@ -54,9 +52,9 @@ object FakeClientHelpers {
  }

  fun encryptedTextMessage(now: Long, message: String = "Test body message"): EnvelopeContent {
-    val content = Content.Builder().apply {
-      dataMessage(
-        DataMessage.Builder().buildWith {
+    val content = SignalServiceProtos.Content.newBuilder().apply {
+      setDataMessage(
+        SignalServiceProtos.DataMessage.newBuilder().apply {
          body = message
          timestamp = now
        }
@@ -66,16 +64,16 @@ object FakeClientHelpers {
  }

  fun OutgoingPushMessage.toEnvelope(timestamp: Long, destination: ServiceId): Envelope {
-    return Envelope.Builder()
-      .type(Envelope.Type.fromValue(this.type))
-      .sourceDevice(1)
-      .timestamp(timestamp)
-      .serverTimestamp(timestamp + 1)
-      .destinationServiceId(destination.toString())
-      .serverGuid(UUID.randomUUID().toString())
-      .content(Base64.decode(this.content).toByteString())
-      .urgent(true)
-      .story(false)
+    return Envelope.newBuilder()
+      .setType(Envelope.Type.valueOf(this.type))
+      .setSourceDevice(1)
+      .setTimestamp(timestamp)
+      .setServerTimestamp(timestamp + 1)
+      .setDestinationServiceId(destination.toString())
+      .setServerGuid(UUID.randomUUID().toString())
+      .setContent(Base64.decode(this.content).toProtoByteString())
+      .setUrgent(true)
+      .setStory(false)
      .build()
  }
 }
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/GroupTestingUtils.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/GroupTestingUtils.kt
@@ -8,27 +8,27 @@ import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import org.whispersystems.signalservice.api.push.ServiceId
 import kotlin.random.Random

 /**
 * Helper methods for creating groups for message processing tests et al.
 */
 object GroupTestingUtils {
-  fun member(aci: ACI, revision: Int = 0, role: Member.Role = Member.Role.ADMINISTRATOR): DecryptedMember {
-    return DecryptedMember.Builder()
-      .aciBytes(aci.toByteString())
-      .joinedAtRevision(revision)
-      .role(role)
+  fun member(serviceId: ServiceId, revision: Int = 0, role: Member.Role = Member.Role.ADMINISTRATOR): DecryptedMember {
+    return DecryptedMember.newBuilder()
+      .setUuid(serviceId.toByteString())
+      .setJoinedAtRevision(revision)
+      .setRole(role)
      .build()
  }

  fun insertGroup(revision: Int = 0, vararg members: DecryptedMember): TestGroupInfo {
    val groupMasterKey = GroupMasterKey(Random.nextBytes(GroupMasterKey.SIZE))
-    val decryptedGroupState = DecryptedGroup.Builder()
-      .members(members.toList())
-      .revision(revision)
-      .title(MessageContentFuzzer.string())
+    val decryptedGroupState = DecryptedGroup.newBuilder()
+      .addAllMembers(members.toList())
+      .setRevision(revision)
+      .setTitle(MessageContentFuzzer.string())
      .build()

    val groupId = SignalDatabase.groups.create(groupMasterKey, decryptedGroupState)!!
@@ -43,7 +43,7 @@ object GroupTestingUtils {
  }

  fun Recipient.asMember(): DecryptedMember {
-    return member(aci = requireAci())
+    return member(serviceId = requireServiceId())
  }

  data class TestGroupInfo(val groupId: GroupId.V2, val masterKey: GroupMasterKey, val recipientId: RecipientId)
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/MessageContentFuzzer.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/MessageContentFuzzer.kt
@@ -1,20 +1,21 @@
 package org.thoughtcrime.securesms.testing

-import okio.ByteString
-import okio.ByteString.Companion.toByteString
+import com.google.protobuf.ByteString
+import org.thoughtcrime.securesms.database.model.toProtoByteString
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.messages.SignalServiceProtoUtil.buildWith
 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.internal.push.AttachmentPointer
-import org.whispersystems.signalservice.internal.push.BodyRange
-import org.whispersystems.signalservice.internal.push.Content
-import org.whispersystems.signalservice.internal.push.DataMessage
-import org.whispersystems.signalservice.internal.push.Envelope
-import org.whispersystems.signalservice.internal.push.GroupContextV2
-import org.whispersystems.signalservice.internal.push.SyncMessage
+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 org.whispersystems.signalservice.internal.push.SignalServiceProtos.GroupContextV2
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.SyncMessage
 import java.util.UUID
 import kotlin.random.Random
 import kotlin.random.nextInt
@@ -34,10 +35,10 @@ object MessageContentFuzzer {
   * Create an [Envelope].
   */
  fun envelope(timestamp: Long): Envelope {
-    return Envelope.Builder()
-      .timestamp(timestamp)
-      .serverTimestamp(timestamp + 5)
-      .serverGuid(UUID.randomUUID().toString())
+    return Envelope.newBuilder()
+      .setTimestamp(timestamp)
+      .setServerTimestamp(timestamp + 5)
+      .setServerGuidBytes(UuidUtil.toByteString(UUID.randomUUID()))
      .build()
  }

@@ -61,22 +62,20 @@ object MessageContentFuzzer {
   * - Bold style body ranges
   */
  fun fuzzTextMessage(groupContextV2: GroupContextV2? = null): Content {
-    return Content.Builder()
-      .dataMessage(
-        DataMessage.Builder().buildWith {
+    return Content.newBuilder()
+      .setDataMessage(
+        DataMessage.newBuilder().buildWith {
          body = string()
          if (random.nextBoolean()) {
            expireTimer = random.nextInt(0..28.days.inWholeSeconds.toInt())
          }
          if (random.nextBoolean()) {
-            bodyRanges(
-              listOf(
-                BodyRange.Builder().buildWith {
-                  start = 0
-                  length = 1
-                  style = BodyRange.Style.BOLD
-                }
-              )
+            addBodyRanges(
+              SignalServiceProtos.BodyRange.newBuilder().buildWith {
+                start = 0
+                length = 1
+                style = SignalServiceProtos.BodyRange.Style.BOLD
+              }
            )
          }
          if (groupContextV2 != null) {
@@ -96,16 +95,16 @@ object MessageContentFuzzer {
    recipientUpdate: Boolean = false
  ): Content {
    return Content
-      .Builder()
-      .syncMessage(
-        SyncMessage.Builder().buildWith {
-          sent = SyncMessage.Sent.Builder().buildWith {
+      .newBuilder()
+      .setSyncMessage(
+        SyncMessage.newBuilder().buildWith {
+          sent = SyncMessage.Sent.newBuilder().buildWith {
            timestamp = textMessage.timestamp
            message = textMessage
            isRecipientUpdate = recipientUpdate
-            unidentifiedStatus(
+            addAllUnidentifiedStatus(
              deliveredTo.map {
-                SyncMessage.Sent.UnidentifiedDeliveryStatus.Builder().buildWith {
+                SyncMessage.Sent.UnidentifiedDeliveryStatus.newBuilder().buildWith {
                  destinationServiceId = Recipient.resolved(it).requireServiceId().toString()
                  unidentified = true
                }
@@ -124,9 +123,9 @@ object MessageContentFuzzer {
   * - A message with 0-2 attachment pointers and may contain a text body
   */
  fun fuzzMediaMessageWithBody(quoteAble: List<TestMessage> = emptyList()): Content {
-    return Content.Builder()
-      .dataMessage(
-        DataMessage.Builder().buildWith {
+    return Content.newBuilder()
+      .setDataMessage(
+        DataMessage.newBuilder().buildWith {
          if (random.nextBoolean()) {
            body = string()
          }
@@ -134,28 +133,28 @@ object MessageContentFuzzer {
          if (random.nextBoolean() && quoteAble.isNotEmpty()) {
            body = string()
            val quoted = quoteAble.random(random)
-            quote = DataMessage.Quote.Builder().buildWith {
+            quote = DataMessage.Quote.newBuilder().buildWith {
              id = quoted.envelope.timestamp
              authorAci = quoted.metadata.sourceServiceId.toString()
-              text = quoted.content.dataMessage?.body
-              attachments(quoted.content.dataMessage?.attachments ?: emptyList())
-              bodyRanges(quoted.content.dataMessage?.bodyRanges ?: emptyList())
+              text = quoted.content.dataMessage.body
+              addAllAttachments(quoted.content.dataMessage.attachmentsList)
+              addAllBodyRanges(quoted.content.dataMessage.bodyRangesList)
              type = DataMessage.Quote.Type.NORMAL
            }
          }

          if (random.nextFloat() < 0.1 && quoteAble.isNotEmpty()) {
            val quoted = quoteAble.random(random)
-            quote = DataMessage.Quote.Builder().buildWith {
-              id = random.nextLong(quoted.envelope.timestamp!! - 1000000, quoted.envelope.timestamp!!)
+            quote = DataMessage.Quote.newBuilder().buildWith {
+              id = random.nextLong(quoted.envelope.timestamp - 1000000, quoted.envelope.timestamp)
              authorAci = quoted.metadata.sourceServiceId.toString()
-              text = quoted.content.dataMessage?.body
+              text = quoted.content.dataMessage.body
            }
          }

          if (random.nextFloat() < 0.25) {
            val total = random.nextInt(1, 2)
-            attachments((0..total).map { attachmentPointer() })
+            (0..total).forEach { _ -> addAttachments(attachmentPointer()) }
          }
        }
      )
@@ -167,12 +166,12 @@ object MessageContentFuzzer {
   * - A reaction to a prior message
   */
  fun fuzzMediaMessageNoContent(previousMessages: List<TestMessage> = emptyList()): Content {
-    return Content.Builder()
-      .dataMessage(
-        DataMessage.Builder().buildWith {
+    return Content.newBuilder()
+      .setDataMessage(
+        DataMessage.newBuilder().buildWith {
          if (random.nextFloat() < 0.25) {
            val reactTo = previousMessages.random(random)
-            reaction = DataMessage.Reaction.Builder().buildWith {
+            reaction = DataMessage.Reaction.newBuilder().buildWith {
              emoji = emojis.random(random)
              remove = false
              targetAuthorAci = reactTo.metadata.sourceServiceId.toString()
@@ -188,15 +187,15 @@ object MessageContentFuzzer {
   * - A sticker
   */
  fun fuzzMediaMessageNoText(previousMessages: List<TestMessage> = emptyList()): Content {
-    return Content.Builder()
-      .dataMessage(
-        DataMessage.Builder().buildWith {
+    return Content.newBuilder()
+      .setDataMessage(
+        DataMessage.newBuilder().buildWith {
          if (random.nextFloat() < 0.9) {
-            sticker = DataMessage.Sticker.Builder().buildWith {
+            sticker = DataMessage.Sticker.newBuilder().buildWith {
              packId = byteString(length = 24)
              packKey = byteString(length = 128)
              stickerId = random.nextInt()
-              data_ = attachmentPointer()
+              data = attachmentPointer()
              emoji = emojis.random(random)
            }
          }
@@ -224,14 +223,14 @@ object MessageContentFuzzer {
   * Generate a random [ByteString].
   */
  fun byteString(length: Int = 512): ByteString {
-    return random.nextBytes(length).toByteString()
+    return random.nextBytes(length).toProtoByteString()
  }

  /**
   * Generate a random [AttachmentPointer].
   */
  fun attachmentPointer(): AttachmentPointer {
-    return AttachmentPointer.Builder().run {
+    return AttachmentPointer.newBuilder().run {
      cdnKey = string()
      contentType = mediaTypes.random(random)
      key = byteString()
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/MockProvider.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/MockProvider.kt
@@ -1,12 +1,22 @@
 package org.thoughtcrime.securesms.testing

+import org.mockito.kotlin.anyOrNull
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.stub
+import org.signal.core.util.Hex
 import org.signal.libsignal.protocol.IdentityKeyPair
 import org.signal.libsignal.protocol.ecc.Curve
 import org.signal.libsignal.protocol.state.PreKeyRecord
 import org.signal.libsignal.protocol.util.KeyHelper
 import org.signal.libsignal.protocol.util.Medium
+import org.signal.libsignal.svr2.PinHash
 import org.thoughtcrime.securesms.crypto.PreKeyUtil
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.test.BuildConfig
+import org.whispersystems.signalservice.api.KeyBackupService
+import org.whispersystems.signalservice.api.SvrPinData
+import org.whispersystems.signalservice.api.kbs.MasterKey
 import org.whispersystems.signalservice.api.messages.multidevice.DeviceInfo
 import org.whispersystems.signalservice.api.push.ServiceId
 import org.whispersystems.signalservice.api.push.SignedPreKeyEntity
@@ -68,6 +78,18 @@ object MockProvider {
    }
  }

+  fun mockGetRegistrationLockStringFlow() {
+    val session: KeyBackupService.RestoreSession = object : KeyBackupService.RestoreSession {
+      override fun hashSalt(): ByteArray = Hex.fromStringCondensed("cba811749042b303a6a7efa5ccd160aea5e3ea243c8d2692bd13d515732f51a8")
+      override fun restorePin(hashedPin: PinHash?): SvrPinData = SvrPinData(MasterKey.createNew(SecureRandom()), null)
+    }
+
+    val kbsService = ApplicationDependencies.getKeyBackupService(BuildConfig.KBS_ENCLAVE)
+    kbsService.stub {
+      on { newRegistrationSession(anyOrNull(), anyOrNull()) } doReturn session
+    }
+  }
+
  fun createPreKeyResponse(identity: IdentityKeyPair = SignalStore.account().aciIdentityKey, deviceId: Int): PreKeyResponse {
    val signedPreKeyRecord = PreKeyUtil.generateSignedPreKey(SecureRandom().nextInt(Medium.MAX_VALUE), identity.privateKey)
    val oneTimePreKey = PreKeyRecord(SecureRandom().nextInt(Medium.MAX_VALUE), Curve.generateKeyPair())
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/TestProtos.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/TestProtos.kt
@@ -0,0 +1,70 @@
+package org.thoughtcrime.securesms.testing
+
+import com.google.protobuf.ByteString
+import org.signal.libsignal.zkgroup.groups.GroupMasterKey
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.DataMessage
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.GroupContextV2
+import org.whispersystems.signalservice.internal.serialize.protos.AddressProto
+import org.whispersystems.signalservice.internal.serialize.protos.MetadataProto
+import org.whispersystems.signalservice.internal.serialize.protos.SignalServiceContentProto
+import java.util.UUID
+import kotlin.random.Random
+
+class TestProtos private constructor() {
+  fun address(
+    uuid: UUID = UUID.randomUUID()
+  ): AddressProto.Builder {
+    return AddressProto.newBuilder()
+      .setUuid(ACI.from(uuid).toByteString())
+  }
+
+  fun metadata(
+    address: AddressProto = address().build()
+  ): MetadataProto.Builder {
+    return MetadataProto.newBuilder()
+      .setAddress(address)
+  }
+
+  fun groupContextV2(
+    revision: Int = 0,
+    masterKeyBytes: ByteArray = Random.Default.nextBytes(GroupMasterKey.SIZE)
+  ): GroupContextV2.Builder {
+    return GroupContextV2.newBuilder()
+      .setRevision(revision)
+      .setMasterKey(ByteString.copyFrom(masterKeyBytes))
+  }
+
+  fun storyContext(
+    sentTimestamp: Long = Random.nextLong(),
+    authorUuid: String = UUID.randomUUID().toString()
+  ): DataMessage.StoryContext.Builder {
+    return DataMessage.StoryContext.newBuilder()
+      .setAuthorAci(authorUuid)
+      .setSentTimestamp(sentTimestamp)
+  }
+
+  fun dataMessage(): DataMessage.Builder {
+    return DataMessage.newBuilder()
+  }
+
+  fun content(): SignalServiceProtos.Content.Builder {
+    return SignalServiceProtos.Content.newBuilder()
+  }
+
+  fun serviceContent(
+    localAddress: AddressProto = address().build(),
+    metadata: MetadataProto = metadata().build()
+  ): SignalServiceContentProto.Builder {
+    return SignalServiceContentProto.newBuilder()
+      .setLocalAddress(localAddress)
+      .setMetadata(metadata)
+  }
+
+  companion object {
+    fun <T> build(buildFn: TestProtos.() -> T): T {
+      return TestProtos().buildFn()
+    }
+  }
+}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/TestUtils.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/TestUtils.kt
@@ -1,19 +1,11 @@
 package org.thoughtcrime.securesms.testing

-import android.database.Cursor
-import android.util.Base64
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.hasSize
 import org.hamcrest.Matchers.`is`
 import org.hamcrest.Matchers.not
 import org.hamcrest.Matchers.notNullValue
 import org.hamcrest.Matchers.nullValue
-import org.signal.core.util.logging.Log
-import org.signal.core.util.readToList
-import org.signal.core.util.select
-import org.thoughtcrime.securesms.database.MessageTable
-import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.util.MessageTableTestUtils
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.TimeoutException
@@ -61,29 +53,3 @@ fun CountDownLatch.awaitFor(duration: Duration) {
    throw TimeoutException("Latch await took longer than ${duration.inWholeMilliseconds}ms")
  }
 }
-
-fun dumpTableToLogs(tag: String = "TestUtils", table: String) {
-  dumpTable(table).forEach { Log.d(tag, it.toString()) }
-}
-
-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 = MessageTableTestUtils.typeColumnToString(cursor.getLong(index))
-        }
-
-        column to data
-      }
-      map
-    }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/util/MessageTableTestUtils.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/util/MessageTableTestUtils.kt
@@ -38,8 +38,10 @@ object MessageTableTestUtils {
      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}
--- a/app/src/benchmark/java/org/signal/benchmark/setup/TestMessages.kt
+++ b/app/src/benchmark/java/org/signal/benchmark/setup/TestMessages.kt
@@ -2,10 +2,9 @@ package org.signal.benchmark.setup

 import org.thoughtcrime.securesms.attachments.PointerAttachment
 import org.thoughtcrime.securesms.database.AttachmentTable
-import org.thoughtcrime.securesms.database.MessageType
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.TestDbUtils
-import org.thoughtcrime.securesms.mms.IncomingMessage
+import org.thoughtcrime.securesms.mms.IncomingMediaMessage
 import org.thoughtcrime.securesms.mms.OutgoingMessage
 import org.thoughtcrime.securesms.mms.QuoteModel
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -66,8 +65,7 @@ object TestMessages {
    return insert
  }
  fun insertIncomingTextMessage(other: Recipient, body: String, timestamp: Long? = null) {
-    val message = IncomingMessage(
-      type = MessageType.NORMAL,
+    val message = IncomingMediaMessage(
      from = other.id,
      body = body,
      sentTimeMillis = timestamp ?: System.currentTimeMillis(),
@@ -75,11 +73,10 @@ object TestMessages {
      receivedTimeMillis = timestamp ?: System.currentTimeMillis()
    )

-    SignalDatabase.messages.insertMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get().messageId
+    SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get().messageId
  }
  fun insertIncomingQuoteTextMessage(other: Recipient, body: String, quote: QuoteModel, timestamp: Long?) {
-    val message = IncomingMessage(
-      type = MessageType.NORMAL,
+    val message = IncomingMediaMessage(
      from = other.id,
      body = body,
      sentTimeMillis = timestamp ?: System.currentTimeMillis(),
@@ -93,30 +90,28 @@ object TestMessages {
    val attachments: List<SignalServiceAttachmentPointer> = (0 until attachmentCount).map {
      imageAttachment()
    }
-    val message = IncomingMessage(
-      type = MessageType.NORMAL,
+    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 insertIncomingMessage(recipient = other, message = message, failed = failed)
+    return insertIncomingMediaMessage(recipient = other, message = message, failed = failed)
  }

  fun insertIncomingVoiceMessage(other: Recipient, timestamp: Long? = null): Long {
-    val message = IncomingMessage(
-      type = MessageType.NORMAL,
+    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 insertIncomingMessage(recipient = other, message = message, failed = false)
+    return insertIncomingMediaMessage(recipient = other, message = message, failed = false)
  }

-  private fun insertIncomingMessage(recipient: Recipient, message: IncomingMessage, failed: Boolean = false): Long {
+  private fun insertIncomingMediaMessage(recipient: Recipient, message: IncomingMediaMessage, failed: Boolean = false): Long {
    val id = insertIncomingMessage(recipient = recipient, message = message)
    if (failed) {
      setMessageMediaFailed(id)
@@ -127,8 +122,8 @@ object TestMessages {
    return id
  }

-  private fun insertIncomingMessage(recipient: Recipient, message: IncomingMessage): Long {
-    return SignalDatabase.messages.insertMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(recipient)).get().messageId
+  private fun insertIncomingMessage(recipient: Recipient, message: IncomingMediaMessage): Long {
+    return SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(recipient)).get().messageId
  }

  private fun setMessageMediaFailed(messageId: Long) {
@@ -154,7 +149,6 @@ object TestMessages {
      1024,
      Optional.empty(),
      Optional.empty(),
-      0,
      Optional.of("/not-there.jpg"),
      false,
      false,
@@ -177,7 +171,6 @@ object TestMessages {
      1024,
      Optional.empty(),
      Optional.empty(),
-      0,
      Optional.of("/not-there.aac"),
      true,
      false,
--- a/app/src/debug/java/org/thoughtcrime/securesms/components/settings/app/internal/conversation/test/ConversationElementGenerator.kt
+++ b/app/src/debug/java/org/thoughtcrime/securesms/components/settings/app/internal/conversation/test/ConversationElementGenerator.kt
@@ -10,7 +10,7 @@ import org.thoughtcrime.securesms.conversation.v2.data.ConversationElementKey
 import org.thoughtcrime.securesms.conversation.v2.data.IncomingTextOnly
 import org.thoughtcrime.securesms.conversation.v2.data.OutgoingTextOnly
 import org.thoughtcrime.securesms.database.MessageTypes
-import org.thoughtcrime.securesms.database.model.MmsMessageRecord
+import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord
 import org.thoughtcrime.securesms.database.model.StoryType
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.mms.SlideDeck
@@ -78,7 +78,7 @@ class ConversationElementGenerator {

    val isIncoming = random.nextBoolean()

-    val record = MmsMessageRecord(
+    val record = MediaMmsMessageRecord(
      messageId,
      if (isIncoming) Recipient.UNKNOWN else Recipient.self(),
      0,
@@ -86,7 +86,7 @@ class ConversationElementGenerator {
      now,
      now,
      now,
-      true,
+      1,
      1,
      testMessage,
      SlideDeck(),
@@ -97,7 +97,7 @@ class ConversationElementGenerator {
      0,
      0,
      false,
-      true,
+      1,
      null,
      emptyList(),
      emptyList(),
@@ -106,7 +106,7 @@ class ConversationElementGenerator {
      false,
      false,
      now,
-      true,
+      1,
      now,
      null,
      StoryType.NONE,
@@ -117,8 +117,7 @@ class ConversationElementGenerator {
      -1,
      null,
      null,
-      0,
-      false
+      0
    )

    val conversationMessage = ConversationMessageFactory.createWithUnresolvedData(
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -44,8 +44,6 @@
    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>

-    <uses-permission android:name="android.permission.NEARBY_WIFI_DEVICES" android:usesPermissionFlags="neverForLocation" />
-
    <uses-permission android:name="android.permission.RECORD_AUDIO" />
    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
    <uses-permission android:name="android.permission.READ_CALL_STATE"/>
@@ -96,10 +94,6 @@

    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />

-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
-    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
-
    <application android:name=".ApplicationContext"
                 android:icon="@mipmap/ic_launcher"
                 android:label="@string/app_name"
@@ -252,7 +246,6 @@

    <activity-alias android:name=".RoutingActivity"
                    android:targetActivity=".MainActivity"
-                    android:resizeableActivity="true"
                    android:exported="true">

        <intent-filter>
@@ -594,13 +587,6 @@
                  android:host="signal.group"/>
        </intent-filter>

-        <intent-filter android:autoVerify="true">
-            <action android:name="android.intent.action.VIEW" />
-            <category android:name="android.intent.category.DEFAULT" />
-            <category android:name="android.intent.category.BROWSABLE" />
-            <data android:scheme="https" android:host="signaldonations.org" android:pathPrefix="/stripe/return/ideal"/>
-        </intent-filter>
-
        <intent-filter android:autoVerify="true">
            <action android:name="android.intent.action.VIEW" />
            <category android:name="android.intent.category.DEFAULT" />
@@ -638,7 +624,6 @@
              android:launchMode="singleTask"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
              android:parentActivityName=".MainActivity"
-              android:resizeableActivity="true"
              android:exported="false">
        <meta-data
                android:name="android.support.PARENT_ACTIVITY"
@@ -970,7 +955,7 @@
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
              android:exported="false"/>

-    <activity android:name=".profiles.edit.CreateProfileActivity"
+    <activity android:name=".profiles.edit.EditProfileActivity"
              android:theme="@style/TextSecure.LightRegistrationTheme"
              android:windowSoftInputMode="stateVisible|adjustResize"
              android:exported="false"/>
@@ -980,7 +965,7 @@
              android:windowSoftInputMode="stateVisible|adjustResize"
              android:exported="false"/>

-    <activity android:name=".profiles.manage.EditProfileActivity"
+    <activity android:name=".profiles.manage.ManageProfileActivity"
              android:theme="@style/TextSecure.LightTheme"
              android:windowSoftInputMode="stateVisible|adjustResize"
              android:exported="false"/>
@@ -1006,7 +991,7 @@
        android:exported="false"/>

    <activity android:name=".contacts.TurnOffContactJoinedNotificationsActivity"
-              android:theme="@style/TextSecure.DialogActivity"
+              android:theme="@style/Theme.AppCompat.Dialog.Alert"
              android:exported="false"/>

    <activity android:name=".contactshare.ContactShareEditActivity"
@@ -1038,7 +1023,6 @@
    <activity android:name=".MainActivity"
              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:resizeableActivity="true"
              android:exported="false"/>

    <activity android:name=".pin.PinRestoreActivity"
@@ -1150,11 +1134,9 @@

    <service
        android:name=".components.voice.VoiceNotePlaybackService"
-        android:foregroundServiceType="mediaPlayback"
        android:exported="true">
        <intent-filter>
            <action android:name="android.media.browse.MediaBrowserService" />
-            <action android:name="androidx.media3.session.MediaSessionService"/>
        </intent-filter>
    </service>

@@ -1196,10 +1178,6 @@
        android:name=".service.GenericForegroundService"
        android:exported="false"/>

-    <service
-        android:name=".service.AttachmentProgressService"
-        android:exported="false"/>
-
    <service
        android:name=".gcm.FcmFetchBackgroundService"
        android:exported="false"/>
@@ -1214,6 +1192,18 @@
        </intent-filter>
    </service>

+    <receiver android:name=".service.SmsListener"
+              android:permission="android.permission.BROADCAST_SMS"
+              android:enabled="true"
+              android:exported="true">
+             <intent-filter android:priority="1001">
+                 <action android:name="android.provider.Telephony.SMS_RECEIVED"/>
+             </intent-filter>
+             <intent-filter>
+                 <action android:name="android.provider.Telephony.SMS_DELIVER"/>
+             </intent-filter>
+    </receiver>
+
    <receiver android:name=".service.SmsDeliveryListener"
              android:exported="true">
        <intent-filter>
@@ -1221,6 +1211,20 @@
        </intent-filter>
    </receiver>

+    <receiver android:name=".service.MmsListener"
+              android:enabled="true"
+              android:exported="true"
+              android:permission="android.permission.BROADCAST_WAP_PUSH">
+             <intent-filter android:priority="1001">
+                 <action android:name="android.provider.Telephony.WAP_PUSH_RECEIVED"/>
+                 <data android:mimeType="application/vnd.wap.mms-message" />
+             </intent-filter>
+             <intent-filter>
+                 <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER"/>
+                 <data android:mimeType="application/vnd.wap.mms-message" />
+             </intent-filter>
+    </receiver>
+
    <receiver android:name=".notifications.MarkReadReceiver"
              android:enabled="true"
              android:exported="false">
@@ -1319,7 +1323,7 @@
        </intent-filter>
    </receiver>

-    <receiver android:name=".messageprocessingalarm.RoutineMessageFetchReceiver" android:exported="false">
+    <receiver android:name=".messageprocessingalarm.MessageProcessReceiver" android:exported="false">
        <intent-filter>
            <action android:name="android.intent.action.BOOT_COMPLETED" />
            <action android:name="org.thoughtcrime.securesms.action.PROCESS_MESSAGES" />
--- a/app/src/main/baseline-prof.txt
+++ b/app/src/main/baseline-prof.txt
--- a/app/src/main/java/com/google/android/material/bottomsheet/BottomSheetBehaviorHack.kt
+++ b/app/src/main/java/com/google/android/material/bottomsheet/BottomSheetBehaviorHack.kt
@@ -1,13 +1,14 @@
 package com.google.android.material.bottomsheet

 import android.view.View
+import android.widget.FrameLayout
 import java.lang.ref.WeakReference

 /**
 * Manually adjust the nested scrolling child for a given [BottomSheetBehavior].
 */
 object BottomSheetBehaviorHack {
-  fun <T : View> setNestedScrollingChild(behavior: BottomSheetBehavior<T>, view: View) {
+  fun setNestedScrollingChild(behavior: BottomSheetBehavior<FrameLayout>, view: View) {
    behavior.nestedScrollingChildRef = WeakReference(view)
  }
 }
--- a/app/src/main/java/org/conscrypt/ConscryptSignal.java
+++ b/app/src/main/java/org/conscrypt/ConscryptSignal.java
@@ -1,800 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.conscrypt;
-
-import java.nio.ByteBuffer;
-import java.security.KeyManagementException;
-import java.security.PrivateKey;
-import java.security.Provider;
-import java.security.cert.X509Certificate;
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLContextSpi;
-import javax.net.ssl.SSLEngine;
-import javax.net.ssl.SSLEngineResult;
-import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLServerSocketFactory;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.SSLSessionContext;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-
-/**
- * Core API for creating and configuring all Conscrypt types.
- * This is identical to the original Conscrypt.java, except with the slow
- * version initialization code removed.
- */
-@SuppressWarnings("unused")
-public final class ConscryptSignal {
-  private ConscryptSignal() {}
-
-  /**
-   * Returns {@code true} if the Conscrypt native library has been successfully loaded.
-   */
-  public static boolean isAvailable() {
-    try {
-      checkAvailability();
-      return true;
-    } catch (Throwable e) {
-      return false;
-    }
-  }
-
-  // BEGIN MODIFICATION
-  /*public static class Version {
-    private final int major;
-    private final int minor;
-    private final int patch;
-
-    private Version(int major, int minor, int patch) {
-      this.major = major;
-      this.minor = minor;
-      this.patch = patch;
-    }
-
-    public int major() { return major; }
-    public int minor() { return minor; }
-    public int patch() { return patch; }
-  }
-
-  private static final Version VERSION;
-
-  static {
-    int major = -1;
-    int minor = -1;
-    int patch = -1;
-    InputStream stream = null;
-    try {
-      stream = Conscrypt.class.getResourceAsStream("conscrypt.properties");
-      if (stream != null) {
-        Properties props = new Properties();
-        props.load(stream);
-        major = Integer.parseInt(props.getProperty("org.conscrypt.version.major", "-1"));
-        minor = Integer.parseInt(props.getProperty("org.conscrypt.version.minor", "-1"));
-        patch = Integer.parseInt(props.getProperty("org.conscrypt.version.patch", "-1"));
-      }
-    } catch (IOException e) {
-      // TODO(prb): This should probably be fatal or have some fallback behaviour
-    } finally {
-      IoUtils.closeQuietly(stream);
-    }
-    if ((major >= 0) && (minor >= 0) && (patch >= 0)) {
-      VERSION = new Version(major, minor, patch);
-    } else {
-      VERSION = null;
-    }
-  }
-
-  /**
-   * Returns the version of this distribution of Conscrypt.  If version information is
-   * unavailable, returns {@code null}.
-   */
-  /*public static Version version() {
-    return VERSION;
-  }*/
-
-  // END MODIFICATION
-
-  /**
-   * Checks that the Conscrypt support is available for the system.
-   *
-   * @throws UnsatisfiedLinkError if unavailable
-   */
-  public static void checkAvailability() {
-    NativeCrypto.checkAvailability();
-  }
-
-  /**
-   * Indicates whether the given {@link Provider} was created by this distribution of Conscrypt.
-   */
-  public static boolean isConscrypt(Provider provider) {
-    return provider instanceof OpenSSLProvider;
-  }
-
-  /**
-   * Constructs a new {@link Provider} with the default name.
-   */
-  public static Provider newProvider() {
-    checkAvailability();
-    return new OpenSSLProvider();
-  }
-
-  /**
-   * Constructs a new {@link Provider} with the given name.
-   *
-   * @deprecated Use {@link #newProviderBuilder()} instead.
-   */
-  @Deprecated
-  public static Provider newProvider(String providerName) {
-    checkAvailability();
-    return newProviderBuilder().setName(providerName).build();
-  }
-
-  public static class ProviderBuilder {
-    private String name = Platform.getDefaultProviderName();
-    private boolean provideTrustManager = Platform.provideTrustManagerByDefault();
-    private String defaultTlsProtocol = NativeCrypto.SUPPORTED_PROTOCOL_TLSV1_3;
-
-    private ProviderBuilder() {}
-
-    /**
-     * Sets the name of the Provider to be built.
-     */
-    public ProviderBuilder setName(String name) {
-      this.name = name;
-      return this;
-    }
-
-    /**
-     * Causes the returned provider to provide an implementation of
-     * {@link javax.net.ssl.TrustManagerFactory}.
-     * @deprecated Use provideTrustManager(true)
-     */
-    @Deprecated
-    public ProviderBuilder provideTrustManager() {
-      return provideTrustManager(true);
-    }
-
-    /**
-     * Specifies whether the returned provider will provide an implementation of
-     * {@link javax.net.ssl.TrustManagerFactory}.
-     */
-    public ProviderBuilder provideTrustManager(boolean provide) {
-      this.provideTrustManager = provide;
-      return this;
-    }
-
-    /**
-     * Specifies what the default TLS protocol should be for SSLContext identifiers
-     * {@code TLS}, {@code SSL}, and {@code Default}.
-     */
-    public ProviderBuilder defaultTlsProtocol(String defaultTlsProtocol) {
-      this.defaultTlsProtocol = defaultTlsProtocol;
-      return this;
-    }
-
-    public Provider build() {
-      return new OpenSSLProvider(name, provideTrustManager, defaultTlsProtocol);
-    }
-  }
-
-  public static ProviderBuilder newProviderBuilder() {
-    return new ProviderBuilder();
-  }
-
-  /**
-   * Returns the maximum length (in bytes) of an encrypted packet.
-   */
-  public static int maxEncryptedPacketLength() {
-    return NativeConstants.SSL3_RT_MAX_PACKET_SIZE;
-  }
-
-  /**
-   * Gets the default X.509 trust manager.
-   */
-  @ExperimentalApi
-  public static X509TrustManager getDefaultX509TrustManager() throws KeyManagementException {
-    checkAvailability();
-    return SSLParametersImpl.getDefaultX509TrustManager();
-  }
-
-  /**
-   * Indicates whether the given {@link SSLContext} was created by this distribution of Conscrypt.
-   */
-  public static boolean isConscrypt(SSLContext context) {
-    return context.getProvider() instanceof OpenSSLProvider;
-  }
-
-  /**
-   * Constructs a new instance of the preferred {@link SSLContextSpi}.
-   */
-  public static SSLContextSpi newPreferredSSLContextSpi() {
-    checkAvailability();
-    return OpenSSLContextImpl.getPreferred();
-  }
-
-  /**
-   * Sets the client-side persistent cache to be used by the context.
-   */
-  public static void setClientSessionCache(SSLContext context, SSLClientSessionCache cache) {
-    SSLSessionContext clientContext = context.getClientSessionContext();
-    if (!(clientContext instanceof ClientSessionContext)) {
-      throw new IllegalArgumentException(
-          "Not a conscrypt client context: " + clientContext.getClass().getName());
-    }
-    ((ClientSessionContext) clientContext).setPersistentCache(cache);
-  }
-
-  /**
-   * Sets the server-side persistent cache to be used by the context.
-   */
-  public static void setServerSessionCache(SSLContext context, SSLServerSessionCache cache) {
-    SSLSessionContext serverContext = context.getServerSessionContext();
-    if (!(serverContext instanceof ServerSessionContext)) {
-      throw new IllegalArgumentException(
-          "Not a conscrypt client context: " + serverContext.getClass().getName());
-    }
-    ((ServerSessionContext) serverContext).setPersistentCache(cache);
-  }
-
-  /**
-   * Indicates whether the given {@link SSLSocketFactory} was created by this distribution of
-   * Conscrypt.
-   */
-  public static boolean isConscrypt(SSLSocketFactory factory) {
-    return factory instanceof OpenSSLSocketFactoryImpl;
-  }
-
-  private static OpenSSLSocketFactoryImpl toConscrypt(SSLSocketFactory factory) {
-    if (!isConscrypt(factory)) {
-      throw new IllegalArgumentException(
-          "Not a conscrypt socket factory: " + factory.getClass().getName());
-    }
-    return (OpenSSLSocketFactoryImpl) factory;
-  }
-
-  /**
-   * Configures the default socket to be created for all socket factory instances.
-   */
-  @ExperimentalApi
-  public static void setUseEngineSocketByDefault(boolean useEngineSocket) {
-    OpenSSLSocketFactoryImpl.setUseEngineSocketByDefault(useEngineSocket);
-    OpenSSLServerSocketFactoryImpl.setUseEngineSocketByDefault(useEngineSocket);
-  }
-
-  /**
-   * Configures the socket to be created for the given socket factory instance.
-   */
-  @ExperimentalApi
-  public static void setUseEngineSocket(SSLSocketFactory factory, boolean useEngineSocket) {
-    toConscrypt(factory).setUseEngineSocket(useEngineSocket);
-  }
-
-  /**
-   * Indicates whether the given {@link SSLServerSocketFactory} was created by this distribution
-   * of Conscrypt.
-   */
-  public static boolean isConscrypt(SSLServerSocketFactory factory) {
-    return factory instanceof OpenSSLServerSocketFactoryImpl;
-  }
-
-  private static OpenSSLServerSocketFactoryImpl toConscrypt(SSLServerSocketFactory factory) {
-    if (!isConscrypt(factory)) {
-      throw new IllegalArgumentException(
-          "Not a conscrypt server socket factory: " + factory.getClass().getName());
-    }
-    return (OpenSSLServerSocketFactoryImpl) factory;
-  }
-
-  /**
-   * Configures the socket to be created for the given server socket factory instance.
-   */
-  @ExperimentalApi
-  public static void setUseEngineSocket(SSLServerSocketFactory factory, boolean useEngineSocket) {
-    toConscrypt(factory).setUseEngineSocket(useEngineSocket);
-  }
-
-  /**
-   * Indicates whether the given {@link SSLSocket} was created by this distribution of Conscrypt.
-   */
-  public static boolean isConscrypt(SSLSocket socket) {
-    return socket instanceof AbstractConscryptSocket;
-  }
-
-  private static AbstractConscryptSocket toConscrypt(SSLSocket socket) {
-    if (!isConscrypt(socket)) {
-      throw new IllegalArgumentException(
-          "Not a conscrypt socket: " + socket.getClass().getName());
-    }
-    return (AbstractConscryptSocket) socket;
-  }
-
-  /**
-   * This method enables Server Name Indication (SNI) and overrides the hostname supplied
-   * during socket creation.  If the hostname is not a valid SNI hostname, the SNI extension
-   * will be omitted from the handshake.
-   *
-   * @param socket the socket
-   * @param hostname the desired SNI hostname, or null to disable
-   */
-  public static void setHostname(SSLSocket socket, String hostname) {
-    toConscrypt(socket).setHostname(hostname);
-  }
-
-  /**
-   * Returns either the hostname supplied during socket creation or via
-   * {@link #setHostname(SSLSocket, String)}. No DNS resolution is attempted before
-   * returning the hostname.
-   */
-  public static String getHostname(SSLSocket socket) {
-    return toConscrypt(socket).getHostname();
-  }
-
-  /**
-   * This method attempts to create a textual representation of the peer host or IP. Does
-   * not perform a reverse DNS lookup. This is typically used during session creation.
-   */
-  public static String getHostnameOrIP(SSLSocket socket) {
-    return toConscrypt(socket).getHostnameOrIP();
-  }
-
-  /**
-   * This method enables session ticket support.
-   *
-   * @param socket the socket
-   * @param useSessionTickets True to enable session tickets
-   */
-  public static void setUseSessionTickets(SSLSocket socket, boolean useSessionTickets) {
-    toConscrypt(socket).setUseSessionTickets(useSessionTickets);
-  }
-
-  /**
-   * Enables/disables TLS Channel ID for the given server-side socket.
-   *
-   * <p>This method needs to be invoked before the handshake starts.
-   *
-   * @param socket the socket
-   * @param enabled Whether to enable channel ID.
-   * @throws IllegalStateException if this is a client socket or if the handshake has already
-   * started.
-   */
-  public static void setChannelIdEnabled(SSLSocket socket, boolean enabled) {
-    toConscrypt(socket).setChannelIdEnabled(enabled);
-  }
-
-  /**
-   * Gets the TLS Channel ID for the given server-side socket. Channel ID is only available
-   * once the handshake completes.
-   *
-   * @param socket the socket
-   * @return channel ID or {@code null} if not available.
-   * @throws IllegalStateException if this is a client socket or if the handshake has not yet
-   * completed.
-   * @throws SSLException if channel ID is available but could not be obtained.
-   */
-  public static byte[] getChannelId(SSLSocket socket) throws SSLException {
-    return toConscrypt(socket).getChannelId();
-  }
-
-  /**
-   * Sets the {@link PrivateKey} to be used for TLS Channel ID by this client socket.
-   *
-   * <p>This method needs to be invoked before the handshake starts.
-   *
-   * @param socket the socket
-   * @param privateKey private key (enables TLS Channel ID) or {@code null} for no key
-   * (disables TLS Channel ID).
-   * The private key must be an Elliptic Curve (EC) key based on the NIST P-256 curve (aka
-   * SECG secp256r1 or ANSI
-   * X9.62 prime256v1).
-   * @throws IllegalStateException if this is a server socket or if the handshake has already
-   * started.
-   */
-  public static void setChannelIdPrivateKey(SSLSocket socket, PrivateKey privateKey) {
-    toConscrypt(socket).setChannelIdPrivateKey(privateKey);
-  }
-
-  /**
-   * Returns the ALPN protocol agreed upon by client and server.
-   *
-   * @param socket the socket
-   * @return the selected protocol or {@code null} if no protocol was agreed upon.
-   */
-  public static String getApplicationProtocol(SSLSocket socket) {
-    return toConscrypt(socket).getApplicationProtocol();
-  }
-
-  /**
-   * Sets an application-provided ALPN protocol selector. If provided, this will override
-   * the list of protocols set by {@link #setApplicationProtocols(SSLSocket, String[])}.
-   *
-   * @param socket the socket
-   * @param selector the ALPN protocol selector
-   */
-  public static void setApplicationProtocolSelector(SSLSocket socket,
-                                                    ApplicationProtocolSelector selector) {
-    toConscrypt(socket).setApplicationProtocolSelector(selector);
-  }
-
-  /**
-   * Sets the application-layer protocols (ALPN) in prioritization order.
-   *
-   * @param socket the socket being configured
-   * @param protocols the protocols in descending order of preference. If empty, no protocol
-   * indications will be used. This array will be copied.
-   * @throws IllegalArgumentException - if protocols is null, or if any element in a non-empty
-   * array is null or an empty (zero-length) string
-   */
-  public static void setApplicationProtocols(SSLSocket socket, String[] protocols) {
-    toConscrypt(socket).setApplicationProtocols(protocols);
-  }
-
-  /**
-   * Gets the application-layer protocols (ALPN) in prioritization order.
-   *
-   * @param socket the socket
-   * @return the protocols in descending order of preference, or an empty array if protocol
-   * indications are not being used. Always returns a new array.
-   */
-  public static String[] getApplicationProtocols(SSLSocket socket) {
-    return toConscrypt(socket).getApplicationProtocols();
-  }
-
-  /**
-   * Returns the tls-unique channel binding value for this connection, per RFC 5929.  This
-   * will return {@code null} if there is no such value available, such as if the handshake
-   * has not yet completed or this connection is closed.
-   */
-  public static byte[] getTlsUnique(SSLSocket socket) {
-    return toConscrypt(socket).getTlsUnique();
-  }
-
-  /**
-   * Exports a value derived from the TLS master secret as described in RFC 5705.
-   *
-   * @param label the label to use in calculating the exported value.  This must be
-   * an ASCII-only string.
-   * @param context the application-specific context value to use in calculating the
-   * exported value.  This may be {@code null} to use no application context, which is
-   * treated differently than an empty byte array.
-   * @param length the number of bytes of keying material to return.
-   * @return a value of the specified length, or {@code null} if the handshake has not yet
-   * completed or the connection has been closed.
-   * @throws SSLException if the value could not be exported.
-   */
-  public static byte[] exportKeyingMaterial(SSLSocket socket, String label, byte[] context,
-                                            int length) throws SSLException {
-    return toConscrypt(socket).exportKeyingMaterial(label, context, length);
-  }
-
-  /**
-   * Indicates whether the given {@link SSLEngine} was created by this distribution of Conscrypt.
-   */
-  public static boolean isConscrypt(SSLEngine engine) {
-    return engine instanceof AbstractConscryptEngine;
-  }
-
-  private static AbstractConscryptEngine toConscrypt(SSLEngine engine) {
-    if (!isConscrypt(engine)) {
-      throw new IllegalArgumentException(
-          "Not a conscrypt engine: " + engine.getClass().getName());
-    }
-    return (AbstractConscryptEngine) engine;
-  }
-
-  /**
-   * Provides the given engine with the provided bufferAllocator.
-   * @throws IllegalArgumentException if the provided engine is not a Conscrypt engine.
-   * @throws IllegalStateException if the provided engine has already begun its handshake.
-   */
-  @ExperimentalApi
-  public static void setBufferAllocator(SSLEngine engine, BufferAllocator bufferAllocator) {
-    toConscrypt(engine).setBufferAllocator(bufferAllocator);
-  }
-
-  /**
-   * Provides the given socket with the provided bufferAllocator.  If the given socket is a
-   * Conscrypt socket but does not use buffer allocators, this method does nothing.
-   * @throws IllegalArgumentException if the provided socket is not a Conscrypt socket.
-   * @throws IllegalStateException if the provided socket has already begun its handshake.
-   */
-  @ExperimentalApi
-  public static void setBufferAllocator(SSLSocket socket, BufferAllocator bufferAllocator) {
-    AbstractConscryptSocket s = toConscrypt(socket);
-    if (s instanceof ConscryptEngineSocket) {
-      ((ConscryptEngineSocket) s).setBufferAllocator(bufferAllocator);
-    }
-  }
-
-  /**
-   * Configures the default {@link BufferAllocator} to be used by all future
-   * {@link SSLEngine} instances from this provider.
-   */
-  @ExperimentalApi
-  public static void setDefaultBufferAllocator(BufferAllocator bufferAllocator) {
-    ConscryptEngine.setDefaultBufferAllocator(bufferAllocator);
-  }
-
-  /**
-   * This method enables Server Name Indication (SNI) and overrides the hostname supplied
-   * during engine creation.
-   *
-   * @param engine the engine
-   * @param hostname the desired SNI hostname, or {@code null} to disable
-   */
-  public static void setHostname(SSLEngine engine, String hostname) {
-    toConscrypt(engine).setHostname(hostname);
-  }
-
-  /**
-   * Returns either the hostname supplied during socket creation or via
-   * {@link #setHostname(SSLEngine, String)}. No DNS resolution is attempted before
-   * returning the hostname.
-   */
-  public static String getHostname(SSLEngine engine) {
-    return toConscrypt(engine).getHostname();
-  }
-
-  /**
-   * Returns the maximum overhead, in bytes, of sealing a record with SSL.
-   */
-  public static int maxSealOverhead(SSLEngine engine) {
-    return toConscrypt(engine).maxSealOverhead();
-  }
-
-  /**
-   * Sets a listener on the given engine for completion of the TLS handshake
-   */
-  public static void setHandshakeListener(SSLEngine engine, HandshakeListener handshakeListener) {
-    toConscrypt(engine).setHandshakeListener(handshakeListener);
-  }
-
-  /**
-   * Enables/disables TLS Channel ID for the given server-side engine.
-   *
-   * <p>This method needs to be invoked before the handshake starts.
-   *
-   * @param engine the engine
-   * @param enabled Whether to enable channel ID.
-   * @throws IllegalStateException if this is a client engine or if the handshake has already
-   * started.
-   */
-  public static void setChannelIdEnabled(SSLEngine engine, boolean enabled) {
-    toConscrypt(engine).setChannelIdEnabled(enabled);
-  }
-
-  /**
-   * Gets the TLS Channel ID for the given server-side engine. Channel ID is only available
-   * once the handshake completes.
-   *
-   * @param engine the engine
-   * @return channel ID or {@code null} if not available.
-   * @throws IllegalStateException if this is a client engine or if the handshake has not yet
-   * completed.
-   * @throws SSLException if channel ID is available but could not be obtained.
-   */
-  public static byte[] getChannelId(SSLEngine engine) throws SSLException {
-    return toConscrypt(engine).getChannelId();
-  }
-
-  /**
-   * Sets the {@link PrivateKey} to be used for TLS Channel ID by this client engine.
-   *
-   * <p>This method needs to be invoked before the handshake starts.
-   *
-   * @param engine the engine
-   * @param privateKey private key (enables TLS Channel ID) or {@code null} for no key
-   * (disables TLS Channel ID).
-   * The private key must be an Elliptic Curve (EC) key based on the NIST P-256 curve (aka
-   * SECG secp256r1 or ANSI X9.62 prime256v1).
-   * @throws IllegalStateException if this is a server engine or if the handshake has already
-   * started.
-   */
-  public static void setChannelIdPrivateKey(SSLEngine engine, PrivateKey privateKey) {
-    toConscrypt(engine).setChannelIdPrivateKey(privateKey);
-  }
-
-  /**
-   * Extended unwrap method for multiple source and destination buffers.
-   *
-   * @param engine the target engine for the unwrap
-   * @param srcs the source buffers
-   * @param dsts the destination buffers
-   * @return the result of the unwrap operation
-   * @throws SSLException thrown if an SSL error occurred
-   */
-  public static SSLEngineResult unwrap(SSLEngine engine, final ByteBuffer[] srcs,
-                                       final ByteBuffer[] dsts) throws SSLException {
-    return toConscrypt(engine).unwrap(srcs, dsts);
-  }
-
-  /**
-   * Exteneded unwrap method for multiple source and destination buffers.
-   *
-   * @param engine the target engine for the unwrap.
-   * @param srcs the source buffers
-   * @param srcsOffset the offset in the {@code srcs} array of the first source buffer
-   * @param srcsLength the number of source buffers starting at {@code srcsOffset}
-   * @param dsts the destination buffers
-   * @param dstsOffset the offset in the {@code dsts} array of the first destination buffer
-   * @param dstsLength the number of destination buffers starting at {@code dstsOffset}
-   * @return the result of the unwrap operation
-   * @throws SSLException thrown if an SSL error occurred
-   */
-  public static SSLEngineResult unwrap(SSLEngine engine, final ByteBuffer[] srcs, int srcsOffset,
-                                       final int srcsLength, final ByteBuffer[] dsts, final int dstsOffset,
-                                       final int dstsLength) throws SSLException {
-    return toConscrypt(engine).unwrap(
-        srcs, srcsOffset, srcsLength, dsts, dstsOffset, dstsLength);
-  }
-
-  /**
-   * This method enables session ticket support.
-   *
-   * @param engine the engine
-   * @param useSessionTickets True to enable session tickets
-   */
-  public static void setUseSessionTickets(SSLEngine engine, boolean useSessionTickets) {
-    toConscrypt(engine).setUseSessionTickets(useSessionTickets);
-  }
-
-  /**
-   * Sets the application-layer protocols (ALPN) in prioritization order.
-   *
-   * @param engine the engine being configured
-   * @param protocols the protocols in descending order of preference. If empty, no protocol
-   * indications will be used.  This array will be copied.
-   * @throws IllegalArgumentException - if protocols is null, or if any element in a non-empty
-   * array is null or an empty (zero-length) string
-   */
-  public static void setApplicationProtocols(SSLEngine engine, String[] protocols) {
-    toConscrypt(engine).setApplicationProtocols(protocols);
-  }
-
-  /**
-   * Gets the application-layer protocols (ALPN) in prioritization order.
-   *
-   * @param engine the engine
-   * @return the protocols in descending order of preference, or an empty array if protocol
-   * indications are not being used. Always returns a new array.
-   */
-  public static String[] getApplicationProtocols(SSLEngine engine) {
-    return toConscrypt(engine).getApplicationProtocols();
-  }
-
-  /**
-   * Sets an application-provided ALPN protocol selector. If provided, this will override
-   * the list of protocols set by {@link #setApplicationProtocols(SSLEngine, String[])}.
-   *
-   * @param engine the engine
-   * @param selector the ALPN protocol selector
-   */
-  public static void setApplicationProtocolSelector(SSLEngine engine,
-                                                    ApplicationProtocolSelector selector) {
-    toConscrypt(engine).setApplicationProtocolSelector(selector);
-  }
-
-  /**
-   * Returns the ALPN protocol agreed upon by client and server.
-   *
-   * @param engine the engine
-   * @return the selected protocol or {@code null} if no protocol was agreed upon.
-   */
-  public static String getApplicationProtocol(SSLEngine engine) {
-    return toConscrypt(engine).getApplicationProtocol();
-  }
-
-  /**
-   * Returns the tls-unique channel binding value for this connection, per RFC 5929.  This
-   * will return {@code null} if there is no such value available, such as if the handshake
-   * has not yet completed or this connection is closed.
-   */
-  public static byte[] getTlsUnique(SSLEngine engine) {
-    return toConscrypt(engine).getTlsUnique();
-  }
-
-  /**
-   * Exports a value derived from the TLS master secret as described in RFC 5705.
-   *
-   * @param label the label to use in calculating the exported value.  This must be
-   * an ASCII-only string.
-   * @param context the application-specific context value to use in calculating the
-   * exported value.  This may be {@code null} to use no application context, which is
-   * treated differently than an empty byte array.
-   * @param length the number of bytes of keying material to return.
-   * @return a value of the specified length, or {@code null} if the handshake has not yet
-   * completed or the connection has been closed.
-   * @throws SSLException if the value could not be exported.
-   */
-  public static byte[] exportKeyingMaterial(SSLEngine engine, String label, byte[] context,
-                                            int length) throws SSLException {
-    return toConscrypt(engine).exportKeyingMaterial(label, context, length);
-  }
-
-  /**
-   * Indicates whether the given {@link TrustManager} was created by this distribution of
-   * Conscrypt.
-   */
-  public static boolean isConscrypt(TrustManager trustManager) {
-    return trustManager instanceof TrustManagerImpl;
-  }
-
-  private static TrustManagerImpl toConscrypt(TrustManager trustManager) {
-    if (!isConscrypt(trustManager)) {
-      throw new IllegalArgumentException(
-          "Not a Conscrypt trust manager: " + trustManager.getClass().getName());
-    }
-    return (TrustManagerImpl) trustManager;
-  }
-
-  /**
-   * Set the default hostname verifier that will be used for HTTPS endpoint identification by
-   * Conscrypt trust managers.  If {@code null} (the default), endpoint identification will use
-   * the default hostname verifier set in
-   * {@link HttpsURLConnection#setDefaultHostnameVerifier(javax.net.ssl.HostnameVerifier)}.
-   */
-  public synchronized static void setDefaultHostnameVerifier(ConscryptHostnameVerifier verifier) {
-    TrustManagerImpl.setDefaultHostnameVerifier(verifier);
-  }
-
-  /**
-   * Returns the currently-set default hostname verifier for Conscrypt trust managers.
-   *
-   * @see #setDefaultHostnameVerifier(ConscryptHostnameVerifier)
-   */
-  public synchronized static ConscryptHostnameVerifier getDefaultHostnameVerifier(TrustManager trustManager) {
-    return TrustManagerImpl.getDefaultHostnameVerifier();
-  }
-
-  /**
-   * Set the hostname verifier that will be used for HTTPS endpoint identification by the
-   * given trust manager.  If {@code null} (the default), endpoint identification will use the
-   * default hostname verifier set in {@link #setDefaultHostnameVerifier(ConscryptHostnameVerifier)}.
-   *
-   * @throws IllegalArgumentException if the provided trust manager is not a Conscrypt trust
-   * manager per {@link #isConscrypt(TrustManager)}
-   */
-  public static void setHostnameVerifier(TrustManager trustManager, ConscryptHostnameVerifier verifier) {
-    toConscrypt(trustManager).setHostnameVerifier(verifier);
-  }
-
-  /**
-   * Returns the currently-set hostname verifier for the given trust manager.
-   *
-   * @throws IllegalArgumentException if the provided trust manager is not a Conscrypt trust
-   * manager per {@link #isConscrypt(TrustManager)}
-   *
-   * @see #setHostnameVerifier(TrustManager, ConscryptHostnameVerifier)
-   */
-  public static ConscryptHostnameVerifier getHostnameVerifier(TrustManager trustManager) {
-    return toConscrypt(trustManager).getHostnameVerifier();
-  }
-
-  /**
-   * Wraps the HttpsURLConnection.HostnameVerifier into a ConscryptHostnameVerifier
-   */
-  public static ConscryptHostnameVerifier wrapHostnameVerifier(final HostnameVerifier verifier) {
-    return  new ConscryptHostnameVerifier() {
-      @Override
-      public boolean verify(X509Certificate[] certificates, String hostname, SSLSession session) {
-        return verifier.verify(hostname, session);
-      }
-    };
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.kt
@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms

+import org.thoughtcrime.securesms.util.FeatureFlags
 import org.whispersystems.signalservice.api.account.AccountAttributes

 object AppCapabilities {
@@ -16,7 +17,7 @@ object AppCapabilities {
      changeNumber = true,
      stories = true,
      giftBadges = true,
-      pni = true,
+      pni = FeatureFlags.phoneNumberPrivacy(),
      paymentActivation = true
    )
  }
--- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
@@ -17,6 +17,7 @@
 package org.thoughtcrime.securesms;

 import android.content.Context;
+import android.os.Build;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -26,15 +27,13 @@ import androidx.multidex.MultiDexApplication;

 import com.google.android.gms.security.ProviderInstaller;

-import org.conscrypt.ConscryptSignal;
+import org.conscrypt.Conscrypt;
 import org.greenrobot.eventbus.EventBus;
 import org.signal.aesgcmprovider.AesGcmProvider;
 import org.signal.core.util.MemoryTracker;
-import org.signal.core.util.concurrent.AnrDetector;
 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.logging.Scrubber;
 import org.signal.core.util.tracing.Tracer;
 import org.signal.glide.SignalGlideCodecs;
 import org.signal.libsignal.protocol.logging.SignalProtocolLoggerProvider;
@@ -50,19 +49,19 @@ import org.thoughtcrime.securesms.dependencies.ApplicationDependencyProvider;
 import org.thoughtcrime.securesms.emoji.EmojiSource;
 import org.thoughtcrime.securesms.emoji.JumboEmoji;
 import org.thoughtcrime.securesms.gcm.FcmFetchManager;
+import org.thoughtcrime.securesms.gcm.FcmJobService;
 import org.thoughtcrime.securesms.jobs.AccountConsistencyWorkerJob;
 import org.thoughtcrime.securesms.jobs.CheckServiceReachabilityJob;
 import org.thoughtcrime.securesms.jobs.DownloadLatestEmojiDataJob;
 import org.thoughtcrime.securesms.jobs.EmojiSearchIndexDownloadJob;
-import org.thoughtcrime.securesms.jobs.ExternalLaunchDonationJob;
 import org.thoughtcrime.securesms.jobs.FcmRefreshJob;
 import org.thoughtcrime.securesms.jobs.FontDownloaderJob;
-import org.thoughtcrime.securesms.jobs.GroupRingCleanupJob;
 import org.thoughtcrime.securesms.jobs.GroupV2UpdateSelfProfileKeyJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
 import org.thoughtcrime.securesms.jobs.PnpInitializeDevicesJob;
 import org.thoughtcrime.securesms.jobs.PreKeysSyncJob;
 import org.thoughtcrime.securesms.jobs.ProfileUploadJob;
+import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
 import org.thoughtcrime.securesms.jobs.RefreshSvrCredentialsJob;
 import org.thoughtcrime.securesms.jobs.RetrieveProfileJob;
 import org.thoughtcrime.securesms.jobs.RetrieveRemoteAnnouncementsJob;
@@ -72,7 +71,7 @@ import org.thoughtcrime.securesms.keyvalue.KeepMessagesDuration;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger;
 import org.thoughtcrime.securesms.logging.PersistentLogger;
-import org.thoughtcrime.securesms.messageprocessingalarm.RoutineMessageFetchReceiver;
+import org.thoughtcrime.securesms.messageprocessingalarm.MessageProcessReceiver;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.SignalGlideComponents;
@@ -87,7 +86,7 @@ import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.service.LocalBackupListener;
 import org.thoughtcrime.securesms.service.RotateSenderCertificateListener;
 import org.thoughtcrime.securesms.service.RotateSignedPreKeyListener;
-import org.thoughtcrime.securesms.apkupdate.ApkUpdateRefreshListener;
+import org.thoughtcrime.securesms.service.UpdateApkRefreshListener;
 import org.thoughtcrime.securesms.service.webrtc.AndroidTelecomUtil;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
 import org.thoughtcrime.securesms.util.AppForegroundObserver;
@@ -112,7 +111,6 @@ import io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException;
 import io.reactivex.rxjava3.exceptions.UndeliverableException;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.Schedulers;
-import kotlin.Unit;
 import rxdogtag2.RxDogTag;

 /**
@@ -127,6 +125,9 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr

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

+  @VisibleForTesting
+  protected PersistentLogger persistentLogger;
+
  public static ApplicationContext getInstance(Context context) {
    return (ApplicationContext)context.getApplicationContext();
  }
@@ -155,29 +156,27 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                              initializeLogging();
                              Log.i(TAG, "onCreate()");
                            })
-                            .addBlocking("anr-detector", this::startAnrDetector)
                            .addBlocking("security-provider", this::initializeSecurityProvider)
                            .addBlocking("crash-handling", this::initializeCrashHandling)
                            .addBlocking("rx-init", this::initializeRx)
                            .addBlocking("event-bus", () -> EventBus.builder().logNoSubscriberMessages(false).installDefaultEventBus())
                            .addBlocking("app-dependencies", this::initializeAppDependencies)
-                            .addBlocking("scrubber", () -> Scrubber.setIdentifierHmacKeyProvider(() -> SignalStore.svr().getOrCreateMasterKey().deriveLoggingKey()))
                            .addBlocking("first-launch", this::initializeFirstEverAppLaunch)
                            .addBlocking("app-migrations", this::initializeApplicationMigrations)
+                            .addBlocking("mark-registration", () -> RegistrationUtil.maybeMarkRegistrationComplete())
                            .addBlocking("lifecycle-observer", () -> ApplicationDependencies.getAppForegroundObserver().addListener(this))
                            .addBlocking("message-retriever", this::initializeMessageRetrieval)
                            .addBlocking("dynamic-theme", () -> DynamicTheme.setDefaultDayNightMode(this))
                            .addBlocking("proxy-init", () -> {
                              if (SignalStore.proxy().isProxyEnabled()) {
                                Log.w(TAG, "Proxy detected. Enabling Conscrypt.setUseEngineSocketByDefault()");
-                                ConscryptSignal.setUseEngineSocketByDefault(true);
+                                Conscrypt.setUseEngineSocketByDefault(true);
                              }
                            })
                            .addBlocking("blob-provider", this::initializeBlobProvider)
                            .addBlocking("feature-flags", FeatureFlags::init)
                            .addBlocking("ring-rtc", this::initializeRingRtc)
                            .addBlocking("glide", () -> SignalGlideModule.setRegisterGlideComponents(new SignalGlideComponents()))
-                            .addNonBlocking(() -> RegistrationUtil.maybeMarkRegistrationComplete())
                            .addNonBlocking(() -> GlideApp.get(this))
                            .addNonBlocking(this::cleanAvatarStorage)
                            .addNonBlocking(this::initializeRevealableMessageManager)
@@ -187,6 +186,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                            .addNonBlocking(PreKeysSyncJob::enqueueIfNeeded)
                            .addNonBlocking(this::initializePeriodicTasks)
                            .addNonBlocking(this::initializeCircumvention)
+                            .addNonBlocking(this::initializePendingMessages)
                            .addNonBlocking(this::initializeCleanup)
                            .addNonBlocking(this::initializeGlideCodecs)
                            .addNonBlocking(StorageSyncHelper::scheduleRoutineSync)
@@ -215,7 +215,6 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                            .addPostRender(() -> ApplicationDependencies.getExoPlayerPool().getPoolStats().getMaxUnreserved())
                            .addPostRender(() -> ApplicationDependencies.getRecipientCache().warmUp())
                            .addPostRender(AccountConsistencyWorkerJob::enqueueIfNecessary)
-                            .addPostRender(GroupRingCleanupJob::enqueue)
                            .execute();

    Log.d(TAG, "onCreate() took " + (System.currentTimeMillis() - startTime) + " ms");
@@ -232,13 +231,11 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
    ApplicationDependencies.getMegaphoneRepository().onAppForegrounded();
    ApplicationDependencies.getDeadlockDetector().start();
    SubscriptionKeepAliveJob.enqueueAndTrackTimeIfNecessary();
-    ExternalLaunchDonationJob.enqueueIfNecessary();
    FcmFetchManager.onForeground(this);
-    startAnrDetector();

    SignalExecutors.BOUNDED.execute(() -> {
      FeatureFlags.refreshIfNecessary();
-      RetrieveProfileJob.enqueueRoutineFetchIfNecessary();
+      RetrieveProfileJob.enqueueRoutineFetchIfNecessary(this);
      executePendingContactSync();
      KeyCachingService.onAppForegrounded(this);
      ApplicationDependencies.getShakeToReport().enable();
@@ -268,7 +265,10 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
    ApplicationDependencies.getShakeToReport().disable();
    ApplicationDependencies.getDeadlockDetector().stop();
    MemoryTracker.stop();
-    AnrDetector.stop();
+  }
+
+  public PersistentLogger getPersistentLogger() {
+    return persistentLogger;
  }

  public void checkBuildExpiration() {
@@ -278,17 +278,6 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
    }
  }

-  /**
-   * Note: this is purposefully "started" twice -- once during application create, and once during foreground.
-   * This is so we can capture ANR's that happen on boot before the foreground event.
-   */
-  private void startAnrDetector() {
-    AnrDetector.start(TimeUnit.SECONDS.toMillis(5), FeatureFlags::internalUser, (dumps) -> {
-      LogDatabase.getInstance(this).anrs().save(System.currentTimeMillis(), dumps);
-      return Unit.INSTANCE;
-    });
-  }
-
  private void initializeSecurityProvider() {
    int aesPosition = Security.insertProviderAt(new AesGcmProvider(), 1);
    Log.i(TAG, "Installed AesGcmProvider: " + aesPosition);
@@ -298,7 +287,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
      throw new ProviderInitializationException();
    }

-    int conscryptPosition = Security.insertProviderAt(ConscryptSignal.newProvider(), 2);
+    int conscryptPosition = Security.insertProviderAt(Conscrypt.newProvider(), 2);
    Log.i(TAG, "Installed Conscrypt provider: " + conscryptPosition);

    if (conscryptPosition < 0) {
@@ -308,14 +297,14 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr

  @VisibleForTesting
  protected void initializeLogging() {
-    Log.initialize(FeatureFlags::internalUser, new AndroidLogger(), new PersistentLogger(this));
+    persistentLogger = new PersistentLogger(this);
+    org.signal.core.util.logging.Log.initialize(FeatureFlags::internalUser, new AndroidLogger(), persistentLogger);

    SignalProtocolLoggerProvider.setProvider(new CustomSignalProtocolLogger());

    SignalExecutors.UNBOUNDED.execute(() -> {
      Log.blockUntilAllWritesFinished();
-      LogDatabase.getInstance(this).logs().trimToSize();
-      LogDatabase.getInstance(this).crashes().trimToSize();
+      LogDatabase.getInstance(this).trimToSize();
    });
  }

@@ -417,10 +406,10 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
    DirectoryRefreshListener.schedule(this);
    LocalBackupListener.schedule(this);
    RotateSenderCertificateListener.schedule(this);
-    RoutineMessageFetchReceiver.startOrUpdateAlarm(this);
+    MessageProcessReceiver.startOrUpdateAlarm(this);

-    if (BuildConfig.MANAGES_APP_UPDATES) {
-      ApkUpdateRefreshListener.schedule(this);
+    if (BuildConfig.PLAY_STORE_DISABLED) {
+      UpdateApkRefreshListener.schedule(this);
    }
  }

@@ -430,9 +419,6 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
      if (FeatureFlags.callingFieldTrialAnyAddressPortsKillSwitch()) {
        fieldTrials.put("RingRTC-AnyAddressPortsKillSwitch", "Enabled");
      }
-      if (!SignalStore.internalValues().callingDisableLBRed()) {
-        fieldTrials.put("RingRTC-Audio-LBRed-For-Opus", "Enabled,bitrate_pri:22000");
-      }
      CallManager.initialize(this, new RingRtcLogger(), fieldTrials);
    } catch (UnsatisfiedLinkError e) {
      throw new AssertionError("Unable to load ringrtc library", e);
@@ -463,6 +449,18 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
    }
  }

+  private void initializePendingMessages() {
+    if (TextSecurePreferences.getNeedsMessagePull(this)) {
+      Log.i(TAG, "Scheduling a message fetch.");
+      if (Build.VERSION.SDK_INT >= 26) {
+        FcmJobService.schedule(this);
+      } else {
+        ApplicationDependencies.getJobManager().add(new PushNotificationReceiveJob());
+      }
+      TextSecurePreferences.setNeedsMessagePull(this, false);
+    }
+  }
+
  @WorkerThread
  private void initializeBlobProvider() {
    BlobProvider.getInstance().initialize(this);
--- a/app/src/main/java/org/thoughtcrime/securesms/AvatarPreviewActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/AvatarPreviewActivity.java
@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.os.Bundle;
 import android.transition.TransitionInflater;
 import android.view.View;
--- a/app/src/main/java/org/thoughtcrime/securesms/BaseActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/BaseActivity.java
@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.view.View;
+import android.view.WindowManager;

 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
@@ -17,6 +18,7 @@ import org.signal.core.util.logging.Log;
 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;

--- a/app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java
@@ -57,10 +57,6 @@ public interface BindableConversationItem extends Unbindable, GiphyMp4Playable,

  void setEventListener(@Nullable EventListener listener);

-  default void setParentScrolling(boolean isParentScrolling) {
-    // Intentionally Blank.
-  }
-
  default void updateTimestamps() {
    // Intentionally Blank.
  }
--- a/app/src/main/java/org/thoughtcrime/securesms/BindableConversationListItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/BindableConversationListItem.java
@@ -20,5 +20,4 @@ public interface BindableConversationListItem extends Unbindable {

  void setSelectedConversations(@NonNull ConversationSet conversations);
  void updateTypingIndicator(@NonNull Set<Long> typingThreads);
-  void updateTimestamp();
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
@@ -35,6 +35,7 @@ import android.widget.Toast;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.Px;
 import androidx.appcompat.app.AlertDialog;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.ConstraintSet;
@@ -49,8 +50,6 @@ import androidx.transition.TransitionManager;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.pnikosis.materialishprogress.ProgressWheel;

-import org.signal.core.util.concurrent.LifecycleDisposable;
-import org.signal.core.util.concurrent.RxExtensions;
 import org.signal.core.util.concurrent.SimpleTask;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.components.RecyclerViewFastScroller;
@@ -71,11 +70,10 @@ import org.thoughtcrime.securesms.contacts.sync.ContactDiscovery;
 import org.thoughtcrime.securesms.groups.SelectionLimits;
 import org.thoughtcrime.securesms.groups.ui.GroupLimitDialog;
 import org.thoughtcrime.securesms.permissions.Permissions;
-import org.thoughtcrime.securesms.profiles.manage.UsernameRepository;
-import org.thoughtcrime.securesms.profiles.manage.UsernameRepository.UsernameAciFetchResult;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 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;
@@ -87,7 +85,6 @@ import java.io.IOException;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Consumer;
@@ -148,8 +145,6 @@ public final class ContactSelectionListFragment extends LoggingFragment {
  private           Set<RecipientId>                     currentSelection;
  private           boolean                              isMulti;
  private           boolean                              canSelectSelf;
-  private           boolean                              resetPositionOnCommit = false;
-
  private           ListClickListener                    listClickListener = new ListClickListener();
  @Nullable private SwipeRefreshLayout.OnRefreshListener onRefreshListener;

@@ -428,10 +423,6 @@ public final class ContactSelectionListFragment extends LoggingFragment {
    onRefreshListener = null;
  }

-  public int getSelectedMembersSize() {
-    return contactSearchMediator.getSelectedMembersSize();
-  }
-
  private @NonNull Bundle safeArguments() {
    return getArguments() != null ? getArguments() : new Bundle();
  }
@@ -528,21 +519,12 @@ public final class ContactSelectionListFragment extends LoggingFragment {
  }

  public void setQueryFilter(String filter) {
-    if (Objects.equals(filter, this.cursorFilter)) {
-      return;
-    }
-
-    this.resetPositionOnCommit = true;
-    this.cursorFilter          = filter;
-
+    this.cursorFilter = filter;
    contactSearchMediator.onFilterChanged(filter);
  }

  public void resetQueryFilter() {
    setQueryFilter(null);
-
-    this.resetPositionOnCommit = true;
-
    swipeRefresh.setRefreshing(false);
  }

@@ -560,12 +542,11 @@ public final class ContactSelectionListFragment extends LoggingFragment {
    headerActionView.setVisibility(View.GONE);
  }

-  private void onLoadFinished(int count) {
-    if (resetPositionOnCommit) {
-      resetPositionOnCommit = false;
-      recyclerView.scrollToPosition(0);
-    }
+  public void setRecyclerViewPaddingBottom(@Px int paddingBottom) {
+    ViewUtil.setPaddingBottom(recyclerView, paddingBottom);
+  }

+  private void onLoadFinished(int count) {
    swipeRefresh.setVisibility(View.VISIBLE);
    showContactsLayout.setVisibility(View.GONE);

@@ -685,18 +666,11 @@ public final class ContactSelectionListFragment extends LoggingFragment {
          AlertDialog loadingDialog = SimpleProgressDialog.show(requireContext());

          SimpleTask.run(getViewLifecycleOwner().getLifecycle(), () -> {
-            try {
-              return RxExtensions.safeBlockingGet(UsernameRepository.fetchAciForUsername(UsernameUtil.sanitizeUsernameFromSearch(username)));
-            } catch (InterruptedException e) {
-              Log.w(TAG, "Interrupted?", e);
-              return UsernameAciFetchResult.NetworkError.INSTANCE;
-            }
-          }, result  -> {
+            return UsernameUtil.fetchAciForUsername(username);
+          }, uuid -> {
            loadingDialog.dismiss();
-
-            // TODO Could be more specific with errors
-            if (result instanceof UsernameAciFetchResult.Success success) {
-              Recipient       recipient = Recipient.externalUsername(success.getAci(), username);
+            if (uuid.isPresent()) {
+              Recipient       recipient = Recipient.externalUsername(uuid.get(), username);
              SelectedContact selected  = SelectedContact.forUsername(recipient.getId(), username);

              if (onContactSelectedListener != null) {
--- a/app/src/main/java/org/thoughtcrime/securesms/DeviceActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/DeviceActivity.java
@@ -5,11 +5,13 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Vibrator;
 import android.text.TextUtils;
 import android.transition.TransitionInflater;
 import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
@@ -30,7 +32,7 @@ import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.permissions.Permissions;
-import org.signal.core.util.Base64;
+import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
@@ -195,7 +197,7 @@ public class DeviceActivity extends PassphraseRequiredActivity
          ProfileKey      profileKey         = ProfileKeyUtil.getSelfProfileKey();

          TextSecurePreferences.setMultiDevice(DeviceActivity.this, true);
-          accountManager.addDevice(ephemeralId, publicKey, aciIdentityKeyPair, pniIdentityKeyPair, profileKey, SignalStore.svr().getOrCreateMasterKey(), verificationCode);
+          accountManager.addDevice(ephemeralId, publicKey, aciIdentityKeyPair, pniIdentityKeyPair, profileKey, verificationCode);

          return SUCCESS;
        } catch (NotFoundException e) {
--- a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.java
@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms;

-import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -16,19 +15,12 @@ import androidx.lifecycle.ViewModelProvider;

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

-import org.signal.core.util.concurrent.LifecycleDisposable;
-import org.signal.core.util.logging.Log;
-import org.signal.donations.StripeApi;
-import org.thoughtcrime.securesms.components.DebugLogsPromptDialogFragment;
-import org.thoughtcrime.securesms.components.PromptBatterySaverDialogFragment;
-import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity;
 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.OldDeviceExitActivity;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.net.DeviceTransferBlockingInterceptor;
-import org.thoughtcrime.securesms.notifications.VitalsViewModel;
 import org.thoughtcrime.securesms.stories.tabs.ConversationListTabRepository;
 import org.thoughtcrime.securesms.stories.tabs.ConversationListTabsViewModel;
 import org.thoughtcrime.securesms.util.AppStartup;
@@ -48,9 +40,6 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot

  private VoiceNoteMediaController      mediaController;
  private ConversationListTabsViewModel conversationListTabsViewModel;
-  private VitalsViewModel               vitalsViewModel;
-
-  private final LifecycleDisposable lifecycleDisposable = new LifecycleDisposable();

  private boolean onFirstRender = false;

@@ -85,43 +74,21 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
          }
        });

-    lifecycleDisposable.bindTo(this);

    mediaController = new VoiceNoteMediaController(this, true);

    ConversationListTabRepository         repository = new ConversationListTabRepository();
    ConversationListTabsViewModel.Factory factory    = new ConversationListTabsViewModel.Factory(repository);

-    handleDeeplinkIntent(getIntent());
+    handleGroupLinkInIntent(getIntent());
+    handleProxyInIntent(getIntent());
+    handleSignalMeIntent(getIntent());
+    handleCallLinkInIntent(getIntent());

    CachedInflater.from(this).clear();

    conversationListTabsViewModel = new ViewModelProvider(this, factory).get(ConversationListTabsViewModel.class);
    updateTabVisibility();
-
-    vitalsViewModel = new ViewModelProvider(this).get(VitalsViewModel.class);
-
-    lifecycleDisposable.add(
-        vitalsViewModel
-            .getVitalsState()
-            .subscribe(this::presentVitalsState)
-    );
-  }
-
-  @SuppressLint("NewApi")
-  private void presentVitalsState(VitalsViewModel.State state) {
-    switch (state) {
-      case NONE:
-        break;
-      case PROMPT_BATTERY_SAVER_DIALOG:
-        PromptBatterySaverDialogFragment.show(getSupportFragmentManager());
-        break;
-      case PROMPT_DEBUGLOGS_FOR_NOTIFICATIONS:
-        DebugLogsPromptDialogFragment.show(this, DebugLogsPromptDialogFragment.Purpose.NOTIFICATIONS);
-      case PROMPT_DEBUGLOGS_FOR_CRASH:
-        DebugLogsPromptDialogFragment.show(this, DebugLogsPromptDialogFragment.Purpose.CRASH);
-        break;
-    }
  }

  @Override
@@ -134,7 +101,10 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
  @Override
  protected void onNewIntent(Intent intent) {
    super.onNewIntent(intent);
-    handleDeeplinkIntent(intent);
+    handleGroupLinkInIntent(intent);
+    handleProxyInIntent(intent);
+    handleSignalMeIntent(intent);
+    handleCallLinkInIntent(intent);
  }

  @Override
@@ -166,8 +136,6 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
    }

    updateTabVisibility();
-
-    vitalsViewModel.checkSlowNotificationHeuristics();
  }

  @Override
@@ -200,14 +168,6 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
    return navigator;
  }

-  private void handleDeeplinkIntent(Intent intent) {
-    handleGroupLinkInIntent(intent);
-    handleProxyInIntent(intent);
-    handleSignalMeIntent(intent);
-    handleCallLinkInIntent(intent);
-    handleDonateReturnIntent(intent);
-  }
-
  private void handleGroupLinkInIntent(Intent intent) {
    Uri data = intent.getData();
    if (data != null) {
@@ -236,13 +196,6 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
    }
  }

-  private void handleDonateReturnIntent(Intent intent) {
-    Uri data = intent.getData();
-    if (data != null && data.toString().startsWith(StripeApi.RETURN_URL_IDEAL)) {
-      startActivity(AppSettingsActivity.manageSubscriptions(this));
-    }
-  }
-
  public void onFirstRender() {
    onFirstRender = true;
  }
--- a/app/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java
@@ -51,6 +51,7 @@ 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.views.SimpleProgressDialog;

 import java.io.IOException;
@@ -312,7 +313,7 @@ public class NewConversationActivity extends ContactSelectionActivity
  }

  private @Nullable ActionItem createRemoveActionItem(@NonNull Recipient recipient) {
-    if (recipient.isSelf() || recipient.isGroup()) {
+    if (!FeatureFlags.hideContacts() || recipient.isSelf() || recipient.isGroup()) {
      return null;
    }

--- a/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java
@@ -21,6 +21,7 @@ import android.app.KeyguardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.PorterDuff;
+import android.os.Build;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.InputType;
--- a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
@@ -19,12 +19,13 @@ import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNum
 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.SignalStore;
 import org.thoughtcrime.securesms.lock.v2.CreateSvrPinActivity;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrationActivity;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
 import org.thoughtcrime.securesms.pin.PinRestoreActivity;
-import org.thoughtcrime.securesms.profiles.edit.CreateProfileActivity;
+import org.thoughtcrime.securesms.profiles.edit.EditProfileActivity;
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity;
@@ -79,6 +80,15 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
  protected void onPreCreate() {}
  protected void onCreate(Bundle savedInstanceState, boolean ready) {}

+  @Override
+  protected void onResume() {
+    super.onResume();
+
+    if (networkAccess.isCensored()) {
+      ApplicationDependencies.getJobManager().add(new PushNotificationReceiveJob());
+    }
+  }
+
  @Override
  protected void onDestroy() {
    super.onDestroy();
@@ -228,7 +238,7 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
  }

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

--- a/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
@@ -37,7 +37,6 @@ import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.content.ContextCompat;
 import androidx.core.util.Consumer;
-import androidx.lifecycle.LiveDataReactiveStreams;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.window.java.layout.WindowInfoTrackerCallbackAdapter;
 import androidx.window.layout.DisplayFeature;
@@ -51,45 +50,35 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 import org.signal.core.util.ThreadUtil;
-import org.signal.core.util.concurrent.LifecycleDisposable;
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
 import org.signal.libsignal.protocol.IdentityKey;
 import org.thoughtcrime.securesms.components.TooltipPopup;
 import org.thoughtcrime.securesms.components.sensors.DeviceOrientationMonitor;
-import org.thoughtcrime.securesms.components.webrtc.CallLinkProfileKeySender;
-import org.thoughtcrime.securesms.components.webrtc.CallOverflowPopupWindow;
+import org.thoughtcrime.securesms.components.webrtc.CallLinkInfoSheet;
 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.InCallStatus;
-import org.thoughtcrime.securesms.components.webrtc.PendingParticipantsBottomSheet;
-import org.thoughtcrime.securesms.components.webrtc.PendingParticipantsView;
 import org.thoughtcrime.securesms.components.webrtc.WebRtcAudioDevice;
 import org.thoughtcrime.securesms.components.webrtc.WebRtcAudioOutput;
 import org.thoughtcrime.securesms.components.webrtc.WebRtcCallView;
 import org.thoughtcrime.securesms.components.webrtc.WebRtcCallViewModel;
 import org.thoughtcrime.securesms.components.webrtc.WebRtcControls;
 import org.thoughtcrime.securesms.components.webrtc.WifiToCellularPopupWindow;
-import org.thoughtcrime.securesms.components.webrtc.controls.ControlsAndInfoController;
-import org.thoughtcrime.securesms.components.webrtc.controls.ControlsAndInfoViewModel;
 import org.thoughtcrime.securesms.components.webrtc.participantslist.CallParticipantsListDialog;
-import org.thoughtcrime.securesms.components.webrtc.requests.CallLinkIncomingRequestSheet;
 import org.thoughtcrime.securesms.conversation.ui.error.SafetyNumberChangeDialog;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.events.WebRtcViewModel;
 import org.thoughtcrime.securesms.messagerequests.CalleeMustAcceptMessageRequestActivity;
 import org.thoughtcrime.securesms.permissions.Permissions;
-import org.thoughtcrime.securesms.reactions.any.ReactWithAnyEmojiBottomSheetDialogFragment;
+import org.thoughtcrime.securesms.recipients.LiveRecipient;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.safety.SafetyNumberBottomSheet;
-import org.thoughtcrime.securesms.service.webrtc.CallLinkDisconnectReason;
 import org.thoughtcrime.securesms.service.webrtc.SignalCallManager;
 import org.thoughtcrime.securesms.sms.MessageSender;
-import org.thoughtcrime.securesms.util.BottomSheetUtil;
 import org.thoughtcrime.securesms.util.EllapsedTimeFormatter;
 import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.FullscreenHelper;
@@ -97,25 +86,21 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.ThrottledDebouncer;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.VibrateUtil;
-import org.thoughtcrime.securesms.util.WindowUtil;
 import org.thoughtcrime.securesms.util.livedata.LiveDataUtil;
 import org.thoughtcrime.securesms.webrtc.CallParticipantsViewState;
 import org.thoughtcrime.securesms.webrtc.audio.SignalAudioManager;
 import org.whispersystems.signalservice.api.messages.calls.HangupMessage;

-import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;

 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
-import io.reactivex.rxjava3.core.BackpressureStrategy;
 import io.reactivex.rxjava3.disposables.Disposable;

 import static org.thoughtcrime.securesms.components.sensors.Orientation.PORTRAIT_BOTTOM_EDGE;

-public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChangeDialog.Callback, ReactWithAnyEmojiBottomSheetDialogFragment.Callback {
+public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChangeDialog.Callback {

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

@@ -125,7 +110,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
  /**
   * ANSWER the call via voice-only.
   */
-  public static final String ANSWER_ACTION = WebRtcCallActivity.class.getCanonicalName() + ".ANSWER_ACTION";
+  public static final String ANSWER_ACTION       = WebRtcCallActivity.class.getCanonicalName() + ".ANSWER_ACTION";

  /**
   * ANSWER the call via video.
@@ -136,29 +121,22 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan

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

  private CallParticipantsListUpdatePopupWindow participantUpdateWindow;
  private CallStateUpdatePopupWindow            callStateUpdatePopupWindow;
-  private CallOverflowPopupWindow               callOverflowPopupWindow;
  private WifiToCellularPopupWindow             wifiToCellularPopupWindow;
  private DeviceOrientationMonitor              deviceOrientationMonitor;

  private FullscreenHelper                 fullscreenHelper;
  private WebRtcCallView                   callScreen;
  private TooltipPopup                     videoTooltip;
-  private TooltipPopup                     switchCameraTooltip;
  private WebRtcCallViewModel              viewModel;
-  private ControlsAndInfoViewModel         controlsAndInfoViewModel;
  private boolean                          enableVideoIfAvailable;
  private boolean                          hasWarnedAboutBluetooth;
  private WindowLayoutInfoConsumer         windowLayoutInfoConsumer;
  private WindowInfoTrackerCallbackAdapter windowInfoTrackerCallbackAdapter;
  private ThrottledDebouncer               requestNewSizesThrottle;
  private PictureInPictureParams.Builder   pipBuilderParams;
-  private LifecycleDisposable              lifecycleDisposable;
-  private long                             lastCallLinkDisconnectDialogShowTime;
-  private ControlsAndInfoController        controlsAndInfo;

  private Disposable ephemeralStateDisposable = Disposable.empty();

@@ -168,14 +146,10 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
    super.attachBaseContext(newBase);
  }

-  @SuppressLint({ "SourceLockedOrientationActivity", "MissingInflatedId" })
+  @SuppressLint("SourceLockedOrientationActivity")
  @Override
  public void onCreate(Bundle savedInstanceState) {
    Log.i(TAG, "onCreate(" + getIntent().getBooleanExtra(EXTRA_STARTED_FROM_FULLSCREEN, false) + ")");
-
-    lifecycleDisposable = new LifecycleDisposable();
-    lifecycleDisposable.bindTo(this);
-
    getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
    getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
    super.onCreate(savedInstanceState);
@@ -196,16 +170,6 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
    initializeViewModel(isLandscapeEnabled);
    initializePictureInPictureParams();

-    controlsAndInfo = new ControlsAndInfoController(this, callScreen, callOverflowPopupWindow, viewModel, controlsAndInfoViewModel);
-    controlsAndInfo.addVisibilityListener(new FadeCallback());
-
-    fullscreenHelper.showAndHideWithSystemUI(getWindow(),
-                                             findViewById(R.id.call_screen_header_gradient),
-                                             findViewById(R.id.webrtc_call_view_toolbar_text),
-                                             findViewById(R.id.webrtc_call_view_toolbar_no_text));
-
-    lifecycleDisposable.add(controlsAndInfo);
-
    logIntent(getIntent());

    if (ANSWER_VIDEO_ACTION.equals(getIntent().getAction())) {
@@ -225,10 +189,6 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
    windowInfoTrackerCallbackAdapter.addWindowLayoutInfoListener(this, SignalExecutors.BOUNDED, windowLayoutInfoConsumer);

    requestNewSizesThrottle = new ThrottledDebouncer(TimeUnit.SECONDS.toMillis(1));
-
-    initializePendingParticipantFragmentListener();
-
-    WindowUtil.setNavigationBarColor(this, ContextCompat.getColor(this, R.color.signal_dark_colorSurface));
  }

  @Override
@@ -280,7 +240,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
    super.onPause();

    if (!viewModel.isCallStarting()) {
-      CallParticipantsState state = viewModel.getCallParticipantsStateSnapshot();
+      CallParticipantsState state = viewModel.getCallParticipantsState().getValue();
      if (state != null && state.getCallState().isPreJoinOrNetworkUnavailable()) {
        finish();
      }
@@ -300,7 +260,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
    }

    if (!viewModel.isCallStarting()) {
-      CallParticipantsState state = viewModel.getCallParticipantsStateSnapshot();
+      CallParticipantsState state = viewModel.getCallParticipantsState().getValue();
      if (state != null && state.getCallState().isPreJoinOrNetworkUnavailable()) {
        ApplicationDependencies.getSignalCallManager().cancelPreJoin();
      }
@@ -375,54 +335,6 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
    }
  }

-  private void initializePendingParticipantFragmentListener() {
-    if (!FeatureFlags.adHocCalling()) {
-      return;
-    }
-
-    getSupportFragmentManager().setFragmentResultListener(
-        PendingParticipantsBottomSheet.REQUEST_KEY,
-        this,
-        (requestKey, result) -> {
-          PendingParticipantsBottomSheet.Action action = PendingParticipantsBottomSheet.getAction(result);
-          List<RecipientId> recipientIds = viewModel.getPendingParticipantsSnapshot()
-                                                    .getUnresolvedPendingParticipants()
-                                                    .stream()
-                                                    .map(r -> r.getRecipient().getId())
-                                                    .collect(Collectors.toList());
-
-          switch (action) {
-            case NONE:
-              break;
-            case APPROVE_ALL:
-              new MaterialAlertDialogBuilder(this)
-                  .setTitle(getResources().getQuantityString(R.plurals.WebRtcCallActivity__approve_d_requests, recipientIds.size(), recipientIds.size()))
-                  .setMessage(getResources().getQuantityString(R.plurals.WebRtcCallActivity__d_people_will_be_added_to_the_call, recipientIds.size(), recipientIds.size()))
-                  .setNegativeButton(android.R.string.cancel, null)
-                  .setPositiveButton(R.string.WebRtcCallActivity__approve_all, (dialog, which) -> {
-                    for (RecipientId id : recipientIds) {
-                      ApplicationDependencies.getSignalCallManager().setCallLinkJoinRequestAccepted(id);
-                    }
-                  })
-                  .show();
-              break;
-            case DENY_ALL:
-              new MaterialAlertDialogBuilder(this)
-                  .setTitle(getResources().getQuantityString(R.plurals.WebRtcCallActivity__deny_d_requests, recipientIds.size(), recipientIds.size()))
-                  .setMessage(getResources().getQuantityString(R.plurals.WebRtcCallActivity__d_people_will_be_added_to_the_call, recipientIds.size(), recipientIds.size()))
-                  .setNegativeButton(android.R.string.cancel, null)
-                  .setPositiveButton(R.string.WebRtcCallActivity__deny_all, (dialog, which) -> {
-                    for (RecipientId id : recipientIds) {
-                      ApplicationDependencies.getSignalCallManager().setCallLinkJoinRequestRejected(id);
-                    }
-                  })
-                  .show();
-              break;
-          }
-        }
-    );
-  }
-
  private void initializeScreenshotSecurity() {
    if (TextSecurePreferences.isScreenSecurityEnabled(this)) {
      getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
@@ -438,13 +350,6 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
    participantUpdateWindow    = new CallParticipantsListUpdatePopupWindow(callScreen);
    callStateUpdatePopupWindow = new CallStateUpdatePopupWindow(callScreen);
    wifiToCellularPopupWindow  = new WifiToCellularPopupWindow(callScreen);
-    callOverflowPopupWindow    = new CallOverflowPopupWindow(this, callScreen, () -> {
-      CallParticipantsState state = viewModel.getCallParticipantsStateSnapshot();
-      if (state == null) {
-        return false;
-      }
-      return state.getLocalParticipant().isHandRaised();
-    });
  }

  private void initializeViewModel(boolean isLandscapeEnabled) {
@@ -457,28 +362,23 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
    viewModel.setIsLandscapeEnabled(isLandscapeEnabled);
    viewModel.setIsInPipMode(isInPipMode());
    viewModel.getMicrophoneEnabled().observe(this, callScreen::setMicEnabled);
-    viewModel.getWebRtcControls().observe(this, controls -> {
-      callScreen.setWebRtcControls(controls);
-      controlsAndInfo.updateControls(controls);
-    });
+    viewModel.getWebRtcControls().observe(this, callScreen::setWebRtcControls);
    viewModel.getEvents().observe(this, this::handleViewModelEvent);
+    viewModel.getCallTime().observe(this, this::handleCallTime);

-    lifecycleDisposable.add(viewModel.getInCallstatus().subscribe(this::handleInCallStatus));
-
-    boolean isStartedFromCallLink = getIntent().getBooleanExtra(WebRtcCallActivity.EXTRA_STARTED_FROM_CALL_LINK, false);
-    LiveDataUtil.combineLatest(LiveDataReactiveStreams.fromPublisher(viewModel.getCallParticipantsState().toFlowable(BackpressureStrategy.LATEST)),
+    LiveDataUtil.combineLatest(viewModel.getCallParticipantsState(),
                               viewModel.getOrientationAndLandscapeEnabled(),
                               viewModel.getEphemeralState(),
-                               (s, o, e) -> new CallParticipantsViewState(s, e, o.first == PORTRAIT_BOTTOM_EDGE, o.second, isStartedFromCallLink))
+                               (s, o, e) -> new CallParticipantsViewState(s, e, o.first == PORTRAIT_BOTTOM_EDGE, o.second))
                .observe(this, p -> callScreen.updateCallParticipants(p));
    viewModel.getCallParticipantListUpdate().observe(this, participantUpdateWindow::addCallParticipantListUpdate);
    viewModel.getSafetyNumberChangeEvent().observe(this, this::handleSafetyNumberChangeEvent);
    viewModel.getGroupMembersChanged().observe(this, unused -> updateGroupMembersForGroupCall());
    viewModel.getGroupMemberCount().observe(this, this::handleGroupMemberCountChange);
-    lifecycleDisposable.add(viewModel.shouldShowSpeakerHint().subscribe(this::updateSpeakerHint));
+    viewModel.shouldShowSpeakerHint().observe(this, this::updateSpeakerHint);

    callScreen.getViewTreeObserver().addOnGlobalLayoutListener(() -> {
-      CallParticipantsState state = viewModel.getCallParticipantsStateSnapshot();
+      CallParticipantsState state = viewModel.getCallParticipantsState().getValue();
      if (state != null) {
        if (state.needsNewRequestSizes()) {
          requestNewSizesThrottle.publish(() -> ApplicationDependencies.getSignalCallManager().updateRenderedResolutions());
@@ -498,14 +398,6 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
      }
      viewModel.setIsLandscapeEnabled(info.isInPictureInPictureMode());
    });
-
-    callScreen.setPendingParticipantsViewListener(new PendingParticipantsViewListener());
-    Disposable disposable = viewModel.getPendingParticipants()
-                                     .subscribe(callScreen::updatePendingParticipantsList);
-
-    lifecycleDisposable.add(disposable);
-
-    controlsAndInfoViewModel = new ViewModelProvider(this).get(ControlsAndInfoViewModel.class);
  }

  private void initializePictureInPictureParams() {
@@ -553,6 +445,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
                                   .setText(R.string.WebRtcCallActivity__tap_here_to_turn_on_your_video)
                                   .setOnDismissListener(() -> viewModel.onDismissedVideoTooltip())
                                   .show(TooltipPopup.POSITION_ABOVE);
+        return;
      }
    } else if (event instanceof WebRtcCallViewModel.Event.DismissVideoTooltip) {
      if (videoTooltip != null) {
@@ -561,54 +454,19 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
      }
    } else if (event instanceof WebRtcCallViewModel.Event.ShowWifiToCellularPopup) {
      wifiToCellularPopupWindow.show();
-    } else if (event instanceof WebRtcCallViewModel.Event.ShowSwitchCameraTooltip) {
-      if (switchCameraTooltip == null) {
-        switchCameraTooltip = TooltipPopup.forTarget(callScreen.getSwitchCameraTooltipTarget())
-                                          .setBackgroundTint(ContextCompat.getColor(this, R.color.core_ultramarine))
-                                          .setTextColor(ContextCompat.getColor(this, R.color.core_white))
-                                          .setText(R.string.WebRtcCallActivity__flip_camera_tooltip)
-                                          .setOnDismissListener(() -> viewModel.onDismissedSwitchCameraTooltip())
-                                          .show(TooltipPopup.POSITION_ABOVE);
-      }
-    } else if (event instanceof WebRtcCallViewModel.Event.DismissSwitchCameraTooltip) {
-      if (switchCameraTooltip != null) {
-        switchCameraTooltip.dismiss();
-        switchCameraTooltip = null;
-      }
    } else {
      throw new IllegalArgumentException("Unknown event: " + event);
    }
  }

-  private void handleInCallStatus(@NonNull InCallStatus inCallStatus) {
-    if (inCallStatus instanceof InCallStatus.ElapsedTime) {
+  private void handleCallTime(long callTime) {
+    EllapsedTimeFormatter ellapsedTimeFormatter = EllapsedTimeFormatter.fromDurationMillis(callTime);

-      EllapsedTimeFormatter ellapsedTimeFormatter = EllapsedTimeFormatter.fromDurationMillis(((InCallStatus.ElapsedTime) inCallStatus).getElapsedTime());
-
-      if (ellapsedTimeFormatter == null) {
-        return;
-      }
-
-      callScreen.setStatus(getString(R.string.WebRtcCallActivity__signal_s, ellapsedTimeFormatter.toString()));
-    } else if (inCallStatus instanceof InCallStatus.PendingCallLinkUsers) {
-      int waiting = ((InCallStatus.PendingCallLinkUsers) inCallStatus).getPendingUserCount();
-
-      callScreen.setStatus(getResources().getQuantityString(
-          R.plurals.WebRtcCallActivity__d_people_waiting,
-          waiting,
-          waiting
-      ));
-    } else if (inCallStatus instanceof InCallStatus.JoinedCallLinkUsers) {
-      int joined = ((InCallStatus.JoinedCallLinkUsers) inCallStatus).getJoinedUserCount();
-
-      callScreen.setStatus(getResources().getQuantityString(
-          R.plurals.WebRtcCallActivity__d_people,
-          joined,
-          joined
-      ));
-    }else {
-      throw new AssertionError();
+    if (ellapsedTimeFormatter == null) {
+      return;
    }
+
+    callScreen.setStatus(getString(R.string.WebRtcCallActivity__signal_s, ellapsedTimeFormatter.toString()));
  }

  private void handleSetAudioHandset() {
@@ -815,16 +673,12 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan

  @Override
  public void onSendAnywayAfterSafetyNumberChange(@NonNull List<RecipientId> changedRecipients) {
-    CallParticipantsState state = viewModel.getCallParticipantsStateSnapshot();
+    CallParticipantsState state = viewModel.getCallParticipantsState().getValue();

    if (state == null) {
      return;
    }

-    if (state.isCallLink()) {
-      CallLinkProfileKeySender.onSendAnyway(new HashSet<>(changedRecipients));
-    }
-
    if (state.getGroupCallState().isConnected()) {
      ApplicationDependencies.getSignalCallManager().groupApproveSafetyChange(changedRecipients);
    } else {
@@ -833,11 +687,11 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
  }

  @Override
-  public void onMessageResentAfterSafetyNumberChange() {}
+  public void onMessageResentAfterSafetyNumberChange() { }

  @Override
  public void onCanceled() {
-    CallParticipantsState state = viewModel.getCallParticipantsStateSnapshot();
+    CallParticipantsState state = viewModel.getCallParticipantsState().getValue();
    if (state != null && state.getGroupCallState().isNotIdle()) {
      if (state.getCallState().isPreJoinOrNetworkUnavailable()) {
        ApplicationDependencies.getSignalCallManager().cancelPreJoin();
@@ -869,7 +723,6 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan

    viewModel.setRecipient(event.getRecipient());
    callScreen.setRecipient(event.getRecipient());
-    controlsAndInfoViewModel.setRecipient(event.getRecipient());

    switch (event.getState()) {
      case CALL_PRE_JOIN:
@@ -906,18 +759,6 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
        handleUntrustedIdentity(event); break;
    }

-    if (event.getCallLinkDisconnectReason() != null && event.getCallLinkDisconnectReason().getPostedAt() > lastCallLinkDisconnectDialogShowTime) {
-      lastCallLinkDisconnectDialogShowTime = System.currentTimeMillis();
-
-      if (event.getCallLinkDisconnectReason() instanceof CallLinkDisconnectReason.RemovedFromCall) {
-        displayRemovedFromCallLinkDialog();
-      } else if (event.getCallLinkDisconnectReason() instanceof CallLinkDisconnectReason.DeniedRequestToJoinCall) {
-        displayDeniedRequestToJoinCallLinkDialog();
-      } else {
-        throw new AssertionError("Unexpected reason: " + event.getCallLinkDisconnectReason());
-      }
-    }
-
    boolean enableVideo = event.getLocalParticipant().getCameraState().getCameraCount() > 0 && enableVideoIfAvailable;

    viewModel.updateFromWebRtcViewModel(event, enableVideo);
@@ -939,24 +780,9 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
    }
  }

-  private void displayRemovedFromCallLinkDialog() {
-    new MaterialAlertDialogBuilder(this)
-        .setTitle(R.string.WebRtcCallActivity__removed_from_call)
-        .setMessage(R.string.WebRtcCallActivity__someone_has_removed_you_from_the_call)
-        .setPositiveButton(android.R.string.ok, null)
-        .show();
-  }
-
-  private void displayDeniedRequestToJoinCallLinkDialog() {
-    new MaterialAlertDialogBuilder(this)
-        .setTitle(R.string.WebRtcCallActivity__join_request_denied)
-        .setMessage(R.string.WebRtcCallActivity__your_request_to_join_this_call_has_been_denied)
-        .setPositiveButton(android.R.string.ok, null)
-        .show();
-  }
-
  private void handleCallPreJoin(@NonNull WebRtcViewModel event) {
    if (event.getGroupState().isNotIdle()) {
+      callScreen.setStatusFromGroupCallState(event.getGroupState());
      callScreen.setRingGroup(event.shouldRingGroup());

      if (event.shouldRingGroup() && event.areRemoteDevicesInCall()) {
@@ -977,15 +803,6 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
    MessageSender.onMessageSent();
  }

-  @Override
-  public void onReactWithAnyEmojiDialogDismissed() { /* no-op */ }
-
-  @Override
-  public void onReactWithAnyEmojiSelected(@NonNull String emoji) {
-    ApplicationDependencies.getSignalCallManager().react(emoji);
-    callOverflowPopupWindow.dismiss();
-  }
-
  private final class ControlsListener implements WebRtcCallView.ControlsListener {

    @Override
@@ -999,13 +816,22 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
    }

    @Override
-    public void toggleControls() {
-      WebRtcControls controlState = viewModel.getWebRtcControls().getValue();
-      if (controlState != null && !controlState.displayIncomingCallButtons()) {
-        controlsAndInfo.toggleControls();
+    public void onControlsFadeOut() {
+      if (videoTooltip != null) {
+        videoTooltip.dismiss();
      }
    }

+    @Override
+    public void showSystemUI() {
+      fullscreenHelper.showSystemUI();
+    }
+
+    @Override
+    public void hideSystemUI() {
+      fullscreenHelper.hideSystemUI();
+    }
+
    @Override
    public void onAudioOutputChanged(@NonNull WebRtcAudioOutput audioOutput) {
      maybeDisplaySpeakerphonePopup(audioOutput);
@@ -1066,11 +892,6 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
      handleAnswerWithAudio();
    }

-    @Override
-    public void onOverflowClicked() {
-      controlsAndInfo.toggleOverflowPopup();
-    }
-
    @Override
    public void onAcceptCallPressed() {
      if (viewModel.isAnswerWithVideoAvailable()) {
@@ -1088,7 +909,6 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
    @Override
    public void onLocalPictureInPictureClicked() {
      viewModel.onLocalPictureInPictureClicked();
-      controlsAndInfo.restartHideControlsTimer();
    }

    @Override
@@ -1105,7 +925,13 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan

    @Override
    public void onCallInfoClicked() {
-      controlsAndInfo.showCallInfo();
+      LiveRecipient liveRecipient = viewModel.getRecipient();
+
+      if (liveRecipient.get().isCallLink()) {
+        CallLinkInfoSheet.show(getSupportFragmentManager(), liveRecipient.get().requireCallLinkRoomId());
+      } else {
+        CallParticipantsListDialog.show(getSupportFragmentManager());
+      }
    }

    @Override
@@ -1123,29 +949,6 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
    }
  }

-  private class PendingParticipantsViewListener implements PendingParticipantsView.Listener {
-
-    @Override
-    public void onAllowPendingRecipient(@NonNull Recipient pendingRecipient) {
-      ApplicationDependencies.getSignalCallManager().setCallLinkJoinRequestAccepted(pendingRecipient.getId());
-    }
-
-    @Override
-    public void onRejectPendingRecipient(@NonNull Recipient pendingRecipient) {
-      ApplicationDependencies.getSignalCallManager().setCallLinkJoinRequestRejected(pendingRecipient.getId());
-    }
-
-    @Override
-    public void onLaunchPendingRequestsSheet() {
-      new PendingParticipantsBottomSheet().show(getSupportFragmentManager(), BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG);
-    }
-
-    @Override
-    public void onLaunchRecipientSheet(@NonNull Recipient pendingRecipient) {
-      CallLinkIncomingRequestSheet.show(getSupportFragmentManager(), pendingRecipient.getId());
-    }
-  }
-
  private class WindowLayoutInfoConsumer implements Consumer<WindowLayoutInfo> {

    @Override
@@ -1168,20 +971,4 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
      }
    }
  }
-
-  private class FadeCallback implements ControlsAndInfoController.BottomSheetVisibilityListener {
-
-    @Override
-    public void onShown() {
-      fullscreenHelper.showSystemUI();
-    }
-
-    @Override
-    public void onHidden() {
-      fullscreenHelper.hideSystemUI();
-      if (videoTooltip != null) {
-        videoTooltip.dismiss();
-      }
-    }
-  }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/absbackup/backupables/SvrAuthTokens.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/absbackup/backupables/SvrAuthTokens.kt
@@ -1,10 +1,10 @@
 package org.thoughtcrime.securesms.absbackup.backupables

+import com.google.protobuf.InvalidProtocolBufferException
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.absbackup.AndroidBackupItem
 import org.thoughtcrime.securesms.absbackup.protos.SvrAuthToken
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import java.io.IOException

 /**
 * This backs up the not-secret KBS Auth tokens, which can be combined with a PIN to prove ownership of a phone number in order to complete the registration process.
@@ -30,7 +30,7 @@ object SvrAuthTokens : AndroidBackupItem {
      val proto = SvrAuthToken.ADAPTER.decode(data)

      SignalStore.svr().putAuthTokenList(proto.tokens)
-    } catch (e: IOException) {
+    } catch (e: InvalidProtocolBufferException) {
      Log.w(TAG, "Cannot restore KbsAuthToken from backup service.")
    }
  }
--- a/app/src/main/java/org/thoughtcrime/securesms/animation/ResizeAnimation.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/animation/ResizeAnimation.java
@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms.animation;

-import android.graphics.Point;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.Animation;
@@ -17,10 +16,6 @@ public class ResizeAnimation extends Animation {
  private int startWidth;
  private int startHeight;

-  public ResizeAnimation(@NonNull View target, @NonNull Point dimension) {
-    this(target, dimension.x, dimension.y);
-  }
-
  public ResizeAnimation(@NonNull View target, int targetWidthPx, int targetHeightPx) {
    this.target         = target;
    this.targetWidthPx  = targetWidthPx;
--- a/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateDownloadManagerReceiver.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateDownloadManagerReceiver.kt
@@ -1,42 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.apkupdate
-
-import android.app.DownloadManager
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-
-/**
- * Provided to the DownloadManager as a callback receiver for when it has finished downloading the APK we're trying to install.
- *
- * Registered in the manifest to list to [DownloadManager.ACTION_DOWNLOAD_COMPLETE].
- */
-class ApkUpdateDownloadManagerReceiver : BroadcastReceiver() {
-
-  companion object {
-    private val TAG = Log.tag(ApkUpdateDownloadManagerReceiver::class.java)
-  }
-
-  override fun onReceive(context: Context, intent: Intent) {
-    Log.i(TAG, "onReceive()")
-
-    if (DownloadManager.ACTION_DOWNLOAD_COMPLETE != intent.action) {
-      Log.i(TAG, "Unexpected action: " + intent.action)
-      return
-    }
-
-    val downloadId = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -2)
-    if (downloadId != SignalStore.apkUpdate().downloadId) {
-      Log.w(TAG, "downloadId doesn't match the one we're waiting for! Ignoring.")
-      return
-    }
-
-    ApkUpdateInstaller.installOrPromptForInstall(context, downloadId, userInitiated = false)
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateInstaller.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateInstaller.kt
@@ -1,150 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.apkupdate
-
-import android.app.PendingIntent
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageInstaller
-import android.os.Build
-import org.signal.core.util.PendingIntentFlags
-import org.signal.core.util.StreamUtil
-import org.signal.core.util.getDownloadManager
-import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.jobs.ApkUpdateJob
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.util.Environment
-import org.thoughtcrime.securesms.util.FileUtils
-import java.io.FileInputStream
-import java.io.IOException
-import java.io.InputStream
-import java.security.MessageDigest
-
-object ApkUpdateInstaller {
-
-  private val TAG = Log.tag(ApkUpdateInstaller::class.java)
-
-  /**
-   * Installs the downloaded APK silently if possible. If not, prompts the user with a notification to install.
-   * May show errors instead under certain conditions.
-   *
-   * A common pattern you may see is that this is called with [userInitiated] = false (or some other state
-   * that prevents us from auto-updating, like the app being in the foreground), causing this function
-   * to show an install prompt notification. The user clicks that notification, calling this with
-   * [userInitiated] = true, and then everything installs.
-   */
-  fun installOrPromptForInstall(context: Context, downloadId: Long, userInitiated: Boolean) {
-    if (downloadId != SignalStore.apkUpdate().downloadId) {
-      Log.w(TAG, "DownloadId doesn't match the one we're waiting for (current: $downloadId, expected: ${SignalStore.apkUpdate().downloadId})! We likely have newer data. Ignoring.")
-      ApkUpdateNotifications.dismissInstallPrompt(context)
-      ApplicationDependencies.getJobManager().add(ApkUpdateJob())
-      return
-    }
-
-    val digest = SignalStore.apkUpdate().digest
-    if (digest == null) {
-      Log.w(TAG, "DownloadId matches, but digest is null! Inconsistent state. Failing and clearing state.")
-      SignalStore.apkUpdate().clearDownloadAttributes()
-      ApkUpdateNotifications.showInstallFailed(context, ApkUpdateNotifications.FailureReason.UNKNOWN)
-      return
-    }
-
-    if (!isMatchingDigest(context, downloadId, digest)) {
-      Log.w(TAG, "DownloadId matches, but digest does not! Bad download or inconsistent state. Failing and clearing state.")
-      SignalStore.apkUpdate().clearDownloadAttributes()
-      ApkUpdateNotifications.showInstallFailed(context, ApkUpdateNotifications.FailureReason.UNKNOWN)
-      return
-    }
-
-    if (!userInitiated && !shouldAutoUpdate()) {
-      Log.w(TAG, "Not user-initiated and not eligible for auto-update. Prompting. (API=${Build.VERSION.SDK_INT}, Foreground=${ApplicationDependencies.getAppForegroundObserver().isForegrounded}, AutoUpdate=${SignalStore.apkUpdate().autoUpdate})")
-      ApkUpdateNotifications.showInstallPrompt(context, downloadId)
-      return
-    }
-
-    try {
-      installApk(context, downloadId, userInitiated)
-    } catch (e: IOException) {
-      Log.w(TAG, "Hit IOException when trying to install APK!", e)
-      SignalStore.apkUpdate().clearDownloadAttributes()
-      ApkUpdateNotifications.showInstallFailed(context, ApkUpdateNotifications.FailureReason.UNKNOWN)
-    } catch (e: SecurityException) {
-      Log.w(TAG, "Hit SecurityException when trying to install APK!", e)
-      SignalStore.apkUpdate().clearDownloadAttributes()
-      ApkUpdateNotifications.showInstallFailed(context, ApkUpdateNotifications.FailureReason.UNKNOWN)
-    }
-  }
-
-  @Throws(IOException::class, SecurityException::class)
-  private fun installApk(context: Context, downloadId: Long, userInitiated: Boolean) {
-    val apkInputStream: InputStream? = getDownloadedApkInputStream(context, downloadId)
-    if (apkInputStream == null) {
-      Log.w(TAG, "Could not open download APK input stream!")
-      return
-    }
-
-    Log.d(TAG, "Beginning APK install...")
-    val packageInstaller: PackageInstaller = context.packageManager.packageInstaller
-
-    val sessionParams = PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL).apply {
-      // At this point, we always want to set this if possible, since we've already prompted the user with our own notification when necessary.
-      // This lets us skip the system-generated notification.
-      if (Build.VERSION.SDK_INT >= 31) {
-        setRequireUserAction(PackageInstaller.SessionParams.USER_ACTION_NOT_REQUIRED)
-      }
-    }
-
-    Log.d(TAG, "Creating install session...")
-    val sessionId: Int = packageInstaller.createSession(sessionParams)
-    val session: PackageInstaller.Session = packageInstaller.openSession(sessionId)
-
-    Log.d(TAG, "Writing APK data...")
-    session.use { activeSession ->
-      val sessionOutputStream = activeSession.openWrite(context.packageName, 0, -1)
-      StreamUtil.copy(apkInputStream, sessionOutputStream)
-    }
-
-    val installerPendingIntent = PendingIntent.getBroadcast(
-      context,
-      sessionId,
-      Intent(context, ApkUpdatePackageInstallerReceiver::class.java).apply {
-        putExtra(ApkUpdatePackageInstallerReceiver.EXTRA_USER_INITIATED, userInitiated)
-        putExtra(ApkUpdatePackageInstallerReceiver.EXTRA_DOWNLOAD_ID, downloadId)
-      },
-      PendingIntentFlags.mutable() or PendingIntentFlags.updateCurrent()
-    )
-
-    Log.d(TAG, "Committing session...")
-    session.commit(installerPendingIntent.intentSender)
-  }
-
-  private fun getDownloadedApkInputStream(context: Context, downloadId: Long): InputStream? {
-    return try {
-      FileInputStream(context.getDownloadManager().openDownloadedFile(downloadId).fileDescriptor)
-    } catch (e: IOException) {
-      Log.w(TAG, e)
-      null
-    }
-  }
-
-  private fun isMatchingDigest(context: Context, downloadId: Long, expectedDigest: ByteArray): Boolean {
-    return try {
-      FileInputStream(context.getDownloadManager().openDownloadedFile(downloadId).fileDescriptor).use { stream ->
-        val digest = FileUtils.getFileDigest(stream)
-        MessageDigest.isEqual(digest, expectedDigest)
-      }
-    } catch (e: IOException) {
-      Log.w(TAG, e)
-      false
-    }
-  }
-
-  private fun shouldAutoUpdate(): Boolean {
-    // TODO Auto-updates temporarily restricted to nightlies. Once we have designs for allowing users to opt-out of auto-updates, we can re-enable this
-    return Environment.IS_NIGHTLY && Build.VERSION.SDK_INT >= 31 && SignalStore.apkUpdate().autoUpdate && !ApplicationDependencies.getAppForegroundObserver().isForegrounded
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateNotificationReceiver.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateNotificationReceiver.kt
@@ -1,43 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.apkupdate
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import org.signal.core.util.logging.Log
-
-/**
- * Receiver that is triggered based on various notification actions that can be taken on update-related notifications.
- */
-class ApkUpdateNotificationReceiver : BroadcastReceiver() {
-
-  companion object {
-    private val TAG = Log.tag(ApkUpdateNotificationReceiver::class.java)
-
-    const val ACTION_INITIATE_INSTALL = "signal.apk_update_notification.initiate_install"
-    const val EXTRA_DOWNLOAD_ID = "signal.download_id"
-  }
-
-  override fun onReceive(context: Context, intent: Intent?) {
-    if (intent == null) {
-      Log.w(TAG, "Null intent")
-      return
-    }
-
-    val downloadId: Long = intent.getLongExtra(EXTRA_DOWNLOAD_ID, -2)
-
-    when (val action: String? = intent.action) {
-      ACTION_INITIATE_INSTALL -> handleInstall(context, downloadId)
-      else -> Log.w(TAG, "Unrecognized notification action: $action")
-    }
-  }
-
-  private fun handleInstall(context: Context, downloadId: Long) {
-    Log.i(TAG, "Got action to install.")
-    ApkUpdateInstaller.installOrPromptForInstall(context, downloadId, userInitiated = true)
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateNotifications.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateNotifications.kt
@@ -1,118 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.apkupdate
-
-import android.annotation.SuppressLint
-import android.app.PendingIntent
-import android.content.Context
-import android.content.Intent
-import androidx.core.app.NotificationCompat
-import androidx.core.content.ContextCompat
-import org.signal.core.util.PendingIntentFlags
-import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.MainActivity
-import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.notifications.NotificationChannels
-import org.thoughtcrime.securesms.notifications.NotificationIds
-import org.thoughtcrime.securesms.util.ServiceUtil
-
-object ApkUpdateNotifications {
-
-  val TAG = Log.tag(ApkUpdateNotifications::class.java)
-
-  /**
-   * Shows a notification to prompt the user to install the app update. Only shown when silently auto-updating is not possible or are disabled by the user.
-   * Note: This is an 'ongoing' notification (i.e. not-user dismissable) and never dismissed programatically. This is because the act of installing the APK
-   * will dismiss it for us.
-   */
-  @SuppressLint("LaunchActivityFromNotification")
-  fun showInstallPrompt(context: Context, downloadId: Long) {
-    Log.d(TAG, "Showing install prompt. DownloadId: $downloadId")
-    ServiceUtil.getNotificationManager(context).cancel(NotificationIds.APK_UPDATE_FAILED_INSTALL)
-
-    val pendingIntent = PendingIntent.getBroadcast(
-      context,
-      1,
-      Intent(context, ApkUpdateNotificationReceiver::class.java).apply {
-        action = ApkUpdateNotificationReceiver.ACTION_INITIATE_INSTALL
-        putExtra(ApkUpdateNotificationReceiver.EXTRA_DOWNLOAD_ID, downloadId)
-      },
-      PendingIntentFlags.updateCurrent()
-    )
-
-    val notification = NotificationCompat.Builder(context, NotificationChannels.getInstance().APP_UPDATES)
-      .setOngoing(true)
-      .setContentTitle(context.getString(R.string.ApkUpdateNotifications_prompt_install_title))
-      .setContentText(context.getString(R.string.ApkUpdateNotifications_prompt_install_body))
-      .setSmallIcon(R.drawable.ic_notification)
-      .setColor(ContextCompat.getColor(context, R.color.core_ultramarine))
-      .setContentIntent(pendingIntent)
-      .build()
-
-    ServiceUtil.getNotificationManager(context).notify(NotificationIds.APK_UPDATE_PROMPT_INSTALL, notification)
-  }
-
-  fun dismissInstallPrompt(context: Context) {
-    Log.d(TAG, "Dismissing install prompt.")
-    ServiceUtil.getNotificationManager(context).cancel(NotificationIds.APK_UPDATE_PROMPT_INSTALL)
-  }
-
-  fun showInstallFailed(context: Context, reason: FailureReason) {
-    Log.d(TAG, "Showing failed notification. Reason: $reason")
-    ServiceUtil.getNotificationManager(context).cancel(NotificationIds.APK_UPDATE_PROMPT_INSTALL)
-
-    val pendingIntent = PendingIntent.getActivity(
-      context,
-      0,
-      Intent(context, MainActivity::class.java),
-      PendingIntentFlags.immutable()
-    )
-
-    val notification = NotificationCompat.Builder(context, NotificationChannels.getInstance().APP_UPDATES)
-      .setContentTitle(context.getString(R.string.ApkUpdateNotifications_failed_general_title))
-      .setContentText(context.getString(R.string.ApkUpdateNotifications_failed_general_body))
-      .setSmallIcon(R.drawable.ic_notification)
-      .setColor(ContextCompat.getColor(context, R.color.core_ultramarine))
-      .setContentIntent(pendingIntent)
-      .setAutoCancel(true)
-      .build()
-
-    ServiceUtil.getNotificationManager(context).notify(NotificationIds.APK_UPDATE_FAILED_INSTALL, notification)
-  }
-
-  fun showAutoUpdateSuccess(context: Context) {
-    val pendingIntent = PendingIntent.getActivity(
-      context,
-      0,
-      Intent(context, MainActivity::class.java),
-      PendingIntentFlags.immutable()
-    )
-
-    val appVersionName = context.packageManager.getPackageInfo(context.packageName, 0).versionName
-
-    val notification = NotificationCompat.Builder(context, NotificationChannels.getInstance().APP_UPDATES)
-      .setContentTitle(context.getString(R.string.ApkUpdateNotifications_auto_update_success_title))
-      .setContentText(context.getString(R.string.ApkUpdateNotifications_auto_update_success_body, appVersionName))
-      .setSmallIcon(R.drawable.ic_notification)
-      .setColor(ContextCompat.getColor(context, R.color.core_ultramarine))
-      .setContentIntent(pendingIntent)
-      .setAutoCancel(true)
-      .build()
-
-    ServiceUtil.getNotificationManager(context).notify(NotificationIds.APK_UPDATE_SUCCESSFUL_INSTALL, notification)
-  }
-
-  enum class FailureReason {
-    UNKNOWN,
-    ABORTED,
-    BLOCKED,
-    INCOMPATIBLE,
-    INVALID,
-    CONFLICT,
-    STORAGE,
-    TIMEOUT
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdatePackageInstallerReceiver.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdatePackageInstallerReceiver.kt
@@ -1,84 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.apkupdate
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageInstaller
-import org.signal.core.util.getParcelableExtraCompat
-import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.apkupdate.ApkUpdateNotifications.FailureReason
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-
-/**
- * This is the receiver that is triggered by the [PackageInstaller] to notify of various events. Package installation is initiated
- * in [ApkUpdateInstaller].
- */
-class ApkUpdatePackageInstallerReceiver : BroadcastReceiver() {
-
-  companion object {
-    private val TAG = Log.tag(ApkUpdatePackageInstallerReceiver::class.java)
-
-    const val EXTRA_USER_INITIATED = "signal.user_initiated"
-    const val EXTRA_DOWNLOAD_ID = "signal.download_id"
-  }
-
-  override fun onReceive(context: Context, intent: Intent?) {
-    val statusCode: Int = intent?.getIntExtra(PackageInstaller.EXTRA_STATUS, -1) ?: -1
-    val statusMessage: String? = intent?.getStringExtra(PackageInstaller.EXTRA_STATUS_MESSAGE)
-    val userInitiated = intent?.getBooleanExtra(EXTRA_USER_INITIATED, false) ?: false
-
-    Log.w(TAG, "[onReceive] Status: $statusCode, Message: $statusMessage")
-
-    when (statusCode) {
-      PackageInstaller.STATUS_SUCCESS -> {
-        if (SignalStore.apkUpdate().lastApkUploadTime != SignalStore.apkUpdate().pendingApkUploadTime) {
-          Log.i(TAG, "Update installed successfully! Updating our lastApkUploadTime to ${SignalStore.apkUpdate().pendingApkUploadTime}")
-          SignalStore.apkUpdate().lastApkUploadTime = SignalStore.apkUpdate().pendingApkUploadTime
-          ApkUpdateNotifications.showAutoUpdateSuccess(context)
-        } else {
-          Log.i(TAG, "Spurious 'success' notification?")
-        }
-      }
-      PackageInstaller.STATUS_PENDING_USER_ACTION -> handlePendingUserAction(context, userInitiated, intent!!)
-      PackageInstaller.STATUS_FAILURE_ABORTED -> ApkUpdateNotifications.showInstallFailed(context, FailureReason.ABORTED)
-      PackageInstaller.STATUS_FAILURE_BLOCKED -> ApkUpdateNotifications.showInstallFailed(context, FailureReason.BLOCKED)
-      PackageInstaller.STATUS_FAILURE_INCOMPATIBLE -> ApkUpdateNotifications.showInstallFailed(context, FailureReason.INCOMPATIBLE)
-      PackageInstaller.STATUS_FAILURE_INVALID -> ApkUpdateNotifications.showInstallFailed(context, FailureReason.INVALID)
-      PackageInstaller.STATUS_FAILURE_CONFLICT -> ApkUpdateNotifications.showInstallFailed(context, FailureReason.CONFLICT)
-      PackageInstaller.STATUS_FAILURE_STORAGE -> ApkUpdateNotifications.showInstallFailed(context, FailureReason.STORAGE)
-      PackageInstaller.STATUS_FAILURE_TIMEOUT -> ApkUpdateNotifications.showInstallFailed(context, FailureReason.TIMEOUT)
-      PackageInstaller.STATUS_FAILURE -> ApkUpdateNotifications.showInstallFailed(context, FailureReason.UNKNOWN)
-      else -> Log.w(TAG, "Unknown status! $statusCode")
-    }
-  }
-
-  private fun handlePendingUserAction(context: Context, userInitiated: Boolean, intent: Intent) {
-    val downloadId = intent.getLongExtra(EXTRA_DOWNLOAD_ID, -2)
-
-    if (!userInitiated) {
-      Log.w(TAG, "Not user-initiated, but needs user action! Showing prompt notification.")
-      ApkUpdateNotifications.showInstallPrompt(context, downloadId)
-      return
-    }
-
-    val promptIntent: Intent? = intent.getParcelableExtraCompat(Intent.EXTRA_INTENT, Intent::class.java)
-    if (promptIntent == null) {
-      Log.w(TAG, "Missing prompt intent! Showing prompt notification instead.")
-      ApkUpdateNotifications.showInstallPrompt(context, downloadId)
-      return
-    }
-
-    promptIntent.apply {
-      putExtra(Intent.EXTRA_NOT_UNKNOWN_SOURCE, true)
-      putExtra(Intent.EXTRA_INSTALLER_PACKAGE_NAME, "com.android.vending")
-      addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-    }
-
-    context.startActivity(promptIntent)
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/Attachment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/Attachment.java
@@ -0,0 +1,234 @@
+package org.thoughtcrime.securesms.attachments;
+
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.thoughtcrime.securesms.audio.AudioHash;
+import org.thoughtcrime.securesms.blurhash.BlurHash;
+import org.thoughtcrime.securesms.database.AttachmentTable;
+import org.thoughtcrime.securesms.database.AttachmentTable.TransformProperties;
+import org.thoughtcrime.securesms.stickers.StickerLocator;
+
+public abstract class Attachment {
+
+  @NonNull
+  private final String  contentType;
+  private final int     transferState;
+  private final long    size;
+
+  @Nullable
+  private final String fileName;
+
+  private final int    cdnNumber;
+
+  @Nullable
+  private final String  location;
+
+  @Nullable
+  private final String  key;
+
+  @Nullable
+  private final String relay;
+
+  @Nullable
+  private final byte[] digest;
+
+  @Nullable
+  private final byte[] incrementalDigest;
+
+  @Nullable
+  private final String fastPreflightId;
+
+  private final boolean voiceNote;
+  private final boolean borderless;
+  private final boolean videoGif;
+  private final int     width;
+  private final int     height;
+  private final boolean quote;
+  private final long    uploadTimestamp;
+
+  @Nullable
+  private final String caption;
+
+  @Nullable
+  private final StickerLocator stickerLocator;
+
+  @Nullable
+  private final BlurHash blurHash;
+
+  @Nullable
+  private final AudioHash audioHash;
+
+  @NonNull
+  private final TransformProperties transformProperties;
+
+  public Attachment(@NonNull String contentType,
+                    int transferState,
+                    long size,
+                    @Nullable String fileName,
+                    int cdnNumber,
+                    @Nullable String location,
+                    @Nullable String key,
+                    @Nullable String relay,
+                    @Nullable byte[] digest,
+                    @Nullable byte[] incrementalDigest,
+                    @Nullable String fastPreflightId,
+                    boolean voiceNote,
+                    boolean borderless,
+                    boolean videoGif,
+                    int width,
+                    int height,
+                    boolean quote,
+                    long uploadTimestamp,
+                    @Nullable String caption,
+                    @Nullable StickerLocator stickerLocator,
+                    @Nullable BlurHash blurHash,
+                    @Nullable AudioHash audioHash,
+                    @Nullable TransformProperties transformProperties)
+  {
+    this.contentType         = contentType;
+    this.transferState       = transferState;
+    this.size                = size;
+    this.fileName            = fileName;
+    this.cdnNumber           = cdnNumber;
+    this.location            = location;
+    this.key                 = key;
+    this.relay               = relay;
+    this.digest              = digest;
+    this.incrementalDigest   = incrementalDigest;
+    this.fastPreflightId     = fastPreflightId;
+    this.voiceNote           = voiceNote;
+    this.borderless          = borderless;
+    this.videoGif            = videoGif;
+    this.width               = width;
+    this.height              = height;
+    this.quote               = quote;
+    this.uploadTimestamp     = uploadTimestamp;
+    this.stickerLocator      = stickerLocator;
+    this.caption             = caption;
+    this.blurHash            = blurHash;
+    this.audioHash           = audioHash;
+    this.transformProperties = transformProperties != null ? transformProperties : TransformProperties.empty();
+  }
+
+  @Nullable
+  public abstract Uri getUri();
+
+  public abstract @Nullable Uri getPublicUri();
+
+  public int getTransferState() {
+    return transferState;
+  }
+
+  public boolean isInProgress() {
+    return transferState != AttachmentTable.TRANSFER_PROGRESS_DONE &&
+           transferState != AttachmentTable.TRANSFER_PROGRESS_FAILED &&
+           transferState != AttachmentTable.TRANSFER_PROGRESS_PERMANENT_FAILURE;
+  }
+
+  public boolean isPermanentlyFailed() {
+    return transferState == AttachmentTable.TRANSFER_PROGRESS_PERMANENT_FAILURE;
+  }
+
+  public long getSize() {
+    return size;
+  }
+
+  @Nullable
+  public String getFileName() {
+    return fileName;
+  }
+
+  @NonNull
+  public String getContentType() {
+    return contentType;
+  }
+
+  public int getCdnNumber() {
+    return cdnNumber;
+  }
+
+  @Nullable
+  public String getLocation() {
+    return location;
+  }
+
+  @Nullable
+  public String getKey() {
+    return key;
+  }
+
+  @Nullable
+  public String getRelay() {
+    return relay;
+  }
+
+  @Nullable
+  public byte[] getDigest() {
+    return digest;
+  }
+
+  @Nullable
+  public byte[] getIncrementalDigest() {
+    return incrementalDigest;
+  }
+
+  @Nullable
+  public String getFastPreflightId() {
+    return fastPreflightId;
+  }
+
+  public boolean isVoiceNote() {
+    return voiceNote;
+  }
+
+  public boolean isBorderless() {
+    return borderless;
+  }
+
+  public boolean isVideoGif() {
+    return videoGif;
+  }
+
+  public int getWidth() {
+    return width;
+  }
+
+  public int getHeight() {
+    return height;
+  }
+
+  public boolean isQuote() {
+    return quote;
+  }
+
+  public long getUploadTimestamp() {
+    return uploadTimestamp;
+  }
+
+  public boolean isSticker() {
+    return stickerLocator != null;
+  }
+
+  public @Nullable StickerLocator getSticker() {
+    return stickerLocator;
+  }
+
+  public @Nullable BlurHash getBlurHash() {
+    return blurHash;
+  }
+
+  public @Nullable AudioHash getAudioHash() {
+    return audioHash;
+  }
+
+  public @Nullable String getCaption() {
+    return caption;
+  }
+
+  public @NonNull TransformProperties getTransformProperties() {
+    return transformProperties;
+  }
+}
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/Attachment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/Attachment.kt
@@ -1,152 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-package org.thoughtcrime.securesms.attachments
-
-import android.net.Uri
-import android.os.Parcel
-import android.os.Parcelable
-import androidx.core.os.ParcelCompat
-import org.thoughtcrime.securesms.audio.AudioHash
-import org.thoughtcrime.securesms.blurhash.BlurHash
-import org.thoughtcrime.securesms.database.AttachmentTable
-import org.thoughtcrime.securesms.database.AttachmentTable.TransformProperties
-import org.thoughtcrime.securesms.stickers.StickerLocator
-import org.thoughtcrime.securesms.util.ParcelUtil
-
-/**
- * Note: We have to use our own Parcelable implementation because we need to do custom stuff to preserve
- * subclass information.
- */
-abstract class Attachment(
-  @JvmField
-  val contentType: String,
-  @JvmField
-  val transferState: Int,
-  @JvmField
-  val size: Long,
-  @JvmField
-  val fileName: String?,
-  @JvmField
-  val cdnNumber: Int,
-  @JvmField
-  val remoteLocation: String?,
-  @JvmField
-  val remoteKey: String?,
-  @JvmField
-  val remoteDigest: ByteArray?,
-  @JvmField
-  val incrementalDigest: ByteArray?,
-  @JvmField
-  val fastPreflightId: String?,
-  @JvmField
-  val voiceNote: Boolean,
-  @JvmField
-  val borderless: Boolean,
-  @JvmField
-  val videoGif: Boolean,
-  @JvmField
-  val width: Int,
-  @JvmField
-  val height: Int,
-  @JvmField
-  val incrementalMacChunkSize: Int,
-  @JvmField
-  val quote: Boolean,
-  @JvmField
-  val uploadTimestamp: Long,
-  @JvmField
-  val caption: String?,
-  @JvmField
-  val stickerLocator: StickerLocator?,
-  @JvmField
-  val blurHash: BlurHash?,
-  @JvmField
-  val audioHash: AudioHash?,
-  @JvmField
-  val transformProperties: TransformProperties?
-) : Parcelable {
-
-  abstract val uri: Uri?
-  abstract val publicUri: Uri?
-
-  protected constructor(parcel: Parcel) : this(
-    contentType = parcel.readString()!!,
-    transferState = parcel.readInt(),
-    size = parcel.readLong(),
-    fileName = parcel.readString(),
-    cdnNumber = parcel.readInt(),
-    remoteLocation = parcel.readString(),
-    remoteKey = parcel.readString(),
-    remoteDigest = ParcelUtil.readByteArray(parcel),
-    incrementalDigest = ParcelUtil.readByteArray(parcel),
-    fastPreflightId = parcel.readString(),
-    voiceNote = ParcelUtil.readBoolean(parcel),
-    borderless = ParcelUtil.readBoolean(parcel),
-    videoGif = ParcelUtil.readBoolean(parcel),
-    width = parcel.readInt(),
-    height = parcel.readInt(),
-    incrementalMacChunkSize = parcel.readInt(),
-    quote = ParcelUtil.readBoolean(parcel),
-    uploadTimestamp = parcel.readLong(),
-    caption = parcel.readString(),
-    stickerLocator = ParcelCompat.readParcelable(parcel, StickerLocator::class.java.classLoader, StickerLocator::class.java),
-    blurHash = ParcelCompat.readParcelable(parcel, BlurHash::class.java.classLoader, BlurHash::class.java),
-    audioHash = ParcelCompat.readParcelable(parcel, AudioHash::class.java.classLoader, AudioHash::class.java),
-    transformProperties = ParcelCompat.readParcelable(parcel, TransformProperties::class.java.classLoader, TransformProperties::class.java)
-  )
-
-  override fun writeToParcel(dest: Parcel, flags: Int) {
-    AttachmentCreator.writeSubclass(dest, this)
-    dest.writeString(contentType)
-    dest.writeInt(transferState)
-    dest.writeLong(size)
-    dest.writeString(fileName)
-    dest.writeInt(cdnNumber)
-    dest.writeString(remoteLocation)
-    dest.writeString(remoteKey)
-    ParcelUtil.writeByteArray(dest, remoteDigest)
-    ParcelUtil.writeByteArray(dest, incrementalDigest)
-    dest.writeString(fastPreflightId)
-    ParcelUtil.writeBoolean(dest, voiceNote)
-    ParcelUtil.writeBoolean(dest, borderless)
-    ParcelUtil.writeBoolean(dest, videoGif)
-    dest.writeInt(width)
-    dest.writeInt(height)
-    dest.writeInt(incrementalMacChunkSize)
-    ParcelUtil.writeBoolean(dest, quote)
-    dest.writeLong(uploadTimestamp)
-    dest.writeString(caption)
-    dest.writeParcelable(stickerLocator, 0)
-    dest.writeParcelable(blurHash, 0)
-    dest.writeParcelable(audioHash, 0)
-    dest.writeParcelable(transformProperties, 0)
-  }
-
-  override fun describeContents(): Int {
-    return 0
-  }
-
-  val isInProgress: Boolean
-    get() = transferState != AttachmentTable.TRANSFER_PROGRESS_DONE && transferState != AttachmentTable.TRANSFER_PROGRESS_FAILED && transferState != AttachmentTable.TRANSFER_PROGRESS_PERMANENT_FAILURE
-
-  val isPermanentlyFailed: Boolean
-    get() = transferState == AttachmentTable.TRANSFER_PROGRESS_PERMANENT_FAILURE
-
-  val isSticker: Boolean
-    get() = stickerLocator != null
-
-  fun getIncrementalDigest(): ByteArray? {
-    return if (incrementalDigest != null && incrementalDigest.size > 0) {
-      incrementalDigest
-    } else {
-      null
-    }
-  }
-
-  companion object {
-    @JvmField
-    val CREATOR: Parcelable.Creator<Attachment> = AttachmentCreator
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentCreator.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentCreator.kt
@@ -1,41 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.attachments
-
-import android.os.Parcel
-import android.os.Parcelable
-
-/**
- * Parcelable Creator for Attachments. Encapsulates the logic around dealing with
- * subclasses, since Attachment is abstract and has several children.
- */
-object AttachmentCreator : Parcelable.Creator<Attachment> {
-  enum class Subclass(val clazz: Class<out Attachment>, val code: String) {
-    DATABASE(DatabaseAttachment::class.java, "database"),
-    POINTER(PointerAttachment::class.java, "pointer"),
-    TOMBSTONE(TombstoneAttachment::class.java, "tombstone"),
-    URI(UriAttachment::class.java, "uri")
-  }
-
-  @JvmStatic
-  fun writeSubclass(dest: Parcel, instance: Attachment) {
-    val subclass = Subclass.values().firstOrNull { it.clazz == instance::class.java } ?: error("Unexpected subtype ${instance::class.java.simpleName}")
-    dest.writeString(subclass.code)
-  }
-
-  override fun createFromParcel(source: Parcel): Attachment {
-    val rawCode = source.readString()!!
-
-    return when (Subclass.values().first { rawCode == it.code }) {
-      Subclass.DATABASE -> DatabaseAttachment(source)
-      Subclass.POINTER -> PointerAttachment(source)
-      Subclass.TOMBSTONE -> TombstoneAttachment(source)
-      Subclass.URI -> UriAttachment(source)
-    }
-  }
-
-  override fun newArray(size: Int): Array<Attachment?> = arrayOfNulls(size)
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentId.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentId.java
@@ -0,0 +1,89 @@
+package org.thoughtcrime.securesms.attachments;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import androidx.annotation.NonNull;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import org.thoughtcrime.securesms.util.Util;
+
+public class AttachmentId implements Parcelable {
+
+  @JsonProperty
+  private final long rowId;
+
+  @JsonProperty
+  private final long uniqueId;
+
+  public AttachmentId(@JsonProperty("rowId") long rowId, @JsonProperty("uniqueId") long uniqueId) {
+    this.rowId    = rowId;
+    this.uniqueId = uniqueId;
+  }
+
+  private AttachmentId(Parcel in) {
+    this.rowId    = in.readLong();
+    this.uniqueId = in.readLong();
+  }
+
+  public long getRowId() {
+    return rowId;
+  }
+
+  public long getUniqueId() {
+    return uniqueId;
+  }
+
+  public String[] toStrings() {
+    return new String[] {String.valueOf(rowId), String.valueOf(uniqueId)};
+  }
+
+  public @NonNull String toString() {
+    return "AttachmentId::(" + rowId + ", " + uniqueId + ")";
+  }
+
+  public boolean isValid() {
+    return rowId >= 0 && uniqueId >= 0;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+
+    AttachmentId attachmentId = (AttachmentId)o;
+
+    if (rowId != attachmentId.rowId) return false;
+    return uniqueId == attachmentId.uniqueId;
+  }
+
+  @Override
+  public int hashCode() {
+    return Util.hashCode(rowId, uniqueId);
+  }
+
+  @Override
+  public int describeContents() {
+    return 0;
+  }
+
+  @Override
+  public void writeToParcel(Parcel dest, int flags) {
+    dest.writeLong(rowId);
+    dest.writeLong(uniqueId);
+  }
+
+  public static final Creator<AttachmentId> CREATOR = new Creator<AttachmentId>() {
+    @Override
+    public AttachmentId createFromParcel(Parcel in) {
+      return new AttachmentId(in);
+    }
+
+    @Override
+    public AttachmentId[] newArray(int size) {
+      return new AttachmentId[size];
+    }
+  };
+
+}
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentId.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentId.kt
@@ -1,20 +0,0 @@
-package org.thoughtcrime.securesms.attachments
-
-import android.os.Parcelable
-import com.fasterxml.jackson.annotation.JsonProperty
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-data class AttachmentId(
-  @JsonProperty("rowId")
-  @JvmField
-  val id: Long
-) : Parcelable {
-
-  val isValid: Boolean
-    get() = id >= 0
-
-  override fun toString(): String {
-    return "AttachmentId::$id"
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachment.java
@@ -0,0 +1,117 @@
+package org.thoughtcrime.securesms.attachments;
+
+import android.net.Uri;
+
+import androidx.annotation.Nullable;
+
+import org.thoughtcrime.securesms.audio.AudioHash;
+import org.thoughtcrime.securesms.blurhash.BlurHash;
+import org.thoughtcrime.securesms.database.AttachmentTable.TransformProperties;
+import org.thoughtcrime.securesms.mms.PartAuthority;
+import org.thoughtcrime.securesms.stickers.StickerLocator;
+
+import java.util.Comparator;
+
+public class DatabaseAttachment extends Attachment {
+
+  private final AttachmentId attachmentId;
+  private final long         mmsId;
+  private final boolean      hasData;
+  private final boolean      hasThumbnail;
+  private final int          displayOrder;
+
+  public DatabaseAttachment(AttachmentId attachmentId,
+                            long mmsId,
+                            boolean hasData,
+                            boolean hasThumbnail,
+                            String contentType,
+                            int transferProgress,
+                            long size,
+                            String fileName,
+                            int cdnNumber,
+                            String location,
+                            String key,
+                            String relay,
+                            byte[] digest,
+                            byte[] incrementalDigest,
+                            String fastPreflightId,
+                            boolean voiceNote,
+                            boolean borderless,
+                            boolean videoGif,
+                            int width,
+                            int height,
+                            boolean quote,
+                            @Nullable String caption,
+                            @Nullable StickerLocator stickerLocator,
+                            @Nullable BlurHash blurHash,
+                            @Nullable AudioHash audioHash,
+                            @Nullable TransformProperties transformProperties,
+                            int displayOrder,
+                            long uploadTimestamp)
+  {
+    super(contentType, transferProgress, size, fileName, cdnNumber, location, key, relay, digest, incrementalDigest, fastPreflightId, voiceNote, borderless, videoGif, width, height, quote, uploadTimestamp, caption, stickerLocator, blurHash, audioHash, transformProperties);
+    this.attachmentId = attachmentId;
+    this.hasData      = hasData;
+    this.hasThumbnail = hasThumbnail;
+    this.mmsId        = mmsId;
+    this.displayOrder = displayOrder;
+  }
+
+  @Override
+  @Nullable
+  public Uri getUri() {
+    if (hasData) {
+      return PartAuthority.getAttachmentDataUri(attachmentId);
+    } else {
+      return null;
+    }
+  }
+
+  @Override
+  public @Nullable Uri getPublicUri() {
+    if (hasData) {
+      return PartAuthority.getAttachmentPublicUri(getUri());
+    } else {
+      return null;
+    }
+  }
+
+  public AttachmentId getAttachmentId() {
+    return attachmentId;
+  }
+
+  public int getDisplayOrder() {
+    return displayOrder;
+  }
+
+  @Override
+  public boolean equals(Object other) {
+    return other != null &&
+           other instanceof DatabaseAttachment &&
+           ((DatabaseAttachment) other).attachmentId.equals(this.attachmentId);
+  }
+
+  @Override
+  public int hashCode() {
+    return attachmentId.hashCode();
+  }
+
+  public long getMmsId() {
+    return mmsId;
+  }
+
+  public boolean hasData() {
+    return hasData;
+  }
+
+  public boolean hasThumbnail() {
+    return hasThumbnail;
+  }
+
+  public static class DisplayOrderComparator implements Comparator<DatabaseAttachment> {
+    @Override
+    public int compare(DatabaseAttachment lhs, DatabaseAttachment rhs) {
+      return Integer.compare(lhs.getDisplayOrder(), rhs.getDisplayOrder());
+    }
+  }
+}
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachment.kt
@@ -1,133 +0,0 @@
-package org.thoughtcrime.securesms.attachments
-
-import android.net.Uri
-import android.os.Parcel
-import androidx.core.os.ParcelCompat
-import org.thoughtcrime.securesms.audio.AudioHash
-import org.thoughtcrime.securesms.blurhash.BlurHash
-import org.thoughtcrime.securesms.database.AttachmentTable.TransformProperties
-import org.thoughtcrime.securesms.mms.PartAuthority
-import org.thoughtcrime.securesms.stickers.StickerLocator
-import org.thoughtcrime.securesms.util.FeatureFlags
-import org.thoughtcrime.securesms.util.ParcelUtil
-
-class DatabaseAttachment : Attachment {
-
-  @JvmField
-  val attachmentId: AttachmentId
-
-  @JvmField
-  val mmsId: Long
-
-  @JvmField
-  val hasData: Boolean
-
-  private val hasThumbnail: Boolean
-  val displayOrder: Int
-
-  constructor(
-    attachmentId: AttachmentId,
-    mmsId: Long,
-    hasData: Boolean,
-    hasThumbnail: Boolean,
-    contentType: String?,
-    transferProgress: Int,
-    size: Long,
-    fileName: String?,
-    cdnNumber: Int,
-    location: String?,
-    key: String?,
-    digest: ByteArray?,
-    incrementalDigest: ByteArray?,
-    incrementalMacChunkSize: Int,
-    fastPreflightId: String?,
-    voiceNote: Boolean,
-    borderless: Boolean,
-    videoGif: Boolean,
-    width: Int,
-    height: Int,
-    quote: Boolean,
-    caption: String?,
-    stickerLocator: StickerLocator?,
-    blurHash: BlurHash?,
-    audioHash: AudioHash?,
-    transformProperties: TransformProperties?,
-    displayOrder: Int,
-    uploadTimestamp: Long
-  ) : super(
-    contentType = contentType!!,
-    transferState = transferProgress,
-    size = size,
-    fileName = fileName,
-    cdnNumber = cdnNumber,
-    remoteLocation = location,
-    remoteKey = key,
-    remoteDigest = digest,
-    incrementalDigest = incrementalDigest,
-    fastPreflightId = fastPreflightId,
-    voiceNote = voiceNote,
-    borderless = borderless,
-    videoGif = videoGif, width = width,
-    height = height,
-    incrementalMacChunkSize = incrementalMacChunkSize,
-    quote = quote,
-    uploadTimestamp = uploadTimestamp,
-    caption = caption,
-    stickerLocator = stickerLocator,
-    blurHash = blurHash,
-    audioHash = audioHash,
-    transformProperties = transformProperties
-  ) {
-    this.attachmentId = attachmentId
-    this.mmsId = mmsId
-    this.hasData = hasData
-    this.hasThumbnail = hasThumbnail
-    this.displayOrder = displayOrder
-  }
-
-  constructor(parcel: Parcel) : super(parcel) {
-    attachmentId = ParcelCompat.readParcelable(parcel, AttachmentId::class.java.classLoader, AttachmentId::class.java)!!
-    hasData = ParcelUtil.readBoolean(parcel)
-    hasThumbnail = ParcelUtil.readBoolean(parcel)
-    mmsId = parcel.readLong()
-    displayOrder = parcel.readInt()
-  }
-
-  override fun writeToParcel(dest: Parcel, flags: Int) {
-    super.writeToParcel(dest, flags)
-    dest.writeParcelable(attachmentId, 0)
-    ParcelUtil.writeBoolean(dest, hasData)
-    ParcelUtil.writeBoolean(dest, hasThumbnail)
-    dest.writeLong(mmsId)
-    dest.writeInt(displayOrder)
-  }
-
-  override val uri: Uri?
-    get() = if (hasData || FeatureFlags.instantVideoPlayback() && getIncrementalDigest() != null) {
-      PartAuthority.getAttachmentDataUri(attachmentId)
-    } else {
-      null
-    }
-
-  override val publicUri: Uri?
-    get() = if (hasData) {
-      PartAuthority.getAttachmentPublicUri(uri)
-    } else {
-      null
-    }
-
-  override fun equals(other: Any?): Boolean {
-    return other != null &&
-      other is DatabaseAttachment && other.attachmentId == attachmentId
-  }
-
-  override fun hashCode(): Int {
-    return attachmentId.hashCode()
-  }
-
-  class DisplayOrderComparator : Comparator<DatabaseAttachment> {
-    override fun compare(lhs: DatabaseAttachment, rhs: DatabaseAttachment): Int {
-      return lhs.displayOrder.compareTo(rhs.displayOrder)
-    }
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/MmsNotificationAttachment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/MmsNotificationAttachment.java
@@ -0,0 +1,39 @@
+package org.thoughtcrime.securesms.attachments;
+
+
+import android.net.Uri;
+
+import androidx.annotation.Nullable;
+
+import org.thoughtcrime.securesms.database.AttachmentTable;
+import org.thoughtcrime.securesms.database.MessageTable;
+
+public class MmsNotificationAttachment extends Attachment {
+
+  public MmsNotificationAttachment(int status, long size) {
+    super("application/mms", getTransferStateFromStatus(status), size, null, 0, null, null, null, null, null, null, false, false, false, 0, 0, false, 0, null, null, null, null, null);
+  }
+
+  @Nullable
+  @Override
+  public Uri getUri() {
+    return null;
+  }
+
+  @Override
+  public @Nullable Uri getPublicUri() {
+    return null;
+  }
+
+  private static int getTransferStateFromStatus(int status) {
+    if (status == MessageTable.MmsStatus.DOWNLOAD_INITIALIZED ||
+        status == MessageTable.MmsStatus.DOWNLOAD_NO_CONNECTIVITY)
+    {
+      return AttachmentTable.TRANSFER_PROGRESS_PENDING;
+    } else if (status == MessageTable.MmsStatus.DOWNLOAD_CONNECTING) {
+      return AttachmentTable.TRANSFER_PROGRESS_STARTED;
+    } else {
+      return AttachmentTable.TRANSFER_PROGRESS_FAILED;
+    }
+  }
+}
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/PointerAttachment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/PointerAttachment.java
@@ -0,0 +1,184 @@
+package org.thoughtcrime.securesms.attachments;
+
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+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;
+import java.util.Optional;
+
+public class PointerAttachment extends Attachment {
+
+  private PointerAttachment(@NonNull String contentType,
+                            int transferState,
+                            long size,
+                            @Nullable String fileName,
+                            int cdnNumber,
+                            @NonNull String location,
+                            @Nullable String key,
+                            @Nullable String relay,
+                            @Nullable byte[] digest,
+                            @Nullable byte[] incrementalDigest,
+                            @Nullable String fastPreflightId,
+                            boolean voiceNote,
+                            boolean borderless,
+                            boolean videoGif,
+                            int width,
+                            int height,
+                            long uploadTimestamp,
+                            @Nullable String caption,
+                            @Nullable StickerLocator stickerLocator,
+                            @Nullable BlurHash blurHash)
+  {
+    super(contentType, transferState, size, fileName, cdnNumber, location, key, relay, digest, incrementalDigest, fastPreflightId, voiceNote, borderless, videoGif, width, height, false, uploadTimestamp, caption, stickerLocator, blurHash, null, null);
+  }
+
+  @Nullable
+  @Override
+  public Uri getUri() {
+    return null;
+  }
+
+  @Override
+  public @Nullable Uri getPublicUri() {
+    return null;
+  }
+
+  public static List<Attachment> forPointers(Optional<List<SignalServiceAttachment>> pointers) {
+    List<Attachment> results = new LinkedList<>();
+
+    if (pointers.isPresent()) {
+      for (SignalServiceAttachment pointer : pointers.get()) {
+        Optional<Attachment> result = forPointer(Optional.of(pointer));
+
+        if (result.isPresent()) {
+          results.add(result.get());
+        }
+      }
+    }
+
+    return results;
+  }
+
+  public static List<Attachment> forPointers(@Nullable List<SignalServiceDataMessage.Quote.QuotedAttachment> pointers) {
+    List<Attachment> results = new LinkedList<>();
+
+    if (pointers != null) {
+      for (SignalServiceDataMessage.Quote.QuotedAttachment pointer : pointers) {
+        Optional<Attachment> result = forPointer(pointer);
+
+        if (result.isPresent()) {
+          results.add(result.get());
+        }
+      }
+    }
+
+    return results;
+  }
+
+  public static Optional<Attachment> forPointer(Optional<SignalServiceAttachment> pointer) {
+    return forPointer(pointer, null, null);
+  }
+
+  public static Optional<Attachment> forPointer(Optional<SignalServiceAttachment> pointer, @Nullable StickerLocator stickerLocator) {
+    return forPointer(pointer, stickerLocator, null);
+  }
+
+  public static Optional<Attachment> forPointer(Optional<SignalServiceAttachment> pointer, @Nullable StickerLocator stickerLocator, @Nullable String fastPreflightId) {
+    if (!pointer.isPresent() || !pointer.get().isPointer()) return Optional.empty();
+
+    String encodedKey = null;
+
+    if (pointer.get().asPointer().getKey() != null) {
+      encodedKey = Base64.encodeBytes(pointer.get().asPointer().getKey());
+    }
+
+    return Optional.of(new PointerAttachment(pointer.get().getContentType(),
+                                             AttachmentTable.TRANSFER_PROGRESS_PENDING,
+                                             pointer.get().asPointer().getSize().orElse(0),
+                                             pointer.get().asPointer().getFileName().orElse(null),
+                                             pointer.get().asPointer().getCdnNumber(),
+                                             pointer.get().asPointer().getRemoteId().toString(),
+                                             encodedKey, null,
+                                             pointer.get().asPointer().getDigest().orElse(null),
+                                             pointer.get().asPointer().getIncrementalDigest().orElse(null),
+                                             fastPreflightId,
+                                             pointer.get().asPointer().getVoiceNote(),
+                                             pointer.get().asPointer().isBorderless(),
+                                             pointer.get().asPointer().isGif(),
+                                             pointer.get().asPointer().getWidth(),
+                                             pointer.get().asPointer().getHeight(),
+                                             pointer.get().asPointer().getUploadTimestamp(),
+                                             pointer.get().asPointer().getCaption().orElse(null),
+                                             stickerLocator,
+                                             BlurHash.parseOrNull(pointer.get().asPointer().getBlurHash().orElse(null))));
+
+  }
+
+  public static Optional<Attachment> forPointer(SignalServiceDataMessage.Quote.QuotedAttachment pointer) {
+    SignalServiceAttachment thumbnail = pointer.getThumbnail();
+
+    return Optional.of(new PointerAttachment(pointer.getContentType(),
+                                             AttachmentTable.TRANSFER_PROGRESS_PENDING,
+                                             thumbnail != null ? thumbnail.asPointer().getSize().orElse(0) : 0,
+                                             pointer.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,
+                                             thumbnail != null ? thumbnail.asPointer().getIncrementalDigest().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));
+  }
+
+  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,
+                                             thumbnail != null ? thumbnail.asPointer().getIncrementalDigest().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));
+  }
+}
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/PointerAttachment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/PointerAttachment.kt
@@ -1,187 +0,0 @@
-package org.thoughtcrime.securesms.attachments
-
-import android.net.Uri
-import android.os.Parcel
-import org.signal.core.util.Base64.encodeWithPadding
-import org.thoughtcrime.securesms.blurhash.BlurHash
-import org.thoughtcrime.securesms.database.AttachmentTable
-import org.thoughtcrime.securesms.stickers.StickerLocator
-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.DataMessage
-import java.util.Optional
-
-class PointerAttachment : Attachment {
-  private constructor(
-    contentType: String,
-    transferState: Int,
-    size: Long,
-    fileName: String?,
-    cdnNumber: Int,
-    location: String,
-    key: String?,
-    digest: ByteArray?,
-    incrementalDigest: ByteArray?,
-    incrementalMacChunkSize: Int,
-    fastPreflightId: String?,
-    voiceNote: Boolean,
-    borderless: Boolean,
-    videoGif: Boolean,
-    width: Int,
-    height: Int,
-    uploadTimestamp: Long,
-    caption: String?,
-    stickerLocator: StickerLocator?,
-    blurHash: BlurHash?
-  ) : super(
-    contentType = contentType,
-    transferState = transferState,
-    size = size,
-    fileName = fileName,
-    cdnNumber = cdnNumber,
-    remoteLocation = location,
-    remoteKey = key,
-    remoteDigest = digest,
-    incrementalDigest = incrementalDigest,
-    fastPreflightId = fastPreflightId,
-    voiceNote = voiceNote,
-    borderless = borderless,
-    videoGif = videoGif,
-    width = width,
-    height = height,
-    incrementalMacChunkSize = incrementalMacChunkSize,
-    quote = false,
-    uploadTimestamp = uploadTimestamp,
-    caption = caption,
-    stickerLocator = stickerLocator,
-    blurHash = blurHash,
-    audioHash = null,
-    transformProperties = null
-  )
-
-  constructor(parcel: Parcel) : super(parcel)
-
-  override val uri: Uri? = null
-  override val publicUri: Uri? = null
-
-  companion object {
-    @JvmStatic
-    fun forPointers(pointers: Optional<List<SignalServiceAttachment>>): List<Attachment> {
-      if (!pointers.isPresent) {
-        return emptyList()
-      }
-
-      return pointers.get()
-        .map { forPointer(Optional.ofNullable(it)) }
-        .filter { it.isPresent }
-        .map { it.get() }
-    }
-
-    @JvmStatic
-    @JvmOverloads
-    fun forPointer(pointer: Optional<SignalServiceAttachment>, stickerLocator: StickerLocator? = null, fastPreflightId: String? = null): Optional<Attachment> {
-      if (!pointer.isPresent || !pointer.get().isPointer) {
-        return Optional.empty()
-      }
-
-      val encodedKey: String? = if (pointer.get().asPointer().key != null) {
-        encodeWithPadding(pointer.get().asPointer().key)
-      } else {
-        null
-      }
-
-      return Optional.of(
-        PointerAttachment(
-          contentType = pointer.get().contentType,
-          transferState = AttachmentTable.TRANSFER_PROGRESS_PENDING,
-          size = pointer.get().asPointer().size.orElse(0).toLong(),
-          fileName = pointer.get().asPointer().fileName.orElse(null),
-          cdnNumber = pointer.get().asPointer().cdnNumber,
-          location = pointer.get().asPointer().remoteId.toString(),
-          key = encodedKey,
-          digest = pointer.get().asPointer().digest.orElse(null),
-          incrementalDigest = pointer.get().asPointer().incrementalDigest.orElse(null),
-          incrementalMacChunkSize = pointer.get().asPointer().incrementalMacChunkSize,
-          fastPreflightId = fastPreflightId,
-          voiceNote = pointer.get().asPointer().voiceNote,
-          borderless = pointer.get().asPointer().isBorderless,
-          videoGif = pointer.get().asPointer().isGif,
-          width = pointer.get().asPointer().width,
-          height = pointer.get().asPointer().height,
-          uploadTimestamp = pointer.get().asPointer().uploadTimestamp,
-          caption = pointer.get().asPointer().caption.orElse(null),
-          stickerLocator = stickerLocator,
-          blurHash = BlurHash.parseOrNull(pointer.get().asPointer().blurHash.orElse(null))
-        )
-      )
-    }
-
-    fun forPointer(pointer: SignalServiceDataMessage.Quote.QuotedAttachment): Optional<Attachment> {
-      val thumbnail = pointer.thumbnail
-
-      return Optional.of(
-        PointerAttachment(
-          contentType = pointer.contentType,
-          transferState = AttachmentTable.TRANSFER_PROGRESS_PENDING,
-          size = (if (thumbnail != null) thumbnail.asPointer().size.orElse(0) else 0).toLong(),
-          fileName = pointer.fileName,
-          cdnNumber = thumbnail?.asPointer()?.cdnNumber ?: 0,
-          location = thumbnail?.asPointer()?.remoteId?.toString() ?: "0",
-          key = if (thumbnail != null && thumbnail.asPointer().key != null) encodeWithPadding(thumbnail.asPointer().key) else null,
-          digest = thumbnail?.asPointer()?.digest?.orElse(null),
-          incrementalDigest = thumbnail?.asPointer()?.incrementalDigest?.orElse(null),
-          incrementalMacChunkSize = thumbnail?.asPointer()?.incrementalMacChunkSize ?: 0,
-          fastPreflightId = null,
-          voiceNote = false,
-          borderless = false,
-          videoGif = false,
-          width = thumbnail?.asPointer()?.width ?: 0,
-          height = thumbnail?.asPointer()?.height ?: 0,
-          uploadTimestamp = thumbnail?.asPointer()?.uploadTimestamp ?: 0,
-          caption = thumbnail?.asPointer()?.caption?.orElse(null),
-          stickerLocator = null,
-          blurHash = null
-        )
-      )
-    }
-
-    fun forPointer(quotedAttachment: DataMessage.Quote.QuotedAttachment): Optional<Attachment> {
-      val thumbnail: SignalServiceAttachment? = try {
-        if (quotedAttachment.thumbnail != null) {
-          AttachmentPointerUtil.createSignalAttachmentPointer(quotedAttachment.thumbnail)
-        } else {
-          null
-        }
-      } catch (e: InvalidMessageStructureException) {
-        return Optional.empty()
-      }
-
-      return Optional.of(
-        PointerAttachment(
-          contentType = quotedAttachment.contentType!!,
-          transferState = AttachmentTable.TRANSFER_PROGRESS_PENDING,
-          size = (if (thumbnail != null) thumbnail.asPointer().size.orElse(0) else 0).toLong(),
-          fileName = quotedAttachment.fileName,
-          cdnNumber = thumbnail?.asPointer()?.cdnNumber ?: 0,
-          location = thumbnail?.asPointer()?.remoteId?.toString() ?: "0",
-          key = if (thumbnail != null && thumbnail.asPointer().key != null) encodeWithPadding(thumbnail.asPointer().key) else null,
-          digest = thumbnail?.asPointer()?.digest?.orElse(null),
-          incrementalDigest = thumbnail?.asPointer()?.incrementalDigest?.orElse(null),
-          incrementalMacChunkSize = thumbnail?.asPointer()?.incrementalMacChunkSize ?: 0,
-          fastPreflightId = null,
-          voiceNote = false,
-          borderless = false,
-          videoGif = false,
-          width = thumbnail?.asPointer()?.width ?: 0,
-          height = thumbnail?.asPointer()?.height ?: 0,
-          uploadTimestamp = thumbnail?.asPointer()?.uploadTimestamp ?: 0,
-          caption = thumbnail?.asPointer()?.caption?.orElse(null),
-          stickerLocator = null,
-          blurHash = null
-        )
-      )
-    }
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/TombstoneAttachment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/TombstoneAttachment.java
@@ -0,0 +1,31 @@
+package org.thoughtcrime.securesms.attachments;
+
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.thoughtcrime.securesms.database.AttachmentTable;
+
+/**
+ * An attachment that represents where an attachment used to be. Useful when you need to know that
+ * a message had an attachment and some metadata about it (like the contentType), even though the
+ * underlying media no longer exists. An example usecase would be view-once messages, so that we can
+ * quote them and know their contentType even though the media has been deleted.
+ */
+public class TombstoneAttachment extends Attachment {
+
+  public TombstoneAttachment(@NonNull String contentType, boolean quote) {
+    super(contentType, AttachmentTable.TRANSFER_PROGRESS_DONE, 0, null, 0, null, null, null, null, null, null, false, false, false, 0, 0, quote, 0, null, null, null, null, null);
+  }
+
+  @Override
+  public @Nullable Uri getUri() {
+    return null;
+  }
+
+  @Override
+  public @Nullable Uri getPublicUri() {
+    return null;
+  }
+}
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/TombstoneAttachment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/TombstoneAttachment.kt
@@ -1,44 +0,0 @@
-package org.thoughtcrime.securesms.attachments
-
-import android.net.Uri
-import android.os.Parcel
-import org.thoughtcrime.securesms.database.AttachmentTable
-
-/**
- * An attachment that represents where an attachment used to be. Useful when you need to know that
- * a message had an attachment and some metadata about it (like the contentType), even though the
- * underlying media no longer exists. An example usecase would be view-once messages, so that we can
- * quote them and know their contentType even though the media has been deleted.
- */
-class TombstoneAttachment : Attachment {
-  constructor(contentType: String, quote: Boolean) : super(
-    contentType = contentType,
-    quote = quote,
-    transferState = AttachmentTable.TRANSFER_PROGRESS_DONE,
-    size = 0,
-    fileName = null,
-    cdnNumber = 0,
-    remoteLocation = null,
-    remoteKey = null,
-    remoteDigest = null,
-    incrementalDigest = null,
-    fastPreflightId = null,
-    voiceNote = false,
-    borderless = false,
-    videoGif = false,
-    width = 0,
-    height = 0,
-    incrementalMacChunkSize = 0,
-    uploadTimestamp = 0,
-    caption = null,
-    stickerLocator = null,
-    blurHash = null,
-    audioHash = null,
-    transformProperties = null
-  )
-
-  constructor(parcel: Parcel) : super(parcel)
-
-  override val uri: Uri? = null
-  override val publicUri: Uri? = null
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/UriAttachment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/UriAttachment.java
@@ -0,0 +1,79 @@
+package org.thoughtcrime.securesms.attachments;
+
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.thoughtcrime.securesms.audio.AudioHash;
+import org.thoughtcrime.securesms.blurhash.BlurHash;
+import org.thoughtcrime.securesms.database.AttachmentTable.TransformProperties;
+import org.thoughtcrime.securesms.stickers.StickerLocator;
+
+import java.util.Objects;
+
+public class UriAttachment extends Attachment {
+
+  private final @NonNull  Uri dataUri;
+
+  public UriAttachment(@NonNull Uri uri,
+                       @NonNull String contentType,
+                       int transferState,
+                       long size,
+                       @Nullable String fileName,
+                       boolean voiceNote,
+                       boolean borderless,
+                       boolean videoGif,
+                       boolean quote,
+                       @Nullable String caption,
+                       @Nullable StickerLocator stickerLocator,
+                       @Nullable BlurHash blurHash,
+                       @Nullable AudioHash audioHash,
+                       @Nullable TransformProperties transformProperties)
+  {
+    this(uri, contentType, transferState, size, 0, 0, fileName, null, voiceNote, borderless, videoGif, quote, caption, stickerLocator, blurHash, audioHash, transformProperties);
+  }
+
+  public UriAttachment(@NonNull Uri dataUri,
+                       @NonNull String contentType,
+                       int transferState,
+                       long size,
+                       int width,
+                       int height,
+                       @Nullable String fileName,
+                       @Nullable String fastPreflightId,
+                       boolean voiceNote,
+                       boolean borderless,
+                       boolean videoGif,
+                       boolean quote,
+                       @Nullable String caption,
+                       @Nullable StickerLocator stickerLocator,
+                       @Nullable BlurHash blurHash,
+                       @Nullable AudioHash audioHash,
+                       @Nullable TransformProperties transformProperties)
+  {
+    super(contentType, transferState, size, fileName, 0, null, null, null, null, null, fastPreflightId, voiceNote, borderless, videoGif, width, height, quote, 0, caption, stickerLocator, blurHash, audioHash, transformProperties);
+    this.dataUri = Objects.requireNonNull(dataUri);
+  }
+
+  @Override
+  @NonNull
+  public Uri getUri() {
+    return dataUri;
+  }
+
+  @Override
+  public @Nullable Uri getPublicUri() {
+    return null;
+  }
+
+  @Override
+  public boolean equals(Object other) {
+    return other != null && other instanceof UriAttachment && ((UriAttachment) other).dataUri.equals(this.dataUri);
+  }
+
+  @Override
+  public int hashCode() {
+    return dataUri.hashCode();
+  }
+}
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/UriAttachment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/UriAttachment.kt
@@ -1,114 +0,0 @@
-package org.thoughtcrime.securesms.attachments
-
-import android.net.Uri
-import android.os.Parcel
-import androidx.core.os.ParcelCompat
-import org.thoughtcrime.securesms.audio.AudioHash
-import org.thoughtcrime.securesms.blurhash.BlurHash
-import org.thoughtcrime.securesms.database.AttachmentTable.TransformProperties
-import org.thoughtcrime.securesms.stickers.StickerLocator
-import java.util.Objects
-
-class UriAttachment : Attachment {
-
-  constructor(
-    uri: Uri,
-    contentType: String,
-    transferState: Int,
-    size: Long,
-    fileName: String?,
-    voiceNote: Boolean,
-    borderless: Boolean,
-    videoGif: Boolean,
-    quote: Boolean,
-    caption: String?,
-    stickerLocator: StickerLocator?,
-    blurHash: BlurHash?,
-    audioHash: AudioHash?,
-    transformProperties: TransformProperties?
-  ) : this(
-    dataUri = uri,
-    contentType = contentType,
-    transferState = transferState,
-    size = size,
-    width = 0,
-    height = 0,
-    fileName = fileName,
-    fastPreflightId = null,
-    voiceNote = voiceNote,
-    borderless = borderless,
-    videoGif = videoGif,
-    quote = quote,
-    caption = caption,
-    stickerLocator = stickerLocator,
-    blurHash = blurHash,
-    audioHash = audioHash,
-    transformProperties = transformProperties
-  )
-
-  constructor(
-    dataUri: Uri,
-    contentType: String,
-    transferState: Int,
-    size: Long,
-    width: Int,
-    height: Int,
-    fileName: String?,
-    fastPreflightId: String?,
-    voiceNote: Boolean,
-    borderless: Boolean,
-    videoGif: Boolean,
-    quote: Boolean,
-    caption: String?,
-    stickerLocator: StickerLocator?,
-    blurHash: BlurHash?,
-    audioHash: AudioHash?,
-    transformProperties: TransformProperties?
-  ) : super(
-    contentType = contentType,
-    transferState = transferState,
-    size = size,
-    fileName = fileName,
-    cdnNumber = 0,
-    remoteLocation = null,
-    remoteKey = null,
-    remoteDigest = null,
-    incrementalDigest = null,
-    fastPreflightId = fastPreflightId,
-    voiceNote = voiceNote,
-    borderless = borderless,
-    videoGif = videoGif,
-    width = width,
-    height = height,
-    incrementalMacChunkSize = 0,
-    quote = quote,
-    uploadTimestamp = 0,
-    caption = caption,
-    stickerLocator = stickerLocator,
-    blurHash = blurHash,
-    audioHash = audioHash,
-    transformProperties = transformProperties
-  ) {
-    uri = Objects.requireNonNull(dataUri)
-  }
-
-  constructor(parcel: Parcel) : super(parcel) {
-    uri = ParcelCompat.readParcelable(parcel, Uri::class.java.classLoader, Uri::class.java)!!
-  }
-
-  override val uri: Uri
-  override val publicUri: Uri? = null
-
-  override fun writeToParcel(dest: Parcel, flags: Int) {
-    super.writeToParcel(dest, flags)
-    dest.writeParcelable(uri, 0)
-  }
-
-  override fun equals(other: Any?): Boolean {
-    return other != null && other is UriAttachment && other.uri == uri
-  }
-
-  override fun hashCode(): Int {
-    return uri.hashCode()
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioFileInfo.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioFileInfo.java
@@ -2,19 +2,19 @@ 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;

-import okio.ByteString;
-
 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.durationUs, audioWaveForm.waveForm.toByteArray());
+    return new AudioFileInfo(audioWaveForm.getDurationUs(), audioWaveForm.getWaveForm().toByteArray());
  }

  AudioFileInfo(long durationUs, byte[] waveFormBytes) {
@@ -37,9 +37,9 @@ public class AudioFileInfo {
  }

  public @NonNull AudioWaveFormData toDatabaseProtobuf() {
-    return new AudioWaveFormData.Builder()
-                                .durationUs(durationUs)
-                                .waveForm(ByteString.of(waveFormBytes))
-                                .build();
+    return AudioWaveFormData.newBuilder()
+                            .setDurationUs(durationUs)
+                            .setWaveForm(ByteString.copyFrom(waveFormBytes))
+                            .build();
  }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioHash.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioHash.java
@@ -1,22 +1,17 @@
 package org.thoughtcrime.securesms.audio;

-import android.os.Parcel;
-import android.os.Parcelable;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

 import org.thoughtcrime.securesms.database.model.databaseprotos.AudioWaveFormData;
-import org.thoughtcrime.securesms.util.ParcelUtil;
-import org.signal.core.util.Base64;
+import org.whispersystems.util.Base64;

 import java.io.IOException;
-import java.util.Objects;

 /**
 * An AudioHash is a compact string representation of the wave form and duration for an audio file.
 */
-public final class AudioHash implements Parcelable {
+public final class AudioHash {

  @NonNull private final String            hash;
  @NonNull private final AudioWaveFormData audioWaveForm;
@@ -27,46 +22,13 @@ public final class AudioHash implements Parcelable {
  }

  public AudioHash(@NonNull AudioWaveFormData audioWaveForm) {
-    this(Base64.encodeWithPadding(audioWaveForm.encode()), audioWaveForm);
+    this(Base64.encodeBytes(audioWaveForm.toByteArray()), audioWaveForm);
  }

-  protected AudioHash(Parcel in) {
-    hash = Objects.requireNonNull(in.readString());
-
-    try {
-      audioWaveForm = AudioWaveFormData.ADAPTER.decode(Objects.requireNonNull(ParcelUtil.readByteArray(in)));
-    } catch (IOException e) {
-      throw new AssertionError();
-    }
-  }
-
-  @Override
-  public void writeToParcel(Parcel dest, int flags) {
-    dest.writeString(hash);
-    ParcelUtil.writeByteArray(dest, audioWaveForm.encode());
-  }
-
-  @Override
-  public int describeContents() {
-    return 0;
-  }
-
-  public static final Creator<AudioHash> CREATOR = new Creator<>() {
-    @Override
-    public AudioHash createFromParcel(Parcel in) {
-      return new AudioHash(in);
-    }
-
-    @Override
-    public AudioHash[] newArray(int size) {
-      return new AudioHash[size];
-    }
-  };
-
  public static @Nullable AudioHash parseOrNull(@Nullable String hash) {
    if (hash == null) return null;
    try {
-      return new AudioHash(hash, AudioWaveFormData.ADAPTER.decode(Base64.decode(hash)));
+      return new AudioHash(hash, AudioWaveFormData.parseFrom(Base64.decode(hash)));
    } catch (IOException e) {
      return null;
    }
--- a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java
@@ -113,23 +113,6 @@ public class AudioRecorder {
    });
  }

-  public void discardRecording() {
-    Log.i(TAG, "cancelRecording()");
-    executor.execute(() -> {
-      if (recorder == null) {
-        Log.e(TAG, "MediaRecorder was never initialized successfully!");
-        return;
-      }
-      audioFocusManager.abandonAudioFocus();
-      recorder.stop();
-      recordingUriFuture.cancel(true);
-
-      recordingSubject   = null;
-      recorder           = null;
-      recordingUriFuture = null;
-    });
-  }
-
  public void stopRecording() {
    Log.i(TAG, "stopRecording()");

--- a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioWaveForms.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioWaveForms.kt
@@ -107,7 +107,7 @@ object AudioWaveForms {
  private fun generateWaveForm(context: Context, uri: Uri, cacheKey: String, attachmentId: AttachmentId): CacheCheckResult {
    try {
      val startTime = System.currentTimeMillis()
-      SignalDatabase.attachments.writeAudioHash(attachmentId, AudioWaveFormData())
+      SignalDatabase.attachments.writeAudioHash(attachmentId, AudioWaveFormData.getDefaultInstance())

      Log.i(TAG, "Starting wave form generation ($cacheKey)")
      val fileInfo: AudioFileInfo = AudioWaveFormGenerator.generateWaveForm(context, uri)
--- a/app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarImage.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarImage.kt
@@ -1,37 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.avatar
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalInspectionMode
-import androidx.compose.ui.viewinterop.AndroidView
-import org.thoughtcrime.securesms.components.AvatarImageView
-import org.thoughtcrime.securesms.recipients.Recipient
-
-@Composable
-fun AvatarImage(
-  recipient: Recipient,
-  modifier: Modifier = Modifier
-) {
-  if (LocalInspectionMode.current) {
-    Spacer(
-      modifier = modifier
-        .background(color = Color.Red, shape = CircleShape)
-    )
-  } else {
-    AndroidView(
-      factory = ::AvatarImageView,
-      modifier = modifier.background(color = Color.Transparent, shape = CircleShape)
-    ) {
-      it.setAvatarUsingProfile(recipient)
-    }
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerFragment.kt
@@ -30,7 +30,6 @@ import org.thoughtcrime.securesms.components.recyclerview.GridDividerDecoration
 import org.thoughtcrime.securesms.groups.ParcelableGroupId
 import org.thoughtcrime.securesms.mediasend.AvatarSelectionActivity
 import org.thoughtcrime.securesms.mediasend.Media
-import org.thoughtcrime.securesms.permissions.PermissionCompat
 import org.thoughtcrime.securesms.permissions.Permissions
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
@@ -239,7 +238,7 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) {
  @Suppress("DEPRECATION")
  private fun openGallery() {
    Permissions.with(this)
-      .request(*PermissionCompat.forImages())
+      .request(Manifest.permission.READ_EXTERNAL_STORAGE)
      .ifNecessary()
      .onAllGranted {
        val intent = AvatarSelectionActivity.getIntentForGallery(requireContext())
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupCountQueries.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupCountQueries.kt
@@ -21,7 +21,7 @@ object BackupCountQueries {
  @get:JvmStatic
  val attachmentCount: String = """
      SELECT COUNT(*) FROM ${AttachmentTable.TABLE_NAME} 
-      INNER JOIN ${MessageTable.TABLE_NAME} ON ${AttachmentTable.TABLE_NAME}.${AttachmentTable.MESSAGE_ID} = ${MessageTable.TABLE_NAME}.${MessageTable.ID} 
+      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
  """
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupFrameOutputStream.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupFrameOutputStream.java
@@ -119,7 +119,8 @@ class BackupFrameOutputStream extends FullBackupBase.BackupStream {
    try {
      write(outputStream, new BackupFrame.Builder()
          .attachment(new Attachment.Builder()
-                          .rowId(attachmentId.id)
+                          .rowId(attachmentId.getRowId())
+                          .attachmentId(attachmentId.getUniqueId())
                          .length(Util.toIntExact(size))
                          .build())
          .build());
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupRecordInputStream.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupRecordInputStream.java
@@ -4,7 +4,6 @@ import androidx.annotation.NonNull;

 import org.signal.core.util.Conversions;
 import org.signal.core.util.StreamUtil;
-import org.signal.core.util.logging.Log;
 import org.signal.libsignal.protocol.kdf.HKDF;
 import org.signal.libsignal.protocol.util.ByteUtil;
 import org.thoughtcrime.securesms.backup.proto.BackupFrame;
@@ -28,9 +27,6 @@ import javax.crypto.spec.SecretKeySpec;

 class BackupRecordInputStream extends FullBackupBase.BackupStream {

-  private final String TAG             = Log.tag(BackupRecordInputStream.class);
-  private final int    MAX_BUFFER_SIZE = 8192;
-
  private final int         version;
  private final InputStream in;
  private final Cipher      cipher;
@@ -96,35 +92,6 @@ class BackupRecordInputStream extends FullBackupBase.BackupStream {
    return readFrame(in);
  }

-  boolean validateFrame() throws InvalidAlgorithmParameterException, IOException, InvalidKeyException {
-    int frameLength = decryptFrameLength(in);
-    if (frameLength <= 0) {
-      Log.i(TAG, "Backup frame is not valid due to negative frame length. This is likely because the decryption passphrase was wrong.");
-      return false;
-    }
-
-    int    bufferSize = Math.min(MAX_BUFFER_SIZE, frameLength);
-    byte[] buffer     = new byte[bufferSize];
-    byte[] theirMac   = new byte[10];
-    while (frameLength > 0) {
-      int read = in.read(buffer, 0, Math.min(buffer.length, frameLength));
-      if (read == -1) return false;
-
-      if (read < MAX_BUFFER_SIZE) {
-        final int frameEndIndex = read - 10;
-        mac.update(buffer, 0, frameEndIndex);
-        System.arraycopy(buffer, frameEndIndex, theirMac, 0, theirMac.length);
-      } else {
-        mac.update(buffer, 0, read);
-      }
-      frameLength -= read;
-    }
-    
-    byte[] ourMac = ByteUtil.trim(mac.doFinal(), 10);
-
-    return MessageDigest.isEqual(ourMac, theirMac);
-  }
-
  void readAttachmentTo(OutputStream out, int length) throws IOException {
    try {
      Conversions.intToByteArray(iv, 0, counter++);
@@ -175,7 +142,24 @@ class BackupRecordInputStream extends FullBackupBase.BackupStream {

  private BackupFrame readFrame(InputStream in) throws IOException {
    try {
-      int frameLength = decryptFrameLength(in);
+      byte[] length = new byte[4];
+      StreamUtil.readFully(in, length);
+
+      Conversions.intToByteArray(iv, 0, counter++);
+      cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(cipherKey, "AES"), new IvParameterSpec(iv));
+
+      int frameLength;
+      if (BackupVersions.isFrameLengthEncrypted(version)) {
+        mac.update(length);
+        // this depends upon cipher being a stream cipher mode in order to get back the length without needing a full AES block-size input
+        byte[] decryptedLength = cipher.update(length);
+        if (decryptedLength.length != length.length) {
+          throw new IOException("Cipher was not a stream cipher!");
+        }
+        frameLength = Conversions.byteArrayToInt(decryptedLength);
+      } else {
+        frameLength = Conversions.byteArrayToInt(length);
+      }

      byte[] frame = new byte[frameLength];
      StreamUtil.readFully(in, frame);
@@ -198,27 +182,5 @@ class BackupRecordInputStream extends FullBackupBase.BackupStream {
    }
  }

-  private int decryptFrameLength(InputStream inputStream) throws IOException, InvalidAlgorithmParameterException, InvalidKeyException {
-    byte[] length = new byte[4];
-    StreamUtil.readFully(inputStream, length);
-
-    Conversions.intToByteArray(iv, 0, counter++);
-    cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(cipherKey, "AES"), new IvParameterSpec(iv));
-
-    int frameLength;
-    if (BackupVersions.isFrameLengthEncrypted(version)) {
-      mac.update(length);
-      // this depends upon cipher being a stream cipher mode in order to get back the length without needing a full AES block-size input
-      byte[] decryptedLength = cipher.update(length);
-      if (decryptedLength.length != length.length) {
-        throw new IOException("Cipher was not a stream cipher!");
-      }
-      frameLength = Conversions.byteArrayToInt(decryptedLength);
-    } else {
-      frameLength = Conversions.byteArrayToInt(length);
-    }
-    return frameLength;
-  }
-
  static class BadMacException extends IOException {}
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java
@@ -44,6 +44,7 @@ import org.thoughtcrime.securesms.database.SessionTable;
 import org.thoughtcrime.securesms.database.SignedPreKeyTable;
 import org.thoughtcrime.securesms.database.StickerTable;
 import org.thoughtcrime.securesms.database.model.AvatarPickerDatabase;
+import org.thoughtcrime.securesms.database.model.MessageId;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.keyvalue.KeyValueDataSet;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -64,7 +65,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;

 import okio.ByteString;
@@ -77,7 +77,6 @@ public class FullBackupExporter extends FullBackupBase {
  private static final long TABLE_RECORD_COUNT_MULTIPLIER    = 3L;
  private static final long IDENTITY_KEY_BACKUP_RECORD_COUNT = 2L;
  private static final long FINAL_MESSAGE_COUNT              = 1L;
-  private static final long EXPIRATION_BACKUP_THRESHOLD      = TimeUnit.DAYS.toMillis(1);

  /**
   * Tables in list will still have their *schema* exported (so the tables will be created),
@@ -160,15 +159,15 @@ public class FullBackupExporter extends FullBackupBase {
      for (String table : tables) {
        throwIfCanceled(cancellationSignal);
        if (table.equals(MessageTable.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isNonExpiringMessage(cursor), null, count, estimatedCount, cancellationSignal);
+          count = exportTable(table, input, outputStream, FullBackupExporter::isNonExpiringMmsMessage, null, count, estimatedCount, cancellationSignal);
        } else if (table.equals(ReactionTable.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, CursorUtil.requireLong(cursor, ReactionTable.MESSAGE_ID)), null, count, estimatedCount, cancellationSignal);
+          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, new MessageId(CursorUtil.requireLong(cursor, ReactionTable.MESSAGE_ID))), null, count, estimatedCount, cancellationSignal);
        } else if (table.equals(MentionTable.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, CursorUtil.requireLong(cursor, MentionTable.MESSAGE_ID)), null, count, estimatedCount, cancellationSignal);
+          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMmsMessage(input, CursorUtil.requireLong(cursor, MentionTable.MESSAGE_ID)), null, count, estimatedCount, cancellationSignal);
        } else if (table.equals(GroupReceiptTable.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(GroupReceiptTable.MMS_ID))), null, count, estimatedCount, cancellationSignal);
+          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMmsMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(GroupReceiptTable.MMS_ID))), null, count, estimatedCount, cancellationSignal);
        } else if (table.equals(AttachmentTable.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentTable.MESSAGE_ID))), (cursor, innerCount) -> exportAttachment(attachmentSecret, cursor, outputStream, innerCount, estimatedCount), count, estimatedCount, cancellationSignal);
+          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMmsMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentTable.MMS_ID))), (cursor, innerCount) -> exportAttachment(attachmentSecret, cursor, outputStream, innerCount, estimatedCount), count, estimatedCount, cancellationSignal);
        } else if (table.equals(StickerTable.TABLE_NAME)) {
          count = exportTable(table, input, outputStream, cursor -> true, (cursor, innerCount) -> exportSticker(attachmentSecret, cursor, outputStream, innerCount, estimatedCount), count, estimatedCount, cancellationSignal);
        } else if (!TABLE_CONTENT_BLOCKLIST.contains(table)) {
@@ -445,10 +444,11 @@ public class FullBackupExporter extends FullBackupBase {
                                      long estimatedCount)
      throws IOException
  {
-    long rowId = cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentTable.ID));
-    long size  = cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentTable.DATA_SIZE));
+    long rowId    = cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentTable.ROW_ID));
+    long uniqueId = cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentTable.UNIQUE_ID));
+    long size     = cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentTable.SIZE));

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

    if (!TextUtils.isEmpty(data)) {
@@ -457,14 +457,14 @@ public class FullBackupExporter extends FullBackupBase {

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

    EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count, estimatedCount));
    if (!TextUtils.isEmpty(data) && size > 0) {
      try (InputStream inputStream = openAttachmentStream(attachmentSecret, random, data)) {
-        outputStream.write(new AttachmentId(rowId), inputStream, size);
+        outputStream.write(new AttachmentId(rowId, uniqueId), inputStream, size);
      } catch (FileNotFoundException e) {
        Log.w(TAG, "Missing attachment", e);
      }
@@ -579,25 +579,27 @@ public class FullBackupExporter extends FullBackupBase {
    return count;
  }

-  private static boolean isNonExpiringMessage(@NonNull Cursor cursor) {
-    long    expiresIn = CursorUtil.requireLong(cursor, MessageTable.EXPIRES_IN);
-    boolean viewOnce  = CursorUtil.requireBoolean(cursor, MessageTable.VIEW_ONCE);
-
-    if (expiresIn == 0 && !viewOnce) {
-      return true;
-    }
-
-    return expiresIn > EXPIRATION_BACKUP_THRESHOLD;
+  private static boolean isNonExpiringMmsMessage(@NonNull Cursor cursor) {
+    return cursor.getLong(cursor.getColumnIndexOrThrow(MessageTable.EXPIRES_IN)) <= 0 &&
+           cursor.getLong(cursor.getColumnIndexOrThrow(MessageTable.VIEW_ONCE)) <= 0;
  }

-  private static boolean isForNonExpiringMessage(@NonNull SQLiteDatabase db, long messageId) {
+  private static boolean isNonExpiringSmsMessage(@NonNull Cursor cursor) {
+    return cursor.getLong(cursor.getColumnIndexOrThrow(MessageTable.EXPIRES_IN)) <= 0;
+  }
+
+  private static boolean isForNonExpiringMessage(@NonNull SQLiteDatabase db, @NonNull MessageId messageId) {
+    return isForNonExpiringMmsMessage(db, messageId.getId());
+  }
+
+  private static boolean isForNonExpiringMmsMessage(@NonNull SQLiteDatabase db, long mmsId) {
    String[] columns = new String[] { MessageTable.EXPIRES_IN, MessageTable.VIEW_ONCE };
    String   where   = MessageTable.ID + " = ?";
-    String[] args    = SqlUtil.buildArgs(messageId);
+    String[] args    = new String[] { String.valueOf(mmsId) };

    try (Cursor mmsCursor = db.query(MessageTable.TABLE_NAME, columns, where, args, null, null, null)) {
      if (mmsCursor != null && mmsCursor.moveToFirst()) {
-        return isNonExpiringMessage(mmsCursor);
+        return isNonExpiringMmsMessage(mmsCursor);
      }
    }

--- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java
@@ -45,8 +45,6 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -65,24 +63,6 @@ public class FullBackupImporter extends FullBackupBase {
  @SuppressWarnings("unused")
  private static final String TAG = Log.tag(FullBackupImporter.class);

-  public static boolean validatePassphrase(@NonNull Context context,
-                                           @NonNull Uri uri,
-                                           @NonNull String passphrase)
-      throws IOException
-  {
-
-    try (InputStream is = getInputStream(context, uri)) {
-      BackupRecordInputStream inputStream = new BackupRecordInputStream(is, passphrase);
-      return inputStream.validateFrame();
-    } catch (InvalidAlgorithmParameterException e) {
-      Log.w(TAG, "Invalid algorithm parameter exception in backup passphrase validation.", e);
-      return false;
-    } catch (InvalidKeyException e) {
-      Log.w(TAG, "Invalid key exception in backup passphrase validation.", e);
-      return false;
-    }
-  }
-
  public static void importFile(@NonNull Context context, @NonNull AttachmentSecret attachmentSecret,
                                @NonNull SQLiteDatabase db, @NonNull Uri uri, @NonNull String passphrase)
      throws IOException
@@ -194,33 +174,26 @@ public class FullBackupImporter extends FullBackupBase {
  private static void processAttachment(@NonNull Context context, @NonNull AttachmentSecret attachmentSecret, @NonNull SQLiteDatabase db, @NonNull Attachment attachment, BackupRecordInputStream inputStream)
      throws IOException
  {
-    File                       dataFile      = AttachmentTable.newFile(context);
-    Pair<byte[], OutputStream> output        = ModernEncryptingPartOutputStream.createFor(attachmentSecret, dataFile, false);
-    boolean                    isLegacyTable = SqlUtil.tableExists(db, "part");
-
-    String dataFileColumnName   = isLegacyTable ? "_data" : AttachmentTable.DATA_FILE;
-    String dataRandomColumnName = isLegacyTable ? "data_random" : AttachmentTable.DATA_RANDOM;
-    String idColumnName         = isLegacyTable ? "_id" : AttachmentTable.ID;
-    String tableName            = isLegacyTable ? "part" : AttachmentTable.TABLE_NAME;
+    File                       dataFile = AttachmentTable.newFile(context);
+    Pair<byte[], OutputStream> output   = ModernEncryptingPartOutputStream.createFor(attachmentSecret, dataFile, false);

    ContentValues contentValues = new ContentValues();

    try {
      inputStream.readAttachmentTo(output.second, attachment.length);

-      contentValues.put(dataFileColumnName, dataFile.getAbsolutePath());
-      contentValues.put(dataRandomColumnName, output.first);
+      contentValues.put(AttachmentTable.DATA, dataFile.getAbsolutePath());
+      contentValues.put(AttachmentTable.DATA_RANDOM, output.first);
    } catch (BackupRecordInputStream.BadMacException e) {
      Log.w(TAG, "Bad MAC for attachment " + attachment.attachmentId + "! Can't restore it.", e);
      dataFile.delete();
-      contentValues.put(dataFileColumnName, (String) null);
-      contentValues.put(dataRandomColumnName, (String) null);
+      contentValues.put(AttachmentTable.DATA, (String) null);
+      contentValues.put(AttachmentTable.DATA_RANDOM, (String) null);
    }

-    db.update(tableName,
-              contentValues,
-              idColumnName + " = ?",
-              SqlUtil.buildArgs(attachment.rowId));
+    db.update(AttachmentTable.TABLE_NAME, contentValues,
+              AttachmentTable.ROW_ID + " = ? AND " + AttachmentTable.UNIQUE_ID + " = ?",
+              new String[] {String.valueOf(attachment.rowId), String.valueOf(attachment.attachmentId)});
  }

  private static void processSticker(@NonNull Context context, @NonNull AttachmentSecret attachmentSecret, @NonNull SQLiteDatabase db, @NonNull Sticker sticker, BackupRecordInputStream inputStream)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Greyson Parrelli	9e95f18867	Bump version to 6.28.6	2023-08-11 17:25:02 -04:00
Greyson Parrelli	14940bbdd9	Fix bug when changing number.	2023-08-11 17:22:48 -04:00