Bump version to 8.11.0

Update translations and other static files.
Improve screen share capture dimension calculation and use remote config.
2026-06-10 01:06:06 +01:00 · 2026-05-14 13:41:16 -04:00 · 2026-05-14 13:28:56 -04:00 · 2026-05-14 13:23:16 -04:00 · 2026-05-14 13:23:16 -04:00 · 2026-05-14 13:23:16 -04:00
1062 changed files with 61798 additions and 32590 deletions
@@ -0,0 +1,27 @@
+version: 2
+updates:
+  # Automatically keep GitHub Actions SHA-pinned to the latest commit SHAs.
+  # Dependabot will update both the SHA and the inline version comment (e.g. # v6)
+  # while leaving any extra documentation comments intact.
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "monday"
+    labels:
+      - "dependencies"
+    commit-message:
+      prefix: "ci"
+    groups:
+      actions:
+        patterns:
+          - "actions/*"
+      gradle-actions:
+        patterns:
+          - "gradle/*"
+      peter-evans:
+        patterns:
+          - "peter-evans/*"
+      usefulness:
+        patterns:
+          - "usefulness/*"
@@ -16,26 +16,30 @@ jobs:
    runs-on: ubuntu-latest-8-cores

    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      # gh api repos/actions/checkout/commits/v6 --jq '.sha'
      with:
          submodules: true

    - name: set up JDK 17
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+      # gh api repos/actions/setup-java/commits/v5 --jq '.sha'
      with:
        distribution: temurin
        java-version: 17
        cache: gradle

    - name: Validate Gradle Wrapper
-      uses: gradle/actions/wrapper-validation@v5
+      uses: gradle/actions/wrapper-validation@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6
+      # gh api repos/gradle/actions/commits/v6 --jq '.sha'

    - name: Build with Gradle
      run: ./gradlew qa

    - name: Archive reports for failed build
      if: ${{ failure() }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+      # gh api repos/actions/upload-artifact/commits/v7 --jq '.sha'
      with:
        name: reports
        path: '*/build/reports'
@@ -14,15 +14,17 @@ jobs:
  assemble-base:
    if: ${{ github.repository != 'signalapp/Signal-Android' }}
    runs-on: ubuntu-latest-8-cores
-    
+
    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      # gh api repos/actions/checkout/commits/v6 --jq '.sha'
      with:
        submodules: true
        ref: ${{ github.event.pull_request.base.sha }}

    - name: set up JDK 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+      # gh api repos/actions/setup-java/commits/v5 --jq '.sha'
      with:
        distribution: temurin
        java-version: 17
@@ -32,11 +34,13 @@ jobs:
      run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;${{ env.NDK_VERSION }}"

    - name: Validate Gradle Wrapper
-      uses: gradle/actions/wrapper-validation@v5
+      uses: gradle/actions/wrapper-validation@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6
+      # gh api repos/gradle/actions/commits/v6 --jq '.sha'

    - name: Cache base apk
      id: cache-base
-      uses: actions/cache@v4
+      uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
+      # gh api repos/actions/cache/commits/v5 --jq '.sha'
      with:
        path: diffuse-base.apk
        key: diffuse-${{ github.event.pull_request.base.sha }}
@@ -49,7 +53,8 @@ jobs:
      if: steps.cache-base.outputs.cache-hit != 'true'
      run: mv app/build/outputs/apk/playProd/release/*arm64*.apk diffuse-base.apk

-    - uses: actions/checkout@v4
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      # gh api repos/actions/checkout/commits/v6 --jq '.sha'
      with:
        submodules: true
        clean: 'false'
@@ -61,18 +66,21 @@ jobs:
      run: mv app/build/outputs/apk/playProd/release/*arm64*.apk diffuse-new.apk

    - id: diffuse
-      uses: usefulness/diffuse-action@v1
+      uses: usefulness/diffuse-action@41995fe8ff6be0a8847e63bdc5a4679c704b455c # v1
+      # gh api repos/usefulness/diffuse-action/commits/v1 --jq '.sha'
      with:
        old-file-path: diffuse-base.apk
        new-file-path: diffuse-new.apk

-    - uses: peter-evans/find-comment@v2
+    - uses: peter-evans/find-comment@b30e6a3c0ed37e7c023ccd3f1db5c6c0b0c23aad # v4
+      # gh api repos/peter-evans/find-comment/commits/v4 --jq '.sha'
      id: find-comment
      with:
        issue-number: ${{ github.event.pull_request.number }}
        body-includes: Diffuse output

-    - uses: peter-evans/create-or-update-comment@v3
+    - uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5
+      # gh api repos/peter-evans/create-or-update-comment/commits/v5 --jq '.sha'
      with:
        body: |
          Diffuse output:
@@ -83,7 +91,8 @@ jobs:
        issue-number: ${{ github.event.pull_request.number }}
        token: ${{ secrets.GITHUB_TOKEN }}

-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+      # gh api repos/actions/upload-artifact/commits/v7 --jq '.sha'
      with:
        name: diffuse-output
        path: ${{ steps.diffuse.outputs.diff-file }}
@@ -11,7 +11,8 @@ jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        # gh api repos/actions/checkout/commits/v6 --jq '.sha'
      - name: Build image
        run: |
          cd reproducible-builds
@@ -14,7 +14,8 @@ jobs:
      actions: write

    steps:
-      - uses: actions/stale@v10
+      - uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10
+        # gh api repos/actions/stale/commits/v10 --jq '.sha'
        with:
          days-before-stale: 60
          days-before-close: 7
@@ -1,6 +1,6 @@
 # Signal Android

-Signal is a simple, powerful, and secure messenger that uses your phone's data connection (WiFi/3G/4G/5G) to communicate securely.
+Signal is a simple, powerful, and secure messenger that uses your phone's data connection (WiFi/4G/5G) to communicate securely.

 Millions of people use Signal every day for free and instantaneous communication anywhere in the world. Send and receive high-fidelity messages, participate in HD voice/video calls, and explore a growing set of new features that help you stay connected. 

@@ -63,7 +63,7 @@ The form and manner of this distribution makes it eligible for export under the

 ## License

-Copyright 2013-2025 Signal Messenger, LLC
+Copyright 2013 Signal Messenger, LLC

 Licensed under the GNU AGPLv3: https://www.gnu.org/licenses/agpl-3.0.html

@@ -1,7 +1,10 @@
@file:Suppress("UnstableApiUsage")

-import com.android.build.api.dsl.ManagedVirtualDevice
+import com.android.build.api.artifact.ArtifactTransformationRequest
+import com.android.build.api.artifact.SingleArtifact
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
 import java.time.Instant
 import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
@@ -10,7 +13,6 @@ import java.util.Properties

 plugins {
  alias(libs.plugins.android.application)
-  alias(libs.plugins.jetbrains.kotlin.android)
  alias(libs.plugins.ktlint)
  alias(libs.plugins.compose.compiler)
  alias(libs.plugins.kotlinx.serialization)
@@ -22,21 +24,22 @@ plugins {
  id("licenses")
 }

-apply(from = "static-ips.gradle.kts")
+val staticIps = Properties().apply { file("static-ips.properties").reader().use { load(it) } }
+staticIps.stringPropertyNames().forEach { rootProject.extra[it] = staticIps.getProperty(it) }

-val canonicalVersionCode = 1680
-val canonicalVersionName = "8.8.0"
+val canonicalVersionCode = 1688
+val canonicalVersionName = "8.11.0"
 val currentHotfixVersion = 0
 val maxHotfixVersions = 100

 // We don't want versions to ever end in 0 so that they don't conflict with nightly versions
 val possibleHotfixVersions = (0 until maxHotfixVersions).toList().filter { it % 10 != 0 }

-val debugKeystorePropertiesProvider = providers.of(PropertiesFileValueSource::class.java) {
+val debugKeystorePropertiesProvider: Provider<Properties> = providers.of(PropertiesFileValueSource::class.java) {
  parameters.file.set(rootProject.layout.projectDirectory.file("keystore.debug.properties"))
 }

-val languagesProvider = providers.of(LanguageListValueSource::class.java) {
+val languagesProvider: Provider<List<String>> = providers.of(LanguageListValueSource::class.java) {
  parameters.resDir.set(layout.projectDirectory.dir("src/main/res"))
 }

@@ -81,6 +84,24 @@ val selectableVariants = listOf(
  "githubProdRelease"
 )

+// Wire 5.x iterates Android source sets and expects matching Kotlin source sets.
+// AGP 9.0's built-in Kotlin doesn't create all source sets automatically.
+val kotlinExt = extensions.getByName("kotlin") as KotlinAndroidProjectExtension
+android.sourceSets.all {
+  kotlinExt.sourceSets.findByName(name) ?: kotlinExt.sourceSets.create(name)
+}
+// AGP 9.0's built-in Kotlin doesn't pick up extra java.srcDir entries from Android
+// source sets, so add shared dirs directly to the relevant Kotlin compile tasks.
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class.java).configureEach {
+  val isTestTask = name.contains("UnitTest") || name.contains("AndroidTest")
+  if (isTestTask) {
+    source("$projectDir/src/testShared")
+  }
+  if (!isTestTask && (name.contains("Mocked") || name.contains("Benchmark"))) {
+    source("$projectDir/src/benchmarkShared/java")
+  }
+}
+
 wire {
  kotlin {
    javaInterop = true
@@ -94,8 +115,6 @@ wire {
    srcDir("${project.rootDir}/lib/libsignal-service/src/main/protowire")
    srcDir("${project.rootDir}/lib/archive/src/main/protowire")
  }
-  // Handled by libsignal
-  prune("signalservice.DecryptionErrorMessage")
 }

 ktlint {
@@ -106,7 +125,7 @@ android {
  namespace = "org.thoughtcrime.securesms"

  buildToolsVersion = libs.versions.buildTools.get()
-  compileSdkVersion = libs.versions.compileSdk.get()
+  compileSdkVersion(libs.versions.compileSdk.get())
  ndkVersion = libs.versions.ndk.get()

  flavorDimensions += listOf("distribution", "environment")
@@ -114,13 +133,7 @@ android {

  android.bundle.language.enableSplit = false

-  kotlinOptions {
-    jvmTarget = libs.versions.kotlinJvmTarget.get()
-    freeCompilerArgs = listOf("-Xjvm-default=all")
-    suppressWarnings = true
-  }
-
-  debugKeystorePropertiesProvider.orNull?.let { properties ->
+  debugKeystorePropertiesProvider.get().takeIf { it.isNotEmpty() }?.let { properties ->
    signingConfigs.getByName("debug").apply {
      storeFile = file("${project.rootDir}/${properties.getProperty("storeFile")}")
      storePassword = properties.getProperty("storePassword")
@@ -137,8 +150,8 @@ android {
    }

    managedDevices {
-      devices {
-        create<ManagedVirtualDevice>("pixel3api30") {
+      localDevices {
+        create("pixel3api30") {
          device = "Pixel 3"
          apiLevel = 30
          systemImageSource = "google-atd"
@@ -195,10 +208,6 @@ android {
    compose = true
  }

-  composeOptions {
-    kotlinCompilerExtensionVersion = "1.5.4"
-  }
-
  defaultConfig {
    if (currentHotfixVersion >= maxHotfixVersions) {
      throw AssertionError("Hotfix version offset is too large!")
@@ -291,7 +300,7 @@ android {
      isDefault = true
      isMinifyEnabled = false
      proguardFiles(
-        getDefaultProguardFile("proguard-android.txt"),
+        getDefaultProguardFile("proguard-android-optimize.txt"),
        "proguard/proguard-firebase-messaging.pro",
        "proguard/proguard-google-play-services.pro",
        "proguard/proguard-jackson.pro",
@@ -308,6 +317,7 @@ android {
        "proguard/proguard-retrolambda.pro",
        "proguard/proguard-okhttp.pro",
        "proguard/proguard-ez-vcard.pro",
+        "proguard/proguard-dnsjava.pro",
        "proguard/proguard.cfg"
      )
      testProguardFiles(
@@ -453,8 +463,8 @@ android {
      buildConfigField("String", "SIGNAL_CDN3_URL", "\"https://cdn3-staging.signal.org\"")
      buildConfigField("String", "SIGNAL_CDSI_URL", "\"https://cdsi.staging.signal.org\"")
      buildConfigField("String", "SIGNAL_SVR2_URL", "\"https://svr2.staging.signal.org\"")
-      buildConfigField("String", "SVR2_MRENCLAVE_LEGACY", "\"a75542d82da9f6914a1e31f8a7407053b99cc99a0e7291d8fbd394253e19b036\"")
-      buildConfigField("String", "SVR2_MRENCLAVE", "\"97f151f6ed078edbbfd72fa9cae694dcc08353f1f5e8d9ccd79a971b10ffc535\"")
+      buildConfigField("String", "SVR2_MRENCLAVE_LEGACY", "\"97f151f6ed078edbbfd72fa9cae694dcc08353f1f5e8d9ccd79a971b10ffc535\"")
+      buildConfigField("String", "SVR2_MRENCLAVE", "\"3c699f4975aaa3d172c0aad042f94f031b2b03e10b9c19a45116a01693d83302\"")
      buildConfigField("String[]", "UNIDENTIFIED_SENDER_TRUST_ROOTS", "new String[]{\"BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx\", \"BYhU6tPjqP46KGZEzRs1OL4U39V5dlPJ/X09ha4rErkm\"}")
      buildConfigField("String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXZSSsOZ6s7M1+rTJN0bI5CKY2PX29y5Ok3jSWufIKcgKOnWoP67d5b2du2ZVJjpjfibNIHbT/cegy/sBLoFwtHogVYUewANUAXIaMPyCLRArsKhfJ5wBtTminG/PAvuBdJ70Z/bXVPf8TVsR292zQ65xwvWTejROW6AZX6aqucUjlENAErBme1YHmOSpU6tr6doJ66dPzVAWIanmO/5mgjNEDeK7DDqQdB1xd03HT2Qs2TxY3kCK8aAb/0iM0HQiXjxZ9HIgYhbtvGEnDKW5ILSUydqH/KBhW4Pb0jZWnqN/YgbWDKeJxnDbYcUob5ZY5Lt5ZCMKuaGUvCJRrCtuugSMaqjowCGRempsDdJEt+cMaalhZ6gczklJB/IbdwENW9KeVFPoFNFzhxWUIS5ML9riVYhAtE6JE5jX0xiHNVIIPthb458cfA8daR0nYfYAUKogQArm0iBezOO+mPk5vCNWI+wwkyFCqNDXz/qxl1gAntuCJtSfq9OC3NkdhQlgYQ==\"")
      buildConfigField("String", "GENERIC_SERVER_PUBLIC_PARAMS", "\"AHILOIrFPXX9laLbalbA9+L1CXpSbM/bTJXZGZiuyK1JaI6dK5FHHWL6tWxmHKYAZTSYmElmJ5z2A5YcirjO/yfoemE03FItyaf8W1fE4p14hzb5qnrmfXUSiAIVrhaXVwIwSzH6RL/+EO8jFIjJ/YfExfJ8aBl48CKHgu1+A6kWynhttonvWWx6h7924mIzW0Czj2ROuh4LwQyZypex4GuOPW8sgIT21KNZaafgg+KbV7XM1x1tF3XA17B4uGUaDbDw2O+nR1+U5p6qHPzmJ7ggFjSN6Utu+35dS1sS0P9N\"")
@@ -480,70 +490,6 @@ android {
    lintConfig = rootProject.file("lint.xml")
  }

-  androidComponents {
-    beforeVariants { variant ->
-      variant.enable = variant.name in selectableVariants
-    }
-    onVariants(selector().all()) { variant: com.android.build.api.variant.ApplicationVariant ->
-      // Include the test-only library on debug builds.
-      if (variant.buildType != "instrumentation") {
-        variant.packaging.jniLibs.excludes.add("**/libsignal_jni_testing.so")
-      }
-
-      // Starting with minSdk 23, Android leaves native libraries uncompressed, which is fine for the Play Store, but not for our self-distributed APKs.
-      // This reverts it to the legacy behavior, compressing the native libraries, and drastically reducing the APK file size.
-      if (variant.name.contains("website", ignoreCase = true) || variant.name.contains("github", ignoreCase = true)) {
-        variant.packaging.jniLibs.useLegacyPackaging.set(true)
-      }
-
-      // Version overrides
-      if (variant.name.contains("nightly", ignoreCase = true)) {
-        var tag = getNightlyTagForCurrentCommit()
-        if (!tag.isNullOrEmpty()) {
-          if (tag.startsWith("v")) {
-            tag = tag.substring(1)
-          }
-
-          // We add a multiple of maxHotfixVersions to nightlies to ensure we're always at least that many versions ahead
-          val nightlyBuffer = (5 * maxHotfixVersions)
-          val nightlyVersionCode = (canonicalVersionCode * maxHotfixVersions) + (getNightlyBuildNumber(tag) * 10) + nightlyBuffer
-
-          variant.outputs.forEach { output ->
-            output.versionName.set("$tag | ${getLastCommitDateTimeUtc()}")
-            output.versionCode.set(nightlyVersionCode)
-          }
-        }
-      }
-    }
-
-    onVariants(selector().withBuildType("quickstart")) { variant ->
-      val environment = variant.flavorName?.let { name ->
-        when {
-          name.contains("staging", ignoreCase = true) -> "staging"
-          name.contains("prod", ignoreCase = true) -> "prod"
-          else -> "prod"
-        }
-      } ?: "prod"
-
-      val taskProvider = tasks.register<CopyQuickstartCredentialsTask>("copyQuickstartCredentials${variant.name.capitalize()}") {
-        if (quickstartCredentialsDir != null) {
-          inputDir.set(File(quickstartCredentialsDir))
-        }
-        filePrefix.set("${environment}_")
-      }
-      variant.sources.assets?.addGeneratedSourceDirectory(taskProvider) { it.outputDir }
-    }
-
-    onVariants(selector().withBuildType("benchmark")) { variant ->
-      val taskProvider = tasks.register<CopyBenchmarkBackupTask>("copyBenchmarkBackup${variant.name.capitalize()}") {
-        if (benchmarkBackupFile != null) {
-          inputFile.set(File(benchmarkBackupFile))
-        }
-      }
-      variant.sources.assets?.addGeneratedSourceDirectory(taskProvider) { it.outputDir }
-    }
-  }
-
  val releaseDir = "$projectDir/src/release/java"
  val debugDir = "$projectDir/src/debug/java"

@@ -565,15 +511,79 @@ android {
      manifest.srcFile("$projectDir/src/benchmarkShared/AndroidManifest.xml")
    }
  }
+}

