Bump version to 8.21.1

Co-authored-by: Cody Henthorne <cody@signal.org>

.github/dependabot.yml

@@ -1,27 +0,0 @@
-version: 2
-updates:
-  # Automatically keep GitHub Actions SHA-pinned to the latest commit SHAs.
-  # Dependabot will update both the SHA and the inline version comment (e.g. # v6)
-  # while leaving any extra documentation comments intact.
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-      day: "monday"
-    labels:
-      - "dependencies"
-    commit-message:
-      prefix: "ci"
-    groups:
-      actions:
-        patterns:
-          - "actions/*"
-      gradle-actions:
-        patterns:
-          - "gradle/*"
-      peter-evans:
-        patterns:
-          - "peter-evans/*"
-      usefulness:
-        patterns:
-          - "usefulness/*"

.github/workflows/android.yml

@@ -16,14 +16,14 @@ jobs:
     runs-on: ubuntu-latest-8-cores
 
     steps:
-    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+    - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       # gh api repos/actions/checkout/commits/v6 --jq '.sha'
       with:
           submodules: true
           lfs: true
 
     - name: set up JDK 21
-      uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5
+      uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5
       # gh api repos/actions/setup-java/commits/v5 --jq '.sha'
       with:
         distribution: temurin
@@ -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,14 +16,14 @@ jobs:
     runs-on: ubuntu-latest-8-cores
 
     steps:
-    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+    - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       # gh api repos/actions/checkout/commits/v6 --jq '.sha'
       with:
         submodules: true
         ref: ${{ github.event.pull_request.base.sha }}
 
     - name: set up JDK 21
-      uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5
+      uses: actions/setup-java@03ad4de0992f5dab5e18fcb136590ce7c4a0ac95 # v5
       # gh api repos/actions/setup-java/commits/v5 --jq '.sha'
       with:
         distribution: temurin
@@ -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@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+    - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       # gh api repos/actions/checkout/commits/v6 --jq '.sha'
       with:
         submodules: true

.github/workflows/docker.yml

@@ -11,17 +11,49 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - name: Free up disk space
+        run: |
+          # The build runs entirely inside the Docker container, which ships its
+          # own JDK, Android SDK, and NDK. None of the host toolchains are needed.
+          sudo rm -rf /usr/lib/jvm
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /usr/share/swift
+          sudo rm -rf /usr/local/.ghcup
+          sudo rm -rf /usr/local/julia*
+          sudo rm -rf /usr/local/lib/android
+          sudo rm -rf /usr/local/share/chromium
+          sudo rm -rf /opt/microsoft /opt/google
+          sudo rm -rf /opt/az
+          sudo rm -rf /usr/local/share/powershell
+          sudo rm -rf /opt/hostedtoolcache
+          docker system prune -af || true
+          docker builder prune -af || true
+      - name: Disk usage after cleanup
+        if: always()
+        run: |
+          df -h
+          docker system df || true
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         # gh api repos/actions/checkout/commits/v6 --jq '.sha'
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
+        uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
       - name: Build image
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
+        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: Disk usage after image build
+        if: always()
+        run: |
+          df -h
+          docker system df || true
       - 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
+      - name: Disk usage after test build
+        if: always()
+        run: |
+          df -h
+          docker system df || true

.github/workflows/stale.yml

@@ -14,7 +14,7 @@ jobs:
       actions: write
 
     steps:
-      - uses: actions/stale@eb5cf3af3ac0a1aa4c9c45633dd1ae542a27a899 # v10
+      - uses: actions/stale@1e223db275d687790206a7acac4d1a11bd6fe629 # v10
         # gh api repos/actions/stale/commits/v10 --jq '.sha'
         with:
           days-before-stale: 60

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,6 +13,7 @@ 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)
@@ -28,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 = 1715
-val canonicalVersionName = "8.18.1"
+val canonicalVersionCode = 1726
+val canonicalVersionName = "8.21.1"
 val currentHotfixVersion = 0
 val maxHotfixVersions = 100
 
@@ -128,6 +132,17 @@ ktlint {
   version.set("1.5.0")
 }
 
+// ktlint only scans convention source dirs, so the shared dirs added to the compile tasks are
+// otherwise skipped. Add them to the base test/androidTest ktlint tasks so ktlintCheck/format cover them.
+tasks.withType(org.jlleitschuh.gradle.ktlint.tasks.BaseKtLintCheckTask::class.java).configureEach {
+  if (name.endsWith("OverTestSourceSet") || name.endsWith("OverAndroidTestSourceSet")) {
+    source("$projectDir/src/testShared")
+  }
+  if (name.endsWith("OverAndroidTestSourceSet")) {
+    source("$projectDir/src/benchmarkShared/java")
+  }
+}
+
 screenshotTests {
   // Fraction of differing pixels tolerated before a screenshot test fails (0.0001 = 0.01%).
   imageDifferenceThreshold = 0.0001f
@@ -139,7 +154,11 @@ android {
   experimentalProperties["android.experimental.enableScreenshotTest"] = true
 
   buildToolsVersion = libs.versions.buildTools.get()
-  compileSdkVersion(libs.versions.compileSdk.get())
+
+  compileSdk {
+    version = release(libs.versions.compileSdk.get().toInt())
+  }
+
   ndkVersion = libs.versions.ndk.get()
 
   flavorDimensions += listOf("distribution", "environment")
@@ -176,12 +195,12 @@ android {
 
   sourceSets {
     getByName("test") {
-      java.srcDir("$projectDir/src/testShared")
+      java.directories += "$projectDir/src/testShared"
     }
 
     getByName("androidTest") {
-      java.srcDir("$projectDir/src/testShared")
-      java.srcDir("$projectDir/src/benchmarkShared/java")
+      java.directories += "$projectDir/src/testShared"
+      java.directories += "$projectDir/src/benchmarkShared/java"
     }
   }
 
@@ -396,6 +415,7 @@ android {
       isDefault = false
       isDebuggable = false
       isMinifyEnabled = true
+      isShrinkResources = true
       matchingFallbacks += "debug"
       buildConfigField("String", "BUILD_VARIANT_TYPE", "\"Benchmark\"")
       buildConfigField("boolean", "TRACING_ENABLED", "true")
@@ -506,18 +526,18 @@ android {
   android.buildTypes.configureEach {
     val path = if (name == "release") releaseDir else debugDir
     sourceSets.named(name) {
-      java.srcDir(path)
+      java.directories += path
     }
   }
 
   sourceSets {
     getByName("mocked") {
-      java.srcDir("$projectDir/src/benchmarkShared/java")
+      java.directories += "$projectDir/src/benchmarkShared/java"
       manifest.srcFile("$projectDir/src/benchmarkShared/AndroidManifest.xml")
     }
 
     getByName("benchmark") {
-      java.srcDir("$projectDir/src/benchmarkShared/java")
+      java.directories += "$projectDir/src/benchmarkShared/java"
       manifest.srcFile("$projectDir/src/benchmarkShared/AndroidManifest.xml")
     }
   }
@@ -598,6 +618,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 {
@@ -646,6 +703,7 @@ dependencies {
   implementation(project(":core:ui"))
   implementation(project(":core:models"))
   implementation(project(":core:models-jvm"))
+  implementation(project(":core:serialization"))
   implementation(project(":feature:camera"))
   implementation(project(":feature:registration"))
   implementation(project(":lib:apng"))
@@ -790,8 +848,18 @@ dependencies {
 
   androidTestImplementation(platform(libs.androidx.compose.bom))
   androidTestImplementation(libs.androidx.compose.ui.test.junit4)
+  androidTestImplementation(libs.androidx.compose.ui.test.manifest)
   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)
@@ -975,6 +1043,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/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/BecomeASustainerUpsellTest.kt

@@ -0,0 +1,191 @@
+/*
+ * 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.app.Application
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import androidx.navigation.fragment.NavHostFragment
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.core.app.ActivityScenario
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.scrollTo
+import androidx.test.espresso.contrib.RecyclerViewActions
+import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
+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 assertk.assertThat
+import assertk.assertions.isEqualTo
+import assertk.assertions.isNotNull
+import assertk.assertions.isNull
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.signal.core.util.getParcelableExtraCompat
+import org.signal.donations.InAppPaymentType
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.badges.self.none.BecomeASustainerFragment
+import org.thoughtcrime.securesms.badges.self.overview.BadgesOverviewFragment
+import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
+import org.thoughtcrime.securesms.components.settings.app.routes.AppSettingsRoute
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.profiles.manage.EditProfileActivity
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.testing.InAppPaymentsRule
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+import java.util.concurrent.TimeUnit
+
+/**
+ * Entry-path coverage for the "become a subscriber" upsell.
+ *
+ * The upsell surface is [BecomeASustainerFragment], reached from the profile screen's badges row. The
+ * handoff test asserts the sheet's button launches the recurring-donation checkout route; the gating
+ * tests assert the "user might be a sustainer" rule in [org.thoughtcrime.securesms.profiles.manage.EditProfileFragment]:
+ * a non-donor sees the upsell, an existing donor is routed to badge management instead.
+ */
+@RunWith(AndroidJUnit4::class)
+class BecomeASustainerUpsellTest {
+
+  @get:Rule
+  val harness = SignalActivityRule()
+
+  @get:Rule
+  val iapRule = InAppPaymentsRule()
+
+  private val context: Context get() = InstrumentationRegistry.getInstrumentation().targetContext
+
+  @Before
+  fun setUp() {
+    setSelfBadges(emptyList())
+  }
+
+  @Test
+  fun nonDonor_badgeTap_showsUpsellSheet() {
+    ActivityScenario.launch(EditProfileActivity::class.java).use { scenario ->
+      onView(withId(R.id.manage_profile_badges_container)).perform(scrollTo(), click())
+
+      val sheet = awaitNavHostFragment(scenario) { it.filterIsInstance<BecomeASustainerFragment>().firstOrNull() }
+      assertThat(sheet).isNotNull()
+    }
+  }
+
+  @Test
+  fun becomeASustainer_launchesRecurringCheckoutRoute() {
+    LaunchedActivityRecorder(AppSettingsActivity::class.java).use { recorder ->
+      ActivityScenario.launch(EditProfileActivity::class.java).use { scenario ->
+        onView(withId(R.id.manage_profile_badges_container)).perform(scrollTo(), click())
+        awaitNavHostFragment(scenario) { it.filterIsInstance<BecomeASustainerFragment>().firstOrNull() }
+
+        val becomeASustainer = withText(R.string.BecomeASustainerMegaphone__become_a_sustainer)
+        onView(withId(R.id.recycler)).perform(RecyclerViewActions.scrollTo<RecyclerView.ViewHolder>(hasDescendant(becomeASustainer)))
+        onView(becomeASustainer).perform(click())
+
+        val intent = recorder.awaitLaunch()
+        val route = intent.extras!!.keySet().firstNotNullOfOrNull { intent.getParcelableExtraCompat(it, AppSettingsRoute::class.java) }
+        assertThat(route).isEqualTo(AppSettingsRoute.DonationsRoute.Donations(directToCheckoutType = InAppPaymentType.RECURRING_DONATION))
+      }
+    }
+  }
+
+  @Test
+  fun donor_badgeTap_opensBadgeManagement() {
+    setSelfBadges(listOf(donorBadge()))
+
+    ActivityScenario.launch(EditProfileActivity::class.java).use { scenario ->
+      onView(withId(R.id.manage_profile_badges_container)).perform(scrollTo(), click())
+
+      val badgeManagement = awaitNavHostFragment(scenario) { it.filterIsInstance<BadgesOverviewFragment>().firstOrNull() }
+      assertThat(badgeManagement).isNotNull()
+
+      val upsell = navHostFragments(scenario).filterIsInstance<BecomeASustainerFragment>().firstOrNull()
+      assertThat(upsell).isNull()
+    }
+  }
+
+  private fun awaitNavHostFragment(scenario: ActivityScenario<EditProfileActivity>, selector: (List<Fragment>) -> Fragment?): Fragment {
+    return await(description = "nav host fragment") { selector(navHostFragments(scenario)) }
+  }
+
+  private fun navHostFragments(scenario: ActivityScenario<EditProfileActivity>): List<Fragment> {
+    var fragments: List<Fragment> = emptyList()
+    scenario.onActivity { activity ->
+      val navHost = activity.supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as? NavHostFragment
+      fragments = navHost?.childFragmentManager?.fragments ?: emptyList()
+    }
+    return fragments
+  }
+
+  private fun setSelfBadges(badges: List<Badge>) {
+    SignalDatabase.recipients.setBadges(Recipient.self().id, badges)
+    Recipient.self().fresh()
+  }
+
+  private fun donorBadge(): Badge {
+    return Badge(
+      id = "test-donor-badge",
+      category = Badge.Category.Donor,
+      name = "Signal Sustainer",
+      description = "",
+      imageUrl = Uri.EMPTY,
+      imageDensity = "xxhdpi",
+      expirationTimestamp = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(30),
+      visible = true,
+      duration = TimeUnit.DAYS.toMillis(30)
+    )
+  }
+
+  private fun <T> await(timeoutMs: Long = 10_000, pollMs: Long = 50, description: String, supplier: () -> T?): T {
+    val deadline = System.currentTimeMillis() + timeoutMs
+    while (System.currentTimeMillis() < deadline) {
+      supplier()?.let { return it }
+      Thread.sleep(pollMs)
+    }
+    error("Timed out after ${timeoutMs}ms waiting for $description")
+  }
+
+  /**
+   * Captures the first launched activity of [activityClass] and finishes it immediately so its own
+   * downstream launches (e.g. the auto-launched checkout) don't cascade during the test.
+   */
+  private inner class LaunchedActivityRecorder(private val activityClass: Class<out Activity>) : AutoCloseable {
+    @Volatile
+    private var launched: Intent? = null
+
+    private val app = context.applicationContext as Application
+    private val callbacks = object : Application.ActivityLifecycleCallbacks {
+      override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
+        if (activityClass.isInstance(activity) && launched == null) {
+          launched = activity.intent
+          activity.finish()
+        }
+      }
+
+      override fun onActivityStarted(activity: Activity) = Unit
+      override fun onActivityResumed(activity: Activity) = Unit
+      override fun onActivityPaused(activity: Activity) = Unit
+      override fun onActivityStopped(activity: Activity) = Unit
+      override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit
+      override fun onActivityDestroyed(activity: Activity) = Unit
+    }
+
+    init {
+      app.registerActivityLifecycleCallbacks(callbacks)
+    }
+
+    fun awaitLaunch(): Intent = await(description = "${activityClass.simpleName} launch") { launched }
+
+    override fun close() = app.unregisterActivityLifecycleCallbacks(callbacks)
+  }
+}

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

@@ -17,17 +17,25 @@ 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 io.mockk.unmockkObject
 import org.hamcrest.Matchers.allOf
+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.thoughtcrime.securesms.R
+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.testing.DisableAnimationsRule
+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
 
 @Suppress("ClassName")
 @RunWith(AndroidJUnit4::class)
@@ -47,13 +55,22 @@ class CheckoutFlowActivityTest__OneTimeDonations {
   @get:Rule
   val composeRule = createEmptyComposeRule()
 
+  @get:Rule
+  val animationsRule = DisableAnimationsRule()
+
   private val intent = CheckoutFlowActivity.createIntent(InstrumentationRegistry.getInstrumentation().targetContext, InAppPaymentType.ONE_TIME_DONATION)
 
   @Before
   fun setUp() {
+    SignalDatabase.inAppPayments.writableDatabase.deleteAll(InAppPaymentTable.TABLE_NAME)
     startJobLoopForTests()
   }
 
+  @After
+  fun tearDown() {
+    unmockkObject(DonationPermits)
+  }
+
   @Test
   fun givenPermitAcquisitionFails_whenIDonateOnce_thenIExpectPaymentSetupErrorDialog() {
     failDonationPermitAcquisition()
@@ -61,16 +78,17 @@ class CheckoutFlowActivityTest__OneTimeDonations {
     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()
 
-    onView(withId(R.id.recycler)).perform(RecyclerViewScrollToBottomAction)
+    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)
 
-    awaitDonationErrorDialog(rxRule.defaultTestScheduler, R.string.DonationsErrors__error_processing_payment)
+    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

@@ -13,35 +13,34 @@ 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 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.DisableAnimationsRule
+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.whispersystems.signalservice.api.subscriptions.ActiveSubscription
+import org.thoughtcrime.securesms.testing.actions.scrollToDescendant
+import org.thoughtcrime.securesms.testing.endpoints.DonationResponses
+import org.thoughtcrime.securesms.testing.endpoints.MockEndpoints
+import org.thoughtcrime.securesms.testing.endpoints.failure
+import org.thoughtcrime.securesms.testing.endpoints.ok
 import org.whispersystems.signalservice.api.subscriptions.SubscriberId
-import java.math.BigDecimal
 import java.util.Currency
-import kotlin.time.Duration.Companion.days
-import kotlin.time.Duration.Companion.milliseconds
 
 @Suppress("ClassName")
 @RunWith(AndroidJUnit4::class)
@@ -61,10 +60,14 @@ class CheckoutFlowActivityTest__RecurringDonations {
   @get:Rule
   val composeRule = createEmptyComposeRule()
 
+  @get:Rule
+  val animationsRule = DisableAnimationsRule()
+
   private val intent = CheckoutFlowActivity.createIntent(InstrumentationRegistry.getInstrumentation().targetContext, InAppPaymentType.RECURRING_DONATION)
 
   @Before
   fun setUp() {
+    SignalDatabase.inAppPayments.writableDatabase.deleteAll(InAppPaymentTable.TABLE_NAME)
     startJobLoopForTests()
   }
 
@@ -76,14 +79,15 @@ class CheckoutFlowActivityTest__RecurringDonations {
   @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
@@ -94,8 +98,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()))
   }
 
@@ -107,7 +112,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()))
@@ -122,7 +127,7 @@ 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()))
   }
@@ -134,75 +139,53 @@ class CheckoutFlowActivityTest__RecurringDonations {
     val scenario = ActivityScenario.launch<CheckoutFlowActivity>(intent)
     rxRule.defaultTestScheduler.triggerActions()
 
-    onView(withId(R.id.recycler)).perform(RecyclerViewScrollToBottomAction)
+    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)
 
-    awaitDonationErrorDialog(rxRule.defaultTestScheduler, R.string.DonationsErrors__error_processing_payment)
+    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))
+    succeedDonationPermitAcquisition()
+    MockEndpoints.responder.register({ it.method == "POST" && it.path.contains("/create_payment_method") }) {
+      failure(402)
+    }
 
     val scenario = ActivityScenario.launch<CheckoutFlowActivity>(intent)
     rxRule.defaultTestScheduler.triggerActions()
 
-    onView(withId(R.id.recycler)).perform(RecyclerViewScrollToBottomAction)
+    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)
 
-    awaitDonationErrorDialog(rxRule.defaultTestScheduler, R.string.DonationsErrors__error_processing_payment)
+    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(
-      subscriberId = SubscriberId.generate(),
-      currency = currency,
-      type = InAppPaymentSubscriberRecord.Type.DONATION,
-      requiresCancel = false,
-      paymentMethodType = InAppPaymentData.PaymentMethodType.CARD,
-      iapSubscriptionId = null
-    )
-
-    InAppPaymentsRepository.setSubscriber(subscriber)
-    SignalStore.inAppPayments.setRecurringDonationCurrency(currency)
-
-    AppDependencies.donationsApi.apply {
-      every { getSubscription(subscriber.subscriberId) } returns NetworkResult.Success(
-        ActiveSubscription(
-          ActiveSubscription.Subscription(
-            200,
-            currency.currencyCode,
-            BigDecimal.ONE,
-            System.currentTimeMillis().milliseconds.inWholeSeconds + 30.days.inWholeSeconds,
-            true,
-            System.currentTimeMillis().milliseconds.inWholeSeconds + 30.days.inWholeSeconds,
-            false,
-            "active",
-            "STRIPE",
-            "CARD",
-            false
-          ),
-          null
-        )
-      )
-
-      every { deleteSubscription(subscriber.subscriberId) } returns NetworkResult.Success(Unit)
+    val subscriber = registerSubscriber()
+    val serialized = subscriber.subscriberId.serialize()
+    MockEndpoints.responder.register({ it.method == "GET" && it.path.contains(serialized) }) {
+      ok(DonationResponses.activeSubscription(status = "active", active = true))
     }
   }
 
   private fun initialisePendingSubscription() {
+    val subscriber = registerSubscriber()
+    val serialized = subscriber.subscriberId.serialize()
+    MockEndpoints.responder.register({ it.method == "GET" && it.path.contains(serialized) }) {
+      ok(DonationResponses.activeSubscription(status = "incomplete", active = false))
+    }
+  }
+
+  private fun registerSubscriber(): InAppPaymentSubscriberRecord {
     val currency = Currency.getInstance("USD")
     val subscriber = InAppPaymentSubscriberRecord(
       subscriberId = SubscriberId.generate(),
@@ -216,25 +199,6 @@ class CheckoutFlowActivityTest__RecurringDonations {
     InAppPaymentsRepository.setSubscriber(subscriber)
     SignalStore.inAppPayments.setRecurringDonationCurrency(currency)
 
-    AppDependencies.donationsApi.apply {
-      every { getSubscription(subscriber.subscriberId) } returns NetworkResult.Success(
-        ActiveSubscription(
-          ActiveSubscription.Subscription(
-            200,
-            currency.currencyCode,
-            BigDecimal.ONE,
-            System.currentTimeMillis().milliseconds.inWholeSeconds + 30.days.inWholeSeconds,
-            false,
-            System.currentTimeMillis().milliseconds.inWholeSeconds + 30.days.inWholeSeconds,
-            false,
-            "incomplete",
-            "STRIPE",
-            "CARD",
-            false
-          ),
-          null
-        )
-      )
-    }
+    return subscriber
   }
 }

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

@@ -0,0 +1,103 @@
+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.matcher.ViewMatchers.isClickable
+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 assertk.assertThat
+import assertk.assertions.isNotEmpty
+import io.mockk.unmockkObject
+import org.hamcrest.Matchers.allOf
+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.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.settings.app.subscription.permits.DonationPermits
+import org.thoughtcrime.securesms.database.DonationReceiptTable
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.InAppPaymentReceiptRecord
+import org.thoughtcrime.securesms.testing.DisableAnimationsRule
+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
+import org.thoughtcrime.securesms.testing.endpoints.MockEndpoints
+import org.thoughtcrime.securesms.testing.endpoints.registerStripeHappyPath
+import org.thoughtcrime.securesms.testing.flushUntil
+
+/**
+ * Milestone integration test: drives a Google Pay one-time donation through the entire lifecycle to
+ * receipt redemption, exercising all three outer boundaries at once — the Signal-service websocket
+ * responder (boost intent + receipt credential + redeem), the Stripe HTTP interceptor (payment
+ * method + confirm + intent status), and the test zk server (real client-side credential validation).
+ */
+@Suppress("ClassName")
+@RunWith(AndroidJUnit4::class)
+class CheckoutFlowActivityTest__Redemption {
+  @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()
+
+  @get:Rule
+  val animationsRule = DisableAnimationsRule()
+
+  private val intent = CheckoutFlowActivity.createIntent(InstrumentationRegistry.getInstrumentation().targetContext, InAppPaymentType.ONE_TIME_DONATION)
+
+  @Before
+  fun setUp() {
+    SignalDatabase.inAppPayments.writableDatabase.deleteAll(InAppPaymentTable.TABLE_NAME)
+    SignalDatabase.donationReceipts.writableDatabase.deleteAll(DonationReceiptTable.TABLE_NAME)
+    startJobLoopForTests()
+    succeedDonationPermitAcquisition()
+    MockEndpoints.responder.registerStripeHappyPath()
+  }
+
+  @After
+  fun tearDown() {
+    unmockkObject(DonationPermits)
+  }
+
+  @Test
+  fun givenAllEndpointsSucceed_whenIDonateOnceWithGooglePay_thenIExpectAReceipt() {
+    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)
+
+    rxRule.defaultTestScheduler.flushUntil {
+      SignalDatabase.donationReceipts.getReceipts(InAppPaymentReceiptRecord.Type.ONE_TIME_DONATION).isNotEmpty()
+    }
+
+    assertThat(SignalDatabase.donationReceipts.getReceipts(InAppPaymentReceiptRecord.Type.ONE_TIME_DONATION)).isNotEmpty()
+  }
+}

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

