Bump version to 8.19.2

This reverts commit 1bad283af2.

.github/workflows/android.yml

@@ -16,18 +16,18 @@ jobs:
     runs-on: ubuntu-latest-8-cores
 
     steps:
-    - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       # gh api repos/actions/checkout/commits/v6 --jq '.sha'
       with:
           submodules: true
           lfs: true
 
-    - name: set up JDK 17
-      uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+    - name: set up JDK 21
+      uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5
       # gh api repos/actions/setup-java/commits/v5 --jq '.sha'
       with:
         distribution: temurin
-        java-version: 17
+        java-version: 21
 
     - name: Validate Gradle Wrapper
       uses: gradle/actions/wrapper-validation@3f131e8634966bd73d06cc69884922b02e6faf92 # v6
@@ -42,15 +42,16 @@ jobs:
         # Required to persist the Gradle configuration cache across runs.
         cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
 
-    # Pull requests run the fast custom linter (ci); pushes to main / 8.x branches run the full
-    # Android lint (qa).
+    # Pull requests run the fast custom linter (ciRemote); pushes to main / 8.x branches run the
+    # full Android lint (qaRemote). Both include screenshot validation, which is deliberately kept
+    # out of the local qa/ci tasks because screenshot rendering is host-OS dependent.
     - name: Build with Gradle
       env:
         SIGNAL_BUILD_CACHE_URL: ${{ secrets.SIGNAL_BUILD_CACHE_URL }}
         SIGNAL_BUILD_CACHE_USER: ${{ secrets.SIGNAL_BUILD_CACHE_USER }}
         SIGNAL_BUILD_CACHE_PASSWORD: ${{ secrets.SIGNAL_BUILD_CACHE_PASSWORD }}
         SIGNAL_BUILD_CACHE_PUSH: ${{ startsWith(github.ref, 'refs/heads/8.') }}
-      run: ./gradlew ${{ github.event_name == 'pull_request' && 'ci' || 'qa' }}
+      run: ./gradlew ${{ github.event_name == 'pull_request' && 'ciRemote' || 'qaRemote' }}
 
     - name: Archive reports for failed build
       if: ${{ failure() }}
@@ -58,4 +59,7 @@ jobs:
       # gh api repos/actions/upload-artifact/commits/v7 --jq '.sha'
       with:
         name: reports
-        path: '*/build/reports'
+        path: |
+          **/build/reports
+          **/build/test-results
+        if-no-files-found: ignore

.github/workflows/diffuse.yml

@@ -16,18 +16,18 @@ jobs:
     runs-on: ubuntu-latest-8-cores
 
     steps:
-    - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       # 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@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
+    - name: set up JDK 21
+      uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5
       # gh api repos/actions/setup-java/commits/v5 --jq '.sha'
       with:
         distribution: temurin
-        java-version: 17
+        java-version: 21
 
     - name: Set up Gradle
       uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6
@@ -47,7 +47,7 @@ jobs:
 
     - name: Cache base apk
       id: cache-base
-      uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
+      uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v5
       # gh api repos/actions/cache/commits/v5 --jq '.sha'
       with:
         path: diffuse-base.apk
@@ -61,7 +61,7 @@ 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@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       # gh api repos/actions/checkout/commits/v6 --jq '.sha'
       with:
         submodules: true

.github/workflows/docker.yml

@@ -11,11 +11,17 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         # gh api repos/actions/checkout/commits/v6 --jq '.sha'
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
       - name: Build image
-        run: |
-          cd reproducible-builds
-          docker build -t signal-android .
+        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
+        with:
+          context: reproducible-builds
+          tags: signal-android
+          load: true
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
       - name: Test build
         run: docker run --memory=12g --rm -v "$(pwd)":/project -w /project signal-android ./gradlew --no-daemon --max-workers=1 -Dorg.gradle.jvmargs="-Xmx4g -XX:MaxMetaspaceSize=512m" -Dkotlin.compiler.execution.strategy=in-process bundlePlayProdRelease

.tool-versions

@@ -1,2 +1,2 @@
-java openjdk-17.0.2
+java openjdk-21.0.2
 uv   latest

app/build.gradle.kts

@@ -2,7 +2,10 @@
 
 import com.android.build.api.artifact.ArtifactTransformationRequest
 import com.android.build.api.artifact.SingleArtifact
+import com.android.build.api.variant.HasAndroidTest
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.gradle.process.ExecOperations
+import org.gradle.work.DisableCachingByDefault
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
 import java.time.Instant
@@ -10,12 +13,14 @@ import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
 import java.util.Locale
 import java.util.Properties
