Bump version to 6.44.0

This reverts commit c50993bbf7c4a9e10a253f8d234c621ededffc47.

.gitignore

@@ -3,6 +3,7 @@ captures/
 project.properties
 keystore.debug.properties
 keystore.staging.properties
+nightly-url.txt
 .project
 .settings
 bin/
@@ -28,4 +29,4 @@ jni/libspeex/.deps/
 pkcs11.password
 dev.keystore
 maps.key
-local/
+local/

app/build.gradle

@@ -1,701 +0,0 @@
-import com.android.build.api.dsl.ManagedVirtualDevice
-
-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'
-
-wire {
-    kotlin {
-        javaInterop = true
-    }
-
-    sourcePath {
-        srcDir 'src/main/protowire'
-    }
-
-    protoPath {
-        srcDir "${project.rootDir}/libsignal/service/src/main/protowire"
-    }
-}
-
-ktlint {
-    version = "0.49.1"
-}
-
-def canonicalVersionCode = 1342
-def canonicalVersionName = "6.36.0"
-
-def postFixSize = 100
-def abiPostFix = ['universal'   : 0,
-                  'armeabi-v7a' : 1,
-                  'arm64-v8a'   : 2,
-                  'x86'         : 3,
-                  'x86_64'      : 4]
-
-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 = signalKotlinJvmTarget
-        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_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", 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_CDN3_IPS", cdn3_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_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", "\"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.media3
-
-    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 project(':glide-webp')
-
-    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
-
-    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.conscrypt.openjdk.uber // Used by robolectric
-    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"
-}

app/build.gradle.kts

@@ -0,0 +1,743 @@
+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() }
+}

app/proguard/proguard.cfg

@@ -4,6 +4,7 @@
 -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*(**);
 }

app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/BackupTest.kt

@@ -0,0 +1,675 @@
+/*
+ * 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
+  )
+}

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

@@ -230,8 +230,6 @@ 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) },
@@ -318,8 +316,6 @@ 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) },

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

@@ -9,8 +9,9 @@ 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.IncomingMediaMessage
+import org.thoughtcrime.securesms.mms.IncomingMessage
 import org.thoughtcrime.securesms.mms.OutgoingMessage
 import org.thoughtcrime.securesms.profiles.ProfileName
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -64,7 +65,8 @@ class ConversationItemPreviewer {
       attachment()
     }
 
-    val message = IncomingMediaMessage(
+    val message = IncomingMessage(
+      type = MessageType.NORMAL,
       from = other.id,
       body = body,
       sentTimeMillis = System.currentTimeMillis(),
@@ -73,7 +75,7 @@ class ConversationItemPreviewer {
       attachments = PointerAttachment.forPointers(Optional.of(attachments))
     )
 
-    SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get()
+    SignalDatabase.messages.insertMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get()
 
     ThreadUtil.sleep(1)
   }
@@ -83,7 +85,8 @@ class ConversationItemPreviewer {
       attachment()
     }
 
-    val message = IncomingMediaMessage(
+    val message = IncomingMessage(
+      type = MessageType.NORMAL,
       from = other.id,
       body = body,
       sentTimeMillis = System.currentTimeMillis(),
@@ -92,7 +95,7 @@ class ConversationItemPreviewer {
       attachments = PointerAttachment.forPointers(Optional.of(attachments))
     )
 
-    val insert = SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get()
+    val insert = SignalDatabase.messages.insertMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get()
 
     SignalDatabase.attachments.getAttachmentsForMessage(insert.messageId).forEachIndexed { index, attachment ->
 //      if (index != 1) {

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)
-    val attachment2Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment2.attachmentId, AttachmentTable.DATA)
+    val attachment1Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment.attachmentId, AttachmentTable.DATA_FILE)
+    val attachment2Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment2.attachmentId, AttachmentTable.DATA_FILE)
 
     assertNotEquals(attachment1Info, attachment2Info)
   }
@@ -89,8 +89,8 @@ class AttachmentTableTest {
       true
     )
 
-    val attachment1Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment.attachmentId, AttachmentTable.DATA)
-    val attachment2Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment2.attachmentId, AttachmentTable.DATA)
+    val attachment1Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment.attachmentId, AttachmentTable.DATA_FILE)
+    val attachment2Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment2.attachmentId, AttachmentTable.DATA_FILE)
 
     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)!!
-    val standardInfo = SignalDatabase.attachments.getAttachmentDataFileInfo(standardDatabaseAttachment.attachmentId, AttachmentTable.DATA)!!
-    val highInfo = SignalDatabase.attachments.getAttachmentDataFileInfo(highDatabaseAttachment.attachmentId, AttachmentTable.DATA)!!
+    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)!!
 
     assertNotEquals(standardInfo, highInfo)
     standardInfo.file assertIs previousInfo.file
@@ -158,9 +158,9 @@ class AttachmentTableTest {
     val secondHighDatabaseAttachment = SignalDatabase.attachments.insertAttachmentForPreUpload(secondHighQualityPreUpload)
 
     // THEN
-    val standardInfo = SignalDatabase.attachments.getAttachmentDataFileInfo(standardDatabaseAttachment.attachmentId, AttachmentTable.DATA)!!
-    val highInfo = SignalDatabase.attachments.getAttachmentDataFileInfo(highDatabaseAttachment.attachmentId, AttachmentTable.DATA)!!
-    val secondHighInfo = SignalDatabase.attachments.getAttachmentDataFileInfo(secondHighDatabaseAttachment.attachmentId, AttachmentTable.DATA)!!
+    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

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

@@ -214,6 +214,175 @@ 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"

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.IncomingMediaMessage
+import org.thoughtcrime.securesms.mms.IncomingMessage
 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: IncomingMediaMessage,
+    message: IncomingMessage,
     threadId: Long
   ): Optional<MessageTable.InsertResult> {
-    return SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, threadId)
+    return SignalDatabase.messages.insertMessageInbox(message, threadId)
   }
 }

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.IncomingMediaMessage
+import org.thoughtcrime.securesms.mms.IncomingMessage
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.whispersystems.signalservice.api.push.ServiceId.ACI
@@ -73,7 +73,8 @@ class MmsTableTest_stories {
     )
 
     MmsHelper.insert(
-      IncomingMediaMessage(
+      IncomingMessage(
+        type = MessageType.NORMAL,
         from = sender,
         sentTimeMillis = 2,
         serverTimeMillis = 2,
@@ -95,7 +96,8 @@ class MmsTableTest_stories {
     // GIVEN
     val sender = recipients[0]
     val messageId = MmsHelper.insert(
-      IncomingMediaMessage(
+      IncomingMessage(
+        type = MessageType.NORMAL,
         from = sender,
         sentTimeMillis = 2,
         serverTimeMillis = 2,
@@ -122,7 +124,8 @@ class MmsTableTest_stories {
     // GIVEN
     val messageIds = recipients.take(5).map {
       MmsHelper.insert(
-        IncomingMediaMessage(
+        IncomingMessage(
+          type = MessageType.NORMAL,
           from = it,
           sentTimeMillis = 2,
           serverTimeMillis = 2,
@@ -154,7 +157,8 @@ class MmsTableTest_stories {
     val unviewedIds: List<Long> = (0 until 5).map {
       Thread.sleep(5)
       MmsHelper.insert(
-        IncomingMediaMessage(
+        IncomingMessage(
+          type = MessageType.NORMAL,
           from = recipients[it],
           sentTimeMillis = System.currentTimeMillis(),
           serverTimeMillis = 2,
@@ -168,7 +172,8 @@ class MmsTableTest_stories {
     val viewedIds: List<Long> = (0 until 5).map {
       Thread.sleep(5)
       MmsHelper.insert(
-        IncomingMediaMessage(
+        IncomingMessage(
+          type = MessageType.NORMAL,
           from = recipients[it],
           sentTimeMillis = System.currentTimeMillis(),
           serverTimeMillis = 2,
@@ -213,7 +218,8 @@ class MmsTableTest_stories {
   fun givenNoOutgoingStories_whenICheckIsOutgoingStoryAlreadyInDatabase_thenIExpectFalse() {
     // GIVEN
     MmsHelper.insert(
-      IncomingMediaMessage(
+      IncomingMessage(
+        type = MessageType.NORMAL,
         from = recipients[0],
         sentTimeMillis = 200,
         serverTimeMillis = 2,
@@ -321,7 +327,8 @@ class MmsTableTest_stories {
     )
 
     MmsHelper.insert(
-      IncomingMediaMessage(
+      IncomingMessage(
+        type = MessageType.NORMAL,
         from = myStory.id,
         sentTimeMillis = 201,
         serverTimeMillis = 201,

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

@@ -14,8 +14,10 @@ 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
@@ -34,12 +36,10 @@ 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.IncomingMediaMessage
+import org.thoughtcrime.securesms.mms.IncomingMessage
 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
@@ -142,6 +142,30 @@ 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)
@@ -801,9 +825,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.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 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 threadIdAci: Long = SignalDatabase.threads.getThreadIdFor(recipientIdAci)!!
     val threadIdE164: Long = SignalDatabase.threads.getThreadIdFor(recipientIdE164)!!
@@ -923,12 +947,30 @@ 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()): IncomingTextMessage {
-    return IncomingTextMessage(sender, 1, time, time, time, body, groupId, 0, true, null)
+  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 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 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 identityKey(value: Byte): IdentityKey {

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

@@ -18,12 +18,10 @@ 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")
@@ -272,13 +270,28 @@ class SmsDatabaseTest_collapseJoinRequestEventsIfPossible {
     assertThat("latest message should be deleted", sms.getMessageRecordOrNull(latestMessage.messageId), nullValue())
   }
 
-  private fun smsMessage(sender: RecipientId, body: String? = ""): IncomingTextMessage {
+  private fun smsMessage(sender: RecipientId, body: String? = ""): IncomingMessage {
     wallClock++
-    return IncomingTextMessage(sender, 1, wallClock, wallClock, wallClock, body, Optional.of(groupId), 0, true, null)
+    return IncomingMessage(
+      type = MessageType.NORMAL,
+      from = sender,
+      sentTimeMillis = wallClock,
+      serverTimeMillis = wallClock,
+      receivedTimeMillis = wallClock,
+      body = body,
+      groupId = groupId,
+      isUnidentified = true
+    )
   }
 
-  private fun groupUpdateMessage(sender: RecipientId, groupContext: DecryptedGroupV2Context): IncomingGroupUpdateMessage {
-    return IncomingGroupUpdateMessage(smsMessage(sender, null), groupContext)
+  private fun groupUpdateMessage(sender: RecipientId, groupContext: DecryptedGroupV2Context): IncomingMessage {
+    wallClock++
+    return IncomingMessage.groupUpdate(
+      from = sender,
+      timestamp = wallClock,
+      groupId = groupId,
+      groupContext = groupContext
+    )
   }
 
   companion object {

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,32 +23,25 @@ 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] and
- * [KeyBackupService].
+ * Handles setting up a mock web server for API calls, and provides mockable versions of [SignalServiceNetworkAccess].
  */
 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 {
@@ -80,7 +73,6 @@ 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)),
@@ -88,7 +80,8 @@ 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)
+      genericServerPublicParams = Base64.decode(BuildConfig.GENERIC_SERVER_PUBLIC_PARAMS),
+      backupServerPublicParams = Base64.decode(BuildConfig.BACKUP_SERVER_PUBLIC_PARAMS)
     )
 
     serviceNetworkAccessMock = mock {
@@ -97,8 +90,6 @@ class InstrumentationApplicationDependencyProvider(application: Application, def
       on { uncensoredConfiguration } doReturn uncensoredConfiguration
     }
 
-    keyBackupService = mock()
-
     recipientCache = LiveRecipientCache(application) { r -> r.run() }
   }
 
@@ -106,10 +97,6 @@ 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
   }

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

@@ -1,181 +0,0 @@
-package org.thoughtcrime.securesms.jobs
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import okhttp3.mockwebserver.MockResponse
-import org.junit.After
-import org.junit.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.account().usernameOutOfSync = false
-  }
-
-  @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.account().usernameOutOfSync)
-  }
-
-  @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.account().usernameOutOfSync)
-  }
-
-  @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.account().usernameOutOfSync)
-  }
-
-  @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.account().usernameOutOfSync)
-  }
-}

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

@@ -39,7 +39,6 @@ class EditMessageSyncProcessorTest {
     )
 
     private val IGNORE_ATTACHMENT_COLUMNS = listOf(
-      AttachmentTable.UNIQUE_ID,
       AttachmentTable.TRANSFER_FILE
     )
   }

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

@@ -33,6 +33,7 @@ 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
 