@@ -0,0 +1,280 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate
+
+import android.os.Bundle
+import androidx.compose.ui.test.hasTestTag
+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.compose.ui.test.performScrollToNode
+import androidx.compose.ui.test.performTextInput
+import androidx.core.os.bundleOf
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.fragment.app.FragmentManager
+import androidx.navigation.fragment.NavHostFragment
+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.ViewMatchers.isClickable
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.isEnabled
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import io.reactivex.rxjava3.schedulers.TestScheduler
+import org.hamcrest.Matchers.allOf
+import org.signal.donations.InAppPaymentType
+import org.signal.donations.StripeIntentAccessor
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway.GatewaySelectorTestTags
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.paypal.PayPalConfirmationDialogFragment
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.paypal.PayPalConfirmationResult
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.stripe.Stripe3DSDialogFragment
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.transfer.DonationTransferTestTags
+import org.thoughtcrime.securesms.testing.actions.scrollToDescendant
+import org.thoughtcrime.securesms.testing.endpoints.StripeResponses
+import org.thoughtcrime.securesms.testing.flushUntil
+
+/**
+ * Drives [CheckoutFlowActivity] through the UI "as a user" for a [DonationsCheckoutTestSpec]: selects
+ * an amount/tier, continues to the gateway selector, and completes the chosen payment method. Each
+ * payment method is a strategy dispatched on [DonationsCheckoutTestSpec.paymentMethod].
+ *
+ * Webview approval steps (PayPal, Stripe 3DS) can't complete against a mocked network, so instead of
+ * loading the approval URL we inject the fragment result the webview would have posted — the same
+ * mechanism the production dialog uses on return.
+ */
+class CheckoutFlowDriver(
+  private val composeRule: ComposeTestRule,
+  private val scheduler: TestScheduler
+) {
+
+  companion object {
+    private const val TEST_NAME = "Test McTesterson"
+    private const val TEST_EMAIL = "test@signal.org"
+
+    /** A structurally valid German IBAN (passes mod-97), for the SEPA form. */
+    private const val TEST_IBAN = "DE89370400440532013000"
+  }
+
+  fun drive(scenario: ActivityScenario<CheckoutFlowActivity>, spec: DonationsCheckoutTestSpec) {
+    scheduler.triggerActions()
+
+    selectAmountOrTier(spec.inAppPaymentType)
+    proceedToGateway()
+
+    when (spec.paymentMethod) {
+      TestPaymentMethod.GOOGLE_PAY -> scenario.selectGooglePay(composeRule, scheduler, spec.inAppPaymentType)
+      TestPaymentMethod.CREDIT_CARD -> completeCreditCard()
+      TestPaymentMethod.PAYPAL -> completePayPal(scenario, spec.inAppPaymentType)
+      TestPaymentMethod.SEPA_DEBIT -> completeSepa()
+      TestPaymentMethod.IDEAL -> completeIdeal(spec.inAppPaymentType)
+    }
+
+    if (spec.world.stripe == StripeOutcome.REQUIRES_3DS && spec.paymentMethod.usesStripe()) {
+      complete3ds(scenario, spec.inAppPaymentType)
+    }
+  }
+
+  private fun selectAmountOrTier(type: InAppPaymentType) {
+    if (type == InAppPaymentType.ONE_TIME_DONATION) {
+      scrollToDescendant(R.id.recycler, withId(R.id.boost_1), scheduler)
+      onView(allOf(withId(R.id.boost_1), isClickable())).perform(ViewActions.click())
+      scheduler.triggerActions()
+    }
+    // Recurring: the monthly tier is selected by default, so nothing to pick here.
+  }
+
+  private fun proceedToGateway() {
+    scrollToDescendant(R.id.recycler, withText(R.string.DonateToSignalFragment__continue), scheduler)
+    onView(withText(R.string.DonateToSignalFragment__continue)).perform(ViewActions.click())
+    scheduler.triggerActions()
+  }
+
+  /**
+   * Fills the [org.thoughtcrime.securesms.components.settings.app.subscription.donate.card.CreditCardFragment]
+   * with a valid test card and continues, driving the flow into the Stripe payment pipeline.
+   */
+  private fun completeCreditCard() {
+    clickGatewayButton(GatewaySelectorTestTags.CREDIT_CARD_BUTTON)
+
+    scheduler.flushUntil {
+      onView(withId(R.id.card_number)).check(matches(isDisplayed()))
+      true
+    }
+
+    onView(withId(R.id.card_number)).perform(ViewActions.typeText("4242424242424242"), ViewActions.closeSoftKeyboard())
+    onView(withId(R.id.card_expiry)).perform(ViewActions.typeText("1228"), ViewActions.closeSoftKeyboard())
+    onView(withId(R.id.card_cvv)).perform(ViewActions.typeText("123"), ViewActions.closeSoftKeyboard())
+
+    scheduler.flushUntil {
+      onView(withId(R.id.continue_button)).check(matches(isEnabled()))
+      true
+    }
+    onView(withId(R.id.continue_button)).perform(ViewActions.click())
+    scheduler.triggerActions()
+  }
+
+  /**
+   * Selects PayPal, then injects the approval result the webview would have returned. One-time uses a
+   * [PayPalConfirmationResult]; recurring posts `true`.
+   */
+  private fun completePayPal(scenario: ActivityScenario<CheckoutFlowActivity>, type: InAppPaymentType) {
+    clickGatewayButton(GatewaySelectorTestTags.PAYPAL_BUTTON)
+
+    val result: Any = if (type == InAppPaymentType.ONE_TIME_DONATION) {
+      PayPalConfirmationResult(payerId = "test-payer", paymentId = null, paymentToken = "test-token")
+    } else {
+      true
+    }
+
+    awaitDialogAndSetResult(
+      scenario = scenario,
+      dialogClass = PayPalConfirmationDialogFragment::class.java,
+      resultKey = PayPalConfirmationDialogFragment.REQUEST_KEY,
+      bundle = bundleOf(PayPalConfirmationDialogFragment.REQUEST_KEY to result)
+    )
+  }
+
+  /** Injects the 3DS return the Stripe webview would have posted, resuming the Stripe pipeline. */
+  private fun complete3ds(scenario: ActivityScenario<CheckoutFlowActivity>, type: InAppPaymentType) {
+    val accessor = if (type == InAppPaymentType.ONE_TIME_DONATION) {
+      StripeIntentAccessor(StripeIntentAccessor.ObjectType.PAYMENT_INTENT, StripeResponses.DEFAULT_PAYMENT_INTENT_ID, "${StripeResponses.DEFAULT_PAYMENT_INTENT_ID}_secret_test")
+    } else {
+      StripeIntentAccessor(StripeIntentAccessor.ObjectType.SETUP_INTENT, StripeResponses.DEFAULT_SETUP_INTENT_ID, "${StripeResponses.DEFAULT_SETUP_INTENT_ID}_secret_test")
+    }
+
+    awaitDialogAndSetResult(
+      scenario = scenario,
+      dialogClass = Stripe3DSDialogFragment::class.java,
+      resultKey = Stripe3DSDialogFragment.REQUEST_KEY,
+      bundle = bundleOf(Stripe3DSDialogFragment.REQUEST_KEY to accessor)
+    )
+  }
+
+  /**
+   * Selects SEPA, accepts the mandate (its button scrolls the text to the bottom before it agrees, so
+   * it is clicked until the details form appears), fills the bank details, and donates. SEPA requires
+   * a EUR donation currency (see [WorldState.currencyCode]).
+   */
+  private fun completeSepa() {
+    clickGatewayButton(GatewaySelectorTestTags.SEPA_BUTTON)
+
+    scheduler.flushUntil {
+      val ibanPresent = runCatching {
+        composeRule.onAllNodesWithTag(DonationTransferTestTags.SEPA_IBAN_FIELD).fetchSemanticsNodes().isNotEmpty()
+      }.getOrDefault(false)
+      if (!ibanPresent) {
+        runCatching { composeRule.onNodeWithTag(DonationTransferTestTags.SEPA_MANDATE_CONTINUE_BUTTON).performClick() }
+      }
+      ibanPresent
+    }
+
+    typeIntoField(DonationTransferTestTags.SEPA_DETAILS_LIST, DonationTransferTestTags.SEPA_IBAN_FIELD, TEST_IBAN)
+    typeIntoField(DonationTransferTestTags.SEPA_DETAILS_LIST, DonationTransferTestTags.SEPA_NAME_FIELD, TEST_NAME)
+    typeIntoField(DonationTransferTestTags.SEPA_DETAILS_LIST, DonationTransferTestTags.SEPA_EMAIL_FIELD, TEST_EMAIL)
+
+    clickWhenReady(DonationTransferTestTags.SEPA_DONATE_BUTTON)
+  }
+
+  /**
+   * Selects iDEAL, fills the bank details (email is recurring-only), and donates. iDEAL requires a EUR
+   * donation currency and, on success, lands in an awaiting-authorization state.
+   */
+  private fun completeIdeal(type: InAppPaymentType) {
+    clickGatewayButton(GatewaySelectorTestTags.IDEAL_BUTTON)
+
+    scheduler.flushUntil {
+      runCatching {
+        composeRule.onAllNodesWithTag(DonationTransferTestTags.IDEAL_NAME_FIELD).fetchSemanticsNodes().isNotEmpty()
+      }.getOrDefault(false)
+    }
+
+    typeIntoField(DonationTransferTestTags.IDEAL_DETAILS_LIST, DonationTransferTestTags.IDEAL_NAME_FIELD, TEST_NAME)
+    if (type.recurring) {
+      typeIntoField(DonationTransferTestTags.IDEAL_DETAILS_LIST, DonationTransferTestTags.IDEAL_EMAIL_FIELD, TEST_EMAIL)
+    }
+
+    clickWhenReady(DonationTransferTestTags.IDEAL_DONATE_BUTTON)
+  }
+
+  /**
+   * Scrolls the [listTag] lazy list until the field tagged [fieldTag] is composed and on-screen, then types
+   * [text] into it. The transfer forms lay their fields out in a [androidx.compose.foundation.lazy.LazyColumn],
+   * so a lower field is not composed on a short screen until scrolled to — without this, the input silently
+   * matches nothing on Firebase's smaller devices.
+   */
+  private fun typeIntoField(listTag: String, fieldTag: String, text: String) {
+    composeRule.onNodeWithTag(listTag).performScrollToNode(hasTestTag(fieldTag))
+    composeRule.onNodeWithTag(fieldTag).performTextInput(text)
+  }
+
+  /** Retries clicking a Compose node until the click lands (e.g. once a submit button becomes enabled). */
+  private fun clickWhenReady(tag: String) {
+    scheduler.flushUntil {
+      runCatching {
+        composeRule.onNodeWithTag(tag).performClick()
+        true
+      }.getOrDefault(false)
+    }
+    scheduler.triggerActions()
+  }
+
+  /**
+   * Clicks a Compose gateway-selector button and waits for the bottom sheet to dismiss. For methods
+   * other than Google Pay the checkout then navigates to the method's fragment; Google Pay instead
+   * requires a result injection (see `selectGooglePay`).
+   */
+  private fun clickGatewayButton(tag: String) {
+    scheduler.flushUntil {
+      composeRule.onAllNodesWithTag(tag).fetchSemanticsNodes().isNotEmpty()
+    }
+
+    // The selector is a vertically scrolling bottom sheet; on a short screen the lower gateway buttons are
+    // off-screen, so bring the target on-screen before clicking (mirrors GatewaySelectorBottomSheetContentTest).
+    composeRule.onNodeWithTag(GatewaySelectorTestTags.CONTAINER).performScrollToNode(hasTestTag(tag))
+    composeRule.onNodeWithTag(tag).performClick()
+
+    scheduler.flushUntil {
+      runCatching {
+        composeRule.onAllNodesWithTag(tag).fetchSemanticsNodes().isEmpty()
+      }.getOrDefault(true)
+    }
+  }
+
+  /**
+   * Waits for a navigated dialog of [dialogClass] to be present, then posts [bundle] as its fragment
+   * result on the nav host's fragment manager (where the in-progress fragment registered its listener).
+   */
+  private fun <T : Fragment> awaitDialogAndSetResult(
+    scenario: ActivityScenario<CheckoutFlowActivity>,
+    dialogClass: Class<T>,
+    resultKey: String,
+    bundle: Bundle
+  ) {
+    scheduler.flushUntil {
+      var delivered = false
+      scenario.onActivity { activity ->
+        val fragmentManager = navHostChildFragmentManager(activity)
+        if (fragmentManager != null && fragmentManager.fragments.any { dialogClass.isInstance(it) }) {
+          fragmentManager.setFragmentResult(resultKey, bundle)
+          delivered = true
+        }
+      }
+      delivered
+    }
+    scheduler.triggerActions()
+  }
+
+  private fun navHostChildFragmentManager(activity: FragmentActivity): FragmentManager? {
+    return activity.supportFragmentManager.fragments
+      .filterIsInstance<NavHostFragment>()
+      .firstOrNull()
+      ?.childFragmentManager
+  }
+
+  private fun TestPaymentMethod.usesStripe(): Boolean {
+    return this != TestPaymentMethod.PAYPAL
+  }
+}

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

@@ -7,29 +7,21 @@ package org.thoughtcrime.securesms.components.settings.app.subscription.donate
 
 import android.app.Activity
 import android.content.Intent
-import android.os.SystemClock
+import androidx.compose.ui.test.hasTestTag
 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.compose.ui.test.performScrollToNode
 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 androidx.test.platform.app.InstrumentationRegistry
-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 io.mockk.mockkObject
 import io.reactivex.rxjava3.schedulers.TestScheduler
-import org.junit.rules.ExternalResource
-import org.signal.donations.GooglePayApi
 import org.signal.donations.InAppPaymentType
 import org.signal.libsignal.net.RequestResult
 import org.signal.network.rest.RestStatusCodeError