-  applicationVariants.configureEach {
-    outputs.configureEach {
-      if (this is com.android.build.gradle.internal.api.BaseVariantOutputImpl) {
-        val fileVersionName = versionName.substringBefore(" |")
-        outputFileName = outputFileName.replace(".apk", "-$fileVersionName.apk")
+androidComponents {
+  beforeVariants { variant ->
+    variant.enable = variant.name in selectableVariants
+  }
+  onVariants(selector().all()) { variant: com.android.build.api.variant.ApplicationVariant ->
+    // Rename APK to include version name
+    val renameTask = tasks.register<RenameApkTask>("renameApk${variant.name.replaceFirstChar { it.uppercase() }}")
+    val renameRequest = variant.artifacts.use(renameTask)
+      .wiredWithDirectories(RenameApkTask::apkFolder, RenameApkTask::outFolder)
+      .toTransformMany(SingleArtifact.APK)
+    renameTask.configure {
+      transformationRequest.set(renameRequest)
+    }
+
+    // Include the test-only library on debug builds.
+    if (variant.buildType != "instrumentation") {
+      variant.packaging.jniLibs.excludes.add("**/libsignal_jni_testing.so")
+    }
+
+    // Starting with minSdk 23, Android leaves native libraries uncompressed, which is fine for the Play Store, but not for our self-distributed APKs.
+    // This reverts it to the legacy behavior, compressing the native libraries, and drastically reducing the APK file size.
+    if (variant.name.contains("website", ignoreCase = true) || variant.name.contains("github", ignoreCase = true)) {
+      variant.packaging.jniLibs.useLegacyPackaging.set(true)
+    }
+
+    // Version overrides
+    if (variant.name.contains("nightly", ignoreCase = true)) {
+      var tag = getNightlyTagForCurrentCommit()
+      if (!tag.isNullOrEmpty()) {
+        if (tag.startsWith("v")) {
+          tag = tag.substring(1)
+        }
+
+        // We add a multiple of maxHotfixVersions to nightlies to ensure we're always at least that many versions ahead
+        val nightlyBuffer = (5 * maxHotfixVersions)
+        val nightlyVersionCode = (canonicalVersionCode * maxHotfixVersions) + (getNightlyBuildNumber(tag) * 10) + nightlyBuffer
+
+        variant.outputs.forEach { output ->
+          output.versionName.set("$tag | ${getLastCommitDateTimeUtc()}")
+          output.versionCode.set(nightlyVersionCode)
+        }
      }
    }
  }
+
+  onVariants(selector().withBuildType("quickstart")) { variant ->
+    val environment = variant.flavorName?.let { name ->
+      when {
+        name.contains("staging", ignoreCase = true) -> "staging"
+        name.contains("prod", ignoreCase = true) -> "prod"
+        else -> "prod"
+      }
+    } ?: "prod"
+
+    val taskProvider = tasks.register<CopyQuickstartCredentialsTask>("copyQuickstartCredentials${variant.name.capitalize()}") {
+      if (quickstartCredentialsDir != null) {
+        inputDir.set(File(quickstartCredentialsDir))
+      }
+      filePrefix.set("${environment}_")
+    }
+    variant.sources.assets?.addGeneratedSourceDirectory(taskProvider) { it.outputDir }
+  }
+
+  onVariants(selector().withBuildType("benchmark")) { variant ->
+    val taskProvider = tasks.register<CopyBenchmarkBackupTask>("copyBenchmarkBackup${variant.name.capitalize()}") {
+      if (benchmarkBackupFile != null) {
+        inputFile.set(File(benchmarkBackupFile))
+      }
+    }
+    variant.sources.assets?.addGeneratedSourceDirectory(taskProvider) { it.outputDir }
+  }
 }

 baselineProfile {
@@ -590,6 +600,14 @@ baselineProfile {
  dexLayoutOptimization = false
 }

+kotlin {
+  compilerOptions {
+    jvmTarget = JvmTarget.fromTarget(libs.versions.kotlinJvmTarget.get())
+    freeCompilerArgs.addAll("-Xjvm-default=all")
+    suppressWarnings = true
+  }
+}
+
 dependencies {
  lintChecks(project(":lintchecks"))
  ktlintRuleset(libs.ktlint.twitter.compose)
@@ -597,6 +615,7 @@ dependencies {

  implementation(project(":lib:archive"))
  implementation(project(":lib:libsignal-service"))
+  implementation(project(":lib:network"))
  implementation(project(":lib:paging"))
  implementation(project(":core:util"))
  implementation(project(":lib:glide"))
@@ -618,11 +637,7 @@ dependencies {
  implementation(project(":lib:apng"))

  implementation(libs.androidx.fragment.ktx)
-  implementation(libs.androidx.appcompat) {
-    version {
-      strictly("1.6.1")
-    }
-  }
+  implementation(libs.androidx.appcompat)
  implementation(libs.androidx.window.window)
  implementation(libs.androidx.window.java)
  implementation(libs.androidx.recyclerview)
@@ -671,6 +686,7 @@ dependencies {
  implementation(libs.google.play.services.maps)
  implementation(libs.google.play.services.auth)
  implementation(libs.google.signin)
+  implementation(libs.androidx.media)
  implementation(libs.bundles.media3)
  implementation(libs.conscrypt.android)
  implementation(libs.signal.aesgcmprovider)
@@ -678,7 +694,6 @@ dependencies {
  implementation(libs.mobilecoin)
  implementation(libs.signal.ringrtc)
  implementation(libs.leolin.shortcutbadger)
-  implementation(libs.emilsjolander.stickylistheaders)
  implementation(libs.glide.glide)
  implementation(libs.roundedimageview)
  implementation(libs.materialish.progress)
@@ -689,9 +704,6 @@ dependencies {
  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.lottie)
  implementation(libs.lottie.compose)
  implementation(libs.signal.android.database.sqlcipher)
@@ -746,6 +758,7 @@ dependencies {
  }
  testImplementation(testLibs.conscrypt.openjdk.uber)
  testImplementation(testLibs.mockk)
+  testImplementation(testFixtures(project(":core:ui")))
  testImplementation(testFixtures(project(":lib:libsignal-service")))
  testImplementation(testLibs.espresso.core)
  testImplementation(testLibs.kotlinx.coroutines.test)
@@ -860,7 +873,7 @@ abstract class LanguageListValueSource : ValueSource<List<String>, LanguageListV
  }
 }

-abstract class PropertiesFileValueSource : ValueSource<Properties?, PropertiesFileValueSource.Params> {
+abstract class PropertiesFileValueSource : ValueSource<Properties, PropertiesFileValueSource.Params> {
  interface Params : ValueSourceParameters {
    @get:InputFile
    @get:Optional
@@ -868,9 +881,9 @@ abstract class PropertiesFileValueSource : ValueSource<Properties?, PropertiesFi
    val file: RegularFileProperty
  }

-  override fun obtain(): Properties? {
+  override fun obtain(): Properties {
    val f: File = parameters.file.asFile.get()
-    if (!f.exists()) return null
+    if (!f.exists()) return Properties()

    return Properties().apply {
      f.inputStream().use { load(it) }
@@ -940,3 +953,30 @@ abstract class CopyBenchmarkBackupTask : DefaultTask() {
    backupFile.copyTo(dest.resolve("backup.binproto"), overwrite = true)
  }
 }
+
+abstract class RenameApkTask : DefaultTask() {
+  @get:InputFiles
+  abstract val apkFolder: DirectoryProperty
+
+  @get:OutputDirectory
+  abstract val outFolder: DirectoryProperty
+
+  @get:Internal
+  abstract val transformationRequest: Property<ArtifactTransformationRequest<RenameApkTask>>
+
+  @TaskAction
+  fun rename() {
+    transformationRequest.get().submit(this) { artifact ->
+      val originalFile = File(artifact.outputFile)
+      val versionName = artifact.versionName?.substringBefore(" |")
+      val newName = if (!versionName.isNullOrEmpty()) {
+        originalFile.name.replace(".apk", "-$versionName.apk")
+      } else {
+        originalFile.name
+      }
+      val newFile = File(outFolder.get().asFile, newName)
+      originalFile.copyTo(newFile, overwrite = true)
+      newFile
+    }
+  }
+}
@@ -513,6 +513,17 @@
            column="31"/>
    </issue>

+    <issue
+        id="SoonBlockedPrivateApi"
+        message="Reflective access to mAttachInfo will throw an exception when targeting API 35 and above"
+        errorLine1="      Field attachInfoField = View.class.getDeclaredField(&quot;mAttachInfo&quot;);"
+        errorLine2="                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java"
+            line="157"
+            column="31"/>
+    </issue>
+
    <issue
        id="SimpleDateFormat"
        message="To get local formatting use `getDateInstance()`, `getDateTimeInstance()`, or `getTimeInstance()`, or use `new SimpleDateFormat(String template, Locale locale)` with for example `Locale.US` for ASCII dates."
@@ -0,0 +1,4 @@
+# dnsjava references desktop/server-only classes that are absent on Android.
+-dontwarn com.sun.jna.**
+-dontwarn javax.naming.**
+-dontwarn lombok.Generated
@@ -16,6 +16,14 @@

 -keep class androidx.window.** { *; }

+# Workaround for R8 non-determinism in AGP 9.x. R8 inconsistently keeps or strips
+# the Signature attribute on this Kotlin lambda subclass of the generic
+# LottieValueCallback, causing intermittent dex byte differences. Explicitly
+# keeping the class stabilizes R8's attribute decisions.
+-keep class com.airbnb.lottie.compose.LottieDynamicPropertiesKt$toValueCallback$1 {
+  *;
+}
+
 -keepclassmembers class * extends androidx.constraintlayout.motion.widget.Key {
  public <init>();
 }
@@ -16,6 +16,7 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.signal.donations.InAppPaymentType
+import org.signal.network.NetworkResult
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
 import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
@@ -26,7 +27,6 @@ import org.thoughtcrime.securesms.testing.InAppPaymentsRule
 import org.thoughtcrime.securesms.testing.RxTestSchedulerRule
 import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.thoughtcrime.securesms.testing.actions.RecyclerViewScrollToBottomAction
-import org.whispersystems.signalservice.api.NetworkResult
 import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
 import org.whispersystems.signalservice.api.subscriptions.SubscriberId
 import java.math.BigDecimal
@@ -4,12 +4,12 @@ import android.app.Application
 import io.mockk.mockk
 import io.mockk.spyk
 import org.signal.core.util.billing.BillingApi
+import org.signal.network.api.ArchiveApi
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess
 import org.thoughtcrime.securesms.recipients.LiveRecipientCache
 import org.whispersystems.signalservice.api.SignalServiceDataStore
 import org.whispersystems.signalservice.api.SignalServiceMessageSender
 import org.whispersystems.signalservice.api.account.AccountApi
-import org.whispersystems.signalservice.api.archive.ArchiveApi
 import org.whispersystems.signalservice.api.attachment.AttachmentApi
 import org.whispersystems.signalservice.api.donations.DonationsApi
 import org.whispersystems.signalservice.api.keys.KeysApi
@@ -19,6 +19,8 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
+import org.signal.network.NetworkResult
+import org.signal.network.exceptions.NonSuccessfulResponseCodeException
 import org.thoughtcrime.securesms.backup.DeletionState
 import org.thoughtcrime.securesms.backup.v2.BackupRepository
 import org.thoughtcrime.securesms.backup.v2.MessageBackupTier
@@ -27,8 +29,6 @@ import org.thoughtcrime.securesms.jobs.protos.BackupDeleteJobData
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.thoughtcrime.securesms.util.RemoteConfig
-import org.whispersystems.signalservice.api.NetworkResult
-import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException

 class BackupDeleteJobTest {

@@ -27,6 +27,8 @@ import org.signal.core.util.billing.BillingPurchaseState
 import org.signal.core.util.billing.BillingResponseCode
 import org.signal.core.util.money.FiatMoney
 import org.signal.donations.InAppPaymentType
+import org.signal.network.NetworkResult
+import org.signal.network.exceptions.NonSuccessfulResponseCodeException
 import org.thoughtcrime.securesms.backup.DeletionState
 import org.thoughtcrime.securesms.backup.v2.BackupRepository
 import org.thoughtcrime.securesms.backup.v2.MessageBackupTier
@@ -42,8 +44,6 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.net.SignalNetwork
 import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.thoughtcrime.securesms.util.RemoteConfig
-import org.whispersystems.signalservice.api.NetworkResult
-import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException
 import org.whispersystems.signalservice.api.storage.IAPSubscriptionId
 import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
 import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription.ChargeFailure
@@ -0,0 +1,843 @@
+/*
+ * Copyright 2026 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.main
+
+import android.app.Activity
+import android.app.Application
+import android.content.Context
+import android.content.Intent
+import android.graphics.Bitmap
+import android.net.Uri
+import android.os.Bundle
+import android.view.View
+import android.widget.TextView
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.fragment.app.FragmentManager
+import androidx.lifecycle.ViewModelProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.signal.core.models.media.Media
+import org.thoughtcrime.securesms.MainActivity
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.calls.log.CallLogFragment
+import org.thoughtcrime.securesms.conversation.ConversationArgs
+import org.thoughtcrime.securesms.conversation.ConversationIntents
+import org.thoughtcrime.securesms.conversation.v2.ConversationFragment
+import org.thoughtcrime.securesms.conversationlist.ConversationListArchiveFragment
+import org.thoughtcrime.securesms.conversationlist.ConversationListFragment
+import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionActivity
+import org.thoughtcrime.securesms.providers.BlobProvider
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.stories.landing.StoriesLandingFragment
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+import java.io.ByteArrayOutputStream
+import java.util.Collections
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+/**
+ * End-to-end launch tests for [MainActivity], covering cold-launch and onNewIntent paths
+ * through [MainNavigationViewModel].
+ */
+@RunWith(AndroidJUnit4::class)
+class MainNavigationLaunchTest {
+
+  @get:Rule
+  val harness = SignalActivityRule(othersCount = 2)
+
+  private val context: Context get() = harness.context
+  private val recipient: RecipientId get() = harness.others.first()
+
+  /**
+   * Share-target cold-launch regression test. Pre-fix, wrapNavigator() re-routed the
+   * early-staged Conversation through goTo(), whose async wallpaper-prefetch path emitted
+   * a SECOND internalDetailLocation with a fresh ConversationArgs — recreating the
+   * fragment and dropping share data.
+   */
+  @Test
+  fun coldLaunch_shareIntent_createsFragmentExactlyOnceWithShareData() {
+    val timestamp = System.currentTimeMillis()
+    val mimeType = "image/jpeg"
+    val blob = realBlob(byteArrayOf(0x01, 0x02, 0x03), mimeType)
+    val intent = shareToConversationIntent(
+      recipient = recipient,
+      blob = blob,
+      mimeType = mimeType,
+      shareDataTimestamp = timestamp
+    )
+
+    launchSync(intent).use { launched ->
+      val recorder = launched.recorder
+
+      try {
+        await(timeoutMs = 10_000, description = "ConversationFragment to be added") {
+          recorder.createdArgs.isNotEmpty()
+        }
+      } catch (e: IllegalStateException) {
+        val vm = runOnMainSync { launched.activity.mainNavigationViewModel() }
+        val state = runOnMainSync {
+          buildString {
+            appendLine("--- diagnostic dump ---")
+            appendLine("fragments observed: ${recorder.allCreated}")
+            appendLine("activity fragments: ${launched.activity.supportFragmentManager.fragments.map { it::class.simpleName }}")
+            appendLine("vm.currentListLocation: ${vm.mainNavigationState.value.currentListLocation}")
+            appendLine("vm.earlyNavigationDetailLocationRequested: ${vm.earlyNavigationDetailLocationRequested}")
+          }
+        }
+        throw IllegalStateException("${e.message}\n$state", e)
+      }
+
+      val expectedName = runOnMainSync { Recipient.resolved(recipient).getDisplayName(context) }
+      awaitConversationTitle(launched, expectedName)
+
+      // Give the post-navigator wallpaper-prefetch path a chance to emit a (pre-fix)
+      // duplicate second nav before we count fragments.
+      Thread.sleep(750)
+
+      check(recorder.createdArgs.size == 1) {
+        "Expected exactly one ConversationFragment, got ${recorder.createdArgs.size}"
+      }
+      val args = recorder.createdArgs.single()
+      check(args.shareDataTimestamp == timestamp) {
+        "Expected shareDataTimestamp=$timestamp, got ${args.shareDataTimestamp}"
+      }
+      check(args.recipientId == recipient) {
+        "Expected recipient=$recipient, got ${args.recipientId}"
+      }
+      check(args.draftMedia == blob) {
+        "Expected draftMedia=$blob, got ${args.draftMedia}"
+      }
+    }
+  }
+
+  /**
+   * Image-share cold-launch: the dispatch path through `ShareOrDraftData.StartSendMedia`
+   * that hops the user from the conversation into the media-send screen
+   * ([MediaSelectionActivity]). Asserts that the secondary activity actually launches and
+   * that its [MediaReviewFragment] surfaces the recipient's display name in the top
+   * corner — i.e. it knows who the share is targeted at.
+   */
+  @Test
+  fun coldLaunch_shareImageIntent_opensMediaSendForRecipient() {
+    val media = realJpegMedia()
+    val intent = shareImageIntent(recipient = recipient, media = media)
+
+    launchSync(intent).use { launched ->
+      val mediaSend = launched.awaitActivity(MediaSelectionActivity::class.java, timeoutMs = 20_000)
+      val expectedName = runOnMainSync { Recipient.resolved(recipient).getDisplayName(context) }
+
+      await(timeoutMs = 15_000, description = "recipient label populated in MediaReviewFragment") {
+        // await() already runs the predicate on the main thread; nesting another
+        // runOnMainSync here would throw "can not be called from the main application thread".
+        mediaSend.findViewById<TextView>(R.id.recipient)?.text?.toString() == expectedName
+      }
+
+      // Exactly one ConversationFragment should have been created — the share dispatch
+      // happens from inside it, then it stays put while the media editor sits on top.
+      check(launched.recorder.createdArgs.size == 1) {
+        "Expected exactly one ConversationFragment for image share, got ${launched.recorder.createdArgs.size}"
+      }
+    }
+  }
+
+  /**
+   * Text-share cold-launch: the dispatch path through `ShareOrDraftData.SetText`. Asserts
+   * the navigation boundary — one ConversationFragment, no secondary activity pushed on
+   * top — *and* that the draft text actually shows up in the composer the user sees.
+   */
+  @Test
+  fun coldLaunch_shareTextIntent_opensConversationWithDraftText() {
+    val draftText = "hello from share"
+    val intent = shareTextIntent(recipient = recipient, text = draftText)
+
+    launchSync(intent).use { launched ->
+      val recorder = launched.recorder
+      await(timeoutMs = 10_000, description = "ConversationFragment to be added") {
+        recorder.createdArgs.isNotEmpty()
+      }
+
+      awaitComposerText(launched, draftText)
+
+      // Give a beat for any spurious second navigation to surface.
+      Thread.sleep(750)
+
+      check(recorder.createdArgs.size == 1) {
+        "Expected exactly one ConversationFragment, got ${recorder.createdArgs.size}"
+      }
+      val args = recorder.createdArgs.single()
+      check(args.recipientId == recipient) {
+        "Expected recipient=$recipient, got ${args.recipientId}"
+      }
+      check(args.draftMedia == null) {
+        "Expected no draftMedia, got ${args.draftMedia}"
+      }
+      check(launched.nonMainActivities().isEmpty()) {
+        "Text share should not launch a secondary activity, got ${launched.nonMainActivities().map { it::class.simpleName }}"
+      }
+    }
+  }
+
+  @Test
+  fun coldLaunch_notificationIntent_opensConversation() {
+    val intent = notificationToConversationIntent(recipient)
+    launchSync(intent).use { launched ->
+      val recorder = launched.recorder
+      await(timeoutMs = 10_000, description = "ConversationFragment to be added") {
+        recorder.createdArgs.isNotEmpty()
+      }
+
+      val expectedName = runOnMainSync { Recipient.resolved(recipient).getDisplayName(context) }
+      awaitConversationTitle(launched, expectedName)
+
+      check(recorder.createdArgs.size == 1) {
+        "Expected exactly one ConversationFragment, got ${recorder.createdArgs.size}"
+      }
+      val args = recorder.createdArgs.single()
+      check(args.recipientId == recipient) {
+        "Expected recipient=$recipient, got ${args.recipientId}"
+      }
+      check(args.threadId > 0) {
+        "Expected threadId > 0, got ${args.threadId}"
+      }
+      check(args.draftMedia == null) {
+        "Expected no draftMedia, got ${args.draftMedia}"
+      }
+      check(args.shareDataTimestamp == -1L) {
+        "Expected shareDataTimestamp=-1 for notification path, got ${args.shareDataTimestamp}"
+      }
+      val vm = runOnMainSync { launched.activity.mainNavigationViewModel() }
+      check(vm.mainNavigationState.value.currentListLocation == MainNavigationListLocation.CHATS) {
+        "Expected currentListLocation=CHATS, got ${vm.mainNavigationState.value.currentListLocation}"
+      }
+    }
+  }
+
+  @Test
+  fun coldLaunch_tabIntent_setsListLocation() {
+    val intent = tabIntent(MainNavigationListLocation.CALLS)
+    launchSync(intent).use { launched ->
+      val recorder = launched.recorder
+      awaitListFragment(launched, MainNavigationListLocation.CALLS)
+
+      val vm = runOnMainSync { launched.activity.mainNavigationViewModel() }
+      check(vm.mainNavigationState.value.currentListLocation == MainNavigationListLocation.CALLS) {
+        "Expected VM CALLS, got ${vm.mainNavigationState.value.currentListLocation}"
+      }
+      Thread.sleep(750)
+      check(recorder.createdArgs.isEmpty()) {
+        "Expected no ConversationFragment for tab launch, got ${recorder.createdArgs.size}"
+      }
+    }
+  }
+
+  /**
+   * Locks down present cold-launch behaviour for KEY_DETAIL_LOCATION: today it is only
+   * consumed by onNewIntent. If a future change starts handling it on cold launch, this
+   * test should fail and force a deliberate decision.
+   */
+  @Test
+  fun coldLaunch_detailLocationIntent_isNoOpToday() {
+    val intent = detailLocationIntent(MainNavigationDetailLocation.Chats.ConversationSettings(recipient))
+    launchSync(intent).use { launched ->
+      val recorder = launched.recorder
+      Thread.sleep(1500)
+      check(recorder.createdArgs.isEmpty()) {
+        "KEY_DETAIL_LOCATION is currently only handled by onNewIntent. If a future change " +
+          "starts handling it on cold launch, update or delete this test. Got: ${recorder.allCreated}"
+      }
+      val vm = runOnMainSync { launched.activity.mainNavigationViewModel() }
+      check(vm.earlyNavigationDetailLocationRequested == null) {
+        "Expected no early detail to be staged, got ${vm.earlyNavigationDetailLocationRequested}"
+      }
+    }
+  }
+
+  @Test
+  fun coldLaunch_deepLinkIntent_reachesChatsList() {
+    val intent = deepLinkIntent(Uri.parse("https://signal.org/test-not-a-real-deeplink"))
+    launchSync(intent).use { launched ->
+      val recorder = launched.recorder
+      awaitListFragment(launched, MainNavigationListLocation.CHATS)
+
+      val vm = runOnMainSync { launched.activity.mainNavigationViewModel() }
+      check(vm.mainNavigationState.value.currentListLocation == MainNavigationListLocation.CHATS) {
+        "Expected CHATS for deep-link launch, got ${vm.mainNavigationState.value.currentListLocation}"
+      }
+      check(recorder.createdArgs.isEmpty()) {
+        "Expected no ConversationFragment for deep-link launch, got ${recorder.createdArgs.size}"
+      }
+    }
+  }
+
+  @Test
+  fun coldLaunch_noExtras_defaultsToChats() {
+    val intent = Intent(context, MainActivity::class.java)
+    launchSync(intent).use { launched ->
+      val recorder = launched.recorder
+      awaitListFragment(launched, MainNavigationListLocation.CHATS)
+
+      val vm = runOnMainSync { launched.activity.mainNavigationViewModel() }
+      check(vm.mainNavigationState.value.currentListLocation == MainNavigationListLocation.CHATS) {
+        "Expected default CHATS, got ${vm.mainNavigationState.value.currentListLocation}"
+      }
+      Thread.sleep(750)
+      check(vm.earlyNavigationDetailLocationRequested == null) {
+        "Expected no early detail, got ${vm.earlyNavigationDetailLocationRequested}"
+      }
+      check(recorder.createdArgs.isEmpty()) {
+        "Expected no ConversationFragment for bare launch, got ${recorder.createdArgs.size}"
+      }
+    }
+  }
+
+  @Test
+  fun warmStart_onNewIntent_conversationIntent_opensConversation() {
+    launchSync(Intent(context, MainActivity::class.java)).use { launched ->
+      val recorder = launched.recorder
+      // Let the bare list settle so we know any further fragment adds came from onNewIntent.
+      Thread.sleep(1000)
+      val baseline = recorder.createdArgs.size
+
+      val warmIntent = notificationToConversationIntent(recipient)
+      runOnMainSync {
+        InstrumentationRegistry.getInstrumentation().callActivityOnNewIntent(launched.activity, warmIntent)
+      }
+
+      await(timeoutMs = 10_000, description = "ConversationFragment after onNewIntent") {
+        recorder.createdArgs.size > baseline
+      }
+
+      val expectedName = runOnMainSync { Recipient.resolved(recipient).getDisplayName(context) }
+      awaitConversationTitle(launched, expectedName)
+
+      val newArgs = recorder.createdArgs.drop(baseline)
+      check(newArgs.size == 1) { "Expected one new ConversationFragment, got ${newArgs.size}" }
+      check(newArgs.single().recipientId == recipient) {
+        "Expected recipient=$recipient, got ${newArgs.single().recipientId}"
+      }
+    }
+  }
+
+  /**
+   * Mid-conversation onNewIntent with `KEY_DETAIL_LOCATION = Empty` — the contract used
+   * by [ConversationSettingsFragment.goToConversationList] to drop back to the chat list
+   * on phones. No new ConversationFragment should be added.
+   */
+  @Test
+  fun warmStart_onNewIntent_emptyDetailIntent_returnsToList() {
+    launchSync(notificationToConversationIntent(recipient)).use { launched ->
+      val recorder = launched.recorder
+      await(timeoutMs = 10_000, description = "initial ConversationFragment") {
+        recorder.createdArgs.isNotEmpty()
+      }
+      val baseline = recorder.createdArgs.size
+
+      val warmIntent = detailLocationIntent(MainNavigationDetailLocation.Empty)
+      runOnMainSync {
+        InstrumentationRegistry.getInstrumentation().callActivityOnNewIntent(launched.activity, warmIntent)
+      }
+
+      await(description = "no new ConversationFragment after Empty detail intent") {
+        recorder.createdArgs.size == baseline
+      }
+      // The user-visible signal that we're "back on the list" is the chat list fragment
+      // being attached, not just the VM saying CHATS.
+      awaitListFragment(launched, MainNavigationListLocation.CHATS)
+
+      val vm = runOnMainSync { launched.activity.mainNavigationViewModel() }
+      check(vm.mainNavigationState.value.currentListLocation == MainNavigationListLocation.CHATS) {
+        "Expected CHATS, got ${vm.mainNavigationState.value.currentListLocation}"
+      }
+    }
+  }
+
+  @Test
+  fun warmStart_onNewIntent_tabIntent_switchesList() {
+    launchSync(Intent(context, MainActivity::class.java)).use { launched ->
+      awaitListFragment(launched, MainNavigationListLocation.CHATS)
+
+      val warmIntent = tabIntent(MainNavigationListLocation.CALLS)
+      runOnMainSync {
+        InstrumentationRegistry.getInstrumentation().callActivityOnNewIntent(launched.activity, warmIntent)
+      }
+
+      awaitListFragment(launched, MainNavigationListLocation.CALLS)
+
+      val vm = runOnMainSync { launched.activity.mainNavigationViewModel() }
+      check(vm.mainNavigationState.value.currentListLocation == MainNavigationListLocation.CALLS) {
+        "Expected VM CALLS, got ${vm.mainNavigationState.value.currentListLocation}"
+      }
+      check(launched.recorder.createdArgs.isEmpty()) {
+        "Expected no ConversationFragment for tab switch, got ${launched.recorder.createdArgs.size}"
+      }
+    }
+  }
+
+  @Test
+  fun recreate_midConversation_restoresState() {
+    launchSync(notificationToConversationIntent(recipient)).use { launched ->
+      val recorder = launched.recorder
+      await(timeoutMs = 10_000, description = "initial ConversationFragment") {
+        recorder.createdArgs.isNotEmpty()
+      }
+      val expectedName = runOnMainSync { Recipient.resolved(recipient).getDisplayName(context) }
+      awaitConversationTitle(launched, expectedName)
+      val initial = recorder.createdArgs.first()
+
+      runOnMainSync { launched.activity.recreate() }
+
+      await(timeoutMs = 15_000, description = "ConversationFragment after recreate") {
+        recorder.createdArgs.size >= 2
+      }
+      // Verify the user-visible title rebinds after recreate, not just the args.
+      awaitConversationTitle(launched, expectedName)
+
+      val recreated = recorder.createdArgs[1]
+      check(recreated.recipientId == initial.recipientId) {
+        "Recipient changed across recreate: ${initial.recipientId} -> ${recreated.recipientId}"
+      }
+      check(recreated.threadId == initial.threadId) {
+        "Thread changed across recreate: ${initial.threadId} -> ${recreated.threadId}"
+      }
+    }
+  }
+
+  @Test
+  fun recreate_midTab_restoresTab() {
+    launchSync(tabIntent(MainNavigationListLocation.CALLS)).use { launched ->
+      awaitListFragment(launched, MainNavigationListLocation.CALLS)
+
+      runOnMainSync { launched.activity.recreate() }
+
+      // Verify the user-visible tab content rebinds after recreate, not just the VM. The
+      // recorder removes destroyed fragments, so this only passes once the post-recreate
+      // CallLogFragment instance is attached.
+      awaitListFragment(launched, MainNavigationListLocation.CALLS)
+
+      // launched.activity returns the *latest* MainActivity (the holder updates in
+      // onActivityCreated), so this reads the post-recreate VM instance.
+      val location = runOnMainSync {
+        launched.activity.mainNavigationViewModel().mainNavigationState.value.currentListLocation
+      }
+      check(location == MainNavigationListLocation.CALLS) {
+        "Expected VM CALLS post-recreate, got $location"
+      }
+      check(launched.recorder.createdArgs.isEmpty()) {
+        "Expected no ConversationFragment across tab recreate, got ${launched.recorder.createdArgs.size}"
+      }
+    }
+  }
+
+  @Test
+  fun recreate_midShareConversation_preservesShareData() {
+    val timestamp = System.currentTimeMillis()
+    val mimeType = "image/jpeg"
+    val blob = realBlob(byteArrayOf(0x01, 0x02, 0x03), mimeType)
+    val intent = shareToConversationIntent(
+      recipient = recipient,
+      blob = blob,
+      mimeType = mimeType,
+      shareDataTimestamp = timestamp
+    )
+
+    launchSync(intent).use { launched ->
+      val recorder = launched.recorder
+      await(timeoutMs = 10_000, description = "initial ConversationFragment") {
+        recorder.createdArgs.isNotEmpty()
+      }
+      val expectedName = runOnMainSync { Recipient.resolved(recipient).getDisplayName(context) }
+      awaitConversationTitle(launched, expectedName)
+      val initialCount = recorder.createdArgs.size
+
+      runOnMainSync { launched.activity.recreate() }
+
+      await(timeoutMs = 15_000, description = "ConversationFragment after recreate") {
+        recorder.createdArgs.size > initialCount
+      }
+      awaitConversationTitle(launched, expectedName)
+
+      val recreated = recorder.createdArgs.last()
+      check(recreated.shareDataTimestamp == timestamp) {
+        "shareDataTimestamp not preserved across recreate: $timestamp -> ${recreated.shareDataTimestamp}"
+      }
+      check(recreated.draftMedia == blob) {
+        "draftMedia not preserved across recreate: $blob -> ${recreated.draftMedia}"
+      }
+    }
+  }
+
+  // region Helpers
+
+  /**
+   * Mirrors [org.thoughtcrime.securesms.sharing.v2.ShareActivity.openConversation]. We
+   * deliberately drop the producer's `clearTop` flags (NEW_TASK | CLEAR_TOP | SINGLE_TOP)
+   * — they are launch-routing concerns that are incompatible with our lifecycle monitor.
+   */
+  private fun shareToConversationIntent(
+    recipient: RecipientId,
+    blob: Uri,
+    mimeType: String,
+    draftText: String? = null,
+    shareDataTimestamp: Long = System.currentTimeMillis()
+  ): Intent {
+    val builder = ConversationIntents.createBuilder(context, recipient, -1L).blockingGet()
+    val conversationIntent = builder
+      .withDataUri(blob)
+      .withDataType(mimeType)
+      .withMedia(emptyList())
+      .withDraftText(draftText)
+      .withStickerLocator(null)
+      .asBorderless(false)
+      .withShareDataTimestamp(shareDataTimestamp)
+      .build()
+
+    return Intent(context, MainActivity::class.java).apply {
+      action = ConversationIntents.ACTION
+      putExtras(conversationIntent)
+    }
+  }
+
+  /**
+   * Mirrors the image-share path through [org.thoughtcrime.securesms.sharing.v2.ShareActivity.openConversation]:
+   * a non-empty `media` list is what flips dispatch to `ShareOrDraftData.StartSendMedia`,
+   * which is what triggers the hop to the media-send screen.
+   */
+  private fun shareImageIntent(recipient: RecipientId, media: Media): Intent {
+    val builder = ConversationIntents.createBuilder(context, recipient, -1L).blockingGet()
+    val conversationIntent = builder
+      .withDataUri(media.uri)
+      .withDataType(media.contentType)
+      .withMedia(listOf(media))
+      .withStickerLocator(null)
+      .asBorderless(false)
+      .withShareDataTimestamp(System.currentTimeMillis())
+      .build()
+
+    return Intent(context, MainActivity::class.java).apply {
+      action = ConversationIntents.ACTION
+      putExtras(conversationIntent)
+    }
+  }
+
+  /**
+   * Mirrors a text-only share. Empty media list + non-null draft text routes dispatch to
+   * `ShareOrDraftData.SetText`.
+   */
+  private fun shareTextIntent(recipient: RecipientId, text: String): Intent {
+    val builder = ConversationIntents.createBuilder(context, recipient, -1L).blockingGet()
+    val conversationIntent = builder
+      .withMedia(emptyList())
+      .withDraftText(text)
+      .withStickerLocator(null)
+      .asBorderless(false)
+      .withShareDataTimestamp(System.currentTimeMillis())
+      .build()
+
+    return Intent(context, MainActivity::class.java).apply {
+      action = ConversationIntents.ACTION
+      putExtras(conversationIntent)
+    }
+  }
+
+  private fun notificationToConversationIntent(recipient: RecipientId): Intent {
+    val conversationIntent = ConversationIntents.createBuilder(context, recipient, -1L)
+      .blockingGet()
+      .build()
+
+    return Intent(context, MainActivity::class.java).apply {
+      action = ConversationIntents.ACTION
+      putExtras(conversationIntent)
+    }
+  }
+
+  private fun tabIntent(tab: MainNavigationListLocation): Intent {
+    return Intent(context, MainActivity::class.java)
+      .putExtra("STARTING_TAB", tab)
+  }
+
+  private fun detailLocationIntent(location: MainNavigationDetailLocation): Intent {
+    return Intent(context, MainActivity::class.java)
+      .putExtra("DETAIL_LOCATION", location)
+  }
+
+  private fun realBlob(bytes: ByteArray, mimeType: String): Uri {
+    return BlobProvider.getInstance()
+      .forData(bytes)
+      .withMimeType(mimeType)
+      .createForSingleSessionInMemory()
+  }
+
+  /**
+   * Build a [Media] backed by a real 1×1 JPEG. The media-send screen attempts to decode
+   * the image during MediaReviewFragment setup, so a fake byte array won't survive — we
+   * need genuine JPEG bytes for the fragment to reach the state where `R.id.recipient`
+   * is populated.
+   */
+  private fun realJpegMedia(): Media {
+    val bitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888)
+    val bytes = ByteArrayOutputStream().use { stream ->
+      bitmap.compress(Bitmap.CompressFormat.JPEG, 90, stream)
+      stream.toByteArray()
+    }
+    bitmap.recycle()
+    val uri = realBlob(bytes, "image/jpeg")
+    return Media(
+      uri = uri,
+      contentType = "image/jpeg",
+      date = 0L,
+      width = 1,
+      height = 1,
+      size = bytes.size.toLong(),
+      duration = 0L,
+      isBorderless = false,
+      isVideoGif = false,
+      bucketId = null,
+      caption = null,
+      transformProperties = null,
+      fileName = null
+    )
+  }
+
+  /**
+   * Mirrors [org.thoughtcrime.securesms.deeplinks.DeepLinkEntryActivity]: bare clearTop
+   * plus a [Uri] in the data field.
+   */
+  private fun deepLinkIntent(data: Uri): Intent {
+    return Intent(context, MainActivity::class.java).setData(data)
+  }
+
+  /**
+   * Synchronously launch [MainActivity] and return the running instance plus a fragment
+   * recorder wired up *before* the activity is created.
+   *
+   * We bypass [androidx.test.core.app.ActivityScenario] and
+   * [android.app.Instrumentation.startActivitySync] because both fail for our case:
+   * ActivityScenario's lifecycle tracker misses CREATED/STARTED/RESUMED for activities
+   * launched with a custom-action intent, and `startActivitySync` waits for main-thread
+   * idle which never arrives while MainActivity's composition + ConversationFragment
+   * setup keeps the looper busy.
+   */
+  private fun launchSync(intent: Intent): LaunchedActivity {
+    val recorder = ConversationFragmentRecorder()
+    val app = InstrumentationRegistry.getInstrumentation().targetContext.applicationContext as Application
+    val resumed = CountDownLatch(1)
+    val activityHolder = arrayOfNulls<MainActivity>(1)
+    val allActivities: MutableList<Activity> = Collections.synchronizedList(mutableListOf())
+    val callbacks = object : Application.ActivityLifecycleCallbacks {
+      override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
+        allActivities += activity
+        if (activity is MainActivity) {
+          activityHolder[0] = activity
+          activity.supportFragmentManager.registerFragmentLifecycleCallbacks(recorder, true)
+        }
+      }
+
+      override fun onActivityStarted(activity: Activity) = Unit
+      override fun onActivityResumed(activity: Activity) {
+        if (activity is MainActivity) resumed.countDown()
+      }
+
+      override fun onActivityPaused(activity: Activity) = Unit
+      override fun onActivityStopped(activity: Activity) = Unit
+      override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit
+      override fun onActivityDestroyed(activity: Activity) {
+        allActivities.remove(activity)
+      }
+    }
+    app.registerActivityLifecycleCallbacks(callbacks)
+
+    // Application.startActivity from a non-Activity context requires FLAG_ACTIVITY_NEW_TASK.
+    val launchIntent = Intent(intent).apply { addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) }
+    try {
+      app.startActivity(launchIntent)
+    } catch (t: Throwable) {
+      app.unregisterActivityLifecycleCallbacks(callbacks)
+      throw t
+    }
+
+    if (!resumed.await(15, TimeUnit.SECONDS)) {
+      app.unregisterActivityLifecycleCallbacks(callbacks)
+      error("MainActivity did not reach RESUMED within 15s")
+    }
+    return LaunchedActivity(activityHolder, recorder, app, callbacks, allActivities)
+  }
+
+  private fun <T> runOnMainSync(block: () -> T): T {
+    var result: Result<T> = Result.failure(IllegalStateException("runOnMainSync did not produce a result"))
+    InstrumentationRegistry.getInstrumentation().runOnMainSync {
+      result = runCatching(block)
+    }
+    return result.getOrThrow()
+  }
+
+  private fun await(
+    timeoutMs: Long = 5_000,
+    pollMs: Long = 50,
+    description: String = "condition",
+    predicate: () -> Boolean
+  ) {
+    val deadline = System.currentTimeMillis() + timeoutMs
+    while (System.currentTimeMillis() < deadline) {
+      if (runOnMainSync(predicate)) return
+      Thread.sleep(pollMs)
+    }
+    error("Timed out after ${timeoutMs}ms waiting for $description")
+  }
+
+  private fun MainActivity.mainNavigationViewModel(): MainNavigationViewModel {
+    return ViewModelProvider(this as FragmentActivity, MainNavigationViewModel.Factory())[MainNavigationViewModel::class.java]
+  }
+
+  /**
+   * Wait until the latest [ConversationFragment]'s composer EditText shows [expected].
+   * setDraftText is invoked off the InputReadyState/ShareOrDraftData reactive chain, so the
+   * text won't be present at fragment-create time — we have to poll the rendered view.
+   */
+  private fun awaitComposerText(launched: LaunchedActivity, expected: String) {
+    await(timeoutMs = 15_000, description = "composer shows \"$expected\"") {
+      val frag = launched.recorder.latestActive() ?: return@await false
+      val view = frag.view ?: return@await false
+      view.findViewById<TextView>(R.id.embedded_text_editor)?.text?.toString() == expected
+    }
+  }
+
+  /**
+   * Wait until the latest [ConversationFragment]'s toolbar shows [expected]. Scoped through
+   * R.id.conversation_title_view to avoid colliding with other R.id.title uses.
+   */
+  private fun awaitConversationTitle(launched: LaunchedActivity, expected: String) {
+    await(timeoutMs = 15_000, description = "conversation title shows \"$expected\"") {
+      val frag = launched.recorder.latestActive() ?: return@await false
+      val view = frag.view ?: return@await false
+      val titleHost = view.findViewById<View>(R.id.conversation_title_view) ?: return@await false
+      titleHost.findViewById<TextView>(R.id.title)?.text?.toString() == expected
+    }
+  }
+
+  /**
+   * MainActivity hosts each tab as a different [Fragment] via Compose's `AndroidFragment`
+   * (see MainActivity.kt:662-698). The user sees the content of whichever one is currently
+   * attached, so a tab assertion that reads the FragmentManager is a real user-visible
+   * signal — strictly stronger than reading the VM's `currentListLocation`.
+   */
+  private fun listFragmentClass(location: MainNavigationListLocation): Class<out Fragment> = when (location) {
+    MainNavigationListLocation.CHATS -> ConversationListFragment::class.java
+    MainNavigationListLocation.ARCHIVE -> ConversationListArchiveFragment::class.java
+    MainNavigationListLocation.CALLS -> CallLogFragment::class.java
+    MainNavigationListLocation.STORIES -> StoriesLandingFragment::class.java
+  }
+
+  private fun awaitListFragment(launched: LaunchedActivity, location: MainNavigationListLocation) {
+    val expected = listFragmentClass(location)
+    try {
+      await(timeoutMs = 10_000, description = "${expected.simpleName} attached for $location") {
+        launched.recorder.isAttached(expected)
+      }
+    } catch (e: IllegalStateException) {
+      throw IllegalStateException("${e.message}; currently attached: ${launched.recorder.attachedNames()}", e)
+    }
+  }
+
+  // endregion
+
+  // region Types
+
+  /**
+   * Records every [ConversationFragment] added under an activity's fragment manager,
+   * capturing each fragment's arguments at create-time.
+   */
+  private class ConversationFragmentRecorder : FragmentManager.FragmentLifecycleCallbacks() {
+    val createdArgs: MutableList<ConversationArgs> = mutableListOf()
+    val allCreated: MutableList<String> = mutableListOf()
+    private val active: MutableList<ConversationFragment> = mutableListOf()
+    private val attached: MutableList<Fragment> = mutableListOf()
+    var destroyedCount: Int = 0
+      private set
+
+    /** Most-recently-added still-attached ConversationFragment, or null. Main-thread read. */
+    fun latestActive(): ConversationFragment? = active.lastOrNull()
+
+    /**
+     * Exact class match (not [Class.isInstance]) — `ConversationListArchiveFragment`
+     * extends `ConversationListFragment`, so an `isInstance` check for CHATS would falsely
+     * pass when the archive list is attached.
+     */
+    fun isAttached(clazz: Class<out Fragment>): Boolean = attached.any { it::class.java == clazz }
+
+    fun attachedNames(): List<String> = attached.map { it::class.simpleName ?: it::class.java.name }
+
+    override fun onFragmentCreated(fm: FragmentManager, f: Fragment, savedInstanceState: android.os.Bundle?) {
+      allCreated += f::class.simpleName ?: f::class.java.name
+      attached += f
+      if (f is ConversationFragment) {
+        createdArgs += ConversationIntents.readArgsFromBundle(f.requireArguments())
+        active += f
+      }
+    }
+
+    override fun onFragmentDestroyed(fm: FragmentManager, f: Fragment) {
+      attached.remove(f)
+      if (f is ConversationFragment) {
+        active.remove(f)
+        destroyedCount++
+      }
+    }
+  }
+
+  private class LaunchedActivity(
+    private val activityHolder: Array<MainActivity?>,
+    val recorder: ConversationFragmentRecorder,
+    private val app: Application,
+    private val callbacks: Application.ActivityLifecycleCallbacks,
+    private val allActivities: MutableList<Activity>
+  ) : AutoCloseable {
+    /**
+     * Always returns the *latest* MainActivity instance so reads follow `recreate()`.
+     */
+    val activity: MainActivity get() = checkNotNull(activityHolder[0]) { "No active MainActivity" }
+
+    /**
+     * Poll until an activity of [clazz] has been created, then return it. Used to assert
+     * the share-image flow's hop into MediaSelectionActivity.
+     */
+    fun <T : Activity> awaitActivity(clazz: Class<T>, timeoutMs: Long = 10_000): T {
+      val deadline = System.currentTimeMillis() + timeoutMs
+      while (System.currentTimeMillis() < deadline) {
+        val match = synchronized(allActivities) {
+          allActivities.firstOrNull { clazz.isInstance(it) }
+        }
+        if (match != null) return clazz.cast(match)!!
+        Thread.sleep(50)
+      }
+      val seen = synchronized(allActivities) { allActivities.map { it::class.simpleName } }
+      error("Timed out after ${timeoutMs}ms waiting for ${clazz.simpleName}; saw $seen")
+    }
+
+    fun nonMainActivities(): List<Activity> = synchronized(allActivities) {
+      allActivities.filter { it !is MainActivity }.toList()
+    }
+
+    override fun close() {
+      // Don't wait for looper idle — secondary activities (e.g. MediaSelectionActivity
+      // opened by share processing) can keep it busy indefinitely. Finish every tracked
+      // activity so subsequent tests start from a clean slate.
+      val toFinish = synchronized(allActivities) { allActivities.toList() }
+      if (toFinish.isNotEmpty()) {
+        InstrumentationRegistry.getInstrumentation().runOnMainSync {
+          toFinish.forEach { it.finish() }
+        }
+      }
+      app.unregisterActivityLifecycleCallbacks(callbacks)
+    }
+  }
+
+  // endregion
+}
@@ -8,9 +8,9 @@ package org.thoughtcrime.securesms.testing
 import androidx.test.platform.app.InstrumentationRegistry
 import io.mockk.every
 import org.junit.rules.ExternalResource
+import org.signal.network.NetworkResult
 import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.util.JsonUtils
-import org.whispersystems.signalservice.api.NetworkResult
 import org.whispersystems.signalservice.internal.push.SubscriptionsConfiguration

 /**
@@ -17,7 +17,6 @@ import org.whispersystems.signalservice.internal.push.PreKeyResponse
 import org.whispersystems.signalservice.internal.push.PreKeyResponseItem
 import org.whispersystems.signalservice.internal.push.PushServiceSocket
 import org.whispersystems.signalservice.internal.push.RegistrationSessionMetadataJson
-import org.whispersystems.signalservice.internal.push.SenderCertificate
 import org.whispersystems.signalservice.internal.push.VerifyAccountResponse
 import org.whispersystems.signalservice.internal.push.WhoAmIResponse
 import java.security.SecureRandom
@@ -27,8 +26,6 @@ import java.security.SecureRandom
 */
 object MockProvider {

-  val senderCertificate = SenderCertificate().apply { certificate = ByteArray(0) }
-
  val lockedFailure = PushServiceSocket.RegistrationLockFailure().apply {
    svr1Credentials = AuthCredentials.create("username", "password")
    svr2Credentials = AuthCredentials.create("username", "password")
@@ -23,7 +23,7 @@ import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.whispersystems.signalservice.internal.push.Envelope
 import org.whispersystems.signalservice.internal.websocket.BenchmarkWebSocketConnection
-import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage
+import org.signal.network.websocket.WebSocketRequestMessage
 import kotlin.random.Random

 /**
@@ -74,7 +74,7 @@ class OtherClient(val serviceId: ServiceId, val e164: String, val identityKeyPai
    val cipher = SignalServiceCipher(serviceAddress, 1, aciStore, sessionLock, null)

    if (!aciStore.containsSession(getAliceProtocolAddress())) {
-      val sessionBuilder = SignalSessionBuilder(sessionLock, SessionBuilder(aciStore, getAliceProtocolAddress()))
+      val sessionBuilder = SignalSessionBuilder(sessionLock, SessionBuilder(aciStore, getAliceProtocolAddress(), SignalProtocolAddress(serviceAddress.identifier, 1)))
      sessionBuilder.process(getAlicePreKeyBundle())
    }

@@ -2,8 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools">

-    <uses-sdk tools:overrideLibrary="androidx.camera.core,androidx.camera.camera2,androidx.camera.lifecycle,androidx.camera.view" />
-
    <!-- ======================================= -->
    <!-- Features                                -->
    <!-- ======================================= -->
@@ -40,6 +38,7 @@
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_PHONE_CALL" />
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_REMOTE_MESSAGING" />
    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
@@ -1405,7 +1404,7 @@
        <service
            android:name="org.thoughtcrime.securesms.service.webrtc.ActiveCallManager$ActiveCallForegroundService"
            android:exported="false"
-            android:foregroundServiceType="dataSync|microphone|camera|phoneCall" />
+            android:foregroundServiceType="dataSync|microphone|camera|phoneCall|mediaProjection" />

        <service
            android:name="com.google.android.datatransport.runtime.scheduling.jobscheduling.JobInfoSchedulerService"
@@ -77,6 +77,7 @@ import org.thoughtcrime.securesms.jobs.LinkedDeviceInactiveCheckJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
 import org.thoughtcrime.securesms.jobs.PreKeysSyncJob;
 import org.thoughtcrime.securesms.jobs.ProfileUploadJob;
+import org.thoughtcrime.securesms.jobs.RefreshAttributesJob;
 import org.thoughtcrime.securesms.jobs.RefreshSvrCredentialsJob;
 import org.thoughtcrime.securesms.jobs.RestoreOptimizedMediaJob;
 import org.thoughtcrime.securesms.jobs.RetrieveProfileJob;
@@ -111,6 +112,7 @@ import org.thoughtcrime.securesms.util.AppStartup;
 import org.thoughtcrime.securesms.util.DeviceProperties;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.Environment;
+import org.thoughtcrime.securesms.util.PlayServicesUtil;
 import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.SignalLocalMetrics;
 import org.thoughtcrime.securesms.util.SignalUncaughtExceptionHandler;
@@ -321,7 +323,7 @@ public class ApplicationContext extends Application implements AppForegroundObse
   * 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), RemoteConfig::internalUser, (dumps) -> {
+    AnrDetector.start(TimeUnit.SECONDS.toMillis(5), () -> RemoteConfig.internalUser() && SignalStore.internal().getAnrDetectionCrashes(), (dumps) -> {
      LogDatabase.getInstance(this).anrs().save(System.currentTimeMillis(), dumps);
      return Unit.INSTANCE;
    });
@@ -439,7 +441,24 @@ public class ApplicationContext extends Application implements AppForegroundObse
  }

  private void initializeFcmCheck() {
-    if (SignalStore.account().isRegistered()) {
+    if (!SignalStore.account().isRegistered()) {
+      return;
+    }
+
+    PlayServicesUtil.PlayServicesStatus playServicesStatus = PlayServicesUtil.getPlayServicesStatus(this);
+
+    if (playServicesStatus == PlayServicesUtil.PlayServicesStatus.SUCCESS && !SignalStore.account().isFcmEnabled()) {
+      Log.i(TAG, "Play Services are newly-available. Enabling FCM and updating server.");
+      SignalStore.account().setFcmEnabled(true);
+      AppDependencies.getJobManager().startChain(new FcmRefreshJob())
+                                      .then(new RefreshAttributesJob())
+                                      .enqueue();
+    } else if (playServicesStatus == PlayServicesUtil.PlayServicesStatus.MISSING && SignalStore.account().isFcmEnabled()) {
+      Log.w(TAG, "Play Services are no longer available. Disabling FCM and updating server.");
+      SignalStore.account().setFcmEnabled(false);
+      SignalStore.account().setFcmToken(null);
+      AppDependencies.getJobManager().add(new RefreshAttributesJob());
+    } else if (SignalStore.account().isFcmEnabled()) {
      long lastSetTime = SignalStore.account().getFcmTokenLastSetTime();
      long nextSetTime = lastSetTime + TimeUnit.HOURS.toMillis(6);
      long now         = System.currentTimeMillis();
@@ -447,6 +466,8 @@ public class ApplicationContext extends Application implements AppForegroundObse
      if (SignalStore.account().getFcmToken() == null || nextSetTime <= now || lastSetTime > now) {
        AppDependencies.getJobManager().add(new FcmRefreshJob());
      }
+    } else {
+      Log.d(TAG, "Play Services status: " + playServicesStatus + ", fcmEnabled: false. Skipping FCM check.");
    }
  }

@@ -45,6 +45,9 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import androidx.transition.AutoTransition;
 import androidx.transition.TransitionManager;

+import org.thoughtcrime.securesms.contacts.paged.ContactSearchView;
+import org.thoughtcrime.securesms.contacts.paged.ContactSearchViewModel;
+
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;

 import org.signal.core.util.concurrent.LifecycleDisposable;
@@ -60,10 +63,12 @@ import org.thoughtcrime.securesms.contacts.SelectedContact;
 import org.thoughtcrime.securesms.contacts.SelectedContacts;
 import org.thoughtcrime.securesms.contacts.paged.ChatType;
 import org.thoughtcrime.securesms.contacts.paged.ContactSearchAdapter;
+import org.thoughtcrime.securesms.contacts.paged.ContactSearchCallbacks;
 import org.thoughtcrime.securesms.contacts.paged.ContactSearchConfiguration;
 import org.thoughtcrime.securesms.contacts.paged.ContactSearchData;
 import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey;
-import org.thoughtcrime.securesms.contacts.paged.ContactSearchMediator;
+import org.thoughtcrime.securesms.contacts.paged.ContactSearchPagedDataSourceRepository;
+import org.thoughtcrime.securesms.contacts.paged.ContactSearchRepository;
 import org.thoughtcrime.securesms.contacts.paged.ContactSearchSortOrder;
 import org.thoughtcrime.securesms.contacts.paged.ContactSearchState;
 import org.thoughtcrime.securesms.contacts.selection.ContactSelectionArguments;
@@ -74,6 +79,7 @@ import org.thoughtcrime.securesms.groups.ui.GroupLimitDialog;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.signal.core.ui.permissions.Permissions;
 import org.thoughtcrime.securesms.profiles.manage.UsernameRepository;
+import org.thoughtcrime.securesms.search.SearchRepository;
 import org.thoughtcrime.securesms.profiles.manage.UsernameRepository.UsernameAciFetchResult;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
@@ -86,6 +92,7 @@ import org.thoughtcrime.securesms.util.adapter.mapping.MappingModelList;
 import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;

 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.stream.Collectors;
 import java.util.List;
@@ -118,7 +125,7 @@ public final class ContactSelectionListFragment extends LoggingFragment {
  private OnContactSelectedListener       onContactSelectedListener;
  private SwipeRefreshLayout              swipeRefresh;
  private String                          cursorFilter;
-  private RecyclerView                    recyclerView;
+  private ContactSearchView               contactSearchView;
  private RecyclerViewFastScroller        fastScroller;
  private RecyclerView                    chipRecycler;
  private OnSelectionLimitReachedListener onSelectionLimitReachedListener;
@@ -127,8 +134,10 @@ public final class ContactSelectionListFragment extends LoggingFragment {
  private LifecycleDisposable             lifecycleDisposable;
  private HeaderActionProvider            headerActionProvider;
  private TextView                        headerActionView;
-  private ContactSearchMediator           contactSearchMediator;
+  private ContactSearchViewModel          contactSearchViewModel;

+  @Nullable private RecyclerView            innerRecyclerView;
+  @Nullable private LinearLayoutManager     innerLayoutManager;
  @Nullable private NewConversationCallback newConversationCallback;
  @Nullable private FindByCallback          findByCallback;
  @Nullable private NewCallCallback         newCallCallback;
@@ -239,7 +248,7 @@ public final class ContactSelectionListFragment extends LoggingFragment {
      handleContactPermissionGranted();
    } else {
      requireActivity().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
-      contactSearchMediator.refresh();
+      contactSearchViewModel.refresh();
    }
  }

@@ -247,29 +256,14 @@ public final class ContactSelectionListFragment extends LoggingFragment {
  public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
    View view = inflater.inflate(R.layout.contact_selection_list_fragment, container, false);

-    emptyText        = view.findViewById(android.R.id.empty);
-    recyclerView     = view.findViewById(R.id.recycler_view);
-    swipeRefresh     = view.findViewById(R.id.swipe_refresh);
+    emptyText         = view.findViewById(android.R.id.empty);
+    contactSearchView = view.findViewById(R.id.recycler_view);
+    swipeRefresh      = view.findViewById(R.id.swipe_refresh);
    fastScroller     = view.findViewById(R.id.fast_scroller);
    chipRecycler     = view.findViewById(R.id.chipRecycler);
    constraintLayout = view.findViewById(R.id.container);
    headerActionView = view.findViewById(R.id.header_action);

-    final LinearLayoutManager layoutManager = new LinearLayoutManager(requireContext());
-
-    recyclerView.setLayoutManager(layoutManager);
-    recyclerView.setItemAnimator(new DefaultItemAnimator() {
-      @Override
-      public boolean canReuseUpdatedViewHolder(@NonNull RecyclerView.ViewHolder viewHolder) {
-        return true;
-      }
-
-      @Override
-      public void onAnimationFinished(@NonNull RecyclerView.ViewHolder viewHolder) {
-        recyclerView.setAlpha(1f);
-      }
-    });
-
    contactChipViewModel = new ViewModelProvider(this).get(ContactChipViewModel.class);
    contactChipAdapter   = new MappingAdapter();
    lifecycleDisposable  = new LifecycleDisposable();
@@ -284,12 +278,6 @@ public final class ContactSelectionListFragment extends LoggingFragment {

    fragmentArgs = ContactSelectionArguments.fromBundle(safeArguments(), requireActivity().getIntent());

-    if (fragmentArgs.getRecyclerPadBottom() != -1) {
-      ViewUtil.setPaddingBottom(recyclerView, fragmentArgs.getRecyclerPadBottom());
-    }
-
-    recyclerView.setClipToPadding(fragmentArgs.getRecyclerChildClipping());
-
    swipeRefresh.setNestedScrollingEnabled(fragmentArgs.isRefreshable());
    swipeRefresh.setEnabled(fragmentArgs.isRefreshable());

@@ -303,6 +291,26 @@ public final class ContactSelectionListFragment extends LoggingFragment {

    currentSelection = getCurrentSelection();

+    Set<ContactSearchKey> fixedContacts = currentSelection.stream()
+                                                          .map(r -> new ContactSearchKey.RecipientSearchKey(r, false))
+                                                          .collect(Collectors.toSet());
+
+    contactSearchViewModel = new ViewModelProvider(
+        this,
+        new ContactSearchViewModel.Factory(
+            selectionLimit,
+            isMulti,
+            new ContactSearchRepository(),
+            false,
+            new ContactSelectionListAdapter.ArbitraryRepository(),
+            new SearchRepository(requireContext().getString(R.string.note_to_self)),
+            new ContactSearchPagedDataSourceRepository(requireContext()),
+            fixedContacts
+        )
+    ).get(ContactSearchViewModel.class);
+
+    List<RecyclerView.OnScrollListener> scrollListeners = new ArrayList<>();
+
    final HeaderAction headerAction;
    if (headerActionProvider != null) {
      headerAction = headerActionProvider.getHeaderAction();
@@ -311,24 +319,20 @@ public final class ContactSelectionListFragment extends LoggingFragment {
      headerActionView.setText(headerAction.getLabel());
      headerActionView.setCompoundDrawablesRelativeWithIntrinsicBounds(headerAction.getIcon(), 0, 0, 0);
      headerActionView.setOnClickListener(v -> headerAction.getAction().run());
-      recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+      scrollListeners.add(new RecyclerView.OnScrollListener() {

        private final Rect bounds = new Rect();

        @Override
-        public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
-        }
-
-        @Override
-        public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
-          if (hideLetterHeaders()) {
+        public void onScrolled(@NonNull RecyclerView rv, int dx, int dy) {
+          if (hideLetterHeaders() || innerLayoutManager == null) {
            return;
          }

-          int firstPosition = layoutManager.findFirstVisibleItemPosition();
+          int firstPosition = innerLayoutManager.findFirstVisibleItemPosition();
          if (firstPosition == 0) {
-            View firstChild = recyclerView.getChildAt(0);
-            recyclerView.getDecoratedBoundsWithMargins(firstChild, bounds);
+            View firstChild = rv.getChildAt(0);
+            rv.getDecoratedBoundsWithMargins(firstChild, bounds);
            headerActionView.setTranslationY(bounds.top);
          }
        }
@@ -337,13 +341,104 @@ public final class ContactSelectionListFragment extends LoggingFragment {
      headerActionView.setEnabled(false);
    }

-    contactSearchMediator = new ContactSearchMediator(
-        this,
-        currentSelection.stream()
-                        .map(r -> new ContactSearchKey.RecipientSearchKey(r, false))
-                        .collect(Collectors.toSet()),
-        selectionLimit,
-        isMulti,
+    scrollListeners.add(new RecyclerView.OnScrollListener() {
+      @Override
+      public void onScrollStateChanged(@NonNull RecyclerView rv, int newState) {
+        if (newState == RecyclerView.SCROLL_STATE_DRAGGING && scrollCallback != null) {
+          scrollCallback.onBeginScroll();
+        }
+      }
+    });
+
+    float contentBottomPaddingDp = fragmentArgs.getRecyclerPadBottom() != -1
+        ? fragmentArgs.getRecyclerPadBottom() / getResources().getDisplayMetrics().density
+        : 0f;
+
+    ContactSearchAdapter.AdapterFactory adapterFactory =
+        (context, fc, displayOptions, callbacks, longClickCallbacks, storyContextMenuCallbacks, callButtonClickCallbacks) ->
+            new ContactSelectionListAdapter(
+                context,
+                fc,
+                displayOptions,
+                new ContactSelectionListAdapter.OnContactSelectionClick() {
+                  @Override
+                  public void onDismissFindContactsBannerClicked() {
+                    SignalStore.uiHints().markDismissedContactsPermissionBanner();
+                    contactSearchViewModel.refresh();
+                  }
+
+                  @Override
+                  public void onFindContactsClicked() {
+                    requestContactPermissions();
+                  }
+
+                  @Override
+                  public void onRefreshContactsClicked() {
+                    if (onRefreshListener != null && !isRefreshing()) {
+                      setRefreshing(true);
+                      onRefreshListener.onRefresh();
+                    }
+                  }
+
+                  @Override
+                  public void onNewGroupClicked() {
+                    newConversationCallback.onNewGroup(false);
+                  }
+
+                  @Override
+                  public void onFindByPhoneNumberClicked() {
+                    findByCallback.onFindByPhoneNumber();
+                  }
+
+                  @Override
+                  public void onFindByUsernameClicked() {
+                    findByCallback.onFindByUsername();
+                  }
+
+                  @Override
+                  public void onInviteToSignalClicked() {
+                    if (newConversationCallback != null) {
+                      newConversationCallback.onInvite();
+                    }
+
+                    if (newCallCallback != null) {
+                      newCallCallback.onInvite();
+                    }
+                  }
+
+                  @Override
+                  public void onStoryClicked(@NonNull View view1, @NonNull ContactSearchData.Story story, boolean isSelected) {
+                    throw new UnsupportedOperationException();
+                  }
+
+                  @Override
+                  public void onKnownRecipientClicked(@NonNull View view1, @NonNull ContactSearchData.KnownRecipient knownRecipient, boolean isSelected) {
+                    listClickListener.onItemClick(knownRecipient.getContactSearchKey());
+                  }
+
+                  @Override
+                  public void onExpandClicked(@NonNull ContactSearchData.Expand expand) {
+                    callbacks.onExpandClicked(expand);
+                  }
+
+                  @Override
+                  public void onUnknownRecipientClicked(@NonNull View view, @NonNull ContactSearchData.UnknownRecipient unknownRecipient, boolean isSelected) {
+                    listClickListener.onItemClick(unknownRecipient.getContactSearchKey());
+                  }
+
+                  @Override
+                  public void onChatTypeClicked(@NonNull View view, @NonNull ContactSearchData.ChatTypeRow chatTypeRow, boolean isSelected) {
+                    listClickListener.onItemClick(chatTypeRow.getContactSearchKey());
+                  }
+                },
+                (anchorView, data) -> listClickListener.onItemLongClick(anchorView, data.getContactSearchKey()),
+                storyContextMenuCallbacks,
+                new CallButtonClickCallbacks()
+            );
+
+    contactSearchView.bind(
+        contactSearchViewModel,
+        getChildFragmentManager(),
        new ContactSearchAdapter.DisplayOptions(
            isMulti,
            ContactSearchAdapter.DisplaySecondaryInformation.ALWAYS,
@@ -351,94 +446,31 @@ public final class ContactSelectionListFragment extends LoggingFragment {
            false
        ),
        this::mapStateToConfiguration,
-        new ContactSearchMediator.SimpleCallbacks() {
+        new ContactSearchCallbacks.Simple() {
          @Override
          public void onAdapterListCommitted(int size) {
            onLoadFinished(size);
          }
        },
-        false,
-        (context, fixedContacts, displayOptions, callbacks, longClickCallbacks, storyContextMenuCallbacks, callButtonClickCallbacks) -> new ContactSelectionListAdapter(
-            context,
-            fixedContacts,
-            displayOptions,
-            new ContactSelectionListAdapter.OnContactSelectionClick() {
-              @Override
-              public void onDismissFindContactsBannerClicked() {
-                SignalStore.uiHints().markDismissedContactsPermissionBanner();
-                contactSearchMediator.refresh();
-              }
+        Collections.singletonList(new LetterHeaderDecoration(requireContext(), this::hideLetterHeaders)),
+        contentBottomPaddingDp,
+        adapterFactory,
+        scrollListeners,
+        rv -> {
+          innerRecyclerView   = rv;
+          innerLayoutManager  = (LinearLayoutManager) rv.getLayoutManager();
+          rv.setItemAnimator(new DefaultItemAnimator() {
+            @Override
+            public boolean canReuseUpdatedViewHolder(@NonNull RecyclerView.ViewHolder viewHolder) {
+              return true;
+            }

-              @Override
-              public void onFindContactsClicked() {
-                requestContactPermissions();
-              }
-
-              @Override
-              public void onRefreshContactsClicked() {
-                if (onRefreshListener != null && !isRefreshing()) {
-                  setRefreshing(true);
-                  onRefreshListener.onRefresh();
-                }
-              }
-
-              @Override
-              public void onNewGroupClicked() {
-                newConversationCallback.onNewGroup(false);
-              }
-
-              @Override
-              public void onFindByPhoneNumberClicked() {
-                findByCallback.onFindByPhoneNumber();
-              }
-
-              @Override
-              public void onFindByUsernameClicked() {
-                findByCallback.onFindByUsername();
-              }
-
-              @Override
-              public void onInviteToSignalClicked() {
-                if (newConversationCallback != null) {
-                  newConversationCallback.onInvite();
-                }
-
-                if (newCallCallback != null) {
-                  newCallCallback.onInvite();
-                }
-              }
-
-              @Override
-              public void onStoryClicked(@NonNull View view1, @NonNull ContactSearchData.Story story, boolean isSelected) {
-                throw new UnsupportedOperationException();
-              }
-
-              @Override
-              public void onKnownRecipientClicked(@NonNull View view1, @NonNull ContactSearchData.KnownRecipient knownRecipient, boolean isSelected) {
-                listClickListener.onItemClick(knownRecipient.getContactSearchKey());
-              }
-
-              @Override
-              public void onExpandClicked(@NonNull ContactSearchData.Expand expand) {
-                callbacks.onExpandClicked(expand);
-              }
-
-              @Override
-              public void onUnknownRecipientClicked(@NonNull View view, @NonNull ContactSearchData.UnknownRecipient unknownRecipient, boolean isSelected) {
-                listClickListener.onItemClick(unknownRecipient.getContactSearchKey());
-              }
-
-              @Override
-              public void onChatTypeClicked(@NonNull View view, @NonNull ContactSearchData.ChatTypeRow chatTypeRow, boolean isSelected) {
-                listClickListener.onItemClick(chatTypeRow.getContactSearchKey());
-              }
-            },
-            (anchorView, data) -> listClickListener.onItemLongClick(anchorView, data.getContactSearchKey()),
-            storyContextMenuCallbacks,
-            new CallButtonClickCallbacks()
-
-        ),
-        new ContactSelectionListAdapter.ArbitraryRepository()
+            @Override
+            public void onAnimationFinished(@NonNull RecyclerView.ViewHolder viewHolder) {
+              contactSearchView.setAlpha(1f);
+            }
+          });
+        }
    );

    return view;
@@ -461,30 +493,30 @@ public final class ContactSelectionListFragment extends LoggingFragment {
  }

  public @NonNull List<SelectedContact> getSelectedContacts() {
-    if (contactSearchMediator == null) {
+    if (contactSearchViewModel == null) {
      return Collections.emptyList();
    }

-    return contactSearchMediator.getSelectedContacts()
-                                .stream()
-                                .map(ContactSearchKey::requireSelectedContact)
-                                .collect(Collectors.toList());
+    return contactSearchViewModel.getSelectedContacts()
+                                 .stream()
+                                 .map(ContactSearchKey::requireSelectedContact)
+                                 .collect(Collectors.toList());
  }

  public int getSelectedContactsCount() {
-    if (contactSearchMediator == null) {
+    if (contactSearchViewModel == null) {
      return 0;
    }

-    return contactSearchMediator.getSelectedContacts().size();
+    return contactSearchViewModel.getSelectedContacts().size();
  }

  public int getTotalMemberCount() {
-    if (contactSearchMediator == null) {
+    if (contactSearchViewModel == null) {
      return 0;
    }

-    return getSelectedContactsCount() + contactSearchMediator.getFixedContactsSize();
+    return getSelectedContactsCount() + contactSearchViewModel.getFixedContactsSize();
  }

  private Set<RecipientId> getCurrentSelection() {
@@ -500,36 +532,23 @@ public final class ContactSelectionListFragment extends LoggingFragment {
               .request(Manifest.permission.WRITE_CONTACTS, Manifest.permission.READ_CONTACTS)
               .ifNecessary()
               .onAllGranted(() -> {
-                 recyclerView.setAlpha(0.5f);
+                 contactSearchView.setAlpha(0.5f);
                 if (!TextSecurePreferences.hasSuccessfullyRetrievedDirectory(getActivity())) {
                   handleContactPermissionGranted();
                 } else {
-                   contactSearchMediator.refresh();
+                   contactSearchViewModel.refresh();
                   if (onRefreshListener != null) {
                     swipeRefresh.setRefreshing(true);
                     onRefreshListener.onRefresh();
                   }
                 }
               })
-               .onAnyDenied(() -> contactSearchMediator.refresh())
+               .onAnyDenied(() -> contactSearchViewModel.refresh())
               .withPermanentDenialDialog(getString(R.string.ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts), null, R.string.ContactSelectionListFragment_allow_access_contacts, R.string.ContactSelectionListFragment_to_find_people, getParentFragmentManager())
               .execute();
  }

  private void initializeCursor() {
-    recyclerView.addItemDecoration(new LetterHeaderDecoration(requireContext(), this::hideLetterHeaders));
-    recyclerView.setAdapter(contactSearchMediator.getAdapter());
-    recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
-      @Override
-      public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
-        if (newState == RecyclerView.SCROLL_STATE_DRAGGING) {
-          if (scrollCallback != null) {
-            scrollCallback.onBeginScroll();
-          }
-        }
-      }
-    });
-
    if (onContactSelectedListener != null) {
      onContactSelectedListener.onSelectionChanged();
    }
@@ -547,7 +566,7 @@ public final class ContactSelectionListFragment extends LoggingFragment {
    this.resetPositionOnCommit = true;
    this.cursorFilter          = filter;

-    contactSearchMediator.onFilterChanged(filter);
+    contactSearchViewModel.setQuery(filter);
  }

  public void resetQueryFilter() {
@@ -558,7 +577,7 @@ public final class ContactSelectionListFragment extends LoggingFragment {
  public void onDataRefreshed() {
    this.resetPositionOnCommit = true;
    swipeRefresh.setRefreshing(false);
-    contactSearchMediator.refresh();
+    contactSearchViewModel.refresh();
  }

  public boolean hasQueryFilter() {
@@ -574,26 +593,25 @@ public final class ContactSelectionListFragment extends LoggingFragment {
  }

  public void reset() {
-    contactSearchMediator.clearSelection();
-    contactSearchMediator.refresh();
+    contactSearchViewModel.clearSelection();
+    contactSearchViewModel.refresh();
    fastScroller.setVisibility(View.GONE);
    headerActionView.setVisibility(View.GONE);
  }

  private void onLoadFinished(int count) {
-    if (resetPositionOnCommit) {
+    if (resetPositionOnCommit && innerRecyclerView != null) {
      resetPositionOnCommit = false;
-      recyclerView.scrollToPosition(0);
+      innerRecyclerView.scrollToPosition(0);
    }

    swipeRefresh.setVisibility(View.VISIBLE);

    emptyText.setText(R.string.contact_selection_group_activity__no_contacts);
    boolean useFastScroller = count > 20;
-    recyclerView.setVerticalScrollBarEnabled(!useFastScroller);
-    if (useFastScroller) {
+    if (useFastScroller && innerRecyclerView != null) {
      fastScroller.setVisibility(View.VISIBLE);
-      fastScroller.setRecyclerView(recyclerView);
+      fastScroller.setRecyclerView(innerRecyclerView);
    } else {
      fastScroller.setRecyclerView(null);
      fastScroller.setVisibility(View.GONE);
@@ -660,8 +678,8 @@ public final class ContactSelectionListFragment extends LoggingFragment {
    }

    Set<SelectedContact> toMarkSelected = contacts.stream()
-                                                  .filter(r -> !contactSearchMediator.getSelectedContacts()
-                                                                                     .contains(new ContactSearchKey.RecipientSearchKey(r, false)))
+                                                  .filter(r -> !contactSearchViewModel.getSelectedContacts()
+                                                                                      .contains(new ContactSearchKey.RecipientSearchKey(r, false)))
                                                  .map(SelectedContact::forRecipientId)
                                                  .collect(Collectors.toSet());

@@ -688,7 +706,7 @@ public final class ContactSelectionListFragment extends LoggingFragment {
        return;
      }

-      if (selectedContact.hasChatType() && !contactSearchMediator.getSelectedContacts().contains(selectedContact.toContactSearchKey())) {
+      if (selectedContact.hasChatType() && !contactSearchViewModel.getSelectedContacts().contains(selectedContact.toContactSearchKey())) {
        if (onContactSelectedListener != null) {
          onContactSelectedListener.onBeforeContactSelected(true, Optional.empty(), null, Optional.of(selectedContact.getChatType()), allowed -> {
            if (allowed) {
@@ -705,7 +723,7 @@ public final class ContactSelectionListFragment extends LoggingFragment {
        return;
      }

-      if (!isMulti || !contactSearchMediator.getSelectedContacts().contains(selectedContact.toContactSearchKey())) {
+      if (!isMulti || !contactSearchViewModel.getSelectedContacts().contains(selectedContact.toContactSearchKey())) {
        if (selectionHardLimitReached()) {
          if (onSelectionLimitReachedListener != null) {
            onSelectionLimitReachedListener.onHardLimitReached(selectionLimit.getHardLimit());
@@ -772,8 +790,8 @@ public final class ContactSelectionListFragment extends LoggingFragment {
    }

    public boolean onItemLongClick(View anchorView, ContactSearchKey item) {
-      if (onItemLongClickListener != null) {
-        return onItemLongClickListener.onLongClick(anchorView, item, recyclerView);
+      if (onItemLongClickListener != null && innerRecyclerView != null) {
+        return onItemLongClickListener.onLongClick(anchorView, item, innerRecyclerView);
      } else {
        return false;
      }
@@ -793,7 +811,7 @@ public final class ContactSelectionListFragment extends LoggingFragment {
  }

  public void markContactSelected(@NonNull SelectedContact selectedContact) {
-    contactSearchMediator.setKeysSelected(Collections.singleton(selectedContact.toContactSearchKey()));
+    contactSearchViewModel.setKeysSelected(Collections.singleton(selectedContact.toContactSearchKey()));
    if (isMulti) {
      addChipForSelectedContact(selectedContact);
    }
@@ -803,7 +821,7 @@ public final class ContactSelectionListFragment extends LoggingFragment {
  }

  private void markContactUnselected(@NonNull SelectedContact selectedContact) {
-    contactSearchMediator.setKeysNotSelected(Collections.singleton(selectedContact.toContactSearchKey()));
+    contactSearchViewModel.setKeysNotSelected(Collections.singleton(selectedContact.toContactSearchKey()));
    contactChipViewModel.remove(selectedContact);

    if (onContactSelectedListener != null) {
@@ -865,8 +883,8 @@ public final class ContactSelectionListFragment extends LoggingFragment {

    AutoTransition transition = new AutoTransition();
    transition.setDuration(CHIP_GROUP_REVEAL_DURATION_MS);
-    transition.excludeChildren(recyclerView, true);
-    transition.excludeTarget(recyclerView, true);
+    transition.excludeChildren(contactSearchView, true);
+    transition.excludeTarget(contactSearchView, true);
    TransitionManager.beginDelayedTransition(constraintLayout, transition);

    ConstraintSet constraintSet = new ConstraintSet();
@@ -44,7 +44,6 @@ import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
-import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
 import androidx.compose.material3.adaptive.layout.PaneAdaptedValue
 import androidx.compose.material3.adaptive.layout.PaneExpansionAnchor
 import androidx.compose.material3.adaptive.layout.ThreePaneScaffoldRole
@@ -61,6 +60,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.fragment.app.DialogFragment
@@ -73,7 +73,6 @@ import androidx.lifecycle.createSavedStateHandle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.recyclerview.widget.RecyclerView
-import androidx.window.core.layout.WindowSizeClass
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import io.reactivex.rxjava3.subjects.PublishSubject
 import io.reactivex.rxjava3.subjects.Subject
@@ -86,8 +85,8 @@ import kotlinx.coroutines.withContext
 import org.signal.core.ui.BottomSheetUtil
 import org.signal.core.ui.compose.Snackbars
 import org.signal.core.ui.compose.theme.SignalTheme
-import org.signal.core.ui.isSplitPane
 import org.signal.core.ui.permissions.Permissions
+import org.signal.core.ui.rememberIsSplitPane
 import org.signal.core.util.Util
 import org.signal.core.util.concurrent.LifecycleDisposable
 import org.signal.core.util.getParcelableCompat
@@ -429,15 +428,15 @@ class MainActivity :
        )
      }

-      val windowSizeClass = currentWindowAdaptiveInfo().windowSizeClass
+      val isSplitPane = LocalResources.current.rememberIsSplitPane()
      val contentLayoutData = MainContentLayoutData.rememberContentLayoutData(mainToolbarState.mode)

      MainContainer {
-        val wrappedNavigator = rememberNavigator(windowSizeClass, contentLayoutData, maxWidth)
+        val wrappedNavigator = rememberNavigator(isSplitPane, contentLayoutData, maxWidth)
        val listPaneWidth = contentLayoutData.rememberDefaultPanePreferredWidth(maxWidth)
        val navigationType = NavigationType.rememberNavigationType()

-        val anchors = remember(contentLayoutData, mainToolbarState) {
+        val anchors = remember(contentLayoutData, mainToolbarState, listPaneWidth, navigationType) {
          val halfPartitionWidth = contentLayoutData.partitionWidth / 2

          val detailOffset = when {
@@ -465,7 +464,7 @@ class MainActivity :
          anchors.indexOf(paneExpansionState.currentAnchor)
        }

-        LaunchedEffect(windowSizeClass) {
+        LaunchedEffect(anchors) {
          val index = when {
            paneAnchorIndex < 0 -> 1
            paneAnchorIndex > anchors.lastIndex -> anchors.lastIndex
@@ -478,7 +477,7 @@ class MainActivity :
          }
        }

-        val chatNavGraphState = ChatNavGraphState.remember(windowSizeClass)
+        val chatNavGraphState = ChatNavGraphState.remember(isSplitPane)
        val mutableInteractionSource = remember { MutableInteractionSource() }
        MainNavigationDetailLocationEffect(mainNavigationViewModel, chatNavGraphState::writeGraphicsLayerToBitmap)

@@ -521,15 +520,14 @@ class MainActivity :
                }.navigateToDetailLocation(location)
              }

-              is MainNavigationDetailLocation.Chats -> {
-                if (location is MainNavigationDetailLocation.Chats.Conversation) {
-                  chatNavGraphState.writeGraphicsLayerToBitmap()
-                }
+              is MainNavigationDetailLocation.Conversation -> {
+                chatNavGraphState.writeGraphicsLayerToBitmap()
                chatsNavHostController.navigateToDetailLocation(location)
              }

+              is MainNavigationDetailLocation.Chats -> chatsNavHostController.navigateToDetailLocation(location)
+              is MainNavigationDetailLocation.CallLinkDetails -> callsNavHostController.navigateToDetailLocation(location)
              is MainNavigationDetailLocation.Calls -> callsNavHostController.navigateToDetailLocation(location)
-
              is MainNavigationDetailLocation.Stories -> storiesNavHostController.navigateToDetailLocation(location)
            }
          }
@@ -624,7 +622,7 @@ class MainActivity :
                  onDestinationSelected = mainNavigationCallback
                )

-                if (!windowSizeClass.isSplitPane()) {
+                if (!LocalResources.current.rememberIsSplitPane()) {
                  Spacer(Modifier.navigationBarsPadding())
                }
              }
@@ -640,7 +638,7 @@ class MainActivity :
            }
          },
          secondaryContent = {
-            val listContainerColor = if (windowSizeClass.isSplitPane()) {
+            val listContainerColor = if (isSplitPane) {
              SignalTheme.colors.colorSurface1
            } else {
              MaterialTheme.colorScheme.surface
@@ -781,12 +779,12 @@ class MainActivity :
  @OptIn(ExperimentalMaterial3AdaptiveApi::class)
  @Composable
  private fun rememberNavigator(
-    windowSizeClass: WindowSizeClass,
+    isSplitPane: Boolean,
    contentLayoutData: MainContentLayoutData,
    maxWidth: Dp
  ): AppScaffoldNavigator<Any> {
    val scaffoldNavigator = rememberThreePaneScaffoldNavigatorDelegate(
-      isSplitPane = windowSizeClass.isSplitPane(),
+      isSplitPane = isSplitPane,
      horizontalPartitionSpacerSize = contentLayoutData.partitionWidth,
      defaultPanePreferredWidth = contentLayoutData.rememberDefaultPanePreferredWidth(maxWidth)
    )
@@ -800,18 +798,18 @@ class MainActivity :

  @Composable
  private fun MainContainer(content: @Composable BoxWithConstraintsScope.() -> Unit) {
-    val windowSizeClass = currentWindowAdaptiveInfo().windowSizeClass
+    val isSplitPane = LocalResources.current.rememberIsSplitPane()

    CompositionLocalProvider(LocalSnackbarStateConsumerRegistry provides mainNavigationViewModel.snackbarRegistry) {
      SignalTheme {
-        val backgroundColor = if (!windowSizeClass.isSplitPane()) {
+        val backgroundColor = if (!isSplitPane) {
          MaterialTheme.colorScheme.surface
        } else {
          SignalTheme.colors.colorSurface1
        }

        val modifier = when {
-          windowSizeClass.isSplitPane() -> {
+          isSplitPane -> {
            Modifier
              .systemBarsPadding()
              .displayCutoutPadding()
@@ -848,7 +846,7 @@ class MainActivity :

    val detailLocation = extras.getParcelableCompat(KEY_DETAIL_LOCATION, MainNavigationDetailLocation::class.java)
    if (detailLocation != null) {
-      mainNavigationViewModel.goTo(detailLocation)
+      goTo(detailLocation)
      return
    }

@@ -1034,7 +1032,7 @@ class MainActivity :
  private fun handleConversationIntent(intent: Intent) {
    if (ConversationIntents.isConversationIntent(intent)) {
      mainNavigationViewModel.goTo(MainNavigationListLocation.CHATS)
-      mainNavigationViewModel.goTo(MainNavigationDetailLocation.Chats.Conversation(ConversationIntents.readArgsFromBundle(intent.extras!!)))
+      mainNavigationViewModel.goTo(MainNavigationDetailLocation.Conversation(ConversationIntents.readArgsFromBundle(intent.extras!!)))
      intent.action = null
      setIntent(intent)
    }
@@ -50,7 +50,7 @@ public class MainNavigator {
                                                                      .withStartingPosition(startingPosition)
                                                                      .asIncognito(incognito)
                                                                      .toConversationArgs())
-                                               .subscribe(args -> viewModel.goTo(new MainNavigationDetailLocation.Chats.Conversation(args)));
+                                               .subscribe(args -> viewModel.goTo(new MainNavigationDetailLocation.Conversation(args)));

    lifecycleDisposable.add(disposable);
  }
@@ -16,7 +16,6 @@
 */
 package org.thoughtcrime.securesms;

-import android.animation.Animator;
 import android.app.KeyguardManager;
 import android.content.Context;
 import android.content.Intent;
@@ -49,7 +48,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;

 import org.signal.core.util.ThreadUtil;
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
 import org.thoughtcrime.securesms.components.AnimatingToggle;
 import org.thoughtcrime.securesms.crypto.InvalidPassphraseException;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
@@ -389,13 +387,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
      Log.i(TAG, "onAuthenticationSucceeded");

      lockScreenButton.setOnClickListener(null);
-      unlockView.addAnimatorListener(new AnimationCompleteListener() {
-        @Override
-        public void onAnimationEnd(Animator animation) {
-          handleAuthenticated();
-        }
-      });
-      unlockView.playAnimation();
+      handleAuthenticated();
    }

    @Override
@@ -10,12 +10,15 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.TaskStackBuilder;

+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.CommunicationActions;

 public class ShortcutLauncherActivity extends AppCompatActivity {

+  private static final String TAG = Log.tag(ShortcutLauncherActivity.class);
+
  private static final String KEY_RECIPIENT = "recipient_id";

  public static Intent createIntent(@NonNull Context context, @NonNull RecipientId recipientId) {
@@ -30,9 +33,18 @@ public class ShortcutLauncherActivity extends AppCompatActivity {
  protected void onCreate(@Nullable Bundle savedInstanceState) {
    super.onCreate(savedInstanceState);

-    String rawId = getIntent().getStringExtra(KEY_RECIPIENT);
+    String      rawId       = getIntent().getStringExtra(KEY_RECIPIENT);
+    RecipientId recipientId = null;

-    if (rawId == null) {
+    if (rawId != null) {
+      try {
+        recipientId = RecipientId.from(rawId);
+      } catch (Throwable t) {
+        Log.w(TAG, "Failed to parse recipientId from intent.", t);
+      }
+    }
+
+    if (recipientId == null) {
      Toast.makeText(this, R.string.ShortcutLauncherActivity_invalid_shortcut, Toast.LENGTH_SHORT).show();
      // TODO [greyson] Navigation
      startActivity(MainActivity.clearTop(this));
@@ -40,7 +52,7 @@ public class ShortcutLauncherActivity extends AppCompatActivity {
      return;
    }

-    Recipient        recipient = Recipient.live(RecipientId.from(rawId)).get();
+    Recipient        recipient = Recipient.live(recipientId).get();
    // TODO [greyson] Navigation
    TaskStackBuilder backStack = TaskStackBuilder.create(this)
                                                 .addNextIntent(MainActivity.clearTop(this));
@@ -99,8 +99,6 @@ object ApkUpdateInstaller {
    val packageInstaller: PackageInstaller = context.packageManager.packageInstaller

    val sessionParams = PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL).apply {
-      setAppPackageName(context.packageName)
-
      // 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) {
@@ -16,8 +16,8 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.media.AudioManager
 import org.signal.core.util.logging.Log
+import org.signal.core.util.safeUnregisterReceiver
 import org.thoughtcrime.securesms.dependencies.AppDependencies
-import org.thoughtcrime.securesms.util.safeUnregisterReceiver
 import org.thoughtcrime.securesms.webrtc.audio.SignalAudioHandler
 import java.util.concurrent.TimeUnit

@@ -19,6 +19,7 @@ import kotlinx.coroutines.flow.update
 import org.signal.core.util.bytes
 import org.signal.core.util.concurrent.SignalExecutors
 import org.signal.core.util.logging.Log
+import org.signal.core.util.safeUnregisterReceiver
 import org.signal.core.util.throttleLatest
 import org.thoughtcrime.securesms.BuildConfig
 import org.thoughtcrime.securesms.attachments.AttachmentId
@@ -31,7 +32,6 @@ import org.thoughtcrime.securesms.jobmanager.impl.DiskSpaceNotLowConstraint
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.jobmanager.impl.WifiConstraint
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.util.safeUnregisterReceiver
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.AtomicInteger
 import java.util.concurrent.atomic.AtomicLong
@@ -203,6 +203,7 @@ object ArchiveRestoreProgress {
          state.hasActivelyRestoredThisRun -> ArchiveRestoreProgressState.RestoreStatus.FINISHED
          else -> ArchiveRestoreProgressState.RestoreStatus.NONE
        }
+
        else -> {
          val availableBytes = SignalStore.backup.spaceAvailableOnDiskBytes

@@ -66,6 +66,11 @@ import org.signal.libsignal.messagebackup.BackupForwardSecrecyToken
 import org.signal.libsignal.zkgroup.VerificationFailedException
 import org.signal.libsignal.zkgroup.backups.BackupLevel
 import org.signal.libsignal.zkgroup.profiles.ProfileKey
+import org.signal.network.ApplicationErrorAction
+import org.signal.network.NetworkResult
+import org.signal.network.StatusCodeErrorAction
+import org.signal.network.api.SvrBApi
+import org.signal.network.exceptions.NonSuccessfulResponseCodeException
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.attachments.AttachmentId
 import org.thoughtcrime.securesms.attachments.Cdn
@@ -144,9 +149,6 @@ import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.ServiceUtil
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.thoughtcrime.securesms.util.toMillis
-import org.whispersystems.signalservice.api.ApplicationErrorAction
-import org.whispersystems.signalservice.api.NetworkResult
-import org.whispersystems.signalservice.api.StatusCodeErrorAction
 import org.whispersystems.signalservice.api.archive.ArchiveGetMediaItemsResponse
 import org.whispersystems.signalservice.api.archive.ArchiveKeyRotationLimitResponse
 import org.whispersystems.signalservice.api.archive.ArchiveMediaRequest
@@ -160,8 +162,6 @@ import org.whispersystems.signalservice.api.crypto.AttachmentCipherStreamUtil
 import org.whispersystems.signalservice.api.link.TransferArchiveResponse
 import org.whispersystems.signalservice.api.messages.AttachmentTransferProgress
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment.ProgressListener
-import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException
-import org.whispersystems.signalservice.api.svr.SvrBApi
 import org.whispersystems.signalservice.internal.crypto.PaddingInputStream
 import org.whispersystems.signalservice.internal.push.AttachmentUploadForm
 import org.whispersystems.signalservice.internal.push.AuthCredentials
@@ -1690,10 +1690,10 @@ object BackupRepository {
   *
   * It's important to note that in order to get this to the archive cdn, you still need to use [copyAttachmentToArchive].
   */
-  fun getAttachmentUploadForm(): NetworkResult<AttachmentUploadForm> {
+  fun getAttachmentUploadForm(uploadLength: Long): NetworkResult<AttachmentUploadForm> {
    return initBackupAndFetchAuth()
      .then { credential ->
-        SignalNetwork.archive.getMediaUploadForm(SignalStore.account.requireAci(), credential.mediaBackupAccess)
+        SignalNetwork.archive.getMediaUploadForm(SignalStore.account.requireAci(), credential.mediaBackupAccess, uploadLength)
      }
  }

@@ -2094,7 +2094,7 @@ object BackupRepository {
  }

  /**
-   * See [org.whispersystems.signalservice.api.archive.ArchiveApi.getSvrBAuthorization].
+   * See [org.signal.network.api.ArchiveApi.getSvrBAuthorization].
   */
  fun getSvrBAuth(): NetworkResult<AuthCredentials> {
    return initBackupAndFetchAuth()
@@ -322,7 +322,7 @@ class ChatItemArchiveExporter(
        }

        MessageTypes.isSessionSwitchoverType(record.type) -> {
-          builder.updateMessage = record.toRemoteSessionSwitchoverUpdate(record.dateSent) ?: continue
+          builder.updateMessage = record.toRemoteSessionSwitchoverUpdate(record.dateSent)?.takeIf { builder.authorIsAciContact(exportState) } ?: continue
          transformTimer.emit("sse")
        }

@@ -886,8 +886,8 @@ class ChatItemArchiveImporter(
          SimpleChatUpdate.Type.UNKNOWN -> typeWithoutBase
          SimpleChatUpdate.Type.JOINED_SIGNAL -> MessageTypes.JOINED_TYPE or typeWithoutBase
          SimpleChatUpdate.Type.IDENTITY_UPDATE -> MessageTypes.KEY_EXCHANGE_IDENTITY_UPDATE_BIT or typeWithoutBase
-          SimpleChatUpdate.Type.IDENTITY_VERIFIED -> MessageTypes.KEY_EXCHANGE_IDENTITY_VERIFIED_BIT or typeWithoutBase
-          SimpleChatUpdate.Type.IDENTITY_DEFAULT -> MessageTypes.KEY_EXCHANGE_IDENTITY_DEFAULT_BIT or typeWithoutBase
+          SimpleChatUpdate.Type.IDENTITY_VERIFIED -> MessageTypes.KEY_EXCHANGE_IDENTITY_VERIFIED_BIT or typeWithoutBase or MessageTypes.BASE_SENT_TYPE
+          SimpleChatUpdate.Type.IDENTITY_DEFAULT -> MessageTypes.KEY_EXCHANGE_IDENTITY_DEFAULT_BIT or typeWithoutBase or MessageTypes.BASE_SENT_TYPE
          SimpleChatUpdate.Type.CHANGE_NUMBER -> MessageTypes.CHANGE_NUMBER_TYPE
          SimpleChatUpdate.Type.RELEASE_CHANNEL_DONATION_REQUEST -> MessageTypes.RELEASE_CHANNEL_DONATION_REQUEST_TYPE
          SimpleChatUpdate.Type.END_SESSION -> MessageTypes.END_SESSION_BIT or typeWithoutBase
@@ -14,6 +14,7 @@ import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.supervisorScope
 import org.signal.archive.local.ArchivedFilesReader
 import org.signal.core.models.backup.MediaName
 import org.signal.core.util.Stopwatch
@@ -122,6 +123,57 @@ class ArchiveFileSystem private constructor(private val context: Context, root:
    fun openInputStream(context: Context, uri: Uri): InputStream? {
      return context.contentResolver.openInputStream(uri)
    }
+
+    /**
+     * Recursively delete the entire SignalBackups directory using parallelized SAF calls.
+     */
+    @JvmStatic
+    @JvmOverloads
+    fun deleteAll(signalBackupsDir: DocumentFile, progressListener: AllFilesProgressListener? = null) {
+      Log.i(TAG, "Deleting all backup data")
+
+      val units = mutableListOf<DocumentFile>()
+      for (child in signalBackupsDir.listFiles()) {
+        if (child.isDirectory && child.name == "files") {
+          units += child.listFiles()
+        } else {
+          units += child
+        }
+      }
+
+      if (units.isEmpty()) {
+        signalBackupsDir.delete()
+        return
+      }
+
+      val total = units.size
+      val completed = AtomicInteger(0)
+      val deleted = AtomicInteger(0)
+      val concurrency = Runtime.getRuntime().availableProcessors().coerceAtMost(8)
+      val chunkSize = ((total + concurrency - 1) / concurrency).coerceAtLeast(1)
+
+      runBlocking {
+        coroutineScope {
+          units.chunked(chunkSize).map { chunk ->
+            async(Dispatchers.IO) {
+              for (unit in chunk) {
+                if (unit.delete()) {
+                  deleted.incrementAndGet()
+                }
+                progressListener?.onProgress(completed.incrementAndGet(), total)
+              }
+            }
+          }.awaitAll()
+        }
+      }
+
+      for (child in signalBackupsDir.listFiles()) {
+        child.delete()
+      }
+      signalBackupsDir.delete()
+
+      Log.d(TAG, "Deleted ${deleted.get()}/$total top-level units")
+    }
  }

  private val signalBackups: DocumentFile
@@ -236,8 +288,14 @@ class ArchiveFileSystem private constructor(private val context: Context, root:
  /**
   * Clean up unused files in the shared files directory leveraged across all current snapshots. A file
   * is unused if it is not referenced directly by any current snapshots.
+   *
+   * @param allFilesProgressListener reports progress of the enumeration phase (fast, 256 shards)
+   * @param deletionProgressListener reports progress of the deletion phase (slow, potentially thousands of SAF calls). Fires from multiple threads.
   */
-  fun deleteUnusedFiles(allFilesProgressListener: AllFilesProgressListener? = null) {
+  fun deleteUnusedFiles(
+    allFilesProgressListener: AllFilesProgressListener? = null,
+    deletionProgressListener: AllFilesProgressListener? = null
+  ) {
    Log.i(TAG, "Deleting unused files")

    val allFiles: MutableMap<String, DocumentFileInfo> = filesFileSystem.allFiles(allFilesProgressListener).toMutableMap()
@@ -251,16 +309,38 @@ class ArchiveFileSystem private constructor(private val context: Context, root:
        }
      }

-    var deleted = 0
-    allFiles
-      .values
-      .forEach {
-        if (it.documentFile.delete()) {
-          deleted++
-        }
-      }
+    val toDelete = allFiles.values.toList()
+    val total = toDelete.size
+    if (total == 0) {
+      Log.d(TAG, "Cleanup removed 0/0 files")
+      return
+    }

-    Log.d(TAG, "Cleanup removed $deleted/${allFiles.size} files")
+    val deleted = AtomicInteger(0)
+    val completed = AtomicInteger(0)
+    val concurrency = Runtime.getRuntime().availableProcessors().coerceAtMost(8)
+    val chunkSize = ((total + concurrency - 1) / concurrency).coerceAtLeast(1)
+
+    runBlocking {
+      supervisorScope {
+        toDelete.chunked(chunkSize).map { chunk ->
+          async(Dispatchers.IO) {
+            try {
+              for (info in chunk) {
+                if (info.documentFile.delete()) {
+                  deleted.incrementAndGet()
+                }
+                deletionProgressListener?.onProgress(completed.incrementAndGet(), total)
+              }
+            } catch (e: Exception) {
+              Log.w(TAG, "Failed to clean up a chunk.", e)
+            }
+          }
+        }.awaitAll()
+      }
+    }
+
+    Log.d(TAG, "Cleanup removed ${deleted.get()}/$total files")
  }

  /** Useful metadata for a given archive snapshot */
@@ -333,9 +333,10 @@ private fun BackupFailedBody() {
    append(stringResource(id = R.string.BackupAlertBottomSheet__an_error_occurred))
    append(" ")

+    val link = stringResource(R.string.remote_backup_support_url)
    withLink(
      LinkAnnotation.Clickable(tag = "learn-more") {
-        CommunicationActions.openBrowserLink(context, context.getString(R.string.remote_backup_support_url))
+        CommunicationActions.openBrowserLink(context, link)
      }
    ) {
      withStyle(SpanStyle(color = MaterialTheme.colorScheme.primary)) {
@@ -31,10 +31,11 @@ class NoRemoteStorageSpaceAvailableBottomSheet : ComposeBottomSheetDialogFragmen
  @Composable
  override fun SheetContent() {
    val context = LocalContext.current
+    val supportUrl = stringResource(R.string.remote_backup_support_url)

    NoRemoteStorageSpaceAvailableBottomSheetContent(
      onLearnMoreClick = {
-        CommunicationActions.openBrowserLink(context, context.getString(R.string.remote_backup_support_url))
+        CommunicationActions.openBrowserLink(context, supportUrl)
      },
      onContactSupportClick = {
        ContactSupportDialogFragment.create(
@@ -20,6 +20,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalLocale
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString.Builder
@@ -37,7 +38,6 @@ import org.signal.core.ui.compose.Previews
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.keyvalue.BackupValues
 import org.thoughtcrime.securesms.util.DateUtils
-import java.util.Locale
 import kotlin.time.Duration.Companion.days
 import org.signal.core.ui.R as CoreUiR

@@ -53,7 +53,7 @@ fun BackupCreateErrorRow(
  onLearnMoreClick: () -> Unit = {}
 ) {
  val context = LocalContext.current
-  val locale = Locale.getDefault()
+  val locale = LocalLocale.current

  when (error) {
    BackupValues.BackupCreationError.TRANSIENT -> {
@@ -82,7 +82,7 @@ fun BackupCreateErrorRow(
    BackupValues.BackupCreationError.BACKUP_FILE_TOO_LARGE -> {
      BackupAlertText {
        if (lastMessageCutoffTime > 0) {
-          append(stringResource(R.string.BackupStatusRow__not_backing_up_old_messages, DateUtils.getDayPrecisionTimeString(context, locale, lastMessageCutoffTime)))
+          append(stringResource(R.string.BackupStatusRow__not_backing_up_old_messages, DateUtils.getDayPrecisionTimeString(context, locale.platformLocale, lastMessageCutoffTime)))
        } else {
          append(stringResource(R.string.BackupStatusRow__backup_file_too_large))
        }
@@ -91,7 +91,7 @@ fun BackupCreateErrorRow(

    BackupValues.BackupCreationError.NOT_ENOUGH_DISK_SPACE -> {
      BackupAlertText {
-        append(stringResource(R.string.BackupStatusRow__not_enough_disk_space, DateUtils.getDayPrecisionTimeString(context, locale, lastMessageCutoffTime)))
+        append(stringResource(R.string.BackupStatusRow__not_enough_disk_space, DateUtils.getDayPrecisionTimeString(context, locale.platformLocale, lastMessageCutoffTime)))
      }
    }
  }
@@ -43,6 +43,7 @@ import org.signal.core.models.AccountEntropyPool
 import org.signal.core.ui.compose.Buttons
 import org.signal.core.ui.compose.horizontalGutters
 import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.TemporaryScreenshotSecurity
 import org.thoughtcrime.securesms.fonts.MonoTypeface
 import org.thoughtcrime.securesms.registration.ui.restore.BackupKeyVisualTransformation
 import org.thoughtcrime.securesms.registration.ui.restore.attachBackupKeyAutoFillHelper
@@ -59,6 +60,8 @@ fun EnterKeyScreen(
  captionContent: @Composable () -> Unit,
  seeKeyButton: @Composable () -> Unit
 ) {
+  TemporaryScreenshotSecurity.bind()
+
  Column(
    verticalArrangement = Arrangement.SpaceBetween,
    modifier = Modifier
@@ -90,7 +93,8 @@ fun EnterKeyScreen(

      val updateEnteredBackupKey = { input: String ->
        enteredBackupKey = AccountEntropyPool.removeIllegalCharacters(input).uppercase()
-        isBackupKeyValid = enteredBackupKey == backupKey
+        val normalized = AccountEntropyPool.formatForStorage(enteredBackupKey)
+        isBackupKeyValid = normalized.equals(AccountEntropyPool.formatForStorage(backupKey), ignoreCase = true)
        showError = !isBackupKeyValid && enteredBackupKey.length >= backupKey.length
      }

@@ -59,6 +59,7 @@ import org.signal.core.ui.compose.horizontalGutters
 import org.signal.core.ui.compose.theme.SignalTheme
 import org.signal.core.util.Util
 import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.TemporaryScreenshotSecurity
 import org.thoughtcrime.securesms.components.settings.app.backups.remote.BackupKeyCredentialManagerHandler
 import org.thoughtcrime.securesms.components.settings.app.backups.remote.BackupKeySaveState
 import org.thoughtcrime.securesms.fonts.MonoTypeface
@@ -133,6 +134,8 @@ fun MessageBackupsKeyRecordScreen(
  mode: MessageBackupsKeyRecordMode = MessageBackupsKeyRecordMode.Next(onNextClick = {}),
  notifyKeyIsSameAsOnDeviceBackupKey: Boolean = false
 ) {
+  TemporaryScreenshotSecurity.bind()
+
  val snackbarHostState = remember { SnackbarHostState() }
  val backupKeyString = remember(backupKey) {
    backupKey.chunked(4).joinToString("  ")
@@ -108,9 +108,10 @@ fun VerifyBackupPinScreen(
    append(stringResource(id = R.string.VerifyBackupPinScreen__enter_the_backup_key_that_you_recorded))
    append(" ")

+    val supportUrl = stringResource(R.string.remote_backup_support_url)
    withLink(
      LinkAnnotation.Clickable(tag = "learn-more") {
-        CommunicationActions.openBrowserLink(context, context.getString(R.string.remote_backup_support_url))
+        CommunicationActions.openBrowserLink(context, supportUrl)
      }
    ) {
      withStyle(SpanStyle(color = MaterialTheme.colorScheme.primary)) {
@@ -10,8 +10,8 @@ import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
 import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
-import org.thoughtcrime.securesms.components.settings.app.subscription.models.CurrencySelection
-import org.thoughtcrime.securesms.components.settings.app.subscription.models.NetworkFailure
+import org.thoughtcrime.securesms.components.settings.app.subscription.ui.CurrencySelection
+import org.thoughtcrime.securesms.components.settings.app.subscription.ui.NetworkFailure
 import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.components.settings.models.IndeterminateLoadingCircle
 import org.thoughtcrime.securesms.components.settings.models.SplashImage
@@ -16,7 +16,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
-import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -27,6 +26,7 @@ import androidx.compose.ui.Alignment.Companion.End
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextRange
@@ -43,7 +43,7 @@ import org.signal.core.ui.compose.Buttons
 import org.signal.core.ui.compose.ComposeDialogFragment
 import org.signal.core.ui.compose.Scaffolds
 import org.signal.core.ui.compose.SignalIcons
-import org.signal.core.ui.isSplitPane
+import org.signal.core.ui.rememberIsSplitPane
 import org.signal.core.util.BreakIteratorCompat
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.calls.links.details.CallLinkDetailsViewModel
@@ -109,7 +109,7 @@ fun EditCallLinkNameScreen(
    onNavigationClick = {
      backPressedDispatcherOwner?.onBackPressedDispatcher?.onBackPressed()
    },
-    showNavigationIcon = !currentWindowAdaptiveInfo().windowSizeClass.isSplitPane()
+    showNavigationIcon = !LocalResources.current.rememberIsSplitPane()
  )
 }

@@ -16,9 +16,8 @@ import androidx.fragment.app.FragmentActivity
 import org.signal.core.ui.compose.theme.SignalTheme
 import org.signal.core.util.getParcelableExtraCompat
 import org.thoughtcrime.securesms.calls.links.EditCallLinkNameDialogFragment
+import org.thoughtcrime.securesms.main.MainNavigationCallDetailRouter
 import org.thoughtcrime.securesms.main.MainNavigationDetailLocation
-import org.thoughtcrime.securesms.main.MainNavigationListLocation
-import org.thoughtcrime.securesms.main.MainNavigationRouter
 import org.thoughtcrime.securesms.service.webrtc.links.CallLinkRoomId
 import org.thoughtcrime.securesms.util.viewModel

@@ -56,23 +55,17 @@ class CallLinkDetailsActivity : FragmentActivity() {
    }
  }

-  private inner class Router : MainNavigationRouter {
-    override fun goTo(location: MainNavigationDetailLocation) {
+  private inner class Router : MainNavigationCallDetailRouter {
+    override fun goToCallDetail(location: MainNavigationDetailLocation.Calls) {
      when (location) {
        is MainNavigationDetailLocation.Calls.CallLinks.EditCallLinkName -> {
          EditCallLinkNameDialogFragment().apply {
            arguments = bundleOf(EditCallLinkNameDialogFragment.ARG_NAME to viewModel.nameSnapshot)
          }.show(supportFragmentManager, null)
        }
-
-        is MainNavigationDetailLocation.Empty -> {
-          finishAfterTransition()
-        }
-
-        else -> error("Unsupported route $location")
      }
    }

-    override fun goTo(location: MainNavigationListLocation) = Unit
+    override fun exitDetailLocation() = finishAfterTransition()
  }
 }
@@ -15,12 +15,12 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.SnackbarHostState
-import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.core.app.ShareCompat
@@ -37,7 +37,7 @@ import org.signal.core.ui.compose.Rows
 import org.signal.core.ui.compose.Scaffolds
 import org.signal.core.ui.compose.SignalIcons
 import org.signal.core.ui.compose.Snackbars
-import org.signal.core.ui.isSplitPane
+import org.signal.core.ui.rememberIsSplitPane
 import org.signal.core.util.Util
 import org.signal.core.util.concurrent.LifecycleDisposable
 import org.signal.ringrtc.CallLinkState.Restrictions
@@ -46,8 +46,8 @@ import org.thoughtcrime.securesms.calls.YouAreAlreadyInACallSnackbar.YouAreAlrea
 import org.thoughtcrime.securesms.calls.links.CallLinks
 import org.thoughtcrime.securesms.calls.links.SignalCallRow
 import org.thoughtcrime.securesms.database.CallLinkTable
+import org.thoughtcrime.securesms.main.MainNavigationCallDetailRouter
 import org.thoughtcrime.securesms.main.MainNavigationDetailLocation
-import org.thoughtcrime.securesms.main.MainNavigationRouter
 import org.thoughtcrime.securesms.main.MainNavigationViewModel
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.service.webrtc.links.CallLinkCredentials
@@ -63,7 +63,7 @@ fun CallLinkDetailsScreen(
  viewModel: CallLinkDetailsViewModel = viewModel {
    CallLinkDetailsViewModel(roomId)
  },
-  router: MainNavigationRouter = viewModel<MainNavigationViewModel>(viewModelStoreOwner = LocalActivity.current as ComponentActivity) {
+  router: MainNavigationCallDetailRouter = viewModel<MainNavigationViewModel>(viewModelStoreOwner = LocalActivity.current as ComponentActivity) {
    error("Should already be created.")
  }
 ) {
@@ -83,14 +83,14 @@ fun CallLinkDetailsScreen(
    state = state,
    showAlreadyInACall = showAlreadyInACall,
    callback = callback,
-    showNavigationIcon = !currentWindowAdaptiveInfo().windowSizeClass.isSplitPane()
+    showNavigationIcon = !LocalResources.current.rememberIsSplitPane()
  )
 }

 class DefaultCallLinkDetailsCallback(
  private val activity: FragmentActivity,
  private val viewModel: CallLinkDetailsViewModel,
-  private val router: MainNavigationRouter
+  private val router: MainNavigationCallDetailRouter
 ) : CallLinkDetailsCallback {

  private val lifecycleDisposable = LifecycleDisposable()
@@ -113,7 +113,7 @@ class DefaultCallLinkDetailsCallback(
  }

  override fun onEditNameClicked() {
-    router.goTo(MainNavigationDetailLocation.Calls.CallLinks.EditCallLinkName(callLinkRoomId = viewModel.recipientSnapshot!!.requireCallLinkRoomId()))
+    router.goToCallDetail(MainNavigationDetailLocation.Calls.CallLinks.EditCallLinkName(callLinkRoomId = viewModel.recipientSnapshot!!.requireCallLinkRoomId()))
  }

  override fun onShareClicked() {
@@ -152,7 +152,7 @@ class DefaultCallLinkDetailsCallback(
    viewModel.setDisplayRevocationDialog(false)
    activity.lifecycleScope.launch {
      if (viewModel.delete()) {
-        router.goTo(MainNavigationDetailLocation.Empty)
+        router.exitDetailLocation()
      }
    }
  }
@@ -324,13 +324,16 @@ class CallLogAdapter(
        return
      }

-      presentRecipientDetails(model.call.peer, model.call.searchQuery)
+      presentRecipientDetails(model.call)
      presentCallInfo(model.call, model.call.date)
      presentCallType(model)
    }

-    private fun presentRecipientDetails(recipient: Recipient, searchQuery: String?) {
-      binding.callRecipientAvatar.setAvatar(Glide.with(binding.callRecipientAvatar), recipient, true)
+    private fun presentRecipientDetails(call: CallLogRow.Call) {
+      val recipient = call.peer
+      val searchQuery = call.searchQuery
+      binding.callRecipientAvatar.setAvatar(Glide.with(binding.callRecipientAvatar), recipient, false)
+      binding.callRecipientAvatar.setOnClickListener { onCallClicked(call) }
      binding.callRecipientBadge.setBadgeFromRecipient(recipient)
      binding.callRecipientName.text = if (searchQuery != null) {
        SearchUtil.getHighlightedSpan(
@@ -23,7 +23,6 @@ import io.reactivex.rxjava3.kotlin.subscribeBy
 import kotlinx.coroutines.launch
 import org.signal.core.ui.BottomSheetUtil
 import org.signal.core.ui.compose.Snackbars
-import org.signal.core.ui.getWindowSizeClass
 import org.signal.core.ui.isSplitPane
 import org.signal.core.util.DimensionUnit
 import org.signal.core.util.concurrent.LifecycleDisposable
@@ -133,7 +132,7 @@ class CallLogFragment : Fragment(R.layout.call_log_fragment), CallLogAdapter.Cal
        val filteredCount = callLogAdapter.submitCallRows(
          data,
          selected,
-          activeCallLogRowId = activeRowId.orNull().takeIf { resources.getWindowSizeClass().isSplitPane() },
+          activeCallLogRowId = activeRowId.orNull().takeIf { resources.isSplitPane() },
          viewModel.callLogPeekHelper.localDeviceCallRecipientId,
          scrollToPositionDelegate::notifyListCommitted
        )
@@ -187,7 +186,7 @@ class CallLogFragment : Fragment(R.layout.call_log_fragment), CallLogAdapter.Cal
      }
    }

-    if (!resources.getWindowSizeClass().isSplitPane()) {
+    if (!resources.isSplitPane()) {
      ViewUtil.setBottomMargin(binding.bottomActionBar, ViewUtil.getNavigationBarHeight(binding.bottomActionBar))
    }

@@ -334,7 +333,7 @@ class CallLogFragment : Fragment(R.layout.call_log_fragment), CallLogAdapter.Cal
    if (viewModel.selectionStateSnapshot.isNotEmpty(binding.recycler.adapter!!.itemCount)) {
      viewModel.toggleSelected(callLogRow.id)
    } else {
-      mainNavigationViewModel.goTo(MainNavigationDetailLocation.Calls.CallLinks.CallLinkDetails(callLogRow.record.roomId))
+      mainNavigationViewModel.goTo(MainNavigationDetailLocation.CallLinkDetails(callLogRow.record.roomId))
    }
  }

@@ -25,7 +25,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.dp
@@ -214,7 +213,8 @@ private fun UserMessagesHost(
  onDismiss: (UserMessage) -> Unit,
  snackbarHostState: SnackbarHostState
 ) {
-  val context = LocalContext.current
+  val youAreAlreadyInACall = stringResource(R.string.CommunicationActions__you_are_already_in_a_call)
+  val errorRetrievingContacts = stringResource(R.string.ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection)

  when (userMessage) {
    null -> {}
@@ -228,14 +228,14 @@ private fun UserMessagesHost(

    is UserMessage.UserAlreadyInAnotherCall -> LaunchedEffect(userMessage) {
      snackbarHostState.showSnackbar(
-        message = context.getString(R.string.CommunicationActions__you_are_already_in_a_call)
+        message = youAreAlreadyInACall
      )
      onDismiss(userMessage)
    }

    is UserMessage.ContactsRefreshFailed -> LaunchedEffect(userMessage) {
      snackbarHostState.showSnackbar(
-        message = context.getString(R.string.ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection)
+        message = errorRetrievingContacts
      )
      onDismiss(userMessage)
    }
@@ -15,6 +15,7 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.signal.core.util.logging.Log
+import org.signal.network.NetworkResult
 import org.thoughtcrime.securesms.calls.new.NewCallUiState.CallType
 import org.thoughtcrime.securesms.calls.new.NewCallUiState.UserMessage
 import org.thoughtcrime.securesms.contacts.sync.ContactDiscovery
@@ -25,7 +26,6 @@ import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.recipients.RecipientRepository
 import org.thoughtcrime.securesms.recipients.ui.RecipientSelection
-import org.whispersystems.signalservice.api.NetworkResult

 class NewCallViewModel : ViewModel() {
  companion object {
@@ -63,6 +63,7 @@ public final class AudioView extends FrameLayout {
  @NonNull  private final AnimatingToggle     controlToggle;
  @NonNull  private final View                progressAndPlay;
  @NonNull  private final LottieAnimationView playPauseButton;
+  @NonNull  private final View                downloadContainer;
  @NonNull  private final ImageView           downloadButton;
  @Nullable private final ProgressWheel       circleProgress;
  @NonNull  private final SeekBar             seekBar;
@@ -121,13 +122,14 @@ public final class AudioView extends FrameLayout {
          throw new IllegalStateException("Unsupported mode: " + mode);
      }

-      this.controlToggle   = findViewById(R.id.control_toggle);
-      this.playPauseButton = findViewById(R.id.play);
-      this.progressAndPlay = findViewById(R.id.progress_and_play);
-      this.downloadButton  = findViewById(R.id.download);
-      this.circleProgress  = findViewById(R.id.circle_progress);
-      this.seekBar         = findViewById(R.id.seek);
-      this.duration        = findViewById(R.id.duration);
+      this.controlToggle     = findViewById(R.id.control_toggle);
+      this.playPauseButton   = findViewById(R.id.play);
+      this.progressAndPlay   = findViewById(R.id.progress_and_play);
+      this.downloadContainer = findViewById(R.id.download_container);
+      this.downloadButton    = findViewById(R.id.download);
+      this.circleProgress    = findViewById(R.id.circle_progress);
+      this.seekBar           = findViewById(R.id.seek);
+      this.duration          = findViewById(R.id.duration);

      lottieDirection = REVERSE;
      this.playPauseButton.setOnClickListener(new PlayPauseClickedListener());
@@ -168,6 +170,7 @@ public final class AudioView extends FrameLayout {

  public void setProgressAndPlayBackgroundTint(@ColorInt int color) {
    progressAndPlay.getBackground().setColorFilter(color, PorterDuff.Mode.SRC_IN);
+    downloadContainer.getBackground().setColorFilter(color, PorterDuff.Mode.SRC_IN);
  }

  public Observer<VoiceNotePlaybackState> getPlaybackStateObserver() {
@@ -195,7 +198,7 @@ public final class AudioView extends FrameLayout {
    }

    if (showControls && audio.isPendingDownload()) {
-      controlToggle.displayQuick(downloadButton);
+      controlToggle.displayQuick(downloadContainer);
      seekBar.setEnabled(false);
      downloadButton.setOnClickListener(new DownloadClickedListener(audio));
      if (circleProgress != null) {
@@ -30,11 +30,12 @@ import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.target.Target;
 import com.bumptech.glide.request.transition.Transition;

+import org.signal.core.util.ContextUtil;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.avatar.fallback.FallbackAvatar;
 import org.thoughtcrime.securesms.avatar.fallback.FallbackAvatarDrawable;
-import org.thoughtcrime.securesms.components.settings.conversation.ConversationSettingsActivity;
+import org.thoughtcrime.securesms.components.settings.conversation.ConversationSettingsNavigator;
 import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.SystemContactPhoto;
@@ -53,9 +54,7 @@ import java.util.List;
 import java.util.Objects;

 public final class AvatarImageView extends AppCompatImageView {
-
  private static final int SIZE_LARGE = 1;
-  private static final int SIZE_SMALL = 2;

  @SuppressWarnings("unused")
  private static final String TAG = Log.tag(AvatarImageView.class);
@@ -156,10 +155,10 @@ public final class AvatarImageView extends AppCompatImageView {

  public void setAvatar(@NonNull RequestManager requestManager, @Nullable Recipient recipient, boolean quickContactEnabled, boolean useSelfProfileAvatar, boolean useBlurGradient) {
    setAvatar(requestManager, recipient, new AvatarOptions.Builder(this)
-                                                          .withUseSelfProfileAvatar(useSelfProfileAvatar)
-                                                          .withQuickContactEnabled(quickContactEnabled)
-                                                          .withUseBlurGradient(useBlurGradient)
-                                                          .build());
+        .withUseSelfProfileAvatar(useSelfProfileAvatar)
+        .withQuickContactEnabled(quickContactEnabled)
+        .withUseBlurGradient(useBlurGradient)
+        .build());
  }

  private void setAvatar(@Nullable Recipient recipient, @NonNull AvatarOptions avatarOptions) {
@@ -182,8 +181,8 @@ public final class AvatarImageView extends AppCompatImageView {

      if (!photo.equals(recipientContactPhoto) || shouldBlur != blurred || !Objects.equals(chatColors, this.chatColors) || !Objects.equals(initials, this.initials)) {
        requestManager.clear(this);
-        this.chatColors = chatColors;
-        this.initials   = initials;
+        this.chatColors       = chatColors;
+        this.initials         = initials;
        recipientContactPhoto = photo;

        FallbackAvatarProvider activeFallbackPhotoProvider = this.fallbackAvatarProvider;
@@ -215,12 +214,12 @@ public final class AvatarImageView extends AppCompatImageView {
          List<Transformation<Bitmap>> transforms = Collections.singletonList(new CircleCrop());

          RequestBuilder<Drawable> request = requestManager.load(photo.contactPhoto)
-                                                         .fallback(fallback)
-                                                         .error(fallback)
-                                                         .diskCacheStrategy(DiskCacheStrategy.ALL)
-                                                         .downsample(DownsampleStrategy.CENTER_INSIDE)
-                                                         .transform(new MultiTransformation<>(transforms))
-                                                         .addListener(redownloadRequestListener);
+                                                           .fallback(fallback)
+                                                           .error(fallback)
+                                                           .diskCacheStrategy(DiskCacheStrategy.ALL)
+                                                           .downsample(DownsampleStrategy.CENTER_INSIDE)
+                                                           .transform(new MultiTransformation<>(transforms))
+                                                           .addListener(redownloadRequestListener);

          if (wasUnblurred) {
            blurred = shouldBlur;
@@ -260,17 +259,12 @@ public final class AvatarImageView extends AppCompatImageView {
  private void setAvatarClickHandler(@NonNull final Recipient recipient, boolean quickContactEnabled) {
    if (quickContactEnabled) {
      super.setOnClickListener(v -> {
-        Context context = getContext();
+        FragmentActivity activity = ContextUtil.requireFragmentActivity(getContext());
+
        if (recipient.isPushGroup()) {
-          context.startActivity(ConversationSettingsActivity.forGroup(context, recipient.requireGroupId().requirePush()),
-                                ConversationSettingsActivity.createTransitionBundle(context, this));
+          ConversationSettingsNavigator.navigate(activity, recipient);
        } else {
-          if (context instanceof FragmentActivity) {
-            RecipientBottomSheetDialogFragment.show(((FragmentActivity) context).getSupportFragmentManager(), recipient.getId(), null);
-          } else {
-            context.startActivity(ConversationSettingsActivity.forRecipient(context, recipient.getId()),
-                                  ConversationSettingsActivity.createTransitionBundle(context, this));
-          }
+          RecipientBottomSheetDialogFragment.show(activity.getSupportFragmentManager(), recipient.getId(), null);
        }
      });
    } else {
@@ -283,13 +277,13 @@ public final class AvatarImageView extends AppCompatImageView {
    Drawable fallback = new FallbackAvatarDrawable(getContext(), new FallbackAvatar.Resource.Group(color)).circleCrop();

    Glide.with(this)
-            .load(avatarBytes)
-            .dontAnimate()
-            .fallback(fallback)
-            .error(fallback)
-            .diskCacheStrategy(DiskCacheStrategy.ALL)
-            .circleCrop()
-            .into(this);
+         .load(avatarBytes)
+         .dontAnimate()
+         .fallback(fallback)
+         .error(fallback)
+         .diskCacheStrategy(DiskCacheStrategy.ALL)
+         .circleCrop()
+         .into(this);
  }

  public void setNonAvatarImageResource(@DrawableRes int imageResource) {
@@ -308,7 +302,8 @@ public final class AvatarImageView extends AppCompatImageView {
    }
  }

-  private static class DefaultFallbackAvatarProvider implements FallbackAvatarProvider {}
+  private static class DefaultFallbackAvatarProvider implements FallbackAvatarProvider {
+  }

  private static class RecipientContactPhoto {

@@ -254,7 +254,11 @@ public class ConversationItemFooter extends ConstraintLayout {
                                 }
                               });

-      dateView.setMaxWidth(ViewUtil.dpToPx(32));
+      ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) dateView.getLayoutParams();
+      params.startToEnd = R.id.footer_audio_playback_speed_toggle;
+      params.constrainedWidth = true;
+      params.horizontalBias = 1f;
+      dateView.setLayoutParams(params);
  }

  private void hidePlaybackSpeedToggle() {
@@ -276,7 +280,11 @@ public class ConversationItemFooter extends ConstraintLayout {
                                 }
                               });

-      dateView.setMaxWidth(Integer.MAX_VALUE);
+      ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) dateView.getLayoutParams();
+      params.startToEnd = ConstraintLayout.LayoutParams.UNSET;
+      params.constrainedWidth = false;
+      params.horizontalBias = 0.5f;
+      dateView.setLayoutParams(params);
  }

  private @NonNull Rect getPlaybackSpeedToggleTouchDelegateRect() {
@@ -9,10 +9,10 @@ import androidx.annotation.DrawableRes;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;

+import org.signal.core.util.ContextUtil;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.emoji.SimpleEmojiTextView;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.util.ContextUtil;
 import org.thoughtcrime.securesms.util.DrawableUtil;
 import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.SpanUtil;
@@ -152,7 +152,7 @@ open class InsetAwareConstraintLayout @JvmOverloads constructor(
    val isLtr = ViewUtil.isLtr(this)

    val statusBar = windowInsets.top
-    val navigationBar = navigationBarInsetOverride ?: if (windowInsets.bottom == 0 && Build.VERSION.SDK_INT <= 29) {
+    val navigationBar = navigationBarInsetOverride ?: if (windowInsets.bottom == 0 && Build.VERSION.SDK_INT <= 29 && !ViewUtil.isGestureNavigation(resources, insets)) {
      ViewUtil.getNavigationBarHeight(resources)
    } else {
      windowInsets.bottom
@@ -0,0 +1,45 @@
+package org.thoughtcrime.securesms.components
+
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.ColorFilter
+import android.graphics.Matrix
+import android.graphics.Paint
+import android.graphics.PixelFormat
+import android.graphics.Shader
+import android.graphics.drawable.Drawable
+
+/**
+ * Draws [bitmap] as a repeating tiled pattern rotated by [rotationDegrees].
+ */
+class RotatedTiledDrawable(
+  private val bitmap: Bitmap,
+  private val rotationDegrees: Float
+) : Drawable() {
+
+  private val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
+    shader = android.graphics.BitmapShader(bitmap, Shader.TileMode.REPEAT, Shader.TileMode.REPEAT)
+  }
+
+  override fun onBoundsChange(bounds: android.graphics.Rect) {
+    paint.shader.setLocalMatrix(
+      Matrix().apply { setRotate(rotationDegrees, bounds.exactCenterX(), bounds.exactCenterY()) }
+    )
+  }
+
+  override fun draw(canvas: Canvas) {
+    canvas.drawRect(bounds, paint)
+  }
+
+  override fun setAlpha(alpha: Int) {
+    paint.alpha = alpha
+    invalidateSelf()
+  }
+
+  override fun setColorFilter(colorFilter: ColorFilter?) {
+    paint.colorFilter = colorFilter
+    invalidateSelf()
+  }
+
+  override fun getOpacity(): Int = PixelFormat.TRANSLUCENT
+}
@@ -5,18 +5,41 @@

 package org.thoughtcrime.securesms.components

+import android.view.Window
 import android.view.WindowManager
 import androidx.activity.ComponentActivity
+import androidx.activity.compose.LocalActivity
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import org.thoughtcrime.securesms.util.TextSecurePreferences
+import java.util.WeakHashMap

 /**
 * Applies temporary screenshot security for the given component lifecycle.
+ *
+ * Multiple callers can request security on the same window concurrently; the
+ * flag is only cleared once every caller has released its hold.
 */
 object TemporaryScreenshotSecurity {

+  private val activeHolds = WeakHashMap<Window, Int>()
+
+  @Composable
+  fun bind() {
+    val activity = LocalActivity.current as? ComponentActivity ?: return
+
+    DisposableEffect(activity) {
+      acquire(activity)
+
+      onDispose {
+        release(activity)
+      }
+    }
+  }
+
  @JvmStatic
  fun bindToViewLifecycleOwner(fragment: Fragment) {
    val observer = LifecycleObserver { fragment.requireActivity() }
@@ -31,21 +54,37 @@ object TemporaryScreenshotSecurity {
    activity.lifecycle.addObserver(observer)
  }

+  private fun acquire(activity: ComponentActivity) {
+    val window = activity.window
+    val previous = activeHolds[window] ?: 0
+    activeHolds[window] = previous + 1
+    if (previous == 0 && !TextSecurePreferences.isScreenSecurityEnabled(activity)) {
+      window.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
+    }
+  }
+
+  private fun release(activity: ComponentActivity) {
+    val window = activity.window
+    val next = ((activeHolds[window] ?: 0) - 1).coerceAtLeast(0)
+    if (next == 0) {
+      activeHolds.remove(window)
+      if (!TextSecurePreferences.isScreenSecurityEnabled(activity)) {
+        window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
+      }
+    } else {
+      activeHolds[window] = next
+    }
+  }
+
  private class LifecycleObserver(
    private val activityProvider: () -> ComponentActivity
  ) : DefaultLifecycleObserver {
    override fun onResume(owner: LifecycleOwner) {
-      val activity = activityProvider()
-      if (!TextSecurePreferences.isScreenSecurityEnabled(activity)) {
-        activity.window.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
-      }
+      acquire(activityProvider())
    }

    override fun onPause(owner: LifecycleOwner) {
-      val activity = activityProvider()
-      if (!TextSecurePreferences.isScreenSecurityEnabled(activity)) {
-        activity.window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
-      }
+      release(activityProvider())
    }
  }
 }
@@ -36,6 +36,7 @@ import com.bumptech.glide.request.Request;
 import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.RequestOptions;

+import org.signal.core.models.media.TransformProperties;
 import org.signal.core.util.concurrent.ListenableFuture;
 import org.signal.core.util.concurrent.SettableFuture;
 import org.signal.core.util.logging.Log;
@@ -608,7 +609,14 @@ public class ThumbnailView extends FrameLayout {
  }

  private RequestBuilder<Drawable> buildThumbnailRequestBuilder(@NonNull RequestManager requestManager, @NonNull Slide slide) {
-    RequestBuilder<Drawable> requestBuilder = applySizing(requestManager.load(new DecryptableUri(Objects.requireNonNull(slide.getDisplayUri())))
+    long                videoTrimStartTimeUs = 0;
+    TransformProperties transformProperties  = slide.asAttachment().transformProperties;
+
+    if (transformProperties != null && !transformProperties.shouldSkipTransform()) {
+      videoTrimStartTimeUs = transformProperties.videoTrimStartTimeUs;
+    }
+
+    RequestBuilder<Drawable> requestBuilder = applySizing(requestManager.load(new DecryptableUri(Objects.requireNonNull(slide.getDisplayUri()), videoTrimStartTimeUs))
                                                              .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
                                                              .downsample(SignalDownsampleStrategy.CENTER_OUTSIDE_NO_UPSCALE)
                                                              .transition(withCrossFade()));
@@ -69,12 +69,14 @@ fun <Reason> SendSupportEmailEffect(
  filterRes: ContactSupportCallbacks.StringForReason<Reason>,
  hide: () -> Unit
 ) {
+  val subject = stringResource(subjectRes(contactSupportState.reason))
+  val helpDebugLog = stringResource(R.string.HelpFragment__debug_log)
+
  val context = LocalContext.current
  LaunchedEffect(contactSupportState.sendEmail) {
    if (contactSupportState.sendEmail) {
-      val subject = context.getString(subjectRes(contactSupportState.reason))
      val prefix = if (contactSupportState.debugLogUrl != null) {
-        "\n${context.getString(R.string.HelpFragment__debug_log)} ${contactSupportState.debugLogUrl}\n\n"
+        "\n$helpDebugLog ${contactSupportState.debugLogUrl}\n\n"
      } else {
        ""
      }
@@ -15,11 +15,11 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.LinearSmoothScroller;
 import androidx.recyclerview.widget.RecyclerView;

+import org.signal.core.util.ContextUtil;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiPageViewGridAdapter.EmojiHeader;
 import org.thoughtcrime.securesms.components.emoji.EmojiPageViewGridAdapter.EmojiNoResultsModel;
 import org.thoughtcrime.securesms.components.emoji.EmojiPageViewGridAdapter.VariationSelectorListener;
-import org.thoughtcrime.securesms.util.ContextUtil;
 import org.thoughtcrime.securesms.util.DrawableUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel;
@@ -243,7 +243,11 @@ public class EmojiTextView extends AppCompatTextView {
            return;
          }

-          textView.setPrecomputedText(precomputedTextCompat);
+          try {
+            textView.setPrecomputedText(precomputedTextCompat);
+          } catch (IllegalArgumentException e) {
+            textView.setText(text, type);
+          }

          if (textView.sizeChangeInProgress) {
            textView.sizeChangeInProgress = false;
@@ -1,17 +1,15 @@
 package org.thoughtcrime.securesms.components.emoji;

 import android.content.Context;
-import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;

 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatImageButton;

+import org.signal.core.util.ContextUtil;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.keyboard.KeyboardPage;
-import org.thoughtcrime.securesms.util.ContextUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;

 public class EmojiToggle extends AppCompatImageButton implements MediaKeyboard.MediaKeyboardListener {
@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.components.emoji;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
-import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
@@ -15,6 +14,7 @@ import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;

+import org.signal.core.util.ContextUtil;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.InputAwareLayout.InputView;
@@ -29,12 +29,12 @@ public class MediaKeyboard extends FrameLayout implements InputView {
  private static final String EMOJI_SEARCH = "emoji_search_fragment";

  @Nullable private MediaKeyboardListener keyboardListener;
-            private boolean               isInitialised;
-            private int                   latestKeyboardHeight;
-            private State                 keyboardState;
-            private KeyboardPagerFragment keyboardPagerFragment;
-            private FragmentManager       fragmentManager;
-            private int                   mediaKeyboardTheme;
+  private boolean               isInitialised;
+  private int                   latestKeyboardHeight;
+  private State                 keyboardState;
+  private KeyboardPagerFragment keyboardPagerFragment;
+  private FragmentManager       fragmentManager;
+  private int                   mediaKeyboardTheme;

  public MediaKeyboard(Context context) {
    this(context, null);
@@ -175,7 +175,7 @@ public class MediaKeyboard extends FrameLayout implements InputView {
      LayoutInflater.from(getContext()).inflate(R.layout.media_keyboard, this, true);

      if (fragmentManager == null) {
-        FragmentActivity activity = resolveActivity(getContext());
+        FragmentActivity activity = ContextUtil.requireFragmentActivity(getContext());
        fragmentManager = activity.getSupportFragmentManager();
      }

@@ -188,25 +188,17 @@ public class MediaKeyboard extends FrameLayout implements InputView {
                     .replace(R.id.media_keyboard_fragment_container, keyboardPagerFragment, TAG)
                     .commitNowAllowingStateLoss();

-      keyboardState         = State.NORMAL;
-      latestKeyboardHeight  = -1;
-      isInitialised         = true;
-    }
-  }
-
-  private static FragmentActivity resolveActivity(@Nullable Context context) {
-    if (context instanceof FragmentActivity) {
-      return (FragmentActivity) context;
-    } else if (context instanceof ContextThemeWrapper) {
-      return resolveActivity(((ContextThemeWrapper) context).getBaseContext());
-    } else {
-      throw new IllegalStateException("Could not locate FragmentActivity");
+      keyboardState        = State.NORMAL;
+      latestKeyboardHeight = -1;
+      isInitialised        = true;
    }
  }

  public interface MediaKeyboardListener {
    void onShown();
+
    void onHidden();
+
    void onKeyboardChanged(@NonNull KeyboardPage page);
  }

@@ -11,9 +11,9 @@ import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.core.graphics.drawable.DrawableCompat;

+import org.signal.core.util.ContextUtil;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.spoiler.SpoilerAnnotation;
-import org.thoughtcrime.securesms.util.ContextUtil;
 import org.thoughtcrime.securesms.util.DrawableUtil;
 import org.signal.core.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
@@ -83,7 +83,7 @@ class AppSettingsActivity : DSLSettingsActivity(), GooglePayComponent {
        )

        AppSettingsRoute.ChatsRoute.Chats -> AppSettingsFragmentDirections.actionDirectToChatsSettingsFragment()
-        AppSettingsRoute.BackupsRoute.Backups -> AppSettingsFragmentDirections.actionDirectToBackupsSettingsFragment()
+        is AppSettingsRoute.BackupsRoute.Backups -> AppSettingsFragmentDirections.actionDirectToBackupsSettingsFragment().setLaunchCheckoutFlow(appSettingsRoute.launchCheckoutFlow)
        AppSettingsRoute.Invite -> AppSettingsFragmentDirections.actionDirectToInviteFragment()
        AppSettingsRoute.DataAndStorageRoute.DataAndStorage -> AppSettingsFragmentDirections.actionDirectToStoragePreferenceFragment()
        else -> error("Unsupported start location: ${appSettingsRoute?.javaClass?.name}")
@@ -233,7 +233,8 @@ class AppSettingsActivity : DSLSettingsActivity(), GooglePayComponent {
    }

    @JvmStatic
-    fun backupsSettings(context: Context): Intent = getIntentForStartLocation(context, AppSettingsRoute.BackupsRoute.Backups)
+    @JvmOverloads
+    fun backupsSettings(context: Context, launchCheckoutFlow: Boolean = false): Intent = getIntentForStartLocation(context, AppSettingsRoute.BackupsRoute.Backups(launchCheckoutFlow = launchCheckoutFlow))

    @JvmStatic
    fun invite(context: Context): Intent = getIntentForStartLocation(context, AppSettingsRoute.Invite)
@@ -312,49 +312,49 @@ private fun AppSettingsContent(
              enabled = isRegisteredAndUpToDate
            )
          }
+        }

-          item {
-            val context = LocalContext.current
-            val donateUrl = stringResource(R.string.donate_url)
+        item {
+          val context = LocalContext.current
+          val donateUrl = stringResource(R.string.donate_url)

-            Rows.TextRow(
-              text = {
-                Text(
-                  text = stringResource(R.string.preferences__donate_to_signal),
-                  modifier = Modifier.weight(1f)
-                )
+          Rows.TextRow(
+            text = {
+              Text(
+                text = stringResource(R.string.preferences__donate_to_signal),
+                modifier = Modifier.weight(1f)
+              )

-                if (state.hasExpiredGiftBadge) {
-                  Icon(
-                    painter = painterResource(R.drawable.symbol_info_fill_24),
-                    tint = colorResource(R.color.signal_accent_primary),
-                    contentDescription = null
-                  )
-                }
-              },
-              icon = {
+              if (state.hasExpiredGiftBadge) {
                Icon(
-                  painter = painterResource(R.drawable.symbol_heart_24),
-                  contentDescription = null,
-                  tint = MaterialTheme.colorScheme.onSurface
+                  painter = painterResource(R.drawable.symbol_info_fill_24),
+                  tint = colorResource(R.color.signal_accent_primary),
+                  contentDescription = null
                )
-              },
-              onClick = {
-                if (state.allowUserToGoToDonationManagementScreen) {
-                  callbacks.navigate(AppSettingsRoute.DonationsRoute.Donations())
-                } else {
-                  CommunicationActions.openBrowserLink(context, donateUrl)
-                }
-              },
-              onLongClick = {
-                callbacks.copyDonorBadgeSubscriberIdToClipboard()
              }
-            )
-          }
+            },
+            icon = {
+              Icon(
+                painter = painterResource(R.drawable.symbol_heart_24),
+                contentDescription = null,
+                tint = MaterialTheme.colorScheme.onSurface
+              )
+            },
+            onClick = {
+              if (state.allowUserToGoToDonationManagementScreen) {
+                callbacks.navigate(AppSettingsRoute.DonationsRoute.Donations())
+              } else {
+                CommunicationActions.openBrowserLink(context, donateUrl)
+              }
+            },
+            onLongClick = {
+              callbacks.copyDonorBadgeSubscriberIdToClipboard()
+            }
+          )
+        }

-          item {
-            Dividers.Default()
-          }
+        item {
+          Dividers.Default()
        }

        item {
@@ -417,7 +417,7 @@ private fun AppSettingsContent(
              icon = SignalIcons.Backup.imageVector,
              text = stringResource(R.string.preferences_chats__backups),
              onClick = {
-                callbacks.navigate(AppSettingsRoute.BackupsRoute.Backups)
+                callbacks.navigate(AppSettingsRoute.BackupsRoute.Backups())
              },
              onLongClick = {
                callbacks.copyRemoteBackupsSubscriberIdToClipboard()
@@ -5,10 +5,10 @@ import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.databind.node.ObjectNode
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.schedulers.Schedulers
+import org.signal.network.NetworkResult
 import org.thoughtcrime.securesms.net.SignalNetwork
 import org.thoughtcrime.securesms.providers.BlobProvider
 import org.thoughtcrime.securesms.util.JsonUtils
-import org.whispersystems.signalservice.api.NetworkResult

 class ExportAccountDataRepository {

@@ -21,6 +21,7 @@ import org.signal.core.util.logging.Log
 import org.signal.core.util.money.FiatMoney
 import org.signal.core.util.throttleLatest
 import org.signal.donations.InAppPaymentType
+import org.signal.network.NetworkResult
 import org.thoughtcrime.securesms.backup.v2.BackupRepository
 import org.thoughtcrime.securesms.backup.v2.MessageBackupTier
 import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsType
@@ -33,7 +34,6 @@ import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
 import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.InternetConnectionObserver
-import org.whispersystems.signalservice.api.NetworkResult
 import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
 import java.math.BigDecimal
 import java.util.Currency
@@ -31,6 +31,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalLocale
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
@@ -38,6 +39,7 @@ import androidx.compose.ui.unit.dp
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.fragment.findNavController
+import androidx.navigation.fragment.navArgs
 import kotlinx.coroutines.delay
 import org.signal.core.ui.compose.Buttons
 import org.signal.core.ui.compose.ComposeFragment
@@ -62,6 +64,7 @@ import org.thoughtcrime.securesms.util.navigation.safeNavigate
 import java.math.BigDecimal
 import java.util.Currency
 import java.util.Locale
+import kotlin.getValue
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.days
 import kotlin.time.Duration.Companion.minutes
@@ -76,11 +79,16 @@ class BackupsSettingsFragment : ComposeFragment() {
  private lateinit var checkoutLauncher: ActivityResultLauncher<MessageBackupTier?>

  private val viewModel: BackupsSettingsViewModel by viewModels()
+  private val args: BackupsSettingsFragmentArgs by navArgs()

  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
    checkoutLauncher = createBackupsCheckoutLauncher {
      findNavController().safeNavigate(R.id.action_backupsSettingsFragment_to_remoteBackupsSettingsFragment)
    }
+
+    if (savedInstanceState == null && args.launchCheckoutFlow) {
+      checkoutLauncher.launch(null)
+    }
  }

  @Composable
@@ -500,6 +508,7 @@ private fun ActiveBackupsRow(
          style = MaterialTheme.typography.bodyLarge
        )

+        val locale = LocalLocale.current.platformLocale
        when (val type = backupState.messageBackupsType) {
          is MessageBackupsType.Paid -> {
            val body = if (backupState is BackupState.Canceled) {
@@ -507,13 +516,13 @@ private fun ActiveBackupsRow(
            } else if (type.pricePerMonth.amount == BigDecimal.ZERO) {
              stringResource(
                R.string.BackupsSettingsFragment_renews_s,
-                DateUtils.formatDateWithYear(Locale.getDefault(), backupState.renewalTime.inWholeMilliseconds)
+                DateUtils.formatDateWithYear(locale, backupState.renewalTime.inWholeMilliseconds)
              )
            } else {
              stringResource(
                R.string.BackupsSettingsFragment_s_month_renews_s,
                FiatMoneyUtil.format(LocalContext.current.resources, type.pricePerMonth),
-                DateUtils.formatDateWithYear(Locale.getDefault(), backupState.renewalTime.inWholeMilliseconds)
+                DateUtils.formatDateWithYear(locale, backupState.renewalTime.inWholeMilliseconds)
              )
            }

@@ -4,6 +4,7 @@
 */
 package org.thoughtcrime.securesms.components.settings.app.backups.local

+import android.annotation.SuppressLint
 import android.content.Intent
 import android.net.Uri
 import android.widget.Toast
@@ -176,6 +177,7 @@ class LocalBackupsFragment : ComposeFragment() {
  }
 }

+@SuppressLint("LocalContextGetResourceValueCall")
@Composable
 private fun rememberChooseBackupLocationLauncher(backStack: NavBackStack<NavKey>): ActivityResultLauncher<Uri?> {
  val context = LocalContext.current
@@ -233,7 +233,15 @@ internal fun LocalBackupsSettingsScreen(
  }

  if (state.isDeleting) {
-    Dialogs.IndeterminateProgressDialog(message = stringResource(id = R.string.BackupDialog_deleting_local_backup))
+    val message = stringResource(id = R.string.BackupDialog_deleting_local_backup)
+    if (state.deleteTotal > 0) {
+      Dialogs.DeterminateProgressDialog(
+        message = message,
+        progress = { state.deleteCompleted.toFloat() / state.deleteTotal }
+      )
+    } else {
+      Dialogs.IndeterminateProgressDialog(message = message)
+    }
  }
 }

@@ -19,5 +19,7 @@ data class LocalBackupsSettingsState(
  val folderDisplayName: String? = null,
  val scheduleTimeLabel: String? = null,
  val progress: LocalBackupCreationProgress = LocalBackupCreationProgress(idle = LocalBackupCreationProgress.Idle()),
-  val isDeleting: Boolean = false
+  val isDeleting: Boolean = false,
+  val deleteCompleted: Int = 0,
+  val deleteTotal: Int = 0
 )
@@ -113,7 +113,7 @@ class LocalBackupsViewModel : ViewModel(), BackupKeyCredentialManagerHandler {
  }

  fun turnOffAndDelete(context: Context) {
-    internalSettingsState.update { it.copy(isDeleting = true) }
+    internalSettingsState.update { it.copy(isDeleting = true, deleteCompleted = 0, deleteTotal = 0) }

    viewModelScope.launch {
      withContext(Dispatchers.IO) {
@@ -121,10 +121,12 @@ class LocalBackupsViewModel : ViewModel(), BackupKeyCredentialManagerHandler {
        val path = SignalStore.backup.newLocalBackupsDirectory
        SignalStore.backup.newLocalBackupsDirectory = null
        AppDependencies.jobManager.cancelAllInQueue(LocalBackupJob.QUEUE)
-        BackupUtil.deleteUnifiedBackups(context, path)
+        BackupUtil.deleteUnifiedBackups(context, path) { completed, total ->
+          internalSettingsState.update { it.copy(deleteCompleted = completed, deleteTotal = total) }
+        }
      }

-      internalSettingsState.update { it.copy(isDeleting = false) }
+      internalSettingsState.update { it.copy(isDeleting = false, deleteCompleted = 0, deleteTotal = 0) }
    }
  }

@@ -16,12 +16,12 @@ import kotlinx.coroutines.withContext
 import org.signal.core.models.AccountEntropyPool
 import org.signal.core.util.concurrent.SignalDispatchers
 import org.signal.core.util.logging.Log
+import org.signal.network.NetworkResult
 import org.thoughtcrime.securesms.backup.v2.BackupRepository
 import org.thoughtcrime.securesms.backup.v2.StagedBackupKeyRotations
 import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.RestoreOptimizedMediaJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.whispersystems.signalservice.api.NetworkResult

 class BackupKeyDisplayViewModel : ViewModel(), BackupKeyCredentialManagerHandler {

@@ -49,12 +49,12 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalLocale
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.painterResource
@@ -1052,9 +1052,10 @@ private fun BackupCard(
            else -> error("Not supported here.")
          }

+          val locale = LocalLocale.current.platformLocale
          if (backupState.renewalTime > 0.seconds) {
            Text(
-              text = stringResource(resource, DateUtils.formatDateWithYear(Locale.getDefault(), backupState.renewalTime.inWholeMilliseconds))
+              text = stringResource(resource, DateUtils.formatDateWithYear(locale, backupState.renewalTime.inWholeMilliseconds))
            )
          }
        }
@@ -1874,8 +1875,10 @@ private fun ErrorCardPreview() {
@Composable
 private fun PendingCardPreview() {
  Previews.Preview {
+    val locale = LocalLocale.current.platformLocale
+
    PendingCard(
-      price = FiatMoney(BigDecimal.TEN, Currency.getInstance(Locale.getDefault()))
+      price = FiatMoney(BigDecimal.TEN, Currency.getInstance(locale))
    )
  }
 }
@@ -29,6 +29,7 @@ import org.signal.core.util.logging.Log
 import org.signal.core.util.mebiBytes
 import org.signal.core.util.throttleLatest
 import org.signal.donations.InAppPaymentType
+import org.signal.network.NetworkResult
 import org.thoughtcrime.securesms.backup.ArchiveUploadProgress
 import org.thoughtcrime.securesms.backup.DeletionState
 import org.thoughtcrime.securesms.backup.v2.ArchiveRestoreProgress
@@ -51,7 +52,6 @@ import org.thoughtcrime.securesms.keyvalue.protos.ArchiveUploadProgressState
 import org.thoughtcrime.securesms.util.Environment
 import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.TextSecurePreferences
-import org.whispersystems.signalservice.api.NetworkResult
 import kotlin.time.Duration.Companion.days
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
@@ -21,6 +21,7 @@ import org.signal.libsignal.protocol.state.SignalProtocolStore
 import org.signal.libsignal.protocol.state.SignedPreKeyRecord
 import org.signal.libsignal.protocol.util.KeyHelper
 import org.signal.libsignal.protocol.util.Medium
+import org.signal.network.NetworkResult
 import org.thoughtcrime.securesms.crypto.PreKeyUtil
 import org.thoughtcrime.securesms.database.IdentityTable
 import org.thoughtcrime.securesms.database.SignalDatabase
@@ -36,7 +37,6 @@ import org.thoughtcrime.securesms.pin.SvrWrongPinException
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.registration.viewmodel.SvrAuthCredentialSet
 import org.thoughtcrime.securesms.storage.StorageSyncHelper
-import org.whispersystems.signalservice.api.NetworkResult
 import org.whispersystems.signalservice.api.SignalServiceAccountManager
 import org.whispersystems.signalservice.api.SignalServiceMessageSender
 import org.whispersystems.signalservice.api.SvrNoDataException
@@ -147,7 +147,7 @@ class ChangeNumberRepository(
    Log.i(TAG, "Submitting prekeys with PNI identity key: ${pniIdentityKeyPair.publicKey.fingerprint}")

    retryChangeLocalNumberNetworkOperation {
-      SignalNetwork.keys.setPreKeys(
+      SignalNetwork.keys.setPreKeysSync(
        PreKeyUpload(
          serviceIdType = ServiceIdType.PNI,
          signedPreKey = signedPreKey,
@@ -5,11 +5,11 @@

 package org.thoughtcrime.securesms.components.settings.app.changenumber

+import org.signal.network.NetworkResult
+import org.signal.network.exceptions.NonSuccessfulResponseCodeException
 import org.thoughtcrime.securesms.pin.SvrWrongPinException
 import org.thoughtcrime.securesms.registration.data.network.RegistrationResult
-import org.whispersystems.signalservice.api.NetworkResult
 import org.whispersystems.signalservice.api.SvrNoDataException
-import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException
 import org.whispersystems.signalservice.api.svr.Svr3Credentials
 import org.whispersystems.signalservice.internal.push.AuthCredentials
 import org.whispersystems.signalservice.internal.push.PushServiceSocket.RegistrationLockFailure
@@ -103,6 +103,10 @@ class ChangeNumberVerifyFragment : LoggingFragment(R.layout.fragment_change_phon

          is VerificationCodeRequestResult.ChallengeRequired -> {
            Log.i(TAG, "Unable to request sms code due to challenges required: ${castResult.challenges.joinToString { it.key }}")
+            if (castResult.challenges.isEmpty()) {
+              Log.w(TAG, "Challenge required but no challenges listed, showing error.")
+              showErrorDialog(R.string.RegistrationActivity_sms_provider_error)
+            }
          }

          is VerificationCodeRequestResult.RateLimited -> {
@@ -27,6 +27,7 @@ import org.signal.core.util.bytes
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.compose.rememberStatusBarColorNestedScrollModifier
 import org.thoughtcrime.securesms.mms.SentMediaQuality
+import org.thoughtcrime.securesms.util.AttachmentUtil
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 import org.thoughtcrime.securesms.webrtc.CallDataMode
 import kotlin.math.abs
@@ -169,6 +170,21 @@ private fun DataAndStorageSettingsScreen(
        )
      }

+      item {
+        Rows.TextRow(
+          text = {
+            Text(
+              text = stringResource(
+                R.string.DataAndStorageSettingsFragment__voice_messages_and_stickers_under_size_are_always_auto_downloaded,
+                AttachmentUtil.SMALL_ATTACHMENT_SIZE.toUnitString()
+              ),
+              style = MaterialTheme.typography.bodyMedium,
+              color = MaterialTheme.colorScheme.onSurfaceVariant
+            )
+          }
+        )
+      }
+
      item {
        Dividers.Default()
      }
@@ -207,12 +207,21 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter

      switchPref(
        title = DSLSettingsText.from("Force split pane UI on phones."),
+        isEnabled = !state.forceSinglePane,
        isChecked = state.forceSplitPane,
        onClick = {
          viewModel.setForceSplitPane(!state.forceSplitPane)
        }
      )

+      switchPref(
+        title = DSLSettingsText.from("Force single-pane on newer devices."),
+        isChecked = state.forceSinglePane,
+        onClick = {
+          viewModel.setForceSinglePane(!state.forceSinglePane)
+        }
+      )
+
      clickPref(
        title = DSLSettingsText.from("Display enable permission sheet"),
        onClick = {
@@ -370,6 +379,14 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter
        }
      )

+      switchPref(
+        title = DSLSettingsText.from("Enable ANR-induced crashing"),
+        isChecked = SignalStore.internal.anrDetectionCrashes,
+        onClick = {
+          SignalStore.internal.anrDetectionCrashes = !SignalStore.internal.anrDetectionCrashes
+        }
+      )
+
      dividerPref()

      sectionHeaderPref(DSLSettingsText.from("Logging"))
@@ -8,6 +8,7 @@ import org.thoughtcrime.securesms.database.MessageTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.RemoteMegaphoneRecord
 import org.thoughtcrime.securesms.database.model.addButton
+import org.thoughtcrime.securesms.database.model.addLink
 import org.thoughtcrime.securesms.database.model.addStyle
 import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList
 import org.thoughtcrime.securesms.dependencies.AppDependencies
@@ -48,9 +49,12 @@ class InternalSettingsRepository(context: Context) {

      val title = "Release Note Title"
      val bodyText = "Release note body. Aren't I awesome?"
-      val body = "$title\n\n$bodyText"
+      val linkUrl = "https://signal.org"
+      val body = "$title\n\n$bodyText\n\n$linkUrl"
+      val linkStart = body.length - linkUrl.length
      val bodyRangeList = BodyRangeList.Builder()
        .addStyle(BodyRangeList.BodyRange.Style.BOLD, 0, title.length)
+        .addLink(linkUrl, linkStart, linkUrl.length)

      bodyRangeList.addButton("Call to Action Text", callToAction, body.lastIndex, 0)

@@ -31,6 +31,7 @@ data class InternalSettingsState(
  val hasPendingOneTimeDonation: Boolean,
  val hevcEncoding: Boolean,
  val forceSplitPane: Boolean,
+  val forceSinglePane: Boolean,
  val useNewMediaActivity: Boolean,
  val disableInternalUser: Boolean
 )
@@ -203,6 +203,7 @@ class InternalSettingsViewModel(private val repository: InternalSettingsReposito
    hasPendingOneTimeDonation = SignalStore.inAppPayments.getPendingOneTimeDonation() != null,
    hevcEncoding = SignalStore.internal.hevcEncoding,
    forceSplitPane = SignalStore.internal.forceSplitPane,
+    forceSinglePane = SignalStore.internal.forceSinglePane,
    useNewMediaActivity = SignalStore.internal.useNewMediaActivity,
    disableInternalUser = RemoteConfig.internalUserDisabled
  )
@@ -225,6 +226,11 @@ class InternalSettingsViewModel(private val repository: InternalSettingsReposito
    refresh()
  }

+  fun setForceSinglePane(forceSinglePane: Boolean) {
+    SignalStore.internal.forceSinglePane = forceSinglePane
+    refresh()
+  }
+
  class Factory(private val repository: InternalSettingsRepository) : ViewModelProvider.Factory {
    override fun <T : ViewModel> create(modelClass: Class<T>): T {
      return requireNotNull(modelClass.cast(InternalSettingsViewModel(repository)))
@@ -503,7 +503,7 @@ fun Screen(
        text = "Copy Account Entropy Pool (AEP)",
        label = "Copies the Account Entropy Pool (AEP) to the clipboard, which is labeled as the \"Backup Key\" in the designs.",
        onClick = {
-          Util.copyToClipboard(context, SignalStore.account.accountEntropyPool.value)
+          Util.copyToClipboard(context, SignalStore.account.accountEntropyPool.displayValue)
          Toast.makeText(context, "Copied!", Toast.LENGTH_SHORT).show()
        }
      )
@@ -37,6 +37,8 @@ import org.signal.core.util.readNBytesOrThrow
 import org.signal.core.util.roundedString
 import org.signal.core.util.stream.LimitedInputStream
 import org.signal.libsignal.zkgroup.profiles.ProfileKey
+import org.signal.network.NetworkResult
+import org.signal.network.api.SvrBApi
 import org.thoughtcrime.securesms.attachments.AttachmentId
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment
 import org.thoughtcrime.securesms.backup.ArchiveUploadProgress
@@ -57,8 +59,6 @@ import org.thoughtcrime.securesms.keyvalue.protos.LocalBackupCreationProgress
 import org.thoughtcrime.securesms.net.SignalNetwork
 import org.thoughtcrime.securesms.providers.BlobProvider
 import org.thoughtcrime.securesms.recipients.Recipient
-import org.whispersystems.signalservice.api.NetworkResult
-import org.whispersystems.signalservice.api.svr.SvrBApi
 import java.io.FileOutputStream
 import java.io.IOException
 import java.io.InputStream
@@ -50,8 +50,8 @@ import org.signal.core.ui.compose.ComposeFragment
 import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.SignalIcons
+import org.signal.core.util.Hex
 import org.signal.core.util.Util
-import org.signal.libsignal.protocol.util.Hex
 import org.thoughtcrime.securesms.components.settings.app.internal.sqlite.InternalSqlitePlaygroundViewModel.QueryResult

 class InternalSqlitePlaygroundFragment : ComposeFragment() {
@@ -16,11 +16,11 @@ import kotlinx.coroutines.withContext
 import org.signal.core.util.ByteSize
 import org.signal.core.util.bytes
 import org.signal.core.util.logging.Log
+import org.signal.network.service.StorageServiceService
 import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.whispersystems.signalservice.api.storage.SignalStorageManifest
 import org.whispersystems.signalservice.api.storage.SignalStorageRecord
-import org.whispersystems.signalservice.api.storage.StorageServiceRepository

 class InternalStorageServicePlaygroundViewModel : ViewModel() {

@@ -47,12 +47,12 @@ class InternalStorageServicePlaygroundViewModel : ViewModel() {
  fun onViewTabSelected() {
    viewModelScope.launch {
      withContext(Dispatchers.IO) {
-        val repository = StorageServiceRepository(AppDependencies.storageServiceApi)
+        val repository = StorageServiceService(AppDependencies.storageServiceApi)
        val storageKey = SignalStore.storageService.storageKeyForInitialDataRestore ?: SignalStore.storageService.storageKey

        val manifest = when (val result = repository.getStorageManifest(storageKey)) {
-          is StorageServiceRepository.ManifestResult.Success -> result.manifest
-          is StorageServiceRepository.ManifestResult.NotFoundError -> {
+          is StorageServiceService.ManifestResult.Success -> result.manifest
+          is StorageServiceService.ManifestResult.NotFoundError -> {
            Log.w(TAG, "Manifest not found!")
            _oneOffEvents.value = OneOffEvent.ManifestNotFoundError
            return@withContext
@@ -66,7 +66,7 @@ class InternalStorageServicePlaygroundViewModel : ViewModel() {
        _manifest.value = manifest

        val records = when (val result = repository.readStorageRecords(storageKey, manifest.recordIkm, manifest.storageIds)) {
-          is StorageServiceRepository.StorageRecordResult.Success -> result.records
+          is StorageServiceService.StorageRecordResult.Success -> result.records
          else -> {
            Log.w(TAG, "Failed to fetch records!")
            _oneOffEvents.value = OneOffEvent.StorageRecordDecryptionError
@@ -12,6 +12,5 @@ sealed interface LabsSettingsEvents {
  data class ToggleGroupSuggestionsForMembers(val enabled: Boolean) : LabsSettingsEvents
  data class ToggleBetterSearch(val enabled: Boolean) : LabsSettingsEvents
  data class ToggleAutoLowerHand(val enabled: Boolean) : LabsSettingsEvents
-
  data class ToggleStarredMessages(val enabled: Boolean) : LabsSettingsEvents
 }
@@ -15,6 +15,5 @@ data class LabsSettingsState(
  val groupSuggestionsForMembers: Boolean = false,
  val betterSearch: Boolean = false,
  val autoLowerHand: Boolean = false,
-
  val starredMessages: Boolean = false
 )
@@ -57,7 +57,6 @@ class LabsSettingsViewModel : ViewModel() {
      groupSuggestionsForMembers = SignalStore.labs.groupSuggestionsForMembers,
      betterSearch = SignalStore.labs.betterSearch,
      autoLowerHand = SignalStore.labs.autoLowerHand,
-
      starredMessages = SignalStore.labs.starredMessages
    )
  }
@@ -45,7 +45,6 @@ import org.signal.core.ui.compose.Texts
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.compose.rememberStatusBarColorNestedScrollModifier
 import org.thoughtcrime.securesms.util.CommunicationActions
-import org.thoughtcrime.securesms.util.RemoteConfig
 import org.thoughtcrime.securesms.util.viewModel

 /**
@@ -299,31 +298,29 @@ private fun AdvancedPrivacySettingsScreen(
        )
      }

-      if (RemoteConfig.internalUser) {
-        item {
-          Dividers.Default()
-        }
+      item {
+        Dividers.Default()
+      }

-        item {
-          val label = buildAnnotatedString {
-            append(stringResource(R.string.preferences_automatic_key_verification_body))
-            append(" ")
-            withLink(
-              LinkAnnotation.Clickable("learn-more", linkInteractionListener = {
-                callbacks.onAutomaticVerificationLearnMoreClick()
-              })
-            ) {
-              append(stringResource(R.string.LearnMoreTextView_learn_more))
-            }
+      item {
+        val label = buildAnnotatedString {
+          append(stringResource(R.string.preferences_automatic_key_verification_body))
+          append(" ")
+          withLink(
+            LinkAnnotation.Clickable("learn-more", linkInteractionListener = {
+              callbacks.onAutomaticVerificationLearnMoreClick()
+            })
+          ) {
+            append(stringResource(R.string.LearnMoreTextView_learn_more))
          }
-
-          Rows.ToggleRow(
-            checked = state.allowAutomaticKeyVerification,
-            text = AnnotatedString(stringResource(R.string.preferences_automatic_key_verification)),
-            label = label,
-            onCheckChanged = callbacks::onAllowAutomaticVerificationChanged
-          )
        }
+
+        Rows.ToggleRow(
+          checked = state.allowAutomaticKeyVerification,
+          text = AnnotatedString(stringResource(R.string.preferences_automatic_key_verification)),
+          label = label,
+          onCheckChanged = callbacks::onAllowAutomaticVerificationChanged
+        )
      }
    }
  }
@@ -75,6 +75,7 @@ class AdvancedPrivacySettingsViewModel(
    viewModelScope.launch(SignalDispatchers.IO) {
      if (!enabled) {
        SignalDatabase.recipients.clearAllKeyTransparencyData()
+        SignalStore.account.distinguishedHead = null
      }
      SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
      StorageSyncHelper.scheduleSyncForDataChange()
@@ -63,9 +63,11 @@ sealed interface AppSettingsRoute : Parcelable {

  @Parcelize
  sealed interface BackupsRoute : AppSettingsRoute {
-    data object Backups : BackupsRoute
+    data class Backups(
+      val launchCheckoutFlow: Boolean = false
+    ) : BackupsRoute
    data class Local(val triggerUpdateFlow: Boolean = false) : BackupsRoute
-    data class Remote(val backupLaterSelected: Boolean = false, val forQuickRestore: Boolean = false) : BackupsRoute
+    data class Remote(val forQuickRestore: Boolean = false) : BackupsRoute
    data object DisplayKey : BackupsRoute
  }

@@ -7,6 +7,7 @@ import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.schedulers.Schedulers
 import org.signal.core.util.logging.Log
 import org.signal.donations.PaymentSourceType
+import org.signal.network.NetworkResult
 import org.thoughtcrime.securesms.backup.v2.MessageBackupTier
 import org.thoughtcrime.securesms.badges.Badges
 import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository.requireSubscriberType
@@ -29,7 +30,6 @@ import org.thoughtcrime.securesms.storage.StorageSyncHelper
 import org.thoughtcrime.securesms.subscription.LevelUpdate
 import org.thoughtcrime.securesms.subscription.LevelUpdateOperation
 import org.thoughtcrime.securesms.subscription.Subscription
-import org.whispersystems.signalservice.api.NetworkResult
 import org.whispersystems.signalservice.api.storage.IAPSubscriptionId
 import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
 import org.whispersystems.signalservice.api.subscriptions.IdempotencyKey
@@ -297,6 +297,7 @@ object RecurringInAppPaymentRepository {
      if (response.status == 200 || response.status == 204) {
        Log.d(TAG, "Successfully set user subscription to level $subscriptionLevel with response code ${response.status}", true)
        SignalStore.inAppPayments.updateLocalStateForLocalSubscribe(subscriberType)
+        MultiDeviceSubscriptionSyncRequestJob.enqueue()
        syncAccountRecord().subscribe()
      } else {
        if (response.applicationError.isPresent) {
@@ -34,9 +34,9 @@ import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
 import org.thoughtcrime.securesms.components.settings.app.subscription.boost.Boost
 import org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway.GatewaySelectorBottomSheet
-import org.thoughtcrime.securesms.components.settings.app.subscription.models.CurrencySelection
-import org.thoughtcrime.securesms.components.settings.app.subscription.models.NetworkFailure
 import org.thoughtcrime.securesms.components.settings.app.subscription.thanks.ThanksForYourSupportBottomSheetDialogFragment
+import org.thoughtcrime.securesms.components.settings.app.subscription.ui.CurrencySelection
+import org.thoughtcrime.securesms.components.settings.app.subscription.ui.NetworkFailure
 import org.thoughtcrime.securesms.components.settings.configure
 import org.thoughtcrime.securesms.database.InAppPaymentTable
 import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
@@ -348,7 +348,7 @@ class DonateToSignalFragment :
      if (state.oneTimeDonationState.isOneTimeDonationLongRunning) {
        R.string.DonateToSignalFragment__bank_transfers_usually_take_1_business_day_to_process_onetime
      } else if (state.oneTimeDonationState.isNonVerifiedIdeal) {
-        R.string.DonateToSignalFragment__your_ideal_payment_is_still_processing
+        R.string.DonateToSignalFragment__your_ideal_wero_payment_is_still_processing
      } else {
        R.string.DonateToSignalFragment__your_payment_is_still_being_processed_onetime
      }
@@ -356,7 +356,7 @@ class DonateToSignalFragment :
      if (state.monthlyDonationState.activeSubscription?.paymentMethod == ActiveSubscription.PaymentMethod.SEPA_DEBIT) {
        R.string.DonateToSignalFragment__bank_transfers_usually_take_1_business_day_to_process_monthly
      } else if (state.monthlyDonationState.nonVerifiedMonthlyDonation != null) {
-        R.string.DonateToSignalFragment__your_ideal_payment_is_still_processing
+        R.string.DonateToSignalFragment__your_ideal_wero_payment_is_still_processing
      } else {
        R.string.DonateToSignalFragment__your_payment_is_still_being_processed_monthly
      }
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.components.settings.app.subscription.donate

 import androidx.lifecycle.ViewModel
 import org.signal.core.util.logging.Log
+import org.signal.network.util.Preconditions
 import org.thoughtcrime.securesms.database.InAppPaymentTable
-import org.whispersystems.signalservice.api.util.Preconditions

 /**
 * State holder for the checkout flow when utilizing Google Pay.
@@ -46,8 +46,7 @@ sealed interface GatewayOrderStrategy {
  }

  companion object {
-    fun getStrategy(): GatewayOrderStrategy {
-      val self = Recipient.self()
+    fun getStrategy(self: Recipient = Recipient.self()): GatewayOrderStrategy {
      val e164 = self.e164.orNull() ?: return Default

      return if (PhoneNumberUtil.getInstance().parse(e164, "").countryCode == 1) {
@@ -1,34 +1,28 @@
 package org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway

 import android.content.Context
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.core.content.ContextCompat
 import androidx.core.os.bundleOf
 import androidx.fragment.app.setFragmentResult
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
-import io.reactivex.rxjava3.kotlin.subscribeBy
-import org.signal.core.util.concurrent.LifecycleDisposable
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.signal.core.ui.compose.ComposeBottomSheetDialogFragment
 import org.signal.core.util.dp
 import org.signal.donations.InAppPaymentType
 import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.badges.Badges
-import org.thoughtcrime.securesms.badges.models.BadgeDisplay112
 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.DSLSettingsIcon
 import org.thoughtcrime.securesms.components.settings.DSLSettingsText
-import org.thoughtcrime.securesms.components.settings.NO_TINT
 import org.thoughtcrime.securesms.components.settings.app.subscription.DonationSerializationHelper.toFiatMoney
 import org.thoughtcrime.securesms.components.settings.app.subscription.GooglePayComponent
-import org.thoughtcrime.securesms.components.settings.app.subscription.models.GooglePayButton
-import org.thoughtcrime.securesms.components.settings.app.subscription.models.PayPalButton
-import org.thoughtcrime.securesms.components.settings.configure
-import org.thoughtcrime.securesms.components.settings.models.IndeterminateLoadingCircle
 import org.thoughtcrime.securesms.database.InAppPaymentTable
 import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
 import org.thoughtcrime.securesms.payments.FiatMoneyUtil
-import org.thoughtcrime.securesms.payments.currency.CurrencyUtil
 import org.thoughtcrime.securesms.util.fragments.requireListener
 import org.thoughtcrime.securesms.util.viewModel
 import org.signal.core.ui.R as CoreUiR
@@ -36,172 +30,56 @@ import org.signal.core.ui.R as CoreUiR
 /**
 * Entry point to capturing the necessary payment token to pay for a donation
 */
-class GatewaySelectorBottomSheet : DSLSettingsBottomSheetFragment() {
-
-  private val lifecycleDisposable = LifecycleDisposable()
+class GatewaySelectorBottomSheet : ComposeBottomSheetDialogFragment() {

  private val args: GatewaySelectorBottomSheetArgs by navArgs()
+  override val peekHeightPercentage: Float = 1f

  private val viewModel: GatewaySelectorViewModel by viewModel {
    GatewaySelectorViewModel(args, requireListener<GooglePayComponent>().googlePayRepository)
  }

-  override fun bindAdapter(adapter: DSLSettingsAdapter) {
-    BadgeDisplay112.register(adapter)
-    GooglePayButton.register(adapter)
-    PayPalButton.register(adapter)
-    IndeterminateLoadingCircle.register(adapter)
+  @Composable
+  override fun SheetContent() {
+    val state by viewModel.state.collectAsStateWithLifecycle()

-    lifecycleDisposable.bindTo(viewLifecycleOwner)
-
-    lifecycleDisposable += viewModel.state.subscribe { state ->
-      adapter.submitList(getConfiguration(state).toMappingModelList())
-    }
+    GatewaySelectorBottomSheetContent(state, onEvent = this::onEvent)
  }

-  private fun getConfiguration(state: GatewaySelectorState): DSLConfiguration {
-    return when (state) {
-      GatewaySelectorState.Loading -> {
-        configure {
-          space(16.dp)
-          customPref(IndeterminateLoadingCircle)
-          space(16.dp)
+  private fun onEvent(event: GatewaySelectorBottomSheetEvent) {
+    when (event) {
+      GatewaySelectorBottomSheetEvent.GOOGLE_PAY_SELECTED -> {
+        setPaymentMethodAndDismiss(InAppPaymentData.PaymentMethodType.GOOGLE_PAY)
+      }
+
+      GatewaySelectorBottomSheetEvent.PAYPAL_SELECTED -> {
+        setPaymentMethodAndDismiss(InAppPaymentData.PaymentMethodType.PAYPAL)
+      }
+
+      GatewaySelectorBottomSheetEvent.SEPA_SELECTED -> {
+        if (viewModel.checkIsSepaPaymentValidAmount()) {
+          setPaymentMethodAndDismiss(InAppPaymentData.PaymentMethodType.SEPA_DEBIT)
+        } else {
+          findNavController().popBackStack()
+          setFragmentResult(REQUEST_KEY, bundleOf(FAILURE_KEY to true, SEPA_EURO_MAX to viewModel.getSepaMaximum()))
        }
      }
-      is GatewaySelectorState.Ready -> {
-        configure {
-          customPref(
-            BadgeDisplay112.Model(
-              badge = state.inAppPayment.data.badge!!.let { Badges.fromDatabaseBadge(it) },
-              withDisplayText = false
-            )
-          )

-          space(12.dp)
+      GatewaySelectorBottomSheetEvent.IDEAL_SELECTED -> {
+        setPaymentMethodAndDismiss(InAppPaymentData.PaymentMethodType.IDEAL)
+      }

-          presentTitleAndSubtitle(requireContext(), state.inAppPayment)
-
-          space(16.dp)
-
-          state.gatewayOrderStrategy.orderedGateways.forEach { gateway ->
-            when (gateway) {
-              InAppPaymentData.PaymentMethodType.GOOGLE_PLAY_BILLING -> error("Unsupported payment method.")
-              InAppPaymentData.PaymentMethodType.GOOGLE_PAY -> renderGooglePayButton(state)
-              InAppPaymentData.PaymentMethodType.PAYPAL -> renderPayPalButton(state)
-              InAppPaymentData.PaymentMethodType.CARD -> renderCreditCardButton(state)
-              InAppPaymentData.PaymentMethodType.SEPA_DEBIT -> renderSEPADebitButton(state)
-              InAppPaymentData.PaymentMethodType.IDEAL -> renderIDEALButton(state)
-              InAppPaymentData.PaymentMethodType.UNKNOWN -> error("Unsupported payment method.")
-            }
-          }
-
-          space(16.dp)
-        }
+      GatewaySelectorBottomSheetEvent.CREDIT_CARD_SELECTED -> {
+        setPaymentMethodAndDismiss(InAppPaymentData.PaymentMethodType.CARD)
      }
    }
  }

-  private fun DSLConfiguration.renderGooglePayButton(state: GatewaySelectorState.Ready) {
-    if (state.isGooglePayAvailable) {
-      space(16.dp)
-
-      customPref(
-        GooglePayButton.Model(
-          isEnabled = true,
-          onClick = {
-            lifecycleDisposable += viewModel.updateInAppPaymentMethod(InAppPaymentData.PaymentMethodType.GOOGLE_PAY)
-              .subscribeBy {
-                findNavController().popBackStack()
-                setFragmentResult(REQUEST_KEY, bundleOf(REQUEST_KEY to it))
-              }
-          }
-        )
-      )
-    }
-  }
-
-  private fun DSLConfiguration.renderPayPalButton(state: GatewaySelectorState.Ready) {
-    if (state.isPayPalAvailable) {
-      space(16.dp)
-
-      customPref(
-        PayPalButton.Model(
-          onClick = {
-            lifecycleDisposable += viewModel.updateInAppPaymentMethod(InAppPaymentData.PaymentMethodType.PAYPAL)
-              .subscribeBy {
-                findNavController().popBackStack()
-                setFragmentResult(REQUEST_KEY, bundleOf(REQUEST_KEY to it))
-              }
-          },
-          isEnabled = true
-        )
-      )
-    }
-  }
-
-  private fun DSLConfiguration.renderCreditCardButton(state: GatewaySelectorState.Ready) {
-    if (state.isCreditCardAvailable) {
-      space(16.dp)
-
-      primaryButton(
-        text = DSLSettingsText.from(R.string.GatewaySelectorBottomSheet__credit_or_debit_card),
-        icon = DSLSettingsIcon.from(R.drawable.credit_card, CoreUiR.color.signal_colorOnCustom),
-        disableOnClick = true,
-        onClick = {
-          lifecycleDisposable += viewModel.updateInAppPaymentMethod(InAppPaymentData.PaymentMethodType.CARD)
-            .subscribeBy {
-              findNavController().popBackStack()
-              setFragmentResult(REQUEST_KEY, bundleOf(REQUEST_KEY to it))
-            }
-        }
-      )
-    }
-  }
-
-  private fun DSLConfiguration.renderSEPADebitButton(state: GatewaySelectorState.Ready) {
-    if (state.isSEPADebitAvailable) {
-      space(16.dp)
-
-      tonalButton(
-        text = DSLSettingsText.from(R.string.GatewaySelectorBottomSheet__bank_transfer),
-        icon = DSLSettingsIcon.from(R.drawable.bank_transfer),
-        disableOnClick = true,
-        onClick = {
-          val price = state.inAppPayment.data.amount!!.toFiatMoney()
-          if (state.sepaEuroMaximum != null &&
-            price.currency == CurrencyUtil.EURO &&
-            price.amount > state.sepaEuroMaximum.amount
-          ) {
-            findNavController().popBackStack()
-            setFragmentResult(REQUEST_KEY, bundleOf(FAILURE_KEY to true, SEPA_EURO_MAX to state.sepaEuroMaximum.amount))
-          } else {
-            lifecycleDisposable += viewModel.updateInAppPaymentMethod(InAppPaymentData.PaymentMethodType.SEPA_DEBIT)
-              .subscribeBy {
-                findNavController().popBackStack()
-                setFragmentResult(REQUEST_KEY, bundleOf(REQUEST_KEY to it))
-              }
-          }
-        }
-      )
-    }
-  }
-
-  private fun DSLConfiguration.renderIDEALButton(state: GatewaySelectorState.Ready) {
-    if (state.isIDEALAvailable) {
-      space(16.dp)
-
-      tonalButton(
-        text = DSLSettingsText.from(R.string.GatewaySelectorBottomSheet__ideal),
-        icon = DSLSettingsIcon.from(R.drawable.logo_ideal, NO_TINT),
-        disableOnClick = true,
-        onClick = {
-          lifecycleDisposable += viewModel.updateInAppPaymentMethod(InAppPaymentData.PaymentMethodType.IDEAL)
-            .subscribeBy {
-              findNavController().popBackStack()
-              setFragmentResult(REQUEST_KEY, bundleOf(REQUEST_KEY to it))
-            }
-        }
-      )
+  private fun setPaymentMethodAndDismiss(type: InAppPaymentData.PaymentMethodType) {
+    viewLifecycleOwner.lifecycleScope.launch(Dispatchers.Main) {
+      val inAppPayment = viewModel.updateInAppPaymentMethod(type)
+      findNavController().popBackStack()
+      setFragmentResult(REQUEST_KEY, bundleOf(REQUEST_KEY to inAppPayment))
    }
  }

@@ -0,0 +1,366 @@
+/*
+ * Copyright 2026 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway
+
+import androidx.annotation.VisibleForTesting
+import androidx.compose.foundation.layout.Arrangement.Absolute.spacedBy
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.platform.LocalResources
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.pluralStringResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.unit.dp
+import org.signal.core.ui.compose.BottomSheets
+import org.signal.core.ui.compose.Buttons
+import org.signal.core.ui.compose.DayNightPreviews
+import org.signal.core.ui.compose.Previews
+import org.signal.core.ui.compose.horizontalGutters
+import org.signal.core.util.money.FiatMoney
+import org.signal.donations.DonateWithGooglePayButton
+import org.signal.donations.InAppPaymentType
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.Badges
+import org.thoughtcrime.securesms.components.settings.app.subscription.BadgeImage112
+import org.thoughtcrime.securesms.components.settings.app.subscription.DonationSerializationHelper.toDecimalValue
+import org.thoughtcrime.securesms.components.settings.app.subscription.DonationSerializationHelper.toFiatMoney
+import org.thoughtcrime.securesms.components.settings.app.subscription.ui.IdealWeroButton
+import org.thoughtcrime.securesms.components.settings.app.subscription.ui.PayPalButton
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.model.databaseprotos.BadgeList
+import org.thoughtcrime.securesms.database.model.databaseprotos.FiatValue
+import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.payments.FiatMoneyUtil
+import org.thoughtcrime.securesms.recipients.Recipient
+import java.math.BigDecimal
+import java.util.Currency
+import kotlin.time.Duration.Companion.milliseconds
+
+@Composable
+fun GatewaySelectorBottomSheetContent(
+  state: GatewaySelectorState,
+  onEvent: (GatewaySelectorBottomSheetEvent) -> Unit,
+  modifier: Modifier = Modifier
+) {
+  val scrollState = rememberScrollState()
+
+  Column(
+    horizontalAlignment = Alignment.CenterHorizontally,
+    modifier = modifier
+      .testTag(GatewaySelectorTestTags.CONTAINER)
+      .verticalScroll(scrollState)
+      .horizontalGutters()
+      .fillMaxWidth()
+  ) {
+    BottomSheets.Handle()
+
+    when (state) {
+      GatewaySelectorState.Loading -> Loading()
+      is GatewaySelectorState.Ready -> Ready(state, onEvent)
+    }
+  }
+}
+
+@Composable
+private fun Loading() {
+  CircularProgressIndicator(
+    modifier = Modifier.padding(vertical = 16.dp)
+  )
+}
+
+@Composable
+private fun Ready(state: GatewaySelectorState.Ready, onEvent: (GatewaySelectorBottomSheetEvent) -> Unit) {
+  BadgeImage112(
+    badge = state.inAppPayment.data.badge!!.let { Badges.fromDatabaseBadge(it) },
+    modifier = Modifier.size(112.dp)
+  )
+
+  Spacer(modifier = Modifier.size(12.dp))
+
+  TitleAndSubtitle(state.inAppPayment)
+
+  Spacer(modifier = Modifier.size(16.dp))
+
+  var isGatewaySelected by remember { mutableStateOf(false) }
+  val onGatewaySelected: (GatewaySelectorBottomSheetEvent) -> Unit = remember(onEvent) {
+    {
+      if (!isGatewaySelected) {
+        isGatewaySelected = true
+        onEvent(it)
+      }
+    }
+  }
+
+  state.gatewayOrderStrategy.orderedGateways.forEach {
+    when (it) {
+      InAppPaymentData.PaymentMethodType.UNKNOWN -> error("Unsupported payment method.")
+      InAppPaymentData.PaymentMethodType.GOOGLE_PAY -> {
+        if (state.isGooglePayAvailable) {
+          DonateWithGooglePayButton(
+            onClick = { onGatewaySelected(GatewaySelectorBottomSheetEvent.GOOGLE_PAY_SELECTED) },
+            enabled = !isGatewaySelected,
+            modifier = Modifier
+              .testTag(GatewaySelectorTestTags.GOOGLE_PAY_BUTTON)
+              .padding(top = 16.dp)
+              .fillMaxWidth()
+              .height(44.dp)
+          )
+        }
+      }
+
+      InAppPaymentData.PaymentMethodType.CARD -> {
+        if (state.isCreditCardAvailable) {
+          Buttons.LargePrimary(
+            onClick = { onGatewaySelected(GatewaySelectorBottomSheetEvent.CREDIT_CARD_SELECTED) },
+            enabled = !isGatewaySelected,
+            modifier = Modifier
+              .testTag(GatewaySelectorTestTags.CREDIT_CARD_BUTTON)
+              .padding(top = 16.dp)
+              .fillMaxWidth()
+              .height(44.dp)
+          ) {
+            Row(
+              horizontalArrangement = spacedBy(8.dp)
+            ) {
+              Icon(
+                imageVector = ImageVector.vectorResource(R.drawable.credit_card),
+                contentDescription = null
+              )
+
+              Text(
+                text = stringResource(R.string.GatewaySelectorBottomSheet__credit_or_debit_card)
+              )
+            }
+          }
+        }
+      }
+
+      InAppPaymentData.PaymentMethodType.SEPA_DEBIT -> {
+        if (state.isSEPADebitAvailable) {
+          Buttons.LargeTonal(
+            onClick = { onGatewaySelected(GatewaySelectorBottomSheetEvent.SEPA_SELECTED) },
+            enabled = !isGatewaySelected,
+            modifier = Modifier
+              .testTag(GatewaySelectorTestTags.SEPA_BUTTON)
+              .padding(top = 16.dp)
+              .fillMaxWidth()
+              .height(44.dp)
+          ) {
+            Row(
+              horizontalArrangement = spacedBy(8.dp)
+            ) {
+              Icon(
+                imageVector = ImageVector.vectorResource(R.drawable.bank_transfer),
+                contentDescription = null
+              )
+
+              Text(
+                text = stringResource(R.string.GatewaySelectorBottomSheet__bank_transfer)
+              )
+            }
+          }
+        }
+      }
+
+      InAppPaymentData.PaymentMethodType.IDEAL -> {
+        if (state.isIDEALAvailable) {
+          IdealWeroButton(
+            onClick = { onGatewaySelected(GatewaySelectorBottomSheetEvent.IDEAL_SELECTED) },
+            enabled = !isGatewaySelected,
+            modifier = Modifier
+              .testTag(GatewaySelectorTestTags.IDEAL_BUTTON)
+              .padding(top = 16.dp)
+              .height(44.dp)
+              .fillMaxWidth()
+          )
+        }
+      }
+
+      InAppPaymentData.PaymentMethodType.PAYPAL -> {
+        if (state.isPayPalAvailable) {
+          PayPalButton(
+            enabled = !isGatewaySelected,
+            onClick = { onGatewaySelected(GatewaySelectorBottomSheetEvent.PAYPAL_SELECTED) },
+            modifier = Modifier
+              .testTag(GatewaySelectorTestTags.PAYPAL_BUTTON)
+              .padding(top = 16.dp)
+              .height(44.dp)
+              .fillMaxWidth()
+          )
+        }
+      }
+
+      InAppPaymentData.PaymentMethodType.GOOGLE_PLAY_BILLING -> error("Unsupported payment method.")
+    }
+  }
+
+  Spacer(modifier = Modifier.size(16.dp))
+}
+
+@DayNightPreviews
+@Composable
+private fun GatewaySelectorBottomSheetContentLoadingPreview() {
+  Previews.BottomSheetContentPreview {
+    GatewaySelectorBottomSheetContent(
+      state = GatewaySelectorState.Loading,
+      onEvent = {}
+    )
+  }
+}
+
+@Composable
+private fun TitleAndSubtitle(inAppPayment: InAppPaymentTable.InAppPayment) {
+  when (inAppPayment.type) {
+    InAppPaymentType.UNKNOWN -> error("Unsupported type UNKNOWN")
+    InAppPaymentType.ONE_TIME_GIFT -> OneTimeGiftTitleAndSubtitle(inAppPayment)
+    InAppPaymentType.ONE_TIME_DONATION -> RecurringDonationTitleAndSubtitle(inAppPayment)
+    InAppPaymentType.RECURRING_DONATION -> OneTimeDonationTitleAndSubtitle(inAppPayment)
+    InAppPaymentType.RECURRING_BACKUP -> error("This type is not supported")
+  }
+}
+
+@Composable
+private fun RecurringDonationTitleAndSubtitle(inAppPayment: InAppPaymentTable.InAppPayment) {
+  Text(
+    text = stringResource(R.string.GatewaySelectorBottomSheet__donate_s_month_to_signal, rememberFormattedAmount(inAppPayment)),
+    style = MaterialTheme.typography.titleLarge,
+    modifier = Modifier.padding(bottom = 6.dp)
+  )
+
+  Text(
+    text = stringResource(R.string.GatewaySelectorBottomSheet__get_a_s_badge, inAppPayment.data.badge!!.name),
+    style = MaterialTheme.typography.bodyLarge,
+    color = MaterialTheme.colorScheme.onSurfaceVariant
+  )
+}
+
+@Composable
+private fun OneTimeDonationTitleAndSubtitle(inAppPayment: InAppPaymentTable.InAppPayment) {
+  Text(
+    text = stringResource(R.string.GatewaySelectorBottomSheet__donate_s_to_signal, rememberFormattedAmount(inAppPayment)),
+    style = MaterialTheme.typography.titleLarge,
+    modifier = Modifier.padding(bottom = 6.dp)
+  )
+
+  Text(
+    text = pluralStringResource(R.plurals.GatewaySelectorBottomSheet__get_a_s_badge_for_d_days, 30, inAppPayment.data.badge!!.name, 30),
+    style = MaterialTheme.typography.bodyLarge,
+    color = MaterialTheme.colorScheme.onSurfaceVariant
+  )
+}
+
+@Composable
+private fun OneTimeGiftTitleAndSubtitle(inAppPayment: InAppPaymentTable.InAppPayment) {
+  Text(
+    text = stringResource(R.string.GatewaySelectorBottomSheet__donate_s_to_signal, rememberFormattedAmount(inAppPayment)),
+    style = MaterialTheme.typography.titleLarge,
+    modifier = Modifier.padding(bottom = 6.dp)
+  )
+
+  Text(
+    text = stringResource(R.string.GatewaySelectorBottomSheet__donate_for_a_friend),
+    style = MaterialTheme.typography.bodyLarge,
+    color = MaterialTheme.colorScheme.onSurfaceVariant
+  )
+}
+
+@Composable
+private fun rememberFormattedAmount(inAppPayment: InAppPaymentTable.InAppPayment): String {
+  val resources = LocalResources.current
+  return remember(inAppPayment.data.amount) {
+    FiatMoneyUtil.format(resources, inAppPayment.data.amount!!.toFiatMoney())
+  }
+}
+
+@DayNightPreviews
+@Composable
+private fun GatewaySelectorBottomSheetContentReadyOneTimeDonationPreview() {
+  Previews.BottomSheetContentPreview {
+    GatewaySelectorBottomSheetContent(
+      state = rememberGatewaySelectorBottomSheetContentPreviewState(InAppPaymentType.ONE_TIME_DONATION),
+      onEvent = {}
+    )
+  }
+}
+
+@DayNightPreviews
+@Composable
+private fun GatewaySelectorBottomSheetContentReadyRecurringDonationPreview() {
+  Previews.BottomSheetContentPreview {
+    GatewaySelectorBottomSheetContent(
+      state = rememberGatewaySelectorBottomSheetContentPreviewState(InAppPaymentType.RECURRING_DONATION),
+      onEvent = {}
+    )
+  }
+}
+
+@DayNightPreviews
+@Composable
+private fun GatewaySelectorBottomSheetContentReadyOneTimeGiftDonationPreview() {
+  Previews.BottomSheetContentPreview {
+    GatewaySelectorBottomSheetContent(
+      state = rememberGatewaySelectorBottomSheetContentPreviewState(InAppPaymentType.ONE_TIME_GIFT),
+      onEvent = {}
+    )
+  }
+}
+
+@Composable
+@VisibleForTesting
+fun rememberGatewaySelectorBottomSheetContentPreviewState(type: InAppPaymentType): GatewaySelectorState.Ready {
+  return remember {
+    GatewaySelectorState.Ready(
+      inAppPayment = InAppPaymentTable.InAppPayment(
+        id = InAppPaymentTable.InAppPaymentId(1),
+        type = type,
+        state = InAppPaymentTable.State.CREATED,
+        insertedAt = 1.milliseconds,
+        updatedAt = 1.milliseconds,
+        notified = true,
+        subscriberId = null,
+        endOfPeriod = 0.milliseconds,
+        data = InAppPaymentData(
+          badge = BadgeList.Badge(
+            name = type.name.lowercase()
+          ),
+          amount = FiatValue(currencyCode = "USD", amount = BigDecimal.TEN.toDecimalValue())
+        )
+      ),
+      gatewayOrderStrategy = GatewayOrderStrategy.getStrategy(
+        self = Recipient(
+          isResolving = false,
+          e164Value = "+15555555555"
+        )
+      ),
+      isGooglePayAvailable = true,
+      isPayPalAvailable = true,
+      isCreditCardAvailable = true,
+      isSEPADebitAvailable = true,
+      isIDEALAvailable = true,
+      sepaEuroMaximum = FiatMoney(BigDecimal.ONE, Currency.getInstance("USD"))
+    )
+  }
+}
--- a/Show More
+++ b/Show More