@@ -96,7 +97,7 @@ class UsernameEditFragmentTest {
   fun testNicknameUpdateHappyPath() {
     val nickname = "Spiderman"
     val discriminator = "4578"
-    val username = "$nickname${UsernameState.DELIMITER}$discriminator"
+    val username = "$nickname${Usernames.DELIMITER}$discriminator"
 
     InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
       Put("/v1/accounts/username/reserved") {

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
@@ -113,7 +113,7 @@ class ContactRecordProcessorTest {
   private fun setStorageId(recipientId: RecipientId, storageId: StorageId) {
     SignalDatabase.rawDatabase
       .update(RecipientTable.TABLE_NAME)
-      .values(RecipientTable.STORAGE_SERVICE_ID to Base64.encodeBytes(storageId.raw))
+      .values(RecipientTable.STORAGE_SERVICE_ID to Base64.encodeWithPadding(storageId.raw))
       .where("${RecipientTable.ID} = ?", recipientId)
       .run()
   }

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

@@ -165,7 +165,7 @@ class BobClient(val serviceId: ServiceId, val e164: String, val identityKeyPair:
     override fun storeSenderKey(sender: SignalProtocolAddress?, distributionId: UUID?, record: SenderKeyRecord?) = throw UnsupportedOperationException()
     override fun loadSenderKey(sender: SignalProtocolAddress?, distributionId: UUID?): SenderKeyRecord = throw UnsupportedOperationException()
     override fun archiveSession(address: SignalProtocolAddress?) = throw UnsupportedOperationException()
-    override fun getAllAddressesWithActiveSessions(addressNames: MutableList<String>?): MutableSet<SignalProtocolAddress> = throw UnsupportedOperationException()
+    override fun getAllAddressesWithActiveSessions(addressNames: MutableList<String>?): MutableMap<SignalProtocolAddress, SessionRecord> = 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()

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

@@ -1,6 +1,7 @@
 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
@@ -20,7 +21,6 @@ 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.util.Base64
 import java.util.Optional
 import java.util.UUID
 

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

@@ -1,22 +1,12 @@
 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
@@ -78,18 +68,6 @@ 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())

app/src/androidTest/java/org/thoughtcrime/securesms/util/MessageTableTestUtils.kt

@@ -38,10 +38,8 @@ 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}

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

@@ -2,9 +2,10 @@ 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.IncomingMediaMessage
+import org.thoughtcrime.securesms.mms.IncomingMessage
 import org.thoughtcrime.securesms.mms.OutgoingMessage
 import org.thoughtcrime.securesms.mms.QuoteModel
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -65,7 +66,8 @@ object TestMessages {
     return insert
   }
   fun insertIncomingTextMessage(other: Recipient, body: String, timestamp: Long? = null) {
-    val message = IncomingMediaMessage(
+    val message = IncomingMessage(
+      type = MessageType.NORMAL,
       from = other.id,
       body = body,
       sentTimeMillis = timestamp ?: System.currentTimeMillis(),
@@ -73,10 +75,11 @@ object TestMessages {
       receivedTimeMillis = timestamp ?: System.currentTimeMillis()
     )
 
-    SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get().messageId
+    SignalDatabase.messages.insertMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get().messageId
   }
   fun insertIncomingQuoteTextMessage(other: Recipient, body: String, quote: QuoteModel, timestamp: Long?) {
-    val message = IncomingMediaMessage(
+    val message = IncomingMessage(
+      type = MessageType.NORMAL,
       from = other.id,
       body = body,
       sentTimeMillis = timestamp ?: System.currentTimeMillis(),
@@ -90,28 +93,30 @@ object TestMessages {
     val attachments: List<SignalServiceAttachmentPointer> = (0 until attachmentCount).map {
       imageAttachment()
     }
-    val message = IncomingMediaMessage(
+    val message = IncomingMessage(
+      type = MessageType.NORMAL,
       from = other.id,
       sentTimeMillis = timestamp ?: System.currentTimeMillis(),
       serverTimeMillis = timestamp ?: System.currentTimeMillis(),
       receivedTimeMillis = timestamp ?: System.currentTimeMillis(),
       attachments = PointerAttachment.forPointers(Optional.of(attachments))
     )
-    return insertIncomingMediaMessage(recipient = other, message = message, failed = failed)
+    return insertIncomingMessage(recipient = other, message = message, failed = failed)
   }
 
   fun insertIncomingVoiceMessage(other: Recipient, timestamp: Long? = null): Long {
-    val message = IncomingMediaMessage(
+    val message = IncomingMessage(
+      type = MessageType.NORMAL,
       from = other.id,
       sentTimeMillis = timestamp ?: System.currentTimeMillis(),
       serverTimeMillis = timestamp ?: System.currentTimeMillis(),
       receivedTimeMillis = timestamp ?: System.currentTimeMillis(),
       attachments = PointerAttachment.forPointers(Optional.of(Collections.singletonList(voiceAttachment()) as List<SignalServiceAttachment>))
     )
-    return insertIncomingMediaMessage(recipient = other, message = message, failed = false)
+    return insertIncomingMessage(recipient = other, message = message, failed = false)
   }
 
-  private fun insertIncomingMediaMessage(recipient: Recipient, message: IncomingMediaMessage, failed: Boolean = false): Long {
+  private fun insertIncomingMessage(recipient: Recipient, message: IncomingMessage, failed: Boolean = false): Long {
     val id = insertIncomingMessage(recipient = recipient, message = message)
     if (failed) {
       setMessageMediaFailed(id)
@@ -122,8 +127,8 @@ object TestMessages {
     return id
   }
 
-  private fun insertIncomingMessage(recipient: Recipient, message: IncomingMediaMessage): Long {
-    return SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(recipient)).get().messageId
+  private fun insertIncomingMessage(recipient: Recipient, message: IncomingMessage): Long {
+    return SignalDatabase.messages.insertMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(recipient)).get().messageId
   }
 
   private fun setMessageMediaFailed(messageId: Long) {

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.MediaMmsMessageRecord
+import org.thoughtcrime.securesms.database.model.MmsMessageRecord
 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 = MediaMmsMessageRecord(
+    val record = MmsMessageRecord(
       messageId,
       if (isIncoming) Recipient.UNKNOWN else Recipient.self(),
       0,
@@ -86,7 +86,7 @@ class ConversationElementGenerator {
       now,
       now,
       now,
-      1,
+      true,
       1,
       testMessage,
       SlideDeck(),
@@ -97,7 +97,7 @@ class ConversationElementGenerator {
       0,
       0,
       false,
-      1,
+      true,
       null,
       emptyList(),
       emptyList(),
@@ -106,7 +106,7 @@ class ConversationElementGenerator {
       false,
       false,
       now,
-      1,
+      true,
       now,
       null,
       StoryType.NONE,
@@ -117,7 +117,8 @@ class ConversationElementGenerator {
       -1,
       null,
       null,
-      0
+      0,
+      false
     )
 
     val conversationMessage = ConversationMessageFactory.createWithUnresolvedData(

app/src/main/AndroidManifest.xml

@@ -594,6 +594,13 @@
                   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" />
@@ -963,7 +970,7 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
               android:exported="false"/>
 
-    <activity android:name=".profiles.edit.EditProfileActivity"
+    <activity android:name=".profiles.edit.CreateProfileActivity"
               android:theme="@style/TextSecure.LightRegistrationTheme"
               android:windowSoftInputMode="stateVisible|adjustResize"
               android:exported="false"/>
@@ -973,7 +980,7 @@
               android:windowSoftInputMode="stateVisible|adjustResize"
               android:exported="false"/>
 
-    <activity android:name=".profiles.manage.ManageProfileActivity"
+    <activity android:name=".profiles.manage.EditProfileActivity"
               android:theme="@style/TextSecure.LightTheme"
               android:windowSoftInputMode="stateVisible|adjustResize"
               android:exported="false"/>
@@ -999,7 +1006,7 @@
         android:exported="false"/>
 
     <activity android:name=".contacts.TurnOffContactJoinedNotificationsActivity"
-              android:theme="@style/Theme.AppCompat.Dialog.Alert"
+              android:theme="@style/TextSecure.DialogActivity"
               android:exported="false"/>
 
     <activity android:name=".contactshare.ContactShareEditActivity"
@@ -1189,6 +1196,10 @@
         android:name=".service.GenericForegroundService"
         android:exported="false"/>
 
+    <service
+        android:name=".service.AttachmentProgressService"
+        android:exported="false"/>
+
     <service
         android:name=".gcm.FcmFetchBackgroundService"
         android:exported="false"/>
@@ -1203,18 +1214,6 @@
         </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>
@@ -1222,20 +1221,6 @@
         </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">

app/src/main/java/com/google/android/material/bottomsheet/BottomSheetBehaviorHack.kt

@@ -1,14 +1,13 @@
 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 setNestedScrollingChild(behavior: BottomSheetBehavior<FrameLayout>, view: View) {
+  fun <T : View> setNestedScrollingChild(behavior: BottomSheetBehavior<T>, view: View) {
     behavior.nestedScrollingChildRef = WeakReference(view)
   }
 }

app/src/main/java/org/conscrypt/ConscryptSignal.java

@@ -0,0 +1,800 @@
+/*
+ * 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);
+      }
+    };
+  }
+}

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

@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms
 
-import org.thoughtcrime.securesms.util.FeatureFlags
 import org.whispersystems.signalservice.api.account.AccountAttributes
 
 object AppCapabilities {
@@ -17,7 +16,7 @@ object AppCapabilities {
       changeNumber = true,
       stories = true,
       giftBadges = true,
-      pni = FeatureFlags.phoneNumberPrivacy(),
+      pni = true,
       paymentActivation = true
     )
   }

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

@@ -26,13 +26,15 @@ import androidx.multidex.MultiDexApplication;
 
 import com.google.android.gms.security.ProviderInstaller;
 
-import org.conscrypt.Conscrypt;
+import org.conscrypt.ConscryptSignal;
 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;
@@ -52,8 +54,10 @@ 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;
@@ -83,7 +87,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.service.UpdateApkRefreshListener;
+import org.thoughtcrime.securesms.apkupdate.ApkUpdateRefreshListener;
 import org.thoughtcrime.securesms.service.webrtc.AndroidTelecomUtil;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
 import org.thoughtcrime.securesms.util.AppForegroundObserver;
@@ -108,6 +112,7 @@ 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;
 
 /**
@@ -150,27 +155,29 @@ 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()");
-                                Conscrypt.setUseEngineSocketByDefault(true);
+                                ConscryptSignal.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)
@@ -208,6 +215,7 @@ 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");
@@ -224,11 +232,13 @@ 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(this);
+      RetrieveProfileJob.enqueueRoutineFetchIfNecessary();
       executePendingContactSync();
       KeyCachingService.onAppForegrounded(this);
       ApplicationDependencies.getShakeToReport().enable();
@@ -258,6 +268,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
     ApplicationDependencies.getShakeToReport().disable();
     ApplicationDependencies.getDeadlockDetector().stop();
     MemoryTracker.stop();
+    AnrDetector.stop();
   }
 
   public void checkBuildExpiration() {
@@ -267,6 +278,17 @@ 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);
@@ -276,7 +298,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
       throw new ProviderInitializationException();
     }
 
-    int conscryptPosition = Security.insertProviderAt(Conscrypt.newProvider(), 2);
+    int conscryptPosition = Security.insertProviderAt(ConscryptSignal.newProvider(), 2);
     Log.i(TAG, "Installed Conscrypt provider: " + conscryptPosition);
 
     if (conscryptPosition < 0) {
@@ -397,8 +419,8 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
     RotateSenderCertificateListener.schedule(this);
     RoutineMessageFetchReceiver.startOrUpdateAlarm(this);
 
-    if (BuildConfig.PLAY_STORE_DISABLED) {
-      UpdateApkRefreshListener.schedule(this);
+    if (BuildConfig.MANAGES_APP_UPDATES) {
+      ApkUpdateRefreshListener.schedule(this);
     }
   }
 
@@ -408,6 +430,9 @@ 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);

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

@@ -20,4 +20,5 @@ public interface BindableConversationListItem extends Unbindable {
 
   void setSelectedConversations(@NonNull ConversationSet conversations);
   void updateTypingIndicator(@NonNull Set<Long> typingThreads);
+  void updateTimestamp();
 }

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

@@ -50,6 +50,7 @@ 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;
@@ -70,6 +71,8 @@ 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;
@@ -145,6 +148,8 @@ 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;
 
@@ -423,6 +428,10 @@ public final class ContactSelectionListFragment extends LoggingFragment {
     onRefreshListener = null;
   }
 
+  public int getSelectedMembersSize() {
+    return contactSearchMediator.getSelectedMembersSize();
+  }
+
   private @NonNull Bundle safeArguments() {
     return getArguments() != null ? getArguments() : new Bundle();
   }
@@ -523,12 +532,17 @@ public final class ContactSelectionListFragment extends LoggingFragment {
       return;
     }
 
-    this.cursorFilter = filter;
+    this.resetPositionOnCommit = true;
+    this.cursorFilter          = filter;
+
     contactSearchMediator.onFilterChanged(filter);
   }
 
   public void resetQueryFilter() {
     setQueryFilter(null);
+
+    this.resetPositionOnCommit = true;
+
     swipeRefresh.setRefreshing(false);
   }
 
@@ -547,6 +561,11 @@ public final class ContactSelectionListFragment extends LoggingFragment {
   }
 
   private void onLoadFinished(int count) {
+    if (resetPositionOnCommit) {
+      resetPositionOnCommit = false;
+      recyclerView.scrollToPosition(0);
+    }
+
     swipeRefresh.setVisibility(View.VISIBLE);
     showContactsLayout.setVisibility(View.GONE);
 
@@ -666,11 +685,18 @@ public final class ContactSelectionListFragment extends LoggingFragment {
           AlertDialog loadingDialog = SimpleProgressDialog.show(requireContext());
 
           SimpleTask.run(getViewLifecycleOwner().getLifecycle(), () -> {
-            return UsernameUtil.fetchAciForUsername(username);
-          }, uuid -> {
+            try {
+              return RxExtensions.safeBlockingGet(UsernameRepository.fetchAciForUsername(UsernameUtil.sanitizeUsernameFromSearch(username)));
+            } catch (InterruptedException e) {
+              Log.w(TAG, "Interrupted?", e);
+              return UsernameAciFetchResult.NetworkError.INSTANCE;
+            }
+          }, result  -> {
             loadingDialog.dismiss();
-            if (uuid.isPresent()) {
-              Recipient       recipient = Recipient.externalUsername(uuid.get(), username);
+
+            // TODO Could be more specific with errors
+            if (result instanceof UsernameAciFetchResult.Success success) {
+              Recipient       recipient = Recipient.externalUsername(success.getAci(), username);
               SelectedContact selected  = SelectedContact.forUsername(recipient.getId(), username);
 
               if (onContactSelectedListener != null) {

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

@@ -30,7 +30,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.thoughtcrime.securesms.util.Base64;
+import org.signal.core.util.Base64;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
@@ -195,7 +195,7 @@ public class DeviceActivity extends PassphraseRequiredActivity
           ProfileKey      profileKey         = ProfileKeyUtil.getSelfProfileKey();
 
           TextSecurePreferences.setMultiDevice(DeviceActivity.this, true);
-          accountManager.addDevice(ephemeralId, publicKey, aciIdentityKeyPair, pniIdentityKeyPair, profileKey, verificationCode);
+          accountManager.addDevice(ephemeralId, publicKey, aciIdentityKeyPair, pniIdentityKeyPair, profileKey, SignalStore.svr().getOrCreateMasterKey(), verificationCode);
 
           return SUCCESS;
         } catch (NotFoundException e) {

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

@@ -17,8 +17,11 @@ 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;
@@ -89,10 +92,7 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
     ConversationListTabRepository         repository = new ConversationListTabRepository();
     ConversationListTabsViewModel.Factory factory    = new ConversationListTabsViewModel.Factory(repository);
 
-    handleGroupLinkInIntent(getIntent());
-    handleProxyInIntent(getIntent());
-    handleSignalMeIntent(getIntent());
-    handleCallLinkInIntent(getIntent());
+    handleDeeplinkIntent(getIntent());
 
     CachedInflater.from(this).clear();
 
@@ -134,10 +134,7 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
   @Override
   protected void onNewIntent(Intent intent) {
     super.onNewIntent(intent);
-    handleGroupLinkInIntent(intent);
-    handleProxyInIntent(intent);
-    handleSignalMeIntent(intent);
-    handleCallLinkInIntent(intent);
+    handleDeeplinkIntent(intent);
   }
 
   @Override
@@ -203,6 +200,14 @@ 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) {
@@ -231,6 +236,13 @@ 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;
   }

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

@@ -51,7 +51,6 @@ 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;
@@ -313,7 +312,7 @@ public class NewConversationActivity extends ContactSelectionActivity
   }
 
   private @Nullable ActionItem createRemoveActionItem(@NonNull Recipient recipient) {
-    if (!FeatureFlags.hideContacts() || recipient.isSelf() || recipient.isGroup()) {
+    if (recipient.isSelf() || recipient.isGroup()) {
       return null;
     }
 

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

@@ -24,7 +24,7 @@ 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.EditProfileActivity;
+import org.thoughtcrime.securesms.profiles.edit.CreateProfileActivity;
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity;
@@ -228,7 +228,7 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
   }
 
   private Intent getCreateProfileNameIntent() {
-    Intent intent = EditProfileActivity.getIntentForUserProfile(this);
+    Intent intent = CreateProfileActivity.getIntentForUserProfile(this);
     return getRoutedIntent(intent, getIntent());
   }
 

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

@@ -53,12 +53,12 @@ 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.libsignal.protocol.IdentityKey;
 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.CallLinkInfoSheet;
 import org.thoughtcrime.securesms.components.webrtc.CallLinkProfileKeySender;
+import org.thoughtcrime.securesms.components.webrtc.CallOverflowPopupWindow;
 import org.thoughtcrime.securesms.components.webrtc.CallParticipantsListUpdatePopupWindow;
 import org.thoughtcrime.securesms.components.webrtc.CallParticipantsState;
 import org.thoughtcrime.securesms.components.webrtc.CallStateUpdatePopupWindow;
@@ -73,6 +73,8 @@ 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;
@@ -80,7 +82,7 @@ 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.recipients.LiveRecipient;
+import org.thoughtcrime.securesms.reactions.any.ReactWithAnyEmojiBottomSheetDialogFragment;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.safety.SafetyNumberBottomSheet;
@@ -95,6 +97,7 @@ 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;
@@ -112,7 +115,7 @@ 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 {
+public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChangeDialog.Callback, ReactWithAnyEmojiBottomSheetDialogFragment.Callback {
 
   private static final String TAG = Log.tag(WebRtcCallActivity.class);
 
@@ -137,13 +140,16 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
 
   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;
@@ -152,6 +158,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
   private PictureInPictureParams.Builder   pipBuilderParams;
   private LifecycleDisposable              lifecycleDisposable;
   private long                             lastCallLinkDisconnectDialogShowTime;
+  private ControlsAndInfoController        controlsAndInfo;
 
   private Disposable ephemeralStateDisposable = Disposable.empty();
 
@@ -161,7 +168,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
     super.attachBaseContext(newBase);
   }
 
-  @SuppressLint("SourceLockedOrientationActivity")
+  @SuppressLint({ "SourceLockedOrientationActivity", "MissingInflatedId" })
   @Override
   public void onCreate(Bundle savedInstanceState) {
     Log.i(TAG, "onCreate(" + getIntent().getBooleanExtra(EXTRA_STARTED_FROM_FULLSCREEN, false) + ")");
@@ -189,6 +196,16 @@ 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())) {
@@ -210,6 +227,8 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
     requestNewSizesThrottle = new ThrottledDebouncer(TimeUnit.SECONDS.toMillis(1));
 
     initializePendingParticipantFragmentListener();
+
+    WindowUtil.setNavigationBarColor(this, ContextCompat.getColor(this, R.color.signal_dark_colorSurface));
   }
 
   @Override
@@ -419,6 +438,13 @@ 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) {
@@ -431,7 +457,10 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
     viewModel.setIsLandscapeEnabled(isLandscapeEnabled);
     viewModel.setIsInPipMode(isInPipMode());
     viewModel.getMicrophoneEnabled().observe(this, callScreen::setMicEnabled);
-    viewModel.getWebRtcControls().observe(this, callScreen::setWebRtcControls);
+    viewModel.getWebRtcControls().observe(this, controls -> {
+      callScreen.setWebRtcControls(controls);
+      controlsAndInfo.updateControls(controls);
+    });
     viewModel.getEvents().observe(this, this::handleViewModelEvent);
 
     lifecycleDisposable.add(viewModel.getInCallstatus().subscribe(this::handleInCallStatus));
@@ -475,6 +504,8 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
                                      .subscribe(callScreen::updatePendingParticipantsList);
 
     lifecycleDisposable.add(disposable);
+
+    controlsAndInfoViewModel = new ViewModelProvider(this).get(ControlsAndInfoViewModel.class);
   }
 
   private void initializePictureInPictureParams() {
@@ -522,7 +553,6 @@ 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) {
@@ -531,6 +561,20 @@ 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);
     }
@@ -825,6 +869,7 @@ 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:
@@ -912,7 +957,6 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
 
   private void handleCallPreJoin(@NonNull WebRtcViewModel event) {
     if (event.getGroupState().isNotIdle()) {
-      callScreen.setStatusFromGroupCallState(event.getGroupState());
       callScreen.setRingGroup(event.shouldRingGroup());
 
       if (event.shouldRingGroup() && event.areRemoteDevicesInCall()) {
@@ -933,6 +977,15 @@ 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
@@ -946,22 +999,13 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
     }
 
     @Override
-    public void onControlsFadeOut() {
-      if (videoTooltip != null) {
-        videoTooltip.dismiss();
+    public void toggleControls() {
+      WebRtcControls controlState = viewModel.getWebRtcControls().getValue();
+      if (controlState != null && !controlState.displayIncomingCallButtons()) {
+        controlsAndInfo.toggleControls();
       }
     }
 
-    @Override
-    public void showSystemUI() {
-      fullscreenHelper.showSystemUI();
-    }
-
-    @Override
-    public void hideSystemUI() {
-      fullscreenHelper.hideSystemUI();
-    }
-
     @Override
     public void onAudioOutputChanged(@NonNull WebRtcAudioOutput audioOutput) {
       maybeDisplaySpeakerphonePopup(audioOutput);
@@ -1022,6 +1066,11 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
       handleAnswerWithAudio();
     }
 
+    @Override
+    public void onOverflowClicked() {
+      controlsAndInfo.toggleOverflowPopup();
+    }
+
     @Override
     public void onAcceptCallPressed() {
       if (viewModel.isAnswerWithVideoAvailable()) {
@@ -1039,6 +1088,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
     @Override
     public void onLocalPictureInPictureClicked() {
       viewModel.onLocalPictureInPictureClicked();
+      controlsAndInfo.restartHideControlsTimer();
     }
 
     @Override
@@ -1055,13 +1105,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
 
     @Override
     public void onCallInfoClicked() {
-      LiveRecipient liveRecipient = viewModel.getRecipient();
-
-      if (liveRecipient.get().isCallLink()) {
-        CallLinkInfoSheet.show(getSupportFragmentManager(), liveRecipient.get().requireCallLinkRoomId());
-      } else {
-        CallParticipantsListDialog.show(getSupportFragmentManager());
-      }
+      controlsAndInfo.showCallInfo();
     }
 
     @Override
@@ -1124,4 +1168,20 @@ 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();
+      }
+    }
+  }
 }

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

@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.animation;
 
+import android.graphics.Point;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.Animation;
@@ -16,6 +17,10 @@ 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;

app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateDownloadManagerReceiver.kt

@@ -0,0 +1,42 @@
+/*
+ * 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)
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateInstaller.kt

@@ -0,0 +1,150 @@
+/*
+ * 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
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateNotificationReceiver.kt

@@ -0,0 +1,43 @@
+/*
+ * 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)
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateNotifications.kt

@@ -0,0 +1,118 @@
+/*
+ * 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
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdatePackageInstallerReceiver.kt

@@ -0,0 +1,84 @@
+/*
+ * 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)
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateRefreshListener.java

@@ -1,4 +1,9 @@
-package org.thoughtcrime.securesms.service;
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.apkupdate;
 
 
 import android.content.Context;
@@ -6,16 +11,18 @@ import android.content.Context;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.BuildConfig;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobs.UpdateApkJob;
+import org.thoughtcrime.securesms.jobs.ApkUpdateJob;
+import org.thoughtcrime.securesms.service.PersistentAlarmManagerListener;
+import org.thoughtcrime.securesms.util.Environment;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 import java.util.concurrent.TimeUnit;
 
-public class UpdateApkRefreshListener extends PersistentAlarmManagerListener {
+public class ApkUpdateRefreshListener extends PersistentAlarmManagerListener {
 
-  private static final String TAG = Log.tag(UpdateApkRefreshListener.class);
+  private static final String TAG = Log.tag(ApkUpdateRefreshListener.class);
 
-  private static final long INTERVAL = TimeUnit.HOURS.toMillis(6);
+  private static final long INTERVAL = Environment.IS_NIGHTLY ? TimeUnit.HOURS.toMillis(2) : TimeUnit.HOURS.toMillis(6);
 
   @Override
   protected long getNextScheduledExecutionTime(Context context) {
@@ -26,9 +33,9 @@ public class UpdateApkRefreshListener extends PersistentAlarmManagerListener {
   protected long onAlarm(Context context, long scheduledTime) {
     Log.i(TAG, "onAlarm...");
 
-    if (scheduledTime != 0 && BuildConfig.PLAY_STORE_DISABLED) {
+    if (scheduledTime != 0 && BuildConfig.MANAGES_APP_UPDATES) {
       Log.i(TAG, "Queueing APK update job...");
-      ApplicationDependencies.getJobManager().add(new UpdateApkJob());
+      ApplicationDependencies.getJobManager().add(new ApkUpdateJob());
     }
 
     long newTime = System.currentTimeMillis() + INTERVAL;
@@ -38,7 +45,7 @@ public class UpdateApkRefreshListener extends PersistentAlarmManagerListener {
   }
 
   public static void schedule(Context context) {
-    new UpdateApkRefreshListener().onReceive(context, getScheduleIntent());
+    new ApkUpdateRefreshListener().onReceive(context, getScheduleIntent());
   }
 
 }

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

@@ -1,319 +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.annotation.NonNull;
-import androidx.annotation.Nullable;
-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;
-
-import java.util.Objects;
-
-public abstract class Attachment implements Parcelable {
-
-  @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;
-  private final int     incrementalMacChunkSize;
-
-  @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,
-                    int incrementalMacChunkSize,
-                    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.incrementalMacChunkSize = incrementalMacChunkSize;
-    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();
-  }
-
-  protected Attachment(Parcel in) {
-    this.contentType             = Objects.requireNonNull(in.readString());
-    this.transferState           = in.readInt();
-    this.size                    = in.readLong();
-    this.fileName                = in.readString();
-    this.cdnNumber               = in.readInt();
-    this.location                = in.readString();
-    this.key                     = in.readString();
-    this.relay                   = in.readString();
-    this.digest                  = ParcelUtil.readByteArray(in);
-    this.incrementalDigest       = ParcelUtil.readByteArray(in);
-    this.fastPreflightId         = in.readString();
-    this.voiceNote               = ParcelUtil.readBoolean(in);
-    this.borderless              = ParcelUtil.readBoolean(in);
-    this.videoGif                = ParcelUtil.readBoolean(in);
-    this.width                   = in.readInt();
-    this.height                  = in.readInt();
-    this.incrementalMacChunkSize = in.readInt();
-    this.quote                   = ParcelUtil.readBoolean(in);
-    this.uploadTimestamp         = in.readLong();
-    this.stickerLocator          = ParcelCompat.readParcelable(in, StickerLocator.class.getClassLoader(), StickerLocator.class);
-    this.caption                 = in.readString();
-    this.blurHash                = ParcelCompat.readParcelable(in, BlurHash.class.getClassLoader(), BlurHash.class);
-    this.audioHash               = ParcelCompat.readParcelable(in, AudioHash.class.getClassLoader(), AudioHash.class);
-    this.transformProperties     = Objects.requireNonNull(ParcelCompat.readParcelable(in, TransformProperties.class.getClassLoader(), TransformProperties.class));
-  }
-
-  @Override
-  public void writeToParcel(@NonNull Parcel dest, int flags) {
-    AttachmentCreator.writeSubclass(dest, this);
-    dest.writeString(contentType);
-    dest.writeInt(transferState);
-    dest.writeLong(size);
-    dest.writeString(fileName);
-    dest.writeInt(cdnNumber);
-    dest.writeString(location);
-    dest.writeString(key);
-    dest.writeString(relay);
-    ParcelUtil.writeByteArray(dest, digest);
-    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.writeParcelable(stickerLocator, 0);
-    dest.writeString(caption);
-    dest.writeParcelable(blurHash, 0);
-    dest.writeParcelable(audioHash, 0);
-    dest.writeParcelable(transformProperties, 0);
-  }
-
-  @Override
-  public int describeContents() {
-    return 0;
-  }
-
-  public static final Creator<Attachment> CREATOR = AttachmentCreator.INSTANCE;
-
-  @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() {
-    if (incrementalDigest != null && incrementalDigest.length > 0) {
-      return incrementalDigest;
-    } else {
-      return null;
-    }
-  }
-
-  @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 int getIncrementalMacChunkSize() {
-    return incrementalMacChunkSize;
-  }
-
-  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;
-  }
-}

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

@@ -0,0 +1,152 @@
+/*
+ * 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
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentCreator.kt

@@ -15,7 +15,6 @@ import android.os.Parcelable
 object AttachmentCreator : Parcelable.Creator<Attachment> {
   enum class Subclass(val clazz: Class<out Attachment>, val code: String) {
     DATABASE(DatabaseAttachment::class.java, "database"),
-    MMS_NOTIFICATION(MmsNotificationAttachment::class.java, "mms_notification"),
     POINTER(PointerAttachment::class.java, "pointer"),
     TOMBSTONE(TombstoneAttachment::class.java, "tombstone"),
     URI(UriAttachment::class.java, "uri")
@@ -32,7 +31,6 @@ object AttachmentCreator : Parcelable.Creator<Attachment> {
 
     return when (Subclass.values().first { rawCode == it.code }) {
       Subclass.DATABASE -> DatabaseAttachment(source)
-      Subclass.MMS_NOTIFICATION -> MmsNotificationAttachment(source)
       Subclass.POINTER -> PointerAttachment(source)
       Subclass.TOMBSTONE -> TombstoneAttachment(source)
       Subclass.URI -> UriAttachment(source)

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

@@ -1,89 +0,0 @@
-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];
-    }
-  };
-
-}

app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentId.kt

@@ -0,0 +1,20 @@
+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"
+  }
+}

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

@@ -1,142 +0,0 @@
-package org.thoughtcrime.securesms.attachments;
-
-import android.net.Uri;
-import android.os.Parcel;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-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;
-
-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,
-                            int incrementalMacChunkSize,
-                            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, incrementalMacChunkSize, quote, uploadTimestamp, caption, stickerLocator, blurHash, audioHash, transformProperties);
-    this.attachmentId = attachmentId;
-    this.hasData      = hasData;
-    this.hasThumbnail = hasThumbnail;
-    this.mmsId        = mmsId;
-    this.displayOrder = displayOrder;
-  }
-
-  protected DatabaseAttachment(Parcel in) {
-    super(in);
-    this.attachmentId = ParcelCompat.readParcelable(in, AttachmentId.class.getClassLoader(), AttachmentId.class);
-    this.hasData      = ParcelUtil.readBoolean(in);
-    this.hasThumbnail = ParcelUtil.readBoolean(in);
-    this.mmsId        = in.readLong();
-    this.displayOrder = in.readInt();
-  }
-
-  @Override
-  public void writeToParcel(@NonNull Parcel dest, int flags) {
-    super.writeToParcel(dest, flags);
-    dest.writeParcelable(attachmentId, 0);
-    ParcelUtil.writeBoolean(dest, hasData);
-    ParcelUtil.writeBoolean(dest, hasThumbnail);
-    dest.writeLong(mmsId);
-    dest.writeInt(displayOrder);
-  }
-
-  @Override
-  @Nullable
-  public Uri getUri() {
-    if (hasData || (FeatureFlags.instantVideoPlayback() && getIncrementalDigest() != null)) {
-      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());
-    }
-  }
-}

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

@@ -0,0 +1,133 @@
+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)
+    }
+  }
+}

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

@@ -1,45 +0,0 @@
-package org.thoughtcrime.securesms.attachments;
-
-
-import android.net.Uri;
-import android.os.Parcel;
-
-import androidx.annotation.NonNull;
-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, 0, false, 0, null, null, null, null, null);
-  }
-
-  protected MmsNotificationAttachment(Parcel in) {
-    super(in);
-  }
-
-  @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;
-    }
-  }
-}

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

@@ -1,194 +0,0 @@
-package org.thoughtcrime.securesms.attachments;
-
-import android.net.Uri;
-import android.os.Parcel;
-
-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.DataMessage;
-
-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,
-                            int incrementalMacChunkSize,
-                            @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, incrementalMacChunkSize, false, uploadTimestamp, caption, stickerLocator, blurHash, null, null);
-  }
-
-  protected PointerAttachment(Parcel in) {
-    super(in);
-  }
-
-  @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),
-                                             pointer.get().asPointer().getIncrementalMacChunkSize(),
-                                             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,
-                                             thumbnail != null ? thumbnail.asPointer().getIncrementalMacChunkSize() : 0,
-                                             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(DataMessage.Quote.QuotedAttachment quotedAttachment) {
-    SignalServiceAttachment thumbnail;
-    try {
-      thumbnail = quotedAttachment.thumbnail != null ? AttachmentPointerUtil.createSignalAttachmentPointer(quotedAttachment.thumbnail) : null;
-    } catch (InvalidMessageStructureException e) {
-      return Optional.empty();
-    }
-
-    return Optional.of(new PointerAttachment(quotedAttachment.contentType,
-                                             AttachmentTable.TRANSFER_PROGRESS_PENDING,
-                                             thumbnail != null ? thumbnail.asPointer().getSize().orElse(0) : 0,
-                                             quotedAttachment.fileName,
-                                             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,
-                                             thumbnail != null ? thumbnail.asPointer().getIncrementalMacChunkSize() : 0,
-                                             null,
-                                             false,
-                                             false,
-                                             false,
-                                             thumbnail != null ? thumbnail.asPointer().getWidth() : 0,
-                                             thumbnail != null ? thumbnail.asPointer().getHeight() : 0,
-                                             thumbnail != null ? thumbnail.asPointer().getUploadTimestamp() : 0,
-                                             thumbnail != null ? thumbnail.asPointer().getCaption().orElse(null) : null,
-                                             null,
-                                             null));
-  }
-}

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

@@ -0,0 +1,187 @@
+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
+        )
+      )
+    }
+  }
+}

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

@@ -1,36 +0,0 @@
-package org.thoughtcrime.securesms.attachments;
-
-import android.net.Uri;
-import android.os.Parcel;
-
-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, 0, quote, 0, null, null, null, null, null);
-  }
-
-  protected TombstoneAttachment(Parcel in) {
-    super(in);
-  }
-
-  @Override
-  public @Nullable Uri getUri() {
-    return null;
-  }
-
-  @Override
-  public @Nullable Uri getPublicUri() {
-    return null;
-  }
-}

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

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

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

@@ -1,92 +0,0 @@
-package org.thoughtcrime.securesms.attachments;
-
-import android.net.Uri;
-import android.os.Parcel;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-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;
-
-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, 0, quote, 0, caption, stickerLocator, blurHash, audioHash, transformProperties);
-    this.dataUri = Objects.requireNonNull(dataUri);
-  }
-
-  protected UriAttachment(Parcel in) {
-    super(in);
-    this.dataUri = Objects.requireNonNull(ParcelCompat.readParcelable(in, Uri.class.getClassLoader(), Uri.class));
-  }
-
-  @Override
-  public void writeToParcel(@NonNull Parcel dest, int flags) {
-    super.writeToParcel(dest, flags);
-    dest.writeParcelable(dataUri, 0);
-  }
-
-  @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();
-  }
-}

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

@@ -0,0 +1,114 @@
+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()
+  }
+}

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

@@ -8,7 +8,7 @@ import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.database.model.databaseprotos.AudioWaveFormData;
 import org.thoughtcrime.securesms.util.ParcelUtil;
-import org.whispersystems.util.Base64;
+import org.signal.core.util.Base64;
 
 import java.io.IOException;
 import java.util.Objects;
@@ -27,7 +27,7 @@ public final class AudioHash implements Parcelable {
   }
 
   public AudioHash(@NonNull AudioWaveFormData audioWaveForm) {
-    this(Base64.encodeBytes(audioWaveForm.encode()), audioWaveForm);
+    this(Base64.encodeWithPadding(audioWaveForm.encode()), audioWaveForm);
   }
 
   protected AudioHash(Parcel in) {

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

@@ -113,6 +113,23 @@ 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()");
 

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

@@ -0,0 +1,37 @@
+/*
+ * 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)
+    }
+  }
+}

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.MMS_ID} = ${MessageTable.TABLE_NAME}.${MessageTable.ID} 
+      INNER JOIN ${MessageTable.TABLE_NAME} ON ${AttachmentTable.TABLE_NAME}.${AttachmentTable.MESSAGE_ID} = ${MessageTable.TABLE_NAME}.${MessageTable.ID} 
       WHERE ${MessageTable.TABLE_NAME}.${MessageTable.EXPIRES_IN} <= 0 AND ${MessageTable.TABLE_NAME}.${MessageTable.VIEW_ONCE} <= 0
   """
 }

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

@@ -119,8 +119,7 @@ class BackupFrameOutputStream extends FullBackupBase.BackupStream {
     try {
       write(outputStream, new BackupFrame.Builder()
           .attachment(new Attachment.Builder()
-                          .rowId(attachmentId.getRowId())
-                          .attachmentId(attachmentId.getUniqueId())
+                          .rowId(attachmentId.id)
                           .length(Util.toIntExact(size))
                           .build())
           .build());

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

@@ -44,7 +44,6 @@ 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;
@@ -65,6 +64,7 @@ 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,6 +77,7 @@ 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),
@@ -159,15 +160,15 @@ public class FullBackupExporter extends FullBackupBase {
       for (String table : tables) {
         throwIfCanceled(cancellationSignal);
         if (table.equals(MessageTable.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, FullBackupExporter::isNonExpiringMmsMessage, null, count, estimatedCount, cancellationSignal);
+          count = exportTable(table, input, outputStream, cursor -> isNonExpiringMessage(cursor), null, count, estimatedCount, cancellationSignal);
         } else if (table.equals(ReactionTable.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, new MessageId(CursorUtil.requireLong(cursor, ReactionTable.MESSAGE_ID))), null, count, estimatedCount, cancellationSignal);
+          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, CursorUtil.requireLong(cursor, ReactionTable.MESSAGE_ID)), null, count, estimatedCount, cancellationSignal);
         } else if (table.equals(MentionTable.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMmsMessage(input, CursorUtil.requireLong(cursor, MentionTable.MESSAGE_ID)), null, count, estimatedCount, cancellationSignal);
+          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, CursorUtil.requireLong(cursor, MentionTable.MESSAGE_ID)), null, count, estimatedCount, cancellationSignal);
         } else if (table.equals(GroupReceiptTable.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMmsMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(GroupReceiptTable.MMS_ID))), null, count, estimatedCount, cancellationSignal);
+          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(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 -> isForNonExpiringMmsMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentTable.MMS_ID))), (cursor, innerCount) -> exportAttachment(attachmentSecret, cursor, outputStream, innerCount, estimatedCount), count, estimatedCount, cancellationSignal);
+          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);
         } 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)) {
@@ -444,11 +445,10 @@ public class FullBackupExporter extends FullBackupBase {
                                       long estimatedCount)
       throws IOException
   {
-    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));
+    long rowId = cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentTable.ID));
+    long size  = cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentTable.DATA_SIZE));
 
-    String data   = cursor.getString(cursor.getColumnIndexOrThrow(AttachmentTable.DATA));
+    String data   = cursor.getString(cursor.getColumnIndexOrThrow(AttachmentTable.DATA_FILE));
     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, uniqueId));
+        Log.w(TAG, "Needed size calculation! Manual: " + size + " File: " + fileLength + "  DB: " + dbLength + " ID: " + new AttachmentId(rowId));
       }
     }
 
     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, uniqueId), inputStream, size);
+        outputStream.write(new AttachmentId(rowId), inputStream, size);
       } catch (FileNotFoundException e) {
         Log.w(TAG, "Missing attachment", e);
       }
@@ -579,27 +579,25 @@ public class FullBackupExporter extends FullBackupBase {
     return count;
   }
 
-  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 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 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) {
+  private static boolean isForNonExpiringMessage(@NonNull SQLiteDatabase db, long messageId) {
     String[] columns = new String[] { MessageTable.EXPIRES_IN, MessageTable.VIEW_ONCE };
     String   where   = MessageTable.ID + " = ?";
-    String[] args    = new String[] { String.valueOf(mmsId) };
+    String[] args    = SqlUtil.buildArgs(messageId);
 
     try (Cursor mmsCursor = db.query(MessageTable.TABLE_NAME, columns, where, args, null, null, null)) {
       if (mmsCursor != null && mmsCursor.moveToFirst()) {
-        return isNonExpiringMmsMessage(mmsCursor);
+        return isNonExpiringMessage(mmsCursor);
       }
     }
 

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

@@ -194,26 +194,33 @@ 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);
+    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;
 
     ContentValues contentValues = new ContentValues();
 
     try {
       inputStream.readAttachmentTo(output.second, attachment.length);
 
-      contentValues.put(AttachmentTable.DATA, dataFile.getAbsolutePath());
-      contentValues.put(AttachmentTable.DATA_RANDOM, output.first);
+      contentValues.put(dataFileColumnName, dataFile.getAbsolutePath());
+      contentValues.put(dataRandomColumnName, output.first);
     } catch (BackupRecordInputStream.BadMacException e) {
       Log.w(TAG, "Bad MAC for attachment " + attachment.attachmentId + "! Can't restore it.", e);
       dataFile.delete();
-      contentValues.put(AttachmentTable.DATA, (String) null);
-      contentValues.put(AttachmentTable.DATA_RANDOM, (String) null);
+      contentValues.put(dataFileColumnName, (String) null);
+      contentValues.put(dataRandomColumnName, (String) null);
     }
 
-    db.update(AttachmentTable.TABLE_NAME, contentValues,
-              AttachmentTable.ROW_ID + " = ? AND " + AttachmentTable.UNIQUE_ID + " = ?",
-              new String[] {String.valueOf(attachment.rowId), String.valueOf(attachment.attachmentId)});
+    db.update(tableName,
+              contentValues,
+              idColumnName + " = ?",
+              SqlUtil.buildArgs(attachment.rowId));
   }
 
   private static void processSticker(@NonNull Context context, @NonNull AttachmentSecret attachmentSecret, @NonNull SQLiteDatabase db, @NonNull Sticker sticker, BackupRecordInputStream inputStream)

app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt

@@ -0,0 +1,257 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2
+
+import org.signal.core.util.EventTimer
+import org.signal.core.util.logging.Log
+import org.signal.core.util.withinTransaction
+import org.signal.libsignal.zkgroup.profiles.ProfileKey
+import org.thoughtcrime.securesms.backup.v2.database.ChatItemImportInserter
+import org.thoughtcrime.securesms.backup.v2.database.clearAllDataForBackupRestore
+import org.thoughtcrime.securesms.backup.v2.processor.AccountDataProcessor
+import org.thoughtcrime.securesms.backup.v2.processor.CallLogBackupProcessor
+import org.thoughtcrime.securesms.backup.v2.processor.ChatBackupProcessor
+import org.thoughtcrime.securesms.backup.v2.processor.ChatItemBackupProcessor
+import org.thoughtcrime.securesms.backup.v2.processor.RecipientBackupProcessor
+import org.thoughtcrime.securesms.backup.v2.stream.BackupExportWriter
+import org.thoughtcrime.securesms.backup.v2.stream.EncryptedBackupReader
+import org.thoughtcrime.securesms.backup.v2.stream.EncryptedBackupWriter
+import org.thoughtcrime.securesms.backup.v2.stream.PlainTextBackupReader
+import org.thoughtcrime.securesms.backup.v2.stream.PlainTextBackupWriter
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.whispersystems.signalservice.api.NetworkResult
+import org.whispersystems.signalservice.api.archive.ArchiveGetBackupInfoResponse
+import org.whispersystems.signalservice.api.archive.ArchiveServiceCredential
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import org.whispersystems.signalservice.api.push.ServiceId.PNI
+import java.io.ByteArrayOutputStream
+import java.io.InputStream
+import kotlin.time.Duration.Companion.milliseconds
+
+object BackupRepository {
+
+  private val TAG = Log.tag(BackupRepository::class.java)
+
+  fun export(plaintext: Boolean = false): ByteArray {
+    val eventTimer = EventTimer()
+
+    val outputStream = ByteArrayOutputStream()
+    val writer: BackupExportWriter = if (plaintext) {
+      PlainTextBackupWriter(outputStream)
+    } else {
+      EncryptedBackupWriter(
+        key = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey(),
+        aci = SignalStore.account().aci!!,
+        outputStream = outputStream,
+        append = { mac -> outputStream.write(mac) }
+      )
+    }
+
+    writer.use {
+      // Note: Without a transaction, we may export inconsistent state. But because we have a transaction,
+      // writes from other threads are blocked. This is something to think more about.
+      SignalDatabase.rawDatabase.withinTransaction {
+        AccountDataProcessor.export {
+          writer.write(it)
+          eventTimer.emit("account")
+        }
+
+        RecipientBackupProcessor.export {
+          writer.write(it)
+          eventTimer.emit("recipient")
+        }
+
+        ChatBackupProcessor.export { frame ->
+          writer.write(frame)
+          eventTimer.emit("thread")
+        }
+
+        CallLogBackupProcessor.export { frame ->
+          writer.write(frame)
+          eventTimer.emit("call")
+        }
+
+        ChatItemBackupProcessor.export { frame ->
+          writer.write(frame)
+          eventTimer.emit("message")
+        }
+      }
+    }
+
+    Log.d(TAG, "export() ${eventTimer.stop().summary}")
+
+    return outputStream.toByteArray()
+  }
+
+  fun import(length: Long, inputStreamFactory: () -> InputStream, selfData: SelfData, plaintext: Boolean = false) {
+    val eventTimer = EventTimer()
+
+    val frameReader = if (plaintext) {
+      PlainTextBackupReader(inputStreamFactory())
+    } else {
+      EncryptedBackupReader(
+        key = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey(),
+        aci = selfData.aci,
+        streamLength = length,
+        dataStream = inputStreamFactory
+      )
+    }
+
+    // Note: Without a transaction, bad imports could lead to lost data. But because we have a transaction,
+    // writes from other threads are blocked. This is something to think more about.
+    SignalDatabase.rawDatabase.withinTransaction {
+      SignalStore.clearAllDataForBackupRestore()
+      SignalDatabase.recipients.clearAllDataForBackupRestore()
+      SignalDatabase.distributionLists.clearAllDataForBackupRestore()
+      SignalDatabase.threads.clearAllDataForBackupRestore()
+      SignalDatabase.messages.clearAllDataForBackupRestore()
+      SignalDatabase.attachments.clearAllDataForBackupRestore()
+
+      // Add back self after clearing data
+      val selfId: RecipientId = SignalDatabase.recipients.getAndPossiblyMerge(selfData.aci, selfData.pni, selfData.e164, pniVerified = true, changeSelf = true)
+      SignalDatabase.recipients.setProfileKey(selfId, selfData.profileKey)
+      SignalDatabase.recipients.setProfileSharing(selfId, true)
+
+      val backupState = BackupState()
+      val chatItemInserter: ChatItemImportInserter = ChatItemBackupProcessor.beginImport(backupState)
+
+      for (frame in frameReader) {
+        when {
+          frame.account != null -> {
+            AccountDataProcessor.import(frame.account, selfId)
+            eventTimer.emit("account")
+          }
+
+          frame.recipient != null -> {
+            RecipientBackupProcessor.import(frame.recipient, backupState)
+            eventTimer.emit("recipient")
+          }
+
+          frame.chat != null -> {
+            ChatBackupProcessor.import(frame.chat, backupState)
+            eventTimer.emit("chat")
+          }
+
+          frame.call != null -> {
+            CallLogBackupProcessor.import(frame.call, backupState)
+            eventTimer.emit("call")
+          }
+
+          frame.chatItem != null -> {
+            chatItemInserter.insert(frame.chatItem)
+            eventTimer.emit("chatItem")
+            // TODO if there's stuff in the stream after chatItems, we need to flush the inserter before going to the next phase
+          }
+
+          else -> Log.w(TAG, "Unrecognized frame")
+        }
+      }
+
+      if (chatItemInserter.flush()) {
+        eventTimer.emit("chatItem")
+      }
+
+      backupState.chatIdToLocalThreadId.values.forEach {
+        SignalDatabase.threads.update(it, unarchive = false, allowDeletion = false)
+      }
+    }
+
+    Log.d(TAG, "import() ${eventTimer.stop().summary}")
+  }
+
+  /**
+   * Returns an object with details about the remote backup state.
+   */
+  fun getRemoteBackupState(): NetworkResult<ArchiveGetBackupInfoResponse> {
+    val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
+    val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+
+    return api
+      .triggerBackupIdReservation(backupKey)
+      .then { getAuthCredential() }
+      .then { credential ->
+        api.setPublicKey(backupKey, credential)
+          .also { Log.i(TAG, "PublicKeyResult: $it") }
+          .map { credential }
+      }
+      .then { credential ->
+        api.getBackupInfo(backupKey, credential)
+      }
+  }
+
+  /**
+   * A simple test method that just hits various network endpoints. Only useful for the playground.
+   *
+   * @return True if successful, otherwise false.
+   */
+  fun uploadBackupFile(backupStream: InputStream, backupStreamLength: Long): Boolean {
+    val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
+    val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+
+    return api
+      .triggerBackupIdReservation(backupKey)
+      .then { getAuthCredential() }
+      .then { credential ->
+        api.setPublicKey(backupKey, credential)
+          .also { Log.i(TAG, "PublicKeyResult: $it") }
+          .map { credential }
+      }
+      .then { credential ->
+        api.getMessageBackupUploadForm(backupKey, credential)
+          .also { Log.i(TAG, "UploadFormResult: $it") }
+      }
+      .then { form ->
+        api.getBackupResumableUploadUrl(form)
+          .also { Log.i(TAG, "ResumableUploadUrlResult: $it") }
+          .map { form to it }
+      }
+      .then { formAndUploadUrl ->
+        val (form, resumableUploadUrl) = formAndUploadUrl
+        api.uploadBackupFile(form, resumableUploadUrl, backupStream, backupStreamLength)
+          .also { Log.i(TAG, "UploadBackupFileResult: $it") }
+      }
+      .also { Log.i(TAG, "OverallResult: $it") } is NetworkResult.Success
+  }
+
+  /**
+   * Retrieves an auth credential, preferring a cached value if available.
+   */
+  private fun getAuthCredential(): NetworkResult<ArchiveServiceCredential> {
+    val currentTime = System.currentTimeMillis()
+
+    val credential = SignalStore.backup().credentialsByDay.getForCurrentTime(currentTime.milliseconds)
+
+    if (credential != null) {
+      return NetworkResult.Success(credential)
+    }
+
+    Log.w(TAG, "No credentials found for today, need to fetch new ones! This shouldn't happen under normal circumstances. We should ensure the routine fetch is running properly.")
+
+    return ApplicationDependencies.getSignalServiceAccountManager().archiveApi.getServiceCredentials(currentTime).map { result ->
+      SignalStore.backup().addCredentials(result.credentials.toList())
+      SignalStore.backup().clearCredentialsOlderThan(currentTime)
+      SignalStore.backup().credentialsByDay.getForCurrentTime(currentTime.milliseconds)!!
+    }
+  }
+
+  data class SelfData(
+    val aci: ACI,
+    val pni: PNI,
+    val e164: String,
+    val profileKey: ProfileKey
+  )
+}
+
+class BackupState {
+  val backupToLocalRecipientId = HashMap<Long, RecipientId>()
+  val chatIdToLocalThreadId = HashMap<Long, Long>()
+  val chatIdToLocalRecipientId = HashMap<Long, RecipientId>()
+  val chatIdToBackupRecipientId = HashMap<Long, Long>()
+  val callIdToType = HashMap<Long, Long>()
+}

app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/AttachmentTableBackupExtensions.kt

@@ -0,0 +1,13 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.database
+
+import org.signal.core.util.delete
+import org.thoughtcrime.securesms.database.AttachmentTable
+
+fun AttachmentTable.clearAllDataForBackupRestore() {
+  writableDatabase.delete(AttachmentTable.TABLE_NAME).run()
+}

app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/CallTableBackupExtensions.kt

@@ -0,0 +1,124 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.database
+
+import android.database.Cursor
+import android.database.sqlite.SQLiteDatabase
+import androidx.core.content.contentValuesOf
+import org.signal.core.util.isNull
+import org.signal.core.util.requireInt
+import org.signal.core.util.requireLong
+import org.signal.core.util.select
+import org.thoughtcrime.securesms.backup.v2.BackupState
+import org.thoughtcrime.securesms.backup.v2.proto.Call
+import org.thoughtcrime.securesms.database.CallTable
+import org.thoughtcrime.securesms.database.RecipientTable
+import java.io.Closeable
+
+typealias BackupCall = org.thoughtcrime.securesms.backup.v2.proto.Call
+
+fun CallTable.getCallsForBackup(): CallLogIterator {
+  return CallLogIterator(
+    readableDatabase
+      .select()
+      .from(CallTable.TABLE_NAME)
+      .where("${CallTable.EVENT} != ${CallTable.Event.serialize(CallTable.Event.DELETE)}")
+      .run()
+  )
+}
+
+fun CallTable.restoreCallLogFromBackup(call: BackupCall, backupState: BackupState) {
+  val type = when (call.type) {
+    Call.Type.VIDEO_CALL -> CallTable.Type.VIDEO_CALL
+    Call.Type.AUDIO_CALL -> CallTable.Type.AUDIO_CALL
+    Call.Type.AD_HOC_CALL -> CallTable.Type.AD_HOC_CALL
+    Call.Type.GROUP_CALL -> CallTable.Type.GROUP_CALL
+    Call.Type.UNKNOWN_TYPE -> return
+  }
+
+  val event = when (call.event) {
+    Call.Event.DELETE -> CallTable.Event.DELETE
+    Call.Event.JOINED -> CallTable.Event.JOINED
+    Call.Event.GENERIC_GROUP_CALL -> CallTable.Event.GENERIC_GROUP_CALL
+    Call.Event.DECLINED -> CallTable.Event.DECLINED
+    Call.Event.ACCEPTED -> CallTable.Event.ACCEPTED
+    Call.Event.MISSED -> CallTable.Event.MISSED
+    Call.Event.OUTGOING_RING -> CallTable.Event.OUTGOING_RING
+    Call.Event.OUTGOING -> CallTable.Event.ONGOING
+    Call.Event.NOT_ACCEPTED -> CallTable.Event.NOT_ACCEPTED
+    Call.Event.UNKNOWN_EVENT -> return
+  }
+
+  val direction = if (call.outgoing) CallTable.Direction.OUTGOING else CallTable.Direction.INCOMING
+
+  backupState.callIdToType[call.callId] = CallTable.Call.getMessageType(type, direction, event)
+
+  val values = contentValuesOf(
+    CallTable.CALL_ID to call.callId,
+    CallTable.PEER to backupState.backupToLocalRecipientId[call.conversationRecipientId]!!.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 call.timestamp
+  )
+
+  writableDatabase.insert(CallTable.TABLE_NAME, SQLiteDatabase.CONFLICT_IGNORE, values)
+}
+
+/**
+ * Provides a nice iterable interface over a [RecipientTable] cursor, converting rows to [BackupRecipient]s.
+ * Important: Because this is backed by a cursor, you must close it. It's recommended to use `.use()` or try-with-resources.
+ */
+class CallLogIterator(private val cursor: Cursor) : Iterator<BackupCall?>, Closeable {
+  override fun hasNext(): Boolean {
+    return cursor.count > 0 && !cursor.isLast
+  }
+
+  override fun next(): BackupCall? {
+    if (!cursor.moveToNext()) {
+      throw NoSuchElementException()
+    }
+
+    val callId = cursor.requireLong(CallTable.CALL_ID)
+    val type = CallTable.Type.deserialize(cursor.requireInt(CallTable.TYPE))
+    val direction = CallTable.Direction.deserialize(cursor.requireInt(CallTable.DIRECTION))
+    val event = CallTable.Event.deserialize(cursor.requireInt(CallTable.EVENT))
+
+    return BackupCall(
+      callId = callId,
+      conversationRecipientId = cursor.requireLong(CallTable.PEER),
+      type = when (type) {
+        CallTable.Type.AUDIO_CALL -> Call.Type.AUDIO_CALL
+        CallTable.Type.VIDEO_CALL -> Call.Type.VIDEO_CALL
+        CallTable.Type.AD_HOC_CALL -> Call.Type.AD_HOC_CALL
+        CallTable.Type.GROUP_CALL -> Call.Type.GROUP_CALL
+      },
+      outgoing = when (direction) {
+        CallTable.Direction.OUTGOING -> true
+        else -> false
+      },
+      timestamp = cursor.requireLong(CallTable.TIMESTAMP),
+      ringerRecipientId = if (cursor.isNull(CallTable.RINGER)) null else cursor.requireLong(CallTable.RINGER),
+      event = when (event) {
+        CallTable.Event.ONGOING -> Call.Event.OUTGOING
+        CallTable.Event.OUTGOING_RING -> Call.Event.OUTGOING_RING
+        CallTable.Event.ACCEPTED -> Call.Event.ACCEPTED
+        CallTable.Event.DECLINED -> Call.Event.DECLINED
+        CallTable.Event.GENERIC_GROUP_CALL -> Call.Event.GENERIC_GROUP_CALL
+        CallTable.Event.JOINED -> Call.Event.JOINED
+        CallTable.Event.MISSED,
+        CallTable.Event.MISSED_NOTIFICATION_PROFILE -> Call.Event.MISSED
+        CallTable.Event.DELETE -> Call.Event.DELETE
+        CallTable.Event.RINGING -> Call.Event.UNKNOWN_EVENT
+        CallTable.Event.NOT_ACCEPTED -> Call.Event.NOT_ACCEPTED
+      }
+    )
+  }
+
+  override fun close() {
+    cursor.close()
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/ChatItemExportIterator.kt

@@ -0,0 +1,482 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.database
+
+import android.database.Cursor
+import com.annimon.stream.Stream
+import okio.ByteString.Companion.toByteString
+import org.signal.core.util.Base64
+import org.signal.core.util.Base64.decodeOrThrow
+import org.signal.core.util.logging.Log
+import org.signal.core.util.requireBlob
+import org.signal.core.util.requireBoolean
+import org.signal.core.util.requireInt
+import org.signal.core.util.requireLong
+import org.signal.core.util.requireString
+import org.thoughtcrime.securesms.backup.v2.proto.CallChatUpdate
+import org.thoughtcrime.securesms.backup.v2.proto.ChatItem
+import org.thoughtcrime.securesms.backup.v2.proto.ChatUpdateMessage
+import org.thoughtcrime.securesms.backup.v2.proto.ExpirationTimerChatUpdate
+import org.thoughtcrime.securesms.backup.v2.proto.GroupCallChatUpdate
+import org.thoughtcrime.securesms.backup.v2.proto.IndividualCallChatUpdate
+import org.thoughtcrime.securesms.backup.v2.proto.ProfileChangeChatUpdate
+import org.thoughtcrime.securesms.backup.v2.proto.Quote
+import org.thoughtcrime.securesms.backup.v2.proto.Reaction
+import org.thoughtcrime.securesms.backup.v2.proto.RemoteDeletedMessage
+import org.thoughtcrime.securesms.backup.v2.proto.SendStatus
+import org.thoughtcrime.securesms.backup.v2.proto.SessionSwitchoverChatUpdate
+import org.thoughtcrime.securesms.backup.v2.proto.SimpleChatUpdate
+import org.thoughtcrime.securesms.backup.v2.proto.StandardMessage
+import org.thoughtcrime.securesms.backup.v2.proto.Text
+import org.thoughtcrime.securesms.backup.v2.proto.ThreadMergeChatUpdate
+import org.thoughtcrime.securesms.database.GroupReceiptTable
+import org.thoughtcrime.securesms.database.MessageTable
+import org.thoughtcrime.securesms.database.MessageTypes
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.SignalDatabase.Companion.calls
+import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatchSet
+import org.thoughtcrime.securesms.database.documents.NetworkFailureSet
+import org.thoughtcrime.securesms.database.model.GroupCallUpdateDetailsUtil
+import org.thoughtcrime.securesms.database.model.ReactionRecord
+import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList
+import org.thoughtcrime.securesms.database.model.databaseprotos.ProfileChangeDetails
+import org.thoughtcrime.securesms.database.model.databaseprotos.SessionSwitchoverEvent
+import org.thoughtcrime.securesms.database.model.databaseprotos.ThreadMergeEvent
+import org.thoughtcrime.securesms.mms.QuoteModel
+import org.thoughtcrime.securesms.util.JsonUtils
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import org.whispersystems.signalservice.api.util.UuidUtil
+import org.whispersystems.signalservice.api.util.toByteArray
+import java.io.Closeable
+import java.io.IOException
+import java.util.LinkedList
+import java.util.Queue
+import java.util.UUID
+import org.thoughtcrime.securesms.backup.v2.proto.BodyRange as BackupBodyRange
+
+/**
+ * An iterator for chat items with a clever performance twist: rather than do the extra queries one at a time (for reactions,
+ * attachments, etc), this will populate items in batches, doing bulk lookups to improve throughput. We keep these in a buffer
+ * and only do more queries when the buffer is empty.
+ *
+ * All of this complexity is hidden from the user -- they just get a normal iterator interface.
+ */
+class ChatItemExportIterator(private val cursor: Cursor, private val batchSize: Int) : Iterator<ChatItem>, Closeable {
+
+  companion object {
+    private val TAG = Log.tag(ChatItemExportIterator::class.java)
+
+    const val COLUMN_BASE_TYPE = "base_type"
+  }
+
+  /**
+   * A queue of already-parsed ChatItems. Processing in batches means that we read ahead in the cursor and put
+   * the pending items here.
+   */
+  private val buffer: Queue<ChatItem> = LinkedList()
+
+  override fun hasNext(): Boolean {
+    return buffer.isNotEmpty() || (cursor.count > 0 && !cursor.isLast && !cursor.isAfterLast)
+  }
+
+  override fun next(): ChatItem {
+    if (buffer.isNotEmpty()) {
+      return buffer.remove()
+    }
+
+    val records: LinkedHashMap<Long, BackupMessageRecord> = linkedMapOf()
+
+    for (i in 0 until batchSize) {
+      if (cursor.moveToNext()) {
+        val record = cursor.toBackupMessageRecord()
+        records[record.id] = record
+      } else {
+        break
+      }
+    }
+
+    val reactionsById: Map<Long, List<ReactionRecord>> = SignalDatabase.reactions.getReactionsForMessages(records.keys)
+    val groupReceiptsById: Map<Long, List<GroupReceiptTable.GroupReceiptInfo>> = SignalDatabase.groupReceipts.getGroupReceiptInfoForMessages(records.keys)
+
+    for ((id, record) in records) {
+      val builder = record.toBasicChatItemBuilder(groupReceiptsById[id])
+
+      when {
+        record.remoteDeleted -> builder.remoteDeletedMessage = RemoteDeletedMessage()
+        MessageTypes.isJoinedType(record.type) -> builder.updateMessage = ChatUpdateMessage(simpleUpdate = SimpleChatUpdate(type = SimpleChatUpdate.Type.JOINED_SIGNAL))
+        MessageTypes.isIdentityUpdate(record.type) -> builder.updateMessage = ChatUpdateMessage(simpleUpdate = SimpleChatUpdate(type = SimpleChatUpdate.Type.IDENTITY_UPDATE))
+        MessageTypes.isIdentityVerified(record.type) -> builder.updateMessage = ChatUpdateMessage(simpleUpdate = SimpleChatUpdate(type = SimpleChatUpdate.Type.IDENTITY_VERIFIED))
+        MessageTypes.isIdentityDefault(record.type) -> builder.updateMessage = ChatUpdateMessage(simpleUpdate = SimpleChatUpdate(type = SimpleChatUpdate.Type.IDENTITY_DEFAULT))
+        MessageTypes.isChangeNumber(record.type) -> builder.updateMessage = ChatUpdateMessage(simpleUpdate = SimpleChatUpdate(type = SimpleChatUpdate.Type.CHANGE_NUMBER))
+        MessageTypes.isBoostRequest(record.type) -> builder.updateMessage = ChatUpdateMessage(simpleUpdate = SimpleChatUpdate(type = SimpleChatUpdate.Type.BOOST_REQUEST))
+        MessageTypes.isEndSessionType(record.type) -> builder.updateMessage = ChatUpdateMessage(simpleUpdate = SimpleChatUpdate(type = SimpleChatUpdate.Type.END_SESSION))
+        MessageTypes.isChatSessionRefresh(record.type) -> builder.updateMessage = ChatUpdateMessage(simpleUpdate = SimpleChatUpdate(type = SimpleChatUpdate.Type.CHAT_SESSION_REFRESH))
+        MessageTypes.isBadDecryptType(record.type) -> builder.updateMessage = ChatUpdateMessage(simpleUpdate = SimpleChatUpdate(type = SimpleChatUpdate.Type.BAD_DECRYPT))
+        MessageTypes.isPaymentsActivated(record.type) -> builder.updateMessage = ChatUpdateMessage(simpleUpdate = SimpleChatUpdate(type = SimpleChatUpdate.Type.PAYMENTS_ACTIVATED))
+        MessageTypes.isPaymentsRequestToActivate(record.type) -> builder.updateMessage = ChatUpdateMessage(simpleUpdate = SimpleChatUpdate(type = SimpleChatUpdate.Type.PAYMENT_ACTIVATION_REQUEST))
+        MessageTypes.isExpirationTimerUpdate(record.type) -> builder.updateMessage = ChatUpdateMessage(expirationTimerChange = ExpirationTimerChatUpdate((record.expiresIn / 1000).toInt()))
+        MessageTypes.isProfileChange(record.type) -> {
+          builder.updateMessage = ChatUpdateMessage(
+            profileChange = try {
+              val decoded: ByteArray = Base64.decode(record.body!!)
+              val profileChangeDetails = ProfileChangeDetails.ADAPTER.decode(decoded)
+              if (profileChangeDetails.profileNameChange != null) {
+                ProfileChangeChatUpdate(previousName = profileChangeDetails.profileNameChange.previous, newName = profileChangeDetails.profileNameChange.newValue)
+              } else {
+                ProfileChangeChatUpdate()
+              }
+            } catch (e: IOException) {
+              Log.w(TAG, "Profile name change details could not be read", e)
+              ProfileChangeChatUpdate()
+            }
+          )
+        }
+        MessageTypes.isSessionSwitchoverType(record.type) -> {
+          builder.updateMessage = ChatUpdateMessage(
+            sessionSwitchover = try {
+              val event = SessionSwitchoverEvent.ADAPTER.decode(decodeOrThrow(record.body!!))
+              SessionSwitchoverChatUpdate(event.e164.e164ToLong()!!)
+            } catch (e: Exception) {
+              SessionSwitchoverChatUpdate()
+            }
+          )
+        }
+        MessageTypes.isThreadMergeType(record.type) -> {
+          builder.updateMessage = ChatUpdateMessage(
+            threadMerge = try {
+              val event = ThreadMergeEvent.ADAPTER.decode(decodeOrThrow(record.body!!))
+              ThreadMergeChatUpdate(event.previousE164.e164ToLong()!!)
+            } catch (e: Exception) {
+              ThreadMergeChatUpdate()
+            }
+          )
+        }
+        MessageTypes.isCallLog(record.type) -> {
+          val call = calls.getCallByMessageId(record.id)
+          if (call != null) {
+            builder.updateMessage = ChatUpdateMessage(callingMessage = CallChatUpdate(callId = call.callId))
+          } else {
+            when {
+              MessageTypes.isMissedAudioCall(record.type) -> {
+                builder.updateMessage = ChatUpdateMessage(callingMessage = CallChatUpdate(callMessage = IndividualCallChatUpdate(type = IndividualCallChatUpdate.Type.MISSED_AUDIO_CALL)))
+              }
+              MessageTypes.isMissedVideoCall(record.type) -> {
+                builder.updateMessage = ChatUpdateMessage(callingMessage = CallChatUpdate(callMessage = IndividualCallChatUpdate(type = IndividualCallChatUpdate.Type.MISSED_VIDEO_CALL)))
+              }
+              MessageTypes.isIncomingAudioCall(record.type) -> {
+                builder.updateMessage = ChatUpdateMessage(callingMessage = CallChatUpdate(callMessage = IndividualCallChatUpdate(type = IndividualCallChatUpdate.Type.INCOMING_AUDIO_CALL)))
+              }
+              MessageTypes.isIncomingVideoCall(record.type) -> {
+                builder.updateMessage = ChatUpdateMessage(callingMessage = CallChatUpdate(callMessage = IndividualCallChatUpdate(type = IndividualCallChatUpdate.Type.INCOMING_VIDEO_CALL)))
+              }
+              MessageTypes.isOutgoingAudioCall(record.type) -> {
+                builder.updateMessage = ChatUpdateMessage(callingMessage = CallChatUpdate(callMessage = IndividualCallChatUpdate(type = IndividualCallChatUpdate.Type.OUTGOING_AUDIO_CALL)))
+              }
+              MessageTypes.isOutgoingVideoCall(record.type) -> {
+                builder.updateMessage = ChatUpdateMessage(callingMessage = CallChatUpdate(callMessage = IndividualCallChatUpdate(type = IndividualCallChatUpdate.Type.OUTGOING_VIDEO_CALL)))
+              }
+              MessageTypes.isGroupCall(record.type) -> {
+                try {
+                  val groupCallUpdateDetails = GroupCallUpdateDetailsUtil.parse(record.body)
+
+                  val joinedMembers = Stream.of(groupCallUpdateDetails.inCallUuids)
+                    .map { uuid: String? -> UuidUtil.parseOrNull(uuid) }
+                    .withoutNulls()
+                    .map { obj: UUID? -> ACI.from(obj!!).toByteString() }
+                    .toList()
+                  builder.updateMessage = ChatUpdateMessage(
+                    callingMessage = CallChatUpdate(
+                      groupCall = GroupCallChatUpdate(
+                        startedCallAci = ACI.from(UuidUtil.parseOrThrow(groupCallUpdateDetails.startedCallUuid)).toByteString(),
+                        startedCallTimestamp = groupCallUpdateDetails.startedCallTimestamp,
+                        inCallAcis = joinedMembers
+                      )
+                    )
+                  )
+                } catch (exception: java.lang.Exception) {
+                  continue
+                }
+              }
+            }
+          }
+        }
+        record.body == null -> {
+          Log.w(TAG, "Record missing a body, skipping")
+          continue
+        }
+        else -> builder.standardMessage = record.toTextMessage(reactionsById[id])
+      }
+
+      buffer += builder.build()
+    }
+
+    return if (buffer.isNotEmpty()) {
+      buffer.remove()
+    } else {
+      throw NoSuchElementException()
+    }
+  }
+
+  override fun close() {
+    cursor.close()
+  }
+
+  private fun String.e164ToLong(): Long? {
+    val fixed = if (this.startsWith("+")) {
+      this.substring(1)
+    } else {
+      this
+    }
+
+    return fixed.toLongOrNull()
+  }
+
+  private fun BackupMessageRecord.toBasicChatItemBuilder(groupReceipts: List<GroupReceiptTable.GroupReceiptInfo>?): ChatItem.Builder {
+    val record = this
+
+    return ChatItem.Builder().apply {
+      chatId = record.threadId
+      authorId = record.fromRecipientId
+      dateSent = record.dateSent
+      sealedSender = record.sealedSender
+      expireStartDate = if (record.expireStarted > 0) record.expireStarted else null
+      expiresInMs = if (record.expiresIn > 0) record.expiresIn else null
+      revisions = emptyList()
+      sms = !MessageTypes.isSecureType(record.type)
+
+      if (MessageTypes.isOutgoingMessageType(record.type)) {
+        outgoing = ChatItem.OutgoingMessageDetails(
+          sendStatus = record.toBackupSendStatus(groupReceipts)
+        )
+      } else {
+        incoming = ChatItem.IncomingMessageDetails(
+          dateServerSent = record.dateServer,
+          dateReceived = record.dateReceived,
+          read = record.read
+        )
+      }
+    }
+  }
+
+  private fun BackupMessageRecord.toTextMessage(reactionRecords: List<ReactionRecord>?): StandardMessage {
+    return StandardMessage(
+      quote = this.toQuote(),
+      text = Text(
+        body = this.body!!,
+        bodyRanges = this.bodyRanges?.toBackupBodyRanges() ?: emptyList()
+      ),
+      // TODO Link previews!
+      linkPreview = emptyList(),
+      longText = null,
+      reactions = reactionRecords.toBackupReactions()
+    )
+  }
+
+  private fun BackupMessageRecord.toQuote(): Quote? {
+    return if (this.quoteTargetSentTimestamp != MessageTable.QUOTE_NOT_PRESENT_ID && this.quoteAuthor > 0) {
+      // TODO Attachments!
+      val type = QuoteModel.Type.fromCode(this.quoteType)
+      Quote(
+        targetSentTimestamp = this.quoteTargetSentTimestamp.takeIf { !this.quoteMissing && it != MessageTable.QUOTE_TARGET_MISSING_ID },
+        authorId = this.quoteAuthor,
+        text = this.quoteBody,
+        bodyRanges = this.quoteBodyRanges?.toBackupBodyRanges() ?: emptyList(),
+        type = when (type) {
+          QuoteModel.Type.NORMAL -> Quote.Type.NORMAL
+          QuoteModel.Type.GIFT_BADGE -> Quote.Type.GIFTBADGE
+        }
+      )
+    } else {
+      null
+    }
+  }
+
+  private fun ByteArray.toBackupBodyRanges(): List<BackupBodyRange> {
+    val decoded: BodyRangeList = try {
+      BodyRangeList.ADAPTER.decode(this)
+    } catch (e: IOException) {
+      Log.w(TAG, "Failed to decode BodyRangeList!")
+      return emptyList()
+    }
+
+    return decoded.ranges.map {
+      BackupBodyRange(
+        start = it.start,
+        length = it.length,
+        mentionAci = it.mentionUuid?.let { UuidUtil.parseOrThrow(it) }?.toByteArray()?.toByteString(),
+        style = it.style?.toBackupBodyRangeStyle()
+      )
+    }
+  }
+
+  private fun BodyRangeList.BodyRange.Style.toBackupBodyRangeStyle(): BackupBodyRange.Style {
+    return when (this) {
+      BodyRangeList.BodyRange.Style.BOLD -> BackupBodyRange.Style.BOLD
+      BodyRangeList.BodyRange.Style.ITALIC -> BackupBodyRange.Style.ITALIC
+      BodyRangeList.BodyRange.Style.STRIKETHROUGH -> BackupBodyRange.Style.STRIKETHROUGH
+      BodyRangeList.BodyRange.Style.MONOSPACE -> BackupBodyRange.Style.MONOSPACE
+      BodyRangeList.BodyRange.Style.SPOILER -> BackupBodyRange.Style.SPOILER
+    }
+  }
+
+  private fun List<ReactionRecord>?.toBackupReactions(): List<Reaction> {
+    return this
+      ?.map {
+        Reaction(
+          emoji = it.emoji,
+          authorId = it.author.toLong(),
+          sentTimestamp = it.dateSent,
+          receivedTimestamp = it.dateReceived
+        )
+      } ?: emptyList()
+  }
+
+  private fun BackupMessageRecord.toBackupSendStatus(groupReceipts: List<GroupReceiptTable.GroupReceiptInfo>?): List<SendStatus> {
+    if (!MessageTypes.isOutgoingMessageType(this.type)) {
+      return emptyList()
+    }
+
+    if (!groupReceipts.isNullOrEmpty()) {
+      return groupReceipts.toBackupSendStatus(this.networkFailureRecipientIds, this.identityMismatchRecipientIds)
+    }
+
+    val status: SendStatus.Status = when {
+      this.viewed -> SendStatus.Status.VIEWED
+      this.hasReadReceipt -> SendStatus.Status.READ
+      this.hasDeliveryReceipt -> SendStatus.Status.DELIVERED
+      this.baseType == MessageTypes.BASE_SENT_TYPE -> SendStatus.Status.SENT
+      MessageTypes.isFailedMessageType(this.type) -> SendStatus.Status.FAILED
+      else -> SendStatus.Status.PENDING
+    }
+
+    return listOf(
+      SendStatus(
+        recipientId = this.toRecipientId,
+        deliveryStatus = status,
+        lastStatusUpdateTimestamp = this.receiptTimestamp,
+        sealedSender = this.sealedSender,
+        networkFailure = this.networkFailureRecipientIds.contains(this.toRecipientId),
+        identityKeyMismatch = this.identityMismatchRecipientIds.contains(this.toRecipientId)
+      )
+    )
+  }
+
+  private fun List<GroupReceiptTable.GroupReceiptInfo>.toBackupSendStatus(networkFailureRecipientIds: Set<Long>, identityMismatchRecipientIds: Set<Long>): List<SendStatus> {
+    return this.map {
+      SendStatus(
+        recipientId = it.recipientId.toLong(),
+        deliveryStatus = it.status.toBackupDeliveryStatus(),
+        sealedSender = it.isUnidentified,
+        lastStatusUpdateTimestamp = it.timestamp,
+        networkFailure = networkFailureRecipientIds.contains(it.recipientId.toLong()),
+        identityKeyMismatch = identityMismatchRecipientIds.contains(it.recipientId.toLong())
+      )
+    }
+  }
+
+  private fun Int.toBackupDeliveryStatus(): SendStatus.Status {
+    return when (this) {
+      GroupReceiptTable.STATUS_UNDELIVERED -> SendStatus.Status.PENDING
+      GroupReceiptTable.STATUS_DELIVERED -> SendStatus.Status.DELIVERED
+      GroupReceiptTable.STATUS_READ -> SendStatus.Status.READ
+      GroupReceiptTable.STATUS_VIEWED -> SendStatus.Status.VIEWED
+      GroupReceiptTable.STATUS_SKIPPED -> SendStatus.Status.SKIPPED
+      else -> SendStatus.Status.SKIPPED
+    }
+  }
+
+  private fun String?.parseNetworkFailures(): Set<Long> {
+    if (this.isNullOrBlank()) {
+      return emptySet()
+    }
+
+    return try {
+      JsonUtils.fromJson(this, NetworkFailureSet::class.java).items.map { it.recipientId.toLong() }.toSet()
+    } catch (e: IOException) {
+      emptySet()
+    }
+  }
+
+  private fun String?.parseIdentityMismatches(): Set<Long> {
+    if (this.isNullOrBlank()) {
+      return emptySet()
+    }
+
+    return try {
+      JsonUtils.fromJson(this, IdentityKeyMismatchSet::class.java).items.map { it.recipientId.toLong() }.toSet()
+    } catch (e: IOException) {
+      emptySet()
+    }
+  }
+
+  private fun Cursor.toBackupMessageRecord(): BackupMessageRecord {
+    return BackupMessageRecord(
+      id = this.requireLong(MessageTable.ID),
+      dateSent = this.requireLong(MessageTable.DATE_SENT),
+      dateReceived = this.requireLong(MessageTable.DATE_RECEIVED),
+      dateServer = this.requireLong(MessageTable.DATE_SERVER),
+      type = this.requireLong(MessageTable.TYPE),
+      threadId = this.requireLong(MessageTable.THREAD_ID),
+      body = this.requireString(MessageTable.BODY),
+      bodyRanges = this.requireBlob(MessageTable.MESSAGE_RANGES),
+      fromRecipientId = this.requireLong(MessageTable.FROM_RECIPIENT_ID),
+      toRecipientId = this.requireLong(MessageTable.TO_RECIPIENT_ID),
+      expiresIn = this.requireLong(MessageTable.EXPIRES_IN),
+      expireStarted = this.requireLong(MessageTable.EXPIRE_STARTED),
+      remoteDeleted = this.requireBoolean(MessageTable.REMOTE_DELETED),
+      sealedSender = this.requireBoolean(MessageTable.UNIDENTIFIED),
+      quoteTargetSentTimestamp = this.requireLong(MessageTable.QUOTE_ID),
+      quoteAuthor = this.requireLong(MessageTable.QUOTE_AUTHOR),
+      quoteBody = this.requireString(MessageTable.QUOTE_BODY),
+      quoteMissing = this.requireBoolean(MessageTable.QUOTE_MISSING),
+      quoteBodyRanges = this.requireBlob(MessageTable.QUOTE_BODY_RANGES),
+      quoteType = this.requireInt(MessageTable.QUOTE_TYPE),
+      originalMessageId = this.requireLong(MessageTable.ORIGINAL_MESSAGE_ID),
+      latestRevisionId = this.requireLong(MessageTable.LATEST_REVISION_ID),
+      hasDeliveryReceipt = this.requireBoolean(MessageTable.HAS_DELIVERY_RECEIPT),
+      viewed = this.requireBoolean(MessageTable.VIEWED_COLUMN),
+      hasReadReceipt = this.requireBoolean(MessageTable.HAS_READ_RECEIPT),
+      read = this.requireBoolean(MessageTable.READ),
+      receiptTimestamp = this.requireLong(MessageTable.RECEIPT_TIMESTAMP),
+      networkFailureRecipientIds = this.requireString(MessageTable.NETWORK_FAILURES).parseNetworkFailures(),
+      identityMismatchRecipientIds = this.requireString(MessageTable.MISMATCHED_IDENTITIES).parseIdentityMismatches(),
+      baseType = this.requireLong(COLUMN_BASE_TYPE)
+    )
+  }
+
+  private class BackupMessageRecord(
+    val id: Long,
+    val dateSent: Long,
+    val dateReceived: Long,
+    val dateServer: Long,
+    val type: Long,
+    val threadId: Long,
+    val body: String?,
+    val bodyRanges: ByteArray?,
+    val fromRecipientId: Long,
+    val toRecipientId: Long,
+    val expiresIn: Long,
+    val expireStarted: Long,
+    val remoteDeleted: Boolean,
+    val sealedSender: Boolean,
+    val quoteTargetSentTimestamp: Long,
+    val quoteAuthor: Long,
+    val quoteBody: String?,
+    val quoteMissing: Boolean,
+    val quoteBodyRanges: ByteArray?,
+    val quoteType: Int,
+    val originalMessageId: Long,
+    val latestRevisionId: Long,
+    val hasDeliveryReceipt: Boolean,
+    val hasReadReceipt: Boolean,
+    val viewed: Boolean,
+    val receiptTimestamp: Long,
+    val read: Boolean,
+    val networkFailureRecipientIds: Set<Long>,
+    val identityMismatchRecipientIds: Set<Long>,
+    val baseType: Long
+  )
+}

app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/ChatItemImportInserter.kt

@@ -0,0 +1,516 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.database
+
+import android.content.ContentValues
+import androidx.core.content.contentValuesOf
+import org.signal.core.util.Base64
+import org.signal.core.util.SqlUtil
+import org.signal.core.util.logging.Log
+import org.signal.core.util.requireLong
+import org.signal.core.util.toInt
+import org.thoughtcrime.securesms.backup.v2.BackupState
+import org.thoughtcrime.securesms.backup.v2.proto.BodyRange
+import org.thoughtcrime.securesms.backup.v2.proto.ChatItem
+import org.thoughtcrime.securesms.backup.v2.proto.ChatUpdateMessage
+import org.thoughtcrime.securesms.backup.v2.proto.IndividualCallChatUpdate
+import org.thoughtcrime.securesms.backup.v2.proto.Quote
+import org.thoughtcrime.securesms.backup.v2.proto.Reaction
+import org.thoughtcrime.securesms.backup.v2.proto.SendStatus
+import org.thoughtcrime.securesms.backup.v2.proto.SimpleChatUpdate
+import org.thoughtcrime.securesms.backup.v2.proto.StandardMessage
+import org.thoughtcrime.securesms.database.CallTable
+import org.thoughtcrime.securesms.database.GroupReceiptTable
+import org.thoughtcrime.securesms.database.MessageTable
+import org.thoughtcrime.securesms.database.MessageTypes
+import org.thoughtcrime.securesms.database.ReactionTable
+import org.thoughtcrime.securesms.database.SQLiteDatabase
+import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch
+import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatchSet
+import org.thoughtcrime.securesms.database.documents.NetworkFailure
+import org.thoughtcrime.securesms.database.documents.NetworkFailureSet
+import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList
+import org.thoughtcrime.securesms.database.model.databaseprotos.ProfileChangeDetails
+import org.thoughtcrime.securesms.database.model.databaseprotos.SessionSwitchoverEvent
+import org.thoughtcrime.securesms.database.model.databaseprotos.ThreadMergeEvent
+import org.thoughtcrime.securesms.mms.QuoteModel
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.util.JsonUtils
+import org.whispersystems.signalservice.api.util.UuidUtil
+
+/**
+ * An object that will ingest all fo the [ChatItem]s you want to write, buffer them until hitting a specified batch size, and then batch insert them
+ * for fast throughput.
+ */
+class ChatItemImportInserter(
+  private val db: SQLiteDatabase,
+  private val backupState: BackupState,
+  private val batchSize: Int
+) {
+  companion object {
+    private val TAG = Log.tag(ChatItemImportInserter::class.java)
+
+    private val MESSAGE_COLUMNS = arrayOf(
+      MessageTable.DATE_SENT,
+      MessageTable.DATE_RECEIVED,
+      MessageTable.DATE_SERVER,
+      MessageTable.TYPE,
+      MessageTable.THREAD_ID,
+      MessageTable.READ,
+      MessageTable.BODY,
+      MessageTable.FROM_RECIPIENT_ID,
+      MessageTable.TO_RECIPIENT_ID,
+      MessageTable.HAS_DELIVERY_RECEIPT,
+      MessageTable.HAS_READ_RECEIPT,
+      MessageTable.VIEWED_COLUMN,
+      MessageTable.MISMATCHED_IDENTITIES,
+      MessageTable.EXPIRES_IN,
+      MessageTable.EXPIRE_STARTED,
+      MessageTable.UNIDENTIFIED,
+      MessageTable.REMOTE_DELETED,
+      MessageTable.REMOTE_DELETED,
+      MessageTable.NETWORK_FAILURES,
+      MessageTable.QUOTE_ID,
+      MessageTable.QUOTE_AUTHOR,
+      MessageTable.QUOTE_BODY,
+      MessageTable.QUOTE_MISSING,
+      MessageTable.QUOTE_BODY_RANGES,
+      MessageTable.QUOTE_TYPE,
+      MessageTable.SHARED_CONTACTS,
+      MessageTable.LINK_PREVIEWS,
+      MessageTable.MESSAGE_RANGES,
+      MessageTable.VIEW_ONCE
+    )
+
+    private val REACTION_COLUMNS = arrayOf(
+      ReactionTable.MESSAGE_ID,
+      ReactionTable.AUTHOR_ID,
+      ReactionTable.EMOJI,
+      ReactionTable.DATE_SENT,
+      ReactionTable.DATE_RECEIVED
+    )
+
+    private val GROUP_RECEIPT_COLUMNS = arrayOf(
+      GroupReceiptTable.MMS_ID,
+      GroupReceiptTable.RECIPIENT_ID,
+      GroupReceiptTable.STATUS,
+      GroupReceiptTable.TIMESTAMP,
+      GroupReceiptTable.UNIDENTIFIED
+    )
+  }
+
+  private val selfId = Recipient.self().id
+  private val buffer: Buffer = Buffer()
+  private var messageId: Long = SqlUtil.getNextAutoIncrementId(db, MessageTable.TABLE_NAME)
+
+  /**
+   * Indicate that you want to insert the [ChatItem] into the database.
+   * If this item causes the buffer to hit the batch size, then a batch of items will actually be inserted.
+   */
+  fun insert(chatItem: ChatItem) {
+    val fromLocalRecipientId: RecipientId? = backupState.backupToLocalRecipientId[chatItem.authorId]
+    if (fromLocalRecipientId == null) {
+      Log.w(TAG, "[insert] Could not find a local recipient for backup recipient ID ${chatItem.authorId}! Skipping.")
+      return
+    }
+
+    val chatLocalRecipientId: RecipientId? = backupState.chatIdToLocalRecipientId[chatItem.chatId]
+    if (chatLocalRecipientId == null) {
+      Log.w(TAG, "[insert] Could not find a local recipient for chatId ${chatItem.chatId}! Skipping.")
+      return
+    }
+
+    val localThreadId: Long? = backupState.chatIdToLocalThreadId[chatItem.chatId]
+    if (localThreadId == null) {
+      Log.w(TAG, "[insert] Could not find a local threadId for backup chatId ${chatItem.chatId}! Skipping.")
+      return
+    }
+
+    val chatBackupRecipientId: Long? = backupState.chatIdToBackupRecipientId[chatItem.chatId]
+    if (chatBackupRecipientId == null) {
+      Log.w(TAG, "[insert] Could not find a backup recipientId for backup chatId ${chatItem.chatId}! Skipping.")
+      return
+    }
+
+    buffer.messages += chatItem.toMessageInsert(fromLocalRecipientId, chatLocalRecipientId, localThreadId)
+    buffer.reactions += chatItem.toReactionContentValues(messageId)
+    buffer.groupReceipts += chatItem.toGroupReceiptContentValues(messageId, chatBackupRecipientId)
+
+    messageId++
+
+    if (buffer.size >= batchSize) {
+      flush()
+    }
+  }
+
+  /** Returns true if something was written to the db, otherwise false. */
+  fun flush(): Boolean {
+    if (buffer.size == 0) {
+      return false
+    }
+
+    buildBulkInsert(MessageTable.TABLE_NAME, MESSAGE_COLUMNS, buffer.messages).forEach {
+      db.rawQuery("${it.query.where} RETURNING ${MessageTable.ID}", it.query.whereArgs).use { cursor ->
+        var index = 0
+        while (cursor.moveToNext()) {
+          val rowId = cursor.requireLong(MessageTable.ID)
+          val followup = it.inserts[index].followUp
+          if (followup != null) {
+            followup(rowId)
+          }
+          index++
+        }
+      }
+    }
+
+    SqlUtil.buildBulkInsert(ReactionTable.TABLE_NAME, REACTION_COLUMNS, buffer.reactions).forEach {
+      db.execSQL(it.where, it.whereArgs)
+    }
+
+    SqlUtil.buildBulkInsert(GroupReceiptTable.TABLE_NAME, GROUP_RECEIPT_COLUMNS, buffer.groupReceipts).forEach {
+      db.execSQL(it.where, it.whereArgs)
+    }
+
+    messageId = SqlUtil.getNextAutoIncrementId(db, MessageTable.TABLE_NAME)
+
+    return true
+  }
+
+  private fun buildBulkInsert(tableName: String, columns: Array<String>, messageInserts: List<MessageInsert>, maxQueryArgs: Int = 999): List<BatchInsert> {
+    val batchSize = maxQueryArgs / columns.size
+
+    return messageInserts
+      .chunked(batchSize)
+      .map { batch: List<MessageInsert> -> BatchInsert(batch, SqlUtil.buildSingleBulkInsert(tableName, columns, batch.map { it.contentValues })) }
+      .toList()
+  }
+
+  private fun ChatItem.toMessageInsert(fromRecipientId: RecipientId, chatRecipientId: RecipientId, threadId: Long): MessageInsert {
+    val contentValues = this.toMessageContentValues(fromRecipientId, chatRecipientId, threadId)
+
+    var followUp: ((Long) -> Unit)? = null
+    if (this.updateMessage != null) {
+      if (this.updateMessage.callingMessage != null && this.updateMessage.callingMessage.callId != null) {
+        followUp = { messageRowId ->
+          val callContentValues = ContentValues()
+          callContentValues.put(CallTable.MESSAGE_ID, messageRowId)
+          db.update(CallTable.TABLE_NAME, SQLiteDatabase.CONFLICT_IGNORE, callContentValues, "${CallTable.CALL_ID} = ?", SqlUtil.buildArgs(this.updateMessage.callingMessage.callId))
+        }
+      }
+    }
+    return MessageInsert(contentValues, followUp)
+  }
+
+  private class BatchInsert(val inserts: List<MessageInsert>, val query: SqlUtil.Query)
+
+  private fun ChatItem.toMessageContentValues(fromRecipientId: RecipientId, chatRecipientId: RecipientId, threadId: Long): ContentValues {
+    val contentValues = ContentValues()
+
+    contentValues.put(MessageTable.TYPE, this.getMessageType())
+    contentValues.put(MessageTable.DATE_SENT, this.dateSent)
+    contentValues.put(MessageTable.DATE_SERVER, this.incoming?.dateServerSent ?: -1)
+    contentValues.put(MessageTable.FROM_RECIPIENT_ID, fromRecipientId.serialize())
+    contentValues.put(MessageTable.TO_RECIPIENT_ID, (if (this.outgoing != null) chatRecipientId else selfId).serialize())
+    contentValues.put(MessageTable.THREAD_ID, threadId)
+    contentValues.put(MessageTable.DATE_RECEIVED, this.incoming?.dateReceived ?: this.dateSent)
+    contentValues.put(MessageTable.RECEIPT_TIMESTAMP, this.outgoing?.sendStatus?.maxOf { it.lastStatusUpdateTimestamp } ?: 0)
+    contentValues.putNull(MessageTable.LATEST_REVISION_ID)
+    contentValues.putNull(MessageTable.ORIGINAL_MESSAGE_ID)
+    contentValues.put(MessageTable.REVISION_NUMBER, 0)
+    contentValues.put(MessageTable.EXPIRES_IN, this.expiresInMs ?: 0)
+    contentValues.put(MessageTable.EXPIRE_STARTED, this.expireStartDate ?: 0)
+
+    if (this.outgoing != null) {
+      val viewed = this.outgoing.sendStatus.any { it.deliveryStatus == SendStatus.Status.VIEWED }
+      val hasReadReceipt = viewed || this.outgoing.sendStatus.any { it.deliveryStatus == SendStatus.Status.READ }
+      val hasDeliveryReceipt = viewed || hasReadReceipt || this.outgoing.sendStatus.any { it.deliveryStatus == SendStatus.Status.DELIVERED }
+
+      contentValues.put(MessageTable.VIEWED_COLUMN, viewed.toInt())
+      contentValues.put(MessageTable.HAS_READ_RECEIPT, hasReadReceipt.toInt())
+      contentValues.put(MessageTable.HAS_DELIVERY_RECEIPT, hasDeliveryReceipt.toInt())
+      contentValues.put(MessageTable.UNIDENTIFIED, this.outgoing.sendStatus.count { it.sealedSender })
+      contentValues.put(MessageTable.READ, 1)
+
+      contentValues.addNetworkFailures(this, backupState)
+      contentValues.addIdentityKeyMismatches(this, backupState)
+    } else {
+      contentValues.put(MessageTable.VIEWED_COLUMN, 0)
+      contentValues.put(MessageTable.HAS_READ_RECEIPT, 0)
+      contentValues.put(MessageTable.HAS_DELIVERY_RECEIPT, 0)
+      contentValues.put(MessageTable.UNIDENTIFIED, this.sealedSender?.toInt())
+      contentValues.put(MessageTable.READ, this.incoming?.read?.toInt() ?: 0)
+    }
+
+    contentValues.put(MessageTable.QUOTE_ID, 0)
+    contentValues.put(MessageTable.QUOTE_AUTHOR, 0)
+    contentValues.put(MessageTable.QUOTE_MISSING, 0)
+    contentValues.put(MessageTable.QUOTE_TYPE, 0)
+    contentValues.put(MessageTable.VIEW_ONCE, 0)
+    contentValues.put(MessageTable.REMOTE_DELETED, 0)
+
+    when {
+      this.standardMessage != null -> contentValues.addStandardMessage(this.standardMessage)
+      this.remoteDeletedMessage != null -> contentValues.put(MessageTable.REMOTE_DELETED, 1)
+      this.updateMessage != null -> contentValues.addUpdateMessage(this.updateMessage)
+    }
+
+    return contentValues
+  }
+
+  private fun ChatItem.toReactionContentValues(messageId: Long): List<ContentValues> {
+    val reactions: List<Reaction> = when {
+      this.standardMessage != null -> this.standardMessage.reactions
+      this.contactMessage != null -> this.contactMessage.reactions
+      this.voiceMessage != null -> this.voiceMessage.reactions
+      this.stickerMessage != null -> this.stickerMessage.reactions
+      else -> emptyList()
+    }
+
+    return reactions
+      .mapNotNull {
+        val authorId: Long? = backupState.backupToLocalRecipientId[it.authorId]?.toLong()
+
+        if (authorId != null) {
+          contentValuesOf(
+            ReactionTable.MESSAGE_ID to messageId,
+            ReactionTable.AUTHOR_ID to authorId,
+            ReactionTable.DATE_SENT to it.sentTimestamp,
+            ReactionTable.DATE_RECEIVED to it.receivedTimestamp,
+            ReactionTable.EMOJI to it.emoji
+          )
+        } else {
+          Log.w(TAG, "[Reaction] Could not find a local recipient for backup recipient ID ${it.authorId}! Skipping.")
+          null
+        }
+      }
+  }
+
+  private fun ChatItem.toGroupReceiptContentValues(messageId: Long, chatBackupRecipientId: Long): List<ContentValues> {
+    if (this.outgoing == null) {
+      return emptyList()
+    }
+
+    // TODO This seems like an indirect/bad way to detect if this is a 1:1 or group convo
+    if (this.outgoing.sendStatus.size == 1 && this.outgoing.sendStatus[0].recipientId == chatBackupRecipientId) {
+      return emptyList()
+    }
+
+    return this.outgoing.sendStatus.mapNotNull { sendStatus ->
+      val recipientId = backupState.backupToLocalRecipientId[sendStatus.recipientId]
+
+      if (recipientId != null) {
+        contentValuesOf(
+          GroupReceiptTable.MMS_ID to messageId,
+          GroupReceiptTable.RECIPIENT_ID to recipientId.serialize(),
+          GroupReceiptTable.STATUS to sendStatus.deliveryStatus.toLocalSendStatus(),
+          GroupReceiptTable.TIMESTAMP to sendStatus.lastStatusUpdateTimestamp,
+          GroupReceiptTable.UNIDENTIFIED to sendStatus.sealedSender
+        )
+      } else {
+        Log.w(TAG, "[GroupReceipts] Could not find a local recipient for backup recipient ID ${sendStatus.recipientId}! Skipping.")
+        null
+      }
+    }
+  }
+
+  private fun ChatItem.getMessageType(): Long {
+    var type: Long = if (this.outgoing != null) {
+      if (this.outgoing.sendStatus.count { it.identityKeyMismatch } > 0) {
+        MessageTypes.BASE_SENT_FAILED_TYPE
+      } else if (this.outgoing.sendStatus.count { it.networkFailure } > 0) {
+        MessageTypes.BASE_SENDING_TYPE
+      } else {
+        MessageTypes.BASE_SENT_TYPE
+      }
+    } else {
+      MessageTypes.BASE_INBOX_TYPE
+    }
+
+    if (!this.sms) {
+      type = type or MessageTypes.SECURE_MESSAGE_BIT or MessageTypes.PUSH_MESSAGE_BIT
+    }
+
+    return type
+  }
+
+  private fun ContentValues.addStandardMessage(standardMessage: StandardMessage) {
+    if (standardMessage.text != null) {
+      this.put(MessageTable.BODY, standardMessage.text.body)
+
+      if (standardMessage.text.bodyRanges.isNotEmpty()) {
+        this.put(MessageTable.MESSAGE_RANGES, standardMessage.text.bodyRanges.toLocalBodyRanges()?.encode() as ByteArray?)
+      }
+    }
+
+    if (standardMessage.quote != null) {
+      this.addQuote(standardMessage.quote)
+    }
+  }
+
+  private fun ContentValues.addUpdateMessage(updateMessage: ChatUpdateMessage) {
+    var typeFlags: Long = 0
+    when {
+      updateMessage.simpleUpdate != null -> {
+        typeFlags = when (updateMessage.simpleUpdate.type) {
+          SimpleChatUpdate.Type.UNKNOWN -> 0
+          SimpleChatUpdate.Type.JOINED_SIGNAL -> MessageTypes.JOINED_TYPE
+          SimpleChatUpdate.Type.IDENTITY_UPDATE -> MessageTypes.KEY_EXCHANGE_IDENTITY_UPDATE_BIT
+          SimpleChatUpdate.Type.IDENTITY_VERIFIED -> MessageTypes.KEY_EXCHANGE_IDENTITY_VERIFIED_BIT
+          SimpleChatUpdate.Type.IDENTITY_DEFAULT -> MessageTypes.KEY_EXCHANGE_IDENTITY_DEFAULT_BIT
+          SimpleChatUpdate.Type.CHANGE_NUMBER -> MessageTypes.CHANGE_NUMBER_TYPE
+          SimpleChatUpdate.Type.BOOST_REQUEST -> MessageTypes.BOOST_REQUEST_TYPE
+          SimpleChatUpdate.Type.END_SESSION -> MessageTypes.END_SESSION_BIT
+          SimpleChatUpdate.Type.CHAT_SESSION_REFRESH -> MessageTypes.ENCRYPTION_REMOTE_FAILED_BIT
+          SimpleChatUpdate.Type.BAD_DECRYPT -> MessageTypes.BAD_DECRYPT_TYPE
+          SimpleChatUpdate.Type.PAYMENTS_ACTIVATED -> MessageTypes.SPECIAL_TYPE_PAYMENTS_ACTIVATED
+          SimpleChatUpdate.Type.PAYMENT_ACTIVATION_REQUEST -> MessageTypes.SPECIAL_TYPE_PAYMENTS_ACTIVATE_REQUEST
+        }
+      }
+      updateMessage.expirationTimerChange != null -> {
+        typeFlags = MessageTypes.EXPIRATION_TIMER_UPDATE_BIT
+        put(MessageTable.EXPIRES_IN, updateMessage.expirationTimerChange.expiresInMs.toLong())
+      }
+      updateMessage.profileChange != null -> {
+        typeFlags = MessageTypes.PROFILE_CHANGE_TYPE
+        val profileChangeDetails = ProfileChangeDetails(profileNameChange = ProfileChangeDetails.StringChange(previous = updateMessage.profileChange.previousName, newValue = updateMessage.profileChange.newName))
+          .encode()
+        put(MessageTable.BODY, Base64.encodeWithPadding(profileChangeDetails))
+      }
+      updateMessage.sessionSwitchover != null -> {
+        typeFlags = MessageTypes.SESSION_SWITCHOVER_TYPE
+        val sessionSwitchoverDetails = SessionSwitchoverEvent(e164 = updateMessage.sessionSwitchover.e164.toString()).encode()
+        put(MessageTable.BODY, Base64.encodeWithPadding(sessionSwitchoverDetails))
+      }
+      updateMessage.threadMerge != null -> {
+        typeFlags = MessageTypes.THREAD_MERGE_TYPE
+        val threadMergeDetails = ThreadMergeEvent(previousE164 = updateMessage.threadMerge.previousE164.toString()).encode()
+        put(MessageTable.BODY, Base64.encodeWithPadding(threadMergeDetails))
+      }
+      updateMessage.callingMessage != null -> {
+        when {
+          updateMessage.callingMessage.callId != null -> {
+            typeFlags = backupState.callIdToType[updateMessage.callingMessage.callId]!!
+          }
+          updateMessage.callingMessage.callMessage != null -> {
+            typeFlags = when (updateMessage.callingMessage.callMessage.type) {
+              IndividualCallChatUpdate.Type.INCOMING_AUDIO_CALL -> MessageTypes.INCOMING_AUDIO_CALL_TYPE
+              IndividualCallChatUpdate.Type.INCOMING_VIDEO_CALL -> MessageTypes.INCOMING_VIDEO_CALL_TYPE
+              IndividualCallChatUpdate.Type.OUTGOING_AUDIO_CALL -> MessageTypes.OUTGOING_AUDIO_CALL_TYPE
+              IndividualCallChatUpdate.Type.OUTGOING_VIDEO_CALL -> MessageTypes.OUTGOING_VIDEO_CALL_TYPE
+              IndividualCallChatUpdate.Type.MISSED_AUDIO_CALL -> MessageTypes.MISSED_AUDIO_CALL_TYPE
+              IndividualCallChatUpdate.Type.MISSED_VIDEO_CALL -> MessageTypes.MISSED_VIDEO_CALL_TYPE
+              IndividualCallChatUpdate.Type.UNKNOWN -> typeFlags
+            }
+          }
+        }
+        // Calls don't use the incoming/outgoing flags, so we overwrite the flags here
+        this.put(MessageTable.TYPE, typeFlags)
+      }
+    }
+    this.put(MessageTable.TYPE, getAsLong(MessageTable.TYPE) or typeFlags)
+  }
+
+  private fun ContentValues.addQuote(quote: Quote) {
+    this.put(MessageTable.QUOTE_ID, quote.targetSentTimestamp ?: MessageTable.QUOTE_TARGET_MISSING_ID)
+    this.put(MessageTable.QUOTE_AUTHOR, backupState.backupToLocalRecipientId[quote.authorId]!!.serialize())
+    this.put(MessageTable.QUOTE_BODY, quote.text)
+    this.put(MessageTable.QUOTE_TYPE, quote.type.toLocalQuoteType())
+    this.put(MessageTable.QUOTE_BODY_RANGES, quote.bodyRanges.toLocalBodyRanges()?.encode())
+    // TODO quote attachments
+    this.put(MessageTable.QUOTE_MISSING, (quote.targetSentTimestamp == null).toInt())
+  }
+
+  private fun Quote.Type.toLocalQuoteType(): Int {
+    return when (this) {
+      Quote.Type.UNKNOWN -> QuoteModel.Type.NORMAL.code
+      Quote.Type.NORMAL -> QuoteModel.Type.NORMAL.code
+      Quote.Type.GIFTBADGE -> QuoteModel.Type.GIFT_BADGE.code
+    }
+  }
+
+  private fun ContentValues.addNetworkFailures(chatItem: ChatItem, backupState: BackupState) {
+    if (chatItem.outgoing == null) {
+      return
+    }
+
+    val networkFailures = chatItem.outgoing.sendStatus
+      .filter { status -> status.networkFailure }
+      .mapNotNull { status -> backupState.backupToLocalRecipientId[status.recipientId] }
+      .map { recipientId -> NetworkFailure(recipientId) }
+      .toSet()
+
+    if (networkFailures.isNotEmpty()) {
+      this.put(MessageTable.NETWORK_FAILURES, JsonUtils.toJson(NetworkFailureSet(networkFailures)))
+    }
+  }
+
+  private fun ContentValues.addIdentityKeyMismatches(chatItem: ChatItem, backupState: BackupState) {
+    if (chatItem.outgoing == null) {
+      return
+    }
+
+    val mismatches = chatItem.outgoing.sendStatus
+      .filter { status -> status.identityKeyMismatch }
+      .mapNotNull { status -> backupState.backupToLocalRecipientId[status.recipientId] }
+      .map { recipientId -> IdentityKeyMismatch(recipientId, null) } // TODO We probably want the actual identity key in this status situation?
+      .toSet()
+
+    if (mismatches.isNotEmpty()) {
+      this.put(MessageTable.MISMATCHED_IDENTITIES, JsonUtils.toJson(IdentityKeyMismatchSet(mismatches)))
+    }
+  }
+
+  private fun List<BodyRange>.toLocalBodyRanges(): BodyRangeList? {
+    if (this.isEmpty()) {
+      return null
+    }
+
+    return BodyRangeList(
+      ranges = this.map { bodyRange ->
+        BodyRangeList.BodyRange(
+          mentionUuid = bodyRange.mentionAci?.let { UuidUtil.fromByteString(it) }?.toString(),
+          style = bodyRange.style?.let {
+            when (bodyRange.style) {
+              BodyRange.Style.BOLD -> BodyRangeList.BodyRange.Style.BOLD
+              BodyRange.Style.ITALIC -> BodyRangeList.BodyRange.Style.ITALIC
+              BodyRange.Style.MONOSPACE -> BodyRangeList.BodyRange.Style.MONOSPACE
+              BodyRange.Style.SPOILER -> BodyRangeList.BodyRange.Style.SPOILER
+              BodyRange.Style.STRIKETHROUGH -> BodyRangeList.BodyRange.Style.STRIKETHROUGH
+              else -> null
+            }
+          },
+          start = bodyRange.start ?: 0,
+          length = bodyRange.length ?: 0
+        )
+      }
+    )
+  }
+
+  private fun SendStatus.Status.toLocalSendStatus(): Int {
+    return when (this) {
+      SendStatus.Status.UNKNOWN -> GroupReceiptTable.STATUS_UNKNOWN
+      SendStatus.Status.FAILED -> GroupReceiptTable.STATUS_UNKNOWN
+      SendStatus.Status.PENDING -> GroupReceiptTable.STATUS_UNDELIVERED
+      SendStatus.Status.SENT -> GroupReceiptTable.STATUS_UNDELIVERED
+      SendStatus.Status.DELIVERED -> GroupReceiptTable.STATUS_DELIVERED
+      SendStatus.Status.READ -> GroupReceiptTable.STATUS_READ
+      SendStatus.Status.VIEWED -> GroupReceiptTable.STATUS_VIEWED
+      SendStatus.Status.SKIPPED -> GroupReceiptTable.STATUS_SKIPPED
+    }
+  }
+
+  private class MessageInsert(val contentValues: ContentValues, val followUp: ((Long) -> Unit)?)
+
+  private class Buffer(
+    val messages: MutableList<MessageInsert> = mutableListOf(),
+    val reactions: MutableList<ContentValues> = mutableListOf(),
+    val groupReceipts: MutableList<ContentValues> = mutableListOf()
+  ) {
+    val size: Int
+      get() = listOf(messages.size, reactions.size, groupReceipts.size).max()
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/DistributionListTablesBackupExtensions.kt

@@ -0,0 +1,114 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.database
+
+import okio.ByteString.Companion.toByteString
+import org.signal.core.util.CursorUtil
+import org.signal.core.util.delete
+import org.signal.core.util.logging.Log
+import org.signal.core.util.readToList
+import org.signal.core.util.requireLong
+import org.signal.core.util.requireNonNullString
+import org.signal.core.util.requireObject
+import org.signal.core.util.select
+import org.thoughtcrime.securesms.backup.v2.BackupState
+import org.thoughtcrime.securesms.database.DistributionListTables
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.DistributionListId
+import org.thoughtcrime.securesms.database.model.DistributionListPrivacyMode
+import org.thoughtcrime.securesms.database.model.DistributionListRecord
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.whispersystems.signalservice.api.push.DistributionId
+import org.whispersystems.signalservice.api.util.UuidUtil
+import org.whispersystems.signalservice.api.util.toByteArray
+import org.thoughtcrime.securesms.backup.v2.proto.DistributionList as BackupDistributionList
+
+private val TAG = Log.tag(DistributionListTables::class.java)
+
+fun DistributionListTables.getAllForBackup(): List<BackupRecipient> {
+  val records = readableDatabase
+    .select()
+    .from(DistributionListTables.ListTable.TABLE_NAME)
+    .run()
+    .readToList { cursor ->
+      val id: DistributionListId = DistributionListId.from(cursor.requireLong(DistributionListTables.ListTable.ID))
+      val privacyMode: DistributionListPrivacyMode = cursor.requireObject(DistributionListTables.ListTable.PRIVACY_MODE, DistributionListPrivacyMode.Serializer)
+
+      DistributionListRecord(
+        id = id,
+        name = cursor.requireNonNullString(DistributionListTables.ListTable.NAME),
+        distributionId = DistributionId.from(cursor.requireNonNullString(DistributionListTables.ListTable.DISTRIBUTION_ID)),
+        allowsReplies = CursorUtil.requireBoolean(cursor, DistributionListTables.ListTable.ALLOWS_REPLIES),
+        rawMembers = getRawMembers(id, privacyMode),
+        members = getMembers(id),
+        deletedAtTimestamp = 0L,
+        isUnknown = CursorUtil.requireBoolean(cursor, DistributionListTables.ListTable.IS_UNKNOWN),
+        privacyMode = privacyMode
+      )
+    }
+
+  return records
+    .map { record ->
+      BackupRecipient(
+        distributionList = BackupDistributionList(
+          name = record.name,
+          distributionId = record.distributionId.asUuid().toByteArray().toByteString(),
+          allowReplies = record.allowsReplies,
+          deletionTimestamp = record.deletedAtTimestamp,
+          privacyMode = record.privacyMode.toBackupPrivacyMode(),
+          memberRecipientIds = record.members.map { it.toLong() }
+        )
+      )
+    }
+}
+
+fun DistributionListTables.restoreFromBackup(dlist: BackupDistributionList, backupState: BackupState): RecipientId {
+  val members: List<RecipientId> = dlist.memberRecipientIds
+    .mapNotNull { backupState.backupToLocalRecipientId[it] }
+
+  if (members.size != dlist.memberRecipientIds.size) {
+    Log.w(TAG, "Couldn't find some member recipients! Missing backup recipientIds: ${dlist.memberRecipientIds.toSet() - members.toSet()}")
+  }
+
+  val dlistId = this.createList(
+    name = dlist.name,
+    members = members,
+    distributionId = DistributionId.from(UuidUtil.fromByteString(dlist.distributionId)),
+    allowsReplies = dlist.allowReplies,
+    deletionTimestamp = dlist.deletionTimestamp,
+    storageId = null,
+    privacyMode = dlist.privacyMode.toLocalPrivacyMode()
+  )!!
+
+  return SignalDatabase.distributionLists.getRecipientId(dlistId)!!
+}
+
+fun DistributionListTables.clearAllDataForBackupRestore() {
+  writableDatabase
+    .delete(DistributionListTables.ListTable.TABLE_NAME)
+    .run()
+
+  writableDatabase
+    .delete(DistributionListTables.MembershipTable.TABLE_NAME)
+    .run()
+}
+
+private fun DistributionListPrivacyMode.toBackupPrivacyMode(): BackupDistributionList.PrivacyMode {
+  return when (this) {
+    DistributionListPrivacyMode.ONLY_WITH -> BackupDistributionList.PrivacyMode.ONLY_WITH
+    DistributionListPrivacyMode.ALL -> BackupDistributionList.PrivacyMode.ALL
+    DistributionListPrivacyMode.ALL_EXCEPT -> BackupDistributionList.PrivacyMode.ALL_EXCEPT
+  }
+}
+
+private fun BackupDistributionList.PrivacyMode.toLocalPrivacyMode(): DistributionListPrivacyMode {
+  return when (this) {
+    BackupDistributionList.PrivacyMode.UNKNOWN -> DistributionListPrivacyMode.ALL
+    BackupDistributionList.PrivacyMode.ONLY_WITH -> DistributionListPrivacyMode.ONLY_WITH
+    BackupDistributionList.PrivacyMode.ALL -> DistributionListPrivacyMode.ALL
+    BackupDistributionList.PrivacyMode.ALL_EXCEPT -> DistributionListPrivacyMode.ALL_EXCEPT
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/MessageTableBackupExtensions.kt

@@ -0,0 +1,77 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.database
+
+import org.signal.core.util.SqlUtil
+import org.signal.core.util.logging.Log
+import org.signal.core.util.select
+import org.thoughtcrime.securesms.backup.v2.BackupState
+import org.thoughtcrime.securesms.database.MessageTable
+import org.thoughtcrime.securesms.database.MessageTypes
+
+private val TAG = Log.tag(MessageTable::class.java)
+private const val BASE_TYPE = "base_type"
+
+fun MessageTable.getMessagesForBackup(): ChatItemExportIterator {
+  val cursor = readableDatabase
+    .select(
+      MessageTable.ID,
+      MessageTable.DATE_SENT,
+      MessageTable.DATE_RECEIVED,
+      MessageTable.DATE_SERVER,
+      MessageTable.TYPE,
+      MessageTable.THREAD_ID,
+      MessageTable.BODY,
+      MessageTable.MESSAGE_RANGES,
+      MessageTable.FROM_RECIPIENT_ID,
+      MessageTable.TO_RECIPIENT_ID,
+      MessageTable.EXPIRES_IN,
+      MessageTable.EXPIRE_STARTED,
+      MessageTable.REMOTE_DELETED,
+      MessageTable.UNIDENTIFIED,
+      MessageTable.QUOTE_ID,
+      MessageTable.QUOTE_AUTHOR,
+      MessageTable.QUOTE_BODY,
+      MessageTable.QUOTE_MISSING,
+      MessageTable.QUOTE_BODY_RANGES,
+      MessageTable.QUOTE_TYPE,
+      MessageTable.ORIGINAL_MESSAGE_ID,
+      MessageTable.LATEST_REVISION_ID,
+      MessageTable.HAS_DELIVERY_RECEIPT,
+      MessageTable.HAS_READ_RECEIPT,
+      MessageTable.VIEWED_COLUMN,
+      MessageTable.RECEIPT_TIMESTAMP,
+      MessageTable.READ,
+      MessageTable.NETWORK_FAILURES,
+      MessageTable.MISMATCHED_IDENTITIES,
+      "${MessageTable.TYPE} & ${MessageTypes.BASE_TYPE_MASK} AS ${ChatItemExportIterator.COLUMN_BASE_TYPE}"
+    )
+    .from(MessageTable.TABLE_NAME)
+    .where(
+      """
+      $BASE_TYPE IN (
+        ${MessageTypes.BASE_INBOX_TYPE},
+        ${MessageTypes.BASE_OUTBOX_TYPE},
+        ${MessageTypes.BASE_SENT_TYPE},
+        ${MessageTypes.BASE_SENDING_TYPE},
+        ${MessageTypes.BASE_SENT_FAILED_TYPE}
+      ) OR ${MessageTable.IS_CALL_TYPE_CLAUSE}
+      """
+    )
+    .orderBy("${MessageTable.DATE_RECEIVED} ASC")
+    .run()
+
+  return ChatItemExportIterator(cursor, 100)
+}
+
+fun MessageTable.createChatItemInserter(backupState: BackupState): ChatItemImportInserter {
+  return ChatItemImportInserter(writableDatabase, backupState, 100)
+}
+
+fun MessageTable.clearAllDataForBackupRestore() {
+  writableDatabase.delete(MessageTable.TABLE_NAME, null, null)
+  SqlUtil.resetAutoIncrementValue(writableDatabase, MessageTable.TABLE_NAME)
+}

app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/RecipientTableBackupExtensions.kt

@@ -0,0 +1,332 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.database
+
+import android.content.ContentValues
+import android.database.Cursor
+import okio.ByteString.Companion.toByteString
+import org.signal.core.util.Base64
+import org.signal.core.util.SqlUtil
+import org.signal.core.util.delete
+import org.signal.core.util.logging.Log
+import org.signal.core.util.nullIfBlank
+import org.signal.core.util.requireBoolean
+import org.signal.core.util.requireInt
+import org.signal.core.util.requireLong
+import org.signal.core.util.requireNonNullBlob
+import org.signal.core.util.requireString
+import org.signal.core.util.select
+import org.signal.core.util.toInt
+import org.signal.core.util.update
+import org.signal.libsignal.zkgroup.InvalidInputException
+import org.thoughtcrime.securesms.backup.v2.BackupState
+import org.thoughtcrime.securesms.backup.v2.proto.AccountData
+import org.thoughtcrime.securesms.backup.v2.proto.Contact
+import org.thoughtcrime.securesms.backup.v2.proto.Group
+import org.thoughtcrime.securesms.backup.v2.proto.Self
+import org.thoughtcrime.securesms.database.GroupTable
+import org.thoughtcrime.securesms.database.RecipientTable
+import org.thoughtcrime.securesms.database.RecipientTableCursorUtil
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.databaseprotos.RecipientExtras
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter
+import org.thoughtcrime.securesms.profiles.ProfileName
+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.PNI
+import java.io.Closeable
+
+typealias BackupRecipient = org.thoughtcrime.securesms.backup.v2.proto.Recipient
+typealias BackupGroup = Group
+
+/**
+ * Fetches all individual contacts for backups and returns the result as an iterator.
+ * It's important to note that the iterator still needs to be closed after it's used.
+ * It's recommended to use `.use` or a try-with-resources pattern.
+ */
+fun RecipientTable.getContactsForBackup(selfId: Long): BackupContactIterator {
+  val cursor = readableDatabase
+    .select(
+      RecipientTable.ID,
+      RecipientTable.ACI_COLUMN,
+      RecipientTable.PNI_COLUMN,
+      RecipientTable.USERNAME,
+      RecipientTable.E164,
+      RecipientTable.BLOCKED,
+      RecipientTable.HIDDEN,
+      RecipientTable.REGISTERED,
+      RecipientTable.UNREGISTERED_TIMESTAMP,
+      RecipientTable.PROFILE_KEY,
+      RecipientTable.PROFILE_SHARING,
+      RecipientTable.PROFILE_GIVEN_NAME,
+      RecipientTable.PROFILE_FAMILY_NAME,
+      RecipientTable.PROFILE_JOINED_NAME,
+      RecipientTable.MUTE_UNTIL,
+      RecipientTable.EXTRAS
+    )
+    .from(RecipientTable.TABLE_NAME)
+    .where(
+      """
+      ${RecipientTable.TYPE} = ? AND (
+        ${RecipientTable.ACI_COLUMN} NOT NULL OR
+        ${RecipientTable.PNI_COLUMN} NOT NULL OR
+        ${RecipientTable.E164} NOT NULL
+      )
+      """,
+      RecipientTable.RecipientType.INDIVIDUAL.id
+    )
+    .run()
+
+  return BackupContactIterator(cursor, selfId)
+}
+
+fun RecipientTable.getGroupsForBackup(): BackupGroupIterator {
+  val cursor = readableDatabase
+    .select(
+      "${RecipientTable.TABLE_NAME}.${RecipientTable.ID}",
+      "${RecipientTable.TABLE_NAME}.${RecipientTable.BLOCKED}",
+      "${RecipientTable.TABLE_NAME}.${RecipientTable.PROFILE_SHARING}",
+      "${RecipientTable.TABLE_NAME}.${RecipientTable.MUTE_UNTIL}",
+      "${RecipientTable.TABLE_NAME}.${RecipientTable.EXTRAS}",
+      "${GroupTable.TABLE_NAME}.${GroupTable.V2_MASTER_KEY}",
+      "${GroupTable.TABLE_NAME}.${GroupTable.SHOW_AS_STORY_STATE}"
+    )
+    .from(
+      """
+      ${RecipientTable.TABLE_NAME} 
+        INNER JOIN ${GroupTable.TABLE_NAME} ON ${RecipientTable.TABLE_NAME}.${RecipientTable.ID} = ${GroupTable.TABLE_NAME}.${GroupTable.RECIPIENT_ID}
+      """
+    )
+    .run()
+
+  return BackupGroupIterator(cursor)
+}
+
+/**
+ * Takes a [BackupRecipient] and writes it into the database.
+ */
+fun RecipientTable.restoreRecipientFromBackup(recipient: BackupRecipient, backupState: BackupState): RecipientId? {
+  // TODO Need to handle groups
+  // TODO Also, should we move this when statement up to mimic the export? Kinda weird that this calls distributionListTable functions
+  return when {
+    recipient.contact != null -> restoreContactFromBackup(recipient.contact)
+    recipient.distributionList != null -> SignalDatabase.distributionLists.restoreFromBackup(recipient.distributionList, backupState)
+    recipient.self != null -> Recipient.self().id
+    else -> {
+      Log.w(TAG, "Unrecognized recipient type!")
+      null
+    }
+  }
+}
+
+/**
+ * Given [AccountData], this will insert the necessary data for the local user into the [RecipientTable].
+ */
+fun RecipientTable.restoreSelfFromBackup(accountData: AccountData, selfId: RecipientId) {
+  val values = ContentValues().apply {
+    put(RecipientTable.PROFILE_GIVEN_NAME, accountData.givenName.nullIfBlank())
+    put(RecipientTable.PROFILE_FAMILY_NAME, accountData.familyName.nullIfBlank())
+    put(RecipientTable.PROFILE_JOINED_NAME, ProfileName.fromParts(accountData.givenName, accountData.familyName).toString().nullIfBlank())
+    put(RecipientTable.PROFILE_AVATAR, accountData.avatarUrlPath.nullIfBlank())
+    put(RecipientTable.REGISTERED, RecipientTable.RegisteredState.REGISTERED.id)
+    put(RecipientTable.PROFILE_SHARING, true)
+    put(RecipientTable.UNREGISTERED_TIMESTAMP, 0)
+    put(RecipientTable.EXTRAS, RecipientExtras().encode())
+
+    try {
+      put(RecipientTable.PROFILE_KEY, Base64.encodeWithPadding(accountData.profileKey.toByteArray()).nullIfBlank())
+    } catch (e: InvalidInputException) {
+      Log.w(TAG, "Missing profile key during restore")
+    }
+
+    put(RecipientTable.USERNAME, accountData.username)
+  }
+
+  writableDatabase
+    .update(RecipientTable.TABLE_NAME)
+    .values(values)
+    .where("${RecipientTable.ID} = ?", selfId)
+    .run()
+}
+
+fun RecipientTable.clearAllDataForBackupRestore() {
+  writableDatabase.delete(RecipientTable.TABLE_NAME).run()
+  SqlUtil.resetAutoIncrementValue(writableDatabase, RecipientTable.TABLE_NAME)
+
+  RecipientId.clearCache()
+  ApplicationDependencies.getRecipientCache().clear()
+  ApplicationDependencies.getRecipientCache().clearSelf()
+}
+
+private fun RecipientTable.restoreContactFromBackup(contact: Contact): RecipientId {
+  val id = getAndPossiblyMergePnpVerified(
+    aci = ACI.parseOrNull(contact.aci?.toByteArray()),
+    pni = PNI.parseOrNull(contact.pni?.toByteArray()),
+    e164 = contact.formattedE164
+  )
+
+  val profileKey = contact.profileKey?.toByteArray()
+
+  writableDatabase
+    .update(RecipientTable.TABLE_NAME)
+    .values(
+      RecipientTable.BLOCKED to contact.blocked,
+      RecipientTable.HIDDEN to contact.hidden,
+      RecipientTable.PROFILE_FAMILY_NAME to contact.profileFamilyName.nullIfBlank(),
+      RecipientTable.PROFILE_GIVEN_NAME to contact.profileGivenName.nullIfBlank(),
+      RecipientTable.PROFILE_JOINED_NAME to ProfileName.fromParts(contact.profileGivenName.nullIfBlank(), contact.profileFamilyName.nullIfBlank()).toString().nullIfBlank(),
+      RecipientTable.PROFILE_KEY to if (profileKey == null) null else Base64.encodeWithPadding(profileKey),
+      RecipientTable.PROFILE_SHARING to contact.profileSharing.toInt(),
+      RecipientTable.REGISTERED to contact.registered.toLocalRegisteredState().id,
+      RecipientTable.USERNAME to contact.username,
+      RecipientTable.UNREGISTERED_TIMESTAMP to contact.unregisteredTimestamp,
+      RecipientTable.EXTRAS to contact.toLocalExtras().encode()
+    )
+    .where("${RecipientTable.ID} = ?", id)
+    .run()
+
+  return id
+}
+
+private fun Contact.toLocalExtras(): RecipientExtras {
+  return RecipientExtras(
+    hideStory = this.hideStory
+  )
+}
+
+/**
+ * Provides a nice iterable interface over a [RecipientTable] cursor, converting rows to [BackupRecipient]s.
+ * Important: Because this is backed by a cursor, you must close it. It's recommended to use `.use()` or try-with-resources.
+ */
+class BackupContactIterator(private val cursor: Cursor, private val selfId: Long) : Iterator<BackupRecipient?>, Closeable {
+  override fun hasNext(): Boolean {
+    return cursor.count > 0 && !cursor.isLast
+  }
+
+  override fun next(): BackupRecipient? {
+    if (!cursor.moveToNext()) {
+      throw NoSuchElementException()
+    }
+
+    val id = cursor.requireLong(RecipientTable.ID)
+    if (id == selfId) {
+      return BackupRecipient(
+        id = id,
+        self = Self()
+      )
+    }
+
+    val aci = ACI.parseOrNull(cursor.requireString(RecipientTable.ACI_COLUMN))
+    val pni = PNI.parseOrNull(cursor.requireString(RecipientTable.PNI_COLUMN))
+    val e164 = cursor.requireString(RecipientTable.E164)?.e164ToLong()
+    val registeredState = RecipientTable.RegisteredState.fromId(cursor.requireInt(RecipientTable.REGISTERED))
+    val profileKey = cursor.requireString(RecipientTable.PROFILE_KEY)
+    val extras = RecipientTableCursorUtil.getExtras(cursor)
+
+    if (aci == null && pni == null && e164 == null) {
+      return null
+    }
+
+    return BackupRecipient(
+      id = id,
+      contact = Contact(
+        aci = aci?.toByteArray()?.toByteString(),
+        pni = pni?.toByteArray()?.toByteString(),
+        username = cursor.requireString(RecipientTable.USERNAME),
+        e164 = cursor.requireString(RecipientTable.E164)?.e164ToLong(),
+        blocked = cursor.requireBoolean(RecipientTable.BLOCKED),
+        hidden = cursor.requireBoolean(RecipientTable.HIDDEN),
+        registered = registeredState.toContactRegisteredState(),
+        unregisteredTimestamp = cursor.requireLong(RecipientTable.UNREGISTERED_TIMESTAMP),
+        profileKey = if (profileKey != null) Base64.decode(profileKey).toByteString() else null,
+        profileSharing = cursor.requireBoolean(RecipientTable.PROFILE_SHARING),
+        profileGivenName = cursor.requireString(RecipientTable.PROFILE_GIVEN_NAME).nullIfBlank(),
+        profileFamilyName = cursor.requireString(RecipientTable.PROFILE_FAMILY_NAME).nullIfBlank(),
+        hideStory = extras?.hideStory() ?: false
+      )
+    )
+  }
+
+  override fun close() {
+    cursor.close()
+  }
+}
+
+/**
+ * Provides a nice iterable interface over a [RecipientTable] cursor, converting rows to [BackupRecipient]s.
+ * Important: Because this is backed by a cursor, you must close it. It's recommended to use `.use()` or try-with-resources.
+ */
+class BackupGroupIterator(private val cursor: Cursor) : Iterator<BackupRecipient>, Closeable {
+  override fun hasNext(): Boolean {
+    return cursor.count > 0 && !cursor.isLast
+  }
+
+  override fun next(): BackupRecipient {
+    if (!cursor.moveToNext()) {
+      throw NoSuchElementException()
+    }
+
+    val extras = RecipientTableCursorUtil.getExtras(cursor)
+    val showAsStoryState: GroupTable.ShowAsStoryState = GroupTable.ShowAsStoryState.deserialize(cursor.requireInt(GroupTable.SHOW_AS_STORY_STATE))
+
+    return BackupRecipient(
+      id = cursor.requireLong(RecipientTable.ID),
+      group = BackupGroup(
+        masterKey = cursor.requireNonNullBlob(GroupTable.V2_MASTER_KEY).toByteString(),
+        whitelisted = cursor.requireBoolean(RecipientTable.PROFILE_SHARING),
+        hideStory = extras?.hideStory() ?: false,
+        storySendMode = showAsStoryState.toGroupStorySendMode()
+      )
+    )
+  }
+
+  override fun close() {
+    cursor.close()
+  }
+}
+
+private fun String.e164ToLong(): Long? {
+  val fixed = if (this.startsWith("+")) {
+    this.substring(1)
+  } else {
+    this
+  }
+
+  return fixed.toLongOrNull()
+}
+
+private fun RecipientTable.RegisteredState.toContactRegisteredState(): Contact.Registered {
+  return when (this) {
+    RecipientTable.RegisteredState.REGISTERED -> Contact.Registered.REGISTERED
+    RecipientTable.RegisteredState.NOT_REGISTERED -> Contact.Registered.NOT_REGISTERED
+    RecipientTable.RegisteredState.UNKNOWN -> Contact.Registered.UNKNOWN
+  }
+}
+
+private fun Contact.Registered.toLocalRegisteredState(): RecipientTable.RegisteredState {
+  return when (this) {
+    Contact.Registered.REGISTERED -> RecipientTable.RegisteredState.REGISTERED
+    Contact.Registered.NOT_REGISTERED -> RecipientTable.RegisteredState.NOT_REGISTERED
+    Contact.Registered.UNKNOWN -> RecipientTable.RegisteredState.UNKNOWN
+  }
+}
+
+private fun GroupTable.ShowAsStoryState.toGroupStorySendMode(): Group.StorySendMode {
+  return when (this) {
+    GroupTable.ShowAsStoryState.ALWAYS -> Group.StorySendMode.ENABLED
+    GroupTable.ShowAsStoryState.NEVER -> Group.StorySendMode.DISABLED
+    GroupTable.ShowAsStoryState.IF_ACTIVE -> Group.StorySendMode.DEFAULT
+  }
+}
+
+private val Contact.formattedE164: String?
+  get() {
+    return e164?.let {
+      PhoneNumberFormatter.get(ApplicationDependencies.getApplication()).format(e164.toString())
+    }
+  }

app/src/main/java/org/thoughtcrime/securesms/backup/v2/database/ThreadTableBackupExtensions.kt

@@ -0,0 +1,78 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.database
+
+import android.database.Cursor
+import org.signal.core.util.SqlUtil
+import org.signal.core.util.insertInto
+import org.signal.core.util.logging.Log
+import org.signal.core.util.requireBoolean
+import org.signal.core.util.requireInt
+import org.signal.core.util.requireLong
+import org.signal.core.util.select
+import org.signal.core.util.toInt
+import org.thoughtcrime.securesms.backup.v2.proto.Chat
+import org.thoughtcrime.securesms.database.ThreadTable
+import org.thoughtcrime.securesms.recipients.RecipientId
+import java.io.Closeable
+
+private val TAG = Log.tag(ThreadTable::class.java)
+
+fun ThreadTable.getThreadsForBackup(): ChatIterator {
+  val cursor = readableDatabase
+    .select(
+      ThreadTable.ID,
+      ThreadTable.RECIPIENT_ID,
+      ThreadTable.ARCHIVED,
+      ThreadTable.PINNED,
+      ThreadTable.EXPIRES_IN
+    )
+    .from(ThreadTable.TABLE_NAME)
+    .run()
+
+  return ChatIterator(cursor)
+}
+
+fun ThreadTable.clearAllDataForBackupRestore() {
+  writableDatabase.delete(ThreadTable.TABLE_NAME, null, null)
+  SqlUtil.resetAutoIncrementValue(writableDatabase, ThreadTable.TABLE_NAME)
+  clearCache()
+}
+
+fun ThreadTable.restoreFromBackup(chat: Chat, recipientId: RecipientId): Long? {
+  return writableDatabase
+    .insertInto(ThreadTable.TABLE_NAME)
+    .values(
+      ThreadTable.RECIPIENT_ID to recipientId.serialize(),
+      ThreadTable.PINNED to chat.pinnedOrder,
+      ThreadTable.ARCHIVED to chat.archived.toInt()
+    )
+    .run()
+}
+
+class ChatIterator(private val cursor: Cursor) : Iterator<Chat>, Closeable {
+  override fun hasNext(): Boolean {
+    return cursor.count > 0 && !cursor.isLast
+  }
+
+  override fun next(): Chat {
+    if (!cursor.moveToNext()) {
+      throw NoSuchElementException()
+    }
+
+    return Chat(
+      id = cursor.requireLong(ThreadTable.ID),
+      recipientId = cursor.requireLong(ThreadTable.RECIPIENT_ID),
+      archived = cursor.requireBoolean(ThreadTable.ARCHIVED),
+      pinnedOrder = cursor.requireInt(ThreadTable.PINNED),
+      expirationTimerMs = cursor.requireLong(ThreadTable.EXPIRES_IN)
+    )
+  }
+
+  override fun close() {
+    cursor.close()
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AccountDataProcessor.kt

@@ -0,0 +1,160 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.processor
+
+import okio.ByteString.Companion.EMPTY
+import okio.ByteString.Companion.toByteString
+import org.thoughtcrime.securesms.backup.v2.database.restoreSelfFromBackup
+import org.thoughtcrime.securesms.backup.v2.proto.AccountData
+import org.thoughtcrime.securesms.backup.v2.proto.Frame
+import org.thoughtcrime.securesms.backup.v2.stream.BackupFrameEmitter
+import org.thoughtcrime.securesms.components.settings.app.usernamelinks.UsernameQrCodeColorScheme
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.SignalDatabase.Companion.recipients
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob
+import org.thoughtcrime.securesms.keyvalue.PhoneNumberPrivacyValues
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.subscription.Subscriber
+import org.thoughtcrime.securesms.util.ProfileUtil
+import org.thoughtcrime.securesms.util.TextSecurePreferences
+import org.whispersystems.signalservice.api.push.UsernameLinkComponents
+import org.whispersystems.signalservice.api.storage.StorageRecordProtoUtil.defaultAccountRecord
+import org.whispersystems.signalservice.api.subscriptions.SubscriberId
+import org.whispersystems.signalservice.api.util.UuidUtil
+
+object AccountDataProcessor {
+
+  fun export(emitter: BackupFrameEmitter) {
+    val context = ApplicationDependencies.getApplication()
+
+    val self = Recipient.self().fresh()
+    val record = recipients.getRecordForSync(self.id)
+
+    val subscriber: Subscriber? = SignalStore.donationsValues().getSubscriber()
+
+    emitter.emit(
+      Frame(
+        account = AccountData(
+          profileKey = self.profileKey?.toByteString() ?: EMPTY,
+          givenName = self.profileName.givenName,
+          familyName = self.profileName.familyName,
+          avatarUrlPath = self.profileAvatar ?: "",
+          subscriptionManuallyCancelled = SignalStore.donationsValues().isUserManuallyCancelled(),
+          username = SignalStore.account().username,
+          subscriberId = subscriber?.subscriberId?.bytes?.toByteString() ?: defaultAccountRecord.subscriberId,
+          subscriberCurrencyCode = subscriber?.currencyCode ?: defaultAccountRecord.subscriberCurrencyCode,
+          accountSettings = AccountData.AccountSettings(
+            storyViewReceiptsEnabled = SignalStore.storyValues().viewedReceiptsEnabled,
+            noteToSelfMarkedUnread = record != null && record.syncExtras.isForcedUnread,
+            typingIndicators = TextSecurePreferences.isTypingIndicatorsEnabled(context),
+            readReceipts = TextSecurePreferences.isReadReceiptsEnabled(context),
+            sealedSenderIndicators = TextSecurePreferences.isShowUnidentifiedDeliveryIndicatorsEnabled(context),
+            linkPreviews = SignalStore.settings().isLinkPreviewsEnabled,
+            notDiscoverableByPhoneNumber = SignalStore.phoneNumberPrivacy().phoneNumberListingMode.isUnlisted,
+            phoneNumberSharingMode = SignalStore.phoneNumberPrivacy().phoneNumberSharingMode.toBackupPhoneNumberSharingMode(),
+            preferContactAvatars = SignalStore.settings().isPreferSystemContactPhotos,
+            universalExpireTimer = SignalStore.settings().universalExpireTimer,
+            preferredReactionEmoji = SignalStore.emojiValues().reactions,
+            storiesDisabled = SignalStore.storyValues().isFeatureDisabled,
+            hasViewedOnboardingStory = SignalStore.storyValues().userHasViewedOnboardingStory,
+            hasSetMyStoriesPrivacy = SignalStore.storyValues().userHasBeenNotifiedAboutStories,
+            keepMutedChatsArchived = SignalStore.settings().shouldKeepMutedChatsArchived(),
+            displayBadgesOnProfile = SignalStore.donationsValues().getDisplayBadgesOnProfile(),
+            hasSeenGroupStoryEducationSheet = SignalStore.storyValues().userHasSeenGroupStoryEducationSheet
+          )
+        )
+      )
+    )
+  }
+
+  fun import(accountData: AccountData, selfId: RecipientId) {
+    recipients.restoreSelfFromBackup(accountData, selfId)
+
+    SignalStore.account().setRegistered(true)
+
+    val context = ApplicationDependencies.getApplication()
+    val settings = accountData.accountSettings
+
+    if (settings != null) {
+      TextSecurePreferences.setReadReceiptsEnabled(context, settings.readReceipts)
+      TextSecurePreferences.setTypingIndicatorsEnabled(context, settings.typingIndicators)
+      TextSecurePreferences.setShowUnidentifiedDeliveryIndicatorsEnabled(context, settings.sealedSenderIndicators)
+      SignalStore.settings().isLinkPreviewsEnabled = settings.linkPreviews
+      SignalStore.phoneNumberPrivacy().phoneNumberListingMode = if (settings.notDiscoverableByPhoneNumber) PhoneNumberPrivacyValues.PhoneNumberListingMode.UNLISTED else PhoneNumberPrivacyValues.PhoneNumberListingMode.LISTED
+      SignalStore.phoneNumberPrivacy().phoneNumberSharingMode = settings.phoneNumberSharingMode.toLocalPhoneNumberMode()
+      SignalStore.settings().isPreferSystemContactPhotos = settings.preferContactAvatars
+      SignalStore.settings().universalExpireTimer = settings.universalExpireTimer
+      SignalStore.emojiValues().reactions = settings.preferredReactionEmoji
+      SignalStore.donationsValues().setDisplayBadgesOnProfile(settings.displayBadgesOnProfile)
+      SignalStore.settings().setKeepMutedChatsArchived(settings.keepMutedChatsArchived)
+      SignalStore.storyValues().userHasBeenNotifiedAboutStories = settings.hasSetMyStoriesPrivacy
+      SignalStore.storyValues().userHasViewedOnboardingStory = settings.hasViewedOnboardingStory
+      SignalStore.storyValues().isFeatureDisabled = settings.storiesDisabled
+      SignalStore.storyValues().userHasSeenGroupStoryEducationSheet = settings.hasSeenGroupStoryEducationSheet
+      SignalStore.storyValues().viewedReceiptsEnabled = settings.storyViewReceiptsEnabled ?: settings.readReceipts
+
+      if (accountData.subscriptionManuallyCancelled) {
+        SignalStore.donationsValues().updateLocalStateForManualCancellation()
+      } else {
+        SignalStore.donationsValues().clearUserManuallyCancelled()
+      }
+
+      if (accountData.subscriberId.size > 0) {
+        val subscriber = Subscriber(SubscriberId.fromBytes(accountData.subscriberId.toByteArray()), accountData.subscriberCurrencyCode)
+        SignalStore.donationsValues().setSubscriber(subscriber)
+      }
+
+      if (accountData.avatarUrlPath.isNotEmpty()) {
+        ApplicationDependencies.getJobManager().add(RetrieveProfileAvatarJob(Recipient.self().fresh(), accountData.avatarUrlPath))
+      }
+
+      if (accountData.usernameLink != null) {
+        SignalStore.account().usernameLink = UsernameLinkComponents(
+          accountData.usernameLink.entropy.toByteArray(),
+          UuidUtil.parseOrThrow(accountData.usernameLink.serverId.toByteArray())
+        )
+        SignalStore.misc().usernameQrCodeColorScheme = accountData.usernameLink.color.toLocalUsernameColor()
+      }
+    }
+
+    SignalDatabase.runPostSuccessfulTransaction { ProfileUtil.handleSelfProfileKeyChange() }
+
+    Recipient.self().live().refresh()
+  }
+
+  private fun PhoneNumberPrivacyValues.PhoneNumberSharingMode.toBackupPhoneNumberSharingMode(): AccountData.PhoneNumberSharingMode {
+    return when (this) {
+      PhoneNumberPrivacyValues.PhoneNumberSharingMode.DEFAULT -> AccountData.PhoneNumberSharingMode.EVERYBODY
+      PhoneNumberPrivacyValues.PhoneNumberSharingMode.EVERYBODY -> AccountData.PhoneNumberSharingMode.EVERYBODY
+      PhoneNumberPrivacyValues.PhoneNumberSharingMode.NOBODY -> AccountData.PhoneNumberSharingMode.NOBODY
+    }
+  }
+
+  private fun AccountData.PhoneNumberSharingMode.toLocalPhoneNumberMode(): PhoneNumberPrivacyValues.PhoneNumberSharingMode {
+    return when (this) {
+      AccountData.PhoneNumberSharingMode.UNKNOWN -> PhoneNumberPrivacyValues.PhoneNumberSharingMode.EVERYBODY
+      AccountData.PhoneNumberSharingMode.EVERYBODY -> PhoneNumberPrivacyValues.PhoneNumberSharingMode.EVERYBODY
+      AccountData.PhoneNumberSharingMode.NOBODY -> PhoneNumberPrivacyValues.PhoneNumberSharingMode.NOBODY
+    }
+  }
+
+  private fun AccountData.UsernameLink.Color?.toLocalUsernameColor(): UsernameQrCodeColorScheme {
+    return when (this) {
+      AccountData.UsernameLink.Color.BLUE -> UsernameQrCodeColorScheme.Blue
+      AccountData.UsernameLink.Color.WHITE -> UsernameQrCodeColorScheme.White
+      AccountData.UsernameLink.Color.GREY -> UsernameQrCodeColorScheme.Grey
+      AccountData.UsernameLink.Color.OLIVE -> UsernameQrCodeColorScheme.Tan
+      AccountData.UsernameLink.Color.GREEN -> UsernameQrCodeColorScheme.Green
+      AccountData.UsernameLink.Color.ORANGE -> UsernameQrCodeColorScheme.Orange
+      AccountData.UsernameLink.Color.PINK -> UsernameQrCodeColorScheme.Pink
+      AccountData.UsernameLink.Color.PURPLE -> UsernameQrCodeColorScheme.Purple
+      else -> UsernameQrCodeColorScheme.Blue
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/CallLogBackupProcessor.kt

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.processor
+
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.backup.v2.BackupState
+import org.thoughtcrime.securesms.backup.v2.database.getCallsForBackup
+import org.thoughtcrime.securesms.backup.v2.database.restoreCallLogFromBackup
+import org.thoughtcrime.securesms.backup.v2.proto.Frame
+import org.thoughtcrime.securesms.backup.v2.stream.BackupFrameEmitter
+import org.thoughtcrime.securesms.database.SignalDatabase
+
+typealias BackupCall = org.thoughtcrime.securesms.backup.v2.proto.Call
+
+object CallLogBackupProcessor {
+
+  val TAG = Log.tag(CallLogBackupProcessor::class.java)
+
+  fun export(emitter: BackupFrameEmitter) {
+    SignalDatabase.calls.getCallsForBackup().use { reader ->
+      for (callLog in reader) {
+        if (callLog != null) {
+          emitter.emit(Frame(call = callLog))
+        }
+      }
+    }
+  }
+
+  fun import(call: BackupCall, backupState: BackupState) {
+    SignalDatabase.calls.restoreCallLogFromBackup(call, backupState)
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/ChatBackupProcessor.kt

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.processor
+
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.backup.v2.BackupState
+import org.thoughtcrime.securesms.backup.v2.database.getThreadsForBackup
+import org.thoughtcrime.securesms.backup.v2.database.restoreFromBackup
+import org.thoughtcrime.securesms.backup.v2.proto.Chat
+import org.thoughtcrime.securesms.backup.v2.proto.Frame
+import org.thoughtcrime.securesms.backup.v2.stream.BackupFrameEmitter
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.recipients.RecipientId
+
+object ChatBackupProcessor {
+  val TAG = Log.tag(ChatBackupProcessor::class.java)
+
+  fun export(emitter: BackupFrameEmitter) {
+    SignalDatabase.threads.getThreadsForBackup().use { reader ->
+      for (chat in reader) {
+        emitter.emit(Frame(chat = chat))
+      }
+    }
+  }
+
+  fun import(chat: Chat, backupState: BackupState) {
+    val recipientId: RecipientId? = backupState.backupToLocalRecipientId[chat.recipientId]
+    if (recipientId == null) {
+      Log.w(TAG, "Missing recipient for chat ${chat.id}")
+      return
+    }
+
+    SignalDatabase.threads.restoreFromBackup(chat, recipientId)?.let { threadId ->
+      backupState.chatIdToLocalRecipientId[chat.id] = recipientId
+      backupState.chatIdToLocalThreadId[chat.id] = threadId
+      backupState.chatIdToBackupRecipientId[chat.id] = chat.recipientId
+    }
+
+    // TODO there's several fields in the chat that actually need to be restored on the recipient table
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/ChatItemBackupProcessor.kt

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.processor
+
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.backup.v2.BackupState
+import org.thoughtcrime.securesms.backup.v2.database.ChatItemImportInserter
+import org.thoughtcrime.securesms.backup.v2.database.createChatItemInserter
+import org.thoughtcrime.securesms.backup.v2.database.getMessagesForBackup
+import org.thoughtcrime.securesms.backup.v2.proto.Frame
+import org.thoughtcrime.securesms.backup.v2.stream.BackupFrameEmitter
+import org.thoughtcrime.securesms.database.SignalDatabase
+
+object ChatItemBackupProcessor {
+  val TAG = Log.tag(ChatItemBackupProcessor::class.java)
+
+  fun export(emitter: BackupFrameEmitter) {
+    SignalDatabase.messages.getMessagesForBackup().use { chatItems ->
+      for (chatItem in chatItems) {
+        emitter.emit(Frame(chatItem = chatItem))
+      }
+    }
+  }
+
+  fun beginImport(backupState: BackupState): ChatItemImportInserter {
+    return SignalDatabase.messages.createChatItemInserter(backupState)
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/RecipientBackupProcessor.kt

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.processor
+
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.backup.v2.BackupState
+import org.thoughtcrime.securesms.backup.v2.database.getAllForBackup
+import org.thoughtcrime.securesms.backup.v2.database.getContactsForBackup
+import org.thoughtcrime.securesms.backup.v2.database.getGroupsForBackup
+import org.thoughtcrime.securesms.backup.v2.database.restoreRecipientFromBackup
+import org.thoughtcrime.securesms.backup.v2.proto.Frame
+import org.thoughtcrime.securesms.backup.v2.stream.BackupFrameEmitter
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.recipients.Recipient
+
+typealias BackupRecipient = org.thoughtcrime.securesms.backup.v2.proto.Recipient
+
+object RecipientBackupProcessor {
+
+  val TAG = Log.tag(RecipientBackupProcessor::class.java)
+
+  fun export(emitter: BackupFrameEmitter) {
+    val selfId = Recipient.self().id.toLong()
+
+    SignalDatabase.recipients.getContactsForBackup(selfId).use { reader ->
+      for (backupRecipient in reader) {
+        if (backupRecipient != null) {
+          emitter.emit(Frame(recipient = backupRecipient))
+        }
+      }
+    }
+
+    SignalDatabase.recipients.getGroupsForBackup().use { reader ->
+      for (backupRecipient in reader) {
+        emitter.emit(Frame(recipient = backupRecipient))
+      }
+    }
+
+    SignalDatabase.distributionLists.getAllForBackup().forEach {
+      emitter.emit(Frame(recipient = it))
+    }
+  }
+
+  fun import(recipient: BackupRecipient, backupState: BackupState) {
+    val newId = SignalDatabase.recipients.restoreRecipientFromBackup(recipient, backupState)
+    if (newId != null) {
+      backupState.backupToLocalRecipientId[recipient.id] = newId
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/BackupEncryptedOutputStream.kt

@@ -0,0 +1,75 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.stream
+
+import org.signal.libsignal.protocol.kdf.HKDF
+import java.io.FilterOutputStream
+import java.io.OutputStream
+import javax.crypto.Cipher
+import javax.crypto.Mac
+import javax.crypto.spec.IvParameterSpec
+import javax.crypto.spec.SecretKeySpec
+
+class BackupEncryptedOutputStream(key: ByteArray, backupId: ByteArray, wrapped: OutputStream) : FilterOutputStream(wrapped) {
+
+  val cipher: Cipher = Cipher.getInstance("AES/CBC/PKCS5Padding")
+  val mac: Mac = Mac.getInstance("HmacSHA256")
+
+  var finalMac: ByteArray? = null
+
+  init {
+    if (key.size != 32) {
+      throw IllegalArgumentException("Key must be 32 bytes!")
+    }
+
+    if (backupId.size != 16) {
+      throw IllegalArgumentException("BackupId must be 32 bytes!")
+    }
+
+    val extendedKey = HKDF.deriveSecrets(key, backupId, "20231003_Signal_Backups_EncryptMessageBackup".toByteArray(), 80)
+    val macKey = extendedKey.copyOfRange(0, 32)
+    val cipherKey = extendedKey.copyOfRange(32, 64)
+    val iv = extendedKey.copyOfRange(64, 80)
+
+    cipher.init(Cipher.ENCRYPT_MODE, SecretKeySpec(cipherKey, "AES"), IvParameterSpec(iv))
+    mac.init(SecretKeySpec(macKey, "HmacSHA256"))
+  }
+
+  override fun write(b: Int) {
+    throw UnsupportedOperationException()
+  }
+
+  override fun write(data: ByteArray) {
+    write(data, 0, data.size)
+  }
+
+  override fun write(data: ByteArray, off: Int, len: Int) {
+    cipher.update(data, off, len)?.let { ciphertext ->
+      mac.update(ciphertext)
+      super.write(ciphertext)
+    }
+  }
+
+  override fun flush() {
+    cipher.doFinal()?.let { ciphertext ->
+      mac.update(ciphertext)
+      super.write(ciphertext)
+    }
+
+    finalMac = mac.doFinal()
+
+    super.flush()
+  }
+
+  override fun close() {
+    flush()
+    super.close()
+  }
+
+  fun getMac(): ByteArray {
+    return finalMac ?: throw IllegalStateException("Mac not yet available! You must call flush() before asking for the mac.")
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/BackupExportWriter.kt

@@ -0,0 +1,12 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.stream
+
+import org.thoughtcrime.securesms.backup.v2.proto.Frame
+
+interface BackupExportWriter : AutoCloseable {
+  fun write(frame: Frame)
+}

app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/BackupFrameEmitter.kt

@@ -0,0 +1,15 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.stream
+
+import org.thoughtcrime.securesms.backup.v2.proto.Frame
+
+/**
+ * An interface that lets sub-processors emit [Frame]s as they export data.
+ */
+fun interface BackupFrameEmitter {
+  fun emit(frame: Frame)
+}

app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/BackupImportStream.kt

@@ -0,0 +1,12 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.stream
+
+import org.thoughtcrime.securesms.backup.v2.proto.Frame
+
+interface BackupImportStream {
+  fun read(): Frame?
+}

app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/EncryptedBackupReader.kt

@@ -0,0 +1,112 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.stream
+
+import org.signal.core.util.readFully
+import org.signal.core.util.readNBytesOrThrow
+import org.signal.core.util.readVarInt32
+import org.signal.core.util.stream.MacInputStream
+import org.signal.core.util.stream.TruncatingInputStream
+import org.thoughtcrime.securesms.backup.v2.proto.Frame
+import org.whispersystems.signalservice.api.backup.BackupKey
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import java.io.EOFException
+import java.io.IOException
+import java.io.InputStream
+import java.util.zip.GZIPInputStream
+import javax.crypto.Cipher
+import javax.crypto.CipherInputStream
+import javax.crypto.Mac
+import javax.crypto.spec.IvParameterSpec
+import javax.crypto.spec.SecretKeySpec
+
+/**
+ * Provides the ability to read backup frames in a streaming fashion from a target [InputStream].
+ * As it's being read, it will be both decrypted and uncompressed. Specifically, the data is decrypted,
+ * that decrypted data is gunzipped, then that data is read as frames.
+ */
+class EncryptedBackupReader(
+  key: BackupKey,
+  aci: ACI,
+  streamLength: Long,
+  dataStream: () -> InputStream
+) : Iterator<Frame>, AutoCloseable {
+
+  var next: Frame? = null
+  val stream: InputStream
+
+  init {
+    val keyMaterial = key.deriveSecrets(aci)
+
+    val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding").apply {
+      init(Cipher.DECRYPT_MODE, SecretKeySpec(keyMaterial.cipherKey, "AES"), IvParameterSpec(keyMaterial.iv))
+    }
+
+    validateMac(keyMaterial.macKey, streamLength, dataStream())
+
+    stream = GZIPInputStream(
+      CipherInputStream(
+        TruncatingInputStream(
+          wrapped = dataStream(),
+          maxBytes = streamLength - MAC_SIZE
+        ),
+        cipher
+      )
+    )
+
+    next = read()
+  }
+
+  override fun hasNext(): Boolean {
+    return next != null
+  }
+
+  override fun next(): Frame {
+    next?.let { out ->
+      next = read()
+      return out
+    } ?: throw NoSuchElementException()
+  }
+
+  private fun read(): Frame? {
+    try {
+      val length = stream.readVarInt32().also { if (it < 0) return null }
+      val frameBytes: ByteArray = stream.readNBytesOrThrow(length)
+
+      return Frame.ADAPTER.decode(frameBytes)
+    } catch (e: EOFException) {
+      return null
+    }
+  }
+
+  override fun close() {
+    stream.close()
+  }
+
+  companion object {
+    const val MAC_SIZE = 32
+
+    fun validateMac(macKey: ByteArray, streamLength: Long, dataStream: InputStream) {
+      val mac = Mac.getInstance("HmacSHA256").apply {
+        init(SecretKeySpec(macKey, "HmacSHA256"))
+      }
+
+      val macStream = MacInputStream(
+        wrapped = TruncatingInputStream(dataStream, maxBytes = streamLength - MAC_SIZE),
+        mac = mac
+      )
+
+      macStream.readFully(false)
+
+      val calculatedMac = macStream.mac.doFinal()
+      val expectedMac = dataStream.readNBytesOrThrow(MAC_SIZE)
+
+      if (!calculatedMac.contentEquals(expectedMac)) {
+        throw IOException("Invalid MAC!")
+      }
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/EncryptedBackupWriter.kt

@@ -0,0 +1,76 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.stream
+
+import org.signal.core.util.stream.MacOutputStream
+import org.signal.core.util.writeVarInt32
+import org.thoughtcrime.securesms.backup.v2.proto.Frame
+import org.whispersystems.signalservice.api.backup.BackupKey
+import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import java.io.IOException
+import java.io.OutputStream
+import java.util.zip.GZIPOutputStream
+import javax.crypto.Cipher
+import javax.crypto.CipherOutputStream
+import javax.crypto.Mac
+import javax.crypto.spec.IvParameterSpec
+import javax.crypto.spec.SecretKeySpec
+
+/**
+ * Provides the ability to write backup frames in a streaming fashion to a target [OutputStream].
+ * As it's being written, it will be both encrypted and compressed. Specifically, the backup frames
+ * are gzipped, that gzipped data is encrypted, and then an HMAC of the encrypted data is appended
+ * to the end of the [outputStream].
+ */
+class EncryptedBackupWriter(
+  key: BackupKey,
+  aci: ACI,
+  private val outputStream: OutputStream,
+  private val append: (ByteArray) -> Unit
+) : BackupExportWriter {
+
+  private val mainStream: GZIPOutputStream
+  private val macStream: MacOutputStream
+
+  init {
+    val keyMaterial = key.deriveSecrets(aci)
+
+    val cipher = Cipher.getInstance("AES/CBC/PKCS5Padding").apply {
+      init(Cipher.ENCRYPT_MODE, SecretKeySpec(keyMaterial.cipherKey, "AES"), IvParameterSpec(keyMaterial.iv))
+    }
+
+    val mac = Mac.getInstance("HmacSHA256").apply {
+      init(SecretKeySpec(keyMaterial.macKey, "HmacSHA256"))
+    }
+
+    macStream = MacOutputStream(outputStream, mac)
+
+    mainStream = GZIPOutputStream(
+      CipherOutputStream(
+        macStream,
+        cipher
+      )
+    )
+  }
+
+  @Throws(IOException::class)
+  override fun write(frame: Frame) {
+    val frameBytes: ByteArray = frame.encode()
+
+    mainStream.writeVarInt32(frameBytes.size)
+    mainStream.write(frameBytes)
+  }
+
+  @Throws(IOException::class)
+  override fun close() {
+    // We need to close the main stream in order for the gzip and all the cipher operations to fully finish before
+    // we can calculate the MAC. Unfortunately flush()/finish() is not sufficient. So we have to defer to the
+    // caller to append the bytes to the end of the data however they see fit (like appending to a file).
+    mainStream.close()
+    val mac = macStream.mac.doFinal()
+    append(mac)
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/PlainTextBackupReader.kt

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.stream
+
+import org.signal.core.util.readNBytesOrThrow
+import org.signal.core.util.readVarInt32
+import org.thoughtcrime.securesms.backup.v2.proto.Frame
+import java.io.EOFException
+import java.io.InputStream
+
+/**
+ * Reads a plaintext backup import stream one frame at a time.
+ */
+class PlainTextBackupReader(val inputStream: InputStream) : Iterator<Frame> {
+
+  var next: Frame? = null
+
+  init {
+    next = read()
+  }
+
+  override fun hasNext(): Boolean {
+    return next != null
+  }
+
+  override fun next(): Frame {
+    next?.let { out ->
+      next = read()
+      return out
+    } ?: throw NoSuchElementException()
+  }
+
+  private fun read(): Frame? {
+    try {
+      val length = inputStream.readVarInt32().also { if (it < 0) return null }
+      val frameBytes: ByteArray = inputStream.readNBytesOrThrow(length)
+
+      return Frame.ADAPTER.decode(frameBytes)
+    } catch (e: EOFException) {
+      return null
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/backup/v2/stream/PlainTextBackupWriter.kt

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.backup.v2.stream
+
+import org.signal.core.util.writeVarInt32
+import org.thoughtcrime.securesms.backup.v2.proto.Frame
+import java.io.IOException
+import java.io.OutputStream
+
+/**
+ * Writes backup frames to the wrapped stream in plain text. Only for testing!
+ */
+class PlainTextBackupWriter(private val outputStream: OutputStream) : BackupExportWriter {
+
+  @Throws(IOException::class)
+  override fun write(frame: Frame) {
+    val frameBytes: ByteArray = frame.encode()
+
+    outputStream.writeVarInt32(frameBytes.size)
+    outputStream.write(frameBytes)
+  }
+
+  override fun close() {
+    outputStream.close()
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt

@@ -8,6 +8,7 @@ import com.bumptech.glide.load.resource.bitmap.DownsampleStrategy
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.badges.glide.BadgeSpriteTransformation
 import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.components.settings.app.subscription.BadgeImageSize
 import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
 import org.thoughtcrime.securesms.glide.GiftBadgeModel
 import org.thoughtcrime.securesms.mms.GlideApp
@@ -31,6 +32,10 @@ class BadgeImageView @JvmOverloads constructor(
     isClickable = false
   }
 
+  constructor(context: Context, badgeImageSize: BadgeImageSize) : this(context) {
+    badgeSize = badgeImageSize.sizeCode
+  }
+
   override fun setOnClickListener(l: OnClickListener?) {
     val wasClickable = isClickable
     super.setOnClickListener(l)

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

@@ -1,13 +1,13 @@
 package org.thoughtcrime.securesms.badges.gifts
 
 import android.content.Context
+import org.signal.core.util.Base64
 import org.signal.libsignal.zkgroup.InvalidInputException
 import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialPresentation
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
 import org.thoughtcrime.securesms.mms.OutgoingMessage
 import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.util.Base64
 import java.lang.Integer.min
 import java.util.concurrent.TimeUnit
 
@@ -32,7 +32,7 @@ object Gifts {
   ): OutgoingMessage {
     return OutgoingMessage(
       threadRecipient = recipient,
-      body = Base64.encodeBytes(giftBadge.encode()),
+      body = Base64.encodeWithPadding(giftBadge.encode()),
       isSecure = true,
       sentTimeMillis = sentTimestamp,
       expiresIn = expiresIn,

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

@@ -14,6 +14,7 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.subjects.PublishSubject
 import org.signal.core.util.concurrent.LifecycleDisposable
 import org.signal.core.util.logging.Log
+import org.signal.core.util.money.FiatMoney
 import org.thoughtcrime.securesms.MainActivity
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.InputAwareLayout
@@ -26,6 +27,7 @@ import org.thoughtcrime.securesms.components.settings.app.subscription.donate.Do
 import org.thoughtcrime.securesms.components.settings.app.subscription.donate.DonationCheckoutDelegate
 import org.thoughtcrime.securesms.components.settings.app.subscription.donate.DonationProcessorAction
 import org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway.GatewayRequest
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway.GatewayResponse
 import org.thoughtcrime.securesms.components.settings.app.subscription.errors.DonationErrorSource
 import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.components.settings.conversation.preferences.RecipientPreference
@@ -263,8 +265,12 @@ class GiftFlowConfirmationFragment :
     findNavController().safeNavigate(GiftFlowConfirmationFragmentDirections.actionGiftFlowConfirmationFragmentToCreditCardFragment(gatewayRequest))
   }
 
-  override fun navigateToBankTransferMandate(gatewayRequest: GatewayRequest) {
-    findNavController().safeNavigate(GiftFlowConfirmationFragmentDirections.actionGiftFlowConfirmationFragmentToBankTransferMandateFragment(gatewayRequest))
+  override fun navigateToIdealDetailsFragment(gatewayRequest: GatewayRequest) {
+    error("Unsupported operation")
+  }
+
+  override fun navigateToBankTransferMandate(gatewayResponse: GatewayResponse) {
+    error("Unsupported operation")
   }
 
   override fun onPaymentComplete(gatewayRequest: GatewayRequest) {
@@ -280,7 +286,10 @@ class GiftFlowConfirmationFragment :
   }
 
   override fun onProcessorActionProcessed() = Unit
-  override fun onUserCancelledPaymentFlow() {
-    findNavController().popBackStack(R.id.giftFlowConfirmationFragment, false)
-  }
+
+  override fun showSepaEuroMaximumDialog(sepaEuroMaximum: FiatMoney) = error("Unsupported operation")
+
+  override fun onUserLaunchedAnExternalApplication() = Unit
+
+  override fun navigateToDonationPending(gatewayRequest: GatewayRequest) = error("Unsupported operation")
 }

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

@@ -34,7 +34,7 @@ object GiftRowItem {
     override fun bind(model: Model) {
       binding.check.visible = false
       binding.badge.setBadge(model.giftBadge)
-      binding.tagline.visible = false
+      binding.tagline.visible = true
 
       val price = FiatMoneyUtil.format(
         context.resources,
@@ -46,7 +46,8 @@ object GiftRowItem {
 
       val duration = TimeUnit.MILLISECONDS.toDays(model.giftBadge.duration)
 
-      binding.title.text = context.resources.getQuantityString(R.plurals.GiftRowItem_s_dot_d_day_duration, duration.toInt(), price, duration)
+      binding.title.text = model.giftBadge.name
+      binding.tagline.text = context.resources.getQuantityString(R.plurals.GiftRowItem_s_dot_d_day_duration, duration.toInt(), price, duration)
     }
   }
 }

app/src/main/java/org/thoughtcrime/securesms/badges/models/Badge.kt

@@ -6,6 +6,7 @@ import android.os.Parcelable
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.compose.runtime.Stable
 import com.bumptech.glide.load.Key
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.load.resource.bitmap.DownsampleStrategy
@@ -25,6 +26,7 @@ typealias OnBadgeClicked = (Badge, Boolean, Boolean) -> Unit
 /**
  * A Badge that can be collected and displayed by a user.
  */
+@Stable
 @Parcelize
 data class Badge(
   val id: String,

app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/CantProcessSubscriptionPaymentBottomSheetDialogFragment.kt

@@ -1,52 +0,0 @@
-package org.thoughtcrime.securesms.badges.self.expired
-
-import androidx.core.content.ContextCompat
-import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.components.settings.DSLConfiguration
-import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter
-import org.thoughtcrime.securesms.components.settings.DSLSettingsBottomSheetFragment
-import org.thoughtcrime.securesms.components.settings.DSLSettingsText
-import org.thoughtcrime.securesms.components.settings.configure
-import org.thoughtcrime.securesms.components.settings.models.SplashImage
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.util.CommunicationActions
-
-class CantProcessSubscriptionPaymentBottomSheetDialogFragment : DSLSettingsBottomSheetFragment() {
-  override fun bindAdapter(adapter: DSLSettingsAdapter) {
-    SplashImage.register(adapter)
-    adapter.submitList(getConfiguration().toMappingModelList())
-  }
-
-  private fun getConfiguration(): DSLConfiguration {
-    return configure {
-      customPref(SplashImage.Model(R.drawable.ic_card_process))
-
-      sectionHeaderPref(
-        title = DSLSettingsText.from(R.string.CantProcessSubscriptionPaymentBottomSheetDialogFragment__cant_process_subscription_payment, DSLSettingsText.CenterModifier)
-      )
-
-      textPref(
-        summary = DSLSettingsText.from(
-          requireContext().getString(R.string.CantProcessSubscriptionPaymentBottomSheetDialogFragment__were_having_trouble),
-          DSLSettingsText.LearnMoreModifier(ContextCompat.getColor(requireContext(), R.color.signal_accent_primary)) {
-            CommunicationActions.openBrowserLink(requireContext(), requireContext().getString(R.string.donation_decline_code_error_url))
-          },
-          DSLSettingsText.CenterModifier
-        )
-      )
-
-      primaryButton(
-        text = DSLSettingsText.from(android.R.string.ok)
-      ) {
-        dismissAllowingStateLoss()
-      }
-
-      secondaryButtonNoOutline(
-        text = DSLSettingsText.from(R.string.CantProcessSubscriptionPaymentBottomSheetDialogFragment__dont_show_this_again)
-      ) {
-        SignalStore.donationsValues().showCantProcessDialog = false
-        dismissAllowingStateLoss()
-      }
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/ExpiredOneTimeBadgeBottomSheetDialogFragment.kt

@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.badges.self.expired
 import androidx.fragment.app.FragmentManager
 import org.signal.core.util.DimensionUnit
 import org.signal.core.util.logging.Log
-import org.signal.donations.StripeDeclineCode
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.badges.models.Badge
 import org.thoughtcrime.securesms.badges.models.ExpiredBadge
@@ -13,18 +12,15 @@ import org.thoughtcrime.securesms.components.settings.DSLSettingsBottomSheetFrag
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
 import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
 import org.thoughtcrime.securesms.components.settings.app.subscription.errors.UnexpectedSubscriptionCancellation
-import org.thoughtcrime.securesms.components.settings.app.subscription.errors.mapToErrorStringResource
-import org.thoughtcrime.securesms.components.settings.app.subscription.errors.shouldRouteToGooglePay
 import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.BottomSheetUtil
-import org.thoughtcrime.securesms.util.CommunicationActions
 import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
 
 /**
  * Bottom sheet displaying a fading badge with a notice and action for becoming a subscriber again.
  */
-class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
+class ExpiredOneTimeBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
   peekHeightPercentage = 1f
 ) {
   override fun bindAdapter(adapter: DSLSettingsAdapter) {
@@ -34,12 +30,9 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
   }
 
   private fun getConfiguration(): DSLConfiguration {
-    val args = ExpiredBadgeBottomSheetDialogFragmentArgs.fromBundle(requireArguments())
+    val args = ExpiredOneTimeBadgeBottomSheetDialogFragmentArgs.fromBundle(requireArguments())
     val badge: Badge = args.badge
-    val cancellationReason = UnexpectedSubscriptionCancellation.fromStatus(args.cancelationReason)
-    val declineCode: StripeDeclineCode? = args.chargeFailure?.let { StripeDeclineCode.getFromCode(it) }
     val isLikelyASustainer = SignalStore.donationsValues().isLikelyASustainer()
-    val inactive = cancellationReason == UnexpectedSubscriptionCancellation.INACTIVE
 
     Log.d(TAG, "Displaying Expired Badge Fragment with bundle: ${requireArguments()}", true)
 
@@ -61,63 +54,32 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
 
       noPadTextPref(
         DSLSettingsText.from(
-          if (badge.isBoost()) {
-            getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_boost_badge_has_expired_and)
-          } else if (declineCode != null) {
-            getString(
-              R.string.ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_canceled_s,
-              getString(declineCode.mapToErrorStringResource()),
-              badge.name
-            )
-          } else if (inactive) {
-            getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_automatically, badge.name)
-          } else {
-            getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_recurring_monthly_donation_was_canceled)
-          },
+          getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_boost_badge_has_expired_and),
           DSLSettingsText.CenterModifier
         )
       )
 
       space(DimensionUnit.DP.toPixels(16f).toInt())
 
-      if (badge.isSubscription() && declineCode?.shouldRouteToGooglePay() == true) {
-        space(DimensionUnit.DP.toPixels(68f).toInt())
-
-        secondaryButtonNoOutline(
-          text = DSLSettingsText.from(R.string.ExpiredBadgeBottomSheetDialogFragment__go_to_google_pay),
-          onClick = {
-            CommunicationActions.openBrowserLink(requireContext(), getString(R.string.google_pay_url))
-          }
-        )
-      } else {
-        noPadTextPref(
-          DSLSettingsText.from(
-            if (badge.isBoost()) {
-              if (isLikelyASustainer) {
-                R.string.ExpiredBadgeBottomSheetDialogFragment__you_can_reactivate
-              } else {
-                R.string.ExpiredBadgeBottomSheetDialogFragment__you_can_keep
-              }
-            } else {
-              R.string.ExpiredBadgeBottomSheetDialogFragment__you_can
-            },
-            DSLSettingsText.CenterModifier
-          )
+      noPadTextPref(
+        DSLSettingsText.from(
+          if (isLikelyASustainer) {
+            R.string.ExpiredBadgeBottomSheetDialogFragment__you_can_reactivate
+          } else {
+            R.string.ExpiredBadgeBottomSheetDialogFragment__you_can_keep
+          },
+          DSLSettingsText.CenterModifier
         )
+      )
 
-        space(DimensionUnit.DP.toPixels(92f).toInt())
-      }
+      space(DimensionUnit.DP.toPixels(92f).toInt())
 
       primaryButton(
         text = DSLSettingsText.from(
-          if (badge.isBoost()) {
-            if (isLikelyASustainer) {
-              R.string.ExpiredBadgeBottomSheetDialogFragment__add_a_boost
-            } else {
-              R.string.ExpiredBadgeBottomSheetDialogFragment__become_a_sustainer
-            }
+          if (isLikelyASustainer) {
+            R.string.ExpiredBadgeBottomSheetDialogFragment__add_a_boost
           } else {
-            R.string.ExpiredBadgeBottomSheetDialogFragment__renew_subscription
+            R.string.ExpiredBadgeBottomSheetDialogFragment__become_a_sustainer
           }
         ),
         onClick = {
@@ -140,7 +102,7 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
   }
 
   companion object {
-    private val TAG = Log.tag(ExpiredBadgeBottomSheetDialogFragment::class.java)
+    private val TAG = Log.tag(ExpiredOneTimeBadgeBottomSheetDialogFragment::class.java)
 
     @JvmStatic
     fun show(
@@ -149,8 +111,8 @@ class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
       chargeFailure: ActiveSubscription.ChargeFailure?,
       fragmentManager: FragmentManager
     ) {
-      val args = ExpiredBadgeBottomSheetDialogFragmentArgs.Builder(badge, cancellationReason?.status, chargeFailure?.code).build()
-      val fragment = ExpiredBadgeBottomSheetDialogFragment()
+      val args = ExpiredOneTimeBadgeBottomSheetDialogFragmentArgs.Builder(badge, cancellationReason?.status, chargeFailure?.code).build()
+      val fragment = ExpiredOneTimeBadgeBottomSheetDialogFragment()
       fragment.arguments = args.toBundle()
 
       fragment.show(fragmentManager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG)

app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/MonthlyDonationCanceledBottomSheetDialogFragment.kt

@@ -0,0 +1,191 @@
+package org.thoughtcrime.securesms.badges.self.expired
+
+import android.content.res.Configuration
+import android.net.Uri
+import androidx.annotation.StringRes
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.fragment.app.FragmentManager
+import org.signal.core.ui.BottomSheets
+import org.signal.core.ui.Buttons
+import org.signal.core.ui.Texts
+import org.signal.core.ui.theme.SignalTheme
+import org.signal.donations.StripeDeclineCode
+import org.signal.donations.StripeFailureCode
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
+import org.thoughtcrime.securesms.components.settings.app.subscription.BadgeImage112
+import org.thoughtcrime.securesms.components.settings.app.subscription.errors.mapToErrorStringResource
+import org.thoughtcrime.securesms.components.settings.app.subscription.manage.ManageDonationsFragment
+import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.util.BottomSheetUtil
+import org.thoughtcrime.securesms.util.CommunicationActions
+import org.thoughtcrime.securesms.util.SpanUtil
+import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
+
+class MonthlyDonationCanceledBottomSheetDialogFragment : ComposeBottomSheetDialogFragment() {
+
+  override val peekHeightPercentage: Float = 1f
+
+  @Composable
+  override fun SheetContent() {
+    val chargeFailure: ActiveSubscription.ChargeFailure? = SignalStore.donationsValues().getUnexpectedSubscriptionCancelationChargeFailure()
+    val declineCode: StripeDeclineCode = StripeDeclineCode.getFromCode(chargeFailure?.outcomeNetworkReason)
+    val failureCode: StripeFailureCode = StripeFailureCode.getFromCode(chargeFailure?.code)
+
+    val errorMessage = if (declineCode.isKnown()) {
+      declineCode.mapToErrorStringResource()
+    } else if (failureCode.isKnown) {
+      failureCode.mapToErrorStringResource()
+    } else {
+      declineCode.mapToErrorStringResource()
+    }
+
+    MonthlyDonationCanceled(
+      badge = SignalStore.donationsValues().getExpiredBadge(),
+      errorMessageRes = errorMessage,
+      onRenewClicked = {
+        startActivity(AppSettingsActivity.subscriptions(requireContext()))
+        dismissAllowingStateLoss()
+      },
+      onNotNowClicked = {
+        SignalStore.donationsValues().showMonthlyDonationCanceledDialog = false
+        dismissAllowingStateLoss()
+      }
+    )
+  }
+
+  companion object {
+    @JvmStatic
+    fun show(fragmentManager: FragmentManager) {
+      val fragment = MonthlyDonationCanceledBottomSheetDialogFragment()
+
+      fragment.show(fragmentManager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG)
+    }
+  }
+}
+
+@Preview(name = "Light Theme", group = "ShortName", uiMode = Configuration.UI_MODE_NIGHT_NO)
+@Preview(name = "Dark Theme", group = "ShortName", uiMode = Configuration.UI_MODE_NIGHT_YES)
+@Composable
+fun MonthlyDonationCanceledPreview() {
+  SignalTheme {
+    Surface {
+      MonthlyDonationCanceled(
+        badge = Badge(
+          id = "",
+          category = Badge.Category.Donor,
+          name = "Signal Star",
+          description = "",
+          imageUrl = Uri.EMPTY,
+          imageDensity = "",
+          expirationTimestamp = 0L,
+          visible = true,
+          duration = 0L
+        ),
+        errorMessageRes = R.string.StripeFailureCode__verify_your_bank_details_are_correct,
+        onRenewClicked = {},
+        onNotNowClicked = {}
+      )
+    }
+  }
+}
+
+@Composable
+private fun MonthlyDonationCanceled(
+  badge: Badge?,
+  @StringRes errorMessageRes: Int,
+  onRenewClicked: () -> Unit,
+  onNotNowClicked: () -> Unit
+) {
+  Column(
+    horizontalAlignment = Alignment.CenterHorizontally,
+    modifier = Modifier.padding(horizontal = 34.dp)
+  ) {
+    BottomSheets.Handle()
+
+    if (badge != null) {
+      Box(modifier = Modifier.padding(top = 21.dp, bottom = 16.dp)) {
+        BadgeImage112(
+          badge = badge,
+          modifier = Modifier
+            .size(80.dp)
+        )
+
+        Image(
+          imageVector = ImageVector.vectorResource(id = R.drawable.symbol_error_circle_fill_24),
+          contentScale = ContentScale.Inside,
+          contentDescription = null,
+          colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.error),
+          modifier = Modifier
+            .size(24.dp)
+            .align(Alignment.TopEnd)
+            .background(
+              color = SignalTheme.colors.colorSurface1,
+              shape = CircleShape
+            )
+        )
+      }
+    }
+
+    Text(
+      text = stringResource(id = R.string.MonthlyDonationCanceled__title),
+      style = MaterialTheme.typography.titleLarge.copy(textAlign = TextAlign.Center, color = MaterialTheme.colorScheme.onSurface),
+      modifier = Modifier.padding(bottom = 20.dp)
+    )
+
+    val context = LocalContext.current
+    val learnMore = stringResource(id = R.string.MonthlyDonationCanceled__learn_more)
+    val errorMessage = stringResource(id = errorMessageRes)
+    val fullString = stringResource(id = R.string.MonthlyDonationCanceled__message, errorMessage, learnMore)
+    val spanned = SpanUtil.urlSubsequence(fullString, learnMore, ManageDonationsFragment.DONATE_TROUBLESHOOTING_URL)
+    Texts.LinkifiedText(
+      textWithUrlSpans = spanned,
+      onUrlClick = { CommunicationActions.openBrowserLink(context, it) },
+      style = MaterialTheme.typography.bodyLarge.copy(textAlign = TextAlign.Center, color = MaterialTheme.colorScheme.onSurfaceVariant),
+      modifier = Modifier.padding(bottom = 36.dp)
+    )
+
+    Buttons.LargeTonal(
+      onClick = onRenewClicked,
+      modifier = Modifier
+        .defaultMinSize(minWidth = 220.dp)
+        .padding(bottom = 16.dp)
+    ) {
+      Text(text = stringResource(id = R.string.MonthlyDonationCanceled__renew_button))
+    }
+
+    TextButton(
+      onClick = onNotNowClicked,
+      modifier = Modifier
+        .defaultMinSize(minWidth = 220.dp)
+        .padding(bottom = 56.dp)
+    ) {
+      Text(text = stringResource(id = R.string.MonthlyDonationCanceled__not_now_button))
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/badges/self/none/BecomeASustainerFragment.kt

@@ -58,7 +58,7 @@ class BecomeASustainerFragment : DSLSettingsBottomSheetFragment() {
 
       space(DimensionUnit.DP.toPixels(32f).toInt())
 
-      tonalButton(
+      tonalWrappedButton(
         text = DSLSettingsText.from(
           R.string.BecomeASustainerMegaphone__become_a_sustainer
         ),

app/src/main/java/org/thoughtcrime/securesms/calls/links/CallLinks.kt

@@ -23,7 +23,7 @@ import java.net.URLDecoder
 object CallLinks {
   private const val ROOT_KEY = "key"
   private const val HTTPS_LINK_PREFIX = "https://signal.link/call/#key="
-  private const val SNGL_LINK_PREFIX = "sgnl://signal.link/#key="
+  private const val SNGL_LINK_PREFIX = "sgnl://signal.link/call/#key="
 
   private val TAG = Log.tag(CallLinks::class.java)
 
@@ -58,7 +58,7 @@ object CallLinks {
       return false
     }
 
-    if (!url.startsWith(HTTPS_LINK_PREFIX) && !url.startsWith(SNGL_LINK_PREFIX)) {
+    if (!url.startsWith(HTTPS_LINK_PREFIX) || !url.startsWith(SNGL_LINK_PREFIX)) {
       return false
     }
 

app/src/main/java/org/thoughtcrime/securesms/calls/links/SignalCallRow.kt

@@ -119,7 +119,8 @@ fun SignalCallRow(
         .align(CenterVertically)
     ) {
       Text(
-        text = callLink.state.name.ifEmpty { stringResource(id = R.string.CreateCallLinkBottomSheetDialogFragment__signal_call) }
+        text = callLink.state.name.ifEmpty { stringResource(id = R.string.CreateCallLinkBottomSheetDialogFragment__signal_call) },
+        color = MaterialTheme.colorScheme.onSurface
       )
       Text(
         text = callUrl,

app/src/main/java/org/thoughtcrime/securesms/calls/links/create/CreateCallLinkBottomSheetDialogFragment.kt

@@ -92,6 +92,7 @@ class CreateCallLinkBottomSheetDialogFragment : ComposeBottomSheetDialogFragment
       Text(
         text = stringResource(id = R.string.CreateCallLinkBottomSheetDialogFragment__create_call_link),
         style = MaterialTheme.typography.titleLarge,
+        color = MaterialTheme.colorScheme.onSurface,
         textAlign = TextAlign.Center,
         modifier = Modifier.fillMaxWidth()
       )

app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogAdapter.kt

@@ -32,6 +32,11 @@ class CallLogAdapter(
   callbacks: Callbacks
 ) : PagingMappingAdapter<CallLogRow.Id>() {
 
+  companion object {
+    private const val PAYLOAD_SELECTION_STATE = "PAYLOAD_SELECTION_STATE"
+    private const val PAYLOAD_TIMESTAMP = "PAYLOAD_TIMESTAMP"
+  }
+
   init {
     registerFactory(
       CallModel::class.java,
@@ -72,6 +77,10 @@ class CallLogAdapter(
     )
   }
 
+  fun onTimestampTick() {
+    notifyItemRangeChanged(0, itemCount, PAYLOAD_TIMESTAMP)
+  }
+
   fun submitCallRows(
     rows: List<CallLogRow?>,
     selectionState: CallLogSelectionState,
@@ -98,9 +107,6 @@ class CallLogAdapter(
     val selectionState: CallLogSelectionState,
     val itemCount: Int
   ) : MappingModel<CallModel> {
-    companion object {
-      const val PAYLOAD_SELECTION_STATE = "PAYLOAD_SELECTION_STATE"
-    }
 
     override fun areItemsTheSame(newItem: CallModel): Boolean = call.id == newItem.call.id
     override fun areContentsTheSame(newItem: CallModel): Boolean {
@@ -133,10 +139,6 @@ class CallLogAdapter(
     val itemCount: Int
   ) : MappingModel<CallLinkModel> {
 
-    companion object {
-      const val PAYLOAD_SELECTION_STATE = "PAYLOAD_SELECTION_STATE"
-    }
-
     override fun areItemsTheSame(newItem: CallLinkModel): Boolean {
       return callLink.record.roomId == newItem.callLink.record.roomId
     }
@@ -149,7 +151,7 @@ class CallLogAdapter(
 
     override fun getChangePayload(newItem: CallLinkModel): Any? {
       return if (callLink == newItem.callLink && (!isSelectionStateTheSame(newItem) || !isItemCountTheSame(newItem))) {
-        CallModel.PAYLOAD_SELECTION_STATE
+        PAYLOAD_SELECTION_STATE
       } else {
         null
       }
@@ -183,6 +185,10 @@ class CallLogAdapter(
     private val onStartVideoCallClicked: (Recipient) -> Unit
   ) : BindingViewHolder<CallLinkModel, CallLogAdapterItemBinding>(binding) {
     override fun bind(model: CallLinkModel) {
+      if (payload.size == 1 && payload.contains(PAYLOAD_TIMESTAMP)) {
+        return
+      }
+
       itemView.setOnClickListener {
         onCallLinkClicked(model.callLink)
       }
@@ -195,7 +201,7 @@ class CallLogAdapter(
       binding.callSelected.isChecked = model.selectionState.contains(model.callLink.id)
       binding.callSelected.visible = model.selectionState.isNotEmpty(model.itemCount)
 
-      if (payload.contains(CallModel.PAYLOAD_SELECTION_STATE)) {
+      if (payload.isNotEmpty()) {
         return
       }
 
@@ -252,7 +258,11 @@ class CallLogAdapter(
       binding.callSelected.isChecked = model.selectionState.contains(model.call.id)
       binding.callSelected.visible = model.selectionState.isNotEmpty(model.itemCount)
 
-      if (payload.contains(CallModel.PAYLOAD_SELECTION_STATE)) {
+      if (payload.contains(PAYLOAD_TIMESTAMP)) {
+        presentCallInfo(model.call, model.call.date)
+      }
+
+      if (payload.isNotEmpty()) {
         return
       }
 
@@ -295,7 +305,7 @@ class CallLogAdapter(
 
       val color = ContextCompat.getColor(
         context,
-        if (call.record.event == CallTable.Event.MISSED) {
+        if (call.record.event.isMissedCall()) {
           R.color.signal_colorError
         } else {
           R.color.signal_colorOnSurfaceVariant
@@ -365,7 +375,7 @@ class CallLogAdapter(
         MessageTypes.OUTGOING_AUDIO_CALL_TYPE, MessageTypes.OUTGOING_VIDEO_CALL_TYPE -> R.drawable.symbol_arrow_upright_compact_16
         MessageTypes.GROUP_CALL_TYPE -> when {
           call.type == CallTable.Type.AD_HOC_CALL -> R.drawable.symbol_link_compact_16
-          call.event == CallTable.Event.MISSED -> R.drawable.symbol_missed_incoming_compact_16
+          call.event.isMissedCall() -> R.drawable.symbol_missed_incoming_compact_16
           call.event == CallTable.Event.GENERIC_GROUP_CALL || call.event == CallTable.Event.JOINED -> R.drawable.symbol_group_compact_16
           call.direction == CallTable.Direction.INCOMING -> R.drawable.symbol_arrow_downleft_compact_16
           call.direction == CallTable.Direction.OUTGOING -> R.drawable.symbol_arrow_upright_compact_16
@@ -379,8 +389,8 @@ class CallLogAdapter(
     @StringRes
     private fun getCallStateStringRes(call: CallTable.Call): Int {
       return when (call.messageType) {
-        MessageTypes.MISSED_VIDEO_CALL_TYPE -> R.string.CallLogAdapter__missed
-        MessageTypes.MISSED_AUDIO_CALL_TYPE -> R.string.CallLogAdapter__missed
+        MessageTypes.MISSED_VIDEO_CALL_TYPE,
+        MessageTypes.MISSED_AUDIO_CALL_TYPE -> if (call.event == CallTable.Event.MISSED) R.string.CallLogAdapter__missed else R.string.CallLogAdapter__missed_notification_profile
         MessageTypes.INCOMING_AUDIO_CALL_TYPE -> R.string.CallLogAdapter__incoming
         MessageTypes.INCOMING_VIDEO_CALL_TYPE -> R.string.CallLogAdapter__incoming
         MessageTypes.OUTGOING_AUDIO_CALL_TYPE -> R.string.CallLogAdapter__outgoing
@@ -388,6 +398,7 @@ class CallLogAdapter(
         MessageTypes.GROUP_CALL_TYPE -> when {
           call.type == CallTable.Type.AD_HOC_CALL -> R.string.CallLogAdapter__call_link
           call.event == CallTable.Event.MISSED -> R.string.CallLogAdapter__missed
+          call.event == CallTable.Event.MISSED_NOTIFICATION_PROFILE -> R.string.CallLogAdapter__missed_notification_profile
           call.event == CallTable.Event.GENERIC_GROUP_CALL || call.event == CallTable.Event.JOINED -> R.string.CallPreference__group_call
           call.direction == CallTable.Direction.INCOMING -> R.string.CallLogAdapter__incoming
           call.direction == CallTable.Direction.OUTGOING -> R.string.CallLogAdapter__outgoing