@@ -37,82 +29,86 @@ 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.components.settings.app.subscription.permits.DonationPermits
 import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.testing.flushUntil
 
 /**
- * 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)
-  }
-}
-
-/**
- * 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.
- */
-private const val GOOGLE_PAY_PAYMENT_DATA_JSON = """{"paymentMethodData":{"tokenizationData":{"token":"{\"id\":\"tok_test\"}"}},"email":"test@signal.org"}"""
-
-/**
- * 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].
+ * Forces donation-permit acquisition to fail, so the checkout surfaces a payment-setup error before
+ * reaching the payment method. Stubs the [DonationPermits] object directly (the underlying
+ * `createDonationPermits` call rides the websocket, which the responder does not mint valid permits
+ * for). Call `unmockkObject(DonationPermits)` in teardown.
  */
 fun failDonationPermitAcquisition(statusCode: Int = 500) {
   AppDependencies.donationPermitsRepository.clearPermits()
-  every { AppDependencies.donationsApi.createDonationPermits(any()) } returns RequestResult.NonSuccess(RestStatusCodeError(statusCode, emptyMap(), null))
+  mockkObject(DonationPermits)
+  every { DonationPermits.getDonationPermit() } returns RequestResult.NonSuccess(RestStatusCodeError(statusCode, emptyMap(), null))
+}
+
+/**
+ * Makes donation-permit acquisition succeed with a placeholder permit, letting the checkout proceed
+ * past the permit gate to the payment method. Call `unmockkObject(DonationPermits)` in teardown.
+ */
+fun succeedDonationPermitAcquisition() {
+  AppDependencies.donationPermitsRepository.clearPermits()
+  mockkObject(DonationPermits)
+  every { DonationPermits.getDonationPermit() } returns RequestResult.Success("permit")
 }
 
 /**
  * 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.
+ *
+ * Before starting it, cancel any leftover in-app-payment jobs. A recurring setup job retries indefinitely over a
+ * one-day lifespan, so a spec that fails setup leaves one persisted in the JobManager. On Firebase Test Lab the
+ * orchestrator's `clearPackageData` does not reliably wipe the JobManager between parameterized specs (it does on a
+ * local emulator, which is why this only surfaces on-device), so that job survives into the next spec and runs after
+ * its InAppPayment row was deleted in setup — `InAppPaymentsRepository.resolveLock` then throws "Not found" from the
+ * job thread and crashes the whole app. Clearing the queues here makes each test start from a clean job state.
  */
 fun startJobLoopForTests() {
+  AppDependencies.jobManager.cancelAllInQueues(
+    setOf(
+      InAppPaymentsRepository.getRecurringJobQueueKey(InAppPaymentType.RECURRING_DONATION),
+      InAppPaymentsRepository.getRecurringJobQueueKey(InAppPaymentType.RECURRING_BACKUP)
+    )
+  )
+  AppDependencies.jobManager.flush()
+
   (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
 ) {
-  val deadline = SystemClock.uptimeMillis() + 10_000
-  var present = false
-  while (SystemClock.uptimeMillis() < deadline && !present) {
-    scheduler.triggerActions()
-    InstrumentationRegistry.getInstrumentation().waitForIdleSync()
-    present = try {
-      composeRule.onAllNodesWithTag(GatewaySelectorTestTags.GOOGLE_PAY_BUTTON).fetchSemanticsNodes().isNotEmpty()
-    } catch (e: IllegalStateException) {
-      false
-    }
-    if (!present) {
-      Thread.sleep(100)
-    }
+  scheduler.flushUntil {
+    composeRule.onAllNodesWithTag(GatewaySelectorTestTags.GOOGLE_PAY_BUTTON).fetchSemanticsNodes().isNotEmpty()
   }
-  check(present) { "Google Pay button never appeared in the gateway selector." }
 
+  composeRule.onNodeWithTag(GatewaySelectorTestTags.CONTAINER).performScrollToNode(hasTestTag(GatewaySelectorTestTags.GOOGLE_PAY_BUTTON))
   composeRule.onNodeWithTag(GatewaySelectorTestTags.GOOGLE_PAY_BUTTON).performClick()
-  pump(scheduler, iterations = 20)
+
+  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(
@@ -126,34 +122,21 @@ fun ActivityScenario<CheckoutFlowActivity>.selectGooglePay(
 }
 
 /**
- * Advances the Rx [scheduler] and pumps the main looper until the checkout error dialog with [titleResId] is
- * displayed, bridging the real JobManager-backed setup job, the Rx observers, and dialog rendering.
+ * 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 awaitDonationErrorDialog(scheduler: TestScheduler, titleResId: Int, timeoutMillis: Long = 15_000) {
-  val deadline = SystemClock.uptimeMillis() + timeoutMillis
-  var lastFailure: Throwable? = null
-
-  while (SystemClock.uptimeMillis() < deadline) {
-    scheduler.triggerActions()
-    InstrumentationRegistry.getInstrumentation().waitForIdleSync()
-
-    try {
-      onView(withText(titleResId)).inRoot(isDialog()).check(matches(isDisplayed()))
-      return
-    } catch (t: Throwable) {
-      lastFailure = t
-    }
-
-    Thread.sleep(100)
-  }
-
-  throw AssertionError("Donation error dialog ($titleResId) was not displayed within ${timeoutMillis}ms.", lastFailure)
-}
-
-private fun pump(scheduler: TestScheduler, iterations: Int, intervalMs: Long = 100) {
-  repeat(iterations) {
-    scheduler.triggerActions()
-    InstrumentationRegistry.getInstrumentation().waitForIdleSync()
-    Thread.sleep(intervalMs)
+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/components/settings/app/subscription/donate/DonationsCheckoutSpecTest.kt

@@ -0,0 +1,286 @@
+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.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 androidx.test.platform.app.InstrumentationRegistry
+import assertk.assertThat
+import assertk.assertions.isNotEmpty
+import assertk.assertions.isNotNull
+import assertk.assertions.isNull
+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.junit.runners.Parameterized
+import org.signal.core.util.deleteAll
+import org.signal.donations.InAppPaymentType
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.settings.app.subscription.permits.DonationPermits
+import org.thoughtcrime.securesms.database.DonationReceiptTable
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.InAppPaymentReceiptRecord
+import org.thoughtcrime.securesms.testing.DisableAnimationsRule
+import org.thoughtcrime.securesms.testing.GooglePayTestRule
+import org.thoughtcrime.securesms.testing.InAppPaymentsRule
+import org.thoughtcrime.securesms.testing.RawFlag
+import org.thoughtcrime.securesms.testing.RemoteConfigForTest
+import org.thoughtcrime.securesms.testing.RxTestSchedulerRule
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+import org.thoughtcrime.securesms.testing.flushUntil
+
+/**
+ * Spec-driven integration test for donation checkout. Each [DonationsCheckoutTestSpec] declares a
+ * "world" (what each endpoint returns) and an expected outcome; this runner applies the world, drives
+ * [CheckoutFlowActivity] through the real UI via [CheckoutFlowDriver], and asserts the outcome.
+ *
+ * Adding coverage is data: append a spec to [DonationsCheckoutSpecs.ALL].
+ */
+@RunWith(Parameterized::class)
+@RemoteConfigForTest(
+  rawFlags = [
+    RawFlag("android.sepa.debit.donations.5", "true"),
+    RawFlag("android.ideal.donations.5", "true"),
+    // Region codes are matched against the digit-only self E164 ("15555550101"), so no leading "+".
+    RawFlag("global.donations.sepaEnabledRegions", "1"),
+    RawFlag("global.donations.idealEnabledRegions", "1")
+  ]
+)
+class DonationsCheckoutSpecTest(private val spec: DonationsCheckoutTestSpec) {
+
+  @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()
+
+  @get:Rule
+  val animationsRule = DisableAnimationsRule()
+
+  @Before
+  fun setUp() {
+    SignalDatabase.inAppPayments.writableDatabase.deleteAll(InAppPaymentTable.TABLE_NAME)
+    SignalDatabase.donationReceipts.writableDatabase.deleteAll(DonationReceiptTable.TABLE_NAME)
+    startJobLoopForTests()
+    spec.world.apply()
+  }
+
+  @After
+  fun tearDown() {
+    unmockkObject(DonationPermits)
+  }
+
+  @Test
+  fun runSpec() {
+    val intent = CheckoutFlowActivity.createIntent(InstrumentationRegistry.getInstrumentation().targetContext, spec.inAppPaymentType)
+    val scenario = ActivityScenario.launch<CheckoutFlowActivity>(intent)
+
+    CheckoutFlowDriver(composeRule, rxRule.defaultTestScheduler).drive(scenario, spec)
+
+    when (val expected = spec.expected) {
+      is ExpectedOutcome.Redeemed -> {
+        rxRule.defaultTestScheduler.flushUntil { receipts().isNotEmpty() }
+        assertThat(receipts()).isNotEmpty()
+      }
+
+      is ExpectedOutcome.ErrorDialog -> {
+        awaitDialog(rxRule.defaultTestScheduler, expected.titleRes)
+        if (expected.messageRes != null) {
+          onView(withText(expected.messageRes)).inRoot(isDialog()).check(matches(isDisplayed()))
+        }
+      }
+
+      is ExpectedOutcome.PaymentSubmitted -> {
+        rxRule.defaultTestScheduler.flushUntil { submittedPayment() != null }
+        val payment = submittedPayment()
+        assertThat(payment).isNotNull()
+        assertThat(payment!!.data.error).isNull()
+      }
+    }
+  }
+
+  /** The latest payment once it has moved past CREATED with no error, or null if not yet there. */
+  private fun submittedPayment(): InAppPaymentTable.InAppPayment? {
+    return SignalDatabase.inAppPayments.getLatestInAppPaymentByType(spec.inAppPaymentType)
+      ?.takeIf { it.state != InAppPaymentTable.State.CREATED && it.data.error == null }
+  }
+
+  private fun receipts(): List<InAppPaymentReceiptRecord> {
+    val type = if (spec.inAppPaymentType == InAppPaymentType.ONE_TIME_DONATION) {
+      InAppPaymentReceiptRecord.Type.ONE_TIME_DONATION
+    } else {
+      InAppPaymentReceiptRecord.Type.RECURRING_DONATION
+    }
+    return SignalDatabase.donationReceipts.getReceipts(type)
+  }
+
+  companion object {
+    @JvmStatic
+    @Parameterized.Parameters(name = "{0}")
+    fun specs(): Collection<DonationsCheckoutTestSpec> = DonationsCheckoutSpecs.ALL
+  }
+}
+
+/**
+ * The enumerated donation checkout scenarios. Currently seeded with Google Pay coverage; the other
+ * payment-method drivers (card, SEPA, iDEAL, PayPal) and their scenarios are added alongside their
+ * [CheckoutFlowDriver] strategies.
+ */
+object DonationsCheckoutSpecs {
+
+  private val paymentErrorDialog = ExpectedOutcome.ErrorDialog(
+    titleRes = R.string.DonationsErrors__error_processing_payment,
+    messageRes = R.string.DonationsErrors__your_payment
+  )
+
+  val ALL: List<DonationsCheckoutTestSpec> = listOf(
+    DonationsCheckoutTestSpec(
+      name = "googlePay_oneTime_happyPath_isRedeemed",
+      inAppPaymentType = InAppPaymentType.ONE_TIME_DONATION,
+      paymentMethod = TestPaymentMethod.GOOGLE_PAY,
+      world = WorldState(),
+      expected = ExpectedOutcome.Redeemed
+    ),
+    DonationsCheckoutTestSpec(
+      name = "googlePay_oneTime_permitFailure_showsError",
+      inAppPaymentType = InAppPaymentType.ONE_TIME_DONATION,
+      paymentMethod = TestPaymentMethod.GOOGLE_PAY,
+      world = WorldState(permit = PermitOutcome.FAILURE),
+      expected = paymentErrorDialog
+    ),
+    DonationsCheckoutTestSpec(
+      name = "googlePay_oneTime_stripeDecline_showsError",
+      inAppPaymentType = InAppPaymentType.ONE_TIME_DONATION,
+      paymentMethod = TestPaymentMethod.GOOGLE_PAY,
+      world = WorldState(stripe = StripeOutcome.DECLINE),
+      expected = paymentErrorDialog
+    ),
+    DonationsCheckoutTestSpec(
+      name = "googlePay_oneTime_signalCreateIntent402_showsError",
+      inAppPaymentType = InAppPaymentType.ONE_TIME_DONATION,
+      paymentMethod = TestPaymentMethod.GOOGLE_PAY,
+      world = WorldState(signalCreatePaymentStatus = 402),
+      expected = paymentErrorDialog
+    ),
+    DonationsCheckoutTestSpec(
+      name = "googlePay_recurring_permitFailure_showsError",
+      inAppPaymentType = InAppPaymentType.RECURRING_DONATION,
+      paymentMethod = TestPaymentMethod.GOOGLE_PAY,
+      world = WorldState(permit = PermitOutcome.FAILURE),
+      expected = paymentErrorDialog
+    ),
+    DonationsCheckoutTestSpec(
+      name = "creditCard_oneTime_happyPath_isRedeemed",
+      inAppPaymentType = InAppPaymentType.ONE_TIME_DONATION,
+      paymentMethod = TestPaymentMethod.CREDIT_CARD,
+      world = WorldState(),
+      expected = ExpectedOutcome.Redeemed
+    ),
+    DonationsCheckoutTestSpec(
+      name = "creditCard_oneTime_stripeDecline_showsError",
+      inAppPaymentType = InAppPaymentType.ONE_TIME_DONATION,
+      paymentMethod = TestPaymentMethod.CREDIT_CARD,
+      world = WorldState(stripe = StripeOutcome.DECLINE),
+      expected = paymentErrorDialog
+    ),
+    DonationsCheckoutTestSpec(
+      name = "creditCard_oneTime_3dsApproved_isRedeemed",
+      inAppPaymentType = InAppPaymentType.ONE_TIME_DONATION,
+      paymentMethod = TestPaymentMethod.CREDIT_CARD,
+      world = WorldState(stripe = StripeOutcome.REQUIRES_3DS),
+      expected = ExpectedOutcome.Redeemed
+    ),
+    DonationsCheckoutTestSpec(
+      name = "payPal_oneTime_happyPath_isRedeemed",
+      inAppPaymentType = InAppPaymentType.ONE_TIME_DONATION,
+      paymentMethod = TestPaymentMethod.PAYPAL,
+      world = WorldState(),
+      expected = ExpectedOutcome.Redeemed
+    ),
+    DonationsCheckoutTestSpec(
+      name = "sepa_oneTime_happyPath_isSubmitted",
+      inAppPaymentType = InAppPaymentType.ONE_TIME_DONATION,
+      paymentMethod = TestPaymentMethod.SEPA_DEBIT,
+      world = WorldState(currencyCode = "EUR"),
+      expected = ExpectedOutcome.PaymentSubmitted
+    ),
+    DonationsCheckoutTestSpec(
+      name = "ideal_oneTime_happyPath_isSubmitted",
+      inAppPaymentType = InAppPaymentType.ONE_TIME_DONATION,
+      paymentMethod = TestPaymentMethod.IDEAL,
+      world = WorldState(currencyCode = "EUR"),
+      expected = ExpectedOutcome.PaymentSubmitted
+    ),
+
+    // Recurring happy paths. Asserted as "submitted": the recurring-specific work is the setup
+    // pipeline (create subscriber, setup intent, set default, set level); receipt redemption is
+    // shared with the one-time path already covered above.
+    DonationsCheckoutTestSpec(
+      name = "googlePay_recurring_happyPath_isSubmitted",
+      inAppPaymentType = InAppPaymentType.RECURRING_DONATION,
+      paymentMethod = TestPaymentMethod.GOOGLE_PAY,
+      world = WorldState(recurringActivatesAfterSetup = true),
+      expected = ExpectedOutcome.PaymentSubmitted
+    ),
+    DonationsCheckoutTestSpec(
+      name = "creditCard_recurring_happyPath_isSubmitted",
+      inAppPaymentType = InAppPaymentType.RECURRING_DONATION,
+      paymentMethod = TestPaymentMethod.CREDIT_CARD,
+      world = WorldState(recurringActivatesAfterSetup = true),
+      expected = ExpectedOutcome.PaymentSubmitted
+    ),
+    DonationsCheckoutTestSpec(
+      name = "payPal_recurring_happyPath_isSubmitted",
+      inAppPaymentType = InAppPaymentType.RECURRING_DONATION,
+      paymentMethod = TestPaymentMethod.PAYPAL,
+      world = WorldState(recurringActivatesAfterSetup = true),
+      expected = ExpectedOutcome.PaymentSubmitted
+    ),
+    DonationsCheckoutTestSpec(
+      name = "sepa_recurring_happyPath_isSubmitted",
+      inAppPaymentType = InAppPaymentType.RECURRING_DONATION,
+      paymentMethod = TestPaymentMethod.SEPA_DEBIT,
+      world = WorldState(currencyCode = "EUR"),
+      expected = ExpectedOutcome.PaymentSubmitted
+    ),
+
+    // Additional error cases.
+    DonationsCheckoutTestSpec(
+      name = "creditCard_oneTime_permitFailure_showsError",
+      inAppPaymentType = InAppPaymentType.ONE_TIME_DONATION,
+      paymentMethod = TestPaymentMethod.CREDIT_CARD,
+      world = WorldState(permit = PermitOutcome.FAILURE),
+      expected = paymentErrorDialog
+    ),
+    DonationsCheckoutTestSpec(
+      name = "creditCard_recurring_stripeDecline_showsError",
+      inAppPaymentType = InAppPaymentType.RECURRING_DONATION,
+      paymentMethod = TestPaymentMethod.CREDIT_CARD,
+      world = WorldState(stripe = StripeOutcome.DECLINE),
+      expected = paymentErrorDialog
+    ),
+    DonationsCheckoutTestSpec(
+      name = "googlePay_recurring_signalCreatePaymentMethod402_showsError",
+      inAppPaymentType = InAppPaymentType.RECURRING_DONATION,
+      paymentMethod = TestPaymentMethod.GOOGLE_PAY,
+      world = WorldState(signalCreatePaymentStatus = 402),
+      expected = paymentErrorDialog
+    )
+  )
+}

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

@@ -0,0 +1,159 @@
+package org.thoughtcrime.securesms.components.settings.app.subscription.donate
+
+import androidx.annotation.StringRes
+import org.signal.donations.InAppPaymentType
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.testing.endpoints.DonationResponses
+import org.thoughtcrime.securesms.testing.endpoints.EndpointResponse
+import org.thoughtcrime.securesms.testing.endpoints.MockEndpoints
+import org.thoughtcrime.securesms.testing.endpoints.StripeResponses
+import org.thoughtcrime.securesms.testing.endpoints.failure
+import org.thoughtcrime.securesms.testing.endpoints.ok
+import org.thoughtcrime.securesms.testing.endpoints.registerPayPalHappyPath
+import org.thoughtcrime.securesms.testing.endpoints.registerStripeHappyPath
+import java.util.Currency
+import java.util.concurrent.atomic.AtomicBoolean
+
+/**
+ * A declarative "state of the world" + expected outcome for one donation checkout scenario. Specs
+ * are enumerated by [DonationsCheckoutSpecTest] and each one drives [CheckoutFlowActivity] end to end
+ * for its [paymentMethod].
+ */
+data class DonationsCheckoutTestSpec(
+  val name: String,
+  val inAppPaymentType: InAppPaymentType,
+  val paymentMethod: TestPaymentMethod,
+  val world: WorldState = WorldState(),
+  val expected: ExpectedOutcome
+) {
+  /** Used as the parameterized test label. */
+  override fun toString(): String = name
+}
+
+enum class TestPaymentMethod {
+  GOOGLE_PAY,
+  CREDIT_CARD,
+  SEPA_DEBIT,
+  IDEAL,
+  PAYPAL
+}
+
+/** Whether donation-permit acquisition succeeds or fails. */
+enum class PermitOutcome { SUCCESS, FAILURE }
+
+/** The Stripe HTTP edge's behavior for a scenario. */
+enum class StripeOutcome {
+  SUCCESS,
+  DECLINE,
+  FAILURE,
+  REQUIRES_3DS
+}
+
+/** Pre-existing recurring subscription state (recurring scenarios only). */
+enum class SubscriptionState { NONE, ACTIVE, PENDING }
+
+/**
+ * The knobs that define what each endpoint returns. [apply] registers the corresponding handlers on
+ * the shared responder (overriding the [org.thoughtcrime.securesms.testing.InAppPaymentsRule]
+ * defaults, since later registrations win) and sets the permit outcome.
+ */
+data class WorldState(
+  val permit: PermitOutcome = PermitOutcome.SUCCESS,
+  val stripe: StripeOutcome = StripeOutcome.SUCCESS,
+  val declineCode: String = "card_declined",
+  val signalCreatePaymentStatus: Int = 200,
+  val receiptCredentialStatus: Int = 200,
+  val redeemStatus: Int = 200,
+  val existingSubscription: SubscriptionState = SubscriptionState.NONE,
+  /** Donation currency to use. SEPA/iDEAL require EUR. */
+  val currencyCode: String = "USD",
+  /**
+   * For a new recurring donation: report no active subscription until the subscription level is set
+   * during setup, then report an active one. This lets the checkout show "Continue" (new subscriber)
+   * while still letting the recurring receipt-credential context job see an active subscription to redeem.
+   */
+  val recurringActivatesAfterSetup: Boolean = false
+) {
+  fun apply() {
+    val currency = Currency.getInstance(currencyCode)
+    SignalStore.inAppPayments.setOneTimeCurrency(currency)
+    SignalStore.inAppPayments.setRecurringDonationCurrency(currency)
+
+    when (permit) {
+      PermitOutcome.SUCCESS -> succeedDonationPermitAcquisition()
+      PermitOutcome.FAILURE -> failDonationPermitAcquisition()
+    }
+
+    val responder = MockEndpoints.responder
+
+    // Signal-service PayPal endpoints (harmless for non-PayPal specs; distinct paths).
+    responder.registerPayPalHappyPath()
+
+    // Stripe HTTP edge.
+    responder.registerStripeHappyPath()
+    when (stripe) {
+      StripeOutcome.SUCCESS -> Unit
+      StripeOutcome.DECLINE -> responder.register({ it.method == "POST" && (it.path.endsWith("/confirm") || it.path.contains("/payment_methods")) }) {
+        failure(402, StripeResponses.declineError(declineCode))
+      }
+      StripeOutcome.FAILURE -> responder.register({ it.method == "POST" && it.path.endsWith("/confirm") }) {
+        failure(402, StripeResponses.failureError("card_not_supported"))
+      }
+      StripeOutcome.REQUIRES_3DS -> responder.register({ it.method == "POST" && it.path.endsWith("/confirm") }) {
+        ok(StripeResponses.confirm3dsRequired())
+      }
+    }
+
+    // Signal-service edge overrides.
+    if (signalCreatePaymentStatus != 200) {
+      responder.register({ it.method == "POST" && (it.path.contains("/create_payment_method") || it.path.endsWith("/boost/create")) }) {
+        failure(signalCreatePaymentStatus)
+      }
+    }
+    if (receiptCredentialStatus != 200) {
+      responder.register({ it.method == "POST" && it.path.contains("/receipt_credentials") }) { failure(receiptCredentialStatus) }
+    }
+    if (redeemStatus != 200) {
+      responder.register({ it.method == "POST" && it.path.contains("/redeem-receipt") }) { failure(redeemStatus) }
+    }
+
+    when (existingSubscription) {
+      SubscriptionState.NONE -> Unit
+      SubscriptionState.ACTIVE -> registerSubscription(status = "active", active = true)
+      SubscriptionState.PENDING -> registerSubscription(status = "incomplete", active = false)
+    }
+
+    if (recurringActivatesAfterSetup) {
+      val activated = AtomicBoolean(false)
+      responder.register({ it.method == "PUT" && it.path.contains("/level/") }) {
+        activated.set(true)
+        ok()
+      }
+      responder.register({ it.method == "GET" && it.path.contains("/v1/subscription/") && !it.path.contains("configuration") && !it.path.contains("bank_mandate") }) {
+        if (activated.get()) ok(DonationResponses.activeSubscription()) else ok(DonationResponses.emptySubscription())
+      }
+    }
+  }
+
+  private fun registerSubscription(status: String, active: Boolean) {
+    MockEndpoints.responder.register({ it.method == "GET" && it.path.contains("/v1/subscription/") && !it.path.contains("configuration") }) {
+      EndpointResponse(status = 200, body = DonationResponses.activeSubscription(status = status, active = active))
+    }
+  }
+}
+
+/** The expected terminal result of driving a spec. */
+sealed interface ExpectedOutcome {
+  /** An error dialog with [titleRes] (and optionally [messageRes]) is shown. */
+  data class ErrorDialog(@StringRes val titleRes: Int, @StringRes val messageRes: Int? = null) : ExpectedOutcome
+
+  /** The full lifecycle completes and a donation receipt is recorded. */
+  data object Redeemed : ExpectedOutcome
+
+  /**
+   * Payment setup succeeded and the payment moved past [org.thoughtcrime.securesms.database.InAppPaymentTable.State.CREATED]
+   * with no error. Used for bank-transfer methods (SEPA/iDEAL), which don't redeem immediately —
+   * they land in a pending / awaiting-authorization state.
+   */
+  data object PaymentSubmitted : ExpectedOutcome
+}

app/src/androidTest/java/org/thoughtcrime/securesms/conversation/v2/InlineDonationPromptTest.kt

@@ -0,0 +1,200 @@
+/*
+ * Copyright 2026 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.conversation.v2
+
+import android.app.Activity
+import android.app.Application
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.FragmentActivity
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import assertk.assertions.isInstanceOf
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.signal.core.util.getSerializableCompat
+import org.signal.donations.InAppPaymentType
+import org.thoughtcrime.securesms.MainActivity
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.DonateToSignalFragment
+import org.thoughtcrime.securesms.conversation.ConversationIntents
+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.InAppPaymentsRule
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+/**
+ * Entry-path coverage for the inline chat donation prompt: the Release-Channel "donation request"
+ * conversation item that renders a "Donate" action button and opens the one-time checkout.
+ *
+ * The conversation is hosted by [MainActivity], so this drives it the same way
+ * [org.thoughtcrime.securesms.main.MainNavigationLaunchTest] does — a manual lifecycle-callback launch
+ * plus direct view interaction, since ActivityScenario/Espresso misbehave for the conversation
+ * custom-action intent.
+ *
+ * Unlike the megaphone and subscriber-upsell paths, this prompt is intentionally NOT gated by sustainer
+ * status; [sustainer_donatePromptStillShown] documents that.
+ */
+@RunWith(AndroidJUnit4::class)
+class InlineDonationPromptTest {
+
+  @get:Rule
+  val harness = SignalActivityRule()
+
+  @get:Rule
+  val iapRule = InAppPaymentsRule()
+
+  private val context: Context get() = InstrumentationRegistry.getInstrumentation().targetContext
+
+  @Before
+  fun setUp() {
+    SignalStore.inAppPayments.setLastEndOfPeriod(0L)
+    SignalDatabase.recipients.setBadges(Recipient.self().id, emptyList())
+    Recipient.self().fresh()
+  }
+
+  @Test
+  fun nonSustainer_donatePromptOpensOneTimeCheckout() {
+    seedDonationRequest()
+
+    assertDonatePromptOpensCheckout()
+  }
+
+  @Test
+  fun sustainer_donatePromptStillShown() {
+    SignalStore.inAppPayments.setLastEndOfPeriod(TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis()) + TimeUnit.DAYS.toSeconds(30))
+    SignalDatabase.recipients.setBadges(Recipient.self().id, listOf(donorBadge()))
+    Recipient.self().fresh()
+
+    seedDonationRequest()
+
+    assertDonatePromptOpensCheckout()
+  }
+
+  private fun assertDonatePromptOpensCheckout() {
+    val activity = launchConversation()
+
+    val donateButton = awaitView(activity, R.id.conversation_update_action)
+    runOnMainSync { donateButton.performClick() }
+
+    val dialog = await(description = "one-time checkout dialog") {
+      activity.supportFragmentManager.findFragmentByTag(ONE_TIME_NAV_TAG)
+    }
+
+    assertThat(dialog).isInstanceOf(DonateToSignalFragment.Dialog::class)
+    val type = dialog.requireArguments().getSerializableCompat(DonateToSignalFragment.Dialog.ARG, InAppPaymentType::class.java)
+    assertThat(type).isEqualTo(InAppPaymentType.ONE_TIME_DONATION)
+  }
+
+  private fun seedDonationRequest() {
+    val recipientId: RecipientId = SignalDatabase.recipients.insertReleaseChannelRecipient()
+    SignalStore.releaseChannel.setReleaseChannelRecipientId(recipientId)
+
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(recipientId))
+    SignalDatabase.messages.insertBoostRequestMessage(recipientId, threadId)
+  }
+
+  private fun launchConversation(): MainActivity {
+    val recipientId = SignalStore.releaseChannel.releaseChannelRecipientId!!
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(recipientId))
+
+    val conversationIntent = ConversationIntents.createBuilder(context, recipientId, threadId).blockingGet().build()
+    val launchIntent = Intent(context, MainActivity::class.java).apply {
+      action = ConversationIntents.ACTION
+      putExtras(conversationIntent)
+      addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+    }
+
+    val app = context.applicationContext as Application
+    val resumed = CountDownLatch(1)
+    val holder = arrayOfNulls<MainActivity>(1)
+    val callbacks = object : Application.ActivityLifecycleCallbacks {
+      override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) = Unit
+
+      // Capture on resume rather than create: a CLEAR_TOP|SINGLE_TOP conversation intent may be
+      // delivered to an existing MainActivity via onNewIntent, which never fires onActivityCreated.
+      override fun onActivityResumed(activity: Activity) {
+        if (activity is MainActivity) {
+          holder[0] = activity
+          resumed.countDown()
+        }
+      }
+
+      override fun onActivityStarted(activity: Activity) = Unit
+      override fun onActivityPaused(activity: Activity) = Unit
+      override fun onActivityStopped(activity: Activity) = Unit
+      override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit
+      override fun onActivityDestroyed(activity: Activity) = Unit
+    }
+    app.registerActivityLifecycleCallbacks(callbacks)
+
+    app.startActivity(launchIntent)
+    if (!resumed.await(15, TimeUnit.SECONDS)) {
+      app.unregisterActivityLifecycleCallbacks(callbacks)
+      error("MainActivity did not reach RESUMED within 15s")
+    }
+    app.unregisterActivityLifecycleCallbacks(callbacks)
+
+    return holder[0] ?: error("MainActivity was not captured")
+  }
+
+  private fun awaitView(activity: FragmentActivity, viewId: Int): View {
+    return await(description = "view $viewId") {
+      activity.findViewById<View>(viewId)?.takeIf { it.isShown }
+    }
+  }
+
+  private fun <T> await(
+    timeoutMs: Long = 15_000,
+    pollMs: Long = 50,
+    description: String,
+    supplier: () -> T?
+  ): T {
+    val deadline = System.currentTimeMillis() + timeoutMs
+    while (System.currentTimeMillis() < deadline) {
+      val result = runOnMainSync(supplier)
+      if (result != null) return result
+      Thread.sleep(pollMs)
+    }
+    error("Timed out after ${timeoutMs}ms waiting for $description")
+  }
+
+  private fun <T> runOnMainSync(block: () -> T): T {
+    var result: Result<T> = Result.failure(IllegalStateException("runOnMainSync produced no result"))
+    InstrumentationRegistry.getInstrumentation().runOnMainSync { result = runCatching(block) }
+    return result.getOrThrow()
+  }
+
+  private fun donorBadge(): Badge {
+    return Badge(
+      id = "test-donor-badge",
+      category = Badge.Category.Donor,
+      name = "Signal Sustainer",
+      description = "",
+      imageUrl = Uri.EMPTY,
+      imageDensity = "xxhdpi",
+      expirationTimestamp = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(30),
+      visible = true,
+      duration = TimeUnit.DAYS.toMillis(30)
+    )
+  }
+
+  companion object {
+    private const val ONE_TIME_NAV_TAG = "one_time_nav"
+  }
+}

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
@@ -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
@@ -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/dependencies/InstrumentationApplicationDependencyProvider.kt

@@ -3,19 +3,28 @@ package org.thoughtcrime.securesms.dependencies
 import android.app.Application
 import io.mockk.mockk
 import io.mockk.spyk
+import okhttp3.OkHttpClient
+import org.signal.core.util.UptimeSleepTimer
 import org.signal.core.util.billing.BillingApi
+import org.signal.libsignal.net.Network
+import org.signal.libsignal.zkgroup.receipts.ClientZkReceiptOperations
 import org.signal.network.api.ArchiveApi
+import org.signal.network.config.SignalServiceConfiguration
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess
 import org.thoughtcrime.securesms.recipients.LiveRecipientCache
+import org.thoughtcrime.securesms.testing.endpoints.DonationTestServer
+import org.thoughtcrime.securesms.testing.endpoints.MockEndpoints
+import org.thoughtcrime.securesms.testing.endpoints.ResponderInterceptor
+import org.thoughtcrime.securesms.testing.endpoints.ResponderWebSocketConnection
 import org.whispersystems.signalservice.api.SignalServiceDataStore
 import org.whispersystems.signalservice.api.SignalServiceMessageSender
 import org.whispersystems.signalservice.api.account.AccountApi
-import org.whispersystems.signalservice.api.donations.DonationsApi
 import org.whispersystems.signalservice.api.keys.KeysApi
 import org.whispersystems.signalservice.api.message.MessageApi
 import org.whispersystems.signalservice.api.websocket.SignalWebSocket