+import javax.inject.Inject
 
 plugins {
   alias(libs.plugins.android.application)
   alias(libs.plugins.ktlint)
   alias(libs.plugins.compose.compiler)
   alias(libs.plugins.kotlinx.serialization)
+  alias(testLibs.plugins.compose.screenshot)
   alias(benchmarkLibs.plugins.baselineprofile)
   id("androidx.navigation.safeargs")
   id("kotlin-parcelize")
@@ -27,8 +32,8 @@ plugins {
 val staticIps = Properties().apply { file("static-ips.properties").reader().use { load(it) } }
 staticIps.stringPropertyNames().forEach { rootProject.extra[it] = staticIps.getProperty(it) }
 
-val canonicalVersionCode = 1709
-val canonicalVersionName = "8.16.1"
+val canonicalVersionCode = 1719
+val canonicalVersionName = "8.19.2"
 val currentHotfixVersion = 0
 val maxHotfixVersions = 100
 
@@ -127,9 +132,16 @@ ktlint {
   version.set("1.5.0")
 }
 
+screenshotTests {
+  // Fraction of differing pixels tolerated before a screenshot test fails (0.0001 = 0.01%).
+  imageDifferenceThreshold = 0.0001f
+}
+
 android {
   namespace = "org.thoughtcrime.securesms"
 
+  experimentalProperties["android.experimental.enableScreenshotTest"] = true
+
   buildToolsVersion = libs.versions.buildTools.get()
   compileSdkVersion(libs.versions.compileSdk.get())
   ndkVersion = libs.versions.ndk.get()
@@ -590,6 +602,43 @@ androidComponents {
     }
     variant.sources.assets?.addGeneratedSourceDirectory(taskProvider) { it.outputDir }
   }
+
+  onVariants(selector().withName("playProdDebug")) { variant ->
+    val androidTest = (variant as? HasAndroidTest)?.androidTest ?: return@onVariants
+
+    tasks.register<FirebaseTestLabTask>("firebaseTestLab") {
+      group = "Verification"
+      description = "Runs the ${variant.name} instrumentation tests on Firebase Test Lab via the gcloud CLI. Run a single class with -Pftl.class=<fqcn>[#method]; override other defaults with -Pftl.* properties."
+
+      appApkDirectory.set(variant.artifacts.get(SingleArtifact.APK))
+      testApkDirectory.set(androidTest.artifacts.get(SingleArtifact.APK))
+
+      val deviceOverride = project.providers.gradleProperty("ftl.devices").orNull
+      devices.set(
+        deviceOverride?.split(";")?.map { it.trim() }?.filter { it.isNotEmpty() }
+          ?: listOf("model=Pixel2.arm,version=31,locale=en,orientation=portrait")
+      )
+
+      useOrchestrator.set(true)
+      environmentVariables.set(mapOf("clearPackageData" to "true"))
+      testTimeout.set(project.providers.gradleProperty("ftl.timeout").getOrElse("30m"))
+      numFlakyTestAttempts.set(project.providers.gradleProperty("ftl.numFlakyTestAttempts").map { it.toInt() }.getOrElse(1))
+      gcloudProject.set(project.providers.gradleProperty("ftl.project"))
+      resultsBucket.set(project.providers.gradleProperty("ftl.resultsBucket"))
+      resultsDir.set(project.providers.gradleProperty("ftl.resultsDir"))
+
+      val testClass = project.providers.gradleProperty("ftl.class").orNull?.takeIf { it.isNotBlank() }
+      testTargets.set(
+        if (testClass != null) "class $testClass" else project.providers.gradleProperty("ftl.testTargets").orNull
+      )
+      gcloudExecutable.set(project.providers.gradleProperty("ftl.gcloud").getOrElse("gcloud"))
+      extraArgs.set(
+        project.providers.gradleProperty("ftl.extraArgs").orNull
+          ?.split(" ")?.map { it.trim() }?.filter { it.isNotEmpty() }
+          ?: emptyList()
+      )
+    }
+  }
 }
 
 baselineProfile {
@@ -662,6 +711,7 @@ dependencies {
   implementation(libs.androidx.navigation.compose)
   implementation(libs.androidx.navigation3.runtime)
   implementation(libs.androidx.navigation3.ui)
+  implementation(libs.androidx.lifecycle.viewmodel.navigation3)
   implementation(libs.androidx.lifecycle.viewmodel.ktx)
   implementation(libs.androidx.lifecycle.livedata.ktx)
   implementation(libs.androidx.lifecycle.process)
@@ -712,6 +762,11 @@ dependencies {
   }
   implementation(libs.lottie)
   implementation(libs.lottie.compose)
+
+  // Compose screenshot testing
+  screenshotTestImplementation(testLibs.compose.screenshot.validation.api)
+  screenshotTestImplementation(libs.androidx.compose.ui.tooling.core)
+  screenshotTestImplementation(libs.androidx.compose.ui.tooling.preview)
   implementation(libs.signal.android.database.sqlcipher)
   implementation(libs.androidx.sqlite)
   testImplementation(libs.androidx.sqlite.framework)
@@ -778,6 +833,15 @@ dependencies {
   androidTestImplementation(libs.androidx.compose.ui.test.junit4)
   androidTestImplementation(testLibs.androidx.test.ext.junit)
   androidTestImplementation(testLibs.espresso.core)
+  androidTestImplementation(testLibs.espresso.contrib) {
+    // espresso-contrib transitively pulls the full checkerframework jar (only its annotations are needed),
+    // whose MANIFEST.MF collides with other test dependencies during androidTest resource merging.
+    exclude(group = "org.checkerframework", module = "checker")
+    // accessibility-test-framework drags in an ancient com.google.protobuf:protobuf-lite:3.0.1 whose
+    // GeneratedMessageLite wins the merged dex and lacks registerDefaultInstance(Class, GeneratedMessageLite),
+    // crashing tests at runtime. We only use RecyclerViewActions from contrib, not the accessibility checks.
+    exclude(group = "com.google.android.apps.common.testing.accessibility.framework")
+  }
   androidTestImplementation(testLibs.androidx.test.core)
   androidTestImplementation(testLibs.androidx.test.core.ktx)
   androidTestImplementation(testLibs.androidx.test.ext.junit.ktx)
@@ -961,6 +1025,110 @@ abstract class CopyBenchmarkBackupTask : DefaultTask() {
   }
 }
 
+/**
+ * Runs an instrumentation test suite on Firebase Test Lab by shelling out to `gcloud firebase test android run`.
+ *
+ * The `gcloud` CLI must be installed and authenticated (`gcloud auth login` and a configured project, or an
+ * activated service account) before invoking this task.
+ */
+@DisableCachingByDefault(because = "Executes tests on remote devices; results must never be served from the build cache")
+abstract class FirebaseTestLabTask
+@Inject
+constructor(
+  private val execOperations: ExecOperations
+) : DefaultTask() {
+  @get:InputFiles
+  @get:PathSensitive(PathSensitivity.RELATIVE)
+  abstract val appApkDirectory: DirectoryProperty
+
+  @get:InputFiles
+  @get:PathSensitive(PathSensitivity.RELATIVE)
+  abstract val testApkDirectory: DirectoryProperty
+
+  @get:Input
+  abstract val devices: ListProperty<String>
+
+  @get:Input
+  abstract val useOrchestrator: Property<Boolean>
+
+  @get:Input
+  abstract val environmentVariables: MapProperty<String, String>
+
+  @get:Input
+  abstract val testTimeout: Property<String>
+
+  @get:Input
+  abstract val numFlakyTestAttempts: Property<Int>
+
+  @get:Input
+  @get:Optional
+  abstract val gcloudProject: Property<String>
+
+  @get:Input
+  @get:Optional
+  abstract val resultsBucket: Property<String>
+
+  @get:Input
+  @get:Optional
+  abstract val resultsDir: Property<String>
+
+  @get:Input
+  @get:Optional
+  abstract val testTargets: Property<String>
+
+  @get:Input
+  abstract val gcloudExecutable: Property<String>
+
+  @get:Input
+  abstract val extraArgs: ListProperty<String>
+
+  @TaskAction
+  fun run() {
+    val appApk = findApk(appApkDirectory.get().asFile, "app")
+    val testApk = findApk(testApkDirectory.get().asFile, "instrumentation test")
+
+    val arguments = mutableListOf(
+      gcloudExecutable.get(),
+      "firebase", "test", "android", "run",
+      "--type", "instrumentation",
+      "--app", appApk.absolutePath,
+      "--test", testApk.absolutePath,
+      "--timeout", testTimeout.get(),
+      "--num-flaky-test-attempts", numFlakyTestAttempts.get().toString()
+    )
+
+    devices.get().forEach { device ->
+      arguments += listOf("--device", device)
+    }
+
+    if (useOrchestrator.get()) {
+      arguments += "--use-orchestrator"
+    }
+
+    val environment = environmentVariables.get()
+    if (environment.isNotEmpty()) {
+      arguments += "--environment-variables"
+      arguments += environment.entries.joinToString(",") { "${it.key}=${it.value}" }
+    }
+
+    gcloudProject.orNull?.takeIf { it.isNotBlank() }?.let { arguments += listOf("--project", it) }
+    resultsBucket.orNull?.takeIf { it.isNotBlank() }?.let { arguments += listOf("--results-bucket", it) }
+    resultsDir.orNull?.takeIf { it.isNotBlank() }?.let { arguments += listOf("--results-dir", it) }
+    testTargets.orNull?.takeIf { it.isNotBlank() }?.let { arguments += listOf("--test-targets", it) }
+    arguments += extraArgs.get()
+
+    logger.lifecycle("Running Firebase Test Lab:\n  ${arguments.joinToString(" ")}")
+    execOperations.exec {
+      commandLine(arguments)
+    }
+  }
+
+  private fun findApk(directory: File, label: String): File {
+    return directory.walkTopDown().firstOrNull { it.isFile && it.extension == "apk" }
+      ?: throw GradleException("No $label APK found under ${directory.absolutePath}. Was the assemble task run?")
+  }
+}
+
 abstract class RenameApkTask : DefaultTask() {
   @get:InputFiles
   abstract val apkFolder: DirectoryProperty

app/proguard/proguard.cfg

@@ -8,6 +8,11 @@
 -keep class org.thoughtcrime.securesms.** { *; }
 -keep class org.signal.donations.json.** { *; }
 -keep class org.signal.network.** { *; }
+
+-keep class org.signal.core.util.crypto.AttachmentSecret { *; }
+-keep class org.signal.core.util.crypto.AttachmentSecret$* { *; }
+-keep class org.signal.core.util.crypto.KeyStoreHelper$SealedData { *; }
+-keep class org.signal.core.util.crypto.KeyStoreHelper$SealedData$* { *; }
 -keepclassmembers class ** {
     public void onEvent*(**);
 }

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

@@ -9,9 +9,11 @@ import org.thoughtcrime.securesms.database.LogDatabase
 import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencyProvider
 import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
+import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger
 import org.thoughtcrime.securesms.logging.PersistentLogger
 import org.thoughtcrime.securesms.testing.InMemoryLogger
+import org.thoughtcrime.securesms.testing.TestRemoteConfig
 import org.thoughtcrime.securesms.util.Environment
 
 /**
@@ -30,6 +32,13 @@ class SignalInstrumentationApplicationContext : ApplicationContext() {
     val default = ApplicationDependencyProvider(this)
     AppDependencies.init(this, InstrumentationApplicationDependencyProvider(this, default))
     AppDependencies.deadlockDetector.start()
+
+    // Stage any test-declared remote config into the store to be read in RemoteConfig.init().
+    if (TestRemoteConfig.pending.isNotEmpty()) {
+      val json = TestRemoteConfig.json
+      SignalStore.remoteConfig.currentConfig = json
+      SignalStore.remoteConfig.pendingConfig = json
+    }
   }
 
   override fun initializeLogging() {

app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/CheckoutFlowActivityTest__OneTimeDonations.kt

@@ -0,0 +1,82 @@
+/*
+ * Copyright 2026 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate
+
+import androidx.compose.ui.test.junit4.v2.createEmptyComposeRule
+import androidx.test.core.app.ActivityScenario
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.RootMatchers.isDialog
+import androidx.test.espresso.matcher.ViewMatchers.isClickable
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.hamcrest.Matchers.allOf
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.signal.core.util.deleteAll
+import org.signal.donations.InAppPaymentType
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.testing.GooglePayTestRule
+import org.thoughtcrime.securesms.testing.InAppPaymentsRule
+import org.thoughtcrime.securesms.testing.RxTestSchedulerRule
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+import org.thoughtcrime.securesms.testing.actions.scrollToDescendant
+
+@Suppress("ClassName")
+@RunWith(AndroidJUnit4::class)
+class CheckoutFlowActivityTest__OneTimeDonations {
+  @get:Rule
+  val harness = SignalActivityRule(othersCount = 10)
+
+  @get:Rule
+  val iapRule = InAppPaymentsRule()
+
+  @get:Rule
+  val rxRule = RxTestSchedulerRule()
+
+  @get:Rule
+  val googlePayRule = GooglePayTestRule()
+
+  @get:Rule
+  val composeRule = createEmptyComposeRule()
+
+  private val intent = CheckoutFlowActivity.createIntent(InstrumentationRegistry.getInstrumentation().targetContext, InAppPaymentType.ONE_TIME_DONATION)
+
+  @Before
+  fun setUp() {
+    SignalDatabase.inAppPayments.writableDatabase.deleteAll(InAppPaymentTable.TABLE_NAME)
+    startJobLoopForTests()
+  }
+
+  @Test
+  fun givenPermitAcquisitionFails_whenIDonateOnce_thenIExpectPaymentSetupErrorDialog() {
+    failDonationPermitAcquisition()
+
+    val scenario = ActivityScenario.launch<CheckoutFlowActivity>(intent)
+    rxRule.defaultTestScheduler.triggerActions()
+
+    scrollToDescendant(R.id.recycler, withId(R.id.boost_1), rxRule.defaultTestScheduler)
+    onView(allOf(withId(R.id.boost_1), isClickable())).perform(ViewActions.click())
+    rxRule.defaultTestScheduler.triggerActions()
+
+    scrollToDescendant(R.id.recycler, withText(R.string.DonateToSignalFragment__continue), rxRule.defaultTestScheduler)
+    onView(withText(R.string.DonateToSignalFragment__continue)).perform(ViewActions.click())
+    rxRule.defaultTestScheduler.triggerActions()
+
+    scenario.selectGooglePay(composeRule, rxRule.defaultTestScheduler, InAppPaymentType.ONE_TIME_DONATION)
+
+    awaitDialog(rxRule.defaultTestScheduler, R.string.DonationsErrors__error_processing_payment)
+    onView(withText(R.string.DonationsErrors__your_payment)).inRoot(isDialog()).check(matches(isDisplayed()))
+  }
+}

app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/CheckoutFlowActivityTest__RecurringDonations.kt

@@ -1,9 +1,11 @@
 package org.thoughtcrime.securesms.components.settings.app.subscription.donate
 
+import androidx.compose.ui.test.junit4.v2.createEmptyComposeRule
 import androidx.test.core.app.ActivityScenario
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.RootMatchers.isDialog
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.isNotEnabled
 import androidx.test.espresso.matcher.ViewMatchers.isSelected
@@ -12,21 +14,32 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import io.mockk.every
+import io.mockk.mockkObject
+import io.mockk.unmockkObject
+import org.junit.After
+import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.signal.core.util.deleteAll
 import org.signal.donations.InAppPaymentType
+import org.signal.libsignal.net.RequestResult
 import org.signal.network.NetworkResult
+import org.signal.network.exceptions.NonSuccessfulResponseCodeException
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.permits.DonationPermits
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
 import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
 import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.testing.GooglePayTestRule
 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.thoughtcrime.securesms.testing.actions.scrollToDescendant
 import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
 import org.whispersystems.signalservice.api.subscriptions.SubscriberId
 import java.math.BigDecimal
@@ -46,19 +59,37 @@ class CheckoutFlowActivityTest__RecurringDonations {
   @get:Rule
   val rxRule = RxTestSchedulerRule()
 
+  @get:Rule
+  val googlePayRule = GooglePayTestRule()
+
+  @get:Rule
+  val composeRule = createEmptyComposeRule()
+
   private val intent = CheckoutFlowActivity.createIntent(InstrumentationRegistry.getInstrumentation().targetContext, InAppPaymentType.RECURRING_DONATION)
 
+  @Before
+  fun setUp() {
+    SignalDatabase.inAppPayments.writableDatabase.deleteAll(InAppPaymentTable.TABLE_NAME)
+    startJobLoopForTests()
+  }
+
+  @After
+  fun tearDown() {
+    unmockkObject(DonationPermits)
+  }
+
   @Test
   fun givenRecurringDonations_whenILoadScreen_thenIExpectMonthlySelected() {
     ActivityScenario.launch<CheckoutFlowActivity>(intent)
+    scrollToDescendant(R.id.recycler, withId(R.id.monthly), rxRule.defaultTestScheduler)
     onView(withId(R.id.monthly)).check(matches(isSelected()))
   }
 
   @Test
   fun givenNoCurrentDonation_whenILoadScreen_thenIExpectContinueButton() {
     ActivityScenario.launch<CheckoutFlowActivity>(intent)
-    onView(withId(R.id.recycler)).perform(RecyclerViewScrollToBottomAction)
-    onView(withText("Continue")).check(matches(isDisplayed()))
+    scrollToDescendant(R.id.recycler, withText(R.string.DonateToSignalFragment__continue), rxRule.defaultTestScheduler)
+    onView(withText(R.string.DonateToSignalFragment__continue)).check(matches(isDisplayed()))
   }
 
   @Test
@@ -69,8 +100,9 @@ class CheckoutFlowActivityTest__RecurringDonations {
 
     rxRule.defaultTestScheduler.triggerActions()
 
-    onView(withId(R.id.recycler)).perform(RecyclerViewScrollToBottomAction)
+    scrollToDescendant(R.id.recycler, withText(R.string.SubscribeFragment__update_subscription), rxRule.defaultTestScheduler)
     onView(withText(R.string.SubscribeFragment__update_subscription)).check(matches(isDisplayed()))
+    scrollToDescendant(R.id.recycler, withText(R.string.SubscribeFragment__cancel_subscription), rxRule.defaultTestScheduler)
     onView(withText(R.string.SubscribeFragment__cancel_subscription)).check(matches(isDisplayed()))
   }
 
@@ -82,7 +114,7 @@ class CheckoutFlowActivityTest__RecurringDonations {
 
     rxRule.defaultTestScheduler.triggerActions()
 
-    onView(withId(R.id.recycler)).perform(RecyclerViewScrollToBottomAction)
+    scrollToDescendant(R.id.recycler, withText(R.string.SubscribeFragment__cancel_subscription), rxRule.defaultTestScheduler)
     onView(withText(R.string.SubscribeFragment__cancel_subscription)).check(matches(isDisplayed()))
     onView(withText(R.string.SubscribeFragment__cancel_subscription)).perform(ViewActions.click())
     onView(withText(R.string.SubscribeFragment__confirm_cancellation)).check(matches(isDisplayed()))
@@ -97,11 +129,48 @@ class CheckoutFlowActivityTest__RecurringDonations {
 
     rxRule.defaultTestScheduler.triggerActions()
 
-    onView(withId(R.id.recycler)).perform(RecyclerViewScrollToBottomAction)
+    scrollToDescendant(R.id.recycler, withText(R.string.SubscribeFragment__update_subscription), rxRule.defaultTestScheduler)
     onView(withText(R.string.SubscribeFragment__update_subscription)).check(matches(isDisplayed()))
     onView(withText(R.string.SubscribeFragment__update_subscription)).check(matches(isNotEnabled()))
   }
 
+  @Test
+  fun givenSubscriberPermitAcquisitionFails_whenISubscribe_thenIExpectPaymentSetupErrorDialog() {
+    failDonationPermitAcquisition()
+
+    val scenario = ActivityScenario.launch<CheckoutFlowActivity>(intent)
+    rxRule.defaultTestScheduler.triggerActions()
+
+    scrollToDescendant(R.id.recycler, withText(R.string.DonateToSignalFragment__continue), rxRule.defaultTestScheduler)
+    onView(withText(R.string.DonateToSignalFragment__continue)).perform(ViewActions.click())
+    rxRule.defaultTestScheduler.triggerActions()
+
+    scenario.selectGooglePay(composeRule, rxRule.defaultTestScheduler, InAppPaymentType.RECURRING_DONATION)
+
+    awaitDialog(rxRule.defaultTestScheduler, R.string.DonationsErrors__error_processing_payment)
+    onView(withText(R.string.DonationsErrors__your_payment)).inRoot(isDialog()).check(matches(isDisplayed()))
+  }
+
+  @Test
+  fun givenSubscriptionPaymentMethodPermitRejected_whenISubscribe_thenIExpectPaymentSetupErrorDialog() {
+    AppDependencies.donationPermitsRepository.clearPermits()
+    mockkObject(DonationPermits)
+    every { DonationPermits.getDonationPermit() } returns RequestResult.Success("permit")
+    every { AppDependencies.donationsApi.createStripeSubscriptionPaymentMethod(any(), any(), any()) } returns NetworkResult.StatusCodeError(NonSuccessfulResponseCodeException(402))
+
+    val scenario = ActivityScenario.launch<CheckoutFlowActivity>(intent)
+    rxRule.defaultTestScheduler.triggerActions()
+
+    scrollToDescendant(R.id.recycler, withText(R.string.DonateToSignalFragment__continue), rxRule.defaultTestScheduler)
+    onView(withText(R.string.DonateToSignalFragment__continue)).perform(ViewActions.click())
+    rxRule.defaultTestScheduler.triggerActions()
+
+    scenario.selectGooglePay(composeRule, rxRule.defaultTestScheduler, InAppPaymentType.RECURRING_DONATION)
+
+    awaitDialog(rxRule.defaultTestScheduler, R.string.DonationsErrors__error_processing_payment)
+    onView(withText(R.string.DonationsErrors__your_payment)).inRoot(isDialog()).check(matches(isDisplayed()))
+  }
+
   private fun initialiseActiveSubscription() {
     val currency = Currency.getInstance("USD")
     val subscriber = InAppPaymentSubscriberRecord(

app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/CheckoutFlowPermitTestSupport.kt

@@ -0,0 +1,109 @@
+/*
+ * Copyright 2026 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate
+
+import android.app.Activity
+import android.content.Intent
+import androidx.compose.ui.test.junit4.ComposeTestRule
+import androidx.compose.ui.test.onAllNodesWithTag
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.test.performClick
+import androidx.test.core.app.ActivityScenario
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.RootMatchers.isDialog
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import io.mockk.every
+import io.reactivex.rxjava3.schedulers.TestScheduler
+import org.signal.donations.InAppPaymentType
+import org.signal.libsignal.net.RequestResult
+import org.signal.network.rest.RestStatusCodeError
+import org.thoughtcrime.securesms.SignalInstrumentationApplicationContext
+import org.thoughtcrime.securesms.components.settings.app.subscription.GooglePayComponent
+import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway.GatewaySelectorTestTags
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.testing.flushUntil
+
+/**
+ * Forces real donation-permit acquisition to fail at the issuer, exercising the permit code path through
+ * [org.thoughtcrime.securesms.components.settings.app.subscription.permits.DonationPermits].
+ */
+fun failDonationPermitAcquisition(statusCode: Int = 500) {
+  AppDependencies.donationPermitsRepository.clearPermits()
+  every { AppDependencies.donationsApi.createDonationPermits(any()) } returns RequestResult.NonSuccess(RestStatusCodeError(statusCode, emptyMap(), null))
+}
+
+/**
+ * The instrumentation app stubs [org.thoughtcrime.securesms.ApplicationContext.beginJobLoop] to a no-op, so enqueued
+ * jobs never run. The checkout pipeline drives a real setup job through the JobManager, so the loop must be started.
+ */
+fun startJobLoopForTests() {
+  (AppDependencies.application as SignalInstrumentationApplicationContext).beginJobLoopForTests()
+}
+
+/**
+ * Selects Google Pay in the Compose gateway selector and feeds the stubbed Google Pay result back into the
+ * checkout, navigating to the payment-in-progress screen where the pipeline runs.
+ *
+ * The gateway selector is populated by Rx work on [scheduler], so we [flushUntil] the button is present
+ * rather than sleeping. Selecting Google Pay dismisses the gateway sheet and hands a fragment result back to
+ * the checkout, which runs `launchGooglePay` -> `provideGatewayRequestForGooglePay` on [scheduler]; only then
+ * does the checkout's subscriber consume a [GooglePayComponent.googlePayResultPublisher] emission
+ * (`consumeGatewayRequestForGooglePay` returns null until then, and the publisher is a hot PublishSubject that
+ * drops earlier emissions). So we [flushUntil] the sheet has dismissed — a real signal that the click was
+ * fully processed — before dispatching the result, rather than pumping a fixed number of times and racing.
+ */
+fun ActivityScenario<CheckoutFlowActivity>.selectGooglePay(
+  composeRule: ComposeTestRule,
+  scheduler: TestScheduler,
+  inAppPaymentType: InAppPaymentType
+) {
+  scheduler.flushUntil {
+    composeRule.onAllNodesWithTag(GatewaySelectorTestTags.GOOGLE_PAY_BUTTON).fetchSemanticsNodes().isNotEmpty()
+  }
+
+  composeRule.onNodeWithTag(GatewaySelectorTestTags.GOOGLE_PAY_BUTTON).performClick()
+
+  scheduler.flushUntil {
+    // Once the gateway sheet dismisses there is no Compose hierarchy left, so fetchSemanticsNodes throws
+    // rather than returning empty; treat both the empty list and the missing hierarchy as "sheet gone".
+    runCatching {
+      composeRule.onAllNodesWithTag(GatewaySelectorTestTags.GOOGLE_PAY_BUTTON).fetchSemanticsNodes().isEmpty()
+    }.getOrDefault(true)
+  }
+
+  onActivity { activity ->
+    (activity as GooglePayComponent).googlePayResultPublisher.onNext(
+      GooglePayComponent.GooglePayResult(
+        requestCode = InAppPaymentsRepository.getGooglePayRequestCode(inAppPaymentType),
+        resultCode = Activity.RESULT_OK,
+        data = Intent()
+      )
+    )
+  }
+}
+
+/**
+ * Waits for a dialog whose title is [titleResId] to be displayed. Matches any dialog by title (error,
+ * confirmation, thanks, etc.) — it is not specific to error dialogs.
+ *
+ * [flushUntil] advances the Rx pipeline (which may create the payment, enqueue the real setup job, and react
+ * to its committed state) while yielding real time for any job to run, until the dialog renders. A single
+ * condition-driven pump rather than a fixed-duration wall-clock poll. Letting the Espresso check throw (rather
+ * than collapsing it to a boolean) lets [flushUntil] chain the last matcher failure as the timeout cause.
+ */
+fun awaitDialog(
+  scheduler: TestScheduler,
+  titleResId: Int,
+  timeoutMillis: Long = 15_000
+) {
+  scheduler.flushUntil(timeoutMillis) {
+    onView(withText(titleResId)).inRoot(isDialog()).check(matches(isDisplayed()))
+    true
+  }
+}

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

@@ -11,6 +11,7 @@ import assertk.assertions.isEmpty
 import assertk.assertions.isEqualTo
 import assertk.assertions.isNotEmpty
 import assertk.assertions.isNotEqualTo
+import assertk.assertions.isNull
 import assertk.assertions.isTrue
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
@@ -26,16 +27,16 @@ import org.signal.core.util.Base64
 import org.signal.core.util.Base64.decodeBase64OrThrow
 import org.signal.core.util.copyTo
 import org.signal.core.util.stream.NullOutputStream
+import org.signal.mediasend.SentMediaQuality
 import org.thoughtcrime.securesms.attachments.ArchivedAttachment
 import org.thoughtcrime.securesms.attachments.Attachment
 import org.thoughtcrime.securesms.attachments.PointerAttachment
 import org.thoughtcrime.securesms.attachments.UriAttachment
 import org.thoughtcrime.securesms.backup.v2.ArchivedMediaObject
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.mms.IncomingMessage
 import org.thoughtcrime.securesms.mms.MediaStream
-import org.thoughtcrime.securesms.mms.SentMediaQuality
-import org.thoughtcrime.securesms.providers.BlobProvider
 import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.thoughtcrime.securesms.util.MediaUtil
 import org.whispersystems.signalservice.api.crypto.AttachmentCipherOutputStream
@@ -67,7 +68,7 @@ class AttachmentTableTest {
 
   @Test
   fun givenABlob_whenIInsert2AttachmentsForPreUpload_thenIExpectDistinctIdsButSameFileName() {
-    val blob = BlobProvider.getInstance().forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory()
+    val blob = AppDependencies.blobs.forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory()
     val highQualityProperties = createHighQualityTransformProperties()
     val highQualityImage = createAttachment(1, blob, highQualityProperties)
     val attachment = SignalDatabase.attachments.insertAttachmentForPreUpload(highQualityImage)
@@ -80,7 +81,7 @@ class AttachmentTableTest {
   @FlakyTest
   @Test
   fun givenABlobAndDifferentTransformQuality_whenIInsert2AttachmentsForPreUpload_thenIExpectDifferentFileInfos() {
-    val blob = BlobProvider.getInstance().forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory()
+    val blob = AppDependencies.blobs.forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory()
     val highQualityProperties = createHighQualityTransformProperties()
     val highQualityImage = createAttachment(1, blob, highQualityProperties)
     val lowQualityImage = createAttachment(1, blob, TransformProperties.empty())
@@ -107,7 +108,7 @@ class AttachmentTableTest {
   @Ignore("test is flaky")
   @Test
   fun givenIdenticalAttachmentsInsertedForPreUpload_whenIUpdateAttachmentDataAndSpecifyOnlyModifyThisAttachment_thenIExpectDifferentFileInfos() {
-    val blob = BlobProvider.getInstance().forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory()
+    val blob = AppDependencies.blobs.forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory()
     val highQualityProperties = createHighQualityTransformProperties()
     val highQualityImage = createAttachment(1, blob, highQualityProperties)
     val attachment = SignalDatabase.attachments.insertAttachmentForPreUpload(highQualityImage)
@@ -143,9 +144,9 @@ class AttachmentTableTest {
     val uncompressData = byteArrayOf(1, 2, 3, 4, 5)
     val compressedData = byteArrayOf(1, 2, 3)
 
-    val blobUncompressed = BlobProvider.getInstance().forData(uncompressData).createForSingleSessionInMemory()
+    val blobUncompressed = AppDependencies.blobs.forData(uncompressData).createForSingleSessionInMemory()
 
-    val previousAttachment = createAttachment(1, BlobProvider.getInstance().forData(compressedData).createForSingleSessionInMemory(), TransformProperties.empty())
+    val previousAttachment = createAttachment(1, AppDependencies.blobs.forData(compressedData).createForSingleSessionInMemory(), TransformProperties.empty())
     val previousDatabaseAttachmentId: AttachmentId = SignalDatabase.attachments.insertAttachmentsForMessage(1, listOf(previousAttachment), emptyList()).values.first()
 
     val standardQualityPreUpload = createAttachment(1, blobUncompressed, TransformProperties.empty())
@@ -178,7 +179,7 @@ class AttachmentTableTest {
   fun doNotDedupedFileIfUsedByAnotherAttachmentWithADifferentTransformProperties() {
     // GIVEN
     val uncompressData = byteArrayOf(1, 2, 3, 4, 5)
-    val blobUncompressed = BlobProvider.getInstance().forData(uncompressData).createForSingleSessionInMemory()
+    val blobUncompressed = AppDependencies.blobs.forData(uncompressData).createForSingleSessionInMemory()
 
     val standardQualityPreUpload = createAttachment(1, blobUncompressed, TransformProperties.empty())
     val standardDatabaseAttachment = SignalDatabase.attachments.insertAttachmentForPreUpload(standardQualityPreUpload)
@@ -204,7 +205,7 @@ class AttachmentTableTest {
   @Test
   fun resetArchiveTransferStateByPlaintextHashAndRemoteKey_singleMatch() {
     // Given an attachment with some plaintextHash+remoteKey
-    val blob = BlobProvider.getInstance().forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory()
+    val blob = AppDependencies.blobs.forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory()
     val attachment = createAttachment(1, blob, TransformProperties.empty())
     val attachmentId = SignalDatabase.attachments.insertAttachmentsForMessage(-1L, listOf(attachment), emptyList()).values.first()
     SignalDatabase.attachments.finalizeAttachmentAfterUpload(attachmentId, AttachmentTableTestUtil.createUploadResult(attachmentId))
@@ -219,6 +220,26 @@ class AttachmentTableTest {
     assertThat(SignalDatabase.attachments.getAttachment(attachmentId)!!.archiveTransferState).isEqualTo(AttachmentTable.ArchiveTransferState.NONE)
   }
 
+  @Test
+  fun resetArchiveTransferStateForLocalBackupMedia_onlyResetsLocalBackupMedia() {
+    // Given one archive-finished attachment restored from a local backup, and one that wasn't
+    val localBackupMessageId = SignalDatabase.messages.insertMessageInbox(createIncomingMessage(serverTime = 0.days, attachment = createArchivedAttachment(localBackupKey = Random.nextBytes(32)))).map { it.messageId }.get()
+    val localBackupAttachmentId = SignalDatabase.attachments.getAttachmentsForMessage(localBackupMessageId).first().attachmentId
+
+    val nonLocalBackupMessageId = SignalDatabase.messages.insertMessageInbox(createIncomingMessage(serverTime = 1.days, attachment = createArchivedAttachment())).map { it.messageId }.get()
+    val nonLocalBackupAttachmentId = SignalDatabase.attachments.getAttachmentsForMessage(nonLocalBackupMessageId).first().attachmentId
+
+    SignalDatabase.attachments.setArchiveTransferState(localBackupAttachmentId, AttachmentTable.ArchiveTransferState.FINISHED)
+    SignalDatabase.attachments.setArchiveTransferState(nonLocalBackupAttachmentId, AttachmentTable.ArchiveTransferState.FINISHED)
+
+    val resetCount = SignalDatabase.attachments.resetArchiveTransferStateForLocalBackupMedia()
+
+    // Only the local-backup attachment is reset
+    assertThat(resetCount).isEqualTo(1)
+    assertThat(SignalDatabase.attachments.getAttachment(localBackupAttachmentId)!!.archiveTransferState).isEqualTo(AttachmentTable.ArchiveTransferState.NONE)
+    assertThat(SignalDatabase.attachments.getAttachment(nonLocalBackupAttachmentId)!!.archiveTransferState).isEqualTo(AttachmentTable.ArchiveTransferState.FINISHED)
+  }
+
   @Test
   fun given10NewerAnd10OlderAttachments_whenIGetEachBatch_thenIExpectProperBucketing() {
     val now = System.currentTimeMillis().milliseconds
@@ -259,7 +280,7 @@ class AttachmentTableTest {
   fun givenAnAttachmentWithAMessageThatExpiresIn5Minutes_whenIGetAttachmentsThatNeedArchiveUpload_thenIDoNotExpectThatAttachment() {
     // GIVEN
     val uncompressData = byteArrayOf(1, 2, 3, 4, 5)
-    val blobUncompressed = BlobProvider.getInstance().forData(uncompressData).createForSingleSessionInMemory()
+    val blobUncompressed = AppDependencies.blobs.forData(uncompressData).createForSingleSessionInMemory()
     val attachment = createAttachment(1, blobUncompressed, TransformProperties.empty())
     val message = createIncomingMessage(serverTime = 0.days, attachment = attachment, expiresIn = 5.minutes)
     val messageId = SignalDatabase.messages.insertMessageInbox(message).map { it.messageId }.get()
@@ -278,7 +299,7 @@ class AttachmentTableTest {
   fun givenAnAttachmentWithAMessageThatExpiresIn5Days_whenIGetAttachmentsThatNeedArchiveUpload_thenIDoExpectThatAttachment() {
     // GIVEN
     val uncompressData = byteArrayOf(1, 2, 3, 4, 5)
-    val blobUncompressed = BlobProvider.getInstance().forData(uncompressData).createForSingleSessionInMemory()
+    val blobUncompressed = AppDependencies.blobs.forData(uncompressData).createForSingleSessionInMemory()
     val attachment = createAttachment(1, blobUncompressed, TransformProperties.empty())
     val message = createIncomingMessage(serverTime = 0.days, attachment = attachment, expiresIn = 5.days)
     val messageId = SignalDatabase.messages.insertMessageInbox(message).map { it.messageId }.get()
@@ -297,7 +318,7 @@ class AttachmentTableTest {
   fun givenAnAttachmentWithAMessageWithExpirationStartedThatExpiresIn5Days_whenIGetAttachmentsThatNeedArchiveUpload_thenIDoExpectThatAttachment() {
     // GIVEN
     val uncompressData = byteArrayOf(1, 2, 3, 4, 5)
-    val blobUncompressed = BlobProvider.getInstance().forData(uncompressData).createForSingleSessionInMemory()
+    val blobUncompressed = AppDependencies.blobs.forData(uncompressData).createForSingleSessionInMemory()
     val attachment = createAttachment(1, blobUncompressed, TransformProperties.empty())
     val message = createIncomingMessage(serverTime = 0.days, attachment = attachment, expiresIn = 5.days)
     val messageId = SignalDatabase.messages.insertMessageInbox(message).map { it.messageId }.get()
@@ -317,7 +338,7 @@ class AttachmentTableTest {
   fun givenAnAttachmentWithALongTextAttachment_whenIGetAttachmentsThatNeedArchiveUpload_thenIDoNotExpectThatAttachment() {
     // GIVEN
     val uncompressData = byteArrayOf(1, 2, 3, 4, 5)
-    val blobUncompressed = BlobProvider.getInstance().forData(uncompressData).createForSingleSessionInMemory()
+    val blobUncompressed = AppDependencies.blobs.forData(uncompressData).createForSingleSessionInMemory()
     val attachment = createAttachment(1, blobUncompressed, TransformProperties.empty(), contentType = MediaUtil.LONG_TEXT)
     val message = createIncomingMessage(serverTime = 0.days, attachment = attachment)
     val messageId = SignalDatabase.messages.insertMessageInbox(message).map { it.messageId }.get()
@@ -418,6 +439,39 @@ class AttachmentTableTest {
     assertThat(dbAttachment2.archiveTransferState).isEqualTo(AttachmentTable.ArchiveTransferState.FINISHED)
   }
 
+  @Test
+  fun givenLocalBackupRestore_whenIFinalizeAttachment_thenIExpectArchiveStateNoneSoItGetsUploaded() {
+    val data = byteArrayOf(1, 2, 3, 4, 5)
+    val attachment = createAttachmentPointer("remote-key-1".toByteArray(), data.size)
+
+    val messageResult = SignalDatabase.messages.insertMessageInbox(createIncomingMessage(serverTime = 0.days, attachment = attachment)).get()
+    val attachmentId = messageResult.insertedAttachments!![attachment]!!
+    SignalDatabase.attachments.setTransferState(messageResult.messageId, attachmentId, AttachmentTable.TRANSFER_PROGRESS_STARTED)
+
+    // Data is restored from a local backup file, not the archive CDN
+    SignalDatabase.attachments.finalizeAttachmentAfterDownload(messageResult.messageId, attachmentId, ByteArrayInputStream(data), archiveRestore = true, restoredFromArchiveCdn = false)
+
+    val result = SignalDatabase.attachments.getAttachment(attachmentId)!!
+    assertThat(result.archiveTransferState).isEqualTo(AttachmentTable.ArchiveTransferState.NONE)
+    assertThat(result.archiveCdn).isNull()
+  }
+
+  @Test
+  fun givenArchiveCdnRestore_whenIFinalizeAttachment_thenIExpectArchiveStateFinished() {
+    val data = byteArrayOf(1, 2, 3, 4, 5)
+    val attachment = createAttachmentPointer("remote-key-1".toByteArray(), data.size)
+
+    val messageResult = SignalDatabase.messages.insertMessageInbox(createIncomingMessage(serverTime = 0.days, attachment = attachment)).get()
+    val attachmentId = messageResult.insertedAttachments!![attachment]!!
+    SignalDatabase.attachments.setTransferState(messageResult.messageId, attachmentId, AttachmentTable.TRANSFER_PROGRESS_STARTED)
+
+    // Data is restored directly from the archive CDN
+    SignalDatabase.attachments.finalizeAttachmentAfterDownload(messageResult.messageId, attachmentId, ByteArrayInputStream(data), archiveRestore = true, restoredFromArchiveCdn = true)
+
+    val result = SignalDatabase.attachments.getAttachment(attachmentId)!!
+    assertThat(result.archiveTransferState).isEqualTo(AttachmentTable.ArchiveTransferState.FINISHED)
+  }
+
   @Test
   fun givenAttachmentsWithMatchingMediaId_whenISetArchiveFinishedForMatchingMediaObjects_thenIExpectThoseAttachmentsToBeMarkedFinished() {
     // GIVEN
@@ -585,7 +639,7 @@ class AttachmentTableTest {
     ).get()
   }
 
-  private fun createArchivedAttachment(): Attachment {
+  private fun createArchivedAttachment(localBackupKey: ByteArray? = null): Attachment {
     return ArchivedAttachment(
       contentType = "image/jpeg",
       size = 1024,
@@ -609,7 +663,7 @@ class AttachmentTableTest {
       quoteTargetContentType = null,
       uuid = UUID.randomUUID(),
       fileName = null,
-      localBackupKey = null
+      localBackupKey = localBackupKey
     )
   }
 

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

@@ -19,14 +19,14 @@ import org.signal.core.util.Util
 import org.signal.core.util.readFully
 import org.signal.core.util.stream.LimitedInputStream
 import org.signal.core.util.update
+import org.signal.mediasend.SentMediaQuality
 import org.thoughtcrime.securesms.attachments.Cdn
 import org.thoughtcrime.securesms.attachments.PointerAttachment
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.mms.MediaStream
 import org.thoughtcrime.securesms.mms.OutgoingMessage
 import org.thoughtcrime.securesms.mms.QuoteModel
-import org.thoughtcrime.securesms.mms.SentMediaQuality
-import org.thoughtcrime.securesms.providers.BlobProvider
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.MediaUtil
 import org.whispersystems.signalservice.internal.crypto.PaddingInputStream
@@ -671,7 +671,7 @@ class AttachmentTableTest_deduping {
     }
 
     fun insertWithData(data: ByteArray, transformProperties: TransformProperties = TransformProperties.empty()): AttachmentId {
-      val uri = BlobProvider.getInstance().forData(data).createForSingleSessionInMemory()
+      val uri = AppDependencies.blobs.forData(data).createForSingleSessionInMemory()
 
       val attachment = UriAttachmentBuilder.build(
         id = Random.nextLong(),

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

@@ -10,9 +10,14 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.signal.ringrtc.CallId
 import org.signal.ringrtc.CallManager
+import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.testing.Flag
+import org.thoughtcrime.securesms.testing.RemoteConfigForTest
 import org.thoughtcrime.securesms.testing.SignalActivityRule
+import org.thoughtcrime.securesms.testing.TestRemoteConfigFlag
 
+@RemoteConfigForTest(flags = [Flag(TestRemoteConfigFlag.DISAPPEAR_MORE, "true")])
 @RunWith(AndroidJUnit4::class)
 class CallTableTest {
 
@@ -977,6 +982,80 @@ class CallTableTest {
 //    assertEquals(0, allCallEvents.size)
   }
 
+  @Test
+  fun givenAMissedOneToOneCall_whenIMarkAllCallEventsRead_thenTimerShouldStart() {
+    val callId = 1L
+    val peer = harness.others[0]
+    insertExpiringThread(peer)
+
+    SignalDatabase.calls.insertOneToOneCall(callId, System.currentTimeMillis(), peer, CallTable.Type.AUDIO_CALL, CallTable.Direction.INCOMING, CallTable.Event.MISSED)
+
+    val readAt = System.currentTimeMillis()
+    SignalDatabase.calls.markAllCallEventsRead(readAt = readAt)
+
+    val call = SignalDatabase.calls.getCallById(callId, peer)
+    assertEquals(readAt, SignalDatabase.messages.getMessageRecord(call!!.messageId!!).expireStarted)
+  }
+
+  @Test
+  fun givenAMissedNotificationProfileOneToOneCall_whenIMarkAllCallEventsRead_thenTimerShouldStart() {
+    val callId = 1L
+    val peer = harness.others[0]
+    insertExpiringThread(peer)
+
+    SignalDatabase.calls.insertOneToOneCall(callId, System.currentTimeMillis(), peer, CallTable.Type.AUDIO_CALL, CallTable.Direction.INCOMING, CallTable.Event.MISSED_NOTIFICATION_PROFILE)
+
+    val readAt = System.currentTimeMillis()
+    SignalDatabase.calls.markAllCallEventsRead(readAt = readAt)
+
+    val call = SignalDatabase.calls.getCallById(callId, peer)
+    assertEquals(readAt, SignalDatabase.messages.getMessageRecord(call!!.messageId!!).expireStarted)
+  }
+
+  @Test
+  fun givenAMissedGroupCall_whenIMarkAllCallEventsRead_thenTimerShouldStart() {
+    val callId = 1L
+    SignalDatabase.recipients.setExpireMessagesForGroup(groupRecipientId, 60)
+
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(callId, groupRecipientId, harness.others[1], System.currentTimeMillis(), CallManager.RingUpdate.EXPIRED_REQUEST)
+
+    val readAt = System.currentTimeMillis()
+    SignalDatabase.calls.markAllCallEventsRead(readAt = readAt)
+
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
+    assertEquals(readAt, SignalDatabase.messages.getMessageRecord(call!!.messageId!!).expireStarted)
+  }
+
+  @Test
+  fun givenAMissedNotificationProfileGroupCall_whenIMarkAllCallEventsRead_thenTimerShouldStart() {
+    val callId = 1L
+    val ringerAci = Recipient.resolved(harness.others[1]).requireAci()
+
+    SignalDatabase.recipients.setExpireMessagesForGroup(groupRecipientId, 60)
+
+    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(callId, groupRecipientId, ringerAci, System.currentTimeMillis(), CallManager.RingUpdate.EXPIRED_REQUEST, true)
+
+    val readAt = System.currentTimeMillis()
+    SignalDatabase.calls.markAllCallEventsRead(readAt = readAt)
+
+    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
+    assertEquals(readAt, SignalDatabase.messages.getMessageRecord(call!!.messageId!!).expireStarted)
+  }
+
+  @Test
+  fun givenAnOutgoingOneToOneCallFromSync_whenInserted_thenTimerIsStarted() {
+    val callId = 1L
+    val peer = harness.others[0]
+    val timestamp = System.currentTimeMillis()
+
+    insertExpiringThread(peer)
+    SignalDatabase.calls.insertOneToOneCall(callId, timestamp, peer, CallTable.Type.AUDIO_CALL, CallTable.Direction.OUTGOING, CallTable.Event.OUTGOING_RING, true)
+
+    val call = SignalDatabase.calls.getCallById(callId, peer)
+    val message = SignalDatabase.messages.getMessageRecord(call!!.messageId!!)
+    assertNotEquals(0L, message.expireStarted)
+  }
+
   private fun insertTwoCallEvents() {
     SignalDatabase.calls.insertAcceptedGroupCall(
       1,
@@ -992,4 +1071,10 @@ class CallTableTest {
       2000
     )
   }
+
+  private fun insertExpiringThread(recipientId: RecipientId) {
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(recipientId))
+    MmsHelper.insert(recipient = Recipient.resolved(recipientId), expiresIn = 30_000L, threadId = threadId)
+    SignalDatabase.threads.update(threadId, false)
+  }
 }

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

@@ -0,0 +1,279 @@
+/*
+ * Copyright 2026 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.jobs
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import assertk.assertions.isFalse
+import assertk.assertions.isNull
+import io.mockk.Runs
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockkObject
+import io.mockk.unmockkAll
+import io.mockk.verify
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.signal.core.models.backup.MediaName
+import org.signal.core.models.database.AttachmentId
+import org.signal.core.util.Base64.decodeBase64OrThrow
+import org.signal.network.NetworkResult
+import org.thoughtcrime.securesms.attachments.Attachment
+import org.thoughtcrime.securesms.attachments.PointerAttachment
+import org.thoughtcrime.securesms.backup.v2.BackupRepository
+import org.thoughtcrime.securesms.backup.v2.MessageBackupTier
+import org.thoughtcrime.securesms.database.AttachmentTable
+import org.thoughtcrime.securesms.database.BackupMediaSnapshotTable.MediaEntry
+import org.thoughtcrime.securesms.database.MessageType
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.mms.IncomingMessage
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+import org.thoughtcrime.securesms.util.MediaUtil
+import org.whispersystems.signalservice.api.archive.ArchiveGetMediaItemsResponse
+import org.whispersystems.signalservice.api.archive.ArchiveGetMediaItemsResponse.StoredMediaObject
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId
+import java.io.ByteArrayInputStream
+import java.util.Optional
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.days
+
+@RunWith(AndroidJUnit4::class)
+class ArchiveAttachmentReconciliationJobTest {
+
+  @get:Rule
+  val harness = SignalActivityRule()
+
+  @Before
+  fun setUp() {
+    SignalStore.backup.backupTier = MessageBackupTier.PAID
+    SignalStore.backup.hasBackupBeenUploaded = true
+    SignalStore.backup.lastAttachmentReconciliationTime = System.currentTimeMillis()
+    SignalStore.backup.localRestoreReconcilePending = false
+
+    mockkObject(BackupRepository)
+    mockkObject(ArchiveCommitAttachmentDeletesJob)
+    every { ArchiveCommitAttachmentDeletesJob.deleteMediaObjectsFromCdn(any(), any(), any(), any()) } returns null
+  }
+
+  @After
+  fun tearDown() {
+    unmockkAll()
+  }
+
+  /**
+   * The core of the reconcile-first restore flow: a local restore resets everything to [AttachmentTable.ArchiveTransferState.NONE], so media that genuinely is
+   * on the CDN must be promoted back to FINISHED during reconciliation -- otherwise the backfill would needlessly re-upload it. This only happens while
+   * [localRestoreReconcilePending] is set, so it never runs in the common periodic reconciliation.
+   */
+  @Test
+  fun givenLocalRestorePendingAndAttachmentOnCdn_whenIReconcile_thenIExpectItMarkedFinished() {
+    SignalStore.backup.localRestoreReconcilePending = true
+
+    val attachmentId = seedFinalizedAttachment("remote-key-1".toByteArray(), byteArrayOf(1, 2, 3, 4, 5))
+    commitSnapshotFor(attachmentId, cdn = 3)
+    fakeCdnContains(attachmentId, cdn = 3)
+
+    ArchiveAttachmentReconciliationJob(forced = true).run()
+
+    assertThat(SignalDatabase.attachments.getAttachment(attachmentId)!!.archiveTransferState).isEqualTo(AttachmentTable.ArchiveTransferState.FINISHED)
+  }
+
+  /**
+   * Guards the reconcile-first promotion above: outside the local-restore flow (the common periodic reconciliation), NONE media that happens to be on the CDN is
+   * left alone, so we don't do the expensive mark-finished scan in the common case.
+   */
+  @Test
+  fun givenNoLocalRestorePendingAndNoneAttachmentOnCdn_whenIReconcile_thenItStaysNone() {
+    val attachmentId = seedFinalizedAttachment("remote-key-common".toByteArray(), byteArrayOf(2, 3, 4, 5, 6))
+    commitSnapshotFor(attachmentId, cdn = 3)
+    fakeCdnContains(attachmentId, cdn = 3)
+
+    ArchiveAttachmentReconciliationJob(forced = true).run()
+
+    assertThat(SignalDatabase.attachments.getAttachment(attachmentId)!!.archiveTransferState).isEqualTo(AttachmentTable.ArchiveTransferState.NONE)
+  }
+
+  @Test
+  fun givenFinishedAttachmentMissingFromCdn_whenIReconcile_thenIExpectItResetToNone() {
+    val attachmentId = seedFinalizedAttachment("remote-key-2".toByteArray(), byteArrayOf(6, 7, 8, 9, 10))
+    SignalDatabase.attachments.setArchiveTransferState(attachmentId, AttachmentTable.ArchiveTransferState.FINISHED)
+    commitSnapshotFor(attachmentId, cdn = 3)
+    fakeCdnEmpty()
+
+    ArchiveAttachmentReconciliationJob(forced = true).run()
+
+    assertThat(SignalDatabase.attachments.getAttachment(attachmentId)!!.archiveTransferState).isEqualTo(AttachmentTable.ArchiveTransferState.NONE)
+  }
+
+  /**
+   * The eventual safety net: an ordinary (non-forced) periodic reconciliation, run after the sync interval has elapsed, heals the bad state on its own -- media
+   * in the snapshot but missing from the CDN is reset to [AttachmentTable.ArchiveTransferState.NONE] and a re-upload is enqueued -- with no help from the
+   * migration or the reconcile-first flow.
+   */
+  @Test
+  fun givenFinishedMediaMissingFromCdn_whenAnOrdinaryPeriodicReconciliationRuns_thenItHealsToNoneAndReUploads() {
+    SignalStore.backup.lastAttachmentReconciliationTime = System.currentTimeMillis() - 60.days.inWholeMilliseconds
+    mockkObject(BackupMessagesJob)
+    every { BackupMessagesJob.enqueue() } just Runs
+
+    val attachmentId = seedFinalizedAttachment("remote-key-periodic".toByteArray(), byteArrayOf(1, 2, 3, 4, 5))
+    SignalDatabase.attachments.setArchiveTransferState(attachmentId, AttachmentTable.ArchiveTransferState.FINISHED)
+    commitSnapshotFor(attachmentId, cdn = 3)
+    fakeCdnEmpty()
+
+    ArchiveAttachmentReconciliationJob(forced = false).run()
+
+    val healed = SignalDatabase.attachments.getAttachment(attachmentId)!!
+    assertThat(healed.archiveTransferState).isEqualTo(AttachmentTable.ArchiveTransferState.NONE)
+    assertThat(healed.archiveCdn).isNull()
+    verify(exactly = 1) { BackupMessagesJob.enqueue() }
+  }
+
+  /**
+   * Reconciliation must only repair genuinely-broken state. Media that is actually present on the CDN stays [AttachmentTable.ArchiveTransferState.FINISHED], so
+   * we never needlessly reset (and therefore re-upload) media that was correctly archived.
+   */
+  @Test
+  fun givenFinishedMediaStillOnCdn_whenIReconcile_thenItStaysFinished() {
+    val attachmentId = seedFinalizedAttachment("remote-key-on-cdn".toByteArray(), byteArrayOf(6, 7, 8, 9, 10))
+    SignalDatabase.attachments.setArchiveTransferState(attachmentId, AttachmentTable.ArchiveTransferState.FINISHED)
+    commitSnapshotFor(attachmentId, cdn = 3)
+    fakeCdnContains(attachmentId, cdn = 3)
+
+    ArchiveAttachmentReconciliationJob(forced = true).run()
+
+    assertThat(SignalDatabase.attachments.getAttachment(attachmentId)!!.archiveTransferState).isEqualTo(AttachmentTable.ArchiveTransferState.FINISHED)
+  }
+
+  /**
+   * The other healing direction: media that is on the CDN but locally marked [AttachmentTable.ArchiveTransferState.NONE] and absent from the current snapshot is
+   * treated as a delete-candidate. Before deleting, reconciliation confirms it's still referenced locally and recovers it to
+   * [AttachmentTable.ArchiveTransferState.FINISHED] rather than deleting it from the CDN.
+   */
+  @Test
+  fun givenNoneMediaOnCdnButNotInSnapshot_whenIReconcile_thenItIsRecoveredToFinished() {
+    val attachmentId = seedFinalizedAttachment("remote-key-flow2".toByteArray(), byteArrayOf(11, 12, 13, 14, 15))
+    SignalDatabase.attachments.setArchiveTransferState(attachmentId, AttachmentTable.ArchiveTransferState.NONE)
+    fakeCdnContains(attachmentId, cdn = 3)
+
+    ArchiveAttachmentReconciliationJob(forced = true).run()
+
+    assertThat(SignalDatabase.attachments.getAttachment(attachmentId)!!.archiveTransferState).isEqualTo(AttachmentTable.ArchiveTransferState.FINISHED)
+  }
+
+  @Test
+  fun givenFirstEverReconciliation_whenIForceIt_thenItStillRunsAndRepairs() {
+    SignalStore.backup.lastAttachmentReconciliationTime = -1
+
+    val attachmentId = seedFinalizedAttachment("remote-key-3".toByteArray(), byteArrayOf(11, 12, 13, 14, 15))
+    SignalDatabase.attachments.setArchiveTransferState(attachmentId, AttachmentTable.ArchiveTransferState.FINISHED)
+    commitSnapshotFor(attachmentId, cdn = 3)
+    fakeCdnEmpty()
+
+    ArchiveAttachmentReconciliationJob(forced = true).run()
+
+    assertThat(SignalDatabase.attachments.getAttachment(attachmentId)!!.archiveTransferState).isEqualTo(AttachmentTable.ArchiveTransferState.NONE)
+  }
+
+  @Test
+  fun givenLocalRestoreReconcilePending_whenReconcileCompletes_thenIExpectFlagCleared() {
+    SignalStore.backup.localRestoreReconcilePending = true
+    fakeCdnEmpty()
+
+    ArchiveAttachmentReconciliationJob(forced = true).run()
+
+    assertThat(SignalStore.backup.localRestoreReconcilePending).isFalse()
+  }
+
+  private fun seedFinalizedAttachment(remoteKey: ByteArray, data: ByteArray): AttachmentId {
+    val attachment = createAttachmentPointer(remoteKey, data.size)
+    val messageResult = SignalDatabase.messages.insertMessageInbox(createIncomingMessage(serverTime = 0.days, attachment = attachment)).get()
+    val attachmentId = messageResult.insertedAttachments!![attachment]!!
+    SignalDatabase.attachments.setTransferState(messageResult.messageId, attachmentId, AttachmentTable.TRANSFER_PROGRESS_STARTED)
+    SignalDatabase.attachments.finalizeAttachmentAfterDownload(messageResult.messageId, attachmentId, ByteArrayInputStream(data))
+    return attachmentId
+  }
+
+  private fun commitSnapshotFor(attachmentId: AttachmentId, cdn: Int) {
+    val attachment = SignalDatabase.attachments.getAttachment(attachmentId)!!
+    val plaintextHash = attachment.dataHash!!.decodeBase64OrThrow()
+    val remoteKey = attachment.remoteKey!!.decodeBase64OrThrow()
+    val mediaId = MediaName.fromPlaintextHashAndRemoteKey(plaintextHash, remoteKey).toMediaId(SignalStore.backup.mediaRootBackupKey).encode()
+
+    SignalDatabase.backupMediaSnapshots.writePendingMediaEntries(
+      listOf(MediaEntry(mediaId = mediaId, cdn = cdn, plaintextHash = plaintextHash, remoteKey = remoteKey, isThumbnail = false))
+    )
+    SignalDatabase.backupMediaSnapshots.commitPendingRows()
+  }
+
+  private fun fakeCdnContains(attachmentId: AttachmentId, cdn: Int) {
+    val attachment = SignalDatabase.attachments.getAttachment(attachmentId)!!
+    val plaintextHash = attachment.dataHash!!.decodeBase64OrThrow()
+    val remoteKey = attachment.remoteKey!!.decodeBase64OrThrow()
+    val mediaId = MediaName.fromPlaintextHashAndRemoteKey(plaintextHash, remoteKey).toMediaId(SignalStore.backup.mediaRootBackupKey).encode()
+
+    every { BackupRepository.listRemoteMediaObjects(any(), any()) } returns NetworkResult.Success(
+      ArchiveGetMediaItemsResponse(
+        storedMediaObjects = listOf(StoredMediaObject(cdn = cdn, mediaId = mediaId, objectLength = attachment.size)),
+        backupDir = null,
+        mediaDir = null,
+        cursor = null
+      )
+    )
+  }
+
+  private fun fakeCdnEmpty() {
+    every { BackupRepository.listRemoteMediaObjects(any(), any()) } returns NetworkResult.Success(
+      ArchiveGetMediaItemsResponse(storedMediaObjects = emptyList(), backupDir = null, mediaDir = null, cursor = null)
+    )
+  }
+
+  private fun createIncomingMessage(serverTime: Duration, attachment: Attachment): IncomingMessage {
+    return IncomingMessage(
+      type = MessageType.NORMAL,
+      from = harness.others[0],
+      body = null,
+      sentTimeMillis = serverTime.inWholeMilliseconds,
+      serverTimeMillis = serverTime.inWholeMilliseconds,
+      receivedTimeMillis = serverTime.inWholeMilliseconds,
+      attachments = listOf(attachment)
+    )
+  }
+
+  private fun createAttachmentPointer(key: ByteArray, size: Int): Attachment {
+    return PointerAttachment.forPointer(
+      pointer = Optional.of(
+        SignalServiceAttachmentPointer(
+          cdnNumber = 3,
+          remoteId = SignalServiceAttachmentRemoteId.V4("asdf"),
+          contentType = MediaUtil.IMAGE_JPEG,
+          key = key,
+          size = Optional.of(size),
+          preview = Optional.empty(),
+          width = 2,
+          height = 2,
+          digest = Optional.of(byteArrayOf()),
+          incrementalDigest = Optional.empty(),
+          incrementalMacChunkSize = 0,
+          fileName = Optional.of("file.jpg"),
+          voiceNote = false,
+          isBorderless = false,
+          isGif = false,
+          caption = Optional.empty(),
+          blurHash = Optional.empty(),
+          uploadTimestamp = 0,
+          uuid = null
+        )
+      )
+    ).get()
+  }
+}

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

@@ -15,14 +15,13 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.signal.core.models.media.TransformProperties
 import org.signal.core.util.StreamUtil
+import org.signal.mediasend.SentMediaQuality
 import org.thoughtcrime.securesms.attachments.UriAttachment
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.UriAttachmentBuilder
 import org.thoughtcrime.securesms.database.transformPropertiesForSentMediaQuality
 import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
-import org.thoughtcrime.securesms.mms.SentMediaQuality
-import org.thoughtcrime.securesms.providers.BlobProvider
 import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.thoughtcrime.securesms.util.MediaUtil
 import java.util.Optional
@@ -40,7 +39,7 @@ class AttachmentCompressionJobTest {
       StreamUtil.readFully(it)
     }
 
-    val blob = BlobProvider.getInstance().forData(imageBytes).createForSingleSessionOnDisk(AppDependencies.application)
+    val blob = AppDependencies.blobs.forData(imageBytes).createForSingleSessionOnDisk(AppDependencies.application)
 
     val firstPreUpload = createAttachment(1, blob, TransformProperties.empty())
     val firstDatabaseAttachment = SignalDatabase.attachments.insertAttachmentForPreUpload(firstPreUpload)

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

@@ -32,10 +32,18 @@ import org.thoughtcrime.securesms.database.AttachmentTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.jobs.protos.BackupDeleteJobData
 import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.testing.Flag
+import org.thoughtcrime.securesms.testing.RemoteConfigForTest
 import org.thoughtcrime.securesms.testing.SignalActivityRule
-import org.thoughtcrime.securesms.util.RemoteConfig
+import org.thoughtcrime.securesms.testing.TestRemoteConfigFlag
 import java.util.UUID
 
+@RemoteConfigForTest(
+  flags = [
+    Flag(TestRemoteConfigFlag.INTERNAL_USER, "true"),
+    Flag(TestRemoteConfigFlag.DEFAULT_MAX_BACKOFF, "1")
+  ]
+)
 class BackupDeleteJobTest {
 
   @get:Rule
@@ -43,10 +51,6 @@ class BackupDeleteJobTest {
 
   @Before
   fun setUp() {
-    mockkObject(RemoteConfig)
-    every { RemoteConfig.internalUser } returns true
-    every { RemoteConfig.defaultMaxBackoff } returns 1000L
-
     mockkObject(BackupRepository)
     every { BackupRepository.getBackupTier() } returns NetworkResult.Success(MessageBackupTier.PAID)
     every { BackupRepository.deleteBackup() } returns NetworkResult.Success(Unit)
@@ -60,29 +64,24 @@ class BackupDeleteJobTest {
 
   @Test
   fun givenUserNotRegistered_whenIRun_thenIExpectFailure() {
-    mockkObject(SignalStore) {
-      every { SignalStore.account.isRegistered } returns false
+    SignalStore.account.setRegistered(false)
 
-      val job = BackupDeleteJob()
+    val job = BackupDeleteJob()
 
-      val result = job.run()
+    val result = job.run()
 
-      assertThat(result.isFailure).isTrue()
-    }
+    assertThat(result.isFailure).isTrue()
   }
 
   @Test
   fun givenLinkedDevice_whenIRun_thenIExpectFailure() {
-    mockkObject(SignalStore) {
-      every { SignalStore.account.isRegistered } returns true
-      every { SignalStore.account.isLinkedDevice } returns true
+    SignalStore.account.deviceId = 2
 
-      val job = BackupDeleteJob()
+    val job = BackupDeleteJob()
 
-      val result = job.run()
+    val result = job.run()
 
-      assertThat(result.isFailure).isTrue()
-    }
+    assertThat(result.isFailure).isTrue()
   }
 
   @Test

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

@@ -42,8 +42,10 @@ import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.net.SignalNetwork
+import org.thoughtcrime.securesms.testing.Flag
+import org.thoughtcrime.securesms.testing.RemoteConfigForTest
 import org.thoughtcrime.securesms.testing.SignalActivityRule
-import org.thoughtcrime.securesms.util.RemoteConfig
+import org.thoughtcrime.securesms.testing.TestRemoteConfigFlag
 import org.whispersystems.signalservice.api.storage.IAPSubscriptionId
 import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
 import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription.ChargeFailure
@@ -55,6 +57,7 @@ import java.util.Currency
 import kotlin.time.Duration.Companion.days
 import kotlin.time.Duration.Companion.milliseconds
 
+@RemoteConfigForTest(flags = [Flag(TestRemoteConfigFlag.INTERNAL_USER, "true") ])
 @RunWith(AndroidJUnit4::class)
 class BackupSubscriptionCheckJobTest {
 
@@ -67,9 +70,6 @@ class BackupSubscriptionCheckJobTest {
 
   @Before
   fun setUp() {
-    mockkObject(RemoteConfig)
-    every { RemoteConfig.internalUser } returns true
-
     coEvery { AppDependencies.billingApi.getApiAvailability() } returns BillingResponseCode.OK
 
     coEvery { AppDependencies.billingApi.queryPurchases() } returns BillingPurchaseResult.Success(
@@ -88,6 +88,7 @@ class BackupSubscriptionCheckJobTest {
     every { RecurringInAppPaymentRepository.getActiveSubscriptionSync(InAppPaymentSubscriberRecord.Type.BACKUP) } returns NetworkResult.Success(
       createActiveSubscription()
     )
+    every { RecurringInAppPaymentRepository.ensureSubscriberIdSync(any(), any(), any()) } returns Unit
 
     mockkObject(BackupRepository)
     every { BackupRepository.getBackupTier() } answers {
@@ -142,28 +143,22 @@ class BackupSubscriptionCheckJobTest {
 
   @Test
   fun givenUserIsNotRegistered_whenIRun_thenIExpectSuccessAndEarlyExit() {
-    mockkObject(SignalStore.account) {
-      every { SignalStore.account.e164 } returns "+15555550101"
-      every { SignalStore.account.isRegistered } returns false
+    SignalStore.account.setRegistered(false)
 
-      val job = BackupSubscriptionCheckJob.create()
-      val result = job.run()
+    val job = BackupSubscriptionCheckJob.create()
+    val result = job.run()
 
-      assertEarlyExit(result)
-    }
+    assertEarlyExit(result)
   }
 
   @Test
   fun givenIsLinkedDevice_whenIRun_thenIExpectSuccessAndEarlyExit() {
-    mockkObject(SignalStore.account) {
-      every { SignalStore.account.e164 } returns "+15555550101"
-      every { SignalStore.account.isLinkedDevice } returns true
+    SignalStore.account.deviceId = 2
 
-      val job = BackupSubscriptionCheckJob.create()
-      val result = job.run()
+    val job = BackupSubscriptionCheckJob.create()
+    val result = job.run()
 
-      assertEarlyExit(result)
-    }
+    assertEarlyExit(result)
   }
 
   @Test

app/src/androidTest/java/org/thoughtcrime/securesms/main/MainNavigationLaunchTest.kt

@@ -32,8 +32,8 @@ 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.dependencies.AppDependencies
 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
@@ -49,7 +49,6 @@ import java.util.concurrent.TimeUnit
  */
 @RunWith(AndroidJUnit4::class)
 class MainNavigationLaunchTest {
-
   @get:Rule
   val harness = SignalActivityRule(othersCount = 2)
 
@@ -89,7 +88,8 @@ class MainNavigationLaunchTest {
             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}")
+            appendLine("vm.detailLocation: ${vm.detailLocation.value}")
+            appendLine("vm.chatsBackStackEntries: ${vm.chatsBackStackEntries.toList()}")
           }
         }
         throw IllegalStateException("${e.message}\n$state", e)
@@ -254,8 +254,9 @@ class MainNavigationLaunchTest {
           "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}"
+      val staged = runOnMainSync { vm.chatsBackStackEntries.filterNot { it is MainNavigationDetailLocation.Empty } }
+      check(staged.isEmpty()) {
+        "Expected no detail to be staged on the chats back stack, got $staged"
       }
     }
   }
@@ -289,8 +290,9 @@ class MainNavigationLaunchTest {
         "Expected default CHATS, got ${vm.mainNavigationState.value.currentListLocation}"
       }
       Thread.sleep(750)
-      check(vm.earlyNavigationDetailLocationRequested == null) {
-        "Expected no early detail, got ${vm.earlyNavigationDetailLocationRequested}"
+      val detailLocation = runOnMainSync { vm.detailLocation.value }
+      check(detailLocation == MainNavigationDetailLocation.Empty) {
+        "Expected Empty detail location, got $detailLocation"
       }
       check(recorder.createdArgs.isEmpty()) {
         "Expected no ConversationFragment for bare launch, got ${recorder.createdArgs.size}"
@@ -348,11 +350,13 @@ class MainNavigationLaunchTest {
       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() }
+
+      await(description = "conversation cleared from chats back stack after Empty detail intent") {
+        vm.chatsBackStackEntries.none { it is MainNavigationDetailLocation.Conversation }
+      }
+
       check(vm.mainNavigationState.value.currentListLocation == MainNavigationListLocation.CHATS) {
         "Expected CHATS, got ${vm.mainNavigationState.value.currentListLocation}"
       }
@@ -569,7 +573,7 @@ class MainNavigationLaunchTest {
   }
 
   private fun realBlob(bytes: ByteArray, mimeType: String): Uri {
-    return BlobProvider.getInstance()
+    return AppDependencies.blobs
       .forData(bytes)
       .withMimeType(mimeType)
       .createForSingleSessionInMemory()

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

@@ -18,10 +18,10 @@ import org.thoughtcrime.securesms.database.UriAttachmentBuilder
 import org.thoughtcrime.securesms.database.model.GroupsV2UpdateMessageConverter
 import org.thoughtcrime.securesms.database.model.databaseprotos.DecryptedGroupV2Context
 import org.thoughtcrime.securesms.database.model.databaseprotos.GV2UpdateDescription
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.ThreadUpdateJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.mms.OutgoingMessage
-import org.thoughtcrime.securesms.providers.BlobProvider
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.testing.GroupTestingUtils
@@ -120,7 +120,7 @@ class MessageHelper(private val harness: SignalActivityRule, var startTime: Long
   }
 
   fun outgoingAttachment(data: ByteArray, uuid: UUID? = UUID.randomUUID()): Attachment {
-    val uri: Uri = BlobProvider.getInstance().forData(data).createForSingleSessionInMemory()
+    val uri: Uri = AppDependencies.blobs.forData(data).createForSingleSessionInMemory()
 
     val attachment: UriAttachment = UriAttachmentBuilder.build(
       id = Random.nextLong(),

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

@@ -0,0 +1,338 @@
+/*
+ * Copyright 2026 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.messages
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import assertk.assertions.isNotNull
+import okio.ByteString.Companion.toByteString
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.signal.core.models.database.AttachmentId
+import org.signal.core.util.Base64
+import org.thoughtcrime.securesms.database.AttachmentTable
+import org.thoughtcrime.securesms.database.MessageTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.testing.MessageContentFuzzer
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+import org.thoughtcrime.securesms.util.MediaUtil
+import org.whispersystems.signalservice.api.push.SignalServiceAddress
+import org.whispersystems.signalservice.internal.push.AddressableMessage
+import org.whispersystems.signalservice.internal.push.AttachmentPointer
+import org.whispersystems.signalservice.internal.push.Content
+import org.whispersystems.signalservice.internal.push.ConversationIdentifier
+import org.whispersystems.signalservice.internal.push.DataMessage
+import org.whispersystems.signalservice.internal.push.SyncMessage
+import java.util.UUID
+
+@Suppress("ClassName")
+@RunWith(AndroidJUnit4::class)
+class SyncMessageProcessorTest_attachmentBackfill {
+
+  @get:Rule
+  val harness = SignalActivityRule(createGroup = true)
+
+  private lateinit var messageHelper: MessageHelper
+  private var originalDeviceId: Int = SignalServiceAddress.DEFAULT_DEVICE_ID
+
+  @Before
+  fun setUp() {
+    messageHelper = MessageHelper(harness)
+    originalDeviceId = SignalStore.account.deviceId
+    // Make this device a linked device so backfill response handling activates.
+    SignalStore.account.deviceId = 2
+  }
+
+  @After
+  fun tearDown() {
+    SignalStore.account.deviceId = originalDeviceId
+    messageHelper.tearDown()
+  }
+
+  @Test
+  fun fresh_pointer_updates_row_and_resets_transfer_state() {
+    val (messageId, attachmentId) = insertIncomingMediaMessage(messageHelper.alice)
+    SignalDatabase.attachments.setTransferProgressFailed(attachmentId, messageId)
+
+    val pointer = freshPointer(cdnNumber = 3, cdnKey = "fresh-key", size = 1234, uploadTimestamp = 9_999_000L)
+    deliverBackfillResponse(
+      sender = messageHelper.alice,
+      sentTimestamp = sentTimestampFor(messageId),
+      conversationId = messageHelper.alice,
+      attachmentData = listOf(SyncMessage.AttachmentBackfillResponse.AttachmentData(attachment = pointer))
+    )
+
+    // transferState is not asserted: the forced download job's onAdded() races it PENDING -> STARTED. The pointer fields
+    // are written synchronously and are stable.
+    val refreshed = SignalDatabase.attachments.getAttachmentsForMessage(messageId).single()
+    assertThat(refreshed.remoteLocation).isEqualTo("fresh-key")
+    assertThat(refreshed.cdn.cdnNumber).isEqualTo(3)
+    assertThat(refreshed.size).isEqualTo(1234L)
+    assertThat(refreshed.uploadTimestamp).isEqualTo(9_999_000L)
+  }
+
+  @Test
+  fun terminal_error_marks_permanent_failure() {
+    val (messageId, attachmentId) = insertIncomingMediaMessage(messageHelper.alice)
+    SignalDatabase.attachments.setTransferProgressFailed(attachmentId, messageId)
+
+    deliverBackfillResponse(
+      sender = messageHelper.alice,
+      sentTimestamp = sentTimestampFor(messageId),
+      conversationId = messageHelper.alice,
+      attachmentData = listOf(
+        SyncMessage.AttachmentBackfillResponse.AttachmentData(
+          status = SyncMessage.AttachmentBackfillResponse.AttachmentData.Status.TERMINAL_ERROR
+        )
+      )
+    )
+
+    val refreshed = SignalDatabase.attachments.getAttachmentsForMessage(messageId).single()
+    assertThat(refreshed.transferState).isEqualTo(AttachmentTable.TRANSFER_PROGRESS_PERMANENT_FAILURE)
+  }
+
+  @Test
+  fun pending_status_leaves_row_unchanged() {
+    val (messageId, attachmentId) = insertIncomingMediaMessage(messageHelper.alice)
+    SignalDatabase.attachments.setTransferProgressFailed(attachmentId, messageId)
+
+    deliverBackfillResponse(
+      sender = messageHelper.alice,
+      sentTimestamp = sentTimestampFor(messageId),
+      conversationId = messageHelper.alice,
+      attachmentData = listOf(
+        SyncMessage.AttachmentBackfillResponse.AttachmentData(
+          status = SyncMessage.AttachmentBackfillResponse.AttachmentData.Status.PENDING
+        )
+      )
+    )
+
+    val refreshed = SignalDatabase.attachments.getAttachmentsForMessage(messageId).single()
+    assertThat(refreshed.transferState).isEqualTo(AttachmentTable.TRANSFER_PROGRESS_FAILED)
+  }
+
+  @Test
+  fun message_not_found_error_marks_attachments_retryable_failed() {
+    val (messageId, attachmentId) = insertIncomingMediaMessage(messageHelper.alice)
+    SignalDatabase.attachments.setTransferProgressFailed(attachmentId, messageId)
+
+    deliverBackfillResponse(
+      sender = messageHelper.alice,
+      sentTimestamp = sentTimestampFor(messageId),
+      conversationId = messageHelper.alice,
+      error = SyncMessage.AttachmentBackfillResponse.Error.MESSAGE_NOT_FOUND
+    )
+
+    val refreshed = SignalDatabase.attachments.getAttachmentsForMessage(messageId).single()
+    assertThat(refreshed.transferState).isEqualTo(AttachmentTable.TRANSFER_PROGRESS_FAILED)
+  }
+
+  @Test
+  fun primary_device_ignores_backfill_response() {
+    SignalStore.account.deviceId = SignalServiceAddress.DEFAULT_DEVICE_ID
+
+    val (messageId, attachmentId) = insertIncomingMediaMessage(messageHelper.alice)
+    SignalDatabase.attachments.setTransferProgressFailed(attachmentId, messageId)
+
+    deliverBackfillResponse(
+      sender = messageHelper.alice,
+      sentTimestamp = sentTimestampFor(messageId),
+      conversationId = messageHelper.alice,
+      attachmentData = listOf(
+        SyncMessage.AttachmentBackfillResponse.AttachmentData(
+          status = SyncMessage.AttachmentBackfillResponse.AttachmentData.Status.TERMINAL_ERROR
+        )
+      )
+    )
+
+    val refreshed = SignalDatabase.attachments.getAttachmentsForMessage(messageId).single()
+    assertThat(refreshed.transferState).isEqualTo(AttachmentTable.TRANSFER_PROGRESS_FAILED)
+  }
+
+  @Test
+  fun multi_attachment_response_matches_positionally_with_mixed_status() {
+    val messageId = insertIncomingMessageWith(messageHelper.alice, listOf(incomingImagePointer(), incomingImagePointer()))
+    val body = SignalDatabase.attachments.getAttachmentsForMessage(messageId).sortedBy { it.displayOrder }
+    assertThat(body.size).isEqualTo(2)
+    body.forEach { SignalDatabase.attachments.setTransferProgressFailed(it.attachmentId, messageId) }
+
+    // Response is a positional array: index 0 -> body[0] (fresh pointer), index 1 -> body[1] (terminal).
+    deliverBackfillResponse(
+      sender = messageHelper.alice,
+      sentTimestamp = sentTimestampFor(messageId),
+      conversationId = messageHelper.alice,
+      attachmentData = listOf(
+        SyncMessage.AttachmentBackfillResponse.AttachmentData(attachment = freshPointer(cdnNumber = 3, cdnKey = "first-key", size = 11, uploadTimestamp = 111L)),
+        SyncMessage.AttachmentBackfillResponse.AttachmentData(status = SyncMessage.AttachmentBackfillResponse.AttachmentData.Status.TERMINAL_ERROR)
+      )
+    )
+
+    val refreshed = SignalDatabase.attachments.getAttachmentsForMessage(messageId).sortedBy { it.displayOrder }
+    // remoteLocation proves index 0 routed to body[0]. transferState is not asserted: it races the download job's onAdded().
+    assertThat(refreshed[0].remoteLocation).isEqualTo("first-key")
+    assertThat(refreshed[0].cdn.cdnNumber).isEqualTo(3)
+    assertThat(refreshed[1].transferState).isEqualTo(AttachmentTable.TRANSFER_PROGRESS_PERMANENT_FAILURE)
+  }
+
+  @Test
+  fun long_text_slot_is_applied_independently_of_the_body() {
+    val messageId = insertIncomingMessageWith(messageHelper.alice, listOf(incomingImagePointer(), incomingLongTextPointer()))
+    val all = SignalDatabase.attachments.getAttachmentsForMessage(messageId)
+    all.forEach { SignalDatabase.attachments.setTransferProgressFailed(it.attachmentId, messageId) }
+
+    deliverBackfillResponse(
+      sender = messageHelper.alice,
+      sentTimestamp = sentTimestampFor(messageId),
+      conversationId = messageHelper.alice,
+      attachmentData = listOf(SyncMessage.AttachmentBackfillResponse.AttachmentData(attachment = freshPointer(cdnNumber = 3, cdnKey = "body-key", size = 22, uploadTimestamp = 222L))),
+      longText = SyncMessage.AttachmentBackfillResponse.AttachmentData(attachment = freshPointer(cdnNumber = 3, cdnKey = "long-text-key", size = 33, uploadTimestamp = 333L))
+    )
+
+    val refreshed = SignalDatabase.attachments.getAttachmentsForMessage(messageId)
+    val bodyRow = refreshed.single { it.contentType != MediaUtil.LONG_TEXT }
+    val longTextRow = refreshed.single { it.contentType == MediaUtil.LONG_TEXT }
+    // The positional `attachments` array fills the body row and the separate `longText` slot fills the long-text row,
+    // with no cross-contamination. transferState is not asserted: it races the download job's onAdded().
+    assertThat(bodyRow.remoteLocation).isEqualTo("body-key")
+    assertThat(longTextRow.remoteLocation).isEqualTo("long-text-key")
+  }
+
+  @Test
+  fun remote_attachment_list_longer_than_local_skips_extras() {
+    val messageId = insertIncomingMessageWith(messageHelper.alice, listOf(incomingImagePointer()))
+    val attachmentId = SignalDatabase.attachments.getAttachmentsForMessage(messageId).single().attachmentId
+    SignalDatabase.attachments.setTransferProgressFailed(attachmentId, messageId)
+
+    deliverBackfillResponse(
+      sender = messageHelper.alice,
+      sentTimestamp = sentTimestampFor(messageId),
+      conversationId = messageHelper.alice,
+      attachmentData = listOf(
+        SyncMessage.AttachmentBackfillResponse.AttachmentData(attachment = freshPointer(cdnNumber = 3, cdnKey = "only-key", size = 44, uploadTimestamp = 444L)),
+        SyncMessage.AttachmentBackfillResponse.AttachmentData(attachment = freshPointer(cdnNumber = 3, cdnKey = "extra-key", size = 55, uploadTimestamp = 555L))
+      )
+    )
+
+    // The single local row is routed from index 0; the extra index-1 entry has no body[1] and must be skipped, not throw.
+    val refreshed = SignalDatabase.attachments.getAttachmentsForMessage(messageId).single()
+    assertThat(refreshed.remoteLocation).isEqualTo("only-key")
+  }
+
+  private fun insertIncomingMediaMessage(sender: RecipientId): Pair<Long, AttachmentId> {
+    messageHelper.startTime = messageHelper.nextStartTime()
+    val sentTimestamp = messageHelper.startTime
+
+    val content = Content.Builder()
+      .dataMessage(
+        DataMessage.Builder()
+          .timestamp(sentTimestamp)
+          .attachments(listOf(MessageContentFuzzer.attachmentPointer()))
+          .build()
+      )
+      .build()
+
+    messageHelper.processor.process(
+      envelope = MessageContentFuzzer.envelope(sentTimestamp),
+      content = content,
+      metadata = MessageContentFuzzer.envelopeMetadata(source = sender, destination = harness.self.id),
+      serverDeliveredTimestamp = sentTimestamp + 10
+    )
+
+    val syncMessageId = MessageTable.SyncMessageId(sender, sentTimestamp)
+    val messageId = SignalDatabase.messages.getMessageIdOrNull(syncMessageId)
+    assertThat(messageId, name = "messageId").isNotNull()
+
+    val attachment = SignalDatabase.attachments.getAttachmentsForMessage(messageId!!).single()
+    return messageId to attachment.attachmentId
+  }
+
+  private fun insertIncomingMessageWith(sender: RecipientId, pointers: List<AttachmentPointer>): Long {
+    messageHelper.startTime = messageHelper.nextStartTime()
+    val sentTimestamp = messageHelper.startTime
+
+    val content = Content.Builder()
+      .dataMessage(
+        DataMessage.Builder()
+          .timestamp(sentTimestamp)
+          .attachments(pointers)
+          .build()
+      )
+      .build()
+
+    messageHelper.processor.process(
+      envelope = MessageContentFuzzer.envelope(sentTimestamp),
+      content = content,
+      metadata = MessageContentFuzzer.envelopeMetadata(source = sender, destination = harness.self.id),
+      serverDeliveredTimestamp = sentTimestamp + 10
+    )
+
+    val messageId = SignalDatabase.messages.getMessageIdOrNull(MessageTable.SyncMessageId(sender, sentTimestamp))
+    assertThat(messageId, name = "messageId").isNotNull()
+    return messageId!!
+  }
+
+  private fun incomingImagePointer(): AttachmentPointer = MessageContentFuzzer.attachmentPointer().newBuilder().contentType("image/jpeg").build()
+
+  private fun incomingLongTextPointer(): AttachmentPointer = MessageContentFuzzer.attachmentPointer().newBuilder().contentType(MediaUtil.LONG_TEXT).build()
+
+  private fun sentTimestampFor(messageId: Long): Long {
+    return SignalDatabase.messages.getMessageRecord(messageId).dateSent
+  }
+
+  private fun deliverBackfillResponse(
+    sender: RecipientId,
+    sentTimestamp: Long,
+    conversationId: RecipientId,
+    attachmentData: List<SyncMessage.AttachmentBackfillResponse.AttachmentData> = emptyList(),
+    longText: SyncMessage.AttachmentBackfillResponse.AttachmentData? = null,
+    error: SyncMessage.AttachmentBackfillResponse.Error? = null
+  ) {
+    messageHelper.startTime = messageHelper.nextStartTime()
+    val envelopeTimestamp = messageHelper.startTime
+
+    val response = SyncMessage.AttachmentBackfillResponse(
+      targetMessage = AddressableMessage(
+        authorServiceIdBinary = Recipient.resolved(sender).requireAci().toByteString(),
+        sentTimestamp = sentTimestamp
+      ),
+      targetConversation = ConversationIdentifier(
+        threadServiceIdBinary = Recipient.resolved(conversationId).requireAci().toByteString()
+      ),
+      attachments = if (error == null) SyncMessage.AttachmentBackfillResponse.AttachmentDataList(attachments = attachmentData, longText = longText) else null,
+      error = error
+    )
+
+    val content = Content.Builder()
+      .syncMessage(SyncMessage.Builder().attachmentBackfillResponse(response).build())
+      .build()
+
+    messageHelper.processor.process(
+      envelope = MessageContentFuzzer.envelope(envelopeTimestamp, serverGuid = UUID.randomUUID()),
+      content = content,
+      metadata = MessageContentFuzzer.envelopeMetadata(source = harness.self.id, destination = harness.self.id, sourceDeviceId = 1),
+      serverDeliveredTimestamp = envelopeTimestamp + 10
+    )
+  }
+
+  private fun freshPointer(cdnNumber: Int, cdnKey: String, size: Int, uploadTimestamp: Long): AttachmentPointer {
+    return AttachmentPointer.Builder()
+      .cdnKey(cdnKey)
+      .cdnNumber(cdnNumber)
+      .key(Base64.decode("AAAAAAAA").toByteString())
+      .digest(ByteArray(32) { it.toByte() }.toByteString())
+      .size(size)
+      .uploadTimestamp(uploadTimestamp)
+      .contentType("image/jpeg")
+      .build()
+  }
+}

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

@@ -236,8 +236,9 @@ class SyncMessageProcessorTest_synchronizePniChangeNumber {
   }
 
   @Test
-  fun skipsRedeliveryWhenPniAlreadyMatches() {
-    sendPniChangeNumber()
+  fun skipsRedeliveryWithSameServerTimestamp() {
+    val timestamp = messageHelper.nextStartTime()
+    sendPniChangeNumber(timestamp = timestamp)
     val afterFirstApply = captureOriginalState()
 
     val otherIdentity = IdentityKeyPair.generate()
@@ -247,12 +248,41 @@ class SyncMessageProcessorTest_synchronizePniChangeNumber {
       identityKeyPair = otherIdentity.serialize().toByteString(),
       signedPreKey = otherSignedPreKey.serialize().toByteString(),
       e164 = "+15555550100",
-      timestamp = messageHelper.nextStartTime() + 1000
+      timestamp = timestamp
     )
 
     assertOriginalStatePreserved(afterFirstApply)
   }
 
+  @Test
+  fun reappliesWhenServerTimestampIsNewer() {
+    sendPniChangeNumber()
+
+    val secondPniUuid = UUID.randomUUID()
+    val secondPni = ServiceId.PNI.from(secondPniUuid)
+    val secondPniBytes = UuidUtil.toByteArray(secondPniUuid).toByteString()
+    val secondIdentity = IdentityKeyPair.generate()
+    val secondSignedPreKey = PreKeyUtil.generateSignedPreKey(9999, secondIdentity.privateKey)
+    val secondE164 = "+15555550100"
+    val secondRegistrationId = 7777
+
+    sendPniChangeNumber(
+      identityKeyPair = secondIdentity.serialize().toByteString(),
+      signedPreKey = secondSignedPreKey.serialize().toByteString(),
+      lastResortKyberPreKey = null,
+      registrationId = secondRegistrationId,
+      e164 = secondE164,
+      envelopePniBinary = secondPniBytes,
+      timestamp = messageHelper.nextStartTime() + 1000
+    )
+
+    assertThat(SignalStore.account.e164).isEqualTo(secondE164)
+    assertThat(SignalStore.account.pni).isEqualTo(secondPni)
+    assertThat(SignalStore.account.pniRegistrationId).isEqualTo(secondRegistrationId)
+    assertThat(SignalStore.account.pniIdentityKey.publicKey.serialize().toByteString())
+      .isEqualTo(secondIdentity.publicKey.serialize().toByteString())
+  }
+
   @Test
   fun bailsWhenServerTimestampStale() {
     sendPniChangeNumber()

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

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2026 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.testing
+
+import com.google.android.gms.wallet.PaymentData
+import io.mockk.Runs
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.mockkConstructor
+import io.mockk.unmockkConstructor
+import io.reactivex.rxjava3.core.Completable
+import org.junit.rules.ExternalResource
+import org.signal.donations.GooglePayApi
+
+/**
+ * Makes Google Pay appear available and return a fake [com.google.android.gms.wallet.PaymentData] without
+ * launching the real Google Pay sheet, allowing checkout to be driven to the payment pipeline in instrumentation.
+ */
+class GooglePayTestRule : ExternalResource() {
+  override fun before() {
+    val paymentData = mockk<PaymentData> {
+      every { toJson() } returns GOOGLE_PAY_PAYMENT_DATA_JSON
+    }
+
+    mockkConstructor(GooglePayApi::class)
+    every { anyConstructed<GooglePayApi>().queryIsReadyToPay() } returns Completable.complete()
+    every { anyConstructed<GooglePayApi>().requestPayment(any(), any(), any()) } just Runs
+    every { anyConstructed<GooglePayApi>().onActivityResult(any(), any(), any(), any(), any()) } answers {
+      arg<GooglePayApi.PaymentRequestCallback>(4).onSuccess(paymentData)
+    }
+  }
+
+  override fun after() {
+    unmockkConstructor(GooglePayApi::class)
+  }
+
+  companion object {
+    /**
+     * Minimal but well-formed Google Pay payload. [org.signal.donations.GooglePayPaymentSource] parses
+     * `paymentMethodData.tokenizationData.token` (itself a JSON object with an `id`) when the source is
+     * serialized into the setup job, so a relaxed mock that returns an empty body fails before the job runs.
+     */
+    const val GOOGLE_PAY_PAYMENT_DATA_JSON = """{"paymentMethodData":{"tokenizationData":{"token":"{\"id\":\"tok_test\"}"}},"email":"test@signal.org"}"""
+  }
+}

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

@@ -0,0 +1,57 @@
+/*
+ * Copyright 2026 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.testing
+
+import android.os.SystemClock
+import androidx.test.platform.app.InstrumentationRegistry
+import io.reactivex.rxjava3.schedulers.TestScheduler
+
+/**
+ * Timing primitives for in-app-payment instrumentation tests.
+ *
+ * The checkout flow runs against two clocks: the Rx pipeline that drives the UI (creating the payment,
+ * enqueuing the setup job, reacting to state changes, rendering dialogs) runs on the test's [TestScheduler]
+ * (virtual time), while the setup job itself executes on a live JobManager worker thread (real time). Neither
+ * clock can be waited on alone — the scheduler must be advanced for the pipeline to make progress, and the
+ * test must yield real time for the job to run and commit its result. [flushUntil] does both.
+ */
+
+/**
+ * Advances virtual Rx time on this [TestScheduler], drains the main looper, and yields briefly for real
+ * JobManager work, repeating until [condition] holds or [timeoutMs] elapses.
+ *
+ * [TestScheduler.triggerActions] runs the pipeline's scheduled work (which may enqueue a job or process a
+ * database update), `waitForIdleSync` renders whatever that produced, and the short sleep lets the real setup
+ * job run on its worker thread and commit the next state before the loop advances the scheduler again to pick
+ * it up. Throws once [timeoutMs] is exceeded, which means the expected UI state never materialised.
+ *
+ * [condition] may either return `false` or throw (e.g. an Espresso `check` that has not yet matched) to signal
+ * "not satisfied"; a thrown failure is retained and chained as the cause of the timeout [AssertionError] so a
+ * flake surfaces the underlying Espresso error rather than an opaque "condition not satisfied".
+ */
+fun TestScheduler.flushUntil(timeoutMs: Long = 15_000, condition: () -> Boolean) {
+  val deadline = SystemClock.uptimeMillis() + timeoutMs
+  var lastFailure: Throwable? = null
+
+  while (true) {
+    triggerActions()
+    InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+
+    try {
+      if (condition()) {
+        return
+      }
+    } catch (t: Throwable) {
+      lastFailure = t
+    }
+
+    if (SystemClock.uptimeMillis() >= deadline) {
+      throw AssertionError("Condition was not satisfied within ${timeoutMs}ms of flushing the checkout pipeline.", lastFailure)
+    }
+
+    Thread.sleep(50)
+  }
+}

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

@@ -10,8 +10,11 @@ import io.mockk.every
 import org.junit.rules.ExternalResource
 import org.signal.core.util.JsonUtils
 import org.signal.network.NetworkResult
+import org.signal.network.exceptions.NonSuccessfulResponseCodeException
 import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
 import org.whispersystems.signalservice.internal.push.SubscriptionsConfiguration
+import org.whispersystems.signalservice.internal.push.WhoAmIResponse
 
 /**
  * Sets up some common infrastructure for on-device InAppPayment testing
@@ -21,6 +24,8 @@ class InAppPaymentsRule : ExternalResource() {
     initialiseConfigurationResponse()
     initialisePutSubscription()
     initialiseSetArchiveBackupId()
+    initialiseSetAccountAttributes()
+    initialiseAccountAndSubscriptionLookups()
   }
 
   private fun initialiseConfigurationResponse() {
@@ -37,6 +42,7 @@ class InAppPaymentsRule : ExternalResource() {
   private fun initialisePutSubscription() {
     AppDependencies.donationsApi.apply {
       every { putSubscription(any()) } returns NetworkResult.Success(Unit)
+      every { createSubscriber(any(), any()) } returns NetworkResult.Success(Unit)
     }
   }
 
@@ -45,4 +51,31 @@ class InAppPaymentsRule : ExternalResource() {
       every { triggerBackupIdReservation(any(), any(), any()) } returns NetworkResult.Success(Unit)
     }
   }
+
+  private fun initialiseSetAccountAttributes() {
+    AppDependencies.accountApi.apply {
+      every { setAccountAttributes(any()) } returns NetworkResult.Success(Unit)
+    }
+  }
+
+  /**
+   * Starting the real job loop lets background jobs unrelated to the assertion under test run against the strict
+   * API mocks (e.g. [org.thoughtcrime.securesms.jobs.InAppPaymentRecurringContextJob] querying whoAmI, the
+   * active subscription, and then submitting receipt credentials). Stub these calls so those jobs hit a handled
+   * path and terminate quietly instead of throwing [io.mockk.MockKException] on a job thread, which crashes the
+   * whole app process (the test asserts nothing, so it surfaces as "Application crashed" with no failed test).
+   * Tests that supply an active subscription push the job past the [getSubscription] guard to
+   * [submitReceiptCredentials], so that must be stubbed too. End-to-end coverage of that pipeline is tracked
+   * separately; here we only keep the process alive and the logs clean.
+   */
+  private fun initialiseAccountAndSubscriptionLookups() {
+    AppDependencies.accountApi.apply {
+      every { whoAmI() } returns NetworkResult.Success(WhoAmIResponse(number = "+15555550123"))
+    }
+
+    AppDependencies.donationsApi.apply {
+      every { getSubscription(any()) } returns NetworkResult.Success(ActiveSubscription.EMPTY)
+      every { submitReceiptCredentials(any(), any()) } returns NetworkResult.StatusCodeError(NonSuccessfulResponseCodeException(402))
+    }
+  }
 }

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

@@ -0,0 +1,82 @@
+package org.thoughtcrime.securesms.testing
+
+import org.json.JSONObject
+import org.thoughtcrime.securesms.util.RemoteConfig
+import kotlin.reflect.KProperty0
+import kotlin.reflect.jvm.isAccessible
+
+/**
+ * Declares remote config values a test needs. The [SignalTestRunner] reads this off the
+ * about-to-run test (class and/or method) and stages the values into [TestRemoteConfig], which
+ * [org.thoughtcrime.securesms.SignalInstrumentationApplicationContext] seeds into the real
+ * [RemoteConfig] before the startup `init()` runs.
+ *
+ * Method-level annotations override class-level ones for the same key. Values are strings, matching
+ * how the service delivers config; `"true"`/`"false"` are decoded into real booleans on the way into
+ * the store (same as [org.signal.network.api.RemoteConfigApi]), other values stay strings.
+ *
+ * Prefer the typed [Flag] (which resolves its key from the actual [RemoteConfig] property); use
+ * [RawFlag] for keys that don't have a [TestRemoteConfigFlag] entry.
+ *
+ * ```
+ * @RemoteConfigForTest(
+ *   flags = [Flag(TestRemoteConfigFlag.INTERNAL_USER, "true")],
+ *   rawFlags = [RawFlag("android.someOtherKey", "1")]
+ * )
+ * class MyTest { ... }
+ * ```
+ */
+@Retention(AnnotationRetention.RUNTIME)
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+annotation class RemoteConfigForTest(
+  val flags: Array<Flag> = [],
+  val rawFlags: Array<RawFlag> = []
+)
+
+/** A flag whose key is resolved from the referenced [RemoteConfig] property at runtime. */
+@Retention(AnnotationRetention.RUNTIME)
+annotation class Flag(val flag: TestRemoteConfigFlag, val value: String)
+
+/** A flag identified by its raw remote config key, for keys without a [TestRemoteConfigFlag] entry. */
+@Retention(AnnotationRetention.RUNTIME)
+annotation class RawFlag(val key: String, val value: String)
+
+/**
+ * Typed handles for remote config flags referenced by tests.
+ */
+enum class TestRemoteConfigFlag(private val property: KProperty0<*>) {
+  INTERNAL_USER(RemoteConfig::internalUser),
+  DEFAULT_MAX_BACKOFF(RemoteConfig::defaultMaxBackoff),
+  DISAPPEAR_MORE(RemoteConfig::disappearMore);
+
+  val key: String
+    get() {
+      property.isAccessible = true
+      val delegate = property.getDelegate() ?: error("RemoteConfig.${property.name} has no delegate; only `by remoteX(...)` configs can be referenced by ${TestRemoteConfigFlag::class.simpleName}.")
+      check(delegate is RemoteConfig.Config<*>) {
+        "RemoteConfig.${property.name} delegate is ${delegate::class.simpleName}, not RemoteConfig.Config; cannot resolve its remote config key."
+      }
+      return delegate.key
+    }
+}
+
+/**
+ * Process-static bridge between [SignalTestRunner] (which knows the running test) and
+ * [org.thoughtcrime.securesms.SignalInstrumentationApplicationContext] (which seeds the config).
+ * Safe because Orchestrator runs each test in a fresh process.
+ */
+object TestRemoteConfig {
+  @Volatile
+  var pending: Map<String, Any> = emptyMap()
+
+  /**
+   * The staged config as a JSON string ready to write into `SignalStore.remoteConfig`. Mirrors
+   * [org.signal.network.api.RemoteConfigApi]'s decode so `"true"`/`"false"` land as real booleans
+   * (like the server path) while other values stay strings.
+   */
+  val json: String
+    get() {
+      val decoded = pending.mapValues { (_, value) -> (value as? String)?.lowercase()?.toBooleanStrictOrNull() ?: value }
+      return JSONObject(decoded).toString()
+    }
+}

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

@@ -2,15 +2,62 @@ package org.thoughtcrime.securesms.testing
 
 import android.app.Application
 import android.content.Context
+import android.os.Bundle
 import androidx.test.runner.AndroidJUnitRunner
 import org.thoughtcrime.securesms.SignalInstrumentationApplicationContext
 
 /**
  * Custom runner that replaces application with [SignalInstrumentationApplicationContext].
+ *
+ * Before the application is created, it reads any [RemoteConfigForTest] declared on the
+ * about-to-run test (passed by the Orchestrator as the `class` argument, `pkg.Class#method`) and
+ * stages the values in [TestRemoteConfig] so the app can seed them into `RemoteConfig` at startup.
  */
 @Suppress("unused")
 class SignalTestRunner : AndroidJUnitRunner() {
+  override fun onCreate(arguments: Bundle?) {
+    TestRemoteConfig.pending = parseRemoteConfig(arguments?.getString("class"))
+    super.onCreate(arguments)
+  }
+
   override fun newApplication(cl: ClassLoader?, className: String?, context: Context?): Application {
     return super.newApplication(cl, SignalInstrumentationApplicationContext::class.java.name, context)
   }
+
+  /**
+   * Resolves [RemoteConfigForTest] annotations from the targeted test(s). [classArg] is the
+   * instrumentation `class` argument: a comma-separated list of `pkg.Class` or `pkg.Class#method`.
+   * Method-level flags override class-level flags for the same key. Reflection failures (e.g. a
+   * whole-suite run with no `class` arg) fall back to no overrides.
+   */
+  private fun parseRemoteConfig(classArg: String?): Map<String, Any> {
+    if (classArg.isNullOrBlank()) {
+      return emptyMap()
+    }
+
+    val flags = mutableMapOf<String, Any>()
+
+    for (entry in classArg.split(",")) {
+      val (className, methodName) = entry.trim().split("#", limit = 2).let { it[0] to it.getOrNull(1) }
+
+      try {
+        // initialize = false: only read annotations, don't run the test class's static init this early.
+        val testClass = Class.forName(className, false, javaClass.classLoader)
+        val method = methodName?.let { name -> testClass.declaredMethods.firstOrNull { it.name == name } }
+
+        // Class annotation first, then method annotation so method-level flags override class-level ones.
+        listOfNotNull(
+          testClass.getAnnotation(RemoteConfigForTest::class.java),
+          method?.getAnnotation(RemoteConfigForTest::class.java)
+        ).forEach { annotation ->
+          annotation.flags.forEach { flags[it.flag.key] = it.value }
+          annotation.rawFlags.forEach { flags[it.key] = it.value }
+        }
+      } catch (_: ReflectiveOperationException) {
+        // Class/method not resolvable in this run; leave overrides as-is.
+      }
+    }
+
+    return flags
+  }
 }

app/src/androidTest/java/org/thoughtcrime/securesms/testing/actions/RecyclerViewInteractions.kt

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2026 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.testing.actions
+
+import android.os.SystemClock
+import android.view.View
+import androidx.annotation.IdRes
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.PerformException
+import androidx.test.espresso.contrib.RecyclerViewActions
+import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.platform.app.InstrumentationRegistry
+import io.reactivex.rxjava3.schedulers.TestScheduler
+import org.hamcrest.Matcher
+
+/**
+ * Scrolls the [RecyclerView] with id [recyclerViewId] to the view holder whose item view matches [target], or
+ * whose item view contains a descendant matching [target] (e.g. a preset button inside a container row),
+ * binding it if necessary, then returns. Off-screen presets/buttons are brought on-screen before a click or
+ * assertion regardless of device size — important for Firebase Test Lab's varied screens.
+ *
+ * The DSL screens use [androidx.recyclerview.widget.ListAdapter], which diffs `submitList` on a background
+ * thread and posts the result to the main thread. espresso-contrib's [RecyclerViewActions.scrollTo] scans the
+ * adapter once and fails fast if that diff has not yet committed, so we retry within [timeoutMs], pumping the
+ * main looper (and, if supplied, advancing [scheduler] to run the Rx work that produces the list) between
+ * attempts. This is the async-diff analogue of the codebase's existing poll-until-ready test idiom; Android
+ * exposes no deterministic completion hook for the differ.
+ */
+fun scrollToDescendant(
+  @IdRes recyclerViewId: Int,
+  target: Matcher<View>,
+  scheduler: TestScheduler? = null,
+  timeoutMs: Long = 5_000
+) {
+  val deadline = SystemClock.uptimeMillis() + timeoutMs
+
+  while (true) {
+    // A holder's item view may itself be the target (a bare button row) or contain it as a descendant
+    // (a preset within a container), so try both rather than assume one shape.
+    if (tryScrollTo(recyclerViewId, target) || tryScrollTo(recyclerViewId, hasDescendant(target))) {
+      return
+    }
+
+    if (SystemClock.uptimeMillis() >= deadline) {
+      throw AssertionError("RecyclerView (id=$recyclerViewId) never bound a holder matching $target within ${timeoutMs}ms.")
+    }
+
+    scheduler?.triggerActions()
+    InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+    Thread.sleep(50)
+  }
+}
+
+private fun tryScrollTo(@IdRes recyclerViewId: Int, holderMatcher: Matcher<View>): Boolean {
+  return try {
+    onView(withId(recyclerViewId)).perform(RecyclerViewActions.scrollTo<RecyclerView.ViewHolder>(holderMatcher))
+    true
+  } catch (e: PerformException) {
+    false
+  }
+}

app/src/androidTest/java/org/thoughtcrime/securesms/testing/actions/RecyclerViewScrollToBottomAction.kt

@@ -1,34 +0,0 @@
-/*
- * Copyright 2025 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.testing.actions
-
-import android.view.View
-import androidx.recyclerview.widget.RecyclerView
-import androidx.test.espresso.UiController
-import androidx.test.espresso.ViewAction
-import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom
-import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import org.hamcrest.CoreMatchers.allOf
-import org.hamcrest.Matcher
-
-/**
- * Scrolls the RecyclerView to the bottom position.
- *
- * Borrowed from [https://stackoverflow.com/a/55990445](https://stackoverflow.com/a/55990445)
- */
-object RecyclerViewScrollToBottomAction : ViewAction {
-  override fun getDescription(): String = "scroll RecyclerView to bottom"
-
-  override fun getConstraints(): Matcher<View> = allOf(isAssignableFrom(RecyclerView::class.java), isDisplayed())
-
-  override fun perform(uiController: UiController?, view: View?) {
-    val recyclerView = view as RecyclerView
-    val itemCount = recyclerView.adapter?.itemCount
-    val position = itemCount?.minus(1) ?: 0
-    recyclerView.scrollToPosition(position)
-    uiController?.loopMainThreadUntilIdle()
-  }
-}

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

@@ -32,6 +32,14 @@ class BenchmarkSetupActivity : BaseActivity() {
 
   companion object {
     private val TAG = Log.tag(BenchmarkSetupActivity::class)
+
+    const val SEARCH_KEYWORD = "lighthouse"
+
+    private val SEARCH_VOCABULARY = listOf(
+      "hello", "world", "signal", "android", "kotlin", "database", "benchmark", "conversation",
+      "morning", "evening", "weekend", "project", "meeting", "dinner", "coffee", "garden",
+      "mountain", "river", "forest", "harbor", "market", "library", "concert", "holiday"
+    )
   }
 
   override fun onCreate(savedInstanceState: Bundle?) {
@@ -51,6 +59,7 @@ class BenchmarkSetupActivity : BaseActivity() {
       when (intent.extras!!.getString("setup-type")) {
         "cold-start" -> setupColdStart()
         "conversation-open" -> setupConversationOpen()
+        "conversation-list-search" -> setupConversationListSearch()
         "message-send" -> setupMessageSend()
         "group-message-send" -> setupGroupMessageSend()
         "group-delivery-receipt" -> setupGroupReceipt(includeMsl = true)
@@ -97,6 +106,39 @@ class BenchmarkSetupActivity : BaseActivity() {
     }
   }
 
+  private fun setupConversationListSearch() {
+    TestUsers.setupSelf()
+
+    val recipientCount = 50
+    val messagesPerRecipient = 2000
+    val totalMessages = recipientCount * messagesPerRecipient
+    val generator = TestMessages.TimestampGenerator(System.currentTimeMillis() - (totalMessages * 2000L) - 60_000L)
+
+    TestUsers.setupTestRecipients(recipientCount).forEachIndexed { recipientIndex, recipientId ->
+      val recipient: Recipient = Recipient.resolved(recipientId)
+
+      for (i in 0 until messagesPerRecipient) {
+        val body = searchableMessageBody(recipientIndex, i)
+        if (i % 2 == 0) {
+          TestMessages.insertIncomingTextMessage(other = recipient, body = body, timestamp = generator.nextTimestamp())
+        } else {
+          TestMessages.insertOutgoingTextMessage(other = recipient, body = body, timestamp = generator.nextTimestamp())
+        }
+      }
+
+      SignalDatabase.messages.setAllMessagesRead()
+      SignalDatabase.threads.update(SignalDatabase.threads.getOrCreateThreadIdFor(recipient = recipient), true)
+    }
+  }
+
+  private fun searchableMessageBody(recipientIndex: Int, messageIndex: Int): String {
+    val words = SEARCH_VOCABULARY
+    val w1 = words[(recipientIndex + messageIndex) % words.size]
+    val w2 = words[(recipientIndex * 7 + messageIndex * 3) % words.size]
+    val w3 = words[(recipientIndex * 13 + messageIndex * 5) % words.size]
+    return "$w1 $w2 $SEARCH_KEYWORD $w3 message $messageIndex"
+  }
+
   private fun setupMessageSend() {
     TestUsers.setupSelf()
     TestUsers.setupTestClients(1)

app/src/main/AndroidManifest.xml

@@ -438,12 +438,7 @@
             android:theme="@style/Theme.Signal.DayNight.NoActionBar"
             android:windowSoftInputMode="adjustResize" />
 
-        <activity
-            android:name=".calls.links.details.CallLinkDetailsActivity"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:exported="false"
-            android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-            android:windowSoftInputMode="stateAlwaysHidden" />
+
 
         <activity
             android:name=".calls.new.NewCallActivity"
@@ -527,6 +522,13 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".preferences.EditProxyActivity"
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+            android:exported="false"
+            android:theme="@style/Signal.DayNight.NoActionBar"
+            android:windowSoftInputMode="adjustResize" />
+
         <activity
             android:name=".stories.my.MyStoriesActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"

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

@@ -39,6 +39,7 @@ import org.signal.core.util.MemoryTracker;
 import org.signal.core.util.Util;
 import org.signal.core.util.concurrent.AnrDetector;
 import org.signal.core.util.concurrent.SignalExecutors;
+import org.signal.core.util.crypto.AttachmentSecretProvider;
 import org.signal.core.util.logging.AndroidLogger;
 import org.signal.core.util.logging.Log;
 import org.signal.core.util.logging.Scrubber;
@@ -46,14 +47,16 @@ import org.signal.core.util.tracing.Tracer;
 import org.signal.glide.SignalGlideCodecs;
 import org.signal.libsignal.net.ChatServiceException;
 import org.signal.libsignal.protocol.logging.SignalProtocolLoggerProvider;
+import org.signal.registration.RegistrationDependencies;
 import org.signal.ringrtc.CallManager;
 import org.thoughtcrime.securesms.apkupdate.ApkUpdateRefreshListener;
 import org.thoughtcrime.securesms.avatar.AvatarPickerStorage;
 import org.thoughtcrime.securesms.backup.v2.BackupRepository;
-import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider;
+import org.thoughtcrime.securesms.preferences.EditProxyActivity;
+import org.thoughtcrime.securesms.conversation.drafts.DraftBlobs;
+import org.thoughtcrime.securesms.crypto.AppAttachmentSecretStore;
 import org.thoughtcrime.securesms.crypto.DatabaseSecretProvider;
 import org.thoughtcrime.securesms.database.LogDatabase;
-import org.thoughtcrime.securesms.database.SQLiteDatabase;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.SqlCipherLibraryLoader;
 import org.thoughtcrime.securesms.dependencies.AppDependencies;
@@ -98,10 +101,11 @@ import org.thoughtcrime.securesms.messageprocessingalarm.RoutineMessageFetchRece
 import org.thoughtcrime.securesms.messages.IncomingMessageObserver;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
 import org.thoughtcrime.securesms.mms.SignalGlideModule;
-import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.ratelimit.RateLimitUtil;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.registration.util.RegistrationUtil;
+import org.thoughtcrime.securesms.registration.v2.AppRegistrationNetworkController;
+import org.thoughtcrime.securesms.registration.v2.AppRegistrationStorageController;
 import org.thoughtcrime.securesms.ringrtc.RingRtcLogger;
 import org.thoughtcrime.securesms.service.AnalyzeDatabaseAlarmListener;
 import org.thoughtcrime.securesms.service.DirectoryRefreshListener;
@@ -114,14 +118,17 @@ import org.thoughtcrime.securesms.service.webrtc.ActiveCallManager;
 import org.thoughtcrime.securesms.service.webrtc.AndroidTelecomUtil;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
 import org.thoughtcrime.securesms.util.AppStartup;
+import org.thoughtcrime.securesms.util.BatterySnapshotTracker;
+import org.thoughtcrime.securesms.util.CommunicationActions;
 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.signal.core.util.PlayServicesUtil;
 import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.SignalLocalMetrics;
 import org.thoughtcrime.securesms.util.SignalUncaughtExceptionHandler;
 import org.thoughtcrime.securesms.util.SqlCipherLogTarget;
+import org.thoughtcrime.securesms.util.SupportEmailUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.VersionTracker;
 import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
@@ -171,7 +178,7 @@ public class ApplicationContext extends Application implements AppForegroundObse
                 SqlCipherLibraryLoader.load();
                 SignalDatabase.init(this,
                                     DatabaseSecretProvider.getOrCreateDatabaseSecret(this),
-                                    AttachmentSecretProvider.getInstance(this).getOrCreateAttachmentSecret());
+                                    AttachmentSecretProvider.getInstance(this, AppAttachmentSecretStore.INSTANCE).getOrCreateAttachmentSecret());
                 Logger.setTarget(SqlCipherLogTarget.INSTANCE);
               })
               .addBlocking("signal-store", () -> SignalStore.init(this))
@@ -179,9 +186,9 @@ public class ApplicationContext extends Application implements AppForegroundObse
                 initializeLogging();
                 Log.i(TAG, "onCreate()");
               })
+              .addBlocking("security-provider", this::initializeSecurityProvider)
               .addBlocking("app-dependencies", this::initializeAppDependencies)
               .addBlocking("anr-detector", this::startAnrDetector)
-              .addBlocking("security-provider", this::initializeSecurityProvider)
               .addBlocking("crash-handling", this::initializeCrashHandling)
               .addBlocking("rx-init", this::initializeRx)
               .addBlocking("event-bus", () -> EventBus.builder().logNoSubscriberMessages(false).installDefaultEventBus())
@@ -259,6 +266,8 @@ public class ApplicationContext extends Application implements AppForegroundObse
     long startTime = System.currentTimeMillis();
     Log.i(TAG, "App is now visible. Battery: " + DeviceProperties.getBatteryLevel(this) + "% (charging: " + DeviceProperties.isCharging(this) + ")");
 
+    BatterySnapshotTracker.emit(this, "foreground");
+
     AppDependencies.getFrameRateTracker().start();
     AppDependencies.getMegaphoneRepository().onAppForegrounded();
     AppDependencies.getDeadlockDetector().start();
@@ -299,6 +308,7 @@ public class ApplicationContext extends Application implements AppForegroundObse
   @Override
   public void onBackground() {
     Log.i(TAG, "App is no longer visible.");
+    BatterySnapshotTracker.emit(this, "background");
     KeyCachingService.onAppBackgrounded(this);
     AppDependencies.getMessageNotifier().clearVisibleThread();
     AppDependencies.getFrameRateTracker().stop();
@@ -417,15 +427,24 @@ public class ApplicationContext extends Application implements AppForegroundObse
   }
 
   private void initializeRegistrationDependencies() {
-    org.signal.registration.RegistrationDependencies.Companion.provide(
-      new org.signal.registration.RegistrationDependencies(
-        new org.thoughtcrime.securesms.registration.v2.AppRegistrationNetworkController(this, AppDependencies.getPushServiceSocket()),
-        new org.thoughtcrime.securesms.registration.v2.AppRegistrationStorageController(this),
+    RegistrationDependencies.provide(
+      new RegistrationDependencies(
+        new AppRegistrationNetworkController(this, AppDependencies.getPushServiceSocket()),
+        new AppRegistrationStorageController(this),
         Environment.IS_LINK_AND_SYNC_AVAILABLE,
         null,
         context -> {
           context.startActivity(new Intent(context, SubmitDebugLogActivity.class));
           return Unit.INSTANCE;
+        },
+        context -> {
+          context.startActivity(EditProxyActivity.intent(context));
+          return Unit.INSTANCE;
+        },
+        (context, subject) -> {
+          String body = SupportEmailUtil.generateSupportEmailBody(context, subject, null, null);
+          CommunicationActions.openEmail(context, SupportEmailUtil.getSupportEmailAddress(context), subject, body);
+          return Unit.INSTANCE;
         }
       )
     );
@@ -571,7 +590,7 @@ public class ApplicationContext extends Application implements AppForegroundObse
 
   @WorkerThread
   private void initializeBlobProvider() {
-    BlobProvider.getInstance().initialize(this);
+    AppDependencies.getBlobs().initialize(this, DraftBlobs.INSTANCE::deleteOrphanedDraftFiles);
   }
 
   @WorkerThread

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

@@ -1,12 +1,14 @@
 package org.thoughtcrime.securesms;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.lifecycle.LifecycleOwner;
 
 import com.bumptech.glide.RequestManager;
 
 import org.thoughtcrime.securesms.conversationlist.model.ConversationSet;
 import org.thoughtcrime.securesms.database.model.ThreadWithRecipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
 
 import java.util.Locale;
 import java.util.Set;
@@ -18,10 +20,10 @@ public interface BindableConversationListItem extends Unbindable {
             @NonNull RequestManager requestManager, @NonNull Locale locale,
             @NonNull Set<Long> typingThreads,
             @NonNull ConversationSet selectedConversations,
-            long activeThreadId);
+            @Nullable RecipientId activeRecipientId);
 
   void setSelectedConversations(@NonNull ConversationSet conversations);
-  void setActiveThreadId(long activeThreadId);
+  void setActiveRecipientId(@Nullable RecipientId activeRecipientId);
   void updateTypingIndicator(@NonNull Set<Long> typingThreads);
   void updateTimestamp();
 }

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

@@ -280,7 +280,7 @@ public final class ContactSelectionListFragment extends LoggingFragment {
             false,
             new ContactSelectionListAdapter.ArbitraryRepository(),
             new SearchRepository(requireContext().getString(R.string.note_to_self)),
-            new ContactSearchPagedDataSourceRepository(requireContext()),
+            new ContactSearchPagedDataSourceRepository(requireContext(), requireContext().getString(R.string.note_to_self)),
             fixedContacts,
             false
         )

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

@@ -5,17 +5,16 @@
 
 package org.thoughtcrime.securesms
 
-import android.Manifest
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
+import android.os.Build
 import android.os.Bundle
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewTreeObserver
-import android.widget.Toast
 import androidx.activity.SystemBarStyle
 import androidx.activity.compose.BackHandler
 import androidx.activity.compose.setContent
@@ -25,6 +24,7 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.compose.foundation.background
 import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.BoxWithConstraintsScope
@@ -59,10 +59,13 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.platform.LocalContext
 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.core.content.ContextCompat
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.compose.AndroidFragment
 import androidx.fragment.compose.rememberFragmentState
@@ -72,6 +75,10 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.createSavedStateHandle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
+import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
+import androidx.navigation3.runtime.entryProvider
+import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator
+import androidx.navigation3.ui.NavDisplay
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import io.reactivex.rxjava3.subjects.PublishSubject
@@ -85,6 +92,7 @@ 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.navigation.TransitionSpecs
 import org.signal.core.ui.permissions.Permissions
 import org.signal.core.ui.rememberIsSplitPane
 import org.signal.core.util.AppForegroundObserver
@@ -100,11 +108,14 @@ import org.thoughtcrime.securesms.backup.v2.ArchiveRestoreProgressState
 import org.thoughtcrime.securesms.backup.v2.ui.CouldNotCompleteBackupRestoreSheet
 import org.thoughtcrime.securesms.backup.v2.ui.verify.VerifyBackupKeyActivity
 import org.thoughtcrime.securesms.calls.YouAreAlreadyInACallSnackbar.show
+import org.thoughtcrime.securesms.calls.callsNavEntries
 import org.thoughtcrime.securesms.calls.log.CallLogFilter
 import org.thoughtcrime.securesms.calls.log.CallLogFragment
 import org.thoughtcrime.securesms.calls.new.NewCallActivity
 import org.thoughtcrime.securesms.calls.quality.CallQuality
 import org.thoughtcrime.securesms.calls.quality.CallQualityBottomSheetFragment
+import org.thoughtcrime.securesms.chats.ConversationTransitionState
+import org.thoughtcrime.securesms.chats.chatsNavEntries
 import org.thoughtcrime.securesms.components.DebugLogsPromptDialogFragment
 import org.thoughtcrime.securesms.components.PromptBatterySaverDialogFragment
 import org.thoughtcrime.securesms.components.compose.ConnectivityWarningBottomSheet
@@ -134,8 +145,6 @@ import org.thoughtcrime.securesms.devicetransfer.olddevice.OldDeviceExitActivity
 import org.thoughtcrime.securesms.groups.ui.creategroup.CreateGroupActivity
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.lock.v2.CreateSvrPinActivity
-import org.thoughtcrime.securesms.main.ChatNavGraphState
-import org.thoughtcrime.securesms.main.DetailsScreenNavHost
 import org.thoughtcrime.securesms.main.MainBottomChrome
 import org.thoughtcrime.securesms.main.MainBottomChromeCallback
 import org.thoughtcrime.securesms.main.MainBottomChromeState
@@ -143,7 +152,6 @@ import org.thoughtcrime.securesms.main.MainContentLayoutData
 import org.thoughtcrime.securesms.main.MainMegaphoneState
 import org.thoughtcrime.securesms.main.MainNavigationBar
 import org.thoughtcrime.securesms.main.MainNavigationDetailLocation
-import org.thoughtcrime.securesms.main.MainNavigationDetailLocationEffect
 import org.thoughtcrime.securesms.main.MainNavigationListLocation
 import org.thoughtcrime.securesms.main.MainNavigationRail
 import org.thoughtcrime.securesms.main.MainNavigationRouter
@@ -156,13 +164,6 @@ import org.thoughtcrime.securesms.main.MainToolbarMode
 import org.thoughtcrime.securesms.main.MainToolbarState
 import org.thoughtcrime.securesms.main.MainToolbarViewModel
 import org.thoughtcrime.securesms.main.Material3OnScrollHelperBinder
-import org.thoughtcrime.securesms.main.callNavGraphBuilder
-import org.thoughtcrime.securesms.main.chatNavGraphBuilder
-import org.thoughtcrime.securesms.main.navigateToDetailLocation
-import org.thoughtcrime.securesms.main.rememberDetailNavHostController
-import org.thoughtcrime.securesms.main.rememberFocusRequester
-import org.thoughtcrime.securesms.main.storiesNavGraphBuilder
-import org.thoughtcrime.securesms.mediasend.camerax.CameraXRemoteConfig
 import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionActivity
 import org.thoughtcrime.securesms.mediasend.v3.mediaSendLauncher
 import org.thoughtcrime.securesms.megaphone.Megaphone
@@ -177,14 +178,12 @@ import org.thoughtcrime.securesms.service.BackupMediaRestoreService
 import org.thoughtcrime.securesms.service.KeyCachingService
 import org.thoughtcrime.securesms.starred.StarredMessagesActivity
 import org.thoughtcrime.securesms.stories.Stories
-import org.thoughtcrime.securesms.stories.archive.StoryArchiveActivity
 import org.thoughtcrime.securesms.stories.landing.StoriesLandingFragment
-import org.thoughtcrime.securesms.stories.settings.StorySettingsActivity
+import org.thoughtcrime.securesms.stories.storiesNavEntries
 import org.thoughtcrime.securesms.util.AppStartup
 import org.thoughtcrime.securesms.util.CachedInflater
 import org.thoughtcrime.securesms.util.CommunicationActions
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme
-import org.thoughtcrime.securesms.util.DynamicTheme
 import org.thoughtcrime.securesms.util.Material3OnScrollHelper
 import org.thoughtcrime.securesms.util.SplashScreenUtil
 import org.thoughtcrime.securesms.util.TopToastPopup
@@ -289,14 +288,6 @@ class MainActivity :
 
     AppStartup.getInstance().onCriticalRenderEventStart()
 
-    enableEdgeToEdge(
-      navigationBarStyle = if (DynamicTheme.isDarkTheme(this)) {
-        SystemBarStyle.dark(0)
-      } else {
-        SystemBarStyle.light(0, 0)
-      }
-    )
-
     super.onCreate(savedInstanceState, ready)
     navigator = MainNavigator(this, mainNavigationViewModel)
 
@@ -498,68 +489,19 @@ class MainActivity :
           }
         }
 
-        val chatNavGraphState = ChatNavGraphState.remember(isSplitPane)
+        val convoTransitionState = ConversationTransitionState.remember(isSplitPane)
         val mutableInteractionSource = remember { MutableInteractionSource() }
-        MainNavigationDetailLocationEffect(mainNavigationViewModel, chatNavGraphState::writeGraphicsLayerToBitmap)
 
-        val chatsNavHostController = rememberDetailNavHostController(
-          onRequestFocus = rememberFocusRequester(
-            mainNavigationViewModel = mainNavigationViewModel,
-            currentListLocation = mainNavigationState.currentListLocation,
-            isTargetListLocation = { it in listOf(MainNavigationListLocation.CHATS, MainNavigationListLocation.ARCHIVE) }
-          )
-        ) {
-          chatNavGraphBuilder(chatNavGraphState)
+        LaunchedEffect(convoTransitionState) {
+          mainNavigationViewModel.setChatListSnapshotCaptureProvider { convoTransitionState.writeGraphicsLayerToBitmap() }
         }
 
-        val callsNavHostController = rememberDetailNavHostController(
-          onRequestFocus = rememberFocusRequester(
-            mainNavigationViewModel = mainNavigationViewModel,
-            currentListLocation = mainNavigationState.currentListLocation
-          ) { it == MainNavigationListLocation.CALLS }
-        ) {
-          callNavGraphBuilder(it)
-        }
-
-        val storiesNavHostController = rememberDetailNavHostController(
-          onRequestFocus = rememberFocusRequester(
-            mainNavigationViewModel = mainNavigationViewModel,
-            currentListLocation = mainNavigationState.currentListLocation
-          ) { it == MainNavigationListLocation.STORIES }
-        ) {
-          storiesNavGraphBuilder()
-        }
-
-        LaunchedEffect(Unit) {
-          suspend fun navigateToLocation(location: MainNavigationDetailLocation) {
-            when (location) {
-              is MainNavigationDetailLocation.Empty -> {
-                when (mainNavigationState.currentListLocation) {
-                  MainNavigationListLocation.CHATS, MainNavigationListLocation.ARCHIVE -> chatsNavHostController
-                  MainNavigationListLocation.CALLS -> callsNavHostController
-                  MainNavigationListLocation.STORIES -> storiesNavHostController
-                }.navigateToDetailLocation(location)
-              }
-
-              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)
-            }
-          }
-
-          mainNavigationViewModel.earlyNavigationDetailLocationRequested?.let { navigateToLocation(it) }
-          mainNavigationViewModel.clearEarlyDetailLocation()
-
-          mainNavigationViewModel.detailLocation.collect { navigateToLocation(it) }
+        LaunchedEffect(isSplitPane) {
+          mainNavigationViewModel.onSplitPaneChanged(isSplitPane)
         }
 
         val scope = rememberCoroutineScope()
+
         BackHandler(paneExpansionState.currentAnchor == detailOnlyAnchor) {
           mainNavigationViewModel.goTo(MainNavigationDetailLocation.Empty)
           scope.launch {
@@ -620,7 +562,7 @@ class MainActivity :
 
         AppScaffold(
           navigator = wrappedNavigator,
-          modifier = chatNavGraphState.writeContentToGraphicsLayer(),
+          modifier = convoTransitionState.writeContentToGraphicsLayer(),
           paneExpansionState = paneExpansionState,
           contentWindowInsets = WindowInsets(),
           snackbarHost = {
@@ -731,23 +673,43 @@ class MainActivity :
           primaryContent = {
             when (mainNavigationState.currentListLocation) {
               MainNavigationListLocation.CHATS, MainNavigationListLocation.ARCHIVE -> {
-                DetailsScreenNavHost(
-                  navHostController = chatsNavHostController,
-                  contentLayoutData = contentLayoutData
+                NavDisplay(
+                  backStack = mainNavigationViewModel.chatsBackStackEntries,
+                  onBack = { mainNavigationViewModel.popChatsDetailLocation() },
+                  transitionSpec = TransitionSpecs.HorizontalSlide.transitionSpec,
+                  popTransitionSpec = TransitionSpecs.HorizontalSlide.popTransitionSpec,
+                  predictivePopTransitionSpec = TransitionSpecs.HorizontalSlide.predictivePopTransitionSpec,
+                  entryProvider = entryProvider { chatsNavEntries(convoTransitionState) }
                 )
               }
 
               MainNavigationListLocation.CALLS -> {
-                DetailsScreenNavHost(
-                  navHostController = callsNavHostController,
-                  contentLayoutData = contentLayoutData
+                NavDisplay(
+                  backStack = mainNavigationViewModel.callsBackStackEntries,
+                  onBack = { mainNavigationViewModel.popCallsDetailLocation() },
+                  transitionSpec = TransitionSpecs.HorizontalSlide.transitionSpec,
+                  popTransitionSpec = TransitionSpecs.HorizontalSlide.popTransitionSpec,
+                  predictivePopTransitionSpec = TransitionSpecs.HorizontalSlide.predictivePopTransitionSpec,
+                  entryDecorators = listOf(
+                    rememberSaveableStateHolderNavEntryDecorator(),
+                    rememberViewModelStoreNavEntryDecorator()
+                  ),
+                  entryProvider = entryProvider { callsNavEntries(isSplitPane) }
                 )
               }
 
               MainNavigationListLocation.STORIES -> {
-                DetailsScreenNavHost(
-                  navHostController = storiesNavHostController,
-                  contentLayoutData = contentLayoutData
+                NavDisplay(
+                  backStack = mainNavigationViewModel.storiesBackStackEntries,
+                  onBack = { mainNavigationViewModel.popStoriesDetailLocation() },
+                  transitionSpec = TransitionSpecs.HorizontalSlide.transitionSpec,
+                  popTransitionSpec = TransitionSpecs.HorizontalSlide.popTransitionSpec,
+                  predictivePopTransitionSpec = TransitionSpecs.HorizontalSlide.predictivePopTransitionSpec,
+                  entryDecorators = listOf(
+                    rememberSaveableStateHolderNavEntryDecorator(),
+                    rememberViewModelStoreNavEntryDecorator()
+                  ),
+                  entryProvider = entryProvider { storiesNavEntries() }
                 )
               }
             }
@@ -762,7 +724,7 @@ class MainActivity :
           } else {
             null
           },
-          animatorFactory = if (mainNavigationState.currentListLocation == MainNavigationListLocation.CHATS || mainNavigationState.currentListLocation == MainNavigationListLocation.ARCHIVE) {
+          animatorFactory = if (mainNavigationState.currentListLocation.isChatsTab) {
             noEnterTransitionFactory
           } else {
             AppScaffoldAnimationStateFactory.Default
@@ -830,6 +792,23 @@ class MainActivity :
           SignalTheme.colors.colorSurface1
         }
 
+        val context = LocalContext.current
+        val isDarkTheme = isSystemInDarkTheme()
+        val navBarColor = if (isSplitPane) backgroundColor.toArgb() else ContextCompat.getColor(context, CoreUiR.color.signal_colorSurface2)
+        LaunchedEffect(isDarkTheme, navBarColor) {
+          if (Build.VERSION.SDK_INT >= 26) {
+            enableEdgeToEdge(
+              navigationBarStyle = if (isDarkTheme) {
+                SystemBarStyle.dark(navBarColor)
+              } else {
+                SystemBarStyle.light(navBarColor, navBarColor)
+              }
+            )
+          } else {
+            enableEdgeToEdge()
+          }
+        }
+
         val modifier = when {
           isSplitPane -> {
             Modifier
@@ -1060,8 +1039,16 @@ class MainActivity :
         return
       }
 
+      val extras = intent.extras
+      if (extras == null) {
+        Log.w(TAG, "Received a conversation intent with no extras. Ignoring it.")
+        intent.action = null
+        setIntent(intent)
+        return
+      }
+
       mainNavigationViewModel.goTo(MainNavigationListLocation.CHATS)
-      mainNavigationViewModel.goTo(MainNavigationDetailLocation.Conversation(ConversationIntents.readArgsFromBundle(intent.extras!!)))
+      mainNavigationViewModel.goTo(MainNavigationDetailLocation.Conversation(ConversationIntents.readArgsFromBundle(extras)))
       intent.action = null
       setIntent(intent)
     }
@@ -1162,7 +1149,7 @@ class MainActivity :
       } else if (SignalStore.internal.useNewMediaActivity) {
         mediaSendLauncher.launch(
           MediaSendActivityContract.Args(
-            isCameraFirst = false,
+            isCameraFirst = true,
             isStory = destination == MainNavigationListLocation.STORIES
           )
         )
@@ -1176,24 +1163,7 @@ class MainActivity :
       }
     }
 
-    if (CameraXRemoteConfig.isSupported()) {
-      onGranted()
-    } else {
-      Permissions.with(this@MainActivity)
-        .request(Manifest.permission.CAMERA)
-        .ifNecessary()
-        .withRationaleDialog(getString(R.string.CameraXFragment_allow_access_camera), getString(R.string.CameraXFragment_to_capture_photos_and_video_allow_camera), CoreUiR.drawable.symbol_camera_24)
-        .withPermanentDenialDialog(
-          getString(R.string.CameraXFragment_signal_needs_camera_access_capture_photos),
-          null,
-          R.string.CameraXFragment_allow_access_camera,
-          R.string.CameraXFragment_to_capture_photos_videos,
-          supportFragmentManager
-        )
-        .onAllGranted(onGranted)
-        .onAnyDenied { Toast.makeText(this@MainActivity, R.string.CameraXFragment_signal_needs_camera_access_capture_photos, Toast.LENGTH_LONG).show() }
-        .execute()
-    }
+    onGranted()
   }
 
   inner class ToolbarCallback : MainToolbarCallback {
@@ -1257,11 +1227,11 @@ class MainActivity :
     }
 
     override fun onStoryPrivacyClick() {
-      startActivity(StorySettingsActivity.getIntent(this@MainActivity))
+      mainNavigationViewModel.goTo(MainNavigationDetailLocation.Stories.PrivacySettings)
     }
 
     override fun onStoryArchiveClick() {
-      startActivity(StoryArchiveActivity.createIntent(this@MainActivity))
+      mainNavigationViewModel.goTo(MainNavigationDetailLocation.Stories.Archive)
     }
 
     override fun onCloseSearchClick() {

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

@@ -13,9 +13,11 @@ import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 
 import org.greenrobot.eventbus.EventBus;
+import org.signal.core.util.AppForegroundObserver;
 import org.signal.core.util.logging.Log;
 import org.signal.core.util.tracing.Tracer;
 import org.signal.devicetransfer.TransferStatus;
+import org.signal.registration.RegistrationRoute;
 import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberLockActivity;
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
 import org.thoughtcrime.securesms.dependencies.AppDependencies;
@@ -30,11 +32,10 @@ import org.thoughtcrime.securesms.profiles.edit.CreateProfileActivity;
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.registration.ui.RegistrationActivity;
-import org.thoughtcrime.securesms.util.Environment;
 import org.thoughtcrime.securesms.restore.RestoreActivity;
 import org.thoughtcrime.securesms.service.KeyCachingService;
-import org.signal.core.util.AppForegroundObserver;
 import org.thoughtcrime.securesms.util.AppStartup;
+import org.thoughtcrime.securesms.util.Environment;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 import java.util.Locale;
@@ -57,6 +58,7 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
   private static final int STATE_TRANSFER_LOCKED     = 9;
   private static final int STATE_CHANGE_NUMBER_LOCK  = 10;
   private static final int STATE_TRANSFER_OR_RESTORE = 11;
+  private static final int STATE_RESUME_LINKING_REG  = 12;
 
   private SignalServiceNetworkAccess networkAccess;
   private BroadcastReceiver          clearKeyReceiver;
@@ -135,12 +137,8 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
     Intent    intent           = getIntentForState(applicationState);
     if (intent != null) {
       Log.d(TAG, "routeApplicationState(), intent: " + intent.getComponent());
-      if (applicationState == STATE_WELCOME_PUSH_SCREEN && Environment.USE_NEW_REGISTRATION) {
-        startActivity(intent);
-      } else {
         startActivity(intent);
         finish();
-      }
     }
   }
 
@@ -159,6 +157,7 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
       case STATE_TRANSFER_LOCKED:     return getOldDeviceTransferLockedIntent();
       case STATE_CHANGE_NUMBER_LOCK:  return getChangeNumberLockIntent();
       case STATE_TRANSFER_OR_RESTORE: return getTransferOrRestoreIntent();
+      case STATE_RESUME_LINKING_REG:  return getResumeLinkedRegistrationIntent();
       default:                        return null;
     }
   }
@@ -172,6 +171,8 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
       return STATE_UI_BLOCKING_UPGRADE;
     } else if (!TextSecurePreferences.hasPromptedPushRegistration(this)) {
       return STATE_WELCOME_PUSH_SCREEN;
+    } else if (shouldResumeLinkingRegistration()) {
+      return STATE_RESUME_LINKING_REG;
     } else if (userCanTransferOrRestore()) {
       return STATE_TRANSFER_OR_RESTORE;
     } else if (SignalStore.storageService().getNeedsAccountRestore()) {
@@ -196,6 +197,14 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
            RestoreDecisionStateUtil.isDecisionPending(SignalStore.registration().getRestoreDecisionState());
   }
 
+  private boolean shouldResumeLinkingRegistration() {
+    return Environment.USE_NEW_REGISTRATION &&
+           SignalStore.account().isRegistered() &&
+           !SignalStore.account().isPrimaryDevice() &&
+           !SignalStore.registration().isRegistrationComplete() &&
+           RestoreDecisionStateUtil.isDecisionPending(SignalStore.registration().getRestoreDecisionState());
+  }
+
   private boolean userMustCreateSignalPin() {
     return !SignalStore.registration().isRegistrationComplete() &&
            !SignalStore.svr().hasPin() &&
@@ -226,11 +235,7 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
   }
 
   private Intent getPushRegistrationIntent() {
-    if (Environment.USE_NEW_REGISTRATION) {
-      return org.signal.registration.RegistrationActivity.createIntent(this);
-    } else {
-      return RegistrationActivity.newIntentForNewRegistration(this, getIntent());
-    }
+    return RegistrationActivity.newIntentForNewRegistration(this, getIntent());
   }
 
   private Intent getEnterSignalPinIntent() {
@@ -254,6 +259,10 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
     return getRoutedIntent(intent, MainActivity.clearTop(this));
   }
 
+  private Intent getResumeLinkedRegistrationIntent() {
+    return org.signal.registration.RegistrationActivity.createIntent(this, MainActivity.clearTop(this), RegistrationRoute.MessageSync.INSTANCE);
+  }
+
   private Intent getCreateProfileNameIntent() {
     Intent intent = CreateProfileActivity.getIntentForUserProfile(this);
     return getRoutedIntent(intent, getIntent());

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

@@ -11,10 +11,11 @@ import androidx.annotation.Nullable;
 
 import org.signal.core.util.ThreadUtil;
 import org.signal.core.util.concurrent.SignalExecutors;
+import org.signal.core.util.contentproviders.BlobProvider;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.components.voice.VoiceNoteDraft;
+import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.notifications.v2.InChatNotificationSoundSuppressor;
-import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.util.MediaUtil;
 
 import java.io.IOException;
@@ -88,9 +89,9 @@ public class AudioRecorder {
 
         ParcelFileDescriptor fds[] = ParcelFileDescriptor.createPipe();
 
-        BlobProvider.BlobBuilder blobBuilder = BlobProvider.getInstance()
-                                                           .forData(new ParcelFileDescriptor.AutoCloseInputStream(fds[0]), 0)
-                                                           .withMimeType(MediaUtil.AUDIO_AAC);
+        BlobProvider.BlobBuilder blobBuilder = AppDependencies.getBlobs()
+                                                              .forData(new ParcelFileDescriptor.AutoCloseInputStream(fds[0]), 0)
+                                                              .withMimeType(MediaUtil.AUDIO_AAC);
 
         recordingUri       = blobBuilder.buildUriForDraftAttachment();
         recordingUriFuture = blobBuilder.createForDraftAttachmentAsync(context);

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

@@ -33,7 +33,7 @@ public final class AudioWaveFormGenerator {
    */
   @WorkerThread
   public static @NonNull AudioFileInfo generateWaveForm(@NonNull Context context, @NonNull Uri uri) throws IOException {
-    try (MediaInput dataSource = DecryptableUriMediaInput.createForUri(context, uri)) {
+    try (MediaInput dataSource = DecryptableUriMediaInput.INSTANCE.createForUri(context, uri)) {
       long[] wave        = new long[BAR_COUNT];
       int[]  waveSamples = new int[BAR_COUNT];
 

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

@@ -11,9 +11,9 @@ import androidx.appcompat.content.res.AppCompatResources
 import com.airbnb.lottie.SimpleColorFilter
 import org.signal.core.models.media.Media
 import org.signal.core.util.concurrent.SignalExecutors
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.mms.PartAuthority
 import org.thoughtcrime.securesms.profiles.AvatarHelper
-import org.thoughtcrime.securesms.providers.BlobProvider
 import org.thoughtcrime.securesms.util.MediaUtil
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
@@ -80,7 +80,7 @@ object AvatarRenderer {
 
   private fun renderPhoto(context: Context, avatar: Avatar.Photo, onAvatarRendered: (Media) -> Unit) {
     SignalExecutors.BOUNDED.execute {
-      val blob = BlobProvider.getInstance()
+      val blob = AppDependencies.blobs
         .forData(AvatarPickerStorage.read(context, PartAuthority.getAvatarPickerFilename(avatar.uri)), avatar.size)
         .createForSingleSessionOnDisk(context)
 
@@ -124,7 +124,7 @@ object AvatarRenderer {
 
       val bytes = outStream.toByteArray()
       val inStream = ByteArrayInputStream(bytes)
-      val uri = BlobProvider.getInstance().forData(inStream, bytes.size.toLong()).createForSingleSessionOnDisk(context)
+      val uri = AppDependencies.blobs.forData(inStream, bytes.size.toLong()).createForSingleSessionOnDisk(context)
 
       onAvatarRendered(createMedia(uri, bytes.size.toLong()))
     }

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

@@ -11,7 +11,7 @@ import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.avatar.AvatarBundler
 import org.thoughtcrime.securesms.avatar.AvatarPickerStorage
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.providers.BlobProvider
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.scribbles.ImageEditorFragment
 
 class PhotoEditorFragment : Fragment(R.layout.avatar_photo_editor_fragment), ImageEditorFragment.Controller {
@@ -39,15 +39,15 @@ class PhotoEditorFragment : Fragment(R.layout.avatar_photo_editor_fragment), Ima
 
     SignalExecutors.BOUNDED.execute {
       val editedImageUri = imageEditorFragment.renderToSingleUseBlob()
-      val size = BlobProvider.getFileSize(editedImageUri) ?: 0
-      val inputStream = BlobProvider.getInstance().getStream(applicationContext, editedImageUri)
+      val size = AppDependencies.blobs.getFileSize(editedImageUri) ?: 0
+      val inputStream = AppDependencies.blobs.getStream(applicationContext, editedImageUri)
       val onDiskUri = AvatarPickerStorage.save(applicationContext, inputStream)
       val photo = AvatarBundler.extractPhoto(args.photoAvatar)
       val database = SignalDatabase.avatarPicker
       val newPhoto = photo.copy(uri = onDiskUri, size = size)
 
       database.update(newPhoto)
-      BlobProvider.getInstance().delete(requireContext(), photo.uri)
+      AppDependencies.blobs.delete(requireContext(), photo.uri)
 
       ThreadUtil.runOnMain {
         setFragmentResult(REQUEST_KEY_EDIT, AvatarBundler.bundlePhoto(newPhoto))

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

@@ -1,13 +1,11 @@
 package org.thoughtcrime.securesms.avatar.picker
 
-import android.Manifest
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.view.Gravity
 import android.view.View
 import android.widget.PopupMenu
-import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.Fragment
@@ -30,12 +28,10 @@ import org.thoughtcrime.securesms.avatar.vector.VectorAvatarCreationFragment
 import org.thoughtcrime.securesms.components.ButtonStripItemView
 import org.thoughtcrime.securesms.components.recyclerview.GridDividerDecoration
 import org.thoughtcrime.securesms.mediasend.AvatarSelectionActivity
-import org.thoughtcrime.securesms.mediasend.camerax.CameraXRemoteConfig
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
 import org.thoughtcrime.securesms.util.visible
-import org.signal.core.ui.R as CoreUiR
 
 /**
  * Primary Avatar picker fragment, displays current user avatar and a list of recently used avatars and defaults.
@@ -223,22 +219,8 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) {
 
   @Suppress("DEPRECATION")
   private fun openCameraCapture() {
-    if (CameraXRemoteConfig.isSupported()) {
-      val intent = AvatarSelectionActivity.getIntentForCameraCapture(requireContext())
-      startActivityForResult(intent, REQUEST_CODE_SELECT_IMAGE)
-    } else {
-      Permissions.with(this)
-        .request(Manifest.permission.CAMERA)
-        .ifNecessary()
-        .onAllGranted {
-          val intent = AvatarSelectionActivity.getIntentForCameraCapture(requireContext())
-          startActivityForResult(intent, REQUEST_CODE_SELECT_IMAGE)
-        }
-        .withRationaleDialog(getString(R.string.CameraXFragment_allow_access_camera), getString(R.string.CameraXFragment_to_capture_photos_allow_camera), CoreUiR.drawable.symbol_camera_24)
-        .withPermanentDenialDialog(getString(R.string.AvatarSelectionBottomSheetDialogFragment__taking_a_photo_requires_the_camera_permission), null, R.string.CameraXFragment_allow_access_camera, R.string.CameraXFragment_to_capture_photos, getParentFragmentManager())
-        .onAnyDenied { Toast.makeText(requireContext(), R.string.AvatarSelectionBottomSheetDialogFragment__taking_a_photo_requires_the_camera_permission, Toast.LENGTH_SHORT).show() }
-        .execute()
-    }
+    val intent = AvatarSelectionActivity.getIntentForCameraCapture(requireContext())
+    startActivityForResult(intent, REQUEST_CODE_SELECT_IMAGE)
   }
 
   @Suppress("DEPRECATION")

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

@@ -16,9 +16,9 @@ import org.thoughtcrime.securesms.avatar.AvatarRenderer
 import org.thoughtcrime.securesms.avatar.Avatars
 import org.thoughtcrime.securesms.conversation.colors.AvatarColor
 import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.profiles.AvatarHelper
-import org.thoughtcrime.securesms.providers.BlobProvider
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.NameUtil
 import org.whispersystems.signalservice.api.util.StreamDetails
@@ -36,7 +36,7 @@ class AvatarPickerRepository(context: Context) {
       try {
         val bytes = StreamUtil.readFully(details.stream)
         Avatar.Photo(
-          BlobProvider.getInstance().forData(bytes).createForSingleSessionInMemory(),
+          AppDependencies.blobs.forData(bytes).createForSingleSessionInMemory(),
           details.length,
           Avatar.DatabaseId.DoNotPersist
         )
@@ -56,7 +56,7 @@ class AvatarPickerRepository(context: Context) {
       try {
         val bytes = AvatarHelper.getAvatarBytes(applicationContext, recipient.id)
         Avatar.Photo(
-          BlobProvider.getInstance().forData(bytes).createForSingleSessionInMemory(),
+          AppDependencies.blobs.forData(bytes).createForSingleSessionInMemory(),
           AvatarHelper.getAvatarLength(applicationContext, recipient.id),
           Avatar.DatabaseId.DoNotPersist
         )

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

@@ -50,7 +50,7 @@ object ArchiveUploadProgress {
 
   private val TAG = Log.tag(ArchiveUploadProgress::class)
 
-  private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+  private val scope = CoroutineScope(Dispatchers.Default + SupervisorJob())
 
   private val _progress: MutableSharedFlow<Unit> = MutableSharedFlow(replay = 1)
 
@@ -119,7 +119,7 @@ object ArchiveUploadProgress {
       updateState(notify = false) { updated }
     }
     .onStart { emit(uploadProgress) }
-    .flowOn(Dispatchers.IO)
+    .flowOn(Dispatchers.Default)
     .shareIn(scope, SharingStarted.Eagerly, replay = 1)
 
   init {

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

@@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.crypto.KeyStoreHelper;
+import org.signal.core.util.crypto.KeyStoreHelper;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 /**

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

@@ -23,9 +23,9 @@ import org.signal.core.models.database.AttachmentId;
 import org.thoughtcrime.securesms.backup.proto.KeyValue;
 import org.thoughtcrime.securesms.backup.proto.SharedPreference;
 import org.thoughtcrime.securesms.backup.proto.SqlStatement;
-import org.thoughtcrime.securesms.crypto.AttachmentSecret;
-import org.thoughtcrime.securesms.crypto.ClassicDecryptingPartInputStream;
-import org.thoughtcrime.securesms.crypto.ModernDecryptingPartInputStream;
+import org.signal.core.util.crypto.AttachmentSecret;
+import org.signal.core.util.crypto.ClassicDecryptingPartInputStream;
+import org.signal.core.util.crypto.ModernDecryptingPartInputStream;
 import org.thoughtcrime.securesms.database.AttachmentTable;
 import org.thoughtcrime.securesms.database.BackupMediaSnapshotTable;
 import org.thoughtcrime.securesms.database.EmojiSearchTable;

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

@@ -24,8 +24,8 @@ import org.thoughtcrime.securesms.backup.proto.KeyValue;
 import org.thoughtcrime.securesms.backup.proto.SharedPreference;
 import org.thoughtcrime.securesms.backup.proto.SqlStatement;
 import org.thoughtcrime.securesms.backup.proto.Sticker;
-import org.thoughtcrime.securesms.crypto.AttachmentSecret;
-import org.thoughtcrime.securesms.crypto.ModernEncryptingPartOutputStream;
+import org.signal.core.util.crypto.AttachmentSecret;
+import org.signal.core.util.crypto.ModernEncryptingPartOutputStream;
 import org.thoughtcrime.securesms.database.AttachmentTable;
 import org.thoughtcrime.securesms.database.EmojiSearchTable;
 import org.thoughtcrime.securesms.database.KeyValueDatabase;

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

@@ -82,7 +82,7 @@ object ArchiveRestoreProgress {
   val stateFlow: Flow<ArchiveRestoreProgressState> = store
     .throttleLatest(1.seconds)
     .distinctUntilChanged()
-    .flowOn(Dispatchers.IO)
+    .flowOn(Dispatchers.Default)
 
   init {
     SignalExecutors.BOUNDED.execute { update() }

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

@@ -47,6 +47,7 @@ import org.signal.core.util.bytes
 import org.signal.core.util.concurrent.LimitedWorker
 import org.signal.core.util.concurrent.SignalDispatchers
 import org.signal.core.util.concurrent.SignalExecutors
+import org.signal.core.util.crypto.AttachmentSecretProvider
 import org.signal.core.util.decodeOrNull
 import org.signal.core.util.forceForeignKeyConstraintsEnabled
 import org.signal.core.util.fullWalCheckpoint
@@ -93,7 +94,7 @@ import org.thoughtcrime.securesms.backup.v2.ui.BackupAlert
 import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsType
 import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
 import org.thoughtcrime.securesms.components.settings.app.subscription.RecurringInAppPaymentRepository
-import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider
+import org.thoughtcrime.securesms.crypto.AppAttachmentSecretStore
 import org.thoughtcrime.securesms.crypto.DatabaseSecretProvider
 import org.thoughtcrime.securesms.database.AttachmentTable
 import org.thoughtcrime.securesms.database.BackupMediaSnapshotTable.ArchiveMediaItem
@@ -140,7 +141,6 @@ import org.thoughtcrime.securesms.logsubmit.SubmitDebugLogRepository
 import org.thoughtcrime.securesms.net.SignalNetwork
 import org.thoughtcrime.securesms.notifications.NotificationChannels
 import org.thoughtcrime.securesms.notifications.NotificationIds
-import org.thoughtcrime.securesms.providers.BlobProvider
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.service.BackupMediaRestoreService
@@ -646,7 +646,7 @@ object BackupRepository {
     val state = SignalStore.backup.backupDownloadNotifierState ?: return null
     val nextSheetDisplayTime = state.lastSheetDisplaySeconds.seconds + state.intervalSeconds.seconds
 
-    val remainingAttachmentSize = withContext(SignalDispatchers.IO) {
+    val remainingAttachmentSize = withContext(SignalDispatchers.Default) {
       SignalDatabase.attachments.getRemainingRestorableAttachmentSize()
     }
 
@@ -717,7 +717,7 @@ object BackupRepository {
       SignalDatabase(
         context = context,
         databaseSecret = DatabaseSecretProvider.getOrCreateDatabaseSecret(context),
-        attachmentSecret = AttachmentSecretProvider.getInstance(context).getOrCreateAttachmentSecret(),
+        attachmentSecret = AttachmentSecretProvider.getInstance(context, AppAttachmentSecretStore).getOrCreateAttachmentSecret(),
         name = "$baseName.db"
       )
     }
@@ -1250,6 +1250,7 @@ object BackupRepository {
       return ImportResult.Failure
     }
     SignalStore.backup.hasInvalidBackupVersion = false
+    val selfId: RecipientId
 
     var transactionSuccessful = false
     try {
@@ -1321,7 +1322,7 @@ object BackupRepository {
       SignalStore.backup.mediaRootBackupKey = mediaRootBackupKey
 
       // Add back self after clearing data
-      val selfId: RecipientId = SignalDatabase.recipients.getAndPossiblyMerge(selfData.aci, selfData.pni, selfData.e164, pniVerified = true, changeSelf = true)
+      selfId = SignalDatabase.recipients.getAndPossiblyMerge(selfData.aci, selfData.pni, selfData.e164, pniVerified = true, changeSelf = true)
       SignalDatabase.recipients.setProfileKey(selfId, selfData.profileKey)
       SignalDatabase.recipients.setProfileSharing(selfId, true)
 
@@ -1532,7 +1533,7 @@ object BackupRepository {
     Log.d(TAG, "[import] Finished! ${eventTimer.stop().summary}")
     stopwatch.stop(TAG)
 
-    return ImportResult.Success(backupTime = header.backupTimeMs)
+    return ImportResult.Success(backupTime = header.backupTimeMs, selfRecipientId = selfId)
   }
 
   fun listRemoteMediaObjects(limit: Int, cursor: String? = null): NetworkResult<ArchiveGetMediaItemsResponse> {
@@ -2235,7 +2236,7 @@ object BackupRepository {
     }
 
     Log.i(TAG, "[remoteRestore] Downloading backup")
-    val tempBackupFile = BlobProvider.getInstance().forNonAutoEncryptingSingleSessionOnDisk(AppDependencies.application)
+    val tempBackupFile = AppDependencies.blobs.forNonAutoEncryptingSingleSessionOnDisk(AppDependencies.application)
     when (val result = downloadBackupFile(tempBackupFile, progressListener)) {
       is NetworkResult.Success -> Log.i(TAG, "[remoteRestore] Download successful")
       else -> {
@@ -2310,19 +2311,23 @@ object BackupRepository {
       forwardSecrecyToken = forwardSecrecyToken,
       cancellationSignal = cancellationSignal
     )
-    if (result == ImportResult.Failure) {
-      Log.w(TAG, "[remoteRestore] Failed to import backup")
-      return RemoteRestoreResult.Failure
+
+    return when (result) {
+      is ImportResult.Failure -> {
+        Log.w(TAG, "[remoteRestore] Failed to import backup")
+        RemoteRestoreResult.Failure
+      }
+
+      is ImportResult.Success -> {
+        Log.i(TAG, "[remoteRestore] Restore successful")
+        BackupMediaRestoreService.resetTimeout()
+        AppDependencies.jobManager.add(BackupRestoreMediaJob())
+        RemoteRestoreResult.Success(result.selfRecipientId)
+      }
     }
-
-    BackupMediaRestoreService.resetTimeout()
-    AppDependencies.jobManager.add(BackupRestoreMediaJob())
-
-    Log.i(TAG, "[remoteRestore] Restore successful")
-    return RemoteRestoreResult.Success
   }
 
-  suspend fun restoreLinkAndSyncBackup(response: TransferArchiveResponse, ephemeralBackupKey: MessageBackupKey) {
+  suspend fun restoreLinkAndSyncBackup(response: TransferArchiveResponse, ephemeralBackupKey: MessageBackupKey): RemoteRestoreResult {
     val context = AppDependencies.application
     ArchiveRestoreProgress.onRestorePending()
 
@@ -2354,9 +2359,16 @@ object BackupRepository {
       override fun shouldCancel() = cancellationSignal()
     }
 
+    val cdn = response.cdn
+    val key = response.key
+    if (cdn == null || key == null) {
+      Log.w(TAG, "[restoreLinkAndSyncBackup] Response has no archive location (error=${response.error}); nothing to download.")
+      return RemoteRestoreResult.Failure
+    }
+
     Log.i(TAG, "[restoreLinkAndSyncBackup] Downloading backup")
-    val tempBackupFile = BlobProvider.getInstance().forNonAutoEncryptingSingleSessionOnDisk(AppDependencies.application)
-    when (val result = AppDependencies.signalServiceMessageReceiver.retrieveLinkAndSyncBackup(response.cdn, response.key, tempBackupFile, progressListener)) {
+    val tempBackupFile = AppDependencies.blobs.forNonAutoEncryptingSingleSessionOnDisk(AppDependencies.application)
+    when (val result = AppDependencies.signalServiceMessageReceiver.retrieveLinkAndSyncBackup(cdn, key, tempBackupFile, progressListener)) {
       is NetworkResult.Success -> Log.i(TAG, "[restoreLinkAndSyncBackup] Download successful")
       else -> {
         Log.w(TAG, "[restoreLinkAndSyncBackup] Failed to download backup file", result.getCause())
@@ -2385,16 +2397,19 @@ object BackupRepository {
       cancellationSignal = cancellationSignal
     )
 
-    if (result == ImportResult.Failure) {
-      Log.w(TAG, "[restoreLinkAndSyncBackup] Failed to import backup")
-      return RemoteRestoreResult.Failure
+    return when (result) {
+      is ImportResult.Failure -> {
+        Log.w(TAG, "[restoreLinkAndSyncBackup] Failed to import backup")
+        RemoteRestoreResult.Failure
+      }
+
+      is ImportResult.Success -> {
+        Log.i(TAG, "[restoreLinkAndSyncBackup] Restore successful")
+        BackupMediaRestoreService.resetTimeout()
+        AppDependencies.jobManager.add(BackupRestoreMediaJob())
+        RemoteRestoreResult.Success(result.selfRecipientId)
+      }
     }
-
-    BackupMediaRestoreService.resetTimeout()
-    AppDependencies.jobManager.add(BackupRestoreMediaJob())
-
-    Log.i(TAG, "[restoreLinkAndSyncBackup] Restore successful")
-    return RemoteRestoreResult.Success
   }
 
   private fun buildDebugInfo(): ByteString {
@@ -2524,12 +2539,12 @@ data class StagedBackupKeyRotations(
 )
 
 sealed class ImportResult {
-  data class Success(val backupTime: Long) : ImportResult()
+  data class Success(val backupTime: Long, val selfRecipientId: RecipientId) : ImportResult()
   data object Failure : ImportResult()
 }
 
 sealed interface RemoteRestoreResult {
-  data object Success : RemoteRestoreResult
+  data class Success(val selfRecipientId: RecipientId) : RemoteRestoreResult
   data object NetworkError : RemoteRestoreResult
   data object Canceled : RemoteRestoreResult
   data object Failure : RemoteRestoreResult
@@ -2558,6 +2573,9 @@ enum class BackupMode {
 
   val isLocalBackup: Boolean
     get() = this == LOCAL
+
+  val isPlaintextExport: Boolean
+    get() = this == PLAINTEXT_EXPORT
 }
 
 /**

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

@@ -167,7 +167,11 @@ fun MessageTable.getMessagesForBackup(db: SignalDatabase, backupTime: Long, self
         .where(
           buildString {
             append("$STORY_TYPE = 0 AND $PARENT_STORY_ID <= 0 AND $SCHEDULED_DATE = -1 AND ")
-            append("($EXPIRES_IN == 0 OR $EXPIRES_IN > ${1.days.inWholeMilliseconds})")
+            if (exportState.backupMode.isPlaintextExport) {
+              append("$EXPIRES_IN == 0")
+            } else {
+              append("($EXPIRES_IN == 0 OR $EXPIRES_IN > ${1.days.inWholeMilliseconds})")
+            }
             append(" AND $DATE_RECEIVED >= $lastSeenReceivedTime $cutoffQuery")
           }
         )

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

@@ -647,15 +647,22 @@ private fun BackupMessageRecord.toBasicChatItemBuilder(selfRecipientId: Recipien
     }
   }
 
-  if (!MessageTypes.isExpirationTimerUpdate(record.type) && builder.expiresInMs != null && builder.expireStartDate != null) {
-    val cutoffDuration = ChatItemArchiveExporter.EXPIRATION_CUTOFF.inWholeMilliseconds
-    val expiresAt = builder.expireStartDate!! + builder.expiresInMs!!
-    val threshold = if (exportState.backupMode.isLinkAndSync) backupStartTime else backupStartTime + cutoffDuration
-
-    if (expiresAt < threshold || (builder.expiresInMs!! <= cutoffDuration && !exportState.backupMode.isLinkAndSync)) {
+  if (!MessageTypes.isExpirationTimerUpdate(record.type) && builder.expiresInMs != null) {
+    if (exportState.backupMode.isPlaintextExport) {
       Log.w(TAG, ExportSkips.messageExpiresTooSoon(record.dateSent))
       return null
     }
+
+    if (builder.expireStartDate != null) {
+      val cutoffDuration = ChatItemArchiveExporter.EXPIRATION_CUTOFF.inWholeMilliseconds
+      val expiresAt = builder.expireStartDate!! + builder.expiresInMs!!
+      val threshold = if (exportState.backupMode.isLinkAndSync) backupStartTime else backupStartTime + cutoffDuration
+
+      if (expiresAt < threshold || (builder.expiresInMs!! <= cutoffDuration && !exportState.backupMode.isLinkAndSync)) {
+        Log.w(TAG, ExportSkips.messageExpiresTooSoon(record.dateSent))
+        return null
+      }
+    }
   }
 
   if (builder.expireStartDate != null && builder.expiresInMs == null) {

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

@@ -17,6 +17,7 @@ import org.signal.core.util.UuidUtil
 import org.signal.core.util.logging.Log
 import org.signal.core.util.toByteArray
 import org.signal.libsignal.zkgroup.backups.BackupLevel
+import org.signal.mediasend.SentMediaQuality
 import org.thoughtcrime.securesms.backup.v2.ExportState
 import org.thoughtcrime.securesms.backup.v2.ImportState
 import org.thoughtcrime.securesms.backup.v2.MessageBackupTier
@@ -471,19 +472,19 @@ object AccountDataArchiveProcessor {
     }
   }
 
-  private fun org.thoughtcrime.securesms.mms.SentMediaQuality.toRemoteSentMediaQuality(): AccountData.SentMediaQuality {
+  private fun SentMediaQuality.toRemoteSentMediaQuality(): AccountData.SentMediaQuality {
     return when (this) {
-      org.thoughtcrime.securesms.mms.SentMediaQuality.STANDARD -> AccountData.SentMediaQuality.STANDARD
-      org.thoughtcrime.securesms.mms.SentMediaQuality.HIGH -> AccountData.SentMediaQuality.HIGH
+      SentMediaQuality.STANDARD -> AccountData.SentMediaQuality.STANDARD
+      SentMediaQuality.HIGH -> AccountData.SentMediaQuality.HIGH
     }
   }
 
-  private fun AccountData.SentMediaQuality?.toLocalSentMediaQuality(): org.thoughtcrime.securesms.mms.SentMediaQuality {
+  private fun AccountData.SentMediaQuality?.toLocalSentMediaQuality(): SentMediaQuality {
     return when (this) {
-      AccountData.SentMediaQuality.HIGH -> org.thoughtcrime.securesms.mms.SentMediaQuality.HIGH
-      AccountData.SentMediaQuality.STANDARD -> org.thoughtcrime.securesms.mms.SentMediaQuality.STANDARD
-      AccountData.SentMediaQuality.UNKNOWN_QUALITY -> org.thoughtcrime.securesms.mms.SentMediaQuality.STANDARD
-      null -> org.thoughtcrime.securesms.mms.SentMediaQuality.STANDARD
+      AccountData.SentMediaQuality.HIGH -> SentMediaQuality.HIGH
+      AccountData.SentMediaQuality.STANDARD -> SentMediaQuality.STANDARD
+      AccountData.SentMediaQuality.UNKNOWN_QUALITY -> SentMediaQuality.STANDARD
+      null -> SentMediaQuality.STANDARD
     }
   }
 

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

@@ -49,7 +49,7 @@ object BackupAlertDelegate {
   }
 
   private suspend fun displayBackupDownloadNotifier(fragmentManager: FragmentManager) {
-    val downloadYourBackupToday = withContext(SignalDispatchers.IO) { BackupRepository.getDownloadYourBackupData() }
+    val downloadYourBackupToday = withContext(SignalDispatchers.Default) { BackupRepository.getDownloadYourBackupData() }
     when (downloadYourBackupToday?.type) {
       BackupDownloadNotifierState.Type.SHEET -> {
         Log.d(TAG, "Displaying 'Download your backup today' sheet.")

app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/ConfirmRecoveryKeyBottomSheet.kt

@@ -0,0 +1,85 @@
+package org.thoughtcrime.securesms.backup.v2.ui.subscription
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+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.thoughtcrime.securesms.R
+
+/**
+ * Bottom sheet shown when confirming your recovery key after saving to password manager
+ */
+@Composable
+fun ConfirmRecoveryKeySheet(
+  onConfirm: () -> Unit = {},
+  onSeeAgain: () -> Unit = {},
+  modifier: Modifier = Modifier
+) {
+  Column(
+    modifier = modifier.horizontalGutters(),
+    horizontalAlignment = Alignment.CenterHorizontally
+  ) {
+    Icon(
+      imageVector = ImageVector.vectorResource(R.drawable.backup_confirm_80),
+      tint = Color.Unspecified,
+      contentDescription = null,
+      modifier = Modifier.padding(top = 24.dp, bottom = 16.dp)
+    )
+
+    Text(
+      text = stringResource(R.string.MessageBackupsKeyVerifyScreen__confirm_your_backup_key),
+      style = MaterialTheme.typography.titleLarge,
+      textAlign = TextAlign.Center,
+      modifier = Modifier.padding(bottom = 12.dp)
+    )
+
+    Text(
+      text = stringResource(R.string.MessageBackupsKeyRecordScreen__confirm_that_your_recovery),
+      textAlign = TextAlign.Center,
+      color = MaterialTheme.colorScheme.onSurfaceVariant
+    )
+
+    Spacer(modifier = Modifier.size(60.dp))
+
+    Buttons.LargeTonal(onClick = onConfirm) {
+      Text(text = stringResource(R.string.MessageBackupsKeyRecordScreen__confirm_recovery))
+    }
+
+    TextButton(
+      onClick = onSeeAgain,
+      modifier = Modifier.padding(vertical = 16.dp)
+    ) {
+      Text(text = stringResource(R.string.MessageBackupsKeyRecordScreen__see_key_again))
+    }
+  }
+}
+
+@DayNightPreviews
+@Composable
+private fun ConfirmRecoveryKeyPreview() {
+  Previews.BottomSheetContentPreview {
+    ConfirmRecoveryKeySheet(
+      onConfirm = {},
+      onSeeAgain = {},
+      modifier = Modifier.fillMaxSize()
+    )
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowFragment.kt

@@ -68,7 +68,8 @@ class MessageBackupsFlowFragment : ComposeFragment(), InAppPaymentCheckoutDelega
   private val viewModel: MessageBackupsFlowViewModel by viewModel {
     MessageBackupsFlowViewModel(
       initialTierSelection = requireArguments().getSerializableCompat(TIER, MessageBackupTier::class.java),
-      googlePlayApiAvailability = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(requireContext())
+      googlePlayApiAvailability = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(requireContext()),
+      isCredentialManagerSupported = AndroidCredentialRepository.isCredentialManagerSupported(requireContext())
     )
   }
 
@@ -155,6 +156,32 @@ class MessageBackupsFlowFragment : ComposeFragment(), InAppPaymentCheckoutDelega
         val context = LocalContext.current
         val passwordManagerSettingsIntent = AndroidCredentialRepository.getCredentialManagerSettingsIntent(requireContext())
 
+        MessageBackupsKeyRecordScreen(
+          backupKey = state.accountEntropyPool.displayValue,
+          keySaveState = state.backupKeySaveState,
+          canOpenPasswordManagerSettings = passwordManagerSettingsIntent != null,
+          onNavigationClick = viewModel::goToPreviousStage,
+          mode = remember {
+            MessageBackupsKeyRecordMode.Passkey(
+              onSaveToPasswordManager = viewModel::onBackupKeySaveRequested,
+              onSaveManually = viewModel::goToRecordManually,
+              onSaveSuccessful = viewModel::goToNextStage
+            )
+          },
+          onCopyToClipboardClick = { Util.copyToClipboard(context, it, CLIPBOARD_TIMEOUT_SECONDS) },
+          onRequestSaveToPasswordManager = viewModel::onBackupKeySaveRequested,
+          onConfirmSaveToPasswordManager = viewModel::onBackupKeySaveConfirmed,
+          onSaveStateCleared = viewModel::onBackupKeySaveStateCleared,
+          onSaveToPasswordManagerComplete = viewModel::onBackupKeySaveCompleted,
+          onGoToPasswordManagerSettingsClick = { requireContext().startActivity(passwordManagerSettingsIntent) },
+          notifyKeyIsSameAsOnDeviceBackupKey = SignalStore.backup.newLocalBackupsEnabled
+        )
+      }
+
+      composable(route = MessageBackupsStage.Route.BACKUP_KEY_RECORD_MANUALLY.name) {
+        val context = LocalContext.current
+        val passwordManagerSettingsIntent = AndroidCredentialRepository.getCredentialManagerSettingsIntent(requireContext())
+
         MessageBackupsKeyRecordScreen(
           backupKey = state.accountEntropyPool.displayValue,
           keySaveState = state.backupKeySaveState,

app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsFlowViewModel.kt

@@ -53,6 +53,7 @@ import kotlin.time.Duration.Companion.seconds
 class MessageBackupsFlowViewModel(
   private val initialTierSelection: MessageBackupTier?,
   googlePlayApiAvailability: Int,
+  private val isCredentialManagerSupported: Boolean,
   startScreen: MessageBackupsStage = if (SignalStore.backup.backupTier == null) MessageBackupsStage.EDUCATION else MessageBackupsStage.TYPE_SELECTION
 ) : ViewModel(), BackupKeyCredentialManagerHandler {
 
@@ -144,7 +145,7 @@ class MessageBackupsFlowViewModel(
               }
             } catch (e: Exception) {
               Log.d(TAG, "Failed to handle purchase.", e)
-              withContext(SignalDispatchers.IO) {
+              withContext(SignalDispatchers.Default) {
                 InAppPaymentsRepository.handlePipelineError(
                   inAppPaymentId = id,
                   error = e
@@ -238,8 +239,9 @@ class MessageBackupsFlowViewModel(
       when (it.stage) {
         MessageBackupsStage.CANCEL -> error("Unsupported state transition from terminal state CANCEL")
         MessageBackupsStage.EDUCATION -> it.copy(stage = MessageBackupsStage.BACKUP_KEY_EDUCATION)
-        MessageBackupsStage.BACKUP_KEY_EDUCATION -> it.copy(stage = MessageBackupsStage.BACKUP_KEY_RECORD)
-        MessageBackupsStage.BACKUP_KEY_RECORD -> it.copy(stage = MessageBackupsStage.BACKUP_KEY_VERIFY)
+        MessageBackupsStage.BACKUP_KEY_EDUCATION -> it.copy(stage = if (isCredentialManagerSupported) MessageBackupsStage.BACKUP_KEY_RECORD else MessageBackupsStage.BACKUP_KEY_RECORD_MANUALLY)
+        MessageBackupsStage.BACKUP_KEY_RECORD -> it.copy(stage = MessageBackupsStage.TYPE_SELECTION)
+        MessageBackupsStage.BACKUP_KEY_RECORD_MANUALLY -> it.copy(stage = MessageBackupsStage.BACKUP_KEY_VERIFY)
         MessageBackupsStage.BACKUP_KEY_VERIFY -> it.copy(stage = MessageBackupsStage.TYPE_SELECTION)
         MessageBackupsStage.TYPE_SELECTION -> validateTypeAndUpdateState(it)
         MessageBackupsStage.CHECKOUT_SHEET -> it.copy(stage = MessageBackupsStage.PROCESS_PAYMENT)
@@ -262,7 +264,8 @@ class MessageBackupsFlowViewModel(
           MessageBackupsStage.EDUCATION -> MessageBackupsStage.CANCEL
           MessageBackupsStage.BACKUP_KEY_EDUCATION -> MessageBackupsStage.EDUCATION
           MessageBackupsStage.BACKUP_KEY_RECORD -> MessageBackupsStage.BACKUP_KEY_EDUCATION
-          MessageBackupsStage.BACKUP_KEY_VERIFY -> MessageBackupsStage.BACKUP_KEY_RECORD
+          MessageBackupsStage.BACKUP_KEY_RECORD_MANUALLY -> if (isCredentialManagerSupported) MessageBackupsStage.BACKUP_KEY_RECORD else MessageBackupsStage.BACKUP_KEY_EDUCATION
+          MessageBackupsStage.BACKUP_KEY_VERIFY -> MessageBackupsStage.BACKUP_KEY_RECORD_MANUALLY
           MessageBackupsStage.TYPE_SELECTION -> MessageBackupsStage.BACKUP_KEY_RECORD
           MessageBackupsStage.CHECKOUT_SHEET -> MessageBackupsStage.TYPE_SELECTION
           MessageBackupsStage.CREATING_IN_APP_PAYMENT -> MessageBackupsStage.CREATING_IN_APP_PAYMENT
@@ -277,6 +280,12 @@ class MessageBackupsFlowViewModel(
     }
   }
 
+  fun goToRecordManually() {
+    internalStateFlow.update {
+      it.copy(stage = MessageBackupsStage.BACKUP_KEY_RECORD_MANUALLY)
+    }
+  }
+
   fun onMessageBackupTierUpdated(messageBackupTier: MessageBackupTier) {
     internalStateFlow.update {
       it.copy(
@@ -288,7 +297,7 @@ class MessageBackupsFlowViewModel(
   private fun validateTypeAndUpdateState(state: MessageBackupsFlowState): MessageBackupsFlowState {
     return when (state.selectedMessageBackupTier!!) {
       MessageBackupTier.FREE -> {
-        viewModelScope.launch(SignalDispatchers.IO) {
+        viewModelScope.launch(SignalDispatchers.Default) {
           SignalDatabase.recipients.markNeedsSync(Recipient.self().id)
           StorageSyncHelper.scheduleSyncForDataChange()
         }

app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsKeyEducationScreen.kt

@@ -5,6 +5,7 @@
 
 package org.thoughtcrime.securesms.backup.v2.ui.subscription
 
+import android.widget.Toast
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.compose.foundation.Image
@@ -28,6 +29,7 @@ import androidx.compose.runtime.Composable
 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.res.dimensionResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -46,6 +48,7 @@ import org.signal.core.ui.compose.SignalIcons
 import org.signal.core.ui.compose.horizontalGutters
 import org.signal.core.ui.compose.theme.SignalTheme
 import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.compose.rememberBiometricsAuthentication
 import org.signal.core.ui.R as CoreUiR
 
 enum class MessageBackupsKeyEducationScreenMode {
@@ -80,6 +83,14 @@ fun MessageBackupsKeyEducationScreen(
   mode: MessageBackupsKeyEducationScreenMode = MessageBackupsKeyEducationScreenMode.DEFAULT
 ) {
   val scrollState = rememberScrollState()
+  val context = LocalContext.current
+  val biometrics = rememberBiometricsAuthentication(
+    promptTitle = stringResource(R.string.RemoteBackupsSettingsFragment__unlock_to_view_backup_key),
+    educationSheetMessage = stringResource(R.string.RemoteBackupsSettingsFragment__to_view_your_key),
+    onAuthenticationFailed = {
+      Toast.makeText(context, R.string.RemoteBackupsSettingsFragment__authentication_required, Toast.LENGTH_SHORT).show()
+    }
+  )
 
   Scaffolds.Settings(
     title = "",
@@ -139,7 +150,7 @@ fun MessageBackupsKeyEducationScreen(
           .padding(top = 16.dp, bottom = 24.dp)
       ) {
         Buttons.LargeTonal(
-          onClick = onNextClick,
+          onClick = { biometrics.withBiometricsAuthentication(onNextClick) },
           modifier = Modifier.align(Alignment.Center)
         ) {
           Text(

app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsKeyRecordScreen.kt

@@ -6,14 +6,22 @@
 package org.thoughtcrime.securesms.backup.v2.ui.subscription
 
 import android.content.Context
+import android.widget.Toast
 import androidx.activity.compose.BackHandler
 import androidx.activity.compose.LocalOnBackPressedDispatcherOwner
 import androidx.annotation.UiContext
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.SizeTransform
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
@@ -22,6 +30,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.SnackbarHostState
@@ -34,9 +43,16 @@ import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.graphics.BlendMode
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.CompositingStrategy
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.testTag
@@ -48,6 +64,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import kotlinx.coroutines.launch
 import org.signal.core.ui.compose.BottomSheets
 import org.signal.core.ui.compose.Buttons
 import org.signal.core.ui.compose.DayNightPreviews
@@ -85,6 +102,11 @@ sealed interface MessageBackupsKeyRecordMode {
     val isOptimizedStorageEnabled: Boolean,
     val canRotateKey: Boolean
   ) : MessageBackupsKeyRecordMode
+  data class Passkey(
+    val onSaveToPasswordManager: () -> Unit,
+    val onSaveManually: () -> Unit,
+    val onSaveSuccessful: () -> Unit
+  ) : MessageBackupsKeyRecordMode
 }
 
 /**
@@ -136,18 +158,24 @@ fun MessageBackupsKeyRecordScreen(
   onRequestSaveToPasswordManager: () -> Unit = {},
   onConfirmSaveToPasswordManager: () -> Unit = {},
   onSaveToPasswordManagerComplete: (CredentialManagerResult) -> Unit = {},
+  onSaveStateCleared: () -> Unit = {},
   onGoToPasswordManagerSettingsClick: () -> Unit = {},
   mode: MessageBackupsKeyRecordMode = MessageBackupsKeyRecordMode.Next(onNextClick = {}),
   notifyKeyIsSameAsOnDeviceBackupKey: Boolean = false
 ) {
   TemporaryScreenshotSecurity.bind()
 
+  val context = LocalContext.current
+  val coroutineScope = rememberCoroutineScope()
   val snackbarHostState = remember { SnackbarHostState() }
   val backupKeyString = remember(backupKey) {
     backupKey.chunked(4).joinToString("  ")
   }
 
-  if (mode is MessageBackupsKeyRecordMode.Next) {
+  val showAsPasskey = mode is MessageBackupsKeyRecordMode.Passkey
+  var showExpandedPasskey by remember { mutableStateOf(false) }
+
+  if (mode is MessageBackupsKeyRecordMode.Next || mode is MessageBackupsKeyRecordMode.Passkey) {
     RecordScreenBackHandler()
   }
 
@@ -183,6 +211,41 @@ fun MessageBackupsKeyRecordScreen(
     }
   }
 
+  var displayKeyVerificationError by remember { mutableStateOf(false) }
+  if (displayKeyVerificationError) {
+    ConfirmationFailureDialog(mode) {
+      displayKeyVerificationError = false
+    }
+  }
+
+  var displayConfirmKey by remember { mutableStateOf(false) }
+  if (displayConfirmKey) {
+    val context = LocalContext.current
+    val credentialId = stringResource(R.string.MessageBackupsKeyRecordScreen__backup_key_password_manager_id)
+    val successMessage = stringResource(R.string.MessageBackupsKeyRecordScreen__recover_key_confirmed)
+    ModalBottomSheet(
+      sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true),
+      containerColor = SignalTheme.colors.colorSurface1,
+      onDismissRequest = { displayConfirmKey = false }
+    ) {
+      ConfirmRecoveryKeySheet(
+        onConfirm = {
+          coroutineScope.launch {
+            val retrieved = getKeyFromCredentialManager(context, credentialId)
+            if (retrieved == backupKey) {
+              Toast.makeText(context, successMessage, Toast.LENGTH_SHORT).show()
+              (mode as? MessageBackupsKeyRecordMode.Passkey)?.onSaveSuccessful()
+            } else {
+              displayKeyVerificationError = true
+            }
+          }
+          displayConfirmKey = false
+        },
+        onSeeAgain = { displayConfirmKey = false }
+      )
+    }
+  }
+
   Scaffolds.Settings(
     title = "",
     navigationIcon = SignalIcons.ArrowStart.imageVector,
@@ -216,7 +279,11 @@ fun MessageBackupsKeyRecordScreen(
 
           item {
             Text(
-              text = stringResource(R.string.MessageBackupsKeyRecordScreen__record_your_backup_key),
+              text = if (showAsPasskey) {
+                stringResource(R.string.MessageBackupsKeyRecordScreen__save_your_recovery_key)
+              } else {
+                stringResource(R.string.MessageBackupsKeyRecordScreen__record_your_backup_key)
+              },
               style = MaterialTheme.typography.headlineMedium,
               modifier = Modifier.padding(top = 16.dp)
             )
@@ -225,6 +292,8 @@ fun MessageBackupsKeyRecordScreen(
           item {
             val text = if (notifyKeyIsSameAsOnDeviceBackupKey) {
               stringResource(R.string.MessageBackupsKeyRecordScreen__this_key_is_the_same_as_your_on_device_recovery_key)
+            } else if (showAsPasskey) {
+              stringResource(R.string.MessageBackupsKeyRecordScreen__your_recovery_key)
             } else {
               stringResource(R.string.MessageBackupsKeyRecordScreen__this_key_is_required_to_recover)
             }
@@ -239,47 +308,113 @@ fun MessageBackupsKeyRecordScreen(
           }
 
           item {
-            Box(
-              modifier = Modifier
-                .padding(top = 24.dp, bottom = 16.dp)
-                .background(
-                  color = SignalTheme.colors.colorSurface1,
-                  shape = RoundedCornerShape(10.dp)
-                )
-                .padding(24.dp)
-            ) {
-              Text(
-                text = backupKeyString,
-                style = MaterialTheme.typography.bodyLarge
-                  .copy(
-                    fontSize = 18.sp,
-                    fontWeight = FontWeight(400),
-                    letterSpacing = 1.44.sp,
-                    lineHeight = 36.sp,
-                    textAlign = TextAlign.Center,
-                    fontFamily = MonoTypeface.fontFamily()
+            AnimatedContent(
+              targetState = showAsPasskey && !showExpandedPasskey,
+              transitionSpec = { fadeIn() togetherWith fadeOut() using SizeTransform(clip = false) },
+              label = "passkey",
+              modifier = Modifier.padding(top = 24.dp, bottom = 16.dp)
+            ) { isCollapsed ->
+              if (isCollapsed) {
+                Box(
+                  contentAlignment = Alignment.CenterEnd,
+                  modifier = Modifier.background(
+                    color = SignalTheme.colors.colorSurface1,
+                    shape = RoundedCornerShape(50.dp)
+                  )
+                ) {
+                  Text(
+                    text = backupKeyString,
+                    maxLines = 1,
+                    style = MaterialTheme.typography.bodyLarge
+                      .copy(
+                        fontSize = 18.sp,
+                        fontWeight = FontWeight(400),
+                        letterSpacing = 1.44.sp,
+                        lineHeight = 36.sp,
+                        textAlign = TextAlign.Center,
+                        fontFamily = MonoTypeface.fontFamily()
+                      ),
+                    modifier = Modifier
+                      .padding(10.dp)
+                      .graphicsLayer { compositingStrategy = CompositingStrategy.Offscreen }
+                      .drawWithContent {
+                        drawContent()
+                        drawRect(
+                          brush = Brush.horizontalGradient(
+                            0f to Color.Black,
+                            0.75f to Color.Transparent
+                          ),
+                          blendMode = BlendMode.DstIn
+                        )
+                      }
                   )
-              )
-            }
-          }
 
-          item {
-            Buttons.Small(
-              onClick = {
-                if (mode is MessageBackupsKeyRecordMode.CreateNewKey) {
-                  displayRecoveryKeyCopyWarning = true
-                } else {
-                  onCopyToClipboardClick(backupKeyString)
+                  Row(
+                    modifier = Modifier
+                      .background(
+                        color = SignalTheme.colors.colorSurface1,
+                        shape = RoundedCornerShape(50.dp)
+                      )
+                      .padding(horizontal = 12.dp)
+                      .clickable(onClick = { showExpandedPasskey = true }),
+                    verticalAlignment = Alignment.CenterVertically
+                  ) {
+                    Icon(
+                      imageVector = ImageVector.vectorResource(R.drawable.symbol_tap_20),
+                      contentDescription = stringResource(R.string.MessageBackupsKeyRecordScreen__see_full_key)
+                    )
+                    Text(
+                      text = stringResource(R.string.MessageBackupsKeyRecordScreen__see_full_key),
+                      style = MaterialTheme.typography.labelMedium,
+                      modifier = Modifier.padding(start = 4.dp, end = 12.dp)
+                    )
+                  }
+                }
+              } else {
+                Box(
+                  modifier = Modifier
+                    .background(
+                      color = SignalTheme.colors.colorSurface1,
+                      shape = RoundedCornerShape(10.dp)
+                    )
+                    .padding(24.dp)
+                ) {
+                  Text(
+                    text = backupKeyString,
+                    style = MaterialTheme.typography.bodyLarge
+                      .copy(
+                        fontSize = 18.sp,
+                        fontWeight = FontWeight(400),
+                        letterSpacing = 1.44.sp,
+                        lineHeight = 36.sp,
+                        textAlign = TextAlign.Center,
+                        fontFamily = MonoTypeface.fontFamily()
+                      )
+                  )
                 }
               }
-            ) {
-              Text(
-                text = stringResource(R.string.MessageBackupsKeyRecordScreen__copy_to_clipboard)
-              )
             }
           }
 
-          if (AndroidCredentialRepository.isCredentialManagerSupported) {
+          if (!showAsPasskey || showExpandedPasskey) {
+            item {
+              Buttons.Small(
+                onClick = {
+                  if (mode is MessageBackupsKeyRecordMode.CreateNewKey) {
+                    displayRecoveryKeyCopyWarning = true
+                  } else {
+                    onCopyToClipboardClick(backupKeyString)
+                  }
+                }
+              ) {
+                Text(
+                  text = stringResource(R.string.MessageBackupsKeyRecordScreen__copy_to_clipboard)
+                )
+              }
+            }
+          }
+
+          if (!showAsPasskey && AndroidCredentialRepository.isCredentialManagerSupported(context)) {
             item {
               Buttons.Small(
                 onClick = { onRequestSaveToPasswordManager() }
@@ -300,6 +435,10 @@ fun MessageBackupsKeyRecordScreen(
           is MessageBackupsKeyRecordMode.CreateNewKey -> {
             CreateNewKeyButton(mode)
           }
+
+          is MessageBackupsKeyRecordMode.Passkey -> {
+            SaveButtons(mode)
+          }
         }
       }
 
@@ -326,7 +465,12 @@ fun MessageBackupsKeyRecordScreen(
         is BackupKeySaveState.Success -> {
           val snackbarMessage = stringResource(R.string.MessageBackupsKeyRecordScreen__save_to_password_manager_success)
           LaunchedEffect(keySaveState) {
-            snackbarHostState.showSnackbar(snackbarMessage)
+            if (showAsPasskey) {
+              displayConfirmKey = true
+            } else {
+              snackbarHostState.showSnackbar(snackbarMessage)
+            }
+            onSaveStateCleared()
           }
         }
 
@@ -343,6 +487,24 @@ fun MessageBackupsKeyRecordScreen(
   }
 }
 
+@Composable
+private fun SaveButtons(mode: MessageBackupsKeyRecordMode.Passkey) {
+  Buttons.LargeTonal(
+    onClick = mode.onSaveToPasswordManager
+  ) {
+    Text(text = stringResource(R.string.MessageBackupsKeyRecordScreen__save_to_password_manager))
+  }
+
+  TextButton(
+    onClick = mode.onSaveManually,
+    modifier = Modifier
+      .padding(vertical = 24.dp)
+      .horizontalGutters()
+  ) {
+    Text(text = stringResource(R.string.MessageBackupsKeyRecordScreen__save_key_manually))
+  }
+}
+
 @Composable
 private fun NextButton(onNextClick: () -> Unit) {
   Box(
@@ -578,6 +740,26 @@ private fun KeyLimitExceededDialog(
   )
 }
 
+@Composable
+private fun ConfirmationFailureDialog(mode: MessageBackupsKeyRecordMode, onDismiss: () -> Unit) {
+  Dialogs.AdvancedAlertDialog(
+    title = stringResource(R.string.MessageBackupsKeyRecordScreen__recover_key_error),
+    body = stringResource(R.string.MessageBackupsKeyRecordScreen__recover_key_error_body),
+    positive = stringResource(R.string.MessageBackupsKeyRecordScreen__save_to_password_manager),
+    onPositive = {
+      (mode as? MessageBackupsKeyRecordMode.Passkey)?.onSaveToPasswordManager()
+      onDismiss()
+    },
+    neutral = stringResource(R.string.MessageBackupsKeyRecordScreen__save_key_manually),
+    onNeutral = {
+      (mode as? MessageBackupsKeyRecordMode.Passkey)?.onSaveManually()
+      onDismiss()
+    },
+    negative = stringResource(android.R.string.cancel),
+    onNegative = onDismiss
+  )
+}
+
 private suspend fun saveKeyToCredentialManager(
   @UiContext activityContext: Context,
   backupKey: String
@@ -589,6 +771,13 @@ private suspend fun saveKeyToCredentialManager(
   )
 }
 
+private suspend fun getKeyFromCredentialManager(
+  @UiContext activityContext: Context,
+  id: String
+): String? {
+  return AndroidCredentialRepository.getCredential(activityContext, id)
+}
+
 @DayNightPreviews
 @Composable
 private fun MessageBackupsKeyRecordScreenPreview() {
@@ -621,6 +810,23 @@ private fun MessageBackupsKeyRecordScreenSameAsOnDeviceKeyPreview() {
   }
 }
 
+@DayNightPreviews
+@Composable
+private fun MessageBackupsKeySaveScreenPreview() {
+  Previews.Preview {
+    MessageBackupsKeyRecordScreen(
+      backupKey = (0 until 63).map { (('A'..'Z') + ('0'..'9')).random() }.joinToString("") + "0",
+      keySaveState = null,
+      canOpenPasswordManagerSettings = true,
+      mode = MessageBackupsKeyRecordMode.Passkey(
+        onSaveToPasswordManager = {},
+        onSaveManually = {},
+        onSaveSuccessful = {}
+      )
+    )
+  }
+}
+
 @DayNightPreviews
 @Composable
 private fun SaveKeyConfirmationDialogPreview() {

app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsStage.kt

@@ -15,6 +15,7 @@ enum class MessageBackupsStage(
   EDUCATION(route = Route.EDUCATION),
   BACKUP_KEY_EDUCATION(route = Route.BACKUP_KEY_EDUCATION),
   BACKUP_KEY_RECORD(route = Route.BACKUP_KEY_RECORD),
+  BACKUP_KEY_RECORD_MANUALLY(route = Route.BACKUP_KEY_RECORD_MANUALLY),
   BACKUP_KEY_VERIFY(route = Route.BACKUP_KEY_VERIFY),
   TYPE_SELECTION(route = Route.TYPE_SELECTION),
   CREATING_IN_APP_PAYMENT(route = Route.TYPE_SELECTION),
@@ -32,6 +33,7 @@ enum class MessageBackupsStage(
     EDUCATION,
     BACKUP_KEY_EDUCATION,
     BACKUP_KEY_RECORD,
+    BACKUP_KEY_RECORD_MANUALLY,
     BACKUP_KEY_VERIFY,
     TYPE_SELECTION;
 

app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/verify/VerifyBackupKeyActivity.kt

@@ -61,7 +61,7 @@ class VerifyBackupKeyActivity : PassphraseRequiredActivity() {
             // Matches existing behavior: show a generic "authentication required" toast.
             Toast.makeText(
               context,
-              R.string.RemoteBackupsSettingsFragment__authenticatino_required,
+              R.string.RemoteBackupsSettingsFragment__authentication_required,
               Toast.LENGTH_SHORT
             ).show()
           }

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

@@ -40,7 +40,7 @@ class MonthlyDonationCanceledViewModel(
 
   private fun initializeFromInAppPaymentId(inAppPaymentId: InAppPaymentTable.InAppPaymentId) {
     viewModelScope.launch {
-      val inAppPayment = withContext(Dispatchers.IO) {
+      val inAppPayment = withContext(Dispatchers.Default) {
         SignalDatabase.inAppPayments.getById(inAppPaymentId)
       }
 

app/src/main/java/org/thoughtcrime/securesms/banner/Banner.kt

@@ -8,6 +8,7 @@ package org.thoughtcrime.securesms.banner
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.runtime.Composable
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.emptyFlow
 
 /**
  * This class represents a banner across the top of the screen.
@@ -28,6 +29,12 @@ abstract class Banner<Model> {
    */
   abstract val dataFlow: Flow<Model>
 
+  /**
+   * Emits whenever this banner's [enabled] state may have changed.
+   */
+  open val stateUpdates: Flow<Unit>
+    get() = emptyFlow()
+
   /**
    * Composable function to display the content emitted from [dataFlow].
    * You likely want to use [org.thoughtcrime.securesms.banner.ui.compose.DefaultBanner].

app/src/main/java/org/thoughtcrime/securesms/banner/BannerManager.kt

@@ -15,6 +15,11 @@ import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.merge
+import kotlinx.coroutines.flow.onStart
 import org.signal.core.ui.compose.theme.SignalTheme
 import org.signal.core.util.logging.Log
 
@@ -32,6 +37,22 @@ class BannerManager @JvmOverloads constructor(
     val TAG = Log.tag(BannerManager::class)
   }
 
+  private fun selectEnabledBanner(): Banner<Any>? = banners.firstOrNull { it.enabled } as Banner<Any>?
+
+  /**
+   * Reactively selects which [Banner] should be shown. Re-evaluates whenever any banner signals via
+   * [Banner.stateUpdates] that its eligibility may have changed.
+   */
+  private val selectedBanner: Flow<Banner<Any>?> =
+    if (banners.isEmpty()) {
+      flowOf(null)
+    } else {
+      merge(*banners.map { it.stateUpdates }.toTypedArray())
+        .onStart { emit(Unit) }
+        .map { selectEnabledBanner() }
+        .distinctUntilChanged()
+    }
+
   /**
    * Re-evaluates the [Banner]s, choosing one to render (if any) and updating the view.
    */
@@ -39,19 +60,20 @@ class BannerManager @JvmOverloads constructor(
     composeView.apply {
       setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
       setContent {
-        val banner: Banner<Any>? = banners.firstOrNull { it.enabled } as Banner<Any>?
-        if (banner == null) {
+        val banner: Banner<Any>? by selectedBanner.collectAsStateWithLifecycle(initialValue = selectEnabledBanner())
+        val selected = banner
+        if (selected == null) {
           onNoBannerShownListener()
           return@setContent
         }
 
-        key(banner) {
-          val bannerState by banner.dataFlow.collectAsStateWithLifecycle(initialValue = null)
+        key(selected) {
+          val bannerState by selected.dataFlow.collectAsStateWithLifecycle(initialValue = null)
 
           bannerState?.let { model ->
             SignalTheme {
               Box {
-                banner.DisplayBanner(model, PaddingValues(horizontal = 12.dp, vertical = 8.dp))
+                selected.DisplayBanner(model, PaddingValues(horizontal = 12.dp, vertical = 8.dp))
               }
             }
             onNewBannerShownListener()
@@ -66,16 +88,14 @@ class BannerManager @JvmOverloads constructor(
    */
   @Composable
   fun Banner() {
-    val banner: Banner<Any>? = banners.firstOrNull { it.enabled } as Banner<Any>?
-    if (banner == null) {
-      return
-    }
+    val banner: Banner<Any>? by selectedBanner.collectAsStateWithLifecycle(initialValue = selectEnabledBanner())
+    val selected = banner ?: return
 
-    key(banner) {
-      val bannerState by banner.dataFlow.collectAsStateWithLifecycle(initialValue = null)
+    key(selected) {
+      val bannerState by selected.dataFlow.collectAsStateWithLifecycle(initialValue = null)
 
       bannerState?.let { model ->
-        banner.DisplayBanner(model, PaddingValues(horizontal = 12.dp, vertical = 8.dp))
+        selected.DisplayBanner(model, PaddingValues(horizontal = 12.dp, vertical = 8.dp))
       }
     }
   }

app/src/main/java/org/thoughtcrime/securesms/banner/banners/ArchiveRestoreStatusBanner.kt

@@ -9,7 +9,9 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.runtime.Composable
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onStart
 import org.thoughtcrime.securesms.backup.v2.ArchiveRestoreProgress
 import org.thoughtcrime.securesms.backup.v2.ArchiveRestoreProgressState
@@ -32,6 +34,12 @@ class ArchiveRestoreStatusBanner(private val listener: RestoreProgressBannerList
       }
   }
 
+  override val stateUpdates: Flow<Unit>
+    get() = ArchiveRestoreProgress.stateFlow
+      .map { enabled }
+      .distinctUntilChanged()
+      .map { }
+
   @Composable
   override fun DisplayBanner(model: ArchiveRestoreProgressState, contentPadding: PaddingValues) {
     ArchiveRestoreStatusBanner(
@@ -40,7 +48,6 @@ class ArchiveRestoreStatusBanner(private val listener: RestoreProgressBannerList
       onActionClick = listener::onActionClick,
       onDismissClick = {
         ArchiveRestoreProgress.clearFinishedStatus()
-        listener.onDismissComplete()
       }
     )
   }
@@ -48,6 +55,5 @@ class ArchiveRestoreStatusBanner(private val listener: RestoreProgressBannerList
   interface RestoreProgressBannerListener {
     fun onBannerClick()
     fun onActionClick(data: ArchiveRestoreProgressState)
-    fun onDismissComplete()
   }
 }

app/src/main/java/org/thoughtcrime/securesms/banner/banners/ArchiveUploadStatusBanner.kt

@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.runtime.Composable
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.map
 import org.signal.core.util.bytes
 import org.thoughtcrime.securesms.backup.ArchiveUploadProgress
@@ -78,6 +79,12 @@ class ArchiveUploadStatusBanner(private val listener: UploadProgressBannerListen
       }
   }
 
+  override val stateUpdates: Flow<Unit>
+    get() = ArchiveUploadProgress.progress
+      .map { enabled }
+      .distinctUntilChanged()
+      .map { }
+
   @Composable
   override fun DisplayBanner(model: ArchiveUploadStatusBannerViewState, contentPadding: PaddingValues) {
     ArchiveUploadStatusBannerView(
@@ -92,7 +99,7 @@ class ArchiveUploadStatusBanner(private val listener: UploadProgressBannerListen
           }
           ArchiveUploadStatusBannerViewEvents.HideClicked -> {
             SignalStore.backup.uploadBannerVisible = false
-            listener.onHidden()
+            ArchiveUploadProgress.triggerUpdate()
           }
         }
       }
@@ -105,6 +112,5 @@ class ArchiveUploadStatusBanner(private val listener: UploadProgressBannerListen
   interface UploadProgressBannerListener {
     fun onBannerClick()
     fun onCancelClicked()
-    fun onHidden()
   }
 }

app/src/main/java/org/thoughtcrime/securesms/banner/banners/UnauthorizedBanner.kt

@@ -12,7 +12,10 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.rx3.asFlow
 import org.signal.core.ui.compose.DayNightPreviews
 import org.signal.core.ui.compose.Previews
 import org.thoughtcrime.securesms.R
@@ -21,6 +24,8 @@ import org.thoughtcrime.securesms.banner.ui.compose.Action
 import org.thoughtcrime.securesms.banner.ui.compose.DefaultBanner
 import org.thoughtcrime.securesms.banner.ui.compose.Importance
 import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.net.DeviceTransferBlockingInterceptor
+import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.registration.ui.RegistrationActivity
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 
@@ -35,23 +40,47 @@ class UnauthorizedBanner(val context: Context) : Banner<Unit>() {
   override val dataFlow: Flow<Unit>
     get() = flowOf(Unit)
 
+  override val stateUpdates: Flow<Unit>
+    get() = Recipient.self()
+      .live()
+      .observable()
+      .asFlow()
+      .map { enabled }
+      .distinctUntilChanged()
+      .map { }
+
   @Composable
   override fun DisplayBanner(model: Unit, contentPadding: PaddingValues) {
-    Banner(contentPadding)
+    Banner(contentPadding, SignalStore.account.isLinkedDevice)
   }
 }
 
 @Composable
-private fun Banner(contentPadding: PaddingValues) {
+private fun Banner(contentPadding: PaddingValues, isLinkedDevice: Boolean) {
   val context = LocalContext.current
 
   DefaultBanner(
     title = null,
-    body = stringResource(id = R.string.UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device),
+    body = stringResource(
+      id = if (isLinkedDevice) {
+        R.string.UnauthorizedReminder_this_device_is_no_longer_linked_relink_to_continue_messaging
+      } else {
+        R.string.UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device
+      }
+    ),
     importance = Importance.ERROR,
     actions = listOf(
-      Action(R.string.UnauthorizedReminder_reregister_action) {
-        val registrationIntent = RegistrationActivity.newIntentForReRegistration(context)
+      Action(if (isLinkedDevice) R.string.UnauthorizedReminder_relink_action else R.string.UnauthorizedReminder_reregister_action) {
+        if (SignalStore.misc.isOldDeviceTransferLocked) {
+          SignalStore.misc.isOldDeviceTransferLocked = false
+          DeviceTransferBlockingInterceptor.getInstance().unblockNetwork()
+        }
+
+        val registrationIntent = if (isLinkedDevice) {
+          RegistrationActivity.newIntentForReLinkDevice(context)
+        } else {
+          RegistrationActivity.newIntentForReRegistration(context)
+        }
         context.startActivity(registrationIntent)
       }
     ),
@@ -63,6 +92,6 @@ private fun Banner(contentPadding: PaddingValues) {
 @Composable
 private fun BannerPreview() {
   Previews.Preview {
-    Banner(PaddingValues(0.dp))
+    Banner(PaddingValues(0.dp), isLinkedDevice = false)
   }
 }

app/src/main/java/org/thoughtcrime/securesms/billing/upgrade/UpgradeToPaidTierBottomSheet.kt

@@ -34,6 +34,7 @@ import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsType
 import org.thoughtcrime.securesms.components.settings.app.subscription.donate.InAppPaymentCheckoutDelegate
 import org.thoughtcrime.securesms.database.InAppPaymentTable
 import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.util.storage.AndroidCredentialRepository
 import org.thoughtcrime.securesms.util.viewModel
 
 /**
@@ -61,6 +62,7 @@ abstract class UpgradeToPaidTierBottomSheet : ComposeBottomSheetDialogFragment()
     MessageBackupsFlowViewModel(
       initialTierSelection = MessageBackupTier.PAID,
       googlePlayApiAvailability = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(requireContext()),
+      isCredentialManagerSupported = AndroidCredentialRepository.isCredentialManagerSupported(requireContext()),
       startScreen = MessageBackupsStage.TYPE_SELECTION
     )
   }

app/src/main/java/org/thoughtcrime/securesms/calls/CallsBackStack.kt

@@ -0,0 +1,64 @@
+/*
+ * Copyright 2026 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.calls
+
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.saveable.Saver
+import androidx.compose.runtime.snapshots.SnapshotStateList
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.viewmodel.compose.SavedStateHandleSaveableApi
+import androidx.lifecycle.viewmodel.compose.saveable
+import org.thoughtcrime.securesms.calls.log.CallLogRow
+import org.thoughtcrime.securesms.main.MainDetailBackStack
+import org.thoughtcrime.securesms.main.MainNavigationDetailLocation
+
+/**
+ * Controls the navigation stack used by the calls screen.
+ */
+@OptIn(SavedStateHandleSaveableApi::class)
+class CallsBackStack(savedStateHandle: SavedStateHandle) : MainDetailBackStack {
+
+  companion object {
+    private const val KEY = "calls_back_stack"
+
+    val saver: Saver<SnapshotStateList<MainNavigationDetailLocation>, ArrayList<MainNavigationDetailLocation>> = Saver(
+      save = { ArrayList(it) },
+      restore = { mutableStateListOf(*it.toTypedArray()) }
+    )
+  }
+
+  override val entries: SnapshotStateList<MainNavigationDetailLocation> = savedStateHandle.saveable(
+    key = KEY,
+    saver = saver
+  ) {
+    mutableStateListOf(MainNavigationDetailLocation.Empty)
+  }
+
+  val activeCallId: CallLogRow.Id?
+    get() = entries.asReversed().firstNotNullOfOrNull { location ->
+      when (location) {
+        is MainNavigationDetailLocation.Calls -> location.controllerKey
+        is MainNavigationDetailLocation.CallLinkDetails -> location.controllerKey
+        else -> null
+      }
+    }
+
+  /**
+   * Pushes an entry onto the stack.
+   */
+  override fun push(location: MainNavigationDetailLocation) {
+    when {
+      location is MainNavigationDetailLocation.Empty || location == entries.lastOrNull() -> Unit
+
+      location.isContentRoot -> {
+        entries.removeAll { it !is MainNavigationDetailLocation.Empty }
+        entries.add(location)
+      }
+
+      else -> entries.add(location)
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/calls/CallsNavigation.kt

@@ -0,0 +1,64 @@
+/*
+ * Copyright 2026 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.calls
+
+import androidx.activity.compose.LocalActivity
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.navigation3.runtime.EntryProviderScope
+import androidx.navigation3.runtime.NavKey
+import org.signal.core.ui.navigation.TransitionSpecs
+import org.thoughtcrime.securesms.MainNavigator
+import org.thoughtcrime.securesms.calls.links.EditCallLinkNameScreen
+import org.thoughtcrime.securesms.calls.links.details.CallLinkDetailsScreen
+import org.thoughtcrime.securesms.main.EmptyDetailScreen
+import org.thoughtcrime.securesms.main.MainNavigationDetailLocation
+
+fun EntryProviderScope<NavKey>.callsNavEntries(isSplitPane: Boolean) {
+  entry<MainNavigationDetailLocation.Empty> {
+    NoCallSelectedEntry()
+  }
+
+  entry<MainNavigationDetailLocation.CallLinkDetails>(
+    metadata = if (isSplitPane) TransitionSpecs.None.metadata else emptyMap()
+  ) { route ->
+    CallLinkDetailsEntry(route)
+  }
+
+  entry<MainNavigationDetailLocation.Calls.CallLinks.EditCallLinkName> { route ->
+    EditCallLinkNameEntry(route)
+  }
+}
+
+@Composable
+private fun NoCallSelectedEntry() {
+  EmptyDetailScreen()
+}
+
+@Composable
+private fun CallLinkDetailsEntry(route: MainNavigationDetailLocation.CallLinkDetails) {
+  informNavigatorWeAreReady()
+
+  CallLinkDetailsScreen(roomId = route.callLinkRoomId)
+}
+
+@Composable
+private fun EditCallLinkNameEntry(route: MainNavigationDetailLocation.Calls.CallLinks.EditCallLinkName) {
+  informNavigatorWeAreReady()
+
+  EditCallLinkNameScreen(
+    roomId = route.callLinkRoomId,
+    initialName = route.currentName
+  )
+}
+
+@Composable
+private fun informNavigatorWeAreReady() {
+  val navigator = LocalActivity.current as? MainNavigator.NavigatorProvider
+  LaunchedEffect(navigator) {
+    navigator?.onFirstRender()
+  }
+}

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

@@ -89,7 +89,8 @@ class EditCallLinkNameDialogFragment : ComposeDialogFragment() {
 
 @Composable
 fun EditCallLinkNameScreen(
-  roomId: CallLinkRoomId
+  roomId: CallLinkRoomId,
+  initialName: String
 ) {
   val viewModel: CallLinkDetailsViewModel = viewModel {
     CallLinkDetailsViewModel(roomId)
@@ -99,7 +100,7 @@ fun EditCallLinkNameScreen(
   val lifecycleScope = LocalLifecycleOwner.current.lifecycleScope
 
   EditCallLinkNameScreen(
-    initialNameValue = viewModel.nameSnapshot,
+    initialNameValue = initialName,
     onSaveClick = {
       lifecycleScope.launch {
         viewModel.setName(it)

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

@@ -1,71 +0,0 @@
-/*
- * Copyright 2025 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.calls.links.details
-
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
-import androidx.compose.runtime.remember
-import androidx.core.os.bundleOf
-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.service.webrtc.links.CallLinkRoomId
-import org.thoughtcrime.securesms.util.viewModel
-
-class CallLinkDetailsActivity : FragmentActivity() {
-
-  companion object {
-    private const val ARG_ROOM_ID = "room.id"
-
-    fun createIntent(context: Context, callLinkRoomId: CallLinkRoomId): Intent {
-      return Intent(context, CallLinkDetailsActivity::class.java)
-        .putExtra(ARG_ROOM_ID, callLinkRoomId)
-    }
-  }
-
-  private val roomId: CallLinkRoomId
-    get() = intent.getParcelableExtraCompat(ARG_ROOM_ID, CallLinkRoomId::class.java)!!
-
-  private val viewModel: CallLinkDetailsViewModel by viewModel {
-    CallLinkDetailsViewModel(roomId)
-  }
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    enableEdgeToEdge()
-
-    super.onCreate(savedInstanceState)
-
-    setContent {
-      SignalTheme {
-        CallLinkDetailsScreen(
-          roomId = roomId,
-          viewModel = viewModel,
-          router = remember { Router() }
-        )
-      }
-    }
-  }
-
-  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)
-        }
-      }
-    }
-
-    override fun exitDetailLocation() = finishAfterTransition()
-  }
-}

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

@@ -113,7 +113,12 @@ class DefaultCallLinkDetailsCallback(
   }
 
   override fun onEditNameClicked() {
-    router.goToCallDetail(MainNavigationDetailLocation.Calls.CallLinks.EditCallLinkName(callLinkRoomId = viewModel.recipientSnapshot!!.requireCallLinkRoomId()))
+    router.goToCallDetail(
+      MainNavigationDetailLocation.Calls.CallLinks.EditCallLinkName(
+        callLinkRoomId = viewModel.recipientSnapshot!!.requireCallLinkRoomId(),
+        currentName = viewModel.nameSnapshot
+      )
+    )
   }
 
   override fun onShareClicked() {
@@ -221,7 +226,7 @@ fun CallLinkDetailsScreen(
         )
       }
 
-      if (state.callLink.credentials?.adminPassBytes != null) {
+      if (state.callLink.canModify) {
         item {
           Rows.TextRow(
             text = stringResource(
@@ -273,13 +278,15 @@ fun CallLinkDetailsScreen(
         )
       }
 
-      item {
-        Rows.TextRow(
-          text = stringResource(id = R.string.CallLinkDetailsFragment__delete_call_link),
-          icon = SignalIcons.Trash.imageVector,
-          foregroundTint = MaterialTheme.colorScheme.error,
-          onClick = callback::onDeleteClicked
-        )
+      if (state.callLink.canModify) {
+        item {
+          Rows.TextRow(
+            text = stringResource(id = R.string.CallLinkDetailsFragment__delete_call_link),
+            icon = SignalIcons.Trash.imageVector,
+            foregroundTint = MaterialTheme.colorScheme.error,
+            onClick = callback::onDeleteClicked
+          )
+        }
       }
     }
 

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

@@ -6,7 +6,6 @@
 package org.thoughtcrime.securesms.calls.links.details
 
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
 import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import io.reactivex.rxjava3.kotlin.subscribeBy
@@ -194,10 +193,4 @@ class CallLinkDetailsViewModel(
   private fun toastCouldNotDeleteCallLink() {
     _state.update { it.copy(failureSnackbar = CallLinkDetailsState.FailureSnackbar.COULD_NOT_DELETE_CALL_LINK) }
   }
-
-  class Factory(private val callLinkRoomId: CallLinkRoomId) : ViewModelProvider.Factory {
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-      return modelClass.cast(CallLinkDetailsViewModel(callLinkRoomId)) as T
-    }
-  }
 }

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

@@ -9,13 +9,13 @@ import org.signal.core.util.concurrent.LifecycleDisposable
 import org.signal.core.util.dp
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.calls.YouAreAlreadyInACallSnackbar
-import org.thoughtcrime.securesms.calls.links.details.CallLinkDetailsActivity
 import org.thoughtcrime.securesms.components.menu.ActionItem
 import org.thoughtcrime.securesms.components.menu.SignalContextMenu
 import org.thoughtcrime.securesms.components.settings.conversation.ConversationSettingsActivity
 import org.thoughtcrime.securesms.conversation.ConversationIntents
 import org.thoughtcrime.securesms.database.CallTable
 import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.service.webrtc.links.CallLinkRoomId
 import org.thoughtcrime.securesms.util.CommunicationActions
 import org.signal.core.ui.R as CoreUiR
 
@@ -122,11 +122,10 @@ class CallLogContextMenu(
       iconRes = CoreUiR.drawable.symbol_info_24,
       title = fragment.getString(R.string.CallContextMenu__info)
     ) {
-      val intent = when {
-        peer.isCallLink -> CallLinkDetailsActivity.createIntent(fragment.requireContext(), peer.requireCallLinkRoomId())
-        else -> ConversationSettingsActivity.forCall(fragment.requireContext(), peer, messageIds)
+      when {
+        peer.isCallLink -> callbacks.goToCallLinkDetails(peer.requireCallLinkRoomId())
+        else -> fragment.startActivity(ConversationSettingsActivity.forCall(fragment.requireContext(), peer, messageIds))
       }
-      fragment.startActivity(intent)
     }
   }
 
@@ -154,6 +153,7 @@ class CallLogContextMenu(
 
   interface Callbacks {
     fun startSelection(call: CallLogRow)
+    fun goToCallLinkDetails(roomId: CallLinkRoomId)
     fun deleteCall(call: CallLogRow)
   }
 }

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

@@ -32,7 +32,6 @@ import org.signal.core.util.orNull
 import org.thoughtcrime.securesms.MainNavigator
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.calls.links.create.CreateCallLinkBottomSheetDialogFragment
-import org.thoughtcrime.securesms.calls.links.details.CallLinkDetailsActivity
 import org.thoughtcrime.securesms.components.ProgressCardDialogFragment
 import org.thoughtcrime.securesms.components.ScrollToPositionDelegate
 import org.thoughtcrime.securesms.components.ViewBinderDelegate
@@ -58,6 +57,7 @@ import org.thoughtcrime.securesms.main.MainToolbarMode
 import org.thoughtcrime.securesms.main.MainToolbarViewModel
 import org.thoughtcrime.securesms.main.Material3OnScrollHelperBinder
 import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.service.webrtc.links.CallLinkRoomId
 import org.thoughtcrime.securesms.util.CommunicationActions
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.doAfterNextLayout
@@ -242,9 +242,11 @@ class CallLogFragment : Fragment(R.layout.call_log_fragment), CallLogAdapter.Cal
         MainToolbarViewModel.Event.Search.Close -> {
           viewModel.setSearchQuery("")
         }
+
         MainToolbarViewModel.Event.Search.Open -> {
           mainToolbarViewModel.setSearchHint(R.string.SearchToolbar_search)
         }
+
         is MainToolbarViewModel.Event.Search.Query -> {
           viewModel.setSearchQuery(it.query.trim())
         }
@@ -325,7 +327,7 @@ class CallLogFragment : Fragment(R.layout.call_log_fragment), CallLogAdapter.Cal
       )
       startActivity(intent)
     } else {
-      startActivity(CallLinkDetailsActivity.createIntent(requireContext(), callLogRow.peer.requireCallLinkRoomId()))
+      goToCallLinkDetails(callLogRow.peer.requireCallLinkRoomId())
     }
   }
 
@@ -375,6 +377,7 @@ class CallLogFragment : Fragment(R.layout.call_log_fragment), CallLogAdapter.Cal
           )
         }
       }
+
       CallLogRow.CanStartCall.GROUP_TERMINATED -> ConversationDialogs.displayCannotStartGroupCallDueToGroupEndedDialog(requireContext())
       CallLogRow.CanStartCall.NOT_A_MEMBER -> ConversationDialogs.displayCannotStartGroupCallDueToNoLongerAMemberDialog(requireContext())
       CallLogRow.CanStartCall.ADMIN_ONLY -> ConversationDialogs.displayCannotStartGroupCallDueToPermissionsDialog(requireContext())
@@ -386,6 +389,10 @@ class CallLogFragment : Fragment(R.layout.call_log_fragment), CallLogAdapter.Cal
     viewModel.toggleSelected(call.id)
   }
 
+  override fun goToCallLinkDetails(roomId: CallLinkRoomId) {
+    mainNavigationViewModel.goTo(MainNavigationDetailLocation.CallLinkDetails(roomId))
+  }
+
   override fun deleteCall(call: CallLogRow) {
     MaterialAlertDialogBuilder(requireContext())
       .setTitle(resources.getQuantityString(R.plurals.CallLogFragment__delete_d_calls, 1, 1))

app/src/main/java/org/thoughtcrime/securesms/calls/new/NewCallViewModel.kt

@@ -53,7 +53,7 @@ class NewCallViewModel : ViewModel() {
   }
 
   private suspend fun resolveAndStartCall(id: RecipientId) {
-    val recipient = withContext(Dispatchers.IO) {
+    val recipient = withContext(Dispatchers.Default) {
       Recipient.resolved(id)
     }
     openCall(recipient)

app/src/main/java/org/thoughtcrime/securesms/chats/ChatsBackStack.kt

@@ -0,0 +1,64 @@
+/*
+ * Copyright 2026 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.chats
+
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.saveable.Saver
+import androidx.compose.runtime.snapshots.SnapshotStateList
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.viewmodel.compose.SavedStateHandleSaveableApi
+import androidx.lifecycle.viewmodel.compose.saveable
+import org.thoughtcrime.securesms.main.MainDetailBackStack
+import org.thoughtcrime.securesms.main.MainNavigationDetailLocation
+import org.thoughtcrime.securesms.recipients.RecipientId
+
+/**
+ * Controls the navigation stack used by the chats screen.
+ */
+@OptIn(SavedStateHandleSaveableApi::class)
+class ChatsBackStack(savedStateHandle: SavedStateHandle) : MainDetailBackStack {
+
+  companion object {
+    private const val KEY = "chats_back_stack"
+
+    val saver: Saver<SnapshotStateList<MainNavigationDetailLocation>, ArrayList<MainNavigationDetailLocation>> = Saver(
+      save = { ArrayList(it) },
+      restore = { mutableStateListOf(*it.toTypedArray()) }
+    )
+  }
+
+  override val entries: SnapshotStateList<MainNavigationDetailLocation> = savedStateHandle.saveable(
+    key = KEY,
+    saver = saver
+  ) {
+    mutableStateListOf(MainNavigationDetailLocation.Empty)
+  }
+
+  val activeRecipientId: RecipientId?
+    get() = entries.asReversed().firstNotNullOfOrNull {
+      when (it) {
+        is MainNavigationDetailLocation.Conversation -> it.conversationArgs.recipientId
+        is MainNavigationDetailLocation.Chats -> it.controllerKey
+        else -> null
+      }
+    }
+
+  /**
+   * Pushes an entry onto the stack.
+   */
+  override fun push(location: MainNavigationDetailLocation) {
+    when (location) {
+      is MainNavigationDetailLocation.Empty, entries.lastOrNull() -> Unit
+
+      is MainNavigationDetailLocation.Conversation -> {
+        entries.removeAll { it !is MainNavigationDetailLocation.Empty }
+        entries.add(location)
+      }
+
+      else -> entries.add(location)
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/chats/ChatsNavigation.kt

@@ -0,0 +1,161 @@
+/*
+ * Copyright 2026 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.chats
+
+import android.os.Bundle
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.layout.statusBarsPadding
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.key
+import androidx.compose.runtime.produceState
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.fragment.compose.AndroidFragment
+import androidx.fragment.compose.rememberFragmentState
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.navigation3.runtime.EntryProviderScope
+import androidx.navigation3.runtime.NavKey
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import org.signal.core.ui.navigation.TransitionSpecs
+import org.thoughtcrime.securesms.MainNavigator
+import org.thoughtcrime.securesms.components.settings.conversation.ConversationSettingsNavHostFragment
+import org.thoughtcrime.securesms.compose.FragmentBackHandler
+import org.thoughtcrime.securesms.compose.FragmentBackPressedState
+import org.thoughtcrime.securesms.conversation.ConversationIntents
+import org.thoughtcrime.securesms.conversation.v2.ConversationFragment
+import org.thoughtcrime.securesms.main.EmptyDetailScreen
+import org.thoughtcrime.securesms.main.MainNavigationDetailLocation
+import org.thoughtcrime.securesms.messagedetails.MessageDetailsFragment
+
+fun EntryProviderScope<NavKey>.chatsNavEntries(
+  transitionState: ConversationTransitionState
+) {
+  entry<MainNavigationDetailLocation.Empty> {
+    NoConvoSelectedEntry()
+  }
+
+  entry<MainNavigationDetailLocation.Conversation>(
+    // disable slide animation - it's unnecessary in split pane mode and is handled by ConversationLoadingMask for single pane mode.
+    metadata = TransitionSpecs.None.metadata
+  ) { route ->
+    ConversationEntry(route, transitionState)
+  }
+
+  entry<MainNavigationDetailLocation.Chats.MessageDetails> { route ->
+    MessageDetailsEntry(route)
+  }
+
+  entry<MainNavigationDetailLocation.Chats.ConversationSettings> { route ->
+    ConversationSettingsEntry(route)
+  }
+}
+
+@Composable
+private fun NoConvoSelectedEntry() {
+  EmptyDetailScreen()
+}
+
+@Composable
+private fun ConversationEntry(
+  route: MainNavigationDetailLocation.Conversation,
+  transitionState: ConversationTransitionState
+) {
+  val context = LocalContext.current
+  val navigatorProvider = context as? MainNavigator.NavigatorProvider
+  val fragmentState = key(route) { rememberFragmentState() }
+  val arguments = requireNotNull(ConversationIntents.createBuilderSync(context, route.conversationArgs).build().extras) {
+    "Handed null Conversation intent arguments."
+  }
+
+  val fragmentContentReady = remember { MutableStateFlow(false) }
+  val backPressedState = remember { FragmentBackPressedState() }
+  FragmentBackHandler(backPressedState)
+
+  ConversationLoadingMask(
+    transitionState = transitionState,
+    contentReady = fragmentContentReady,
+    onFirstRender = { navigatorProvider?.onFirstRender() }
+  ) { modifier ->
+    AndroidFragment(
+      clazz = ConversationFragment::class.java,
+      fragmentState = fragmentState,
+      arguments = arguments,
+      modifier = modifier
+        .background(MaterialTheme.colorScheme.background)
+        .fillMaxSize()
+    ) { fragment ->
+      backPressedState.attach(fragment)
+
+      fragment.viewLifecycleOwner.lifecycleScope.launch {
+        fragment.repeatOnLifecycle(Lifecycle.State.STARTED) {
+          fragment.didFirstFrameRender.collectLatest { fragmentContentReady.value = it }
+        }
+      }
+    }
+  }
+}
+
+@Composable
+private fun MessageDetailsEntry(route: MainNavigationDetailLocation.Chats.MessageDetails) {
+  val navigatorProvider = LocalContext.current as? MainNavigator.NavigatorProvider
+  val fragmentState = key(route) { rememberFragmentState() }
+
+  LaunchedEffect(Unit) {
+    navigatorProvider?.onFirstRender()
+  }
+
+  AndroidFragment(
+    clazz = MessageDetailsFragment::class.java,
+    fragmentState = fragmentState,
+    arguments = MessageDetailsFragment.args(route.recipientId, route.messageId),
+    modifier = Modifier
+      .fillMaxSize()
+      .background(MaterialTheme.colorScheme.background)
+      .statusBarsPadding()
+      .navigationBarsPadding()
+  )
+}
+
+@Composable
+private fun ConversationSettingsEntry(route: MainNavigationDetailLocation.Chats.ConversationSettings) {
+  val navigatorProvider = LocalContext.current as? MainNavigator.NavigatorProvider
+  val fragmentState = key(route) { rememberFragmentState() }
+  val arguments: Bundle? by produceState(null, route.recipientId) {
+    value = ConversationSettingsNavHostFragment.createArgs(route.recipientId)
+  }
+
+  LaunchedEffect(Unit) {
+    navigatorProvider?.onFirstRender()
+  }
+
+  arguments?.let { args ->
+    val backPressedState = remember { FragmentBackPressedState() }
+    FragmentBackHandler(backPressedState)
+
+    AndroidFragment(
+      clazz = ConversationSettingsNavHostFragment::class.java,
+      fragmentState = fragmentState,
+      arguments = args,
+      modifier = Modifier
+        .fillMaxSize()
+        .background(MaterialTheme.colorScheme.background)
+        .statusBarsPadding()
+        .navigationBarsPadding()
+    ) { fragment ->
+      backPressedState.attach(fragment)
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/chats/ConversationLoadingMask.kt

@@ -0,0 +1,128 @@
+/*
+ * Copyright 2026 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.chats
+
+import androidx.compose.animation.core.Transition
+import androidx.compose.animation.core.animateDp
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.updateTransition
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.unit.dp
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.withTimeoutOrNull
+import org.thoughtcrime.securesms.window.AppScaffoldAnimationDefaults
+import org.thoughtcrime.securesms.window.AppScaffoldAnimationState
+import kotlin.time.Duration.Companion.seconds
+
+/**
+ * Wraps [content] with an animation that crossfades a snapshotted chat list bitmap over the conversation fragment while it loads its first frame.
+ *
+ * @param contentReady emits when the fragment's first frame has been rendered.
+ * @param onFirstRender signals that this composable has content ready to display, so the parent activity can proceed with its first draw.
+ * @param content will be animated in as the overlay fades out.
+ */
+@Composable
+fun ConversationLoadingMask(
+  transitionState: ConversationTransitionState,
+  contentReady: StateFlow<Boolean>,
+  onFirstRender: () -> Unit,
+  content: @Composable (chatModifier: Modifier) -> Unit
+) {
+  // it can take a long time to load content, so we use a "fake" chat list image to delay displaying the fragment
+  // and prevent pop-in. When there's no bitmap (e.g. returning from a sub-route), skip the animation.
+  var shouldDisplayFragment by remember {
+    val hasBitmap = transitionState.chatBitmap != null
+    mutableStateOf(!hasBitmap)
+  }
+  val transition: Transition<Boolean> = updateTransition(shouldDisplayFragment)
+  val bitmap = transitionState.chatBitmap
+
+  val fakeChatListAnimationState = transition.fakeChatListAnimationState()
+  val chatAnimationState = transition.chatAnimationState(hasFake = bitmap != null)
+
+  LaunchedEffect(transition.currentState, transition.isRunning) {
+    if (transition.currentState && !transition.isRunning) {
+      transitionState.clearBitmap()
+    }
+  }
+
+  LaunchedEffect(shouldDisplayFragment) {
+    onFirstRender()
+  }
+
+  LaunchedEffect(contentReady) {
+    if (!shouldDisplayFragment) {
+      withTimeoutOrNull(5.seconds) {
+        contentReady.first { it }
+      }
+      shouldDisplayFragment = true
+    }
+  }
+
+  val chatModifier = Modifier.graphicsLayer {
+    with(chatAnimationState) { applyChildValues() }
+  }
+
+  Box(modifier = Modifier.fillMaxSize()) {
+    content(chatModifier)
+
+    if (bitmap != null) {
+      Image(
+        bitmap = bitmap,
+        contentDescription = null,
+        modifier = Modifier
+          .graphicsLayer {
+            with(fakeChatListAnimationState) { applyChildValues() }
+          }
+          .fillMaxSize()
+      )
+    }
+  }
+}
+
+@Composable
+private fun Transition<Boolean>.fakeChatListAnimationState(): AppScaffoldAnimationState {
+  val alpha = animateFloat(transitionSpec = { AppScaffoldAnimationDefaults.tween() }) { if (it) 0f else 1f }
+  val offset = animateDp(transitionSpec = { AppScaffoldAnimationDefaults.tween() }) { if (it) (-48).dp else 0.dp }
+  return remember {
+    AppScaffoldAnimationState(
+      offset = offset,
+      alpha = alpha
+    )
+  }
+}
+
+@Composable
+private fun Transition<Boolean>.chatAnimationState(hasFake: Boolean): AppScaffoldAnimationState {
+  val alpha = animateFloat(transitionSpec = { AppScaffoldAnimationDefaults.tween() }) { if (it) 1f else 0f }
+  return if (!hasFake) {
+    remember {
+      AppScaffoldAnimationState(
+        offset = mutableStateOf(0.dp),
+        alpha = alpha
+      )
+    }
+  } else {
+    val offset = animateDp(transitionSpec = { AppScaffoldAnimationDefaults.tween() }) { if (it) 0.dp else 48.dp }
+    remember {
+      AppScaffoldAnimationState(
+        offset = offset,
+        alpha = alpha
+      )
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/chats/ConversationTransitionState.kt

@@ -0,0 +1,70 @@
+/*
+ * Copyright 2026 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.chats
+
+import android.os.Build
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.Stable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawWithContent
+import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.layer.GraphicsLayer
+import androidx.compose.ui.graphics.layer.drawLayer
+import androidx.compose.ui.graphics.rememberGraphicsLayer
+
+/**
+ * Allows the setting of a "fake" bitmap driven by a graphics layer to coordinate delayed animations
+ * in lieu of proper support for postponing enter transitions.
+ */
+@Stable
+class ConversationTransitionState private constructor(
+  val isSplitPane: Boolean,
+  val graphicsLayer: GraphicsLayer
+) {
+  companion object {
+    @Composable
+    fun remember(isSplitPane: Boolean): ConversationTransitionState {
+      val graphicsLayer = rememberGraphicsLayer()
+
+      return remember(isSplitPane) {
+        ConversationTransitionState(isSplitPane, graphicsLayer)
+      }
+    }
+  }
+
+  var chatBitmap: ImageBitmap? by mutableStateOf(null)
+    private set
+
+  private var hasWrittenToGraphicsLayer: Boolean by mutableStateOf(false)
+
+  suspend fun writeGraphicsLayerToBitmap() {
+    // toImageBitmap() uses LayerSnapshot which has format compatibility issues on Android 7 and below
+    if (Build.VERSION.SDK_INT >= 26 && !isSplitPane && hasWrittenToGraphicsLayer) {
+      chatBitmap = graphicsLayer.toImageBitmap()
+    }
+  }
+
+  fun writeContentToGraphicsLayer(): Modifier {
+    if (isSplitPane) return Modifier
+
+    return Modifier.drawWithContent {
+      graphicsLayer.record {
+        this@drawWithContent.drawContent()
+        hasWrittenToGraphicsLayer = true
+      }
+
+      drawLayer(graphicsLayer)
+    }
+  }
+
+  fun clearBitmap() {
+    chatBitmap = null
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/color/ViewColorSet.kt

@@ -20,8 +20,8 @@ data class ViewColorSet(
 ) : Parcelable {
   companion object {
     val PRIMARY = ViewColorSet(
-      foreground = ViewColor.ColorResource(CoreUiR.color.signal_colorOnPrimary),
-      background = ViewColor.ColorResource(CoreUiR.color.signal_colorPrimary)
+      foreground = ViewColor.ColorResource(CoreUiR.color.signal_light_colorOnPrimary),
+      background = ViewColor.ColorResource(CoreUiR.color.signal_light_colorPrimary)
     )
 
     fun forCustomColor(@ColorInt customColor: Int): ViewColorSet {

app/src/main/java/org/thoughtcrime/securesms/components/AudioView.java

@@ -39,6 +39,7 @@ import org.thoughtcrime.securesms.audio.AudioWaveForms;
 import org.thoughtcrime.securesms.components.voice.VoiceNotePlaybackState;
 import org.thoughtcrime.securesms.database.AttachmentTable;
 import org.thoughtcrime.securesms.events.PartProgressEvent;
+import org.thoughtcrime.securesms.jobs.AttachmentBackfill;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.mms.AudioSlide;
 import org.thoughtcrime.securesms.mms.SlideClickListener;
@@ -82,9 +83,11 @@ public final class AudioView extends FrameLayout {
             private boolean            isPlaying;
             private long               durationMillis;
             private AudioSlide         audioSlide;
+            private boolean            showControls;
             private Callbacks          callbacks;
 
-            private Disposable disposable = Disposable.disposed();
+  private Disposable disposable         = Disposable.disposed();
+  private Disposable awaitingDisposable = Disposable.disposed();
 
   private final Observer<VoiceNotePlaybackState> playbackStateObserver = this::onPlaybackState;
 
@@ -159,6 +162,12 @@ public final class AudioView extends FrameLayout {
   protected void onAttachedToWindow() {
     super.onAttachedToWindow();
     if (!EventBus.getDefault().isRegistered(this)) EventBus.getDefault().register(this);
+
+    awaitingDisposable = AttachmentBackfill.awaitingChanges()
+                                           .observeOn(AndroidSchedulers.mainThread())
+                                           .subscribe(ignored -> {
+                                             if (audioSlide != null) presentTransferControls(audioSlide, showControls);
+                                           }, t -> Log.w(TAG, "Error observing backfill awaiting state.", t));
   }
 
   @Override
@@ -166,6 +175,7 @@ public final class AudioView extends FrameLayout {
     super.onDetachedFromWindow();
     EventBus.getDefault().unregister(this);
     disposable.dispose();
+    awaitingDisposable.dispose();
   }
 
   public void setProgressAndPlayBackgroundTint(@ColorInt int color) {
@@ -197,27 +207,8 @@ public final class AudioView extends FrameLayout {
       }
     }
 
-    if (showControls && audio.isPendingDownload()) {
-      controlToggle.displayQuick(downloadContainer);
-      seekBar.setEnabled(false);
-      downloadButton.setOnClickListener(new DownloadClickedListener(audio));
-      if (circleProgress != null) {
-        if (circleProgress.isSpinning()) circleProgress.stopSpinning();
-        circleProgress.setVisibility(View.GONE);
-      }
-    } else if (showControls && audio.getTransferState() == AttachmentTable.TRANSFER_PROGRESS_STARTED) {
-      controlToggle.displayQuick(progressAndPlay);
-      seekBar.setEnabled(false);
-      showPlayButton();
-      if (circleProgress != null) {
-        circleProgress.setVisibility(View.VISIBLE);
-        circleProgress.spin();
-      }
-    } else {
-      seekBar.setEnabled(true);
-      if (circleProgress != null && circleProgress.isSpinning()) circleProgress.stopSpinning();
-      showPlayButton();
-    }
+    this.showControls = showControls;
+    presentTransferControls(audio, showControls);
 
     if (seekBar instanceof WaveFormSeekBarView) {
       WaveFormSeekBarView waveFormView = (WaveFormSeekBarView) seekBar;
@@ -263,6 +254,38 @@ public final class AudioView extends FrameLayout {
     }
   }
 
+  private void presentTransferControls(@NonNull AudioSlide audio, boolean showControls) {
+    DatabaseAttachment dbAttachment = audio.asAttachment() instanceof DatabaseAttachment ? (DatabaseAttachment) audio.asAttachment() : null;
+
+    if (dbAttachment != null && dbAttachment.transferState == AttachmentTable.TRANSFER_PROGRESS_DONE && AttachmentBackfill.isAwaitingBackfill(dbAttachment.attachmentId)) {
+      AttachmentBackfill.onAttachmentTerminal(dbAttachment.attachmentId, dbAttachment.mmsId);
+    }
+
+    boolean awaitingBackfill = dbAttachment != null && AttachmentBackfill.isAwaitingBackfill(dbAttachment.attachmentId);
+
+    if (showControls && audio.isPendingDownload() && !awaitingBackfill) {
+      controlToggle.displayQuick(downloadContainer);
+      seekBar.setEnabled(false);
+      downloadButton.setOnClickListener(new DownloadClickedListener(audio));
+      if (circleProgress != null) {
+        if (circleProgress.isSpinning()) circleProgress.stopSpinning();
+        circleProgress.setVisibility(View.GONE);
+      }
+    } else if (showControls && (audio.getTransferState() == AttachmentTable.TRANSFER_PROGRESS_STARTED || awaitingBackfill)) {
+      controlToggle.displayQuick(progressAndPlay);
+      seekBar.setEnabled(false);
+      showPlayButton();
+      if (circleProgress != null) {
+        circleProgress.setVisibility(View.VISIBLE);
+        if (!circleProgress.isSpinning()) circleProgress.spin();
+      }
+    } else {
+      seekBar.setEnabled(true);
+      if (circleProgress != null && circleProgress.isSpinning()) circleProgress.stopSpinning();
+      showPlayButton();
+    }
+  }
+
   public void setDownloadClickListener(@Nullable SlideClickListener listener) {
     this.downloadListener = listener;
   }

app/src/main/java/org/thoughtcrime/securesms/components/DocumentView.java

@@ -28,6 +28,7 @@ import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
 import org.thoughtcrime.securesms.database.AttachmentTable;
 import org.thoughtcrime.securesms.events.PartProgressEvent;
+import org.thoughtcrime.securesms.jobs.AttachmentBackfill;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.mms.SlideClickListener;
@@ -36,6 +37,9 @@ import org.whispersystems.signalservice.api.util.OptionalUtil;
 
 import java.util.Collections;
 
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.disposables.Disposable;
+
 public class DocumentView extends FrameLayout {
 
   private static final String TAG = Log.tag(DocumentView.class);
@@ -55,6 +59,9 @@ public class DocumentView extends FrameLayout {
   private @Nullable SlidesClickedListener cancelTransferClickListener;
   private @Nullable SlidesClickedListener resendTransferClickListener;
   private @Nullable Slide                 documentSlide;
+  private           boolean               showControls;
+
+  private Disposable awaitingDisposable = Disposable.disposed();
 
   public DocumentView(@NonNull Context context) {
     this(context, null);
@@ -98,12 +105,19 @@ public class DocumentView extends FrameLayout {
     if (!EventBus.getDefault().isRegistered(this)) {
       EventBus.getDefault().register(this);
     }
+
+    awaitingDisposable = AttachmentBackfill.awaitingChanges()
+                                           .observeOn(AndroidSchedulers.mainThread())
+                                           .subscribe(ignored -> {
+                                             if (documentSlide != null) presentTransferControls(documentSlide, showControls);
+                                           }, t -> Log.w(TAG, "Error observing backfill awaiting state.", t));
   }
 
   @Override
   protected void onDetachedFromWindow() {
     super.onDetachedFromWindow();
     EventBus.getDefault().unregister(this);
+    awaitingDisposable.dispose();
   }
 
   public void setDownloadClickListener(@Nullable SlideClickListener listener) {
@@ -126,22 +140,8 @@ public class DocumentView extends FrameLayout {
                           final boolean showControls,
                           final boolean showSingleLineFilename)
   {
-    if (showControls && documentSlide.getTransferState() == AttachmentTable.TRANSFER_PROGRESS_STARTED) {
-      controlToggle.displayQuick(stopUploadButton);
-      downloadProgress.spin();
-      stopUploadButton.setOnClickListener(new CancelTransferListener(documentSlide));
-    } else if (showControls && documentSlide.getUri() != null && documentSlide.isPendingDownload()) {
-      controlToggle.displayQuick(uploadButton);
-      uploadButton.setOnClickListener(new ResendTransferClickListener(documentSlide));
-      if (downloadProgress.isSpinning()) downloadProgress.stopSpinning();
-    } else if (showControls && documentSlide.getUri() == null && documentSlide.isPendingDownload()) {
-      controlToggle.displayQuick(downloadButton);
-      downloadButton.setOnClickListener(new DownloadClickedListener(documentSlide));
-      if (downloadProgress.isSpinning()) downloadProgress.stopSpinning();
-    } else {
-      controlToggle.displayQuick(iconContainer);
-      if (downloadProgress.isSpinning()) downloadProgress.stopSpinning();
-    }
+    this.showControls = showControls;
+    presentTransferControls(documentSlide, showControls);
 
     this.documentSlide = documentSlide;
 
@@ -172,6 +172,33 @@ public class DocumentView extends FrameLayout {
     }
   }
 
+  private void presentTransferControls(@NonNull Slide documentSlide, boolean showControls) {
+    DatabaseAttachment dbAttachment = documentSlide.asAttachment() instanceof DatabaseAttachment ? (DatabaseAttachment) documentSlide.asAttachment() : null;
+
+    if (dbAttachment != null && dbAttachment.transferState == AttachmentTable.TRANSFER_PROGRESS_DONE && AttachmentBackfill.isAwaitingBackfill(dbAttachment.attachmentId)) {
+      AttachmentBackfill.onAttachmentTerminal(dbAttachment.attachmentId, dbAttachment.mmsId);
+    }
+
+    boolean awaitingBackfill = dbAttachment != null && AttachmentBackfill.isAwaitingBackfill(dbAttachment.attachmentId);
+
+    if (showControls && (documentSlide.getTransferState() == AttachmentTable.TRANSFER_PROGRESS_STARTED || awaitingBackfill)) {
+      controlToggle.displayQuick(stopUploadButton);
+      if (!downloadProgress.isSpinning()) downloadProgress.spin();
+      stopUploadButton.setOnClickListener(awaitingBackfill ? null : new CancelTransferListener(documentSlide));
+    } else if (showControls && documentSlide.getUri() != null && documentSlide.isPendingDownload()) {
+      controlToggle.displayQuick(uploadButton);
+      uploadButton.setOnClickListener(new ResendTransferClickListener(documentSlide));
+      if (downloadProgress.isSpinning()) downloadProgress.stopSpinning();
+    } else if (showControls && documentSlide.getUri() == null && documentSlide.isPendingDownload()) {
+      controlToggle.displayQuick(downloadButton);
+      downloadButton.setOnClickListener(new DownloadClickedListener(documentSlide));
+      if (downloadProgress.isSpinning()) downloadProgress.stopSpinning();
+    } else {
+      controlToggle.displayQuick(iconContainer);
+      if (downloadProgress.isSpinning()) downloadProgress.stopSpinning();
+    }
+  }
+
   @Override
   public void setFocusable(boolean focusable) {
     super.setFocusable(focusable);

app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java

@@ -27,7 +27,7 @@ import org.thoughtcrime.securesms.components.subsampling.AttachmentRegionDecoder
 import org.signal.glide.decryptableuri.DecryptableUri;
 import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.util.ActionRequestListener;
-import org.thoughtcrime.securesms.util.BitmapUtil;
+import org.signal.core.util.bitmaps.BitmapUtil;
 import org.thoughtcrime.securesms.util.MediaUtil;
 
 import java.io.IOException;

app/src/main/java/org/thoughtcrime/securesms/components/settings/DSLSettingsAdapter.kt

@@ -274,8 +274,17 @@ class DividerPreferenceViewHolder(itemView: View) : MappingViewHolder<DividerPre
 class SectionHeaderPreferenceViewHolder(itemView: View) : MappingViewHolder<SectionHeaderPreference>(itemView) {
 
   private val sectionHeader: TextView = itemView.findViewById(R.id.section_header)
+  private val iconEndView: ImageView = itemView.findViewById(R.id.icon_end)
 
   override fun bind(model: SectionHeaderPreference) {
     sectionHeader.text = model.title.resolve(context)
+
+    val iconEnd = model.iconEnd?.resolve(context)
+    iconEndView.setImageDrawable(iconEnd)
+    iconEndView.visible = iconEnd != null
+
+    if (model.onClick != null) {
+      iconEndView.setOnClickListener { model.onClick() }
+    }
   }
 }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt

@@ -180,7 +180,7 @@ class AppSettingsFragment : ComposeFragment(), Callbacks {
     @StringRes toastSuccessStringRes: Int
   ) {
     lifecycleScope.launch {
-      val subscriber = withContext(Dispatchers.IO) {
+      val subscriber = withContext(Dispatchers.Default) {
         InAppPaymentsRepository.getSubscriber(subscriberType)
       }
 

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/account/export/ExportAccountDataRepository.kt

@@ -7,8 +7,8 @@ import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.schedulers.Schedulers
 import org.signal.core.util.JsonUtils
 import org.signal.network.NetworkResult
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.net.SignalNetwork
-import org.thoughtcrime.securesms.providers.BlobProvider
 
 class ExportAccountDataRepository {
 
@@ -44,7 +44,7 @@ class ExportAccountDataRepository {
       tree["text"].asText()
     }
 
-    val uri = BlobProvider.getInstance()
+    val uri = AppDependencies.blobs
       .forData(dataStr.encodeToByteArray())
       .withMimeType(mimeType)
       .withFileName(fileName)

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/BackupStateObserver.kt

@@ -58,7 +58,7 @@ class BackupStateObserver(
   companion object {
     private val TAG = Log.tag(BackupStateObserver::class)
 
-    private val staticScope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+    private val staticScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
     private val backupTierChangedNotifier = MutableSharedFlow<Unit>()
 
     /**
@@ -107,13 +107,13 @@ class BackupStateObserver(
         }
     }
 
-    scope.launch(SignalDispatchers.IO) {
+    scope.launch(SignalDispatchers.Default) {
       backupTierChangedNotifier.collect {
         requestBackupStateRefresh()
       }
     }
 
-    scope.launch(SignalDispatchers.IO) {
+    scope.launch(SignalDispatchers.Default) {
       InternetConnectionObserver.observe().asFlow()
         .collect {
           if (backupState.value is BackupState.Error) {
@@ -122,19 +122,19 @@ class BackupStateObserver(
         }
     }
 
-    scope.launch(SignalDispatchers.IO) {
+    scope.launch(SignalDispatchers.Default) {
       InAppPaymentsRepository.observeLatestBackupPayment().collect {
         requestBackupStateRefresh()
       }
     }
 
-    scope.launch(SignalDispatchers.IO) {
+    scope.launch(SignalDispatchers.Default) {
       SignalStore.backup.subscriptionStateMismatchDetectedFlow.collect {
         requestBackupStateRefresh()
       }
     }
 
-    scope.launch(SignalDispatchers.IO) {
+    scope.launch(SignalDispatchers.Default) {
       SignalStore.backup.deletionStateFlow.collect {
         requestBackupStateRefresh()
       }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/BackupsSettingsViewModel.kt

@@ -51,7 +51,7 @@ class BackupsSettingsViewModel : ViewModel() {
       }
     }
 
-    viewModelScope.launch(Dispatchers.IO) {
+    viewModelScope.launch(Dispatchers.Default) {
       SignalStore.backup.lastBackupTimeFlow
         .collect { lastBackupTime ->
           internalStateFlow.update {

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/local/LocalBackupsSettingsCallback.kt

@@ -33,6 +33,7 @@ sealed interface LocalBackupsSettingsCallback {
   fun onLearnMoreClick()
   fun onLaunchBackupLocationPickerClick()
   fun onTurnOffAndDeleteConfirmed()
+  fun onViewOptimizeStorageSettingClick()
 
   object Empty : LocalBackupsSettingsCallback {
     override fun onNavigationClick() = Unit
@@ -43,6 +44,7 @@ sealed interface LocalBackupsSettingsCallback {
     override fun onLearnMoreClick() = Unit
     override fun onLaunchBackupLocationPickerClick() = Unit
     override fun onTurnOffAndDeleteConfirmed() = Unit
+    override fun onViewOptimizeStorageSettingClick() = Unit
   }
 }
 
@@ -144,4 +146,8 @@ class DefaultLocalBackupsSettingsCallback(
   override fun onTurnOffAndDeleteConfirmed() {
     viewModel.turnOffAndDelete(fragment.requireContext())
   }
+
+  override fun onViewOptimizeStorageSettingClick() {
+    fragment.findNavController().safeNavigate(R.id.action_direct_to_storagePreferenceFragment)
+  }
 }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/local/LocalBackupsSettingsScreen.kt

@@ -53,6 +53,7 @@ internal fun LocalBackupsSettingsScreen(
   val context = LocalContext.current
   var showChooseLocationDialog by rememberSaveable { mutableStateOf(false) }
   var showTurnOffAndDeleteDialog by rememberSaveable { mutableStateOf(false) }
+  var showOptimizeStorageWarningDialog by rememberSaveable { mutableStateOf(false) }
 
   val learnMore = stringResource(id = R.string.BackupsPreferenceFragment__learn_more)
   val restoreText = stringResource(id = R.string.OnDeviceBackupsScreen__to_restore_a_backup, learnMore).trim()
@@ -80,6 +81,14 @@ internal fun LocalBackupsSettingsScreen(
     educationSheetMessage = stringResource(R.string.RemoteBackupsSettingsFragment__to_view_your_key)
   )
 
+  val proceedWithTurnOn = {
+    if (BackupUtil.isUserSelectionRequired(context)) {
+      showChooseLocationDialog = true
+    } else {
+      callback.onTurnOnClick()
+    }
+  }
+
   Scaffolds.Settings(
     title = stringResource(id = R.string.RemoteBackupsSettingsFragment__on_device_backups),
     navigationIcon = ImageVector.vectorResource(CoreUiR.drawable.symbol_arrow_start_24),
@@ -104,11 +113,10 @@ internal fun LocalBackupsSettingsScreen(
 
                 Buttons.MediumTonal(
                   onClick = {
-                    // For the SAF-based flow, present an in-screen dialog before launching the picker.
-                    if (BackupUtil.isUserSelectionRequired(context)) {
-                      showChooseLocationDialog = true
+                    if (state.optimizeStorageEnabled) {
+                      showOptimizeStorageWarningDialog = true
                     } else {
-                      callback.onTurnOnClick()
+                      proceedWithTurnOn()
                     }
                   },
                   enabled = state.canTurnOn,
@@ -220,6 +228,24 @@ internal fun LocalBackupsSettingsScreen(
     )
   }
 
+  if (showOptimizeStorageWarningDialog) {
+    Dialogs.AdvancedAlertDialog(
+      body = stringResource(id = R.string.OnDeviceBackupsScreen__you_have_optimize_signal_storage_on),
+      positive = stringResource(id = R.string.OnDeviceBackupsScreen__view_setting),
+      neutral = stringResource(id = R.string.OnDeviceBackupsScreen__continue_without_turning_off),
+      negative = stringResource(id = android.R.string.cancel),
+      onPositive = {
+        showOptimizeStorageWarningDialog = false
+        callback.onViewOptimizeStorageSettingClick()
+      },
+      onNeutral = {
+        showOptimizeStorageWarningDialog = false
+        proceedWithTurnOn()
+      },
+      onNegative = { showOptimizeStorageWarningDialog = false }
+    )
+  }
+
   if (showTurnOffAndDeleteDialog) {
     Dialogs.SimpleAlertDialog(
       title = stringResource(id = R.string.BackupDialog_delete_backups),

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/local/LocalBackupsSettingsState.kt

@@ -15,6 +15,7 @@ import org.thoughtcrime.securesms.keyvalue.protos.LocalBackupCreationProgress
 data class LocalBackupsSettingsState(
   val backupsEnabled: Boolean = false,
   val canTurnOn: Boolean = true,
+  val optimizeStorageEnabled: Boolean = false,
   val lastBackupLabel: String? = null,
   val folderDisplayName: String? = null,
   val scheduleTimeLabel: String? = null,

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/local/LocalBackupsViewModel.kt

@@ -103,7 +103,8 @@ class LocalBackupsViewModel : ViewModel(), BackupKeyCredentialManagerHandler {
     internalSettingsState.update {
       it.copy(
         canTurnOn = canTurnOn,
-        scheduleTimeLabel = backupTime
+        scheduleTimeLabel = backupTime,
+        optimizeStorageEnabled = SignalStore.backup.optimizeStorage
       )
     }
   }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/BackupKeyCredentialManagerHandler.kt

@@ -27,6 +27,9 @@ interface BackupKeyCredentialManagerHandler {
   /** Called when the user confirms they want to save the backup key to the password manager. */
   fun onBackupKeySaveConfirmed() = updateBackupKeySaveState(BackupKeySaveState.AwaitingCredentialManager(isRetry = false))
 
+  /** Called to clear the key save state. */
+  fun onBackupKeySaveStateCleared() = updateBackupKeySaveState(null)
+
   /** Handles the password manager save operation response. */
   fun onBackupKeySaveCompleted(result: CredentialManagerResult) {
     when (result) {

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/BackupKeyDisplayViewModel.kt

@@ -44,7 +44,7 @@ class BackupKeyDisplayViewModel : ViewModel(), BackupKeyCredentialManagerHandler
     viewModelScope.launch {
       internalUiState.update { it.copy(rotationState = BackupKeyRotationState.GENERATING_KEY) }
 
-      val stagedKeyRotations = withContext(SignalDispatchers.IO) {
+      val stagedKeyRotations = withContext(SignalDispatchers.Default) {
         BackupRepository.stageBackupKeyRotations()
       }
 

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsFragment.kt

@@ -368,7 +368,7 @@ private fun RemoteBackupsSettingsContent(
     promptTitle = stringResource(R.string.RemoteBackupsSettingsFragment__unlock_to_view_backup_key),
     educationSheetMessage = stringResource(R.string.RemoteBackupsSettingsFragment__to_view_your_key),
     onAuthenticationFailed = {
-      Toast.makeText(context, R.string.RemoteBackupsSettingsFragment__authenticatino_required, Toast.LENGTH_SHORT).show()
+      Toast.makeText(context, R.string.RemoteBackupsSettingsFragment__authentication_required, Toast.LENGTH_SHORT).show()
     }
   )
 

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/backups/remote/RemoteBackupsSettingsViewModel.kt

@@ -143,7 +143,7 @@ class RemoteBackupsSettingsViewModel : ViewModel() {
         }
     }
 
-    viewModelScope.launch(Dispatchers.IO) {
+    viewModelScope.launch(Dispatchers.Default) {
       var optimizedRemainingBytes = 0L
       while (isActive) {
         if (ArchiveRestoreProgress.state.let { it.restoreState.isMediaRestoreOperation || it.restoreStatus == RestoreStatus.FINISHED }) {
@@ -194,7 +194,7 @@ class RemoteBackupsSettingsViewModel : ViewModel() {
       }
     }
 
-    viewModelScope.launch(Dispatchers.IO) {
+    viewModelScope.launch(Dispatchers.Default) {
       BackupRepository.maybeFixAnyDanglingUploadProgress()
     }
   }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterCodeFragment.kt

@@ -128,11 +128,14 @@ class ChangeNumberEnterCodeFragment : LoggingFragment(R.layout.fragment_change_n
     binding.codeEntryLayout.resendSmsCountDown.startCountDownTo(state.nextSmsTimestamp.milliseconds)
     binding.codeEntryLayout.callMeCountDown.startCountDownTo(state.nextCallTimestamp.milliseconds)
     when (val outcome = state.changeNumberOutcome) {
-      is ChangeNumberOutcome.RecoveryPasswordWorked,
-      is ChangeNumberOutcome.VerificationCodeWorked -> changeNumberSuccess()
+      is ChangeNumberOutcome.Succeeded -> changeNumberSuccess()
 
       is ChangeNumberOutcome.ChangeNumberRequestOutcome -> if (!state.inProgress && !outcome.result.isSuccess()) {
-        presentGenericError(outcome.result)
+        if (outcome.result is VerificationCodeRequestResult.RequestVerificationCodeRateLimited) {
+          Log.i(TAG, "Verification code request rate limited; staying on code entry screen.")
+        } else {
+          presentGenericError(outcome.result)
+        }
       }
 
       null -> Unit
@@ -158,6 +161,8 @@ class ChangeNumberEnterCodeFragment : LoggingFragment(R.layout.fragment_change_n
     when (result) {
       is VerificationCodeRequestResult.Success -> binding.codeEntryLayout.keyboard.displaySuccess()
       is VerificationCodeRequestResult.RateLimited -> presentRateLimitedDialog()
+      is VerificationCodeRequestResult.RequestVerificationCodeRateLimited -> presentRateLimitedDialog(retryAfterSeconds = (result.nextSmsTimestamp - System.currentTimeMillis().milliseconds).inWholeSeconds.coerceAtLeast(0))
+      is VerificationCodeRequestResult.SubmitVerificationCodeRateLimited -> presentRateLimitedDialog()
       is VerificationCodeRequestResult.RegistrationLocked -> presentRegistrationLocked(result.timeRemaining)
       else -> presentGenericError(result)
     }

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRegistrationLockFragment.kt

@@ -113,7 +113,7 @@ class ChangeNumberRegistrationLockFragment : LoggingFragment(R.layout.fragment_c
   }
 
   private fun onStateUpdate(state: ChangeNumberState) {
-    if (state.changeNumberOutcome == ChangeNumberOutcome.VerificationCodeWorked) {
+    if (state.changeNumberOutcome == ChangeNumberOutcome.Succeeded) {
       handleSuccessfulPinEntry(state.enteredPin)
     }
 

app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberRepository.kt

@@ -188,8 +188,7 @@ class ChangeNumberRepository(
       StorageSyncHelper.scheduleSyncForDataChange()
     }
 
-    SignalStore.account.setE164(e164)
-    SignalStore.account.setPni(pni)
+    SignalStore.account.setNumberAndPniIdentity(e164, pni, pniRegistrationId, pniIdentityKeyPair)
     AppDependencies.resetProtocolStores()
 
     AppDependencies.groupsV2Authorization.clear()
@@ -197,9 +196,6 @@ class ChangeNumberRepository(
     val pniProtocolStore = AppDependencies.protocolStore.pni()
     val pniMetadataStore = SignalStore.account.pniPreKeys
 
-    SignalStore.account.pniRegistrationId = pniRegistrationId
-    SignalStore.account.setPniIdentityKeyAfterChangeNumber(pniIdentityKeyPair)
-
     PreKeyUtil.storeSignedPreKey(pniProtocolStore, pniMetadataStore, pniSignedPreKey)
     pniMetadataStore.activeSignedPreKeyId = pniSignedPreKey.id
 
@@ -326,6 +322,10 @@ class ChangeNumberRepository(
       }
     }
 
+    if (result !is NetworkResult.Success) {
+      result = verifyChangeAppliedDespiteError(newE164 = newE164, originalResult = result)
+    }
+
     if (result is NetworkResult.StatusCodeError) {
       SignalStore.misc.unlockChangeNumber()
     }
@@ -336,13 +336,39 @@ class ChangeNumberRepository(
         NumberChangeResult(
           uuid = accountRegistrationResponse.uuid,
           pni = accountRegistrationResponse.pni,
-          storageCapable = accountRegistrationResponse.storageCapable,
           number = accountRegistrationResponse.number
         )
       }
     )
   }
 
+  /**
+   * The server can commit a number change but still return an error. Before trusting a non-success result, check
+   * with the server and see if it already reports [newE164] as our number. If it does, then the change actually
+   * went through, so treat it as a success instead of surfacing the error.
+   */
+  private suspend fun verifyChangeAppliedDespiteError(newE164: String, originalResult: NetworkResult<VerifyAccountResponse>): NetworkResult<VerifyAccountResponse> {
+    return try {
+      val whoAmI = withContext(Dispatchers.IO) { whoAmI() }
+      if (whoAmI.number == newE164 && whoAmI.pni != null) {
+        Log.w(TAG, "Change number request did not succeed, but whoami reports the new number is already active. Treating the change as successful.")
+        NetworkResult.Success(
+          VerifyAccountResponse().apply {
+            uuid = whoAmI.aci
+            pni = whoAmI.pni
+            number = whoAmI.number
+          }
+        )
+      } else {
+        Log.i(TAG, "Change number request did not succeed and whoami does not report the new number; treating as a genuine failure.")
+        originalResult
+      }
+    } catch (e: IOException) {
+      Log.w(TAG, "Failed to query whoami while verifying change number outcome; treating as a genuine failure.", e)
+      originalResult
+    }
+  }
+
   @WorkerThread
   private fun createChangeNumberRequest(
     sessionId: String? = null,
@@ -433,7 +459,6 @@ class ChangeNumberRepository(
   data class NumberChangeResult(
     val uuid: String,
     val pni: String,
-    val storageCapable: Boolean,
     val number: String
   )
 }