-import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration
 import org.whispersystems.signalservice.internal.push.PushServiceSocket
+import java.util.function.Supplier
+import kotlin.time.Duration.Companion.seconds
 
 /**
  * Dependency provider used for instrumentation tests (aka androidTests).
@@ -45,8 +54,54 @@ class InstrumentationApplicationDependencyProvider(val application: Application,
     return mockk()
   }
 
-  override fun provideDonationsApi(authWebSocket: SignalWebSocket.AuthenticatedWebSocket, unauthWebSocket: SignalWebSocket.UnauthenticatedWebSocket): DonationsApi {
-    return mockk()
+  /**
+   * Adds the Stripe-matching [ResponderInterceptor] on top of the default client (which supplies the
+   * user agent + DNS), so `api.stripe.com` requests made by [org.signal.donations.StripeApi] are
+   * answered from the shared [MockEndpoints.responder] and never hit the real network.
+   */
+  override fun provideOkHttpClient(): OkHttpClient {
+    return default.provideOkHttpClient()
+      .newBuilder()
+      .addInterceptor(ResponderInterceptor(MockEndpoints.responder))
+      .build()
+  }
+
+  /**
+   * Backs the real [org.whispersystems.signalservice.api.donations.DonationsApi] (and any other
+   * websocket API) with a [ResponderWebSocketConnection] driven by the shared [MockEndpoints.responder],
+   * so Signal-service requests are answered from the scenario's "world" and never hit the network.
+   */
+  override fun provideAuthWebSocket(
+    signalServiceConfigurationSupplier: Supplier<SignalServiceConfiguration>,
+    libSignalNetworkSupplier: Supplier<Network>
+  ): SignalWebSocket.AuthenticatedWebSocket {
+    return SignalWebSocket.AuthenticatedWebSocket(
+      connectionFactory = { ResponderWebSocketConnection(MockEndpoints.responder) },
+      canConnect = { true },
+      sleepTimer = UptimeSleepTimer(),
+      disconnectTimeoutMs = 15.seconds.inWholeMilliseconds
+    )
+  }
+
+  override fun provideUnauthWebSocket(
+    signalServiceConfigurationSupplier: Supplier<SignalServiceConfiguration>,
+    libSignalNetworkSupplier: Supplier<Network>
+  ): SignalWebSocket.UnauthenticatedWebSocket {
+    return SignalWebSocket.UnauthenticatedWebSocket(
+      connectionFactory = { ResponderWebSocketConnection(MockEndpoints.responder) },
+      canConnect = { true },
+      sleepTimer = UptimeSleepTimer(),
+      disconnectTimeoutMs = 15.seconds.inWholeMilliseconds
+    )
+  }
+
+  /**
+   * Uses the test zk server's public params so credentials minted by [MockEndpoints] validate here.
+   * The real [ClientZkReceiptOperations.receiveReceiptCredential] validation still runs in the
+   * receipt-credential context job — only the params are swapped for test ones.
+   */
+  override fun provideClientZkReceiptOperations(signalServiceConfiguration: SignalServiceConfiguration): ClientZkReceiptOperations {
+    return DonationTestServer.clientReceiptOperations
   }
 
   override fun provideSignalServiceMessageSender(

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

@@ -121,8 +121,6 @@ class BackupSubscriptionCheckJobTest {
       )
     )
 
-    every { AppDependencies.donationsApi.putSubscription(any()) } returns NetworkResult.Success(Unit)
-
     insertSubscriber()
   }
 

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

@@ -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}"

app/src/androidTest/java/org/thoughtcrime/securesms/megaphone/DonationMegaphoneGatingTest.kt

@@ -0,0 +1,84 @@
+/*
+ * Copyright 2026 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.megaphone
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import assertk.assertions.isFalse
+import assertk.assertions.isNull
+import assertk.assertions.isTrue
+import io.mockk.every
+import io.mockk.mockkObject
+import io.mockk.mockkStatic
+import io.mockk.unmockkObject
+import io.mockk.unmockkStatic
+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.thoughtcrime.securesms.components.settings.app.subscription.InAppDonations
+import org.thoughtcrime.securesms.database.InAppPaymentTable
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.testing.InAppPaymentsRule
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+import org.thoughtcrime.securesms.util.VersionTracker
+
+/**
+ * The "user might be a sustainer" rule for the donations remote megaphone: the `standard_donate`
+ * conditional (via [RemoteMegaphoneRepository.getRemoteMegaphoneToShow]) suppresses the megaphone for
+ * existing donors and shows it otherwise.
+ */
+@RunWith(AndroidJUnit4::class)
+class DonationMegaphoneGatingTest {
+
+  @get:Rule
+  val harness = SignalActivityRule()
+
+  @get:Rule
+  val iapRule = InAppPaymentsRule()
+
+  @Before
+  fun setUp() {
+    SignalDatabase.inAppPayments.writableDatabase.deleteAll(InAppPaymentTable.TABLE_NAME)
+    SignalDatabase.remoteMegaphones.debugRemoveAll()
+    setSelfBadges(emptyList())
+
+    // Freshly-installed test APKs report 0 days installed and no configured payment methods, both of
+    // which independently fail shouldShowDonateMegaphone. Fix them so the donor badge is the only
+    // variable across the gating tests.
+    mockkStatic(VersionTracker::class)
+    mockkObject(InAppDonations)
+    every { VersionTracker.getDaysSinceFirstInstalled(any()) } returns 30L
+    every { InAppDonations.hasAtLeastOnePaymentMethodAvailable() } returns true
+  }
+
+  @After
+  fun tearDown() {
+    unmockkStatic(VersionTracker::class)
+    unmockkObject(InAppDonations)
+  }
+
+  @Test
+  fun nonDonor_showsStandardDonateMegaphone() {
+    val record = donateMegaphoneRecord(conditionalId = "standard_donate")
+    SignalDatabase.remoteMegaphones.insert(record)
+
+    assertThat(RemoteMegaphoneRepository.getRemoteMegaphoneToShow()?.uuid).isEqualTo(record.uuid)
+    assertThat(RemoteMegaphoneRepository.hasRemoteMegaphoneToShow(canShowLocalDonate = true)).isTrue()
+  }
+
+  @Test
+  fun sustainer_donorBadge_suppressesStandardDonateMegaphone() {
+    SignalDatabase.remoteMegaphones.insert(donateMegaphoneRecord(conditionalId = "standard_donate"))
+    setSelfBadges(listOf(donorBadge()))
+
+    assertThat(RemoteMegaphoneRepository.getRemoteMegaphoneToShow()).isNull()
+    assertThat(RemoteMegaphoneRepository.hasRemoteMegaphoneToShow(canShowLocalDonate = true)).isFalse()
+  }
+}

app/src/androidTest/java/org/thoughtcrime/securesms/megaphone/DonationMegaphoneTest.kt

@@ -0,0 +1,113 @@
+/*
+ * Copyright 2026 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.megaphone
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import androidx.compose.ui.test.junit4.v2.createComposeRule
+import androidx.compose.ui.test.onNodeWithText
+import androidx.compose.ui.test.performClick
+import androidx.fragment.app.DialogFragment
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+import assertk.assertions.isNotNull
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.signal.core.ui.compose.theme.SignalTheme
+import org.signal.core.util.getSerializableCompat
+import org.signal.donations.InAppPaymentType
+import org.thoughtcrime.securesms.components.settings.app.subscription.donate.CheckoutFlowActivity
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.RemoteMegaphoneRecord
+import org.thoughtcrime.securesms.testing.InAppPaymentsRule
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+
+/**
+ * Entry-path coverage for the donations remote megaphone: the megaphone shown on the conversation list
+ * that carries a "Donate" action into the one-time checkout flow.
+ *
+ * The megaphone renders through [MegaphoneComponent], so this renders that composable directly (rather
+ * than launching the full [org.thoughtcrime.securesms.MainActivity]) and asserts that tapping Donate
+ * runs the production [RemoteMegaphoneRepository] action, which navigates to [CheckoutFlowActivity]
+ * with [InAppPaymentType.ONE_TIME_DONATION]. The sustainer gating is covered by [DonationMegaphoneGatingTest].
+ */
+@RunWith(AndroidJUnit4::class)
+class DonationMegaphoneTest {
+
+  @get:Rule
+  val harness = SignalActivityRule()
+
+  @get:Rule
+  val iapRule = InAppPaymentsRule()
+
+  @get:Rule
+  val composeRule = createComposeRule()
+
+  private val context: Context get() = InstrumentationRegistry.getInstrumentation().targetContext
+
+  @Before
+  fun setUp() {
+    SignalDatabase.remoteMegaphones.debugRemoveAll()
+  }
+
+  @Test
+  fun donateMegaphone_donateClick_opensOneTimeCheckout() {
+    val record = donateMegaphoneRecord(conditionalId = null)
+    SignalDatabase.remoteMegaphones.insert(record)
+
+    val controller = RecordingMegaphoneActionController()
+
+    composeRule.setContent {
+      SignalTheme {
+        MegaphoneComponent(buildDonateMegaphone(record), controller)
+      }
+    }
+
+    composeRule.onNodeWithText(record.primaryActionText!!).performClick()
+
+    val intent = controller.navigationIntent
+    assertThat(intent).isNotNull()
+    assertThat(intent!!.component?.className).isEqualTo(CheckoutFlowActivity::class.java.name)
+
+    val type = intent.extras!!.getSerializableCompat(CheckoutFlowActivity.ARG_IN_APP_PAYMENT_TYPE, InAppPaymentType::class.java)
+    assertThat(type).isEqualTo(InAppPaymentType.ONE_TIME_DONATION)
+  }
+
+  /** Mirrors [Megaphones.buildRemoteMegaphone]: wires the primary button to the real repository action. */
+  private fun buildDonateMegaphone(record: RemoteMegaphoneRecord): Megaphone {
+    return Megaphone.Builder(Megaphones.Event.REMOTE_MEGAPHONE, Megaphone.Style.BASIC)
+      .setTitle(record.title)
+      .setBody(record.body)
+      .setActionButton(record.primaryActionText!!) { _, controller ->
+        RemoteMegaphoneRepository.getAction(record.primaryActionId!!).run(context, controller, record)
+      }
+      .build()
+  }
+
+  private class RecordingMegaphoneActionController : MegaphoneActionController {
+    var navigationIntent: Intent? = null
+      private set
+
+    override fun onMegaphoneNavigationRequested(intent: Intent) {
+      navigationIntent = intent
+    }
+
+    override fun onMegaphoneNavigationRequested(intent: Intent, requestCode: Int) {
+      navigationIntent = intent
+    }
+
+    override fun onMegaphoneToastRequested(string: String) = Unit
+    override fun getMegaphoneActivity(): Activity = throw UnsupportedOperationException("not used")
+    override fun onMegaphoneSnooze(event: Megaphones.Event) = Unit
+    override fun onMegaphoneCompleted(event: Megaphones.Event) = Unit
+    override fun onMegaphoneDialogFragmentRequested(dialogFragment: DialogFragment) = Unit
+  }
+}

app/src/androidTest/java/org/thoughtcrime/securesms/megaphone/DonationMegaphoneTestSupport.kt

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2026 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.megaphone
+
+import android.net.Uri
+import org.thoughtcrime.securesms.badges.models.Badge
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.RemoteMegaphoneRecord
+import org.thoughtcrime.securesms.recipients.Recipient
+import java.util.UUID
+import java.util.concurrent.TimeUnit
+
+fun donateMegaphoneRecord(conditionalId: String?): RemoteMegaphoneRecord {
+  val now = System.currentTimeMillis()
+  return RemoteMegaphoneRecord(
+    priority = 100,
+    uuid = UUID.randomUUID().toString(),
+    countries = null,
+    minimumVersion = 1,
+    doNotShowBefore = now - TimeUnit.DAYS.toMillis(2),
+    doNotShowAfter = now + TimeUnit.DAYS.toMillis(28),
+    showForNumberOfDays = 30,
+    conditionalId = conditionalId,
+    primaryActionId = RemoteMegaphoneRecord.ActionId.DONATE,
+    secondaryActionId = RemoteMegaphoneRecord.ActionId.SNOOZE,
+    imageUrl = null,
+    title = "Donate Test",
+    body = "Donate body test.",
+    primaryActionText = "Donate",
+    secondaryActionText = "Snooze"
+  )
+}
+
+fun donorBadge(): Badge {
+  return Badge(
+    id = "test-donor-badge",
+    category = Badge.Category.Donor,
+    name = "Signal Sustainer",
+    description = "",
+    imageUrl = Uri.EMPTY,
+    imageDensity = "xxhdpi",
+    expirationTimestamp = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(30),
+    visible = true,
+    duration = TimeUnit.DAYS.toMillis(30)
+  )
+}
+
+fun setSelfBadges(badges: List<Badge>) {
+  SignalDatabase.recipients.setBadges(Recipient.self().id, badges)
+  Recipient.self().fresh()
+}

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

@@ -101,7 +101,7 @@ class DataMessageProcessorTest_polls {
       message = DataMessage(pollTerminate = DataMessage.PollTerminate(targetSentTimestamp = 100)),
       senderRecipient = alice,
       metadata = EnvelopeMetadata(alice.requireServiceId(), null, 1, false, null, harness.self.requireServiceId(), CiphertextMessage.WHISPER_TYPE),
-      threadRecipient = bob,
+      threadRecipient = Recipient.resolved(groupRecipientId),
       groupId = groupId,
       receivedTime = 200
     )
@@ -310,6 +310,7 @@ class DataMessageProcessorTest_polls {
       envelope = MessageContentFuzzer.envelope(100),
       message = DataMessage(pollVote = pollVote),
       senderRecipient = senderRecipient,
+      threadRecipient = Recipient.resolved(groupRecipientId),
       earlyMessageCacheEntry = null
     )
   }

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

@@ -26,6 +26,7 @@ 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.thoughtcrime.securesms.util.TextSecurePreferences
 import org.whispersystems.signalservice.api.push.SignalServiceAddress
 import org.whispersystems.signalservice.internal.push.AddressableMessage
 import org.whispersystems.signalservice.internal.push.AttachmentPointer
@@ -51,6 +52,14 @@ class SyncMessageProcessorTest_attachmentBackfill {
     originalDeviceId = SignalStore.account.deviceId
     // Make this device a linked device so backfill response handling activates.
     SignalStore.account.deviceId = 2
+
+    // Prevent AttachmentDownloadJob onAdded from async changing the attachment state.
+    TextSecurePreferences.getSharedPreferences(harness.application)
+      .edit()
+      .putStringSet(TextSecurePreferences.MEDIA_DOWNLOAD_WIFI_PREF, emptySet())
+      .putStringSet(TextSecurePreferences.MEDIA_DOWNLOAD_MOBILE_PREF, emptySet())
+      .putStringSet(TextSecurePreferences.MEDIA_DOWNLOAD_ROAMING_PREF, emptySet())
+      .commit()
   }
 
   @After

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

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2026 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.testing
+
+import android.provider.Settings
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.rules.ExternalResource
+import java.io.FileInputStream
+
+/**
+ * Disables system animation scales for the duration of a test and restores them afterward.
+ *
+ * Espresso and [android.app.Instrumentation.waitForIdleSync] only make progress once the main looper is idle. An
+ * on-screen indeterminate animation (e.g. the checkout's `CircularProgressIndicator`) posts frame callbacks forever, so
+ * the looper never idles and any idle-gated wait hangs indefinitely rather than timing out. Forcing the scales to 0
+ * stops those animations so the looper can idle.
+ *
+ * Writes go through the shell (`UiAutomation`), which holds `WRITE_SECURE_SETTINGS`; the app process does not.
+ */
+class DisableAnimationsRule : ExternalResource() {
+
+  private val scales = listOf(
+    Settings.Global.WINDOW_ANIMATION_SCALE,
+    Settings.Global.TRANSITION_ANIMATION_SCALE,
+    Settings.Global.ANIMATOR_DURATION_SCALE
+  )
+
+  private lateinit var previous: Map<String, Float>
+
+  override fun before() {
+    val resolver = InstrumentationRegistry.getInstrumentation().targetContext.contentResolver
+    previous = scales.associateWith { Settings.Global.getFloat(resolver, it, 1f) }
+    scales.forEach { putScale(it, 0f) }
+  }
+
+  override fun after() {
+    if (::previous.isInitialized) {
+      previous.forEach { (key, value) -> putScale(key, value) }
+    }
+  }
+
+  private fun putScale(key: String, value: Float) {
+    val stream = InstrumentationRegistry.getInstrumentation().uiAutomation.executeShellCommand("settings put global $key $value")
+    FileInputStream(stream.fileDescriptor).use { it.readBytes() }
+  }
+}

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

@@ -7,38 +7,90 @@ package org.thoughtcrime.securesms.testing
 
 import androidx.test.platform.app.InstrumentationRegistry
 import io.mockk.every
+import org.json.JSONObject
 import org.junit.rules.ExternalResource
-import org.signal.core.util.JsonUtils
 import org.signal.network.NetworkResult
 import org.thoughtcrime.securesms.dependencies.AppDependencies
-import org.whispersystems.signalservice.internal.push.SubscriptionsConfiguration
+import org.thoughtcrime.securesms.testing.endpoints.DonationResponses
+import org.thoughtcrime.securesms.testing.endpoints.DonationTestServer
+import org.thoughtcrime.securesms.testing.endpoints.EndpointResponse
+import org.thoughtcrime.securesms.testing.endpoints.MockEndpoints
+import org.thoughtcrime.securesms.testing.endpoints.delete
+import org.thoughtcrime.securesms.testing.endpoints.get
+import org.thoughtcrime.securesms.testing.endpoints.ok
+import org.thoughtcrime.securesms.testing.endpoints.post
+import org.thoughtcrime.securesms.testing.endpoints.put
+import org.whispersystems.signalservice.internal.push.WhoAmIResponse
 
 /**
- * Sets up some common infrastructure for on-device InAppPayment testing
+ * Sets up common infrastructure for on-device InAppPayment testing.
+ *
+ * The Signal-service edge is driven through the shared [MockEndpoints.responder] (the real
+ * [org.whispersystems.signalservice.api.donations.DonationsApi] runs against these handlers), while
+ * account/archive lookups that are not websocket-backed here stay mocked via mockk. A scenario can
+ * override any default by registering a more specific handler after this rule runs (last-registered
+ * wins).
  */
 class InAppPaymentsRule : ExternalResource() {
+
   override fun before() {
-    initialiseConfigurationResponse()
-    initialisePutSubscription()
+    MockEndpoints.responder.clear()
+    registerDonationServiceDefaults()
     initialiseSetArchiveBackupId()
+    initialiseSetAccountAttributes()
+    initialiseAccountLookups()
   }
 
-  private fun initialiseConfigurationResponse() {
-    val assets = InstrumentationRegistry.getInstrumentation().context.resources.assets
-    val response = assets.open("inAppPaymentsTests/configuration.json").use { stream ->
-      NetworkResult.Success(JsonUtils.fromJson(stream, SubscriptionsConfiguration::class.java))
-    }
-
-    AppDependencies.donationsApi.apply {
-      every { getDonationsConfiguration(any()) } returns response
-    }
+  override fun after() {
+    MockEndpoints.responder.clear()
   }
 
-  private fun initialisePutSubscription() {
-    AppDependencies.donationsApi.apply {
-      every { putSubscription(any()) } returns NetworkResult.Success(Unit)
-      every { createSubscriber(any(), any()) } returns NetworkResult.Success(Unit)
+  /**
+   * Default happy-path responses for the Signal donations endpoints. Registered generic-to-specific
+   * so more specific paths registered later win.
+   */
+  private fun registerDonationServiceDefaults() {
+    val responder = MockEndpoints.responder
+
+    // Subscriber lifecycle: create/put/update-level (PUT), cancel (DELETE) all succeed by default.
+    responder.put("/v1/subscription/") { ok() }
+    responder.delete("/v1/subscription/") { ok() }
+
+    // getSubscription defaults to "no active subscription".
+    responder.get("/v1/subscription/") { ok(DonationResponses.emptySubscription()) }
+
+    // Donations configuration (registered after the generic GET so it wins for its path).
+    val configuration = InstrumentationRegistry.getInstrumentation().context.resources.assets
+      .open("inAppPaymentsTests/configuration.json")
+      .use { it.readBytes().decodeToString() }
+    responder.get("/v1/subscription/configuration") { ok(configuration) }
+
+    // SEPA bank-transfer mandate text (registered after the generic GET so it wins for its path).
+    responder.get("/v1/subscription/bank_mandate/") { ok(DonationResponses.bankMandate()) }
+
+    // One-time (boost) payment intent.
+    responder.post("/v1/subscription/boost/create") { ok(DonationResponses.stripeClientSecret()) }
+
+    // Recurring payment method setup + default payment method + level are keyed by subscriber id in
+    // the middle of the path, so match on a distinctive suffix.
+    responder.register({ it.method == "POST" && it.path.contains("/create_payment_method") && !it.path.contains("paypal") }) {
+      ok(DonationResponses.setupIntentClientSecret())
     }
+    responder.register({ it.method == "POST" && it.path.contains("/default_payment_method") }) { ok() }
+
+    // Receipt credential submission (boost + recurring) — mint a valid credential from the client's request.
+    responder.register({ it.method == "POST" && it.path.contains("/receipt_credentials") }) { request ->
+      mintReceiptCredential(request.bodyString)
+    }
+
+    // Redemption.
+    responder.post("/v1/donation/redeem-receipt") { ok() }
+  }
+
+  private fun mintReceiptCredential(requestBody: String): EndpointResponse {
+    val requestBase64 = JSONObject(requestBody).getString("receiptCredentialRequest")
+    val minted = DonationTestServer.issueReceiptCredential(requestBase64)
+    return ok(DonationResponses.receiptCredential(minted))
   }
 
   private fun initialiseSetArchiveBackupId() {
@@ -46,4 +98,20 @@ 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)
+    }
+  }
+
+  /**
+   * whoAmI is served by the (still mocked) account API rather than the websocket responder, so
+   * background jobs that resolve the account during a test hit a handled path instead of throwing.
+   */
+  private fun initialiseAccountLookups() {
+    AppDependencies.accountApi.apply {
+      every { whoAmI() } returns NetworkResult.Success(WhoAmIResponse(number = "+15555550123"))
+    }
+  }
 }

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/androidTest/java/org/thoughtcrime/securesms/testing/incomingmessageobserver/IncomingMessageObserverDependencyProvider.kt

@@ -4,13 +4,13 @@ import android.app.Application
 import org.signal.benchmark.setup.NoOpJob
 import org.signal.core.util.UptimeSleepTimer
 import org.signal.libsignal.net.Network
+import org.signal.network.config.SignalServiceConfiguration
 import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencyProvider
 import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
 import org.thoughtcrime.securesms.jobmanager.JobManager
 import org.thoughtcrime.securesms.jobs.JobManagerFactories
 import org.whispersystems.signalservice.api.websocket.SignalWebSocket
-import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration
 import org.whispersystems.signalservice.internal.websocket.BenchmarkWebSocketConnection
 import java.util.function.Supplier
 import kotlin.time.Duration.Companion.seconds

app/src/benchmark/java/org/thoughtcrime/securesms/BenchmarkApplicationContext.kt

@@ -9,13 +9,13 @@ import android.app.Application
 import org.signal.benchmark.setup.NoOpJob
 import org.signal.core.util.UptimeSleepTimer
 import org.signal.libsignal.net.Network
+import org.signal.network.config.SignalServiceConfiguration
 import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencyProvider
 import org.thoughtcrime.securesms.jobmanager.JobManager
 import org.thoughtcrime.securesms.jobs.JobManagerFactories
 import org.thoughtcrime.securesms.net.DeviceTransferBlockingInterceptor
 import org.whispersystems.signalservice.api.websocket.SignalWebSocket
-import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration
 import org.whispersystems.signalservice.internal.websocket.BenchmarkWebSocketConnection
 import java.util.function.Supplier
 import kotlin.time.Duration.Companion.seconds

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

@@ -16,6 +16,7 @@ import org.signal.benchmark.setup.Harness
 import org.signal.benchmark.setup.OtherClient
 import org.signal.core.util.ThreadUtil
 import org.signal.core.util.logging.Log
+import org.signal.network.websocket.WebSocketRequestMessage
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.TestDbUtils
 import org.thoughtcrime.securesms.dependencies.AppDependencies
@@ -23,7 +24,6 @@ import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.whispersystems.signalservice.internal.push.Envelope
 import org.whispersystems.signalservice.internal.websocket.BenchmarkWebSocketConnection
-import org.signal.network.websocket.WebSocketRequestMessage
 import kotlin.random.Random
 
 /**

app/src/benchmarkShared/java/org/signal/benchmark/setup/NoOpJob.kt

@@ -78,7 +78,6 @@ class NoOpJob(parameters: Parameters) : Job(parameters) {
       StoryOnboardingDownloadJob.KEY
     )
 
-    fun replaceFactories(factories: Map<String, Job.Factory<*>>): Map<String, Job.Factory<*>> =
-      factories.mapValues { if (it.key in STARTUP_NETWORK_JOB_KEYS) Factory() else it.value }
+    fun replaceFactories(factories: Map<String, Job.Factory<*>>): Map<String, Job.Factory<*>> = factories.mapValues { if (it.key in STARTUP_NETWORK_JOB_KEYS) Factory() else it.value }
   }
 }

app/src/benchmarkShared/java/org/whispersystems/signalservice/internal/websocket/BenchmarkWebSocketConnection.kt

@@ -8,10 +8,10 @@ package org.whispersystems.signalservice.internal.websocket
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.subjects.BehaviorSubject
+import org.signal.core.util.JsonUtils
 import org.signal.network.websocket.WebSocketRequestMessage
 import org.signal.network.websocket.WebSocketResponseMessage
 import org.signal.network.websocket.WebsocketResponse
-import org.signal.core.util.JsonUtils
 import org.thoughtcrime.securesms.util.SignalTrace
 import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState
 import org.whispersystems.signalservice.internal.push.SendMessageResponse

app/src/main/AndroidManifest.xml

@@ -469,18 +469,18 @@
         <activity
             android:name=".mediasend.v2.MediaSelectionActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
+            android:screenOrientation="portrait"
             android:exported="false"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
             android:theme="@style/TextSecure.DarkNoActionBar"
             android:windowSoftInputMode="stateAlwaysHidden|adjustNothing" />
 
         <activity
             android:name=".mediasend.v3.MediaSendV3Activity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
+            android:screenOrientation="portrait"
             android:exported="false"
             android:launchMode="singleTop"
-            android:screenOrientation="portrait"
             android:theme="@style/Signal.DayNight.NoActionBar"
             android:windowSoftInputMode="stateAlwaysHidden|adjustNothing" />
 
@@ -522,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"
@@ -885,6 +892,14 @@
             android:launchMode="singleTask"
             android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
 
+        <activity
+            android:name=".clockskew.ClockSkewActivity"
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+            android:excludeFromRecents="true"
+            android:exported="false"
+            android:launchMode="singleTask"
+            android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
+
         <activity
             android:name=".ratelimit.RecaptchaProofActivity"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
@@ -1529,7 +1544,7 @@
         </receiver>
 
         <receiver
-            android:name="org.thoughtcrime.securesms.jobs.ForegroundServiceUtil$Receiver"
+            android:name="org.signal.core.util.ForegroundServiceUtil$Receiver"
             android:exported="false" />
 
         <receiver

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

@@ -52,7 +52,8 @@ 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.components.settings.app.AppSettingsActivity;
+import org.thoughtcrime.securesms.clockskew.ClockSkewDetector;
+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;
@@ -186,9 +187,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())
@@ -420,6 +421,7 @@ public class ApplicationContext extends Application implements AppForegroundObse
       AppDependencies.init(this, new ApplicationDependencyProvider(this));
     }
     AppForegroundObserver.begin();
+    ClockSkewDetector.beginObserving(this);
 
     if (Environment.USE_NEW_REGISTRATION) {
       initializeRegistrationDependencies();
@@ -429,7 +431,7 @@ public class ApplicationContext extends Application implements AppForegroundObse
   private void initializeRegistrationDependencies() {
     RegistrationDependencies.provide(
       new RegistrationDependencies(
-        new AppRegistrationNetworkController(this, AppDependencies.getPushServiceSocket()),
+        new AppRegistrationNetworkController(this, AppDependencies.getRegistrationApiV2()),
         new AppRegistrationStorageController(this),
         Environment.IS_LINK_AND_SYNC_AVAILABLE,
         null,
@@ -438,7 +440,7 @@ public class ApplicationContext extends Application implements AppForegroundObse
           return Unit.INSTANCE;
         },
         context -> {
-          context.startActivity(AppSettingsActivity.proxy(context));
+          context.startActivity(EditProxyActivity.intent(context));
           return Unit.INSTANCE;
         },
         (context, subject) -> {

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

@@ -36,6 +36,7 @@ import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.FullscreenHelper;
+import org.thoughtcrime.securesms.util.WindowUtil;
 
 /**
  * Activity for displaying avatars full screen.
@@ -77,6 +78,9 @@ public final class AvatarPreviewActivity extends PassphraseRequiredActivity {
     setTheme(R.style.TextSecure_MediaPreview);
     setContentView(R.layout.contact_photo_preview_activity);
 
+    WindowUtil.clearLightStatusBar(getWindow());
+    WindowUtil.clearLightNavigationBar(getWindow());
+
     postponeEnterTransition();
     TransitionInflater inflater = TransitionInflater.from(this);
     getWindow().setSharedElementEnterTransition(inflater.inflateTransition(R.transition.full_screen_avatar_image_enter_transition_set));

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

@@ -6,6 +6,7 @@ import android.content.res.Configuration;
 import android.os.Bundle;
 import android.view.View;
 
+import androidx.activity.EdgeToEdge;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
@@ -34,6 +35,7 @@ public abstract class BaseActivity extends AppCompatActivity {
   protected void onCreate(Bundle savedInstanceState) {
     AppStartup.getInstance().onCriticalRenderEventStart();
     logEvent("onCreate()");
+    EdgeToEdge.enable(this);
     super.onCreate(savedInstanceState);
     AppStartup.getInstance().onCriticalRenderEventEnd();
   }

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

@@ -19,9 +19,11 @@ package org.thoughtcrime.securesms;
 import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.view.WindowInsetsCompat;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import org.signal.core.util.DimensionUnit;
@@ -34,6 +36,7 @@ import org.thoughtcrime.securesms.contacts.sync.ContactDiscovery;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.SystemWindowInsetsSetter;
 
 import java.io.IOException;
 import java.lang.ref.WeakReference;
@@ -110,11 +113,16 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActivit
     getSupportActionBar().setDisplayHomeAsUpEnabled(false);
     getSupportActionBar().setIcon(null);
     getSupportActionBar().setLogo(null);
+
+    toolbar.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT;
+    SystemWindowInsetsSetter.attach(toolbar, this, WindowInsetsCompat.Type.statusBars());
   }
 
   private void initializeResources() {
     contactsFragment = (ContactSelectionListFragment) getSupportFragmentManager().findFragmentById(R.id.contact_selection_list_fragment);
     contactsFragment.setOnRefreshListener(this);
+
+    SystemWindowInsetsSetter.attach(contactsFragment.requireView(), this, WindowInsetsCompat.Type.navigationBars());
   }
 
   private void initializeSearch() {

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/DeviceProvisioningActivity.java

@@ -9,10 +9,10 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
 
 public class DeviceProvisioningActivity extends PassphraseRequiredActivity {
 
-  @SuppressWarnings("unused")
   private static final String TAG = Log.tag(DeviceProvisioningActivity.class);
 
   @Override
@@ -22,6 +22,13 @@ public class DeviceProvisioningActivity extends PassphraseRequiredActivity {
 
   @Override
   protected void onCreate(Bundle bundle, boolean ready) {
+    if (SignalStore.account().isLinkedDevice()) {
+      Log.i(TAG, "Cannot link a device from a linked device. Ignoring provisioning intent.");
+      startActivity(MainActivity.clearTop(this));
+      finish();
+      return;
+    }
+
     AlertDialog dialog = new MaterialAlertDialogBuilder(this)
         .setTitle(getString(R.string.DeviceProvisioningActivity_link_a_signal_device))
         .setMessage(getString(R.string.DeviceProvisioningActivity_to_link_a_desktop_or_ipad_to_this_signal_account))

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

@@ -76,6 +76,7 @@ import androidx.lifecycle.createSavedStateHandle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
+import androidx.navigation3.runtime.NavKey
 import androidx.navigation3.runtime.entryProvider
 import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator
 import androidx.navigation3.ui.NavDisplay
@@ -145,7 +146,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.DetailsScreenNavHost
 import org.thoughtcrime.securesms.main.MainBottomChrome
 import org.thoughtcrime.securesms.main.MainBottomChromeCallback
 import org.thoughtcrime.securesms.main.MainBottomChromeState
@@ -165,10 +165,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.navigateToDetailLocation
-import org.thoughtcrime.securesms.main.rememberDetailNavHostController
-import org.thoughtcrime.securesms.main.rememberFocusRequester
-import org.thoughtcrime.securesms.main.storiesNavGraphBuilder
 import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionActivity
 import org.thoughtcrime.securesms.mediasend.v3.mediaSendLauncher
 import org.thoughtcrime.securesms.megaphone.Megaphone
@@ -183,9 +179,8 @@ 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
@@ -506,50 +501,6 @@ class MainActivity :
           mainNavigationViewModel.onSplitPaneChanged(isSplitPane)
         }
 
-        val storiesNavHostController = rememberDetailNavHostController(
-          onRequestFocus = rememberFocusRequester(
-            mainNavigationViewModel = mainNavigationViewModel,
-            currentListLocation = mainNavigationState.currentListLocation
-          ) { it == MainNavigationListLocation.STORIES }
-        ) {
-          storiesNavGraphBuilder()
-        }
-
-        LaunchedEffect(Unit) {
-          fun navigateToLocation(location: MainNavigationDetailLocation) {
-            when (location) {
-              is MainNavigationDetailLocation.Empty -> {
-                when (mainNavigationState.currentListLocation) {
-                  MainNavigationListLocation.CHATS, MainNavigationListLocation.ARCHIVE -> {
-                    throw IllegalStateException("Navigation to ${mainNavigationState.currentListLocation} should be handled by ChatsBackStack.")
-                  }
-
-                  MainNavigationListLocation.CALLS -> {
-                    throw IllegalStateException("Navigation to ${MainNavigationListLocation.CALLS} should be handled by CallsBackStack.")
-                  }
-
-                  MainNavigationListLocation.STORIES -> storiesNavHostController.navigateToDetailLocation(location)
-                }
-              }
-
-              is MainNavigationDetailLocation.Conversation, is MainNavigationDetailLocation.Chats -> {
-                throw IllegalStateException("Navigation to $location should be handled by ChatsBackStack.")
-              }
-
-              is MainNavigationDetailLocation.CallLinkDetails, is MainNavigationDetailLocation.Calls -> {
-                throw IllegalStateException("Navigation to $location should be handled by CallsBackStack.")
-              }
-
-              is MainNavigationDetailLocation.Stories -> storiesNavHostController.navigateToDetailLocation(location)
-            }
-          }
-
-          mainNavigationViewModel.earlyNavigationDetailLocationRequested?.let { navigateToLocation(it) }
-          mainNavigationViewModel.clearEarlyDetailLocation()
-
-          mainNavigationViewModel.detailLocation.collect { navigateToLocation(it) }
-        }
-
         val scope = rememberCoroutineScope()
 
         BackHandler(paneExpansionState.currentAnchor == detailOnlyAnchor) {
@@ -721,38 +672,54 @@ class MainActivity :
             }
           },
           primaryContent = {
-            when (mainNavigationState.currentListLocation) {
-              MainNavigationListLocation.CHATS, MainNavigationListLocation.ARCHIVE -> {
-                NavDisplay(
-                  backStack = mainNavigationViewModel.chatsBackStackEntries,
-                  onBack = { mainNavigationViewModel.popChatsDetailLocation() },
-                  transitionSpec = TransitionSpecs.HorizontalSlide.transitionSpec,
-                  popTransitionSpec = TransitionSpecs.HorizontalSlide.popTransitionSpec,
-                  predictivePopTransitionSpec = TransitionSpecs.HorizontalSlide.predictivePopTransitionSpec,
-                  entryProvider = entryProvider { chatsNavEntries(convoTransitionState) }
-                )
-              }
+            Box(
+              modifier = Modifier
+                .padding(end = contentLayoutData.detailPaddingEnd)
+                .clip(contentLayoutData.shape)
+                .background(color = MaterialTheme.colorScheme.surface)
+                .fillMaxSize()
+            ) {
+              when (mainNavigationState.currentListLocation) {
+                MainNavigationListLocation.CHATS, MainNavigationListLocation.ARCHIVE -> {
+                  NavDisplay<NavKey>(
+                    backStack = mainNavigationViewModel.chatsBackStackEntries,
+                    onBack = { mainNavigationViewModel.popChatsDetailLocation() },
+                    transitionSpec = { TransitionSpecs.HorizontalSlide.transitionSpec },
+                    popTransitionSpec = { TransitionSpecs.HorizontalSlide.popTransitionSpec },
+                    predictivePopTransitionSpec = { TransitionSpecs.HorizontalSlide.predictivePopTransitionSpec },
+                    entryProvider = entryProvider { chatsNavEntries(convoTransitionState) }
+                  )
+                }
 
-              MainNavigationListLocation.CALLS -> {
-                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.CALLS -> {
+                  NavDisplay<NavKey>(
+                    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
-                )
+                MainNavigationListLocation.STORIES -> {
+                  NavDisplay<NavKey>(
+                    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() }
+                  )
+                }
               }
             }
           },
@@ -1007,7 +974,6 @@ class MainActivity :
       onSetToolbarColor = {
         toolbarViewModel.setToolbarColor(it)
       },
-      setStatusBarColor = {},
       lifecycleOwner = lifecycleOwner
     ).attach(recyclerView)
   }
@@ -1017,7 +983,6 @@ class MainActivity :
       activity = this,
       views = listOf(chatFolders),
       viewStubs = listOf(),
-      setStatusBarColor = {},
       onSetToolbarColor = {
         toolbarViewModel.setToolbarColor(it)
       },
@@ -1269,11 +1234,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,13 @@ 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.clockskew.ClockSkewActivity;
+import org.thoughtcrime.securesms.clockskew.ClockSkewDetector;
 import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberLockActivity;
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
 import org.thoughtcrime.securesms.dependencies.AppDependencies;
@@ -30,11 +34,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 +60,8 @@ 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 static final int STATE_CLOCK_SKEW          = 13;
 
   private SignalServiceNetworkAccess networkAccess;
   private BroadcastReceiver          clearKeyReceiver;
@@ -155,6 +160,8 @@ 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();
+      case STATE_CLOCK_SKEW:          return getClockSkewIntent();
       default:                        return null;
     }
   }
@@ -168,6 +175,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()) {
@@ -182,6 +191,8 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
       return STATE_TRANSFER_LOCKED;
     } else if (SignalStore.misc().isChangeNumberLocked() && getClass() != ChangeNumberLockActivity.class) {
       return STATE_CHANGE_NUMBER_LOCK;
+    } else if (ClockSkewDetector.INSTANCE.isDetected() && getClass() != ClockSkewActivity.class) {
+      return STATE_CLOCK_SKEW;
     } else {
       return STATE_NORMAL;
     }
@@ -192,6 +203,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() &&
@@ -242,10 +261,17 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
   }
 
   private Intent getTransferOrRestoreIntent() {
+    if (Environment.USE_NEW_REGISTRATION) {
+      return org.signal.registration.RegistrationActivity.createIntent(this, MainActivity.clearTop(this));
+    }
     Intent intent = RestoreActivity.getRestoreIntent(this);
     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());
@@ -268,6 +294,10 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
     return ChangeNumberLockActivity.createIntent(this);
   }
 
+  private Intent getClockSkewIntent() {
+    return ClockSkewActivity.createIntent(this);
+  }
+
   private Intent getRoutedIntent(Intent destination, @Nullable Intent nextIntent) {
     if (nextIntent != null)   destination.putExtra(NEXT_INTENT_EXTRA, nextIntent);
     return destination;

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

@@ -79,7 +79,13 @@ class SystemContactsEntrypointViewModel : ViewModel() {
   }
 
   private fun getDestinationForSyncAdapter(context: Context, intent: Intent): DestinationAndBody {
-    context.contentResolver.query(intent.data!!, null, null, null, null).use { cursor ->
+    val uri = intent.data
+    if (uri == null || uri.authority != ContactsContract.AUTHORITY) {
+      Log.w(TAG, "Ignoring content URI with an unexpected authority.")
+      return DestinationAndBody("", "")
+    }
+
+    context.contentResolver.query(uri, null, null, null, null).use { cursor ->
       if (cursor != null && cursor.moveToNext()) {
         return DestinationAndBody(cursor.getString(cursor.getColumnIndexOrThrow(ContactsContract.RawContacts.Data.DATA1)), "")
       }

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

@@ -13,10 +13,14 @@ import androidx.fragment.app.setFragmentResult
 import androidx.fragment.app.setFragmentResultListener
 import androidx.fragment.app.viewModels
 import androidx.navigation.Navigation
+import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import org.signal.core.models.media.Media
+import org.signal.core.ui.WindowBreakpoint
+import org.signal.core.ui.getWindowBreakpoint
 import org.signal.core.ui.permissions.Permissions
 import org.signal.core.util.ThreadUtil
+import org.signal.core.util.dp
 import org.signal.core.util.getParcelableExtraCompat
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.avatar.Avatar
@@ -31,6 +35,7 @@ import org.thoughtcrime.securesms.mediasend.AvatarSelectionActivity
 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.padding
 import org.thoughtcrime.securesms.util.visible
 
 /**
@@ -65,8 +70,25 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) {
     val saveButton: View = view.findViewById(R.id.avatar_picker_save)
     val clearButton: View = view.findViewById(R.id.avatar_picker_clear)
 
+    val spanCount = when (resources.getWindowBreakpoint()) {
+      is WindowBreakpoint.Small -> 4
+      else -> 6
+    }
+
+    val recyclerPadding = when (resources.getWindowBreakpoint()) {
+      is WindowBreakpoint.Small -> 0
+      else -> 112.dp
+    }
+
     recycler = view.findViewById(R.id.avatar_picker_recycler)
-    recycler.addItemDecoration(GridDividerDecoration(4, ViewUtil.dpToPx(16)))
+    recycler.addItemDecoration(GridDividerDecoration(spanCount, ViewUtil.dpToPx(16)))
+    recycler.padding(
+      left = recyclerPadding,
+      right = recyclerPadding
+    )
+
+    val gridLayoutManager: GridLayoutManager = recycler.layoutManager as GridLayoutManager
+    gridLayoutManager.spanCount = spanCount
 
     val adapter = MappingAdapter()
     AvatarPickerItem.register(adapter, this::onAvatarClick, this::onAvatarLongClick)

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

@@ -63,6 +63,7 @@ class TextAvatarCreationFragment : Fragment(R.layout.text_avatar_creation_fragme
     val tabLayout: ControllableTabLayout = view.findViewById(R.id.text_avatar_creation_tabs)
     val doneButton: View = view.findViewById(R.id.text_avatar_creation_done)
     val keyboardAwareLayout: KeyboardAwareLinearLayout = view.findViewById(R.id.keyboard_aware_layout)
+    keyboardAwareLayout.setInsetPaddingMode(KeyboardAwareLinearLayout.InsetPaddingMode.SAFE_AREA)
 
     withRecyclerSet.load(requireContext(), R.layout.text_avatar_creation_fragment_content)
     withoutRecyclerSet.load(requireContext(), R.layout.text_avatar_creation_fragment_content_hidden_recycler)

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/BackupFileIOError.java

@@ -53,7 +53,7 @@ public enum BackupFileIOError {
 
     PendingIntent pendingIntent           = PendingIntent.getActivity(context, -1, AppSettingsActivity.backups(context), PendingIntentFlags.mutable());
     Notification backupFailedNotification = new NotificationCompat.Builder(context, NotificationChannels.getInstance().FAILURES)
-                                                                  .setSmallIcon(R.drawable.ic_signal_backup)
+                                                                  .setSmallIcon(org.signal.core.ui.R.drawable.ic_signal_backup)
                                                                   .setContentTitle(context.getString(titleId))
                                                                   .setContentText(context.getString(messageId))
                                                                   .setStyle(new NotificationCompat.BigTextStyle().bigText(context.getString(messageId)))

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

@@ -46,7 +46,7 @@ import org.thoughtcrime.securesms.database.SenderKeyTable;
 import org.thoughtcrime.securesms.database.SenderKeySharedTable;
 import org.thoughtcrime.securesms.database.SessionTable;
 import org.thoughtcrime.securesms.database.SignedPreKeyTable;
-import org.thoughtcrime.securesms.database.StickerTable;
+import org.thoughtcrime.securesms.database.StickerTables;
 import org.thoughtcrime.securesms.database.model.AvatarPickerDatabase;
 import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.keyvalue.KeyValueDataSet;
@@ -186,7 +186,7 @@ public class FullBackupExporter extends FullBackupBase {
           count = exportTable(table, input, outputStream, cursor -> isForNonExpiringPollMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(PollTables.PollOptionTable.POLL_ID))), null, count, estimatedCount, cancellationSignal);
         } else if (table.equals(PollTables.PollVoteTable.TABLE_NAME)) {
           count = exportTable(table, input, outputStream, cursor -> isForNonExpiringPollMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(PollTables.PollVoteTable.POLL_ID))), null, count, estimatedCount, cancellationSignal);
-        } else if (table.equals(StickerTable.TABLE_NAME)) {
+        } else if (table.equals(StickerTables.Sticker.TABLE_NAME)) {
           count = exportTable(table, input, outputStream, cursor -> true, (cursor, innerCount) -> exportSticker(attachmentSecret, cursor, outputStream, innerCount, estimatedCount), count, estimatedCount, cancellationSignal);
         } else if (!TABLE_CONTENT_BLOCKLIST.contains(table)) {
           count = exportTable(table, input, outputStream, null, null, count, estimatedCount, cancellationSignal);
@@ -238,7 +238,7 @@ public class FullBackupExporter extends FullBackupBase {
         count += getCount(input, BackupCountQueries.getGroupReceiptCount());
       } else if (table.equals(AttachmentTable.TABLE_NAME)) {
         count += getCount(input, BackupCountQueries.getAttachmentCount());
-      } else if (table.equals(StickerTable.TABLE_NAME)) {
+      } else if (table.equals(StickerTables.Sticker.TABLE_NAME)) {
         count += getCount(input, "SELECT COUNT(*) FROM " + table);
       } else if (!TABLE_CONTENT_BLOCKLIST.contains(table)) {
         count += getCount(input, "SELECT COUNT(*) FROM " + table);
@@ -497,11 +497,11 @@ public class FullBackupExporter extends FullBackupBase {
                                    long estimatedCount)
       throws IOException
   {
-    long rowId = cursor.getLong(cursor.getColumnIndexOrThrow(StickerTable.ID));
-    long size  = cursor.getLong(cursor.getColumnIndexOrThrow(StickerTable.FILE_LENGTH));
+    long rowId = cursor.getLong(cursor.getColumnIndexOrThrow(StickerTables.Sticker.ID));
+    long size  = cursor.getLong(cursor.getColumnIndexOrThrow(StickerTables.Sticker.FILE_LENGTH));
 
-    String data   = cursor.getString(cursor.getColumnIndexOrThrow(StickerTable.FILE_PATH));
-    byte[] random = cursor.getBlob(cursor.getColumnIndexOrThrow(StickerTable.FILE_RANDOM));
+    String data   = cursor.getString(cursor.getColumnIndexOrThrow(StickerTables.Sticker.FILE_PATH));
+    byte[] random = cursor.getBlob(cursor.getColumnIndexOrThrow(StickerTables.Sticker.FILE_RANDOM));
 
     if (!TextUtils.isEmpty(data) && size > 0) {
       EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count, estimatedCount));

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

@@ -34,7 +34,7 @@ import org.thoughtcrime.securesms.database.LastResortKeyTupleTable;
 import org.thoughtcrime.securesms.database.OneTimePreKeyTable;
 import org.thoughtcrime.securesms.database.SearchTable;
 import org.thoughtcrime.securesms.database.SignedPreKeyTable;
-import org.thoughtcrime.securesms.database.StickerTable;
+import org.thoughtcrime.securesms.database.StickerTables;
 import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.keyvalue.KeyValueDataSet;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -244,7 +244,7 @@ public class FullBackupImporter extends FullBackupBase {
   private static void processSticker(@NonNull Context context, @NonNull AttachmentSecret attachmentSecret, @NonNull SQLiteDatabase db, @NonNull Sticker sticker, BackupRecordInputStream inputStream)
       throws IOException
   {
-    File stickerDirectory = context.getDir(StickerTable.DIRECTORY, Context.MODE_PRIVATE);
+    File stickerDirectory = context.getDir(StickerTables.DIRECTORY, Context.MODE_PRIVATE);
     File dataFile         = File.createTempFile("sticker", ".mms", stickerDirectory);
 
     Pair<byte[], OutputStream> output = ModernEncryptingPartOutputStream.createFor(attachmentSecret, dataFile, false);
@@ -252,12 +252,12 @@ public class FullBackupImporter extends FullBackupBase {
     inputStream.readAttachmentTo(output.getSecond(), sticker.length);
 
     ContentValues contentValues = new ContentValues();
-    contentValues.put(StickerTable.FILE_PATH, dataFile.getAbsolutePath());
-    contentValues.put(StickerTable.FILE_LENGTH, sticker.length);
-    contentValues.put(StickerTable.FILE_RANDOM, output.getFirst());
+    contentValues.put(StickerTables.Sticker.FILE_PATH, dataFile.getAbsolutePath());
+    contentValues.put(StickerTables.Sticker.FILE_LENGTH, sticker.length);
+    contentValues.put(StickerTables.Sticker.FILE_RANDOM, output.getFirst());
 
-    db.update(StickerTable.TABLE_NAME, contentValues,
-              StickerTable.ID + " = ?",
+    db.update(StickerTables.Sticker.TABLE_NAME, contentValues,
+              StickerTables.Sticker.ID + " = ?",
               new String[] {String.valueOf(sticker.rowId)});
   }
 

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

@@ -102,9 +102,10 @@ import org.thoughtcrime.securesms.database.KeyValueDatabase
 import org.thoughtcrime.securesms.database.KyberPreKeyTable
 import org.thoughtcrime.securesms.database.OneTimePreKeyTable
 import org.thoughtcrime.securesms.database.SearchTable
+import org.thoughtcrime.securesms.database.SessionTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.SignedPreKeyTable
-import org.thoughtcrime.securesms.database.StickerTable
+import org.thoughtcrime.securesms.database.StickerTables
 import org.thoughtcrime.securesms.database.ThreadTable
 import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
 import org.thoughtcrime.securesms.dependencies.AppDependencies
@@ -184,6 +185,7 @@ import kotlin.time.Duration
 import kotlin.time.Duration.Companion.days
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
+import org.signal.registration.R as RegistrationR
 
 object BackupRepository {
 
@@ -646,7 +648,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()
     }
 
@@ -1126,7 +1128,7 @@ object BackupRepository {
     }
 
     return frameReader.use { reader ->
-      import(reader, selfData, cancellationSignal = { false })
+      import(reader, selfData, backupMode = BackupMode.LOCAL, cancellationSignal = { false })
     }
   }
 
@@ -1157,7 +1159,7 @@ object BackupRepository {
       }
 
       return frameReader.use { reader ->
-        import(reader, selfData, cancellationSignal)
+        import(reader, selfData, backupMode = BackupMode.REMOTE, cancellationSignal = cancellationSignal)
       }
     } catch (e: IOException) {
       Log.w(TAG, "Unable to restore signal backup", e)
@@ -1185,7 +1187,7 @@ object BackupRepository {
     )
 
     return frameReader.use { reader ->
-      import(reader, selfData, cancellationSignal)
+      import(reader, selfData, backupMode = BackupMode.LINK_SYNC, cancellationSignal = cancellationSignal)
     }
   }
 
@@ -1211,7 +1213,7 @@ object BackupRepository {
     }
 
     return frameReader.use { reader ->
-      import(reader, selfData, cancellationSignal)
+      import(reader, selfData, backupMode = BackupMode.REMOTE, cancellationSignal = cancellationSignal)
     }
   }
 
@@ -1227,13 +1229,14 @@ object BackupRepository {
     val frameReader = PlainTextBackupReader(inputStreamFactory(), length)
 
     return frameReader.use { reader ->
-      import(reader, selfData, cancellationSignal)
+      import(reader, selfData, backupMode = BackupMode.PLAINTEXT_EXPORT, cancellationSignal = cancellationSignal)
     }
   }
 
   private fun import(
     frameReader: BackupImportReader,
     selfData: SelfData,
+    backupMode: BackupMode,
     cancellationSignal: () -> Boolean
   ): ImportResult {
     val stopwatch = Stopwatch("import")
@@ -1291,7 +1294,16 @@ object BackupRepository {
       }
 
       Log.d(TAG, "[import] --- Recreating all tables ---")
-      val skipTables = setOf(KyberPreKeyTable.TABLE_NAME, OneTimePreKeyTable.TABLE_NAME, SignedPreKeyTable.TABLE_NAME)
+      val skipTables = buildSet {
+        add(KyberPreKeyTable.TABLE_NAME)
+        add(OneTimePreKeyTable.TABLE_NAME)
+        add(SignedPreKeyTable.TABLE_NAME)
+
+        // Preserve the session established with the primary during linking
+        if (backupMode.isLinkAndSync) {
+          add(SessionTable.TABLE_NAME)
+        }
+      }
       val tableMetadata = SignalDatabase.rawDatabase.getAllTableDefinitions().filter { !it.name.startsWith(SearchTable.FTS_TABLE_NAME + "_") }
       for (table in tableMetadata) {
         if (skipTables.contains(table.name)) {
@@ -1326,7 +1338,7 @@ object BackupRepository {
       SignalDatabase.recipients.setProfileKey(selfId, selfData.profileKey)
       SignalDatabase.recipients.setProfileSharing(selfId, true)
 
-      val importState = ImportState(mediaRootBackupKey)
+      val importState = ImportState(mediaRootBackupKey, backupMode)
       val chatItemInserter: ChatItemArchiveImporter = ChatItemArchiveProcessor.beginImport(importState)
 
       Log.d(TAG, "[import] Beginning to read frames.")
@@ -1475,7 +1487,7 @@ object BackupRepository {
     }
 
     val stickerJobs = SignalDatabase.stickers.getAllStickerPacks().use { cursor ->
-      val reader = StickerTable.StickerPackRecordReader(cursor)
+      val reader = StickerTables.StickerPackRecordReader(cursor)
       reader
         .filter { it.isInstalled }
         .map {
@@ -1510,7 +1522,7 @@ object BackupRepository {
       val jobs = mutableListOf<Job>()
       groups
         .asSequence()
-        .filter { it.id.isV2 }
+        .filter { it.id.isV2 && it.hasV2GroupProperties }
         .forEach { group ->
           jobs.add(RequestGroupV2InfoJob(group.id as GroupId.V2))
           val avatarKey = group.requireV2GroupProperties().avatarKey
@@ -1664,6 +1676,19 @@ object BackupRepository {
       }
   }
 
+  /**
+   * Stores the remote backup's last-modified time in [BackupValues.lastBackupTime], (404/401 clear it to 0).
+   */
+  fun refreshBackupFileTimestamp(): NetworkResult<ZonedDateTime> {
+    return getBackupFileLastModified().also { result ->
+      when (result) {
+        is NetworkResult.Success -> SignalStore.backup.lastBackupTime = result.result.toMillis()
+        is NetworkResult.StatusCodeError if (result.code == 404 || result.code == 401) -> SignalStore.backup.lastBackupTime = 0L
+        else -> Log.w(TAG, "Failed to refresh last backup time from remote: ${result::class.simpleName}")
+      }
+    }
+  }
+
   /**
    * Returns an object with details about the remote backup state.
    */
@@ -2334,7 +2359,7 @@ object BackupRepository {
     try {
       DataRestoreConstraint.isRestoringData = true
       return withContext(Dispatchers.IO) {
-        return@withContext BackupProgressService.start(context, context.getString(R.string.BackupProgressService_title)).use {
+        return@withContext BackupProgressService.start(context, context.getString(RegistrationR.string.MessageSyncScreen__syncing_messages)).use {
           restoreLinkAndSyncBackup(response, ephemeralBackupKey, controller = it, cancellationSignal = { !isActive })
         }
       }
@@ -2349,7 +2374,7 @@ object BackupRepository {
     val progressListener = object : ProgressListener {
       override fun onAttachmentProgress(progress: AttachmentTransferProgress) {
         controller.update(
-          title = AppDependencies.application.getString(R.string.BackupProgressService_title_downloading),
+          title = AppDependencies.application.getString(RegistrationR.string.MessageSyncScreen__syncing_messages),
           progress = progress.value,
           indeterminate = false
         )
@@ -2381,7 +2406,7 @@ object BackupRepository {
     }
 
     controller.update(
-      title = AppDependencies.application.getString(R.string.BackupProgressService_title),
+      title = AppDependencies.application.getString(RegistrationR.string.MessageSyncScreen__syncing_messages),
       progress = 0f,
       indeterminate = true
     )
@@ -2505,7 +2530,7 @@ class ExportState(
   var releaseNoteRecipientId: Long? = null
 }
 
-class ImportState(val mediaRootBackupKey: MediaRootBackupKey) {
+class ImportState(val mediaRootBackupKey: MediaRootBackupKey, val backupMode: BackupMode) {
   val remoteToLocalRecipientId: MutableMap<Long, RecipientId> = hashMapOf()
   val chatIdToLocalThreadId: MutableMap<Long, Long> = hashMapOf()
   val chatIdToLocalRecipientId: MutableMap<Long, RecipientId> = hashMapOf()

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

@@ -6,6 +6,7 @@
 package org.thoughtcrime.securesms.backup.v2
 
 import org.signal.core.util.LongSerializer
+import org.signal.libsignal.zkgroup.backups.BackupLevel
 
 /**
  * Serializable enum value for what we think a user's current backup tier is.
@@ -18,6 +19,13 @@ enum class MessageBackupTier(val value: Int) {
   FREE(0),
   PAID(1);
 
+  fun toBackupLevel(): Long {
+    return when (this) {
+      FREE -> BackupLevel.FREE.value.toLong()
+      PAID -> BackupLevel.PAID.value.toLong()
+    }
+  }
+
   companion object Serializer : LongSerializer<MessageBackupTier?> {
     override fun serialize(data: MessageBackupTier?): Long {
       return data?.value?.toLong() ?: -1
@@ -26,5 +34,13 @@ enum class MessageBackupTier(val value: Int) {
     override fun deserialize(data: Long): MessageBackupTier? {
       return entries.firstOrNull { it.value == data.toInt() }
     }
+
+    fun fromBackupLevel(backupLevel: Long?): MessageBackupTier? {
+      return when (backupLevel) {
+        BackupLevel.FREE.value.toLong() -> FREE
+        BackupLevel.PAID.value.toLong() -> PAID
+        else -> null
+      }
+    }
   }
 }

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

@@ -104,11 +104,23 @@ class ArchiveFileSystem private constructor(private val context: Context, root:
     }
 
     /**
-     * Returns true if [dir] appears to be a SignalBackups directory based on its name and
-     * expected internal structure (presence of the "files" subdirectory).
+     * Returns true if [dir] appears to be a SignalBackups directory based on its expected internal
+     * structure. We can't rely on the directory being named [MAIN_DIRECTORY_NAME], since users may
+     * rename it or restore it into a differently-named folder (e.g. when transferring a backup
+     * between devices). A directory is therefore considered a backups directory if it either matches
+     * the expected name or directly contains the archive contents (a "files" subdirectory alongside
+     * at least one snapshot directory).
      */
     private fun looksLikeSignalBackupsDirectory(dir: DocumentFile): Boolean {
-      return dir.name == MAIN_DIRECTORY_NAME && dir.findFile("files") != null
+      if (dir.findFile("files") == null) {
+        return false
+      }
+
+      if (dir.name == MAIN_DIRECTORY_NAME) {
+        return true
+      }
+
+      return dir.listFiles().any { it.isDirectory && it.name?.startsWith(BACKUP_DIRECTORY_PREFIX) == true }
     }
 
     /**

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

@@ -26,6 +26,7 @@ import org.signal.core.util.toJson
 import org.signal.libsignal.crypto.Aes256Ctr32
 import org.thoughtcrime.securesms.backup.LocalExportProgress
 import org.thoughtcrime.securesms.backup.v2.BackupRepository
+import org.thoughtcrime.securesms.backup.v2.ImportResult
 import org.thoughtcrime.securesms.database.AttachmentTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -269,13 +270,18 @@ object LocalArchiver {
 
       val mainStreamLength = snapshotFileSystem.mainLength() ?: return ArchiveResult.failure(RestoreFailure.MainStream)
 
-      BackupRepository.importLocal(
+      val importResult = BackupRepository.importLocal(
         mainStreamFactory = { snapshotFileSystem.mainInputStream()!! },
         mainStreamLength = mainStreamLength,
         selfData = selfData,
         backupId = backupId,
         messageBackupKey = messageBackupKey
       )
+
+      if (importResult is ImportResult.Failure) {
+        Log.w(TAG, "Local backup import failed")
+        return RestoreResult.failure(RestoreFailure.ImportFailed)
+      }
     } finally {
       metadataStream?.close()
     }
@@ -350,6 +356,7 @@ object LocalArchiver {
     data object MainStream : RestoreFailure
     data object Cancelled : RestoreFailure
     data object BackupIdMissing : RestoreFailure
+    data object ImportFailed : RestoreFailure
     data class VersionMismatch(val backupVersion: Int, val supportedVersion: Int) : RestoreFailure
   }
 

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

@@ -16,7 +16,6 @@ import org.signal.core.models.database.AttachmentId
 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
@@ -127,7 +126,7 @@ object AccountDataArchiveProcessor {
             hasCompletedUsernameOnboarding = signalStore.uiHintValues.hasCompletedUsernameOnboarding(),
             customChatColors = db.chatColorsTable.getSavedChatColors().toRemoteChatColors().also { colors -> exportState.customChatColorIds.addAll(colors.map { it.id }) },
             optimizeOnDeviceStorage = signalStore.backupValues.optimizeStorage && signalStore.backupValues.backupTier == MessageBackupTier.PAID,
-            backupTier = signalStore.backupValues.backupTier.toRemoteBackupTier(),
+            backupTier = signalStore.backupValues.backupTier?.toBackupLevel(),
             defaultSentMediaQuality = signalStore.settingsValues.sentMediaQuality.toRemoteSentMediaQuality(),
             autoDownloadSettings = AccountData.AutoDownloadSettings(
               images = getRemoteAutoDownloadOption("image", mobileAutoDownload, wifiAutoDownload),
@@ -276,8 +275,8 @@ object AccountDataArchiveProcessor {
     SignalStore.story.isFeatureDisabled = settings.storiesDisabled
     SignalStore.story.userHasSeenGroupStoryEducationSheet = settings.hasSeenGroupStoryEducationSheet
     SignalStore.story.viewedReceiptsEnabled = settings.storyViewReceiptsEnabled ?: settings.readReceipts
-    SignalStore.backup.optimizeStorage = settings.optimizeOnDeviceStorage
-    SignalStore.backup.backupTier = settings.backupTier?.toLocalBackupTier()
+    SignalStore.backup.optimizeStorage = !importState.backupMode.isLinkAndSync && settings.optimizeOnDeviceStorage
+    SignalStore.backup.backupTier = MessageBackupTier.fromBackupLevel(settings.backupTier)
     SignalStore.settings.sentMediaQuality = settings.defaultSentMediaQuality.toLocalSentMediaQuality()
     SignalStore.settings.setTheme(settings.appTheme.toLocalTheme())
     SignalStore.settings.setCallDataMode(settings.callsUseLessDataSetting.toLocalCallDataMode())
@@ -456,22 +455,6 @@ object AccountDataArchiveProcessor {
       }
   }
 
-  private fun MessageBackupTier?.toRemoteBackupTier(): Long? {
-    return when (this) {
-      MessageBackupTier.FREE -> BackupLevel.FREE.value.toLong()
-      MessageBackupTier.PAID -> BackupLevel.PAID.value.toLong()
-      null -> null
-    }
-  }
-
-  private fun Long?.toLocalBackupTier(): MessageBackupTier? {
-    return when (this) {
-      BackupLevel.FREE.value.toLong() -> MessageBackupTier.FREE
-      BackupLevel.PAID.value.toLong() -> MessageBackupTier.PAID
-      else -> null
-    }
-  }
-
   private fun SentMediaQuality.toRemoteSentMediaQuality(): AccountData.SentMediaQuality {
     return when (this) {
       SentMediaQuality.STANDARD -> AccountData.SentMediaQuality.STANDARD

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

@@ -10,13 +10,10 @@ import org.signal.archive.proto.Frame
 import org.signal.archive.proto.StickerPack
 import org.signal.archive.stream.BackupFrameEmitter
 import org.signal.core.util.Hex
-import org.signal.core.util.insertInto
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.backup.v2.ExportSkips
-import org.thoughtcrime.securesms.database.SQLiteDatabase
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.database.StickerTable
-import org.thoughtcrime.securesms.database.StickerTable.StickerPackRecordReader
+import org.thoughtcrime.securesms.database.StickerTables.StickerPackRecordReader
 import org.thoughtcrime.securesms.database.model.StickerPackRecord
 import java.io.IOException
 
@@ -27,7 +24,7 @@ private val TAG = Log.tag(StickerArchiveProcessor::class)
  */
 object StickerArchiveProcessor {
   fun export(db: SignalDatabase, emitter: BackupFrameEmitter) {
-    StickerPackRecordReader(db.stickerTable.getAllStickerPacks()).use { reader ->
+    StickerPackRecordReader(db.stickerTables.getAllStickerPacks()).use { reader ->
       var record: StickerPackRecord? = null
       while (reader.getNext()?.let { record = it } != null) {
         if (record!!.isInstalled) {
@@ -39,20 +36,10 @@ object StickerArchiveProcessor {
   }
 
   fun import(stickerPack: StickerPack) {
-    SignalDatabase.rawDatabase
-      .insertInto(StickerTable.TABLE_NAME)
-      .values(
-        StickerTable.PACK_ID to Hex.toStringCondensed(stickerPack.packId.toByteArray()),
-        StickerTable.PACK_KEY to Hex.toStringCondensed(stickerPack.packKey.toByteArray()),
-        StickerTable.PACK_TITLE to "",
-        StickerTable.PACK_AUTHOR to "",
-        StickerTable.INSTALLED to 1,
-        StickerTable.COVER to 1,
-        StickerTable.EMOJI to "",
-        StickerTable.CONTENT_TYPE to "",
-        StickerTable.FILE_PATH to ""
-      )
-      .run(SQLiteDatabase.CONFLICT_IGNORE)
+    SignalDatabase.stickers.insertPackReference(
+      packId = Hex.toStringCondensed(stickerPack.packId.toByteArray()),
+      packKey = Hex.toStringCondensed(stickerPack.packKey.toByteArray())
+    )
   }
 }
 

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

@@ -7,8 +7,6 @@ package org.thoughtcrime.securesms.backup.v2.ui.subscription
 
 import android.content.Context
 import android.content.Intent
-import android.os.Bundle
-import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContract
 import androidx.core.content.IntentCompat
 import androidx.core.os.bundleOf
@@ -42,12 +40,6 @@ class MessageBackupsCheckoutActivity : FragmentWrapperActivity() {
     }
   }
 
-  override fun onCreate(savedInstanceState: Bundle?, ready: Boolean) {
-    super.onCreate(savedInstanceState, ready)
-
-    enableEdgeToEdge()
-  }
-
   override fun getFragment(): Fragment = MessageBackupsFlowFragment.create(
     IntentCompat.getSerializableExtra(intent, TIER, MessageBackupTier::class.java)
   )

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

@@ -145,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
@@ -297,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/MessageBackupsTypeSelectionScreen.kt

@@ -52,14 +52,14 @@ import org.signal.core.ui.compose.Previews
 import org.signal.core.ui.compose.Scaffolds
 import org.signal.core.ui.compose.SignalIcons
 import org.signal.core.ui.compose.theme.SignalTheme
+import org.signal.core.ui.fonts.SignalSymbols
+import org.signal.core.ui.fonts.SignalSymbols.signalSymbolText
 import org.signal.core.util.ByteUnit
 import org.signal.core.util.billing.BillingResponseCode
 import org.signal.core.util.bytes
 import org.signal.core.util.money.FiatMoney
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.backup.v2.MessageBackupTier
-import org.thoughtcrime.securesms.fonts.SignalSymbols
-import org.thoughtcrime.securesms.fonts.SignalSymbols.signalSymbolText
 import org.thoughtcrime.securesms.payments.FiatMoneyUtil
 import java.math.BigDecimal
 import java.util.Currency

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

@@ -5,7 +5,6 @@ import android.content.Intent
 import android.os.Bundle
 import android.widget.Toast
 import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
@@ -49,8 +48,6 @@ class VerifyBackupKeyActivity : PassphraseRequiredActivity() {
   }
 
   override fun onCreate(savedInstanceState: Bundle?, ready: Boolean) {
-    enableEdgeToEdge()
-
     setContent {
       SignalTheme {
         val context = LocalContext.current

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

@@ -21,6 +21,7 @@ import org.signal.donations.InAppPaymentType
 import org.thoughtcrime.securesms.MainActivity
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.InputAwareLayout
+import org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout
 import org.thoughtcrime.securesms.components.emoji.EmojiEventListener
 import org.thoughtcrime.securesms.components.emoji.MediaKeyboard
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
@@ -94,6 +95,7 @@ class GiftFlowConfirmationFragment :
       .create()
 
     inputAwareLayout = requireView().findViewById(R.id.input_aware_layout)
+    inputAwareLayout.setInsetPaddingMode(KeyboardAwareLinearLayout.InsetPaddingMode.KEYBOARD_AND_NAVIGATION_BAR)
     emojiKeyboard = requireView().findViewById(R.id.emoji_drawer)
 
     emojiKeyboard.setFragmentManager(childFragmentManager)

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
@@ -22,6 +25,7 @@ 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
 
@@ -36,28 +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) {
+      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 = RegistrationActivity.newIntentForReRegistration(context)
+        val registrationIntent = if (isLinkedDevice) {
+          RegistrationActivity.newIntentForReLinkDevice(context)
+        } else {
+          RegistrationActivity.newIntentForReRegistration(context)
+        }
         context.startActivity(registrationIntent)
       }
     ),
@@ -69,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/banner/banners/UsernameOutOfSyncBanner.kt

@@ -26,6 +26,10 @@ class UsernameOutOfSyncBanner(private val onActionClick: (UsernameSyncState) ->
 
   override val enabled: Boolean
     get() {
+      if (SignalStore.account.isLinkedDevice) {
+        return false
+      }
+
       return when (SignalStore.account.usernameSyncState) {
         AccountValues.UsernameSyncState.USERNAME_AND_LINK_CORRUPTED -> true
         AccountValues.UsernameSyncState.LINK_CORRUPTED -> true

app/src/main/java/org/thoughtcrime/securesms/blocked/BlockedUsersActivity.java

@@ -4,11 +4,13 @@ import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.view.View;
+import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.view.WindowInsetsCompat;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 
@@ -28,6 +30,7 @@ import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.signal.core.util.concurrent.LifecycleDisposable;
+import org.thoughtcrime.securesms.util.SystemWindowInsetsSetter;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
 import java.util.Optional;
@@ -63,6 +66,11 @@ public class BlockedUsersActivity extends PassphraseRequiredActivity implements
     container                           = findViewById(R.id.fragment_container);
 
     toolbar.setNavigationOnClickListener(unused -> onBackPressed());
+
+    toolbar.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT;
+    SystemWindowInsetsSetter.attach(toolbar, this, WindowInsetsCompat.Type.statusBars());
+    SystemWindowInsetsSetter.attach(container, this, WindowInsetsCompat.Type.navigationBars());
+
     contactFilterView.setOnFilterChangedListener(query -> {
       Fragment fragment = getSupportFragmentManager().findFragmentByTag(CONTACT_SELECTION_FRAGMENT);
       if (fragment != null) {

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

@@ -110,6 +110,9 @@ object CallLinks {
     } catch (_: UnsupportedEncodingException) {
       Log.w(TAG, "Invalid url: $url")
       return null
+    } catch (_: IllegalArgumentException) {
+      Log.w(TAG, "Invalid url: $url")
+      return null
     }
 
     val key = fragmentQuery[ROOT_KEY]

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

@@ -11,7 +11,9 @@ import android.view.WindowManager
 import androidx.activity.compose.LocalOnBackPressedDispatcherOwner
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
@@ -43,6 +45,7 @@ import org.signal.core.ui.compose.Buttons
 import org.signal.core.ui.compose.ComposeDialogFragment
 import org.signal.core.ui.compose.Scaffolds
 import org.signal.core.ui.compose.SignalIcons
+import org.signal.core.ui.enableEdgeToEdge
 import org.signal.core.ui.rememberIsSplitPane
 import org.signal.core.util.BreakIteratorCompat
 import org.thoughtcrime.securesms.R
@@ -68,6 +71,7 @@ class EditCallLinkNameDialogFragment : ComposeDialogFragment() {
   override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
     val dialog = super.onCreateDialog(savedInstanceState)
     dialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
+    dialog.window?.enableEdgeToEdge()
     return dialog
   }
 
@@ -143,7 +147,12 @@ private fun EditCallLinkNameScreen(
     val focusRequester = remember { FocusRequester() }
     val breakIterator = remember { BreakIteratorCompat.getInstance() }
 
-    Surface(modifier = Modifier.padding(paddingValues)) {
+    Surface(
+      modifier = Modifier
+        .padding(paddingValues)
+        .consumeWindowInsets(paddingValues)
+        .imePadding()
+    ) {
       Column(
         modifier = Modifier
           .padding(

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

@@ -91,28 +91,24 @@ class CallEventCache(
     ): CallLogRow.Call? {
       val parent = next()
 
-      if (parent.type == Type.AD_HOC_CALL.code && !callLinksSeen.add(parent.peer)) {
-        return null
-      }
+      val isActiveCallLinkRow = parent.type != Type.AD_HOC_CALL.code || callLinksSeen.add(parent.peer)
 
       val children = mutableSetOf<Long>()
-      while (hasNext()) {
-        val child = next()
 
-        if (child.type == Type.AD_HOC_CALL.code) {
-          previous()
-          break
-        }
+      if (parent.type != Type.AD_HOC_CALL.code) {
+        while (hasNext()) {
+          val child = next()
 
-        if (parent.peer == child.peer && parent.direction == child.direction && isEventMatch(parent, child) && isWithinTimeout(parent, child)) {
-          children.add(child.rowId)
-        } else {
-          previous()
-          break
+          if (parent.peer == child.peer && parent.direction == child.direction && isEventMatch(parent, child) && isWithinTimeout(parent, child)) {
+            children.add(child.rowId)
+          } else {
+            previous()
+            break
+          }
         }
       }
 
-      return createParentCallLogRow(parent, children, filterState, groupCallStateMap, canUserBeginCallMap)
+      return createParentCallLogRow(parent, children, filterState, groupCallStateMap, canUserBeginCallMap, isActiveCallLinkRow)
     }
 
     private fun readDataFromDatabase(): List<CacheRecord> {
@@ -170,7 +166,8 @@ class CallEventCache(
       children: Set<Long>,
       filterState: FilterState,
       groupCallStateCache: MutableMap<Long, CallLogRow.GroupCallState>,
-      canUserBeginCallMap: MutableMap<Long, CallLogRow.CanStartCall>
+      canUserBeginCallMap: MutableMap<Long, CallLogRow.CanStartCall>,
+      isActiveCallLinkRow: Boolean
     ): CallLogRow.Call {
       val peer = Recipient.resolved(RecipientId.from(parent.peer))
       return CallLogRow.Call(
@@ -196,7 +193,7 @@ class CallEventCache(
         },
         children = setOf(parent.rowId) + children,
         searchQuery = filterState.query,
-        callLinkPeekInfo = AppDependencies.signalCallManager.peekInfoSnapshot[peer.id],
+        callLinkPeekInfo = if (isActiveCallLinkRow) AppDependencies.signalCallManager.peekInfoSnapshot[peer.id] else null,
         canUserBeginCall = if (peer.isGroup) {
           canUserBeginCallMap.getOrPut(parent.peer) { canUserBeginCall(peer, parent.decryptedGroupBytes) }
         } else {

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

@@ -10,7 +10,6 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.activity.compose.LocalActivity
 import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -60,7 +59,6 @@ class NewCallActivity : PassphraseRequiredActivity() {
   }
 
   override fun onCreate(savedInstanceState: Bundle?, ready: Boolean) {
-    enableEdgeToEdge()
     super.onCreate(savedInstanceState, ready)
 
     val navigateBack = onBackPressedDispatcher::onBackPressed

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

@@ -8,8 +8,6 @@ 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
@@ -124,8 +122,6 @@ private fun MessageDetailsEntry(route: MainNavigationDetailLocation.Chats.Messag
     modifier = Modifier
       .fillMaxSize()
       .background(MaterialTheme.colorScheme.background)
-      .statusBarsPadding()
-      .navigationBarsPadding()
   )
 }
 
@@ -152,8 +148,6 @@ private fun ConversationSettingsEntry(route: MainNavigationDetailLocation.Chats.
       modifier = Modifier
         .fillMaxSize()
         .background(MaterialTheme.colorScheme.background)
-        .statusBarsPadding()
-        .navigationBarsPadding()
     ) { fragment ->
       backPressedState.attach(fragment)
     }

app/src/main/java/org/thoughtcrime/securesms/clockskew/ClockSkewActivity.kt

@@ -0,0 +1,76 @@
+/*
+ * Copyright 2026 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.clockskew
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.provider.Settings
+import androidx.activity.addCallback
+import androidx.activity.compose.setContent
+import androidx.compose.runtime.getValue
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.launch
+import org.signal.core.ui.compose.theme.SignalTheme
+import org.thoughtcrime.securesms.PassphraseRequiredActivity
+import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme
+import org.thoughtcrime.securesms.util.viewModel
+
+/**
+ * Hosts [ClockSkewScreen], the full-screen blocking screen shown when the local device clock is too far out of sync
+ * with the server's clock (see [ClockSkewDetector]). The user cannot leave until they fix their clock; the screen
+ * dismisses itself once the skew is resolved (which is re-checked when the app is backgrounded/foregrounded).
+ */
+class ClockSkewActivity : PassphraseRequiredActivity() {
+
+  private val theme = DynamicNoActionBarTheme()
+  private val viewModel: ClockSkewViewModel by viewModel { ClockSkewViewModel() }
+
+  override fun onPreCreate() {
+    theme.onCreate(this)
+  }
+
+  override fun onCreate(savedInstanceState: Bundle?, ready: Boolean) {
+    onBackPressedDispatcher.addCallback(this) {
+      // Disabled: the user must fix their clock.
+    }
+
+    lifecycleScope.launch {
+      viewModel.actions.collect { action ->
+        when (action) {
+          ClockSkewScreenAction.OpenDateSettings -> startActivity(Intent(Settings.ACTION_DATE_SETTINGS))
+          ClockSkewScreenAction.Finish -> finish()
+        }
+      }
+    }
+
+    setContent {
+      val state by viewModel.state.collectAsStateWithLifecycle()
+
+      SignalTheme {
+        ClockSkewScreen(
+          state = state,
+          onEvent = viewModel::onEvent
+        )
+      }
+    }
+  }
+
+  override fun onResume() {
+    super.onResume()
+    theme.onResume(this)
+    viewModel.onEvent(ClockSkewScreenEvent.ScreenResumed)
+  }
+
+  companion object {
+    @JvmStatic
+    fun createIntent(context: Context): Intent {
+      return Intent(context, ClockSkewActivity::class.java)
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/clockskew/ClockSkewDetector.kt

@@ -0,0 +1,137 @@
+/*
+ * Copyright 2026 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.clockskew
+
+import android.app.Application
+import android.content.Intent
+import android.os.SystemClock
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.launch
+import org.signal.core.util.AppForegroundObserver
+import org.signal.core.util.logging.Log
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.util.RemoteConfig
+import kotlin.math.abs
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
+
+/**
+ * Detects when the local device clock is too far out of sync with the server's clock and holds that state in memory.
+ *
+ * We learn the server's true time from two sources: the websocket ([org.signal.libsignal.net.ChatConnectionListener.onServerTimestamp],
+ * routed through [org.thoughtcrime.securesms.net.SignalWebSocketHealthMonitor]) and the remote config fetch. Because we
+ * hold the websocket open aggressively, a user can change their clock while already connected — in which case we won't
+ * receive a fresh server time. To catch that, we cache the last-known server time alongside a monotonic
+ * [SystemClock.elapsedRealtime] reading and re-check on foreground, estimating the current server time without needing
+ * another network round-trip.
+ *
+ * When skew is detected we stop trying to keep the websocket open (so we don't reconnect in a loop) regardless of
+ * whether the app is foregrounded, and — only while foregrounded — show [ClockSkewActivity]. The detection state is
+ * intentionally not persisted and is re-evaluated via [recheck] whenever the app is backgrounded or foregrounded, so a
+ * skew that has since been corrected clears itself and the user always gets a fresh attempt.
+ *
+ * Note that the monotonic reading is deliberately kept in memory only: it is meaningless across reboots, but a reboot
+ * kills our process anyway, so a live cache is always from the current boot.
+ */
+object ClockSkewDetector {
+
+  private val TAG = Log.tag(ClockSkewDetector::class)
+
+  private val _detected = MutableStateFlow(false)
+  val detected: StateFlow<Boolean> = _detected.asStateFlow()
+
+  val isDetected: Boolean
+    get() = _detected.value
+
+  /** The amount our local clock was off from the server's when skew was detected. [Duration.ZERO] when not detected. */
+  @Volatile
+  var skew: Duration = Duration.ZERO
+    private set
+
+  @Volatile
+  private var lastServerTime: Long = 0
+
+  @Volatile
+  private var lastServerTimeElapsedRealtime: Long = 0
+
+  private val allowedSkew: Duration
+    get() = RemoteConfig.maxAllowedClockSkewSeconds.seconds
+
+  /**
+   * Records a freshly-observed server time (both persisting it and caching it for [recheck]) and immediately checks it
+   * against our local clock.
+   */
+  fun onServerTimeReceived(serverTime: Long) {
+    lastServerTime = serverTime
+    lastServerTimeElapsedRealtime = SystemClock.elapsedRealtime()
+    SignalStore.misc.setLastKnownServerTime(serverTime, System.currentTimeMillis())
+
+    val skew = skewFrom(serverTime)
+    if (skew > allowedSkew) {
+      Log.w(TAG, "Local clock is off from the server by $skew, which exceeds the allowed limit. Blocking.", true)
+      markDetected(skew)
+    }
+  }
+
+  /**
+   * Re-evaluates clock skew using our cached server time and a monotonic estimate of elapsed time, without needing a
+   * network round-trip. Intended to be called when the app is foregrounded, to catch the case where the user changed
+   * their clock while we were already connected. Clears the detection state if the clock now looks fine.
+   */
+  fun recheck() {
+    if (lastServerTimeElapsedRealtime == 0L) {
+      reset()
+      return
+    }
+
+    val estimatedServerTime = lastServerTime + (SystemClock.elapsedRealtime() - lastServerTimeElapsedRealtime)
+    val skew = skewFrom(estimatedServerTime)
+    if (skew > allowedSkew) {
+      Log.w(TAG, "Local clock is off from the estimated server time by $skew, which exceeds the allowed limit. Blocking.", true)
+      markDetected(skew)
+    } else {
+      reset()
+    }
+  }
+
+  /** Clears any detected skew, allowing the websocket to reconnect and re-check. */
+  private fun reset() {
+    skew = Duration.ZERO
+    _detected.value = false
+  }
+
+  /**
+   * Begins observing the detection state and launches [ClockSkewActivity] whenever clock skew is detected while the app
+   * is foregrounded. Skew can also be detected while backgrounded (which still blocks the websocket), but we only bring
+   * up the blocking screen when foregrounded, to avoid a background activity launch. Should be called once during app
+   * startup.
+   */
+  @JvmStatic
+  fun beginObserving(application: Application) {
+    CoroutineScope(Dispatchers.Main).launch {
+      detected.collect { detected ->
+        if (detected && AppForegroundObserver.isForegrounded()) {
+          application.startActivity(ClockSkewActivity.createIntent(application).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
+        }
+      }
+    }
+  }
+
+  private fun markDetected(skew: Duration) {
+    this.skew = skew
+    _detected.value = true
+  }
+
+  private fun skewFrom(serverTime: Long): Duration {
+    return abs(System.currentTimeMillis() - serverTime).milliseconds
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/clockskew/ClockSkewScreen.kt

@@ -0,0 +1,135 @@
+/*
+ * Copyright 2026 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.clockskew
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.displayCutoutPadding
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.systemBarsPadding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import org.signal.core.ui.compose.AllDevicePreviews
+import org.signal.core.ui.compose.Buttons
+import org.signal.core.ui.compose.Previews
+import org.thoughtcrime.securesms.R
+
+/**
+ * Full-screen blocking screen shown when we've detected that the local device clock is too far out of sync with the
+ * server's clock (see [ClockSkewDetector]).
+ */
+@Composable
+fun ClockSkewScreen(
+  state: ClockSkewState,
+  onEvent: (ClockSkewScreenEvent) -> Unit,
+  modifier: Modifier = Modifier
+) {
+  Surface(modifier = modifier) {
+    Column(
+      horizontalAlignment = Alignment.CenterHorizontally,
+      modifier = Modifier
+        .fillMaxSize()
+        .systemBarsPadding()
+        .displayCutoutPadding()
+        .padding(horizontal = 32.dp, vertical = 24.dp)
+    ) {
+      Text(
+        text = stringResource(R.string.ClockSkewActivity__title),
+        style = MaterialTheme.typography.headlineLarge,
+        textAlign = TextAlign.Center,
+        modifier = Modifier.fillMaxWidth()
+      )
+
+      BoxWithConstraints(
+        modifier = Modifier
+          .weight(1f)
+          .fillMaxWidth()
+      ) {
+        Column(
+          horizontalAlignment = Alignment.CenterHorizontally,
+          verticalArrangement = Arrangement.Center,
+          modifier = Modifier
+            .fillMaxWidth()
+            .heightIn(min = maxHeight)
+            .verticalScroll(rememberScrollState())
+        ) {
+          Spacer(modifier = Modifier.height(64.dp))
+          Box(
+            contentAlignment = Alignment.Center,
+            modifier = Modifier
+              .size(150.dp)
+              .background(color = MaterialTheme.colorScheme.surfaceVariant, shape = CircleShape)
+          ) {
+            Icon(
+              painter = painterResource(R.drawable.symbol_recent_24),
+              contentDescription = null,
+              tint = MaterialTheme.colorScheme.primary,
+              modifier = Modifier.size(96.dp)
+            )
+          }
+
+          Spacer(modifier = Modifier.height(64.dp))
+
+          Text(
+            text = stringResource(R.string.ClockSkewActivity__date_inaccurate_description),
+            style = MaterialTheme.typography.bodyLarge,
+            textAlign = TextAlign.Center,
+            modifier = Modifier.fillMaxWidth()
+          )
+
+          Spacer(modifier = Modifier.height(16.dp))
+
+          Text(
+            text = stringResource(R.string.ClockSkewActivity__time_prefix, state.deviceDateTime),
+            style = MaterialTheme.typography.bodyMedium,
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
+            textAlign = TextAlign.Center,
+            modifier = Modifier.fillMaxWidth()
+          )
+        }
+      }
+
+      Buttons.LargePrimary(
+        onClick = { onEvent(ClockSkewScreenEvent.AdjustDateSelected) },
+        modifier = Modifier.fillMaxWidth()
+      ) {
+        Text(text = stringResource(R.string.ClockSkewActivity__adjust_date_button))
+      }
+    }
+  }
+}
+
+@AllDevicePreviews
+@Composable
+private fun ClockSkewScreenPreview() {
+  Previews.Preview {
+    ClockSkewScreen(
+      state = ClockSkewState(deviceDateTime = "12/17/25, 11:26 PM\n(Greenwich Mean Time)"),
+      onEvent = {}
+    )
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/clockskew/ClockSkewScreenAction.kt

@@ -0,0 +1,18 @@
+/*
+ * Copyright 2026 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.clockskew
+
+/**
+ * One-shot side effects emitted by [ClockSkewViewModel] for the host [ClockSkewActivity] to perform, since they require
+ * an Activity context.
+ */
+sealed interface ClockSkewScreenAction {
+  /** Open the system date and time settings. */
+  data object OpenDateSettings : ClockSkewScreenAction
+
+  /** Skew has been resolved; the blocking screen should close. */
+  data object Finish : ClockSkewScreenAction
+}

app/src/main/java/org/thoughtcrime/securesms/clockskew/ClockSkewScreenEvent.kt

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2026 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.clockskew
+
+/**
+ * Events emitted by [ClockSkewScreen] and handled by [ClockSkewViewModel].
+ */
+sealed interface ClockSkewScreenEvent {
+  /** The screen became visible; the displayed device time should be recomputed. */
+  data object ScreenResumed : ClockSkewScreenEvent
+
+  /** The user tapped the button to adjust their device date. */
+  data object AdjustDateSelected : ClockSkewScreenEvent
+
+  /** Internal: the [ClockSkewDetector]'s detection state changed. */
+  data class SkewStateChanged(val detected: Boolean) : ClockSkewScreenEvent
+}

app/src/main/java/org/thoughtcrime/securesms/clockskew/ClockSkewState.kt

@@ -0,0 +1,14 @@
+/*
+ * Copyright 2026 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.clockskew
+
+/**
+ * View state for [ClockSkewScreen].
+ */
+data class ClockSkewState(
+  /** The current device date and time, formatted for display (including the time zone). */
+  val deviceDateTime: String = ""
+)

app/src/main/java/org/thoughtcrime/securesms/clockskew/ClockSkewViewModel.kt

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2026 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.clockskew
+
+import androidx.annotation.VisibleForTesting
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.receiveAsFlow
+import org.signal.core.ui.compose.EventDrivenViewModel
+import org.signal.core.util.logging.Log
+import java.text.DateFormat
+import java.util.Date
+import java.util.TimeZone
+
+class ClockSkewViewModel(
+  private val clock: () -> Long = { System.currentTimeMillis() },
+  detected: StateFlow<Boolean> = ClockSkewDetector.detected
+) : EventDrivenViewModel<ClockSkewScreenEvent>(TAG) {
+
+  companion object {
+    private val TAG = Log.tag(ClockSkewViewModel::class)
+  }
+
+  private val _state = MutableStateFlow(ClockSkewState(deviceDateTime = formatDeviceDateTime()))
+  val state: StateFlow<ClockSkewState> = _state.asStateFlow()
+
+  private val _actions = Channel<ClockSkewScreenAction>(Channel.UNLIMITED)
+  val actions: Flow<ClockSkewScreenAction> = _actions.receiveAsFlow()
+
+  init {
+    detected
+      .onEach { onEvent(ClockSkewScreenEvent.SkewStateChanged(it)) }
+      .launchIn(viewModelScope)
+  }
+
+  override suspend fun processEvent(event: ClockSkewScreenEvent) {
+    applyEvent(_state.value, event, { _actions.trySend(it) }) { _state.value = it }
+  }
+
+  @VisibleForTesting
+  fun applyEvent(
+    state: ClockSkewState,
+    event: ClockSkewScreenEvent,
+    actionEmitter: (ClockSkewScreenAction) -> Unit,
+    stateEmitter: (ClockSkewState) -> Unit
+  ) {
+    when (event) {
+      ClockSkewScreenEvent.ScreenResumed -> stateEmitter(state.copy(deviceDateTime = formatDeviceDateTime()))
+      ClockSkewScreenEvent.AdjustDateSelected -> actionEmitter(ClockSkewScreenAction.OpenDateSettings)
+      is ClockSkewScreenEvent.SkewStateChanged -> if (!event.detected) actionEmitter(ClockSkewScreenAction.Finish)
+    }
+  }
+
+  private fun formatDeviceDateTime(): String {
+    val dateTime = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT).format(Date(clock()))
+    val timeZone = TimeZone.getDefault().getDisplayName(false, TimeZone.LONG)
+    return "$dateTime\n($timeZone)"
+  }
+}

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

@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.components;
 
+import android.app.Dialog;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -12,7 +13,9 @@ import androidx.annotation.StringRes;
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.DialogFragment;
 
+import org.signal.core.ui.WindowExtensionsKt;
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.util.SystemWindowInsetsSetter;
 import org.thoughtcrime.securesms.util.WindowUtil;
 
 /**
@@ -30,6 +33,15 @@ public abstract class FullScreenDialogFragment extends DialogFragment {
     setStyle(STYLE_NO_FRAME, R.style.Signal_DayNight_Dialog_FullScreen);
   }
 
+  @Override
+  public @NonNull Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+    Dialog dialog = super.onCreateDialog(savedInstanceState);
+    if (dialog.getWindow() != null) {
+      WindowExtensionsKt.enableEdgeToEdge(dialog.getWindow());
+    }
+    return dialog;
+  }
+
   @Override
   public final @NonNull View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
     View view = inflater.inflate(R.layout.full_screen_dialog_fragment, container, false);
@@ -41,6 +53,8 @@ public abstract class FullScreenDialogFragment extends DialogFragment {
     }
 
     toolbar.setNavigationOnClickListener(v -> onNavigateUp());
+
+    SystemWindowInsetsSetter.attach(view, getViewLifecycleOwner());
     return view;
   }
 

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

@@ -17,40 +17,37 @@
 package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
-import android.graphics.Rect;
-import android.os.Build;
+import android.content.res.Configuration;
 import android.preference.PreferenceManager;
 import android.util.AttributeSet;
-import android.util.DisplayMetrics;
-import android.view.Surface;
-import android.view.View;
-import android.view.WindowInsets;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.widget.LinearLayoutCompat;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
-import org.signal.core.util.ServiceUtil;
 import org.signal.core.util.Util;
-import org.thoughtcrime.securesms.util.ViewUtil;
 
-import java.lang.reflect.Field;
 import java.util.HashSet;
 import java.util.Set;
 
 /**
  * LinearLayout that, when a view container, will report back when it thinks a soft keyboard
- * has been opened and what its height would be.
+ * has been opened and what its height would be. Driven by {@link WindowInsetsCompat.Type#ime()}
+ * insets, so it requires an edge-to-edge host window (all activity and dialog windows in the app
+ * are edge-to-edge). The reported height excludes the navigation bar, matching what a custom
+ * keyboard sitting above a navigation-bar-padded container should be sized to.
  */
 public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
   private static final String TAG = Log.tag(KeyboardAwareLinearLayout.class);
 
   private static final long KEYBOARD_DEBOUNCE = 150;
 
-  private final Rect                          rect            = new Rect();
   private final Set<OnKeyboardHiddenListener> hiddenListeners = new HashSet<>();
   private final Set<OnKeyboardShownListener>  shownListeners  = new HashSet<>();
-  private final DisplayMetrics                displayMetrics  = new DisplayMetrics();
 
   private final int minKeyboardSize;
   private final int minCustomKeyboardSize;
@@ -58,14 +55,14 @@ public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
   private final int minCustomKeyboardTopMarginPortrait;
   private final int minCustomKeyboardTopMarginLandscape;
   private final int minCustomKeyboardTopMarginLandscapeBubble;
-  private final int statusBarHeight;
-
-  private int viewInset;
 
   private boolean keyboardOpen = false;
-  private int     rotation     = 0;
   private boolean isBubble     = false;
   private long    openedAt     = 0;
+  private int     lastKeyboardHeight;
+  private boolean lastKeyboardVisible;
+
+  private InsetPaddingMode insetPaddingMode = InsetPaddingMode.NONE;
 
   public KeyboardAwareLinearLayout(Context context) {
     this(context, null);
@@ -83,48 +80,71 @@ public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
     minCustomKeyboardTopMarginPortrait        = getResources().getDimensionPixelSize(R.dimen.min_custom_keyboard_top_margin_portrait);
     minCustomKeyboardTopMarginLandscape       = getResources().getDimensionPixelSize(R.dimen.min_custom_keyboard_top_margin_portrait);
     minCustomKeyboardTopMarginLandscapeBubble = getResources().getDimensionPixelSize(R.dimen.min_custom_keyboard_top_margin_landscape_bubble);
-    statusBarHeight                           = ViewUtil.getStatusBarHeight(this);
-    viewInset                                 = getViewInset();
-  }
 
-  @Override
-  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-    updateRotation();
-    updateKeyboardState();
-    super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    ViewCompat.setOnApplyWindowInsetsListener(this, (view, insets) -> {
+      Insets ime  = insets.getInsets(WindowInsetsCompat.Type.ime());
+      Insets nav  = insets.getInsets(WindowInsetsCompat.Type.navigationBars());
+      Insets bars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
+
+      lastKeyboardHeight  = Math.max(0, ime.bottom - nav.bottom);
+      lastKeyboardVisible = insets.isVisible(WindowInsetsCompat.Type.ime());
+
+      switch (insetPaddingMode) {
+        case NONE:
+          break;
+        case KEYBOARD:
+          setPadding(getPaddingLeft(), getPaddingTop(), getPaddingRight(), lastKeyboardVisible ? lastKeyboardHeight : 0);
+          break;
+        case KEYBOARD_AND_NAVIGATION_BAR:
+          setPadding(getPaddingLeft(), getPaddingTop(), getPaddingRight(), Math.max(nav.bottom, ime.bottom));
+          break;
+        case SAFE_AREA:
+          setPadding(bars.left, bars.top, bars.right, Math.max(bars.bottom, ime.bottom));
+          break;
+      }
+
+      updateKeyboardState();
+
+      return insets;
+    });
   }
 
   public void setIsBubble(boolean isBubble) {
     this.isBubble = isBubble;
   }
 
-  private void updateRotation() {
-    int oldRotation = rotation;
-    rotation = getDeviceRotation();
-    if (oldRotation != rotation) {
-      Log.i(TAG, "rotation changed");
-      onKeyboardClose();
-    }
+  /**
+   * Opt-in self-padding, replacing the window resize behavior these layouts relied on before the
+   * host windows went edge-to-edge. [InsetPaddingMode.NONE] keeps the layout as a pure keyboard
+   * event source (e.g. when a parent container already manages insets).
+   */
+  public void setInsetPaddingMode(@NonNull InsetPaddingMode mode) {
+    this.insetPaddingMode = mode;
+    ViewCompat.requestApplyInsets(this);
+  }
+
+  public enum InsetPaddingMode {
+    /** Apply no padding; the layout only reports keyboard events. */
+    NONE,
+    /** Pad the bottom by the keyboard height above the navigation bar (use inside a container that already clears the navigation bar). */
+    KEYBOARD,
+    /** Pad the bottom by the keyboard or navigation bar, whichever is larger. */
+    KEYBOARD_AND_NAVIGATION_BAR,
+    /** Pad all sides by the system bars, and the bottom by the keyboard when it is taller. */
+    SAFE_AREA
   }
 
   private void updateKeyboardState() {
-    if (viewInset == 0) viewInset = getViewInset();
-
-    getWindowVisibleDisplayFrame(rect);
-
-    final int availableHeight = getAvailableHeight();
-    final int keyboardHeight  = availableHeight - rect.bottom;
-
-    if (keyboardHeight > minKeyboardSize) {
-      if (getKeyboardHeight() != keyboardHeight) {
+    if (lastKeyboardVisible && lastKeyboardHeight > minKeyboardSize) {
+      if (getKeyboardHeight() != lastKeyboardHeight) {
         if (isLandscape()) {
-          setKeyboardLandscapeHeight(keyboardHeight);
+          setKeyboardLandscapeHeight(lastKeyboardHeight);
         } else {
-          setKeyboardPortraitHeight(keyboardHeight);
+          setKeyboardPortraitHeight(lastKeyboardHeight);
         }
       }
       if (!keyboardOpen) {
-        onKeyboardOpen(keyboardHeight);
+        onKeyboardOpen(lastKeyboardHeight);
       }
     } else if (keyboardOpen) {
       onKeyboardClose();
@@ -134,53 +154,7 @@ public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
   @Override
   protected void onAttachedToWindow() {
     super.onAttachedToWindow();
-    rotation = getDeviceRotation();
-    if (getRootWindowInsets() != null) {
-      int          bottomInset;
-      WindowInsets windowInsets = getRootWindowInsets();
-
-      if (Build.VERSION.SDK_INT >= 30) {
-        bottomInset = windowInsets.getInsets(WindowInsets.Type.navigationBars()).bottom;
-      } else {
-        bottomInset = windowInsets.getStableInsetBottom();
-      }
-
-      if (bottomInset != 0 && (viewInset == 0 || viewInset == statusBarHeight)) {
-        Log.i(TAG, "Updating view inset based on WindowInsets. viewInset: " + viewInset + " windowInset: " + bottomInset);
-        viewInset = bottomInset;
-      }
-    }
-  }
-
-  private int getViewInset() {
-    try {
-      Field attachInfoField = View.class.getDeclaredField("mAttachInfo");
-      attachInfoField.setAccessible(true);
-      Object attachInfo = attachInfoField.get(this);
-      if (attachInfo != null) {
-        Field stableInsetsField = attachInfo.getClass().getDeclaredField("mStableInsets");
-        stableInsetsField.setAccessible(true);
-        Rect insets = (Rect) stableInsetsField.get(attachInfo);
-        if (insets != null) {
-          return insets.bottom;
-        }
-      }
-    } catch (NoSuchFieldException | IllegalAccessException e) {
-      // Do nothing
-    }
-    return statusBarHeight;
-  }
-
-  private int getAvailableHeight() {
-    final int availableHeight = this.getRootView().getHeight() - viewInset;
-    final int availableWidth  = this.getRootView().getWidth();
-
-    if (isLandscape() && availableHeight > availableWidth) {
-      //noinspection SuspiciousNameCombination
-      return availableWidth;
-    }
-
-    return availableHeight;
+    ViewCompat.requestApplyInsets(this);
   }
 
   protected void onKeyboardOpen(int keyboardHeight) {
@@ -213,21 +187,7 @@ public class KeyboardAwareLinearLayout extends LinearLayoutCompat {
   }
 
   public boolean isLandscape() {
-    int rotation = getDeviceRotation();
-    return rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270;
-  }
-
-  private int getDeviceRotation() {
-    if (isInEditMode()) {
-      return Surface.ROTATION_0;
-    }
-
-    if (Build.VERSION.SDK_INT >= 30) {
-      getContext().getDisplay().getRealMetrics(displayMetrics);
-    } else {
-      ServiceUtil.getWindowManager(getContext()).getDefaultDisplay().getRealMetrics(displayMetrics);
-    }
-    return displayMetrics.widthPixels > displayMetrics.heightPixels ? Surface.ROTATION_90 : Surface.ROTATION_0;
+    return getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE;
   }
 
   private int getKeyboardLandscapeHeight() {

app/src/main/java/org/thoughtcrime/securesms/components/KeyboardEntryDialogFragment.kt

@@ -8,6 +8,7 @@ import android.view.ViewGroup
 import android.view.WindowManager
 import androidx.annotation.LayoutRes
 import androidx.fragment.app.DialogFragment
+import org.signal.core.ui.enableEdgeToEdge
 import org.thoughtcrime.securesms.R
 
 /**
@@ -38,6 +39,7 @@ abstract class KeyboardEntryDialogFragment(@LayoutRes contentLayoutId: Int) :
     }
 
     dialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE or WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
+    dialog.window?.enableEdgeToEdge()
 
     return dialog
   }
@@ -47,6 +49,7 @@ abstract class KeyboardEntryDialogFragment(@LayoutRes contentLayoutId: Int) :
 
     val view = super.onCreateView(inflater, container, savedInstanceState)
     return if (view is KeyboardAwareLinearLayout) {
+      view.setInsetPaddingMode(KeyboardAwareLinearLayout.InsetPaddingMode.SAFE_AREA)
       view.addOnKeyboardShownListener(this)
       view.addOnKeyboardHiddenListener(this)
       view

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

@@ -13,6 +13,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
+import androidx.constraintlayout.widget.ConstraintLayout;
 
 import com.bumptech.glide.RequestManager;
 
@@ -207,6 +208,27 @@ public class LinkPreviewView extends FrameLayout {
     } else {
       thumbnail.setVisibility(GONE);
     }
+
+    boolean thumbnailVisible = (showThumbnail && linkPreview.getThumbnail().isPresent()) || callLinkRootKey != null;
+    alignTitleWithThumbnail(thumbnailVisible);
+  }
+
+  private void alignTitleWithThumbnail(boolean thumbnailVisible) {
+    ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams) title.getLayoutParams();
+    if (thumbnailVisible) {
+      params.topToTop       = R.id.linkpreview_thumbnail;
+      params.bottomToBottom = R.id.linkpreview_thumbnail;
+      params.startToEnd     = R.id.linkpreview_thumbnail;
+      params.startToStart   = ConstraintLayout.LayoutParams.UNSET;
+      params.setMarginStart(ViewUtil.dpToPx(8));
+    } else {
+      params.topToTop       = ConstraintLayout.LayoutParams.PARENT_ID;
+      params.bottomToBottom = ConstraintLayout.LayoutParams.UNSET;
+      params.startToEnd     = ConstraintLayout.LayoutParams.UNSET;
+      params.startToStart   = ConstraintLayout.LayoutParams.PARENT_ID;
+      params.setMarginStart(0);
+    }
+    title.setLayoutParams(params);
   }
 
   public void setCorners(int topStart, int topEnd) {

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

@@ -22,6 +22,7 @@ import com.google.android.material.imageview.ShapeableImageView;
 import com.google.android.material.shape.CornerFamily;
 import com.google.android.material.shape.ShapeAppearanceModel;
 
+import org.signal.core.ui.fonts.SignalSymbols;
 import org.signal.core.ui.view.Stub;
 import org.signal.core.util.DimensionUnit;
 import org.signal.core.util.Util;
@@ -37,7 +38,6 @@ import org.thoughtcrime.securesms.conversation.MessageStyler;
 import org.thoughtcrime.securesms.conversation.v2.items.SenderNameWithLabelView;
 import org.thoughtcrime.securesms.database.model.Mention;
 import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList;
-import org.thoughtcrime.securesms.fonts.SignalSymbols;
 import org.thoughtcrime.securesms.groups.memberlabel.MemberLabel;
 import org.thoughtcrime.securesms.mms.QuoteModel;
 import org.thoughtcrime.securesms.mms.Slide;

app/src/main/java/org/thoughtcrime/securesms/components/SignalProgressDialog.kt

@@ -48,11 +48,15 @@ class SignalProgressDialog private constructor(
   }
 
   fun hide() {
-    dialog.hide()
+    if (dialog.window?.decorView?.isAttachedToWindow == true) {
+      dialog.hide()
+    }
   }
 
   fun dismiss() {
-    dialog.dismiss()
+    if (dialog.window?.decorView?.isAttachedToWindow == true) {
+      dialog.dismiss()
+    }
   }
 
   companion object {

app/src/main/java/org/thoughtcrime/securesms/components/WrapperDialogFragment.kt

@@ -1,11 +1,13 @@
 package org.thoughtcrime.securesms.components
 
+import android.app.Dialog
 import android.content.DialogInterface
 import android.os.Bundle
 import android.view.View
 import androidx.activity.OnBackPressedCallback
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
+import org.signal.core.ui.enableEdgeToEdge
 import org.signal.core.ui.initializeScreenshotSecurity
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.util.fragments.findListener
@@ -41,6 +43,12 @@ abstract class WrapperDialogFragment : DialogFragment(R.layout.fragment_containe
     setStyle(STYLE_NO_FRAME, R.style.Signal_DayNight_Dialog_FullScreen)
   }
 
+  override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+    return super.onCreateDialog(savedInstanceState).apply {
+      window?.enableEdgeToEdge()
+    }
+  }
+
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     requireActivity().onBackPressedDispatcher.addCallback(
       viewLifecycleOwner,

app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiUtil.java

@@ -17,7 +17,7 @@ import java.util.Set;
 import java.util.regex.Pattern;
 
 public final class EmojiUtil {
-  private static final Pattern EMOJI_PATTERN = Pattern.compile("^(?:(?:[\u00a9\u00ae\u203c\u2049\u2122\u2139\u2194-\u2199\u21a9-\u21aa\u231a-\u231b\u2328\u23cf\u23e9-\u23f3\u23f8-\u23fa\u24c2\u25aa-\u25ab\u25b6\u25c0\u25fb-\u25fe\u2600-\u2604\u260e\u2611\u2614-\u2615\u2618\u261d\u2620\u2622-\u2623\u2626\u262a\u262e-\u262f\u2638-\u263a\u2648-\u2653\u2660\u2663\u2665-\u2666\u2668\u267b\u267f\u2692-\u2694\u2696-\u2697\u2699\u269b-\u269c\u26a0-\u26a1\u26aa-\u26ab\u26b0-\u26b1\u26bd-\u26be\u26c4-\u26c5\u26c8\u26ce-\u26cf\u26d1\u26d3-\u26d4\u26e9-\u26ea\u26f0-\u26f5\u26f7-\u26fa\u26fd\u2702\u2705\u2708-\u270d\u270f\u2712\u2714\u2716\u271d\u2721\u2728\u2733-\u2734\u2744\u2747\u274c\u274e\u2753-\u2755\u2757\u2763-\u2764\u2795-\u2797\u27a1\u27b0\u27bf\u2934-\u2935\u2b05-\u2b07\u2b1b-\u2b1c\u2b50\u2b55\u3030\u303d\u3297\u3299\ud83c\udc04\ud83c\udccf\ud83c\udd70-\ud83c\udd71\ud83c\udd7e-\ud83c\udd7f\ud83c\udd8e\ud83c\udd91-\ud83c\udd9a\ud83c\ude01-\ud83c\ude02\ud83c\ude1a\ud83c\ude2f\ud83c\ude32-\ud83c\ude3a\ud83c\ude50-\ud83c\ude51\u200d\ud83c\udf00-\ud83d\uddff\ud83d\ude00-\ud83d\ude4f\ud83d\ude80-\ud83d\udeff\ud83e\udd00-\ud83e\uddff\udb40\udc20-\udb40\udc7f]|\u200d[\u2640\u2642]|[\ud83c\udde6-\ud83c\uddff]{2}|.[\u20e0\u20e3\ufe0f]+)+)+$");
+  private static final Pattern EMOJI_PATTERN = Pattern.compile("^(?:[\u00a9\u00ae\u203c\u2049\u2122\u2139\u2194-\u2199\u21a9-\u21aa\u231a-\u231b\u2328\u23cf\u23e9-\u23f3\u23f8-\u23fa\u24c2\u25aa-\u25ab\u25b6\u25c0\u25fb-\u25fe\u2600-\u2604\u260e\u2611\u2614-\u2615\u2618\u261d\u2620\u2622-\u2623\u2626\u262a\u262e-\u262f\u2638-\u263a\u2648-\u2653\u2660\u2663\u2665-\u2666\u2668\u267b\u267f\u2692-\u2694\u2696-\u2697\u2699\u269b-\u269c\u26a0-\u26a1\u26aa-\u26ab\u26b0-\u26b1\u26bd-\u26be\u26c4-\u26c5\u26c8\u26ce-\u26cf\u26d1\u26d3-\u26d4\u26e9-\u26ea\u26f0-\u26f5\u26f7-\u26fa\u26fd\u2702\u2705\u2708-\u270d\u270f\u2712\u2714\u2716\u271d\u2721\u2728\u2733-\u2734\u2744\u2747\u274c\u274e\u2753-\u2755\u2757\u2763-\u2764\u2795-\u2797\u27a1\u27b0\u27bf\u2934-\u2935\u2b05-\u2b07\u2b1b-\u2b1c\u2b50\u2b55\u3030\u303d\u3297\u3299\ud83c\udc04\ud83c\udccf\ud83c\udd70-\ud83c\udd71\ud83c\udd7e-\ud83c\udd7f\ud83c\udd8e\ud83c\udd91-\ud83c\udd9a\ud83c\ude01-\ud83c\ude02\ud83c\ude1a\ud83c\ude2f\ud83c\ude32-\ud83c\ude3a\ud83c\ude50-\ud83c\ude51\u200d\ud83c\udf00-\ud83d\uddff\ud83d\ude00-\ud83d\ude4f\ud83d\ude80-\ud83d\udeff\ud83e\udd00-\ud83e\uddff\udb40\udc20-\udb40\udc7f]|\u200d[\u2640\u2642]|[\ud83c\udde6-\ud83c\uddff]{2}|.[\u20e0\u20e3\ufe0f]++)+$");
   private static final String  EMOJI_REGEX   = "[^\\p{L}\\p{M}\\p{N}\\p{P}\\p{Z}\\p{Cf}\\p{Cs}\\s]";
 
   private EmojiUtil() {}

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

@@ -1,7 +1,12 @@
 package org.thoughtcrime.securesms.components.settings
 
+import android.content.res.Configuration
+import android.os.Build
 import android.os.Bundle
 import androidx.activity.OnBackPressedCallback
+import androidx.activity.SystemBarStyle
+import androidx.activity.enableEdgeToEdge
+import androidx.core.content.ContextCompat
 import androidx.navigation.NavController
 import androidx.navigation.Navigation
 import androidx.navigation.fragment.NavHostFragment
@@ -9,6 +14,7 @@ import org.thoughtcrime.securesms.PassphraseRequiredActivity
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme
 import org.thoughtcrime.securesms.util.DynamicTheme
+import org.signal.core.ui.R as CoreUiR
 
 /**
  * The DSL API can be completely replaced by compose.
@@ -22,6 +28,8 @@ open class DSLSettingsActivity : PassphraseRequiredActivity() {
     private set
 
   override fun onCreate(savedInstanceState: Bundle?, ready: Boolean) {
+    enableSettingsEdgeToEdge()
+
     setContentView(R.layout.dsl_settings_activity)
 
     if (savedInstanceState == null) {
@@ -62,6 +70,23 @@ open class DSLSettingsActivity : PassphraseRequiredActivity() {
     }
   }
 
+  private fun enableSettingsEdgeToEdge() {
+    val navBarColor = ContextCompat.getColor(this, CoreUiR.color.signal_colorSurface2)
+    val isDark = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
+
+    if (Build.VERSION.SDK_INT >= 26) {
+      enableEdgeToEdge(
+        navigationBarStyle = if (isDark) {
+          SystemBarStyle.dark(navBarColor)
+        } else {
+          SystemBarStyle.light(navBarColor, navBarColor)
+        }
+      )
+    } else {
+      enableEdgeToEdge()
+    }
+  }
+
   protected open fun onWillFinish() {}
 
   protected open fun resolveNavGraphId(): Int = intent.getIntExtra(ARG_NAV_GRAPH, -1)

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

@@ -4,6 +4,7 @@ import android.content.Context
 import android.os.Build
 import android.os.Bundle
 import android.view.View
+import android.view.ViewGroup
 import android.widget.EdgeEffect
 import androidx.annotation.CallSuper
 import androidx.annotation.LayoutRes
@@ -11,12 +12,17 @@ import androidx.annotation.MenuRes
 import androidx.annotation.StringRes
 import androidx.appcompat.widget.Toolbar
 import androidx.core.content.ContextCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updateLayoutParams
 import androidx.recyclerview.widget.ConcatAdapter
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import org.signal.core.ui.logging.LoggingFragment
+import org.thoughtcrime.securesms.MainActivity
 import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.settings.conversation.ConversationSettingsNavHostFragment
 import org.thoughtcrime.securesms.util.Material3OnScrollHelper
+import org.thoughtcrime.securesms.util.SystemWindowInsetsSetter
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 
 /**
@@ -35,6 +41,12 @@ abstract class DSLSettingsFragment(
 
   private var toolbar: Toolbar? = null
 
+  /**
+   * Set by layouts that anchor the list to the top of the toolbar rather than below it. Those lists scroll
+   * behind the toolbar, so they have to carry the status bar inset themselves.
+   */
+  protected open val listScrollsBehindToolbar: Boolean = false
+
   @CallSuper
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     toolbar = view.findViewById(R.id.toolbar)
@@ -70,6 +82,8 @@ abstract class DSLSettingsFragment(
       }
     }
 
+    applyEdgeToEdgeInsets()
+
     when (settingsAdapter) {
       is ConcatAdapter -> bindAdapters(settingsAdapter)
       is MappingAdapter -> bindAdapter(settingsAdapter)
@@ -77,6 +91,41 @@ abstract class DSLSettingsFragment(
     }
   }
 
+  /**
+   * All host windows are edge-to-edge — activities centrally via [org.thoughtcrime.securesms.BaseActivity],
+   * and the full-screen dialog hosts ([org.thoughtcrime.securesms.components.WrapperDialogFragment],
+   * [org.thoughtcrime.securesms.stories.settings.create.CreateStoryFlowDialogFragment]) via their own
+   * `enableEdgeToEdge` calls — so the toolbar tint must extend behind the (transparent) status bar and the
+   * list must scroll clear of the navigation bar. Skipped only for fragments embedded directly in
+   * [MainActivity]'s Compose scaffolding, which insets those containers itself — except the
+   * conversation-settings detail entry ([ConversationSettingsNavHostFragment]), which leaves insets to these
+   * fragments so the toolbar scroll tint can reach behind the status bar.
+   */
+  private fun applyEdgeToEdgeInsets() {
+    if (isInsetByMainActivityHost()) {
+      return
+    }
+
+    toolbar?.let { toolbar ->
+      toolbar.updateLayoutParams { height = ViewGroup.LayoutParams.WRAP_CONTENT }
+      SystemWindowInsetsSetter.attach(toolbar, viewLifecycleOwner, WindowInsetsCompat.Type.statusBars())
+    }
+
+    recyclerView?.let { recycler ->
+      val insetTypes = WindowInsetsCompat.Type.navigationBars() or if (listScrollsBehindToolbar) WindowInsetsCompat.Type.statusBars() else 0
+
+      recycler.clipToPadding = false
+      SystemWindowInsetsSetter.attach(recycler, viewLifecycleOwner, insetTypes)
+    }
+  }
+
+  private fun isInsetByMainActivityHost(): Boolean {
+    if (activity !is MainActivity) {
+      return false
+    }
+    return generateSequence(parentFragment) { it.parentFragment }.none { it is ConversationSettingsNavHostFragment }
+  }
+
   open fun getMaterial3OnScrollHelper(toolbar: Toolbar?): Material3OnScrollHelper? {
     if (toolbar == null) {
       return null