Bump version to 8.13.2

2026-07-25 06:54:40 +01:00 · 2026-06-03 15:35:01 -03:00
1956 changed files with 85149 additions and 107209 deletions
@@ -1,2 +1 @@
 *.ai binary
-**/src/screenshotTest*/reference/**/*.png filter=lfs diff=lfs merge=lfs -text
@@ -5,7 +5,7 @@ on:
  push:
    branches:
    - 'main'
-    - '8.**'
+    - '7.**'

 permissions:
  contents: read # to fetch code (actions/checkout)
@@ -16,42 +16,25 @@ jobs:
    runs-on: ubuntu-latest-8-cores

    steps:
-    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
      # gh api repos/actions/checkout/commits/v6 --jq '.sha'
      with:
          submodules: true
-          lfs: true

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

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

-    - name: Set up Gradle
-      uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6
-      # gh api repos/gradle/actions/commits/v6 --jq '.sha'
-      with:
-        # Only 8.** branch builds write to the cache; everything else (PRs, etc.) reads only.
-        cache-read-only: ${{ !startsWith(github.ref, 'refs/heads/8.') }}
-        # Required to persist the Gradle configuration cache across runs.
-        cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
-
-    # 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' && 'ciRemote' || 'qaRemote' }}
+      run: ./gradlew qa

    - name: Archive reports for failed build
      if: ${{ failure() }}
@@ -59,7 +42,4 @@ jobs:
      # gh api repos/actions/upload-artifact/commits/v7 --jq '.sha'
      with:
        name: reports
-        path: |
-          **/build/reports
-          **/build/test-results
-        if-no-files-found: ignore
+        path: '*/build/reports'
@@ -16,38 +16,30 @@ jobs:
    runs-on: ubuntu-latest-8-cores

    steps:
-    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
      # gh api repos/actions/checkout/commits/v6 --jq '.sha'
      with:
        submodules: true
        ref: ${{ github.event.pull_request.base.sha }}

-    - name: set up JDK 21
-      uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5
+    - name: set up JDK 17
+      uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
      # gh api repos/actions/setup-java/commits/v5 --jq '.sha'
      with:
        distribution: temurin
-        java-version: 21
-
-    - name: Set up Gradle
-      uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6
-      # gh api repos/gradle/actions/commits/v6 --jq '.sha'
-      with:
-        # PR-only workflow: always read from the cache, never write.
-        cache-read-only: true
-        # Required to read the Gradle configuration cache persisted by 8.** builds.
-        cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+        java-version: 17
+        cache: gradle

    - name: Install NDK
      run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;${{ env.NDK_VERSION }}"

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

    - name: Cache base apk
      id: cache-base
-      uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v5
+      uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
      # gh api repos/actions/cache/commits/v5 --jq '.sha'
      with:
        path: diffuse-base.apk
@@ -61,7 +53,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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
      # gh api repos/actions/checkout/commits/v6 --jq '.sha'
      with:
        submodules: true
@@ -11,17 +11,11 @@ jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
        # gh api repos/actions/checkout/commits/v6 --jq '.sha'
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
      - name: Build image
-        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
+        run: |
+          cd reproducible-builds
+          docker build -t signal-android .
      - 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
@@ -14,7 +14,7 @@ jobs:
      actions: write

    steps:
-      - uses: actions/stale@1e223db275d687790206a7acac4d1a11bd6fe629 # v10
+      - uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10
        # gh api repos/actions/stale/commits/v10 --jq '.sha'
        with:
          days-before-stale: 60
@@ -1,2 +1,2 @@
-java openjdk-21.0.2
+java openjdk-17.0.2
 uv   latest
@@ -2,10 +2,7 @@

 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
@@ -13,14 +10,12 @@ import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
 import java.util.Locale
 import java.util.Properties
-import javax.inject.Inject

 plugins {
  alias(libs.plugins.android.application)
  alias(libs.plugins.ktlint)
  alias(libs.plugins.compose.compiler)
  alias(libs.plugins.kotlinx.serialization)
-  alias(testLibs.plugins.compose.screenshot)
  alias(benchmarkLibs.plugins.baselineprofile)
  id("androidx.navigation.safeargs")
  id("kotlin-parcelize")
@@ -32,9 +27,9 @@ plugins {
 val staticIps = Properties().apply { file("static-ips.properties").reader().use { load(it) } }
 staticIps.stringPropertyNames().forEach { rootProject.extra[it] = staticIps.getProperty(it) }

-val canonicalVersionCode = 1722
-val canonicalVersionName = "8.20.2"
-val currentHotfixVersion = 0
+val canonicalVersionCode = 1699
+val canonicalVersionName = "8.13.2"
+val currentHotfixVersion = 1
 val maxHotfixVersions = 100

 // We don't want versions to ever end in 0 so that they don't conflict with nightly versions
@@ -132,27 +127,9 @@ 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
-}
-
 android {
  namespace = "org.thoughtcrime.securesms"

-  experimentalProperties["android.experimental.enableScreenshotTest"] = true
-
  buildToolsVersion = libs.versions.buildTools.get()
  compileSdkVersion(libs.versions.compileSdk.get())
  ndkVersion = libs.versions.ndk.get()
@@ -613,43 +590,6 @@ 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 {
@@ -722,7 +662,6 @@ dependencies {
  implementation(libs.androidx.navigation.compose)
  implementation(libs.androidx.navigation3.runtime)
  implementation(libs.androidx.navigation3.ui)
-  implementation(libs.androidx.lifecycle.viewmodel.navigation3)
  implementation(libs.androidx.lifecycle.viewmodel.ktx)
  implementation(libs.androidx.lifecycle.livedata.ktx)
  implementation(libs.androidx.lifecycle.process)
@@ -773,11 +712,6 @@ dependencies {
  }
  implementation(libs.lottie)
  implementation(libs.lottie.compose)
-
-  // Compose screenshot testing
-  screenshotTestImplementation(testLibs.compose.screenshot.validation.api)
-  screenshotTestImplementation(libs.androidx.compose.ui.tooling.core)
-  screenshotTestImplementation(libs.androidx.compose.ui.tooling.preview)
  implementation(libs.signal.android.database.sqlcipher)
  implementation(libs.androidx.sqlite)
  testImplementation(libs.androidx.sqlite.framework)
@@ -842,18 +776,8 @@ 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)
@@ -1037,110 +961,6 @@ 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
@@ -8,11 +8,6 @@
 -keep class org.thoughtcrime.securesms.** { *; }
 -keep class org.signal.donations.json.** { *; }
 -keep class org.signal.network.** { *; }
-
-keep class org.signal.core.util.crypto.AttachmentSecret { *; }
-keep class org.signal.core.util.crypto.AttachmentSecret$* { *; }
-keep class org.signal.core.util.crypto.KeyStoreHelper$SealedData { *; }
-keep class org.signal.core.util.crypto.KeyStoreHelper$SealedData$* { *; }
 -keepclassmembers class ** {
    public void onEvent*(**);
 }
@@ -9,11 +9,9 @@ import org.thoughtcrime.securesms.database.LogDatabase
 import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencyProvider
 import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
-import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger
 import org.thoughtcrime.securesms.logging.PersistentLogger
 import org.thoughtcrime.securesms.testing.InMemoryLogger
-import org.thoughtcrime.securesms.testing.TestRemoteConfig
 import org.thoughtcrime.securesms.util.Environment

 /**
@@ -32,13 +30,6 @@ class SignalInstrumentationApplicationContext : ApplicationContext() {
    val default = ApplicationDependencyProvider(this)
    AppDependencies.init(this, InstrumentationApplicationDependencyProvider(this, default))
    AppDependencies.deadlockDetector.start()
-
-    // Stage any test-declared remote config into the store to be read in RemoteConfig.init().
-    if (TestRemoteConfig.pending.isNotEmpty()) {
-      val json = TestRemoteConfig.json
-      SignalStore.remoteConfig.currentConfig = json
-      SignalStore.remoteConfig.pendingConfig = json
-    }
  }

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

-import androidx.compose.ui.test.junit4.v2.createEmptyComposeRule
 import androidx.test.core.app.ActivityScenario
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.RootMatchers.isDialog
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.isNotEnabled
 import androidx.test.espresso.matcher.ViewMatchers.isSelected
@@ -13,33 +11,28 @@ 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.junit.After
-import org.junit.Before
+import io.mockk.every
 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.network.NetworkResult
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
-import org.thoughtcrime.securesms.components.settings.app.subscription.permits.DonationPermits
-import org.thoughtcrime.securesms.database.InAppPaymentTable
-import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
 import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.testing.GooglePayTestRule
 import org.thoughtcrime.securesms.testing.InAppPaymentsRule
 import org.thoughtcrime.securesms.testing.RxTestSchedulerRule
 import org.thoughtcrime.securesms.testing.SignalActivityRule
-import org.thoughtcrime.securesms.testing.actions.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.thoughtcrime.securesms.testing.actions.RecyclerViewScrollToBottomAction
+import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
 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)
@@ -53,37 +46,19 @@ class CheckoutFlowActivityTest__RecurringDonations {
  @get:Rule
  val rxRule = RxTestSchedulerRule()

-  @get:Rule
-  val googlePayRule = GooglePayTestRule()
-
-  @get:Rule
-  val composeRule = createEmptyComposeRule()
-
  private val intent = CheckoutFlowActivity.createIntent(InstrumentationRegistry.getInstrumentation().targetContext, InAppPaymentType.RECURRING_DONATION)

-  @Before
-  fun setUp() {
-    SignalDatabase.inAppPayments.writableDatabase.deleteAll(InAppPaymentTable.TABLE_NAME)
-    startJobLoopForTests()
-  }
-
-  @After
-  fun tearDown() {
-    unmockkObject(DonationPermits)
-  }
-
  @Test
  fun givenRecurringDonations_whenILoadScreen_thenIExpectMonthlySelected() {
    ActivityScenario.launch<CheckoutFlowActivity>(intent)
-    scrollToDescendant(R.id.recycler, withId(R.id.monthly), rxRule.defaultTestScheduler)
    onView(withId(R.id.monthly)).check(matches(isSelected()))
  }

  @Test
  fun givenNoCurrentDonation_whenILoadScreen_thenIExpectContinueButton() {
    ActivityScenario.launch<CheckoutFlowActivity>(intent)
-    scrollToDescendant(R.id.recycler, withText(R.string.DonateToSignalFragment__continue), rxRule.defaultTestScheduler)
-    onView(withText(R.string.DonateToSignalFragment__continue)).check(matches(isDisplayed()))
+    onView(withId(R.id.recycler)).perform(RecyclerViewScrollToBottomAction)
+    onView(withText("Continue")).check(matches(isDisplayed()))
  }

  @Test
@@ -94,9 +69,8 @@ class CheckoutFlowActivityTest__RecurringDonations {

    rxRule.defaultTestScheduler.triggerActions()

-    scrollToDescendant(R.id.recycler, withText(R.string.SubscribeFragment__update_subscription), rxRule.defaultTestScheduler)
+    onView(withId(R.id.recycler)).perform(RecyclerViewScrollToBottomAction)
    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()))
  }

@@ -108,7 +82,7 @@ class CheckoutFlowActivityTest__RecurringDonations {

    rxRule.defaultTestScheduler.triggerActions()

-    scrollToDescendant(R.id.recycler, withText(R.string.SubscribeFragment__cancel_subscription), rxRule.defaultTestScheduler)
+    onView(withId(R.id.recycler)).perform(RecyclerViewScrollToBottomAction)
    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()))
@@ -123,65 +97,12 @@ class CheckoutFlowActivityTest__RecurringDonations {

    rxRule.defaultTestScheduler.triggerActions()

-    scrollToDescendant(R.id.recycler, withText(R.string.SubscribeFragment__update_subscription), rxRule.defaultTestScheduler)
+    onView(withId(R.id.recycler)).perform(RecyclerViewScrollToBottomAction)
    onView(withText(R.string.SubscribeFragment__update_subscription)).check(matches(isDisplayed()))
    onView(withText(R.string.SubscribeFragment__update_subscription)).check(matches(isNotEnabled()))
  }

-  @Test
-  fun givenSubscriberPermitAcquisitionFails_whenISubscribe_thenIExpectPaymentSetupErrorDialog() {
-    failDonationPermitAcquisition()
-
-    val scenario = ActivityScenario.launch<CheckoutFlowActivity>(intent)
-    rxRule.defaultTestScheduler.triggerActions()
-
-    scrollToDescendant(R.id.recycler, withText(R.string.DonateToSignalFragment__continue), rxRule.defaultTestScheduler)
-    onView(withText(R.string.DonateToSignalFragment__continue)).perform(ViewActions.click())
-    rxRule.defaultTestScheduler.triggerActions()
-
-    scenario.selectGooglePay(composeRule, rxRule.defaultTestScheduler, InAppPaymentType.RECURRING_DONATION)
-
-    awaitDialog(rxRule.defaultTestScheduler, R.string.DonationsErrors__error_processing_payment)
-    onView(withText(R.string.DonationsErrors__your_payment)).inRoot(isDialog()).check(matches(isDisplayed()))
-  }
-
-  @Test
-  fun givenSubscriptionPaymentMethodPermitRejected_whenISubscribe_thenIExpectPaymentSetupErrorDialog() {
-    succeedDonationPermitAcquisition()
-    MockEndpoints.responder.register({ it.method == "POST" && it.path.contains("/create_payment_method") }) {
-      failure(402)
-    }
-
-    val scenario = ActivityScenario.launch<CheckoutFlowActivity>(intent)
-    rxRule.defaultTestScheduler.triggerActions()
-
-    scrollToDescendant(R.id.recycler, withText(R.string.DonateToSignalFragment__continue), rxRule.defaultTestScheduler)
-    onView(withText(R.string.DonateToSignalFragment__continue)).perform(ViewActions.click())
-    rxRule.defaultTestScheduler.triggerActions()
-
-    scenario.selectGooglePay(composeRule, rxRule.defaultTestScheduler, InAppPaymentType.RECURRING_DONATION)
-
-    awaitDialog(rxRule.defaultTestScheduler, R.string.DonationsErrors__error_processing_payment)
-    onView(withText(R.string.DonationsErrors__your_payment)).inRoot(isDialog()).check(matches(isDisplayed()))
-  }
-
  private fun initialiseActiveSubscription() {
-    val 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(),
@@ -195,6 +116,63 @@ class CheckoutFlowActivityTest__RecurringDonations {
    InAppPaymentsRepository.setSubscriber(subscriber)
    SignalStore.inAppPayments.setRecurringDonationCurrency(currency)

-    return subscriber
+    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)
+    }
+  }
+
+  private fun initialisePendingSubscription() {
+    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,
+            false,
+            System.currentTimeMillis().milliseconds.inWholeSeconds + 30.days.inWholeSeconds,
+            false,
+            "incomplete",
+            "STRIPE",
+            "CARD",
+            false
+          ),
+          null
+        )
+      )
+    }
  }
 }
@@ -1,99 +0,0 @@
-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.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()
-
-  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()
-  }
-}
@@ -1,280 +0,0 @@
-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
-  }
-}
@@ -1,142 +0,0 @@
-/*
- * Copyright 2026 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.components.settings.app.subscription.donate
-
-import android.app.Activity
-import android.content.Intent
-import androidx.compose.ui.test.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 io.mockk.every
-import io.mockk.mockkObject
-import io.reactivex.rxjava3.schedulers.TestScheduler
-import org.signal.donations.InAppPaymentType
-import org.signal.libsignal.net.RequestResult
-import org.signal.network.rest.RestStatusCodeError
-import org.thoughtcrime.securesms.SignalInstrumentationApplicationContext
-import org.thoughtcrime.securesms.components.settings.app.subscription.GooglePayComponent
-import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
-import org.thoughtcrime.securesms.components.settings.app.subscription.donate.gateway.GatewaySelectorTestTags
-import org.thoughtcrime.securesms.components.settings.app.subscription.permits.DonationPermits
-import org.thoughtcrime.securesms.dependencies.AppDependencies
-import org.thoughtcrime.securesms.testing.flushUntil
-
-/**
- * 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()
-  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
-) {
-  scheduler.flushUntil {
-    composeRule.onAllNodesWithTag(GatewaySelectorTestTags.GOOGLE_PAY_BUTTON).fetchSemanticsNodes().isNotEmpty()
-  }
-
-  composeRule.onNodeWithTag(GatewaySelectorTestTags.CONTAINER).performScrollToNode(hasTestTag(GatewaySelectorTestTags.GOOGLE_PAY_BUTTON))
-  composeRule.onNodeWithTag(GatewaySelectorTestTags.GOOGLE_PAY_BUTTON).performClick()
-
-  scheduler.flushUntil {
-    // Once the gateway sheet dismisses there is no Compose hierarchy left, so fetchSemanticsNodes throws
-    // rather than returning empty; treat both the empty list and the missing hierarchy as "sheet gone".
-    runCatching {
-      composeRule.onAllNodesWithTag(GatewaySelectorTestTags.GOOGLE_PAY_BUTTON).fetchSemanticsNodes().isEmpty()
-    }.getOrDefault(true)
-  }
-
-  onActivity { activity ->
-    (activity as GooglePayComponent).googlePayResultPublisher.onNext(
-      GooglePayComponent.GooglePayResult(
-        requestCode = InAppPaymentsRepository.getGooglePayRequestCode(inAppPaymentType),
-        resultCode = Activity.RESULT_OK,
-        data = Intent()
-      )
-    )
-  }
-}
-
-/**
- * Waits for a dialog whose title is [titleResId] to be displayed. Matches any dialog by title (error,
- * confirmation, thanks, etc.) — it is not specific to error dialogs.
- *
- * [flushUntil] advances the Rx pipeline (which may create the payment, enqueue the real setup job, and react
- * to its committed state) while yielding real time for any job to run, until the dialog renders. A single
- * condition-driven pump rather than a fixed-duration wall-clock poll. Letting the Espresso check throw (rather
- * than collapsing it to a boolean) lets [flushUntil] chain the last matcher failure as the timeout cause.
- */
-fun awaitDialog(
-  scheduler: TestScheduler,
-  titleResId: Int,
-  timeoutMillis: Long = 15_000
-) {
-  scheduler.flushUntil(timeoutMillis) {
-    onView(withText(titleResId)).inRoot(isDialog()).check(matches(isDisplayed()))
-    true
-  }
-}
@@ -1,282 +0,0 @@
-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.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()
-
-  @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
-    )
-  )
-}
@@ -1,159 +0,0 @@
-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
-}
@@ -138,7 +138,7 @@ class ConversationItemPreviewer {
  private fun attachment(): SignalServiceAttachmentPointer {
    return SignalServiceAttachmentPointer(
      Cdn.CDN_3.cdnNumber,
-      SignalServiceAttachmentRemoteId.from("", Cdn.CDN_3.cdnNumber),
+      SignalServiceAttachmentRemoteId.from(""),
      "image/webp",
      null,
      Optional.empty(),
@@ -1,200 +0,0 @@
-/*
- * 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"
-  }
-}
@@ -1,393 +0,0 @@
-/*
- * 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.Intent
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentManager
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import assertk.assertThat
-import assertk.assertions.isEqualTo
-import assertk.assertions.isGreaterThan
-import assertk.assertions.isGreaterThanOrEqualTo
-import assertk.assertions.isLessThan
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.thoughtcrime.securesms.MainActivity
-import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.conversation.ConversationIntents
-import org.thoughtcrime.securesms.database.MessageType
-import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.mms.IncomingMessage
-import org.thoughtcrime.securesms.mms.OutgoingMessage
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.testing.SignalActivityRule
-import java.util.Collections
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.TimeUnit
-
-/**
- * End-to-end UI test of the unread divider. Seeds a thread with many unread messages and opens it via the notification
- * path (which enters the conversation with no explicit jump point — functionally "open a chat with X unread"), then
- * verifies the real pipeline (repository -> view model -> fragment -> decoration) anchors the divider to the oldest
- * unread message and scrolls there rather than opening at the bottom.
- *
- * The launch harness mirrors [org.thoughtcrime.securesms.main.MainNavigationLaunchTest]: ActivityScenario can't track
- * MainActivity launched with a custom-action intent, so we start it via Application#startActivity and observe lifecycle
- * callbacks instead.
- */
-@RunWith(AndroidJUnit4::class)
-class UnreadDividerInstrumentationTest {
-
-  @get:Rule
-  val harness = SignalActivityRule(othersCount = 2)
-
-  @Test
-  fun opensScrolledToOldestUnreadWithCorrectDividerState() {
-    val recipientId = harness.others.first()
-    SignalDatabase.recipients.setProfileSharing(recipientId, true)
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(recipientId))
-
-    val totalUnread = 50
-    val oldestSentTime = 1000L
-    var oldestUnreadId = -1L
-    for (i in 0 until totalUnread) {
-      val id = insertIncoming(threadId, recipientId, time = oldestSentTime + i, body = "unread $i")
-      if (i == 0) {
-        oldestUnreadId = id
-      }
-    }
-
-    // Derive expectations from the DB the same way the app does, so the test is robust to any extra system rows.
-    val expectedUnreadCount = SignalDatabase.messages.getUnreadCount(threadId)
-    val firstUnreadPosition = SignalDatabase.messages.getMessagePositionByDateReceivedTimestamp(threadId, oldestSentTime, false)
-
-    launch(recipientId).use { launched ->
-      val result = await(timeoutMs = 20_000, description = "conversation scrolled to oldest unread") {
-        val fragment = launched.latestConversationFragment() ?: return@await null
-        val recycler = fragment.view?.findViewById<RecyclerView>(R.id.conversation_item_recycler) ?: return@await null
-        val decoration = recycler.conversationItemDecorations() ?: return@await null
-        val state = decoration.unreadStateForTesting as? ConversationItemDecorations.UnreadState.CompleteUnreadState ?: return@await null
-        val view = recycler.layoutManager?.findViewByPosition(firstUnreadPosition) ?: return@await null
-        Observed(state.unreadCount, state.firstUnreadId, view.top, recycler.height)
-      }
-
-      assertThat(result.unreadCount).isEqualTo(expectedUnreadCount)
-      assertThat(result.firstUnreadId).isEqualTo(oldestUnreadId)
-      // The oldest unread is laid out in the top half -> we scrolled up to it instead of opening at the bottom (where,
-      // with this many messages, it would be off-screen above and findViewByPosition would have returned null).
-      assertThat(result.firstUnreadTop).isGreaterThanOrEqualTo(0)
-      assertThat(result.firstUnreadTop).isLessThan(result.recyclerHeight / 2)
-    }
-  }
-
-  @Test
-  fun fullyReadConversationOpensAtBottomWithoutDivider() {
-    val recipientId = harness.others.first()
-    SignalDatabase.recipients.setProfileSharing(recipientId, true)
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(recipientId))
-
-    val total = 50
-    for (i in 0 until total) {
-      insertIncoming(threadId, recipientId, time = 1000L + i, body = "read $i")
-    }
-    SignalDatabase.threads.setRead(threadId)
-    // Precondition: nothing is unread, so there should be no divider.
-    assertThat(SignalDatabase.messages.getUnreadCount(threadId)).isEqualTo(0)
-
-    launch(recipientId).use { launched ->
-      val result = await(timeoutMs = 20_000, description = "fully-read conversation opened at the bottom") {
-        val fragment = launched.latestConversationFragment() ?: return@await null
-        val recycler = fragment.view?.findViewById<RecyclerView>(R.id.conversation_item_recycler) ?: return@await null
-        val decoration = recycler.conversationItemDecorations() ?: return@await null
-        // The newest message is position 0; if it's laid out, the list loaded and settled at the bottom.
-        val newest = recycler.layoutManager?.findViewByPosition(0) ?: return@await null
-        BottomObserved(decoration.unreadStateForTesting, newest.bottom, recycler.height)
-      }
-
-      assertThat(result.unreadState).isEqualTo(ConversationItemDecorations.UnreadState.None)
-      // Newest message sits in the lower half -> opened at the bottom (with this many messages it would be off-screen
-      // below if we'd opened at the top).
-      assertThat(result.newestBottom).isGreaterThan(result.recyclerHeight / 2)
-    }
-  }
-
-  @Test
-  fun outgoingMessageNewerThanUnreadClearsDivider() {
-    val recipientId = harness.others.first()
-    SignalDatabase.recipients.setProfileSharing(recipientId, true)
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(recipientId))
-
-    // A few unread incoming messages, then a newer outgoing reply. Kept small so all rows load in the initial page.
-    insertIncoming(threadId, recipientId, time = 1000L, body = "unread 0")
-    insertIncoming(threadId, recipientId, time = 1001L, body = "unread 1")
-    insertIncoming(threadId, recipientId, time = 1002L, body = "unread 2")
-    val outgoing = OutgoingMessage.text(
-      threadRecipient = Recipient.resolved(recipientId),
-      body = "my reply",
-      expiresIn = 0,
-      sentTimeMillis = 1003L
-    )
-    SignalDatabase.messages.insertMessageOutbox(outgoing, threadId)
-
-    // Precondition: the messages are still unread at the DB level, so the divider would show if it weren't for the
-    // newer outgoing message clearing it.
-    assertThat(SignalDatabase.messages.getUnreadCount(threadId)).isGreaterThan(0)
-
-    launch(recipientId).use { launched ->
-      val cleared = await(timeoutMs = 20_000, description = "divider cleared by newer outgoing message") {
-        val fragment = launched.latestConversationFragment() ?: return@await null
-        val recycler = fragment.view?.findViewById<RecyclerView>(R.id.conversation_item_recycler) ?: return@await null
-        val decoration = recycler.conversationItemDecorations() ?: return@await null
-        // Wait until the list has loaded (outgoing at position 0 laid out) before reading the resolved state.
-        recycler.layoutManager?.findViewByPosition(0) ?: return@await null
-        if (decoration.unreadStateForTesting == ConversationItemDecorations.UnreadState.None) true else null
-      }
-
-      assertThat(cleared).isEqualTo(true)
-    }
-  }
-
-  @Test
-  fun scrollingToBottomMarksEverythingReadAndDrainsUnreadCount() {
-    val recipientId = harness.others.first()
-    SignalDatabase.recipients.setProfileSharing(recipientId, true)
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(recipientId))
-
-    val total = 50
-    for (i in 0 until total) {
-      insertIncoming(threadId, recipientId, time = 1000L + i, body = "unread $i")
-    }
-
-    launch(recipientId).use { launched ->
-      // getUnreadCount is the shared source for the chat-list badge and the scroll-to-bottom button's count, so
-      // asserting on it verifies the number the user sees updating as they scroll.
-      await(timeoutMs = 20_000, description = "conversation loaded") {
-        val recycler = launched.latestConversationFragment()?.view?.findViewById<RecyclerView>(R.id.conversation_item_recycler)
-        if ((recycler?.childCount ?: 0) > 0) true else null
-      }
-      assertThat(SignalDatabase.messages.getUnreadCount(threadId)).isGreaterThan(0)
-
-      // Jump to the newest message; revealing it marks every earlier message read (MarkReadHelper.onViewsRevealed).
-      runOnMain {
-        launched.latestConversationFragment()?.view?.findViewById<RecyclerView>(R.id.conversation_item_recycler)?.scrollToPosition(0)
-      }
-
-      // Scrolling through the thread drains the unread count to 0.
-      await(timeoutMs = 20_000, description = "unread count reaches 0 after scrolling to the bottom") {
-        if (SignalDatabase.messages.getUnreadCount(threadId) == 0) true else null
-      }
-    }
-  }
-
-  @Test
-  fun scrollingPartwayLeavesExactlyTheUnreadMessagesBelowTheViewport() {
-    val recipientId = harness.others.first()
-    SignalDatabase.recipients.setProfileSharing(recipientId, true)
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(recipientId))
-
-    val total = 50
-    for (i in 0 until total) {
-      insertIncoming(threadId, recipientId, time = 1000L + i, body = "unread $i")
-    }
-
-    launch(recipientId).use { launched ->
-      await(timeoutMs = 20_000, description = "conversation loaded") {
-        val recycler = launched.latestConversationFragment()?.view?.findViewById<RecyclerView>(R.id.conversation_item_recycler)
-        if ((recycler?.childCount ?: 0) > 0) true else null
-      }
-
-      // The chat opens at the oldest unread (near the top); scroll down to roughly the middle.
-      runOnMain {
-        val recycler = launched.latestConversationFragment()?.view?.findViewById<RecyclerView>(R.id.conversation_item_recycler)
-        (recycler?.layoutManager as? LinearLayoutManager)?.scrollToPositionWithOffset(total / 2, 0)
-      }
-
-      // Once mark-read settles, the unread count must equal the index of the newest visible message — i.e. exactly the
-      // messages still below the viewport (reverse layout: position 0 = newest, so index N = N newer messages). This is
-      // the number the scroll-to-bottom button and chat-list badge show; it must not over- or under-count mid-scroll.
-      val stableCount = awaitStableUnreadCount(threadId)
-      val newestVisiblePosition = await(timeoutMs = 5_000, description = "newest visible position") {
-        val recycler = launched.latestConversationFragment()?.view?.findViewById<RecyclerView>(R.id.conversation_item_recycler)
-        (recycler?.layoutManager as? LinearLayoutManager)?.findFirstVisibleItemPosition()?.takeIf { it >= 0 }
-      }
-
-      assertThat(stableCount).isEqualTo(newestVisiblePosition)
-      // Sanity: we exercised a genuine mid-scroll point, not the very top or bottom.
-      assertThat(stableCount).isGreaterThan(0)
-      assertThat(stableCount).isLessThan(total)
-    }
-  }
-
-  /** Polls [MessageTable.getUnreadCount] until it holds steady (mark-read is debounced + async), then returns it. */
-  private fun awaitStableUnreadCount(threadId: Long, timeoutMs: Long = 20_000): Int {
-    val deadline = System.currentTimeMillis() + timeoutMs
-    var last = Int.MIN_VALUE
-    var stableSince = System.currentTimeMillis()
-    while (System.currentTimeMillis() < deadline) {
-      val current = SignalDatabase.messages.getUnreadCount(threadId)
-      if (current == last) {
-        if (System.currentTimeMillis() - stableSince >= 500) {
-          return current
-        }
-      } else {
-        last = current
-        stableSince = System.currentTimeMillis()
-      }
-      Thread.sleep(100)
-    }
-    throw AssertionError("Unread count never stabilized (last observed = $last)")
-  }
-
-  private data class BottomObserved(
-    val unreadState: ConversationItemDecorations.UnreadState,
-    val newestBottom: Int,
-    val recyclerHeight: Int
-  )
-
-  private fun insertIncoming(threadId: Long, from: RecipientId, time: Long, body: String): Long {
-    val message = IncomingMessage(
-      type = MessageType.NORMAL,
-      from = from,
-      sentTimeMillis = time,
-      serverTimeMillis = time,
-      receivedTimeMillis = time,
-      body = body
-    )
-    return SignalDatabase.messages.insertMessageInbox(message, threadId).get().messageId
-  }
-
-  private data class Observed(
-    val unreadCount: Int,
-    val firstUnreadId: Long,
-    val firstUnreadTop: Int,
-    val recyclerHeight: Int
-  )
-
-  private fun RecyclerView.conversationItemDecorations(): ConversationItemDecorations? {
-    for (i in 0 until itemDecorationCount) {
-      val decoration = getItemDecorationAt(i)
-      if (decoration is ConversationItemDecorations) {
-        return decoration
-      }
-    }
-    return null
-  }
-
-  private fun runOnMain(block: () -> Unit) {
-    InstrumentationRegistry.getInstrumentation().runOnMainSync { block() }
-  }
-
-  /** Polls [block] on the main thread until it returns non-null, failing after [timeoutMs]. */
-  private fun <T> await(timeoutMs: Long, pollMs: Long = 100, description: String, block: () -> T?): T {
-    val deadline = System.currentTimeMillis() + timeoutMs
-    while (System.currentTimeMillis() < deadline) {
-      var value: T? = null
-      InstrumentationRegistry.getInstrumentation().runOnMainSync { value = block() }
-      if (value != null) {
-        return value!!
-      }
-      Thread.sleep(pollMs)
-    }
-    throw AssertionError("Timed out after ${timeoutMs}ms waiting for $description")
-  }
-
-  private fun launch(recipientId: RecipientId): Launched {
-    val app = InstrumentationRegistry.getInstrumentation().targetContext.applicationContext as Application
-    val resumed = CountDownLatch(1)
-    val conversationFragments: MutableList<ConversationFragment> = Collections.synchronizedList(mutableListOf())
-    val allActivities: MutableList<Activity> = Collections.synchronizedList(mutableListOf())
-
-    val fragmentCallbacks = object : FragmentManager.FragmentLifecycleCallbacks() {
-      override fun onFragmentCreated(fm: FragmentManager, f: Fragment, savedInstanceState: Bundle?) {
-        if (f is ConversationFragment) {
-          conversationFragments.add(f)
-        }
-      }
-
-      override fun onFragmentDestroyed(fm: FragmentManager, f: Fragment) {
-        if (f is ConversationFragment) {
-          conversationFragments.remove(f)
-        }
-      }
-    }
-
-    val activityCallbacks = object : Application.ActivityLifecycleCallbacks {
-      override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
-        allActivities.add(activity)
-        if (activity is MainActivity) {
-          activity.supportFragmentManager.registerFragmentLifecycleCallbacks(fragmentCallbacks, true)
-        }
-      }
-
-      override fun onActivityResumed(activity: Activity) {
-        if (activity is MainActivity) {
-          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) {
-        allActivities.remove(activity)
-      }
-    }
-    app.registerActivityLifecycleCallbacks(activityCallbacks)
-
-    // Open the conversation the way a notification tap does: a conversation intent with no starting position.
-    val conversationIntent = ConversationIntents.createBuilder(harness.context, recipientId, -1L).blockingGet().build()
-    val intent = Intent(harness.context, MainActivity::class.java).apply {
-      action = ConversationIntents.ACTION
-      putExtras(conversationIntent)
-      // Application#startActivity from a non-Activity context requires a new task.
-      addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-    }
-
-    try {
-      app.startActivity(intent)
-    } catch (t: Throwable) {
-      app.unregisterActivityLifecycleCallbacks(activityCallbacks)
-      throw t
-    }
-
-    if (!resumed.await(15, TimeUnit.SECONDS)) {
-      app.unregisterActivityLifecycleCallbacks(activityCallbacks)
-      throw AssertionError("MainActivity did not reach RESUMED within 15s")
-    }
-
-    return Launched(conversationFragments, app, activityCallbacks, allActivities)
-  }
-
-  private class Launched(
-    private val conversationFragments: List<ConversationFragment>,
-    private val app: Application,
-    private val callbacks: Application.ActivityLifecycleCallbacks,
-    private val allActivities: MutableList<Activity>
-  ) : AutoCloseable {
-
-    fun latestConversationFragment(): ConversationFragment? = synchronized(conversationFragments) { conversationFragments.lastOrNull() }
-
-    override fun close() {
-      val toFinish = synchronized(allActivities) { allActivities.toList() }
-      if (toFinish.isNotEmpty()) {
-        InstrumentationRegistry.getInstrumentation().runOnMainSync {
-          toFinish.forEach { it.finish() }
-        }
-      }
-      app.unregisterActivityLifecycleCallbacks(callbacks)
-    }
-  }
-}
@@ -11,7 +11,6 @@ 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
@@ -21,22 +20,22 @@ 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.models.media.TransformProperties
 import org.signal.core.util.Base64
 import org.signal.core.util.Base64.decodeBase64OrThrow
 import org.signal.core.util.copyTo
 import org.signal.core.util.stream.NullOutputStream
-import org.signal.mediasend.SentMediaQuality
 import org.thoughtcrime.securesms.attachments.ArchivedAttachment
 import org.thoughtcrime.securesms.attachments.Attachment
+import org.thoughtcrime.securesms.attachments.AttachmentId
 import org.thoughtcrime.securesms.attachments.PointerAttachment
 import org.thoughtcrime.securesms.attachments.UriAttachment
 import org.thoughtcrime.securesms.backup.v2.ArchivedMediaObject
-import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.mms.IncomingMessage
 import org.thoughtcrime.securesms.mms.MediaStream
+import org.thoughtcrime.securesms.mms.SentMediaQuality
+import org.thoughtcrime.securesms.providers.BlobProvider
 import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.thoughtcrime.securesms.util.MediaUtil
 import org.whispersystems.signalservice.api.crypto.AttachmentCipherOutputStream
@@ -68,7 +67,7 @@ class AttachmentTableTest {

  @Test
  fun givenABlob_whenIInsert2AttachmentsForPreUpload_thenIExpectDistinctIdsButSameFileName() {
-    val blob = AppDependencies.blobs.forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory()
+    val blob = BlobProvider.getInstance().forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory()
    val highQualityProperties = createHighQualityTransformProperties()
    val highQualityImage = createAttachment(1, blob, highQualityProperties)
    val attachment = SignalDatabase.attachments.insertAttachmentForPreUpload(highQualityImage)
@@ -81,7 +80,7 @@ class AttachmentTableTest {
  @FlakyTest
  @Test
  fun givenABlobAndDifferentTransformQuality_whenIInsert2AttachmentsForPreUpload_thenIExpectDifferentFileInfos() {
-    val blob = AppDependencies.blobs.forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory()
+    val blob = BlobProvider.getInstance().forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory()
    val highQualityProperties = createHighQualityTransformProperties()
    val highQualityImage = createAttachment(1, blob, highQualityProperties)
    val lowQualityImage = createAttachment(1, blob, TransformProperties.empty())
@@ -108,7 +107,7 @@ class AttachmentTableTest {
  @Ignore("test is flaky")
  @Test
  fun givenIdenticalAttachmentsInsertedForPreUpload_whenIUpdateAttachmentDataAndSpecifyOnlyModifyThisAttachment_thenIExpectDifferentFileInfos() {
-    val blob = AppDependencies.blobs.forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory()
+    val blob = BlobProvider.getInstance().forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory()
    val highQualityProperties = createHighQualityTransformProperties()
    val highQualityImage = createAttachment(1, blob, highQualityProperties)
    val attachment = SignalDatabase.attachments.insertAttachmentForPreUpload(highQualityImage)
@@ -144,9 +143,9 @@ class AttachmentTableTest {
    val uncompressData = byteArrayOf(1, 2, 3, 4, 5)
    val compressedData = byteArrayOf(1, 2, 3)

-    val blobUncompressed = AppDependencies.blobs.forData(uncompressData).createForSingleSessionInMemory()
+    val blobUncompressed = BlobProvider.getInstance().forData(uncompressData).createForSingleSessionInMemory()

-    val previousAttachment = createAttachment(1, AppDependencies.blobs.forData(compressedData).createForSingleSessionInMemory(), TransformProperties.empty())
+    val previousAttachment = createAttachment(1, BlobProvider.getInstance().forData(compressedData).createForSingleSessionInMemory(), TransformProperties.empty())
    val previousDatabaseAttachmentId: AttachmentId = SignalDatabase.attachments.insertAttachmentsForMessage(1, listOf(previousAttachment), emptyList()).values.first()

    val standardQualityPreUpload = createAttachment(1, blobUncompressed, TransformProperties.empty())
@@ -179,7 +178,7 @@ class AttachmentTableTest {
  fun doNotDedupedFileIfUsedByAnotherAttachmentWithADifferentTransformProperties() {
    // GIVEN
    val uncompressData = byteArrayOf(1, 2, 3, 4, 5)
-    val blobUncompressed = AppDependencies.blobs.forData(uncompressData).createForSingleSessionInMemory()
+    val blobUncompressed = BlobProvider.getInstance().forData(uncompressData).createForSingleSessionInMemory()

    val standardQualityPreUpload = createAttachment(1, blobUncompressed, TransformProperties.empty())
    val standardDatabaseAttachment = SignalDatabase.attachments.insertAttachmentForPreUpload(standardQualityPreUpload)
@@ -205,7 +204,7 @@ class AttachmentTableTest {
  @Test
  fun resetArchiveTransferStateByPlaintextHashAndRemoteKey_singleMatch() {
    // Given an attachment with some plaintextHash+remoteKey
-    val blob = AppDependencies.blobs.forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory()
+    val blob = BlobProvider.getInstance().forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory()
    val attachment = createAttachment(1, blob, TransformProperties.empty())
    val attachmentId = SignalDatabase.attachments.insertAttachmentsForMessage(-1L, listOf(attachment), emptyList()).values.first()
    SignalDatabase.attachments.finalizeAttachmentAfterUpload(attachmentId, AttachmentTableTestUtil.createUploadResult(attachmentId))
@@ -220,26 +219,6 @@ 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
@@ -280,7 +259,7 @@ class AttachmentTableTest {
  fun givenAnAttachmentWithAMessageThatExpiresIn5Minutes_whenIGetAttachmentsThatNeedArchiveUpload_thenIDoNotExpectThatAttachment() {
    // GIVEN
    val uncompressData = byteArrayOf(1, 2, 3, 4, 5)
-    val blobUncompressed = AppDependencies.blobs.forData(uncompressData).createForSingleSessionInMemory()
+    val blobUncompressed = BlobProvider.getInstance().forData(uncompressData).createForSingleSessionInMemory()
    val attachment = createAttachment(1, blobUncompressed, TransformProperties.empty())
    val message = createIncomingMessage(serverTime = 0.days, attachment = attachment, expiresIn = 5.minutes)
    val messageId = SignalDatabase.messages.insertMessageInbox(message).map { it.messageId }.get()
@@ -299,7 +278,7 @@ class AttachmentTableTest {
  fun givenAnAttachmentWithAMessageThatExpiresIn5Days_whenIGetAttachmentsThatNeedArchiveUpload_thenIDoExpectThatAttachment() {
    // GIVEN
    val uncompressData = byteArrayOf(1, 2, 3, 4, 5)
-    val blobUncompressed = AppDependencies.blobs.forData(uncompressData).createForSingleSessionInMemory()
+    val blobUncompressed = BlobProvider.getInstance().forData(uncompressData).createForSingleSessionInMemory()
    val attachment = createAttachment(1, blobUncompressed, TransformProperties.empty())
    val message = createIncomingMessage(serverTime = 0.days, attachment = attachment, expiresIn = 5.days)
    val messageId = SignalDatabase.messages.insertMessageInbox(message).map { it.messageId }.get()
@@ -318,7 +297,7 @@ class AttachmentTableTest {
  fun givenAnAttachmentWithAMessageWithExpirationStartedThatExpiresIn5Days_whenIGetAttachmentsThatNeedArchiveUpload_thenIDoExpectThatAttachment() {
    // GIVEN
    val uncompressData = byteArrayOf(1, 2, 3, 4, 5)
-    val blobUncompressed = AppDependencies.blobs.forData(uncompressData).createForSingleSessionInMemory()
+    val blobUncompressed = BlobProvider.getInstance().forData(uncompressData).createForSingleSessionInMemory()
    val attachment = createAttachment(1, blobUncompressed, TransformProperties.empty())
    val message = createIncomingMessage(serverTime = 0.days, attachment = attachment, expiresIn = 5.days)
    val messageId = SignalDatabase.messages.insertMessageInbox(message).map { it.messageId }.get()
@@ -338,7 +317,7 @@ class AttachmentTableTest {
  fun givenAnAttachmentWithALongTextAttachment_whenIGetAttachmentsThatNeedArchiveUpload_thenIDoNotExpectThatAttachment() {
    // GIVEN
    val uncompressData = byteArrayOf(1, 2, 3, 4, 5)
-    val blobUncompressed = AppDependencies.blobs.forData(uncompressData).createForSingleSessionInMemory()
+    val blobUncompressed = BlobProvider.getInstance().forData(uncompressData).createForSingleSessionInMemory()
    val attachment = createAttachment(1, blobUncompressed, TransformProperties.empty(), contentType = MediaUtil.LONG_TEXT)
    val message = createIncomingMessage(serverTime = 0.days, attachment = attachment)
    val messageId = SignalDatabase.messages.insertMessageInbox(message).map { it.messageId }.get()
@@ -439,39 +418,6 @@ 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
@@ -639,7 +585,7 @@ class AttachmentTableTest {
    ).get()
  }

-  private fun createArchivedAttachment(localBackupKey: ByteArray? = null): Attachment {
+  private fun createArchivedAttachment(): Attachment {
    return ArchivedAttachment(
      contentType = "image/jpeg",
      size = 1024,
@@ -663,7 +609,7 @@ class AttachmentTableTest {
      quoteTargetContentType = null,
      uuid = UUID.randomUUID(),
      fileName = null,
-      localBackupKey = localBackupKey
+      localBackupKey = null
    )
  }

@@ -5,10 +5,10 @@

 package org.thoughtcrime.securesms.database

-import org.signal.core.models.database.AttachmentId
 import org.signal.core.util.Base64
 import org.signal.core.util.Util
 import org.signal.network.api.AttachmentUploadResult
+import org.thoughtcrime.securesms.attachments.AttachmentId
 import org.thoughtcrime.securesms.attachments.Cdn
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId
 import kotlin.random.Random
@@ -12,21 +12,21 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.signal.core.models.ServiceId
-import org.signal.core.models.database.AttachmentId
 import org.signal.core.models.media.TransformProperties
 import org.signal.core.util.Base64
 import org.signal.core.util.Util
 import org.signal.core.util.readFully
 import org.signal.core.util.stream.LimitedInputStream
 import org.signal.core.util.update
-import org.signal.mediasend.SentMediaQuality
+import org.thoughtcrime.securesms.attachments.AttachmentId
 import org.thoughtcrime.securesms.attachments.Cdn
 import org.thoughtcrime.securesms.attachments.PointerAttachment
-import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.mms.MediaStream
 import org.thoughtcrime.securesms.mms.OutgoingMessage
 import org.thoughtcrime.securesms.mms.QuoteModel
+import org.thoughtcrime.securesms.mms.SentMediaQuality
+import org.thoughtcrime.securesms.providers.BlobProvider
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.MediaUtil
 import org.whispersystems.signalservice.internal.crypto.PaddingInputStream
@@ -671,7 +671,7 @@ class AttachmentTableTest_deduping {
    }

    fun insertWithData(data: ByteArray, transformProperties: TransformProperties = TransformProperties.empty()): AttachmentId {
-      val uri = AppDependencies.blobs.forData(data).createForSingleSessionInMemory()
+      val uri = BlobProvider.getInstance().forData(data).createForSingleSessionInMemory()

      val attachment = UriAttachmentBuilder.build(
        id = Random.nextLong(),
@@ -1,29 +1,23 @@
 package org.thoughtcrime.securesms.database

-import android.app.Application
+import androidx.media3.common.util.Util
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import assertk.assertThat
 import assertk.assertions.isEqualTo
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 import org.signal.core.util.count
 import org.signal.core.util.readToSingleInt
 import org.thoughtcrime.securesms.backup.v2.ArchivedMediaObject
 import org.thoughtcrime.securesms.database.BackupMediaSnapshotTable.MediaEntry
-import org.thoughtcrime.securesms.testutil.MockAppDependenciesRule
-import org.thoughtcrime.securesms.testutil.SignalDatabaseRule
+import org.thoughtcrime.securesms.testing.SignalActivityRule

-@RunWith(RobolectricTestRunner::class)
-@Config(manifest = Config.NONE, application = Application::class)
+@RunWith(AndroidJUnit4::class)
 class BackupMediaSnapshotTableTest {

  @get:Rule
-  val appDependencies = MockAppDependenciesRule()
-
-  @get:Rule
-  val signalDatabaseRule = SignalDatabaseRule()
+  val harness = SignalActivityRule()

  @Test
  fun givenAnEmptyTable_whenIWriteToTable_thenIExpectEmptyTable() {
@@ -308,21 +302,12 @@ class BackupMediaSnapshotTableTest {
    return MediaEntry(
      mediaId = mediaId(seed, thumbnail),
      cdn = cdn,
-      plaintextHash = intToByteArray(seed),
-      remoteKey = intToByteArray(seed),
+      plaintextHash = Util.toByteArray(seed),
+      remoteKey = Util.toByteArray(seed),
      isThumbnail = thumbnail
    )
  }

-  private fun intToByteArray(value: Int): ByteArray {
-    return byteArrayOf(
-      (value shr 24).toByte(),
-      (value shr 16).toByte(),
-      (value shr 8).toByte(),
-      value.toByte()
-    )
-  }
-
  private fun createArchiveMediaObject(seed: Int, thumbnail: Boolean = false, cdn: Int = 0): ArchivedMediaObject {
    return ArchivedMediaObject(
      mediaId = mediaId(seed, thumbnail),
@@ -10,14 +10,9 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.signal.ringrtc.CallId
 import org.signal.ringrtc.CallManager
-import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.testing.Flag
-import org.thoughtcrime.securesms.testing.RemoteConfigForTest
 import org.thoughtcrime.securesms.testing.SignalActivityRule
-import org.thoughtcrime.securesms.testing.TestRemoteConfigFlag

-@RemoteConfigForTest(flags = [Flag(TestRemoteConfigFlag.DISAPPEAR_MORE, "true")])
@RunWith(AndroidJUnit4::class)
 class CallTableTest {

@@ -436,7 +431,7 @@ class CallTableTest {

    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
    assertNotNull(call)
-    assertEquals(CallTable.Event.MISSED, call?.event)
+    assertEquals(CallTable.Event.GENERIC_GROUP_CALL, call?.event)
    assertEquals(1L, call?.timestamp)
  }

@@ -982,80 +977,6 @@ class CallTableTest {
 //    assertEquals(0, allCallEvents.size)
  }

-  @Test
-  fun givenAMissedOneToOneCall_whenIMarkAllCallEventsRead_thenTimerShouldStart() {
-    val callId = 1L
-    val peer = harness.others[0]
-    insertExpiringThread(peer)
-
-    SignalDatabase.calls.insertOneToOneCall(callId, System.currentTimeMillis(), peer, CallTable.Type.AUDIO_CALL, CallTable.Direction.INCOMING, CallTable.Event.MISSED)
-
-    val readAt = System.currentTimeMillis()
-    SignalDatabase.calls.markAllCallEventsRead(readAt = readAt)
-
-    val call = SignalDatabase.calls.getCallById(callId, peer)
-    assertEquals(readAt, SignalDatabase.messages.getMessageRecord(call!!.messageId!!).expireStarted)
-  }
-
-  @Test
-  fun givenAMissedNotificationProfileOneToOneCall_whenIMarkAllCallEventsRead_thenTimerShouldStart() {
-    val callId = 1L
-    val peer = harness.others[0]
-    insertExpiringThread(peer)
-
-    SignalDatabase.calls.insertOneToOneCall(callId, System.currentTimeMillis(), peer, CallTable.Type.AUDIO_CALL, CallTable.Direction.INCOMING, CallTable.Event.MISSED_NOTIFICATION_PROFILE)
-
-    val readAt = System.currentTimeMillis()
-    SignalDatabase.calls.markAllCallEventsRead(readAt = readAt)
-
-    val call = SignalDatabase.calls.getCallById(callId, peer)
-    assertEquals(readAt, SignalDatabase.messages.getMessageRecord(call!!.messageId!!).expireStarted)
-  }
-
-  @Test
-  fun givenAMissedGroupCall_whenIMarkAllCallEventsRead_thenTimerShouldStart() {
-    val callId = 1L
-    SignalDatabase.recipients.setExpireMessagesForGroup(groupRecipientId, 60)
-
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(callId, groupRecipientId, harness.others[1], System.currentTimeMillis(), CallManager.RingUpdate.EXPIRED_REQUEST)
-
-    val readAt = System.currentTimeMillis()
-    SignalDatabase.calls.markAllCallEventsRead(readAt = readAt)
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertEquals(readAt, SignalDatabase.messages.getMessageRecord(call!!.messageId!!).expireStarted)
-  }
-
-  @Test
-  fun givenAMissedNotificationProfileGroupCall_whenIMarkAllCallEventsRead_thenTimerShouldStart() {
-    val callId = 1L
-    val ringerAci = Recipient.resolved(harness.others[1]).requireAci()
-
-    SignalDatabase.recipients.setExpireMessagesForGroup(groupRecipientId, 60)
-
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(callId, groupRecipientId, ringerAci, System.currentTimeMillis(), CallManager.RingUpdate.EXPIRED_REQUEST, true)
-
-    val readAt = System.currentTimeMillis()
-    SignalDatabase.calls.markAllCallEventsRead(readAt = readAt)
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertEquals(readAt, SignalDatabase.messages.getMessageRecord(call!!.messageId!!).expireStarted)
-  }
-
-  @Test
-  fun givenAnOutgoingOneToOneCallFromSync_whenInserted_thenTimerIsStarted() {
-    val callId = 1L
-    val peer = harness.others[0]
-    val timestamp = System.currentTimeMillis()
-
-    insertExpiringThread(peer)
-    SignalDatabase.calls.insertOneToOneCall(callId, timestamp, peer, CallTable.Type.AUDIO_CALL, CallTable.Direction.OUTGOING, CallTable.Event.OUTGOING_RING, true)
-
-    val call = SignalDatabase.calls.getCallById(callId, peer)
-    val message = SignalDatabase.messages.getMessageRecord(call!!.messageId!!)
-    assertNotEquals(0L, message.expireStarted)
-  }
-
  private fun insertTwoCallEvents() {
    SignalDatabase.calls.insertAcceptedGroupCall(
      1,
@@ -1071,10 +992,4 @@ class CallTableTest {
      2000
    )
  }
-
-  private fun insertExpiringThread(recipientId: RecipientId) {
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(recipientId))
-    MmsHelper.insert(recipient = Recipient.resolved(recipientId), expiresIn = 30_000L, threadId = threadId)
-    SignalDatabase.threads.update(threadId, false)
-  }
 }
@@ -1,28 +1,17 @@
 package org.thoughtcrime.securesms.database

-import android.app.Application
 import org.junit.Assert
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 import org.signal.core.models.ServiceId.ACI
 import org.thoughtcrime.securesms.database.model.DistributionListId
 import org.thoughtcrime.securesms.database.model.DistributionListRecord
 import org.thoughtcrime.securesms.database.model.StoryType
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.testutil.RecipientTestRule
 import java.util.UUID

-@RunWith(RobolectricTestRunner::class)
-@Config(manifest = Config.NONE, application = Application::class)
 class DistributionListTablesTest {

-  @get:Rule
-  val recipients = RecipientTestRule()
-
  private lateinit var distributionDatabase: DistributionListTables

  @Before
@@ -38,7 +27,8 @@ class DistributionListTablesTest {

  @Test
  fun getList_returnCorrectList() {
-    val members: List<RecipientId> = createRecipients(3)
+    createRecipients(3)
+    val members: List<RecipientId> = recipientList(1, 2, 3)

    val id: DistributionListId? = distributionDatabase.createList("test", members)
    Assert.assertNotNull(id)
@@ -52,7 +42,8 @@ class DistributionListTablesTest {

  @Test
  fun getMembers_returnsCorrectMembers() {
-    val members: List<RecipientId> = createRecipients(3)
+    createRecipients(3)
+    val members: List<RecipientId> = recipientList(1, 2, 3)

    val id: DistributionListId? = distributionDatabase.createList("test", members)
    Assert.assertNotNull(id)
@@ -86,8 +77,8 @@ class DistributionListTablesTest {
    Assert.fail("Expected an assertion error.")
  }

-  private fun createRecipients(count: Int): List<RecipientId> {
-    return (0 until count).map {
+  private fun createRecipients(count: Int) {
+    for (i in 0 until count) {
      SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID()))
    }
  }
@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms.database

-import android.app.Application
 import android.database.sqlite.SQLiteConstraintException
 import assertk.assertThat
 import assertk.assertions.isEqualTo
@@ -9,34 +8,20 @@ import org.junit.Assert.fail
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 import org.signal.core.util.count
 import org.signal.core.util.deleteAll
 import org.signal.core.util.readToSingleInt
 import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
 import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
 import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
-import org.thoughtcrime.securesms.testutil.MockAppDependenciesRule
-import org.thoughtcrime.securesms.testutil.MockSignalStoreRule
-import org.thoughtcrime.securesms.testutil.SignalDatabaseRule
+import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.whispersystems.signalservice.api.storage.IAPSubscriptionId
 import org.whispersystems.signalservice.api.subscriptions.SubscriberId
 import java.util.Currency

-@RunWith(RobolectricTestRunner::class)
-@Config(manifest = Config.NONE, application = Application::class)
 class InAppPaymentSubscriberTableTest {
-
  @get:Rule
-  val signalStore = MockSignalStoreRule()
-
-  @get:Rule
-  val appDependencies = MockAppDependenciesRule()
-
-  @get:Rule
-  val signalDatabaseRule = SignalDatabaseRule()
+  val harness = SignalActivityRule()

  @Before
  fun setUp() {
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.database
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import assertk.assertThat
+import assertk.assertions.isEqualTo
+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.database.model.databaseprotos.InAppPaymentData
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+
+@RunWith(AndroidJUnit4::class)
+class InAppPaymentTableTest {
+  @get:Rule
+  val harness = SignalActivityRule()
+
+  @Before
+  fun setUp() {
+    SignalDatabase.inAppPayments.writableDatabase.deleteAll(InAppPaymentTable.TABLE_NAME)
+  }
+
+  @Test
+  fun givenACreatedInAppPayment_whenIUpdateToPending_thenIExpectPendingPayment() {
+    val inAppPaymentId = SignalDatabase.inAppPayments.insert(
+      type = InAppPaymentType.ONE_TIME_DONATION,
+      state = InAppPaymentTable.State.CREATED,
+      subscriberId = null,
+      endOfPeriod = null,
+      inAppPaymentData = InAppPaymentData()
+    )
+
+    val paymentBeforeUpdate = SignalDatabase.inAppPayments.getById(inAppPaymentId)
+    assertThat(paymentBeforeUpdate?.state).isEqualTo(InAppPaymentTable.State.CREATED)
+
+    SignalDatabase.inAppPayments.update(
+      inAppPayment = paymentBeforeUpdate!!.copy(state = InAppPaymentTable.State.PENDING)
+    )
+
+    val paymentAfterUpdate = SignalDatabase.inAppPayments.getById(inAppPaymentId)
+    assertThat(paymentAfterUpdate?.state).isEqualTo(InAppPaymentTable.State.PENDING)
+  }
+}
@@ -5,43 +5,20 @@

 package org.thoughtcrime.securesms.database

-import android.app.Application
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
-import org.junit.Rule
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
-import org.signal.core.models.ServiceId
 import org.signal.core.models.ServiceId.ACI
 import org.signal.core.models.ServiceId.PNI
-import org.signal.core.util.readToSingleObject
-import org.signal.core.util.requireLongOrNull
-import org.signal.core.util.select
-import org.signal.core.util.update
 import org.signal.libsignal.protocol.ReusedBaseKeyException
-import org.signal.libsignal.protocol.ecc.ECKeyPair
-import org.signal.libsignal.protocol.ecc.ECPublicKey
-import org.signal.libsignal.protocol.kem.KEMKeyPair
-import org.signal.libsignal.protocol.kem.KEMKeyType
-import org.signal.libsignal.protocol.state.KyberPreKeyRecord
-import org.thoughtcrime.securesms.testutil.MockAppDependenciesRule
-import org.thoughtcrime.securesms.testutil.SignalDatabaseRule
-import java.security.SecureRandom
+import org.thoughtcrime.securesms.util.KyberPreKeysTestUtil.generateECPublicKey
+import org.thoughtcrime.securesms.util.KyberPreKeysTestUtil.getStaleTime
+import org.thoughtcrime.securesms.util.KyberPreKeysTestUtil.insertTestRecord
 import java.util.UUID

-@RunWith(RobolectricTestRunner::class)
-@Config(manifest = Config.NONE, application = Application::class)
 class KyberPreKeyTableTest {

-  @get:Rule
-  val appDependencies = MockAppDependenciesRule()
-
-  @get:Rule
-  val signalDatabaseRule = SignalDatabaseRule()
-
  private val aci: ACI = ACI.from(UUID.randomUUID())
  private val pni: PNI = PNI.from(UUID.randomUUID())

@@ -153,7 +130,7 @@ class KyberPreKeyTableTest {
    insertTestRecord(aci, id = 2, staleTime = 10, lastResort = true)
    insertTestRecord(aci, id = 3, staleTime = 10, lastResort = true)

-    SignalDatabase.kyberPreKeys.deleteAllStaleBefore(aci, threshold = 11, minCount = 0)
+    SignalDatabase.oneTimePreKeys.deleteAllStaleBefore(aci, threshold = 11, minCount = 0)

    assertNotNull(getStaleTime(aci, 1))
    assertNotNull(getStaleTime(aci, 2))
@@ -199,50 +176,4 @@ class KyberPreKeyTableTest {
      baseKey = publicKey
    )
  }
-
-  private fun insertTestRecord(account: ServiceId, id: Int, staleTime: Long = 0, lastResort: Boolean = false) {
-    val kemKeyPair = KEMKeyPair.generate(KEMKeyType.KYBER_1024)
-    SignalDatabase.kyberPreKeys.insert(
-      serviceId = account,
-      keyId = id,
-      record = KyberPreKeyRecord(
-        id,
-        System.currentTimeMillis(),
-        kemKeyPair,
-        ECKeyPair.generate().privateKey.calculateSignature(kemKeyPair.publicKey.serialize())
-      ),
-      lastResort = lastResort
-    )
-
-    val count = SignalDatabase.writableDatabase
-      .update(KyberPreKeyTable.TABLE_NAME)
-      .values(KyberPreKeyTable.STALE_TIMESTAMP to staleTime)
-      .where("${KyberPreKeyTable.ACCOUNT_ID} = ? AND ${KyberPreKeyTable.KEY_ID} = $id", account.toAccountId())
-      .run()
-
-    assertEquals(1, count)
-  }
-
-  private fun getStaleTime(account: ServiceId, id: Int): Long? {
-    return SignalDatabase.writableDatabase
-      .select(KyberPreKeyTable.STALE_TIMESTAMP)
-      .from(KyberPreKeyTable.TABLE_NAME)
-      .where("${KyberPreKeyTable.ACCOUNT_ID} = ? AND ${KyberPreKeyTable.KEY_ID} = $id", account.toAccountId())
-      .run()
-      .readToSingleObject { it.requireLongOrNull(KyberPreKeyTable.STALE_TIMESTAMP) }
-  }
-
-  private fun generateECPublicKey(): ECPublicKey {
-    val byteArray = ByteArray(ECPublicKey.KEY_SIZE - 1)
-    SecureRandom().nextBytes(byteArray)
-
-    return ECPublicKey.fromPublicKeyBytes(byteArray)
-  }
-
-  private fun ServiceId.toAccountId(): String {
-    return when (this) {
-      is ACI -> this.toString()
-      is PNI -> KyberPreKeyTable.PNI_ACCOUNT_ID
-    }
-  }
 }
@@ -1,37 +1,38 @@
 package org.thoughtcrime.securesms.database

-import android.app.Application
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 import org.signal.core.models.ServiceId.ACI
+import org.signal.core.models.ServiceId.PNI
 import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
+import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.testutil.RecipientTestRule
 import java.util.UUID

@Suppress("ClassName")
-@RunWith(RobolectricTestRunner::class)
-@Config(manifest = Config.NONE, application = Application::class)
+@RunWith(AndroidJUnit4::class)
 class MessageTableTest_gifts {
-
-  @get:Rule
-  val recipientTestRule = RecipientTestRule()
-
  private lateinit var mms: MessageTable

+  private val localAci = ACI.from(UUID.randomUUID())
+  private val localPni = PNI.from(UUID.randomUUID())
+
  private lateinit var recipients: List<RecipientId>

  @Before
  fun setUp() {
    mms = SignalDatabase.messages

+    mms.deleteAllThreads()
+
+    SignalStore.account.setAci(localAci)
+    SignalStore.account.setPni(localPni)
+
    recipients = (0 until 5).map { SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID())) }
  }

@@ -0,0 +1,174 @@
+package org.thoughtcrime.securesms.database
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import assertk.assertThat
+import assertk.assertions.containsExactlyInAnyOrder
+import assertk.assertions.isEmpty
+import assertk.assertions.isEqualTo
+import assertk.assertions.isFalse
+import okio.ByteString.Companion.toByteString
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotEquals
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.signal.core.models.ServiceId.ACI
+import org.signal.core.util.UuidUtil
+import org.signal.core.util.deleteAll
+import org.thoughtcrime.securesms.conversation.colors.AvatarColor
+import org.thoughtcrime.securesms.notifications.profiles.NotificationProfile
+import org.thoughtcrime.securesms.notifications.profiles.NotificationProfileId
+import org.thoughtcrime.securesms.notifications.profiles.NotificationProfileSchedule
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.storage.StorageSyncHelper
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+import org.whispersystems.signalservice.api.storage.SignalNotificationProfileRecord
+import org.whispersystems.signalservice.api.storage.StorageId
+import java.time.DayOfWeek
+import java.util.UUID
+import org.whispersystems.signalservice.internal.storage.protos.NotificationProfile as RemoteNotificationProfile
+import org.whispersystems.signalservice.internal.storage.protos.Recipient as RemoteRecipient
+
+@RunWith(AndroidJUnit4::class)
+class NotificationProfileTablesTest {
+
+  @get:Rule
+  val harness = SignalActivityRule()
+
+  private lateinit var alice: RecipientId
+  private lateinit var profile1: NotificationProfile
+
+  @Before
+  fun setUp() {
+    alice = SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID()))
+
+    profile1 = NotificationProfile(
+      id = 1,
+      name = "profile1",
+      emoji = "",
+      createdAt = 1000L,
+      schedule = NotificationProfileSchedule(id = 1),
+      allowedMembers = setOf(alice),
+      notificationProfileId = NotificationProfileId.generate(),
+      deletedTimestampMs = 0,
+      storageServiceId = StorageId.forNotificationProfile(byteArrayOf(1, 2, 3))
+    )
+
+    SignalDatabase.notificationProfiles.writableDatabase.deleteAll(NotificationProfileTables.NotificationProfileTable.TABLE_NAME)
+    SignalDatabase.notificationProfiles.writableDatabase.deleteAll(NotificationProfileTables.NotificationProfileScheduleTable.TABLE_NAME)
+    SignalDatabase.notificationProfiles.writableDatabase.deleteAll(NotificationProfileTables.NotificationProfileAllowedMembersTable.TABLE_NAME)
+  }
+
+  @Test
+  fun givenARemoteProfile_whenIInsertLocally_thenIExpectAListWithThatProfile() {
+    val remoteRecord =
+      SignalNotificationProfileRecord(
+        profile1.storageServiceId!!,
+        RemoteNotificationProfile(
+          id = UuidUtil.toByteArray(profile1.notificationProfileId.uuid).toByteString(),
+          name = "profile1",
+          emoji = "",
+          color = profile1.color.colorInt(),
+          createdAtMs = 1000L,
+          allowedMembers = listOf(RemoteRecipient(RemoteRecipient.Contact(Recipient.resolved(alice).serviceId.get().toString()))),
+          allowAllMentions = false,
+          allowAllCalls = true,
+          scheduleEnabled = false,
+          scheduleStartTime = 900,
+          scheduleEndTime = 1700,
+          scheduleDaysEnabled = emptyList(),
+          deletedAtTimestampMs = 0
+        )
+      )
+
+    SignalDatabase.notificationProfiles.insertNotificationProfileFromStorageSync(remoteRecord)
+    val actualProfiles = SignalDatabase.notificationProfiles.getProfiles()
+
+    assertEquals(listOf(profile1), actualProfiles)
+  }
+
+  @Test
+  fun givenAProfile_whenIDeleteIt_thenIExpectAnEmptyList() {
+    val profile: NotificationProfile = SignalDatabase.notificationProfiles.createProfile(
+      name = "Profile",
+      emoji = "avatar",
+      color = AvatarColor.A210,
+      createdAt = 1000L
+    ).profile
+
+    SignalDatabase.notificationProfiles.deleteProfile(profile.id)
+
+    assertThat(SignalDatabase.notificationProfiles.getProfiles()).isEmpty()
+    assertThat(SignalDatabase.notificationProfiles.getProfile(profile.id))
+  }
+
+  @Test
+  fun givenADeletedProfile_whenIGetIt_thenIExpectItToStillHaveASchedule() {
+    val profile: NotificationProfile = SignalDatabase.notificationProfiles.createProfile(
+      name = "Profile",
+      emoji = "avatar",
+      color = AvatarColor.A210,
+      createdAt = 1000L
+    ).profile
+
+    SignalDatabase.notificationProfiles.deleteProfile(profile.id)
+
+    val deletedProfile = SignalDatabase.notificationProfiles.getProfile(profile.id)!!
+    assertThat(deletedProfile.schedule.enabled).isFalse()
+    assertThat(deletedProfile.schedule.start).isEqualTo(900)
+    assertThat(deletedProfile.schedule.end).isEqualTo(1700)
+    assertThat(deletedProfile.schedule.daysEnabled, "Contains correct default days")
+      .containsExactlyInAnyOrder(DayOfWeek.MONDAY, DayOfWeek.TUESDAY, DayOfWeek.WEDNESDAY, DayOfWeek.THURSDAY, DayOfWeek.FRIDAY)
+  }
+
+  @Test
+  fun givenNotificationProfiles_whenIUpdateTheirStorageSyncIds_thenIExpectAnUpdatedList() {
+    SignalDatabase.notificationProfiles.createProfile(
+      name = "Profile1",
+      emoji = "avatar",
+      color = AvatarColor.A210,
+      createdAt = 1000L
+    )
+    SignalDatabase.notificationProfiles.createProfile(
+      name = "Profile2",
+      emoji = "avatar",
+      color = AvatarColor.A210,
+      createdAt = 2000L
+    )
+
+    val existingMap = SignalDatabase.notificationProfiles.getStorageSyncIdsMap()
+    existingMap.forEach { (id, _) ->
+      SignalDatabase.notificationProfiles.applyStorageIdUpdate(id, StorageId.forNotificationProfile(StorageSyncHelper.generateKey()))
+    }
+    val updatedMap = SignalDatabase.notificationProfiles.getStorageSyncIdsMap()
+
+    existingMap.forEach { (id, storageId) ->
+      assertNotEquals(storageId, updatedMap[id])
+    }
+  }
+
+  @Test
+  fun givenAProfileDeletedOver30Days_whenICleanUp_thenIExpectItToNotHaveAStorageId() {
+    val remoteRecord =
+      SignalNotificationProfileRecord(
+        profile1.storageServiceId!!,
+        RemoteNotificationProfile(
+          id = UuidUtil.toByteArray(profile1.notificationProfileId.uuid).toByteString(),
+          name = "profile1",
+          emoji = "",
+          color = profile1.color.colorInt(),
+          createdAtMs = 1000L,
+          deletedAtTimestampMs = 1000L
+        )
+      )
+
+    SignalDatabase.notificationProfiles.insertNotificationProfileFromStorageSync(remoteRecord)
+    SignalDatabase.notificationProfiles.removeStorageIdsFromOldDeletedProfiles(System.currentTimeMillis())
+    assertThat(SignalDatabase.notificationProfiles.getStorageSyncIds()).isEmpty()
+  }
+
+  private val NotificationProfileTables.NotificationProfileChangeResult.profile: NotificationProfile
+    get() = (this as NotificationProfileTables.NotificationProfileChangeResult.Success).notificationProfile
+}
@@ -5,15 +5,10 @@

 package org.thoughtcrime.securesms.database

-import android.app.Application
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
-import org.junit.Rule
 import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 import org.signal.core.models.ServiceId
 import org.signal.core.models.ServiceId.ACI
 import org.signal.core.models.ServiceId.PNI
@@ -23,20 +18,10 @@ import org.signal.core.util.select
 import org.signal.core.util.update
 import org.signal.libsignal.protocol.ecc.ECKeyPair
 import org.signal.libsignal.protocol.state.PreKeyRecord
-import org.thoughtcrime.securesms.testutil.MockAppDependenciesRule
-import org.thoughtcrime.securesms.testutil.SignalDatabaseRule
 import java.util.UUID

-@RunWith(RobolectricTestRunner::class)
-@Config(manifest = Config.NONE, application = Application::class)
 class OneTimePreKeyTableTest {

-  @get:Rule
-  val appDependencies = MockAppDependenciesRule()
-
-  @get:Rule
-  val signalDatabaseRule = SignalDatabaseRule()
-
  private val aci: ACI = ACI.from(UUID.randomUUID())
  private val pni: PNI = PNI.from(UUID.randomUUID())

@@ -132,7 +117,7 @@ class OneTimePreKeyTableTest {
      record = PreKeyRecord(id, ECKeyPair.generate())
    )

-    val count = SignalDatabase.writableDatabase
+    val count = SignalDatabase.rawDatabase
      .update(OneTimePreKeyTable.TABLE_NAME)
      .values(OneTimePreKeyTable.STALE_TIMESTAMP to staleTime)
      .where("${OneTimePreKeyTable.ACCOUNT_ID} = ? AND ${OneTimePreKeyTable.KEY_ID} = $id", account.toAccountId())
@@ -142,7 +127,7 @@ class OneTimePreKeyTableTest {
  }

  private fun getStaleTime(account: ServiceId, id: Int): Long? {
-    return SignalDatabase.writableDatabase
+    return SignalDatabase.rawDatabase
      .select(OneTimePreKeyTable.STALE_TIMESTAMP)
      .from(OneTimePreKeyTable.TABLE_NAME)
      .where("${OneTimePreKeyTable.ACCOUNT_ID} = ? AND ${OneTimePreKeyTable.KEY_ID} = $id", account.toAccountId())
@@ -1,14 +1,12 @@
 package org.thoughtcrime.securesms.database

-import android.app.Application
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 import org.signal.core.util.deleteAll
 import org.thoughtcrime.securesms.database.model.MessageId
 import org.thoughtcrime.securesms.mms.IncomingMessage
@@ -16,18 +14,15 @@ import org.thoughtcrime.securesms.polls.PollOption
 import org.thoughtcrime.securesms.polls.PollRecord
 import org.thoughtcrime.securesms.polls.Voter
 import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.testutil.RecipientTestRule
+import org.thoughtcrime.securesms.testing.SignalActivityRule

-@RunWith(RobolectricTestRunner::class)
-@Config(manifest = Config.NONE, application = Application::class)
+@RunWith(AndroidJUnit4::class)
 class PollTablesTest {

  @get:Rule
-  val recipients = RecipientTestRule()
+  val harness = SignalActivityRule()

  private lateinit var poll1: PollRecord
-  private lateinit var other0: RecipientId

  @Before
  fun setUp() {
@@ -49,9 +44,8 @@ class PollTablesTest {
    SignalDatabase.polls.writableDatabase.deleteAll(PollTables.PollOptionTable.TABLE_NAME)
    SignalDatabase.polls.writableDatabase.deleteAll(PollTables.PollVoteTable.TABLE_NAME)

-    other0 = recipients.createRecipient("Buddy #0")
-    val message = IncomingMessage(type = MessageType.NORMAL, from = other0, sentTimeMillis = 100, serverTimeMillis = 100, receivedTimeMillis = 100)
-    SignalDatabase.messages.insertMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other0, isGroup = false))
+    val message = IncomingMessage(type = MessageType.NORMAL, from = harness.others[0], sentTimeMillis = 100, serverTimeMillis = 100, receivedTimeMillis = 100)
+    SignalDatabase.messages.insertMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(harness.others[0], isGroup = false))
  }

  @Test
@@ -8,17 +8,10 @@ package org.thoughtcrime.securesms.database
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import assertk.assertThat
 import assertk.assertions.isEqualTo
-import assertk.assertions.isFalse
-import assertk.assertions.isNotEqualTo
-import assertk.assertions.isNotNull
-import assertk.assertions.isNull
 import assertk.assertions.isTrue
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.signal.core.models.ServiceId.ACI
-import org.signal.core.models.ServiceId.PNI
-import org.signal.core.util.nullIfBlank
 import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.storage.StorageRecordUpdate
@@ -26,11 +19,8 @@ import org.thoughtcrime.securesms.storage.StorageSyncModels
 import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.thoughtcrime.securesms.util.MessageTableTestUtils
 import org.whispersystems.signalservice.api.storage.SignalContactRecord
-import org.whispersystems.signalservice.api.storage.signalAci
-import org.whispersystems.signalservice.api.storage.signalPni
 import org.whispersystems.signalservice.api.storage.toSignalContactRecord
 import org.whispersystems.signalservice.internal.storage.protos.ContactRecord
-import java.util.UUID

@Suppress("ClassName")
@RunWith(AndroidJUnit4::class)
@@ -70,46 +60,4 @@ class RecipientTableTest_applyStorageSyncContactUpdate {
    val messages = MessageTableTestUtils.getMessages(SignalDatabase.threads.getThreadIdFor(other.id)!!)
    assertThat(messages.first().isIdentityDefault).isTrue()
  }
-
-  @Test
-  fun givenAnAlreadySyncedContact_whenMarkedUnregistered_thenItSplitsAndPublishesTheSplit() {
-    // GIVEN a registered contact with aci+pni+e164 that is already in storage service (has a storageId)
-    val aci = ACI.from(UUID.randomUUID())
-    val pni = PNI.from(UUID.randomUUID())
-    val e164 = "+13334445555"
-
-    val id = SignalDatabase.recipients.getAndPossiblyMerge(aci, pni, e164)
-    SignalDatabase.recipients.markRegistered(id, aci)
-
-    val originalStorageId: ByteArray? = SignalDatabase.recipients.getRecord(id).storageId
-    assertThat(originalStorageId).isNotNull()
-
-    // Sanity: the record it currently publishes is whole + registered.
-    val before = StorageSyncModels.localToRemoteRecord(SignalDatabase.recipients.getRecordForSync(id)!!).proto.contact!!
-    assertThat(before.signalAci).isEqualTo(aci)
-    assertThat(before.signalPni).isEqualTo(pni)
-    assertThat(before.unregisteredAtTimestamp).isEqualTo(0L)
-
-    // WHEN it is marked unregistered (which strips its pni/e164 and splits it)
-    SignalDatabase.recipients.markUnregistered(id)
-
-    // THEN its storageId rotates
-    val updatedStorageId: ByteArray? = SignalDatabase.recipients.getRecord(id).storageId
-    assertThat(updatedStorageId).isNotNull()
-    assertThat(originalStorageId!!.contentEquals(updatedStorageId!!)).isFalse()
-
-    // THEN the published record is now ACI-only + unregistered
-    val after = StorageSyncModels.localToRemoteRecord(SignalDatabase.recipients.getRecordForSync(id)!!).proto.contact!!
-    assertThat(after.signalAci).isEqualTo(aci)
-    assertThat(after.signalPni).isNull()
-    assertThat(after.e164.nullIfBlank()).isNull()
-    assertThat(after.unregisteredAtTimestamp > 0L).isTrue()
-
-    // THEN the number now lives on a separate PNI-only recipient, so no whole aci+pni+e164 record remains.
-    val byPni = SignalDatabase.recipients.getByPni(pni).get()
-    assertThat(byPni).isNotEqualTo(id)
-    val pniRecord = StorageSyncModels.localToRemoteRecord(SignalDatabase.recipients.getRecordForSync(byPni)!!).proto.contact!!
-    assertThat(pniRecord.signalAci).isNull()
-    assertThat(pniRecord.signalPni).isEqualTo(pni)
-  }
 }
@@ -1,17 +1,13 @@
 package org.thoughtcrime.securesms.database

-import android.app.Application
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import assertk.assertThat
 import assertk.assertions.isEqualTo
 import assertk.assertions.isNull
 import assertk.assertions.isPresent
-import io.mockk.every
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 import org.signal.core.models.ServiceId.ACI
 import org.signal.core.models.ServiceId.PNI
 import org.signal.core.util.Hex
@@ -30,18 +26,12 @@ import org.thoughtcrime.securesms.isAbsent
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.mms.IncomingMessage
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.testutil.RecipientTestRule
-import org.whispersystems.signalservice.api.push.ServiceIds
 import java.util.UUID

@Suppress("ClassName", "TestFunctionName")
-@RunWith(RobolectricTestRunner::class)
-@Config(manifest = Config.NONE, application = Application::class)
+@RunWith(AndroidJUnit4::class)
 class SmsDatabaseTest_collapseJoinRequestEventsIfPossible {

-  @get:Rule
-  val recipientRule = RecipientTestRule()
-
  private lateinit var recipients: RecipientTable
  private lateinit var sms: MessageTable

@@ -58,7 +48,8 @@ class SmsDatabaseTest_collapseJoinRequestEventsIfPossible {
    recipients = SignalDatabase.recipients
    sms = SignalDatabase.messages

-    every { recipientRule.signalStore.account.getServiceIds() } returns ServiceIds(localAci, localPni)
+    SignalStore.account.setAci(localAci)
+    SignalStore.account.setPni(localPni)

    alice = recipients.getOrInsertFromServiceId(aliceServiceId)
    bob = recipients.getOrInsertFromServiceId(bobServiceId)
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.database

-import android.app.Application
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import assertk.assertThat
 import assertk.assertions.containsExactlyInAnyOrder
 import assertk.assertions.hasSize
@@ -16,23 +16,20 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
 import org.signal.core.models.ServiceId.ACI
 import org.thoughtcrime.securesms.database.model.DistributionListId
 import org.thoughtcrime.securesms.database.model.StoryType
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.testutil.RecipientTestRule
+import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.whispersystems.signalservice.api.push.DistributionId
 import java.util.UUID

-@RunWith(RobolectricTestRunner::class)
-@Config(manifest = Config.NONE, application = Application::class)
+@RunWith(AndroidJUnit4::class)
 class StorySendTableTest {

  @get:Rule
-  val recipients = RecipientTestRule()
+  val harness = SignalActivityRule(othersCount = 0, createGroup = false)

  private val distributionId1 = DistributionId.from(UUID.randomUUID())
  private val distributionId2 = DistributionId.from(UUID.randomUUID())
@@ -0,0 +1,120 @@
+package org.thoughtcrime.securesms.database.helpers.migration
+
+import android.app.Application
+import androidx.core.content.contentValuesOf
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
+import org.junit.Assert.fail
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.signal.core.util.SqlUtil
+import org.thoughtcrime.securesms.database.DistributionListTables
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.DistributionListId
+import org.thoughtcrime.securesms.testing.SignalDatabaseRule
+import org.whispersystems.signalservice.api.push.DistributionId
+import java.util.UUID
+import org.thoughtcrime.securesms.database.SQLiteDatabase as SignalSQLiteDatabase
+
+@RunWith(AndroidJUnit4::class)
+class MyStoryMigrationTest {
+
+  @get:Rule val harness = SignalDatabaseRule(deleteAllThreadsOnEachRun = false)
+
+  @Test
+  fun givenAValidMyStory_whenIMigrate_thenIExpectMyStoryToBeValid() {
+    // GIVEN
+    assertValidMyStoryExists()
+
+    // WHEN
+    runMigration()
+
+    // THEN
+    assertValidMyStoryExists()
+  }
+
+  @Test
+  fun givenNoMyStory_whenIMigrate_thenIExpectMyStoryToBeCreated() {
+    // GIVEN
+    deleteMyStory()
+
+    // WHEN
+    runMigration()
+
+    // THEN
+    assertValidMyStoryExists()
+  }
+
+  @Test
+  fun givenA00000000DistributionIdForMyStory_whenIMigrate_thenIExpectMyStoryToBeCreated() {
+    // GIVEN
+    setMyStoryDistributionId("0000-0000")
+
+    // WHEN
+    runMigration()
+
+    // THEN
+    assertValidMyStoryExists()
+  }
+
+  @Test
+  fun givenARandomDistributionIdForMyStory_whenIMigrate_thenIExpectMyStoryToBeCreated() {
+    // GIVEN
+    setMyStoryDistributionId(UUID.randomUUID().toString())
+
+    // WHEN
+    runMigration()
+
+    // THEN
+    assertValidMyStoryExists()
+  }
+
+  private fun setMyStoryDistributionId(serializedId: String) {
+    SignalDatabase.rawDatabase.update(
+      DistributionListTables.LIST_TABLE_NAME,
+      contentValuesOf(
+        DistributionListTables.DISTRIBUTION_ID to serializedId
+      ),
+      "_id = ?",
+      SqlUtil.buildArgs(DistributionListId.MY_STORY)
+    )
+  }
+
+  private fun deleteMyStory() {
+    SignalDatabase.rawDatabase.delete(
+      DistributionListTables.LIST_TABLE_NAME,
+      "_id = ?",
+      SqlUtil.buildArgs(DistributionListId.MY_STORY)
+    )
+  }
+
+  private fun assertValidMyStoryExists() {
+    SignalDatabase.rawDatabase.query(
+      DistributionListTables.LIST_TABLE_NAME,
+      SqlUtil.COUNT,
+      "_id = ? AND ${DistributionListTables.DISTRIBUTION_ID} = ?",
+      SqlUtil.buildArgs(DistributionListId.MY_STORY, DistributionId.MY_STORY.toString()),
+      null,
+      null,
+      null
+    ).use {
+      if (it.moveToNext()) {
+        val count = it.getInt(0)
+        assertEquals("assertValidMyStoryExists: Query produced an unexpected count.", 1, count)
+      } else {
+        fail("assertValidMyStoryExists: Query did not produce a count.")
+      }
+    }
+  }
+
+  private fun runMigration() {
+    V151_MyStoryMigration.migrate(
+      InstrumentationRegistry.getInstrumentation().targetContext.applicationContext as Application,
+      SignalSQLiteDatabase(SignalDatabase.rawDatabase),
+      0,
+      1
+    )
+  }
+}
@@ -3,28 +3,19 @@ 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.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).
@@ -54,54 +45,8 @@ class InstrumentationApplicationDependencyProvider(val application: Application,
    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 provideDonationsApi(authWebSocket: SignalWebSocket.AuthenticatedWebSocket, unauthWebSocket: SignalWebSocket.UnauthenticatedWebSocket): DonationsApi {
+    return mockk()
  }

  override fun provideSignalServiceMessageSender(
@@ -1,279 +0,0 @@
-/*
- * 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()
-  }
-}
@@ -15,13 +15,14 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.signal.core.models.media.TransformProperties
 import org.signal.core.util.StreamUtil
-import org.signal.mediasend.SentMediaQuality
 import org.thoughtcrime.securesms.attachments.UriAttachment
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.UriAttachmentBuilder
 import org.thoughtcrime.securesms.database.transformPropertiesForSentMediaQuality
 import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
+import org.thoughtcrime.securesms.mms.SentMediaQuality
+import org.thoughtcrime.securesms.providers.BlobProvider
 import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.thoughtcrime.securesms.util.MediaUtil
 import java.util.Optional
@@ -39,7 +40,7 @@ class AttachmentCompressionJobTest {
      StreamUtil.readFully(it)
    }

-    val blob = AppDependencies.blobs.forData(imageBytes).createForSingleSessionOnDisk(AppDependencies.application)
+    val blob = BlobProvider.getInstance().forData(imageBytes).createForSingleSessionOnDisk(AppDependencies.application)

    val firstPreUpload = createAttachment(1, blob, TransformProperties.empty())
    val firstDatabaseAttachment = SignalDatabase.attachments.insertAttachmentForPreUpload(firstPreUpload)
@@ -19,31 +19,17 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.signal.core.util.Base64
-import org.signal.core.util.Util
 import org.signal.network.NetworkResult
 import org.signal.network.exceptions.NonSuccessfulResponseCodeException
-import org.thoughtcrime.securesms.attachments.Cdn
-import org.thoughtcrime.securesms.attachments.PointerAttachment
 import org.thoughtcrime.securesms.backup.DeletionState
 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.SignalDatabase
 import org.thoughtcrime.securesms.jobs.protos.BackupDeleteJobData
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.testing.Flag
-import org.thoughtcrime.securesms.testing.RemoteConfigForTest
 import org.thoughtcrime.securesms.testing.SignalActivityRule
-import org.thoughtcrime.securesms.testing.TestRemoteConfigFlag
-import java.util.UUID
+import org.thoughtcrime.securesms.util.RemoteConfig

-@RemoteConfigForTest(
-  flags = [
-    Flag(TestRemoteConfigFlag.INTERNAL_USER, "true"),
-    Flag(TestRemoteConfigFlag.DEFAULT_MAX_BACKOFF, "1")
-  ]
-)
 class BackupDeleteJobTest {

  @get:Rule
@@ -51,6 +37,10 @@ class BackupDeleteJobTest {

  @Before
  fun setUp() {
+    mockkObject(RemoteConfig)
+    every { RemoteConfig.internalUser } returns true
+    every { RemoteConfig.defaultMaxBackoff } returns 1000L
+
    mockkObject(BackupRepository)
    every { BackupRepository.getBackupTier() } returns NetworkResult.Success(MessageBackupTier.PAID)
    every { BackupRepository.deleteBackup() } returns NetworkResult.Success(Unit)
@@ -64,24 +54,29 @@ class BackupDeleteJobTest {

  @Test
  fun givenUserNotRegistered_whenIRun_thenIExpectFailure() {
-    SignalStore.account.setRegistered(false)
+    mockkObject(SignalStore) {
+      every { SignalStore.account.isRegistered } returns false

-    val job = BackupDeleteJob()
+      val job = BackupDeleteJob()

-    val result = job.run()
+      val result = job.run()

-    assertThat(result.isFailure).isTrue()
+      assertThat(result.isFailure).isTrue()
+    }
  }

  @Test
  fun givenLinkedDevice_whenIRun_thenIExpectFailure() {
-    SignalStore.account.deviceId = 2
+    mockkObject(SignalStore) {
+      every { SignalStore.account.isRegistered } returns true
+      every { SignalStore.account.isLinkedDevice } returns true

-    val job = BackupDeleteJob()
+      val job = BackupDeleteJob()

-    val result = job.run()
+      val result = job.run()

-    assertThat(result.isFailure).isTrue()
+      assertThat(result.isFailure).isTrue()
+    }
  }

  @Test
@@ -160,7 +155,10 @@ class BackupDeleteJobTest {

  @Test
  fun givenMediaOffloaded_whenIRun_thenIExpectAwaitingMediaDownload() {
-    insertOffloadedAttachment()
+    mockkObject(SignalDatabase)
+    every { SignalDatabase.attachments.getRemainingRestorableAttachmentSize() } returns 1
+    every { SignalDatabase.attachments.getOptimizedMediaAttachmentSize() } returns 1
+    every { SignalDatabase.attachments.clearAllArchiveData() } returns Unit

    SignalStore.backup.deletionState = DeletionState.CLEAR_LOCAL_STATE

@@ -254,39 +252,4 @@ class BackupDeleteJobTest {

    assertThat(result.isRetry).isTrue()
  }
-
-  private fun insertOffloadedAttachment(size: Long = 100) {
-    SignalDatabase.attachments.insertAttachmentsForMessage(
-      mmsId = 1,
-      attachments = listOf(
-        PointerAttachment(
-          contentType = "image/jpeg",
-          transferState = AttachmentTable.TRANSFER_RESTORE_OFFLOADED,
-          size = size,
-          fileName = null,
-          cdn = Cdn.CDN_3,
-          location = "somelocation",
-          key = Base64.encodeWithPadding(Util.getSecretBytes(64)),
-          iv = null,
-          digest = Util.getSecretBytes(64),
-          incrementalDigest = null,
-          incrementalMacChunkSize = 0,
-          fastPreflightId = null,
-          voiceNote = false,
-          borderless = false,
-          videoGif = false,
-          width = 100,
-          height = 100,
-          uploadTimestamp = System.currentTimeMillis(),
-          caption = null,
-          stickerLocator = null,
-          blurHash = null,
-          uuid = UUID.randomUUID(),
-          quote = false,
-          quoteTargetContentType = null
-        )
-      ),
-      quoteAttachment = emptyList()
-    )
-  }
 }
@@ -42,10 +42,8 @@ import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobmanager.Job
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.net.SignalNetwork
-import org.thoughtcrime.securesms.testing.Flag
-import org.thoughtcrime.securesms.testing.RemoteConfigForTest
 import org.thoughtcrime.securesms.testing.SignalActivityRule
-import org.thoughtcrime.securesms.testing.TestRemoteConfigFlag
+import org.thoughtcrime.securesms.util.RemoteConfig
 import org.whispersystems.signalservice.api.storage.IAPSubscriptionId
 import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
 import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription.ChargeFailure
@@ -57,7 +55,6 @@ import java.util.Currency
 import kotlin.time.Duration.Companion.days
 import kotlin.time.Duration.Companion.milliseconds

-@RemoteConfigForTest(flags = [Flag(TestRemoteConfigFlag.INTERNAL_USER, "true") ])
@RunWith(AndroidJUnit4::class)
 class BackupSubscriptionCheckJobTest {

@@ -70,6 +67,9 @@ class BackupSubscriptionCheckJobTest {

  @Before
  fun setUp() {
+    mockkObject(RemoteConfig)
+    every { RemoteConfig.internalUser } returns true
+
    coEvery { AppDependencies.billingApi.getApiAvailability() } returns BillingResponseCode.OK

    coEvery { AppDependencies.billingApi.queryPurchases() } returns BillingPurchaseResult.Success(
@@ -88,7 +88,6 @@ class BackupSubscriptionCheckJobTest {
    every { RecurringInAppPaymentRepository.getActiveSubscriptionSync(InAppPaymentSubscriberRecord.Type.BACKUP) } returns NetworkResult.Success(
      createActiveSubscription()
    )
-    every { RecurringInAppPaymentRepository.ensureSubscriberIdSync(any(), any(), any()) } returns Unit

    mockkObject(BackupRepository)
    every { BackupRepository.getBackupTier() } answers {
@@ -121,6 +120,8 @@ class BackupSubscriptionCheckJobTest {
      )
    )

+    every { AppDependencies.donationsApi.putSubscription(any()) } returns NetworkResult.Success(Unit)
+
    insertSubscriber()
  }

@@ -141,22 +142,26 @@ class BackupSubscriptionCheckJobTest {

  @Test
  fun givenUserIsNotRegistered_whenIRun_thenIExpectSuccessAndEarlyExit() {
-    SignalStore.account.setRegistered(false)
+    mockkObject(SignalStore.account) {
+      every { SignalStore.account.isRegistered } returns false

-    val job = BackupSubscriptionCheckJob.create()
-    val result = job.run()
+      val job = BackupSubscriptionCheckJob.create()
+      val result = job.run()

-    assertEarlyExit(result)
+      assertEarlyExit(result)
+    }
  }

  @Test
  fun givenIsLinkedDevice_whenIRun_thenIExpectSuccessAndEarlyExit() {
-    SignalStore.account.deviceId = 2
+    mockkObject(SignalStore.account) {
+      every { SignalStore.account.isLinkedDevice } returns true

-    val job = BackupSubscriptionCheckJob.create()
-    val result = job.run()
+      val job = BackupSubscriptionCheckJob.create()
+      val result = job.run()

-    assertEarlyExit(result)
+      assertEarlyExit(result)
+    }
  }

  @Test
@@ -32,8 +32,8 @@ import org.thoughtcrime.securesms.conversation.ConversationIntents
 import org.thoughtcrime.securesms.conversation.v2.ConversationFragment
 import org.thoughtcrime.securesms.conversationlist.ConversationListArchiveFragment
 import org.thoughtcrime.securesms.conversationlist.ConversationListFragment
-import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionActivity
+import org.thoughtcrime.securesms.providers.BlobProvider
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.stories.landing.StoriesLandingFragment
@@ -49,6 +49,7 @@ import java.util.concurrent.TimeUnit
 */
@RunWith(AndroidJUnit4::class)
 class MainNavigationLaunchTest {
+
  @get:Rule
  val harness = SignalActivityRule(othersCount = 2)

@@ -88,8 +89,7 @@ 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.detailLocation: ${vm.detailLocation.value}")
-            appendLine("vm.chatsBackStackEntries: ${vm.chatsBackStackEntries.toList()}")
+            appendLine("vm.earlyNavigationDetailLocationRequested: ${vm.earlyNavigationDetailLocationRequested}")
          }
        }
        throw IllegalStateException("${e.message}\n$state", e)
@@ -254,9 +254,8 @@ class MainNavigationLaunchTest {
          "starts handling it on cold launch, update or delete this test. Got: ${recorder.allCreated}"
      }
      val vm = runOnMainSync { launched.activity.mainNavigationViewModel() }
-      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"
+      check(vm.earlyNavigationDetailLocationRequested == null) {
+        "Expected no early detail to be staged, got ${vm.earlyNavigationDetailLocationRequested}"
      }
    }
  }
@@ -290,9 +289,8 @@ class MainNavigationLaunchTest {
        "Expected default CHATS, got ${vm.mainNavigationState.value.currentListLocation}"
      }
      Thread.sleep(750)
-      val detailLocation = runOnMainSync { vm.detailLocation.value }
-      check(detailLocation == MainNavigationDetailLocation.Empty) {
-        "Expected Empty detail location, got $detailLocation"
+      check(vm.earlyNavigationDetailLocationRequested == null) {
+        "Expected no early detail, got ${vm.earlyNavigationDetailLocationRequested}"
      }
      check(recorder.createdArgs.isEmpty()) {
        "Expected no ConversationFragment for bare launch, got ${recorder.createdArgs.size}"
@@ -350,13 +348,11 @@ class MainNavigationLaunchTest {
      await(description = "no new ConversationFragment after Empty detail intent") {
        recorder.createdArgs.size == baseline
      }
+      // The user-visible signal that we're "back on the list" is the chat list fragment
+      // being attached, not just the VM saying CHATS.
+      awaitListFragment(launched, MainNavigationListLocation.CHATS)

      val vm = runOnMainSync { launched.activity.mainNavigationViewModel() }
-
-      await(description = "conversation cleared from chats back stack after Empty detail intent") {
-        vm.chatsBackStackEntries.none { it is MainNavigationDetailLocation.Conversation }
-      }
-
      check(vm.mainNavigationState.value.currentListLocation == MainNavigationListLocation.CHATS) {
        "Expected CHATS, got ${vm.mainNavigationState.value.currentListLocation}"
      }
@@ -573,7 +569,7 @@ class MainNavigationLaunchTest {
  }

  private fun realBlob(bytes: ByteArray, mimeType: String): Uri {
-    return AppDependencies.blobs
+    return BlobProvider.getInstance()
      .forData(bytes)
      .withMimeType(mimeType)
      .createForSingleSessionInMemory()
@@ -1,84 +0,0 @@
-/*
- * 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()
-  }
-}
@@ -1,113 +0,0 @@
-/*
- * 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
-  }
-}
@@ -1,54 +0,0 @@
-/*
- * 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()
-}
@@ -18,10 +18,10 @@ import org.thoughtcrime.securesms.database.UriAttachmentBuilder
 import org.thoughtcrime.securesms.database.model.GroupsV2UpdateMessageConverter
 import org.thoughtcrime.securesms.database.model.databaseprotos.DecryptedGroupV2Context
 import org.thoughtcrime.securesms.database.model.databaseprotos.GV2UpdateDescription
-import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.jobs.ThreadUpdateJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.mms.OutgoingMessage
+import org.thoughtcrime.securesms.providers.BlobProvider
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.testing.GroupTestingUtils
@@ -120,7 +120,7 @@ class MessageHelper(private val harness: SignalActivityRule, var startTime: Long
  }

  fun outgoingAttachment(data: ByteArray, uuid: UUID? = UUID.randomUUID()): Attachment {
-    val uri: Uri = AppDependencies.blobs.forData(data).createForSingleSessionInMemory()
+    val uri: Uri = BlobProvider.getInstance().forData(data).createForSingleSessionInMemory()

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

  @Test
-  fun skipsRedeliveryWithSameServerTimestamp() {
-    val timestamp = messageHelper.nextStartTime()
-    sendPniChangeNumber(timestamp = timestamp)
+  fun skipsRedeliveryWhenPniAlreadyMatches() {
+    sendPniChangeNumber()
    val afterFirstApply = captureOriginalState()

    val otherIdentity = IdentityKeyPair.generate()
@@ -248,39 +247,10 @@ class SyncMessageProcessorTest_synchronizePniChangeNumber {
      identityKeyPair = otherIdentity.serialize().toByteString(),
      signedPreKey = otherSignedPreKey.serialize().toByteString(),
      e164 = "+15555550100",
-      timestamp = timestamp
-    )
-
-    assertOriginalStatePreserved(afterFirstApply)
-  }
-
-  @Test
-  fun reappliesWhenServerTimestampIsNewer() {
-    sendPniChangeNumber()
-
-    val secondPniUuid = UUID.randomUUID()
-    val secondPni = ServiceId.PNI.from(secondPniUuid)
-    val secondPniBytes = UuidUtil.toByteArray(secondPniUuid).toByteString()
-    val secondIdentity = IdentityKeyPair.generate()
-    val secondSignedPreKey = PreKeyUtil.generateSignedPreKey(9999, secondIdentity.privateKey)
-    val secondE164 = "+15555550100"
-    val secondRegistrationId = 7777
-
-    sendPniChangeNumber(
-      identityKeyPair = secondIdentity.serialize().toByteString(),
-      signedPreKey = secondSignedPreKey.serialize().toByteString(),
-      lastResortKyberPreKey = null,
-      registrationId = secondRegistrationId,
-      e164 = secondE164,
-      envelopePniBinary = secondPniBytes,
      timestamp = messageHelper.nextStartTime() + 1000
    )

-    assertThat(SignalStore.account.e164).isEqualTo(secondE164)
-    assertThat(SignalStore.account.pni).isEqualTo(secondPni)
-    assertThat(SignalStore.account.pniRegistrationId).isEqualTo(secondRegistrationId)
-    assertThat(SignalStore.account.pniIdentityKey.publicKey.serialize().toByteString())
-      .isEqualTo(secondIdentity.publicKey.serialize().toByteString())
+    assertOriginalStatePreserved(afterFirstApply)
  }

  @Test
@@ -1,49 +0,0 @@
-/*
- * 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"}"""
-  }
-}
@@ -1,57 +0,0 @@
-/*
- * 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)
-  }
-}
@@ -7,90 +7,37 @@ 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.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
+import org.whispersystems.signalservice.internal.push.SubscriptionsConfiguration

 /**
- * 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).
+ * Sets up some common infrastructure for on-device InAppPayment testing
 */
 class InAppPaymentsRule : ExternalResource() {
-
  override fun before() {
-    MockEndpoints.responder.clear()
-    registerDonationServiceDefaults()
+    initialiseConfigurationResponse()
+    initialisePutSubscription()
    initialiseSetArchiveBackupId()
-    initialiseSetAccountAttributes()
-    initialiseAccountLookups()
  }

-  override fun after() {
-    MockEndpoints.responder.clear()
-  }
-
-  /**
-   * 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)
+  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))
    }

-    // Redemption.
-    responder.post("/v1/donation/redeem-receipt") { ok() }
+    AppDependencies.donationsApi.apply {
+      every { getDonationsConfiguration(any()) } returns response
+    }
  }

-  private fun mintReceiptCredential(requestBody: String): EndpointResponse {
-    val requestBase64 = JSONObject(requestBody).getString("receiptCredentialRequest")
-    val minted = DonationTestServer.issueReceiptCredential(requestBase64)
-    return ok(DonationResponses.receiptCredential(minted))
+  private fun initialisePutSubscription() {
+    AppDependencies.donationsApi.apply {
+      every { putSubscription(any()) } returns NetworkResult.Success(Unit)
+    }
  }

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

 import android.app.Application
 import android.content.Context
-import android.os.Bundle
 import androidx.test.runner.AndroidJUnitRunner
 import org.thoughtcrime.securesms.SignalInstrumentationApplicationContext

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

 /**
@@ -32,14 +32,6 @@ class BenchmarkSetupActivity : BaseActivity() {

  companion object {
    private val TAG = Log.tag(BenchmarkSetupActivity::class)
-
-    const val SEARCH_KEYWORD = "lighthouse"
-
-    private val SEARCH_VOCABULARY = listOf(
-      "hello", "world", "signal", "android", "kotlin", "database", "benchmark", "conversation",
-      "morning", "evening", "weekend", "project", "meeting", "dinner", "coffee", "garden",
-      "mountain", "river", "forest", "harbor", "market", "library", "concert", "holiday"
-    )
  }

  override fun onCreate(savedInstanceState: Bundle?) {
@@ -59,7 +51,6 @@ class BenchmarkSetupActivity : BaseActivity() {
      when (intent.extras!!.getString("setup-type")) {
        "cold-start" -> setupColdStart()
        "conversation-open" -> setupConversationOpen()
-        "conversation-list-search" -> setupConversationListSearch()
        "message-send" -> setupMessageSend()
        "group-message-send" -> setupGroupMessageSend()
        "group-delivery-receipt" -> setupGroupReceipt(includeMsl = true)
@@ -106,39 +97,6 @@ class BenchmarkSetupActivity : BaseActivity() {
    }
  }

-  private fun setupConversationListSearch() {
-    TestUsers.setupSelf()
-
-    val recipientCount = 50
-    val messagesPerRecipient = 2000
-    val totalMessages = recipientCount * messagesPerRecipient
-    val generator = TestMessages.TimestampGenerator(System.currentTimeMillis() - (totalMessages * 2000L) - 60_000L)
-
-    TestUsers.setupTestRecipients(recipientCount).forEachIndexed { recipientIndex, recipientId ->
-      val recipient: Recipient = Recipient.resolved(recipientId)
-
-      for (i in 0 until messagesPerRecipient) {
-        val body = searchableMessageBody(recipientIndex, i)
-        if (i % 2 == 0) {
-          TestMessages.insertIncomingTextMessage(other = recipient, body = body, timestamp = generator.nextTimestamp())
-        } else {
-          TestMessages.insertOutgoingTextMessage(other = recipient, body = body, timestamp = generator.nextTimestamp())
-        }
-      }
-
-      SignalDatabase.messages.setAllMessagesRead()
-      SignalDatabase.threads.update(SignalDatabase.threads.getOrCreateThreadIdFor(recipient = recipient), true)
-    }
-  }
-
-  private fun searchableMessageBody(recipientIndex: Int, messageIndex: Int): String {
-    val words = SEARCH_VOCABULARY
-    val w1 = words[(recipientIndex + messageIndex) % words.size]
-    val w2 = words[(recipientIndex * 7 + messageIndex * 3) % words.size]
-    val w3 = words[(recipientIndex * 13 + messageIndex * 5) % words.size]
-    return "$w1 $w2 $SEARCH_KEYWORD $w3 message $messageIndex"
-  }
-
  private fun setupMessageSend() {
    TestUsers.setupSelf()
    TestUsers.setupTestClients(1)
@@ -78,6 +78,7 @@ 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 }
  }
 }
@@ -241,6 +241,5 @@ class OtherClient(val serviceId: ServiceId, val e164: String, val identityKeyPai
    override fun deleteAllStaleOneTimeKyberPreKeys(threshold: Long, minCount: Int) = throw UnsupportedOperationException()
    override fun loadLastResortKyberPreKeys(): List<KyberPreKeyRecord> = throw UnsupportedOperationException()
    override fun isMultiDevice(): Boolean = throw UnsupportedOperationException()
-    override fun setMultiDevice(isMultiDevice: Boolean) = throw UnsupportedOperationException()
  }
 }
@@ -146,7 +146,7 @@ object TestMessages {
  private fun imageAttachment(): SignalServiceAttachmentPointer {
    return SignalServiceAttachmentPointer(
      Cdn.S3.cdnNumber,
-      SignalServiceAttachmentRemoteId.from("", Cdn.S3.cdnNumber),
+      SignalServiceAttachmentRemoteId.from(""),
      "image/webp",
      null,
      Optional.empty(),
@@ -170,7 +170,7 @@ object TestMessages {
  private fun voiceAttachment(): SignalServiceAttachmentPointer {
    return SignalServiceAttachmentPointer(
      Cdn.S3.cdnNumber,
-      SignalServiceAttachmentRemoteId.from("", Cdn.S3.cdnNumber),
+      SignalServiceAttachmentRemoteId.from(""),
      "audio/aac",
      null,
      Optional.empty(),
@@ -133,7 +133,7 @@ object TestUsers {
        val recipientId = RecipientId.from(SignalServiceAddress(aci, "+15555551%03d".format(i)))
        SignalDatabase.recipients.setProfileName(recipientId, ProfileName.fromParts("Buddy", "#$i"))
        SignalDatabase.recipients.setProfileKeyIfAbsent(recipientId, ProfileKeyUtil.createNew())
-        SignalDatabase.recipients.setCapabilities(recipientId, SignalServiceProfile.Capabilities(true, true, true))
+        SignalDatabase.recipients.setCapabilities(recipientId, SignalServiceProfile.Capabilities(true, true))
        SignalDatabase.recipients.setProfileSharing(recipientId, true)
        SignalDatabase.recipients.markRegistered(recipientId, aci)
        val otherIdentity = IdentityKeyPair.generate()
@@ -157,7 +157,7 @@ object TestUsers {
        val recipientId = RecipientId.from(SignalServiceAddress(otherClient.serviceId, otherClient.e164))
        SignalDatabase.recipients.setProfileName(recipientId, ProfileName.fromParts("Buddy", "#$i"))
        SignalDatabase.recipients.setProfileKeyIfAbsent(recipientId, otherClient.profileKey)
-        SignalDatabase.recipients.setCapabilities(recipientId, SignalServiceProfile.Capabilities(true, true, true))
+        SignalDatabase.recipients.setCapabilities(recipientId, SignalServiceProfile.Capabilities(true, true))
        SignalDatabase.recipients.setProfileSharing(recipientId, true)
        SignalDatabase.recipients.markRegistered(recipientId, otherClient.serviceId)
        AppDependencies.protocolStore.aci().saveIdentity(SignalProtocolAddress(otherClient.serviceId.toString(), 1), otherClient.identityKeyPair.publicKey)
@@ -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
@@ -438,7 +438,12 @@
            android:theme="@style/Theme.Signal.DayNight.NoActionBar"
            android:windowSoftInputMode="adjustResize" />

-
+        <activity
+            android:name=".calls.links.details.CallLinkDetailsActivity"
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+            android:exported="false"
+            android:theme="@style/Theme.Signal.DayNight.NoActionBar"
+            android:windowSoftInputMode="stateAlwaysHidden" />

        <activity
            android:name=".calls.new.NewCallActivity"
@@ -522,13 +527,6 @@
            </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"
@@ -1373,7 +1371,7 @@

        <service
            android:name=".gcm.FcmReceiveService"
-            android:exported="false">
+            android:exported="true">
            <intent-filter>
                <action android:name="com.google.firebase.MESSAGING_EVENT" />
            </intent-filter>
@@ -1536,7 +1534,7 @@
        </receiver>

        <receiver
-            android:name="org.signal.core.util.ForegroundServiceUtil$Receiver"
+            android:name="org.thoughtcrime.securesms.jobs.ForegroundServiceUtil$Receiver"
            android:exported="false" />

        <receiver
@@ -24,11 +24,6 @@ class ConversationLayoutManager(context: Context) : LinearLayoutManager(context,

  private var afterScroll: (() -> Unit)? = null

-  // Backing state for scrollToPositionTopAligned; alignTopCorrected guards the one-shot corrective re-scroll.
-  private var alignTopPosition: Int = RecyclerView.NO_POSITION
-  private var alignTopInset: Int = 0
-  private var alignTopCorrected: Boolean = false
-
  override fun supportsPredictiveItemAnimations(): Boolean {
    return false
  }
@@ -39,23 +34,9 @@ class ConversationLayoutManager(context: Context) : LinearLayoutManager(context,
   */
  fun scrollToPositionWithOffset(position: Int, offset: Int, afterScroll: () -> Unit) {
    this.afterScroll = afterScroll
-    alignTopPosition = RecyclerView.NO_POSITION
    super.scrollToPositionWithOffset(position, offset)
  }

-  /**
-   * Scroll so [position]'s decorated top (including any top decoration, e.g. the unread divider) lands [topInset] px
-   * below the top of the recycler. [afterScroll] fires once the alignment settles.
-   */
-  fun scrollToPositionTopAligned(position: Int, topInset: Int, afterScroll: () -> Unit) {
-    this.afterScroll = afterScroll
-    alignTopPosition = position
-    alignTopInset = topInset
-    alignTopCorrected = false
-    // Rough first pass: the exact offset needs the item's height, which isn't known until it's laid out (see onLayoutCompleted).
-    super.scrollToPositionWithOffset(position, height - topInset)
-  }
-
  /**
   * If a scroll to position request is made and a layout pass occurs prior to the list being populated with via the data source,
   * the base implementation clears the request as if it was never made.
@@ -83,26 +64,10 @@ class ConversationLayoutManager(context: Context) : LinearLayoutManager(context,
      } else {
        scrollToPosition(pendingScrollPosition)
      }
-      return
+    } else {
+      afterScroll?.invoke()
+      afterScroll = null
    }
-
-    // The target is now laid out, so its height is known. Correct the offset once so the decorated top sits at the
-    // requested inset, then let the next layout settle before notifying via afterScroll.
-    if (alignTopPosition != RecyclerView.NO_POSITION && !alignTopCorrected) {
-      val target = findViewByPosition(alignTopPosition)
-      if (target != null) {
-        alignTopCorrected = true
-        if (getDecoratedTop(target) != alignTopInset) {
-          val correctedOffset = (height - paddingBottom) - alignTopInset - getDecoratedMeasuredHeight(target)
-          super.scrollToPositionWithOffset(alignTopPosition, correctedOffset)
-          return
-        }
-      }
-    }
-
-    afterScroll?.invoke()
-    afterScroll = null
-    alignTopPosition = RecyclerView.NO_POSITION
  }

  companion object {
@@ -13,8 +13,7 @@ object AppCapabilities {
      storage = storageCapable,
      versionedExpirationTimer = true,
      attachmentBackfill = true,
-      spqr = true,
-      usernameChangeSyncMessage = true
+      spqr = true
    )
  }
 }
@@ -33,13 +33,10 @@ import net.zetetic.database.Logger;
 import org.conscrypt.ConscryptSignal;
 import org.greenrobot.eventbus.EventBus;
 import org.signal.aesgcmprovider.AesGcmProvider;
-import org.signal.core.util.AppForegroundObserver;
 import org.signal.core.util.DiskUtil;
 import org.signal.core.util.MemoryTracker;
-import org.signal.core.util.Util;
 import org.signal.core.util.concurrent.AnrDetector;
 import org.signal.core.util.concurrent.SignalExecutors;
-import org.signal.core.util.crypto.AttachmentSecretProvider;
 import org.signal.core.util.logging.AndroidLogger;
 import org.signal.core.util.logging.Log;
 import org.signal.core.util.logging.Scrubber;
@@ -47,14 +44,11 @@ import org.signal.core.util.tracing.Tracer;
 import org.signal.glide.SignalGlideCodecs;
 import org.signal.libsignal.net.ChatServiceException;
 import org.signal.libsignal.protocol.logging.SignalProtocolLoggerProvider;
-import org.signal.registration.RegistrationDependencies;
 import org.signal.ringrtc.CallManager;
 import org.thoughtcrime.securesms.apkupdate.ApkUpdateRefreshListener;
 import org.thoughtcrime.securesms.avatar.AvatarPickerStorage;
 import org.thoughtcrime.securesms.backup.v2.BackupRepository;
-import org.thoughtcrime.securesms.preferences.EditProxyActivity;
-import org.thoughtcrime.securesms.conversation.drafts.DraftBlobs;
-import org.thoughtcrime.securesms.crypto.AppAttachmentSecretStore;
+import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider;
 import org.thoughtcrime.securesms.crypto.DatabaseSecretProvider;
 import org.thoughtcrime.securesms.database.LogDatabase;
 import org.thoughtcrime.securesms.database.SignalDatabase;
@@ -65,7 +59,6 @@ import org.thoughtcrime.securesms.emoji.EmojiSource;
 import org.thoughtcrime.securesms.emoji.JumboEmoji;
 import org.thoughtcrime.securesms.gcm.FcmFetchManager;
 import org.thoughtcrime.securesms.glide.SignalGlideComponents;
-import org.thoughtcrime.securesms.jobmanager.impl.SealedSenderConstraint;
 import org.thoughtcrime.securesms.jobs.AccountConsistencyWorkerJob;
 import org.thoughtcrime.securesms.jobs.BackupRefreshJob;
 import org.thoughtcrime.securesms.jobs.BackupSubscriptionCheckJob;
@@ -82,7 +75,6 @@ import org.thoughtcrime.securesms.jobs.GroupV2UpdateSelfProfileKeyJob;
 import org.thoughtcrime.securesms.jobs.InAppPaymentAuthCheckJob;
 import org.thoughtcrime.securesms.jobs.InAppPaymentKeepAliveJob;
 import org.thoughtcrime.securesms.jobs.LinkedDeviceInactiveCheckJob;
-import org.thoughtcrime.securesms.jobs.MessageSendLogCleanupJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
 import org.thoughtcrime.securesms.jobs.PreKeysSyncJob;
 import org.thoughtcrime.securesms.jobs.ProfileUploadJob;
@@ -91,6 +83,7 @@ import org.thoughtcrime.securesms.jobs.RefreshSvrCredentialsJob;
 import org.thoughtcrime.securesms.jobs.RestoreOptimizedMediaJob;
 import org.thoughtcrime.securesms.jobs.RetrieveProfileJob;
 import org.thoughtcrime.securesms.jobs.RetrieveRemoteAnnouncementsJob;
+import org.thoughtcrime.securesms.jobmanager.impl.SealedSenderConstraint;
 import org.thoughtcrime.securesms.jobs.StoryOnboardingDownloadJob;
 import org.thoughtcrime.securesms.keyvalue.KeepMessagesDuration;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -101,11 +94,10 @@ import org.thoughtcrime.securesms.messageprocessingalarm.RoutineMessageFetchRece
 import org.thoughtcrime.securesms.messages.IncomingMessageObserver;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
 import org.thoughtcrime.securesms.mms.SignalGlideModule;
+import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.ratelimit.RateLimitUtil;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.registration.util.RegistrationUtil;
-import org.thoughtcrime.securesms.registration.v2.AppRegistrationNetworkController;
-import org.thoughtcrime.securesms.registration.v2.AppRegistrationStorageController;
 import org.thoughtcrime.securesms.ringrtc.RingRtcLogger;
 import org.thoughtcrime.securesms.service.AnalyzeDatabaseAlarmListener;
 import org.thoughtcrime.securesms.service.DirectoryRefreshListener;
@@ -115,21 +107,21 @@ import org.thoughtcrime.securesms.service.MessageBackupListener;
 import org.thoughtcrime.securesms.service.RotateSenderCertificateListener;
 import org.thoughtcrime.securesms.service.RotateSignedPreKeyListener;
 import org.thoughtcrime.securesms.service.webrtc.ActiveCallManager;
+import org.thoughtcrime.securesms.service.webrtc.CallingAssets;
 import org.thoughtcrime.securesms.service.webrtc.AndroidTelecomUtil;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
+import org.signal.core.util.AppForegroundObserver;
 import org.thoughtcrime.securesms.util.AppStartup;
-import org.thoughtcrime.securesms.util.BatterySnapshotTracker;
-import org.thoughtcrime.securesms.util.CommunicationActions;
 import org.thoughtcrime.securesms.util.DeviceProperties;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.Environment;
-import org.signal.core.util.PlayServicesUtil;
+import org.thoughtcrime.securesms.util.PlayServicesUtil;
 import org.thoughtcrime.securesms.util.RemoteConfig;
 import org.thoughtcrime.securesms.util.SignalLocalMetrics;
 import org.thoughtcrime.securesms.util.SignalUncaughtExceptionHandler;
 import org.thoughtcrime.securesms.util.SqlCipherLogTarget;
-import org.thoughtcrime.securesms.util.SupportEmailUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.signal.core.util.Util;
 import org.thoughtcrime.securesms.util.VersionTracker;
 import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
 import org.whispersystems.signalservice.api.websocket.SignalWebSocket;
@@ -178,7 +170,7 @@ public class ApplicationContext extends Application implements AppForegroundObse
                SqlCipherLibraryLoader.load();
                SignalDatabase.init(this,
                                    DatabaseSecretProvider.getOrCreateDatabaseSecret(this),
-                                    AttachmentSecretProvider.getInstance(this, AppAttachmentSecretStore.INSTANCE).getOrCreateAttachmentSecret());
+                                    AttachmentSecretProvider.getInstance(this).getOrCreateAttachmentSecret());
                Logger.setTarget(SqlCipherLogTarget.INSTANCE);
              })
              .addBlocking("signal-store", () -> SignalStore.init(this))
@@ -186,9 +178,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())
@@ -237,7 +229,7 @@ public class ApplicationContext extends Application implements AppForegroundObse
              .addPostRender(RefreshSvrCredentialsJob::enqueueIfNecessary)
              .addPostRender(() -> DownloadLatestEmojiDataJob.scheduleIfNecessary(this))
              .addPostRender(EmojiSearchIndexDownloadJob::scheduleIfNecessary)
-              .addPostRender(MessageSendLogCleanupJob::enqueue)
+              .addPostRender(() -> SignalDatabase.messageLog().trimOldMessages(System.currentTimeMillis(), RemoteConfig.retryRespondMaxAge()))
              .addPostRender(() -> JumboEmoji.updateCurrentVersion(this))
              .addPostRender(RetrieveRemoteAnnouncementsJob::enqueue)
              .addPostRender(AndroidTelecomUtil::registerPhoneAccount)
@@ -266,8 +258,6 @@ public class ApplicationContext extends Application implements AppForegroundObse
    long startTime = System.currentTimeMillis();
    Log.i(TAG, "App is now visible. Battery: " + DeviceProperties.getBatteryLevel(this) + "% (charging: " + DeviceProperties.isCharging(this) + ")");

-    BatterySnapshotTracker.emit(this, "foreground");
-
    AppDependencies.getFrameRateTracker().start();
    AppDependencies.getMegaphoneRepository().onAppForegrounded();
    AppDependencies.getDeadlockDetector().start();
@@ -287,7 +277,7 @@ public class ApplicationContext extends Application implements AppForegroundObse
      checkFreeDiskSpace();
      MemoryTracker.start();
      BackupSubscriptionCheckJob.enqueueIfAble();
-      CheckKeyTransparencyJob.enqueueIfNecessary(true, false);
+      CheckKeyTransparencyJob.enqueueIfNecessary(true);
      AppDependencies.getAuthWebSocket().registerKeepAliveToken(SignalWebSocket.FOREGROUND_KEEPALIVE);
      AppDependencies.getUnauthWebSocket().registerKeepAliveToken(SignalWebSocket.FOREGROUND_KEEPALIVE);

@@ -308,7 +298,6 @@ public class ApplicationContext extends Application implements AppForegroundObse
  @Override
  public void onBackground() {
    Log.i(TAG, "App is no longer visible.");
-    BatterySnapshotTracker.emit(this, "background");
    KeyCachingService.onAppBackgrounded(this);
    AppDependencies.getMessageNotifier().clearVisibleThread();
    AppDependencies.getFrameRateTracker().stop();
@@ -427,24 +416,14 @@ public class ApplicationContext extends Application implements AppForegroundObse
  }

  private void initializeRegistrationDependencies() {
-    RegistrationDependencies.provide(
-      new RegistrationDependencies(
-        new AppRegistrationNetworkController(this, AppDependencies.getPushServiceSocket()),
-        new AppRegistrationStorageController(this),
-        Environment.IS_LINK_AND_SYNC_AVAILABLE,
+    org.signal.registration.RegistrationDependencies.Companion.provide(
+      new org.signal.registration.RegistrationDependencies(
+        new org.thoughtcrime.securesms.registration.v2.AppRegistrationNetworkController(this, AppDependencies.getPushServiceSocket()),
+        new org.thoughtcrime.securesms.registration.v2.AppRegistrationStorageController(this),
        null,
        context -> {
          context.startActivity(new Intent(context, SubmitDebugLogActivity.class));
          return Unit.INSTANCE;
-        },
-        context -> {
-          context.startActivity(EditProxyActivity.intent(context));
-          return Unit.INSTANCE;
-        },
-        (context, subject) -> {
-          String body = SupportEmailUtil.generateSupportEmailBody(context, subject, null, null);
-          CommunicationActions.openEmail(context, SupportEmailUtil.getSupportEmailAddress(context), subject, body);
-          return Unit.INSTANCE;
        }
      )
    );
@@ -590,7 +569,7 @@ public class ApplicationContext extends Application implements AppForegroundObse

  @WorkerThread
  private void initializeBlobProvider() {
-    AppDependencies.getBlobs().initialize(this, DraftBlobs.INSTANCE::deleteOrphanedDraftFiles);
+    BlobProvider.getInstance().initialize(this);
  }

  @WorkerThread
@@ -1,14 +1,12 @@
 package org.thoughtcrime.securesms;

 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import androidx.lifecycle.LifecycleOwner;

 import com.bumptech.glide.RequestManager;

 import org.thoughtcrime.securesms.conversationlist.model.ConversationSet;
 import org.thoughtcrime.securesms.database.model.ThreadWithRecipient;
-import org.thoughtcrime.securesms.recipients.RecipientId;

 import java.util.Locale;
 import java.util.Set;
@@ -20,10 +18,10 @@ public interface BindableConversationListItem extends Unbindable {
            @NonNull RequestManager requestManager, @NonNull Locale locale,
            @NonNull Set<Long> typingThreads,
            @NonNull ConversationSet selectedConversations,
-            @Nullable RecipientId activeRecipientId);
+            long activeThreadId);

  void setSelectedConversations(@NonNull ConversationSet conversations);
-  void setActiveRecipientId(@Nullable RecipientId activeRecipientId);
+  void setActiveThreadId(long activeThreadId);
  void updateTypingIndicator(@NonNull Set<Long> typingThreads);
  void updateTimestamp();
 }
@@ -280,9 +280,8 @@ public final class ContactSelectionListFragment extends LoggingFragment {
            false,
            new ContactSelectionListAdapter.ArbitraryRepository(),
            new SearchRepository(requireContext().getString(R.string.note_to_self)),
-            new ContactSearchPagedDataSourceRepository(requireContext(), requireContext().getString(R.string.note_to_self)),
-            fixedContacts,
-            false
+            new ContactSearchPagedDataSourceRepository(requireContext()),
+            fixedContacts
        )
    ).get(ContactSearchViewModel.class);

@@ -600,18 +599,7 @@ public final class ContactSelectionListFragment extends LoggingFragment {
      boolean         isUnknown       = contact instanceof ContactSearchKey.UnknownRecipientKey;
      SelectedContact selectedContact = contact.requireSelectedContact();

-      boolean needsSelfCheck = !canSelectSelf && !selectedContact.hasUsername();
-
-      if (needsSelfCheck) {
-        lifecycleDisposable.add(contactChipViewModel.isSelf(selectedContact)
-                                                    .subscribe(isSelf -> onItemClickResolved(contact, selectedContact, isUnknown, isSelf)));
-      } else {
-        onItemClickResolved(contact, selectedContact, isUnknown, false);
-      }
-    }
-
-    private void onItemClickResolved(ContactSearchKey contact, SelectedContact selectedContact, boolean isUnknown, boolean isSelf) {
-      if (isSelf) {
+      if (!canSelectSelf && !selectedContact.hasUsername() && Recipient.self().getId().equals(selectedContact.getOrCreateRecipientId())) {
        Toast.makeText(requireContext(), R.string.ContactSelectionListFragment_you_do_not_need_to_add_yourself_to_the_group, Toast.LENGTH_SHORT).show();
        return;
      }
@@ -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,13 +22,6 @@ 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))
@@ -5,16 +5,17 @@

 package org.thoughtcrime.securesms

+import android.Manifest
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
-import android.os.Build
 import android.os.Bundle
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewTreeObserver
+import android.widget.Toast
 import androidx.activity.SystemBarStyle
 import androidx.activity.compose.BackHandler
 import androidx.activity.compose.setContent
@@ -24,7 +25,6 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.compose.foundation.background
 import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.BoxWithConstraintsScope
@@ -59,13 +59,10 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import androidx.core.content.ContextCompat
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.compose.AndroidFragment
 import androidx.fragment.compose.rememberFragmentState
@@ -75,11 +72,6 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.createSavedStateHandle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
-import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
-import androidx.navigation3.runtime.NavKey
-import androidx.navigation3.runtime.entryProvider
-import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator
-import androidx.navigation3.ui.NavDisplay
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import io.reactivex.rxjava3.subjects.PublishSubject
@@ -93,7 +85,6 @@ import kotlinx.coroutines.withContext
 import org.signal.core.ui.BottomSheetUtil
 import org.signal.core.ui.compose.Snackbars
 import org.signal.core.ui.compose.theme.SignalTheme
-import org.signal.core.ui.navigation.TransitionSpecs
 import org.signal.core.ui.permissions.Permissions
 import org.signal.core.ui.rememberIsSplitPane
 import org.signal.core.util.AppForegroundObserver
@@ -109,14 +100,11 @@ import org.thoughtcrime.securesms.backup.v2.ArchiveRestoreProgressState
 import org.thoughtcrime.securesms.backup.v2.ui.CouldNotCompleteBackupRestoreSheet
 import org.thoughtcrime.securesms.backup.v2.ui.verify.VerifyBackupKeyActivity
 import org.thoughtcrime.securesms.calls.YouAreAlreadyInACallSnackbar.show
-import org.thoughtcrime.securesms.calls.callsNavEntries
 import org.thoughtcrime.securesms.calls.log.CallLogFilter
 import org.thoughtcrime.securesms.calls.log.CallLogFragment
 import org.thoughtcrime.securesms.calls.new.NewCallActivity
 import org.thoughtcrime.securesms.calls.quality.CallQuality
 import org.thoughtcrime.securesms.calls.quality.CallQualityBottomSheetFragment
-import org.thoughtcrime.securesms.chats.ConversationTransitionState
-import org.thoughtcrime.securesms.chats.chatsNavEntries
 import org.thoughtcrime.securesms.components.DebugLogsPromptDialogFragment
 import org.thoughtcrime.securesms.components.PromptBatterySaverDialogFragment
 import org.thoughtcrime.securesms.components.compose.ConnectivityWarningBottomSheet
@@ -146,6 +134,8 @@ import org.thoughtcrime.securesms.devicetransfer.olddevice.OldDeviceExitActivity
 import org.thoughtcrime.securesms.groups.ui.creategroup.CreateGroupActivity
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.lock.v2.CreateSvrPinActivity
+import org.thoughtcrime.securesms.main.ChatNavGraphState
+import org.thoughtcrime.securesms.main.DetailsScreenNavHost
 import org.thoughtcrime.securesms.main.MainBottomChrome
 import org.thoughtcrime.securesms.main.MainBottomChromeCallback
 import org.thoughtcrime.securesms.main.MainBottomChromeState
@@ -153,6 +143,7 @@ import org.thoughtcrime.securesms.main.MainContentLayoutData
 import org.thoughtcrime.securesms.main.MainMegaphoneState
 import org.thoughtcrime.securesms.main.MainNavigationBar
 import org.thoughtcrime.securesms.main.MainNavigationDetailLocation
+import org.thoughtcrime.securesms.main.MainNavigationDetailLocationEffect
 import org.thoughtcrime.securesms.main.MainNavigationListLocation
 import org.thoughtcrime.securesms.main.MainNavigationRail
 import org.thoughtcrime.securesms.main.MainNavigationRouter
@@ -165,6 +156,13 @@ import org.thoughtcrime.securesms.main.MainToolbarMode
 import org.thoughtcrime.securesms.main.MainToolbarState
 import org.thoughtcrime.securesms.main.MainToolbarViewModel
 import org.thoughtcrime.securesms.main.Material3OnScrollHelperBinder
+import org.thoughtcrime.securesms.main.callNavGraphBuilder
+import org.thoughtcrime.securesms.main.chatNavGraphBuilder
+import org.thoughtcrime.securesms.main.navigateToDetailLocation
+import org.thoughtcrime.securesms.main.rememberDetailNavHostController
+import org.thoughtcrime.securesms.main.rememberFocusRequester
+import org.thoughtcrime.securesms.main.storiesNavGraphBuilder
+import org.thoughtcrime.securesms.mediasend.camerax.CameraXRemoteConfig
 import org.thoughtcrime.securesms.mediasend.v2.MediaSelectionActivity
 import org.thoughtcrime.securesms.mediasend.v3.mediaSendLauncher
 import org.thoughtcrime.securesms.megaphone.Megaphone
@@ -179,12 +177,14 @@ 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.storiesNavEntries
+import org.thoughtcrime.securesms.stories.settings.StorySettingsActivity
 import org.thoughtcrime.securesms.util.AppStartup
 import org.thoughtcrime.securesms.util.CachedInflater
 import org.thoughtcrime.securesms.util.CommunicationActions
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme
+import org.thoughtcrime.securesms.util.DynamicTheme
 import org.thoughtcrime.securesms.util.Material3OnScrollHelper
 import org.thoughtcrime.securesms.util.SplashScreenUtil
 import org.thoughtcrime.securesms.util.TopToastPopup
@@ -289,6 +289,14 @@ class MainActivity :

    AppStartup.getInstance().onCriticalRenderEventStart()

+    enableEdgeToEdge(
+      navigationBarStyle = if (DynamicTheme.isDarkTheme(this)) {
+        SystemBarStyle.dark(0)
+      } else {
+        SystemBarStyle.light(0, 0)
+      }
+    )
+
    super.onCreate(savedInstanceState, ready)
    navigator = MainNavigator(this, mainNavigationViewModel)

@@ -490,21 +498,69 @@ class MainActivity :
          }
        }

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

-        LaunchedEffect(convoTransitionState) {
-          mainNavigationViewModel.setChatListSnapshotCaptureProvider { convoTransitionState.writeGraphicsLayerToBitmap() }
+        val chatsNavHostController = rememberDetailNavHostController(
+          onRequestFocus = rememberFocusRequester(
+            mainNavigationViewModel = mainNavigationViewModel,
+            currentListLocation = mainNavigationState.currentListLocation,
+            isTargetListLocation = { it in listOf(MainNavigationListLocation.CHATS, MainNavigationListLocation.ARCHIVE) }
+          )
+        ) {
+          chatNavGraphBuilder(chatNavGraphState)
        }

-        LaunchedEffect(isSplitPane) {
-          mainNavigationViewModel.onSplitPaneChanged(isSplitPane)
+        val callsNavHostController = rememberDetailNavHostController(
+          onRequestFocus = rememberFocusRequester(
+            mainNavigationViewModel = mainNavigationViewModel,
+            currentListLocation = mainNavigationState.currentListLocation
+          ) { it == MainNavigationListLocation.CALLS }
+        ) {
+          callNavGraphBuilder(it)
+        }
+
+        val storiesNavHostController = rememberDetailNavHostController(
+          onRequestFocus = rememberFocusRequester(
+            mainNavigationViewModel = mainNavigationViewModel,
+            currentListLocation = mainNavigationState.currentListLocation
+          ) { it == MainNavigationListLocation.STORIES }
+        ) {
+          storiesNavGraphBuilder()
+        }
+
+        LaunchedEffect(Unit) {
+          suspend fun navigateToLocation(location: MainNavigationDetailLocation) {
+            when (location) {
+              is MainNavigationDetailLocation.Empty -> {
+                when (mainNavigationState.currentListLocation) {
+                  MainNavigationListLocation.CHATS, MainNavigationListLocation.ARCHIVE -> chatsNavHostController
+                  MainNavigationListLocation.CALLS -> callsNavHostController
+                  MainNavigationListLocation.STORIES -> storiesNavHostController
+                }.navigateToDetailLocation(location)
+              }
+
+              is MainNavigationDetailLocation.Conversation -> {
+                chatNavGraphState.writeGraphicsLayerToBitmap()
+                chatsNavHostController.navigateToDetailLocation(location)
+              }
+
+              is MainNavigationDetailLocation.Chats -> chatsNavHostController.navigateToDetailLocation(location)
+              is MainNavigationDetailLocation.CallLinkDetails -> callsNavHostController.navigateToDetailLocation(location)
+              is MainNavigationDetailLocation.Calls -> callsNavHostController.navigateToDetailLocation(location)
+              is MainNavigationDetailLocation.Stories -> storiesNavHostController.navigateToDetailLocation(location)
+            }
+          }
+
+          mainNavigationViewModel.earlyNavigationDetailLocationRequested?.let { navigateToLocation(it) }
+          mainNavigationViewModel.clearEarlyDetailLocation()
+
+          mainNavigationViewModel.detailLocation.collect { navigateToLocation(it) }
        }

        val scope = rememberCoroutineScope()
-
        BackHandler(paneExpansionState.currentAnchor == detailOnlyAnchor) {
-          mainNavigationViewModel.goTo(MainNavigationDetailLocation.Empty)
          scope.launch {
            paneExpansionState.animateTo(listOnlyAnchor)
          }
@@ -563,7 +619,7 @@ class MainActivity :

        AppScaffold(
          navigator = wrappedNavigator,
-          modifier = convoTransitionState.writeContentToGraphicsLayer(),
+          modifier = chatNavGraphState.writeContentToGraphicsLayer(),
          paneExpansionState = paneExpansionState,
          contentWindowInsets = WindowInsets(),
          snackbarHost = {
@@ -674,43 +730,23 @@ class MainActivity :
          primaryContent = {
            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) }
+                DetailsScreenNavHost(
+                  navHostController = chatsNavHostController,
+                  contentLayoutData = contentLayoutData
                )
              }

              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) }
+                DetailsScreenNavHost(
+                  navHostController = callsNavHostController,
+                  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() }
+                DetailsScreenNavHost(
+                  navHostController = storiesNavHostController,
+                  contentLayoutData = contentLayoutData
                )
              }
            }
@@ -725,7 +761,7 @@ class MainActivity :
          } else {
            null
          },
-          animatorFactory = if (mainNavigationState.currentListLocation.isChatsTab) {
+          animatorFactory = if (mainNavigationState.currentListLocation == MainNavigationListLocation.CHATS || mainNavigationState.currentListLocation == MainNavigationListLocation.ARCHIVE) {
            noEnterTransitionFactory
          } else {
            AppScaffoldAnimationStateFactory.Default
@@ -793,23 +829,6 @@ class MainActivity :
          SignalTheme.colors.colorSurface1
        }

-        val context = LocalContext.current
-        val isDarkTheme = isSystemInDarkTheme()
-        val navBarColor = if (isSplitPane) backgroundColor.toArgb() else ContextCompat.getColor(context, CoreUiR.color.signal_colorSurface2)
-        LaunchedEffect(isDarkTheme, navBarColor) {
-          if (Build.VERSION.SDK_INT >= 26) {
-            enableEdgeToEdge(
-              navigationBarStyle = if (isDarkTheme) {
-                SystemBarStyle.dark(navBarColor)
-              } else {
-                SystemBarStyle.light(navBarColor, navBarColor)
-              }
-            )
-          } else {
-            enableEdgeToEdge()
-          }
-        }
-
        val modifier = when {
          isSplitPane -> {
            Modifier
@@ -1033,36 +1052,13 @@ class MainActivity :

  private fun handleConversationIntent(intent: Intent) {
    if (ConversationIntents.isConversationIntent(intent)) {
-      if (!isTrustedConversationIntent(intent)) {
-        Log.w(TAG, "Received a conversation intent through an exported entry point. Ignoring its extras.")
-        intent.action = null
-        setIntent(intent)
-        return
-      }
-
-      val extras = intent.extras
-      if (extras == null) {
-        Log.w(TAG, "Received a conversation intent with no extras. Ignoring it.")
-        intent.action = null
-        setIntent(intent)
-        return
-      }
-
      mainNavigationViewModel.goTo(MainNavigationListLocation.CHATS)
-      mainNavigationViewModel.goTo(MainNavigationDetailLocation.Conversation(ConversationIntents.readArgsFromBundle(extras)))
+      mainNavigationViewModel.goTo(MainNavigationDetailLocation.Conversation(ConversationIntents.readArgsFromBundle(intent.extras!!)))
      intent.action = null
      setIntent(intent)
    }
  }

-  /**
-   * While MainActivity isn't exporting, we have launcher aliases that are, so we verify that someone isn't launching us through those befre
-   * respecting various intent attributes.
-   */
-  private fun isTrustedConversationIntent(intent: Intent): Boolean {
-    return intent.component?.className == MainActivity::class.java.name
-  }
-
  private fun handleGroupLinkInIntent(intent: Intent) {
    intent.data?.let { data ->
      CommunicationActions.handlePotentialGroupLinkUrl(this, data.toString())
@@ -1150,7 +1146,7 @@ class MainActivity :
      } else if (SignalStore.internal.useNewMediaActivity) {
        mediaSendLauncher.launch(
          MediaSendActivityContract.Args(
-            isCameraFirst = true,
+            isCameraFirst = false,
            isStory = destination == MainNavigationListLocation.STORIES
          )
        )
@@ -1164,7 +1160,24 @@ class MainActivity :
      }
    }

-    onGranted()
+    if (CameraXRemoteConfig.isSupported()) {
+      onGranted()
+    } else {
+      Permissions.with(this@MainActivity)
+        .request(Manifest.permission.CAMERA)
+        .ifNecessary()
+        .withRationaleDialog(getString(R.string.CameraXFragment_allow_access_camera), getString(R.string.CameraXFragment_to_capture_photos_and_video_allow_camera), CoreUiR.drawable.symbol_camera_24)
+        .withPermanentDenialDialog(
+          getString(R.string.CameraXFragment_signal_needs_camera_access_capture_photos),
+          null,
+          R.string.CameraXFragment_allow_access_camera,
+          R.string.CameraXFragment_to_capture_photos_videos,
+          supportFragmentManager
+        )
+        .onAllGranted(onGranted)
+        .onAnyDenied { Toast.makeText(this@MainActivity, R.string.CameraXFragment_signal_needs_camera_access_capture_photos, Toast.LENGTH_LONG).show() }
+        .execute()
+    }
  }

  inner class ToolbarCallback : MainToolbarCallback {
@@ -1228,11 +1241,11 @@ class MainActivity :
    }

    override fun onStoryPrivacyClick() {
-      mainNavigationViewModel.goTo(MainNavigationDetailLocation.Stories.PrivacySettings)
+      startActivity(StorySettingsActivity.getIntent(this@MainActivity))
    }

    override fun onStoryArchiveClick() {
-      mainNavigationViewModel.goTo(MainNavigationDetailLocation.Stories.Archive)
+      startActivity(StoryArchiveActivity.createIntent(this@MainActivity))
    }

    override fun onCloseSearchClick() {
@@ -13,11 +13,9 @@ import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;

 import org.greenrobot.eventbus.EventBus;
-import org.signal.core.util.AppForegroundObserver;
 import org.signal.core.util.logging.Log;
 import org.signal.core.util.tracing.Tracer;
 import org.signal.devicetransfer.TransferStatus;
-import org.signal.registration.RegistrationRoute;
 import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberLockActivity;
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
 import org.thoughtcrime.securesms.dependencies.AppDependencies;
@@ -32,10 +30,11 @@ 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;
@@ -58,7 +57,6 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
  private static final int STATE_TRANSFER_LOCKED     = 9;
  private static final int STATE_CHANGE_NUMBER_LOCK  = 10;
  private static final int STATE_TRANSFER_OR_RESTORE = 11;
-  private static final int STATE_RESUME_LINKING_REG  = 12;

  private SignalServiceNetworkAccess networkAccess;
  private BroadcastReceiver          clearKeyReceiver;
@@ -137,8 +135,12 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
    Intent    intent           = getIntentForState(applicationState);
    if (intent != null) {
      Log.d(TAG, "routeApplicationState(), intent: " + intent.getComponent());
+      if (applicationState == STATE_WELCOME_PUSH_SCREEN && Environment.USE_NEW_REGISTRATION) {
+        startActivity(intent);
+      } else {
        startActivity(intent);
        finish();
+      }
    }
  }

@@ -157,7 +159,6 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
      case STATE_TRANSFER_LOCKED:     return getOldDeviceTransferLockedIntent();
      case STATE_CHANGE_NUMBER_LOCK:  return getChangeNumberLockIntent();
      case STATE_TRANSFER_OR_RESTORE: return getTransferOrRestoreIntent();
-      case STATE_RESUME_LINKING_REG:  return getResumeLinkedRegistrationIntent();
      default:                        return null;
    }
  }
@@ -171,8 +172,6 @@ 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()) {
@@ -197,14 +196,6 @@ 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() &&
@@ -235,7 +226,11 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
  }

  private Intent getPushRegistrationIntent() {
-    return RegistrationActivity.newIntentForNewRegistration(this, getIntent());
+    if (Environment.USE_NEW_REGISTRATION) {
+      return org.signal.registration.RegistrationActivity.createIntent(this);
+    } else {
+      return RegistrationActivity.newIntentForNewRegistration(this, getIntent());
+    }
  }

  private Intent getEnterSignalPinIntent() {
@@ -255,17 +250,10 @@ 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());
@@ -1,27 +1,107 @@
 package org.thoughtcrime.securesms;

+import android.app.Activity;
+import android.content.Intent;
+import android.database.Cursor;
 import android.os.Bundle;
+import android.provider.ContactsContract;
+import android.text.TextUtils;
 import android.widget.Toast;

-import androidx.activity.ComponentActivity;
-import androidx.lifecycle.ViewModelProvider;
+import androidx.annotation.NonNull;

-public class SystemContactsEntrypointActivity extends ComponentActivity {
+import org.signal.core.util.logging.Log;
+import org.thoughtcrime.securesms.conversation.ConversationIntents;
+import org.thoughtcrime.securesms.conversation.NewConversationActivity;
+import org.thoughtcrime.securesms.database.SignalDatabase;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.util.Rfc5724Uri;
+
+import java.net.URISyntaxException;
+
+public class SystemContactsEntrypointActivity extends Activity {
+
+  private static final String TAG = Log.tag(SystemContactsEntrypointActivity.class);

  @Override
  protected void onCreate(Bundle savedInstanceState) {
+    startActivity(getNextIntent(getIntent()));
+    finish();
    super.onCreate(savedInstanceState);
+  }

-    SystemContactsEntrypointViewModel viewModel = new ViewModelProvider(this).get(SystemContactsEntrypointViewModel.class);
+  private Intent getNextIntent(Intent original) {
+    DestinationAndBody destination;

-    viewModel.getContactAction().observe(this, nextStep -> {
-      if (nextStep.getShowSpecifyRecipientToast()) {
+    if (original.getData() != null && "content".equals(original.getData().getScheme())) {
+      destination = getDestinationForSyncAdapter(original);
+    } else {
+      destination = getDestinationForView(original);
+    }
+
+    final Intent nextIntent;
+
+    if (TextUtils.isEmpty(destination.destination)) {
+      nextIntent = NewConversationActivity.createIntent(this, destination.getBody());
+      Toast.makeText(this, R.string.ConversationActivity_specify_recipient, Toast.LENGTH_LONG).show();
+    } else {
+      Recipient recipient = Recipient.external(destination.getDestination());
+
+      if (recipient != null) {
+        long threadId = SignalDatabase.threads().getOrCreateThreadIdFor(recipient);
+
+        nextIntent = ConversationIntents.createBuilderSync(this, recipient.getId(), threadId)
+                                        .withDraftText(destination.getBody())
+                                        .build();
+      } else {
+        nextIntent = NewConversationActivity.createIntent(this, destination.getBody());
        Toast.makeText(this, R.string.ConversationActivity_specify_recipient, Toast.LENGTH_LONG).show();
      }
-      startActivity(nextStep.getIntent());
-      finish();
-    });
+    }
+    return nextIntent;
+  }

-    viewModel.resolveNextStep(getIntent());
+  private @NonNull DestinationAndBody getDestinationForView(Intent intent) {
+    try {
+      Rfc5724Uri smsUri = new Rfc5724Uri(intent.getData().toString());
+      return new DestinationAndBody(smsUri.getPath(), smsUri.getQueryParams().get("body"));
+    } catch (URISyntaxException e) {
+      Log.w(TAG, "unable to parse RFC5724 URI from intent", e);
+      return new DestinationAndBody("", "");
+    }
+  }
+
+  private @NonNull DestinationAndBody getDestinationForSyncAdapter(Intent intent) {
+    Cursor cursor = null;
+
+    try {
+      cursor = getContentResolver().query(intent.getData(), null, null, null, null);
+
+      if (cursor != null && cursor.moveToNext()) {
+        return new DestinationAndBody(cursor.getString(cursor.getColumnIndexOrThrow(ContactsContract.RawContacts.Data.DATA1)), "");
+      }
+
+      return new DestinationAndBody("", "");
+    } finally {
+      if (cursor != null) cursor.close();
+    }
+  }
+
+  private static class DestinationAndBody {
+    private final String destination;
+    private final String body;
+
+    private DestinationAndBody(String destination, String body) {
+      this.destination = destination;
+      this.body = body;
+    }
+
+    public String getDestination() {
+      return destination;
+    }
+
+    public String getBody() {
+      return body;
+    }
  }
 }
@@ -1,106 +0,0 @@
-package org.thoughtcrime.securesms
-
-import android.content.Context
-import android.content.Intent
-import android.provider.ContactsContract
-import android.text.TextUtils
-import androidx.annotation.WorkerThread
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.conversation.ConversationIntents
-import org.thoughtcrime.securesms.conversation.NewConversationActivity
-import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.AppDependencies
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.util.Rfc5724Uri
-import java.net.URISyntaxException
-
-class SystemContactsEntrypointViewModel : ViewModel() {
-
-  companion object {
-    private val TAG = Log.tag(SystemContactsEntrypointViewModel::class.java)
-  }
-
-  private val internalContactAction = MutableLiveData<ContactAction>()
-  val contactAction: LiveData<ContactAction> = internalContactAction
-
-  fun resolveNextStep(original: Intent) {
-    viewModelScope.launch {
-      val result = withContext(Dispatchers.IO) {
-        getContactAction(AppDependencies.application, original)
-      }
-
-      internalContactAction.value = result
-    }
-  }
-
-  @WorkerThread
-  private fun getContactAction(context: Context, original: Intent): ContactAction {
-    val destination = if (original.data != null && "content" == original.data?.scheme) {
-      getDestinationForSyncAdapter(context, original)
-    } else {
-      getDestinationForView(original)
-    }
-
-    val destinationAddress = destination.destination
-    if (TextUtils.isEmpty(destinationAddress)) {
-      return ContactAction(NewConversationActivity.createIntent(context, destination.body), true)
-    }
-
-    val recipient = Recipient.external(destinationAddress!!)
-
-    if (recipient != null) {
-      val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
-
-      val nextIntent = ConversationIntents.createBuilderSync(context, recipient.id, threadId)
-        .withDraftText(destination.body)
-        .build()
-
-      return ContactAction(nextIntent, false)
-    }
-
-    return ContactAction(NewConversationActivity.createIntent(context, destination.body), true)
-  }
-
-  private fun getDestinationForView(intent: Intent): DestinationAndBody {
-    return try {
-      val smsUri = Rfc5724Uri(intent.data.toString())
-      DestinationAndBody(smsUri.path, smsUri.queryParams["body"])
-    } catch (e: URISyntaxException) {
-      Log.w(TAG, "unable to parse RFC5724 URI from intent", e)
-      DestinationAndBody("", "")
-    }
-  }
-
-  private fun getDestinationForSyncAdapter(context: Context, intent: Intent): DestinationAndBody {
-    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)), "")
-      }
-
-      return DestinationAndBody("", "")
-    }
-  }
-
-  data class ContactAction(
-    val intent: Intent,
-    val showSpecifyRecipientToast: Boolean
-  )
-
-  private data class DestinationAndBody(
-    val destination: String?,
-    val body: String?
-  )
-}
@@ -61,36 +61,21 @@ object ApkUpdateInstaller {
      return
    }

-    if (!userInitiated && !shouldAutoUpdate()) {
-      if (!isMatchingDigest(context, downloadId, digest)) {
-        Log.w(TAG, "DownloadId matches, but digest does not! Bad download or inconsistent state. Failing and clearing state.")
-        SignalStore.apkUpdate.clearDownloadAttributes()
-        ApkUpdateNotifications.showInstallFailed(context, ApkUpdateNotifications.FailureReason.UNKNOWN)
-        return
-      }
+    if (!isMatchingDigest(context, downloadId, digest)) {
+      Log.w(TAG, "DownloadId matches, but digest does not! Bad download or inconsistent state. Failing and clearing state.")
+      SignalStore.apkUpdate.clearDownloadAttributes()
+      ApkUpdateNotifications.showInstallFailed(context, ApkUpdateNotifications.FailureReason.UNKNOWN)
+      return
+    }

+    if (!userInitiated && !shouldAutoUpdate()) {
      Log.w(TAG, "Not user-initiated and not eligible for auto-update. Prompting. (API=${Build.VERSION.SDK_INT}, Foreground=${AppForegroundObserver.isForegrounded()}, AutoUpdate=${SignalStore.apkUpdate.autoUpdate})")
      ApkUpdateNotifications.showInstallPrompt(context, downloadId)
      return
    }

    try {
-      context
-        .getDownloadManager()
-        .openDownloadedFile(downloadId)
-        .use { parcelFileDescriptor ->
-          val stream = FileInputStream(parcelFileDescriptor.fileDescriptor)
-
-          if (!MessageDigest.isEqual(FileUtils.getFileDigest(stream), digest)) {
-            Log.w(TAG, "DownloadId matches, but digest does not! Bad download or inconsistent state. Failing and clearing state.")
-            SignalStore.apkUpdate.clearDownloadAttributes()
-            ApkUpdateNotifications.showInstallFailed(context, ApkUpdateNotifications.FailureReason.UNKNOWN)
-            return
-          }
-
-          stream.channel.position(0)
-          installApk(context, downloadId, stream, userInitiated)
-        }
+      installApk(context, downloadId, userInitiated)
    } catch (e: IOException) {
      Log.w(TAG, "Hit IOException when trying to install APK!", e)
      SignalStore.apkUpdate.clearDownloadAttributes()
@@ -103,13 +88,17 @@ object ApkUpdateInstaller {
  }

  @Throws(IOException::class, SecurityException::class)
-  private fun installApk(context: Context, downloadId: Long, apkInputStream: InputStream, userInitiated: Boolean) {
+  private fun installApk(context: Context, downloadId: Long, userInitiated: Boolean) {
+    val apkInputStream: InputStream? = getDownloadedApkInputStream(context, downloadId)
+    if (apkInputStream == null) {
+      Log.w(TAG, "Could not open download APK input stream!")
+      return
+    }
+
    Log.d(TAG, "Beginning APK install...")
    val packageInstaller: PackageInstaller = context.packageManager.packageInstaller

    val sessionParams = PackageInstaller.SessionParams(PackageInstaller.SessionParams.MODE_FULL_INSTALL).apply {
-      // Reject the session if the APK's declared package name doesn't match ours.
-      setAppPackageName(context.packageName)
      // At this point, we always want to set this if possible, since we've already prompted the user with our own notification when necessary.
      // This lets us skip the system-generated notification.
      if (Build.VERSION.SDK_INT >= 31) {
@@ -144,6 +133,15 @@ object ApkUpdateInstaller {
    session.commit(installerPendingIntent.intentSender)
  }

+  private fun getDownloadedApkInputStream(context: Context, downloadId: Long): InputStream? {
+    return try {
+      FileInputStream(context.getDownloadManager().openDownloadedFile(downloadId).fileDescriptor)
+    } catch (e: IOException) {
+      Log.w(TAG, e)
+      null
+    }
+  }
+
  private fun isDownloadSuccessful(context: Context, downloadId: Long): Boolean {
    val query = DownloadManager.Query().setFilterById(downloadId)
    val cursor = context.getDownloadManager().query(query)
@@ -31,7 +31,7 @@ fun Attachment.toAttachmentPointer(context: Context): AttachmentPointer? {
  }

  try {
-    val remoteId = SignalServiceAttachmentRemoteId.from(attachment.remoteLocation!!, attachment.cdn.cdnNumber)
+    val remoteId = SignalServiceAttachmentRemoteId.from(attachment.remoteLocation!!)

    var attachmentWidth = attachment.width
    var attachmentHeight = attachment.height
@@ -1,13 +1,9 @@
-/*
- * Copyright 2026 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.signal.core.models.database
+package org.thoughtcrime.securesms.attachments

 import android.os.Parcelable
 import com.fasterxml.jackson.annotation.JsonProperty
 import kotlinx.parcelize.Parcelize
+import org.signal.core.util.DatabaseId

@Parcelize
 data class AttachmentId(
@@ -41,16 +41,12 @@ enum class Cdn(private val value: Int) {
    }

    fun fromCdnNumber(cdnNumber: Int): Cdn {
-      return fromCdnNumberOrNull(cdnNumber) ?: throw UnsupportedOperationException("Invalid CDN number: $cdnNumber")
-    }
-
-    fun fromCdnNumberOrNull(cdnNumber: Int): Cdn? {
      return when (cdnNumber) {
        -1 -> S3
        0 -> CDN_0
        2 -> CDN_2
        3 -> CDN_3
-        else -> null
+        else -> throw UnsupportedOperationException("Invalid CDN number: $cdnNumber")
      }
    }
  }
@@ -4,7 +4,6 @@ import android.net.Uri
 import android.os.Parcel
 import androidx.core.os.ParcelCompat
 import org.signal.blurhash.BlurHash
-import org.signal.core.models.database.AttachmentId
 import org.signal.core.models.media.TransformProperties
 import org.signal.core.util.ParcelUtil
 import org.thoughtcrime.securesms.audio.AudioHash
@@ -5,7 +5,6 @@ import android.os.Parcel
 import androidx.annotation.VisibleForTesting
 import org.signal.blurhash.BlurHash
 import org.signal.core.util.Base64
-import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.database.AttachmentTable
 import org.thoughtcrime.securesms.stickers.StickerLocator
 import org.whispersystems.signalservice.api.InvalidMessageStructureException
@@ -77,8 +76,6 @@ class PointerAttachment : Attachment {
  override val thumbnailUri: Uri? = null

  companion object {
-    private val TAG = Log.tag(PointerAttachment::class)
-
    @JvmStatic
    fun forPointers(pointers: Optional<List<SignalServiceAttachment>>): List<Attachment> {
      if (!pointers.isPresent) {
@@ -105,13 +102,6 @@ class PointerAttachment : Attachment {
        return Optional.empty()
      }

-      val cdnNumber = pointer.get().asPointer().cdnNumber
-      val cdn = Cdn.fromCdnNumberOrNull(cdnNumber)
-      if (cdn == null) {
-        Log.w(TAG, "Encountered an attachment pointer with an unsupported CDN number ($cdnNumber). Skipping attachment.")
-        return Optional.empty()
-      }
-
      val encodedKey: String? = pointer.get().asPointer().key?.let { Base64.encodeWithPadding(it) }

      return Optional.of(
@@ -120,7 +110,7 @@ class PointerAttachment : Attachment {
          transferState = transferState,
          size = pointer.get().asPointer().size.orElse(0).toLong(),
          fileName = pointer.get().asPointer().fileName.orElse(null),
-          cdn = cdn,
+          cdn = Cdn.fromCdnNumber(pointer.get().asPointer().cdnNumber),
          location = pointer.get().asPointer().remoteId.toString(),
          key = encodedKey,
          iv = null,
@@ -155,13 +145,7 @@ class PointerAttachment : Attachment {
        return Optional.empty()
      }

-      val cdnNumber = thumbnail?.asPointer()?.cdnNumber ?: 0
-      val cdn = Cdn.fromCdnNumberOrNull(cdnNumber)
-      if (cdn == null) {
-        Log.w(TAG, "Encountered a quote thumbnail with an unsupported CDN number ($cdnNumber). Skipping attachment.")
-        return Optional.empty()
-      }
-
+      val cdn = Cdn.fromCdnNumber(thumbnail?.asPointer()?.cdnNumber ?: 0)
      if (cdn == Cdn.S3) {
        return Optional.empty()
      }
@@ -11,11 +11,10 @@ import androidx.annotation.Nullable;

 import org.signal.core.util.ThreadUtil;
 import org.signal.core.util.concurrent.SignalExecutors;
-import org.signal.core.util.contentproviders.BlobProvider;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.components.voice.VoiceNoteDraft;
-import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.notifications.v2.InChatNotificationSoundSuppressor;
+import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.util.MediaUtil;

 import java.io.IOException;
@@ -89,9 +88,9 @@ public class AudioRecorder {

        ParcelFileDescriptor fds[] = ParcelFileDescriptor.createPipe();

-        BlobProvider.BlobBuilder blobBuilder = AppDependencies.getBlobs()
-                                                              .forData(new ParcelFileDescriptor.AutoCloseInputStream(fds[0]), 0)
-                                                              .withMimeType(MediaUtil.AUDIO_AAC);
+        BlobProvider.BlobBuilder blobBuilder = BlobProvider.getInstance()
+                                                           .forData(new ParcelFileDescriptor.AutoCloseInputStream(fds[0]), 0)
+                                                           .withMimeType(MediaUtil.AUDIO_AAC);

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

@@ -7,9 +7,9 @@ import androidx.annotation.AnyThread
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.schedulers.Schedulers
 import io.reactivex.rxjava3.subjects.SingleSubject
-import org.signal.core.models.database.AttachmentId
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.attachments.Attachment
+import org.thoughtcrime.securesms.attachments.AttachmentId
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.databaseprotos.AudioWaveFormData
@@ -38,8 +38,8 @@ object AvatarPickerStorage {
      .getAllAvatars()
      .filterIsInstance<Avatar.Photo>()

-    val inDatabaseFileNames = photoAvatars.mapTo(mutableSetOf()) { PartAuthority.getAvatarPickerFilename(it.uri) }
-    val onDiskFileNames = avatarFiles.mapTo(mutableSetOf()) { it.name }
+    val inDatabaseFileNames = photoAvatars.map { PartAuthority.getAvatarPickerFilename(it.uri) }
+    val onDiskFileNames = avatarFiles.map { it.name }

    val inDatabaseButNotOnDisk = inDatabaseFileNames - onDiskFileNames
    val onDiskButNotInDatabase = onDiskFileNames - inDatabaseFileNames
@@ -11,9 +11,9 @@ import androidx.appcompat.content.res.AppCompatResources
 import com.airbnb.lottie.SimpleColorFilter
 import org.signal.core.models.media.Media
 import org.signal.core.util.concurrent.SignalExecutors
-import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.mms.PartAuthority
 import org.thoughtcrime.securesms.profiles.AvatarHelper
+import org.thoughtcrime.securesms.providers.BlobProvider
 import org.thoughtcrime.securesms.util.MediaUtil
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
@@ -80,7 +80,7 @@ object AvatarRenderer {

  private fun renderPhoto(context: Context, avatar: Avatar.Photo, onAvatarRendered: (Media) -> Unit) {
    SignalExecutors.BOUNDED.execute {
-      val blob = AppDependencies.blobs
+      val blob = BlobProvider.getInstance()
        .forData(AvatarPickerStorage.read(context, PartAuthority.getAvatarPickerFilename(avatar.uri)), avatar.size)
        .createForSingleSessionOnDisk(context)

@@ -124,7 +124,7 @@ object AvatarRenderer {

      val bytes = outStream.toByteArray()
      val inStream = ByteArrayInputStream(bytes)
-      val uri = AppDependencies.blobs.forData(inStream, bytes.size.toLong()).createForSingleSessionOnDisk(context)
+      val uri = BlobProvider.getInstance().forData(inStream, bytes.size.toLong()).createForSingleSessionOnDisk(context)

      onAvatarRendered(createMedia(uri, bytes.size.toLong()))
    }
@@ -11,7 +11,7 @@ import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.avatar.AvatarBundler
 import org.thoughtcrime.securesms.avatar.AvatarPickerStorage
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.providers.BlobProvider
 import org.thoughtcrime.securesms.scribbles.ImageEditorFragment

 class PhotoEditorFragment : Fragment(R.layout.avatar_photo_editor_fragment), ImageEditorFragment.Controller {
@@ -39,15 +39,15 @@ class PhotoEditorFragment : Fragment(R.layout.avatar_photo_editor_fragment), Ima

    SignalExecutors.BOUNDED.execute {
      val editedImageUri = imageEditorFragment.renderToSingleUseBlob()
-      val size = AppDependencies.blobs.getFileSize(editedImageUri) ?: 0
-      val inputStream = AppDependencies.blobs.getStream(applicationContext, editedImageUri)
+      val size = BlobProvider.getFileSize(editedImageUri) ?: 0
+      val inputStream = BlobProvider.getInstance().getStream(applicationContext, editedImageUri)
      val onDiskUri = AvatarPickerStorage.save(applicationContext, inputStream)
      val photo = AvatarBundler.extractPhoto(args.photoAvatar)
      val database = SignalDatabase.avatarPicker
      val newPhoto = photo.copy(uri = onDiskUri, size = size)

      database.update(newPhoto)
-      AppDependencies.blobs.delete(requireContext(), photo.uri)
+      BlobProvider.getInstance().delete(requireContext(), photo.uri)

      ThreadUtil.runOnMain {
        setFragmentResult(REQUEST_KEY_EDIT, AvatarBundler.bundlePhoto(newPhoto))
@@ -1,11 +1,13 @@
 package org.thoughtcrime.securesms.avatar.picker

+import android.Manifest
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.view.Gravity
 import android.view.View
 import android.widget.PopupMenu
+import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.Fragment
@@ -13,14 +15,10 @@ 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
@@ -32,11 +30,12 @@ import org.thoughtcrime.securesms.avatar.vector.VectorAvatarCreationFragment
 import org.thoughtcrime.securesms.components.ButtonStripItemView
 import org.thoughtcrime.securesms.components.recyclerview.GridDividerDecoration
 import org.thoughtcrime.securesms.mediasend.AvatarSelectionActivity
+import org.thoughtcrime.securesms.mediasend.camerax.CameraXRemoteConfig
 import org.thoughtcrime.securesms.util.ViewUtil
 import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 import org.thoughtcrime.securesms.util.navigation.safeNavigate
-import org.thoughtcrime.securesms.util.padding
 import org.thoughtcrime.securesms.util.visible
+import org.signal.core.ui.R as CoreUiR

 /**
 * Primary Avatar picker fragment, displays current user avatar and a list of recently used avatars and defaults.
@@ -70,25 +69,8 @@ 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(spanCount, ViewUtil.dpToPx(16)))
-    recycler.padding(
-      left = recyclerPadding,
-      right = recyclerPadding
-    )
-
-    val gridLayoutManager: GridLayoutManager = recycler.layoutManager as GridLayoutManager
-    gridLayoutManager.spanCount = spanCount
+    recycler.addItemDecoration(GridDividerDecoration(4, ViewUtil.dpToPx(16)))

    val adapter = MappingAdapter()
    AvatarPickerItem.register(adapter, this::onAvatarClick, this::onAvatarLongClick)
@@ -241,8 +223,22 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) {

  @Suppress("DEPRECATION")
  private fun openCameraCapture() {
-    val intent = AvatarSelectionActivity.getIntentForCameraCapture(requireContext())
-    startActivityForResult(intent, REQUEST_CODE_SELECT_IMAGE)
+    if (CameraXRemoteConfig.isSupported()) {
+      val intent = AvatarSelectionActivity.getIntentForCameraCapture(requireContext())
+      startActivityForResult(intent, REQUEST_CODE_SELECT_IMAGE)
+    } else {
+      Permissions.with(this)
+        .request(Manifest.permission.CAMERA)
+        .ifNecessary()
+        .onAllGranted {
+          val intent = AvatarSelectionActivity.getIntentForCameraCapture(requireContext())
+          startActivityForResult(intent, REQUEST_CODE_SELECT_IMAGE)
+        }
+        .withRationaleDialog(getString(R.string.CameraXFragment_allow_access_camera), getString(R.string.CameraXFragment_to_capture_photos_allow_camera), CoreUiR.drawable.symbol_camera_24)
+        .withPermanentDenialDialog(getString(R.string.AvatarSelectionBottomSheetDialogFragment__taking_a_photo_requires_the_camera_permission), null, R.string.CameraXFragment_allow_access_camera, R.string.CameraXFragment_to_capture_photos, getParentFragmentManager())
+        .onAnyDenied { Toast.makeText(requireContext(), R.string.AvatarSelectionBottomSheetDialogFragment__taking_a_photo_requires_the_camera_permission, Toast.LENGTH_SHORT).show() }
+        .execute()
+    }
  }

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

 import androidx.annotation.WorkerThread
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.SharedFlow
-import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.onStart
-import kotlinx.coroutines.flow.shareIn
 import kotlinx.coroutines.withContext
-import org.signal.core.models.database.AttachmentId
 import org.signal.core.util.bytes
 import org.signal.core.util.logging.Log
 import org.signal.core.util.throttleLatest
 import org.thoughtcrime.securesms.BuildConfig
+import org.thoughtcrime.securesms.attachments.AttachmentId
 import org.thoughtcrime.securesms.backup.v2.BackupRepository
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.dependencies.AppDependencies
@@ -50,8 +46,6 @@ object ArchiveUploadProgress {

  private val TAG = Log.tag(ArchiveUploadProgress::class)

-  private val scope = CoroutineScope(Dispatchers.Default + SupervisorJob())
-
  private val _progress: MutableSharedFlow<Unit> = MutableSharedFlow(replay = 1)

  private var uploadProgress: ArchiveUploadProgressState = SignalStore.backup.archiveUploadState ?: ArchiveUploadProgressState(
@@ -67,7 +61,7 @@ object ArchiveUploadProgress {
  /**
   * Observe this to get updates on the current upload progress.
   */
-  val progress: SharedFlow<ArchiveUploadProgressState> = _progress
+  val progress: Flow<ArchiveUploadProgressState> = _progress
    .throttleLatest(500.milliseconds) {
      uploadProgress.state == ArchiveUploadProgressState.State.None ||
        (uploadProgress.state == ArchiveUploadProgressState.State.UploadBackupFile && uploadProgress.backupFileUploadedBytes == 0L) ||
@@ -119,12 +113,7 @@ object ArchiveUploadProgress {
      updateState(notify = false) { updated }
    }
    .onStart { emit(uploadProgress) }
-    .flowOn(Dispatchers.Default)
-    .shareIn(scope, SharingStarted.Eagerly, replay = 1)
-
-  init {
-    _progress.tryEmit(Unit)
-  }
+    .flowOn(Dispatchers.IO)

  val inProgress
    get() = uploadProgress.state != ArchiveUploadProgressState.State.None && uploadProgress.state != ArchiveUploadProgressState.State.UserCanceled
@@ -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(org.signal.core.ui.R.drawable.ic_signal_backup)
+                                                                  .setSmallIcon(R.drawable.ic_signal_backup)
                                                                  .setContentTitle(context.getString(titleId))
                                                                  .setContentText(context.getString(messageId))
                                                                  .setStyle(new NotificationCompat.BigTextStyle().bigText(context.getString(messageId)))
@@ -11,7 +11,7 @@ import org.signal.core.util.Conversions;
 import org.signal.core.util.logging.Log;
 import org.signal.libsignal.protocol.kdf.HKDF;
 import org.signal.libsignal.protocol.util.ByteUtil;
-import org.signal.core.models.database.AttachmentId;
+import org.thoughtcrime.securesms.attachments.AttachmentId;
 import org.thoughtcrime.securesms.backup.proto.Attachment;
 import org.thoughtcrime.securesms.backup.proto.Avatar;
 import org.thoughtcrime.securesms.backup.proto.BackupFrame;
@@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

 import org.signal.core.util.logging.Log;
-import org.signal.core.util.crypto.KeyStoreHelper;
+import org.thoughtcrime.securesms.crypto.KeyStoreHelper;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;

 /**
@@ -19,13 +19,13 @@ import org.signal.core.util.SetUtil;
 import org.signal.core.util.SqlUtil;
 import org.signal.core.util.Stopwatch;
 import org.signal.core.util.logging.Log;
-import org.signal.core.models.database.AttachmentId;
+import org.thoughtcrime.securesms.attachments.AttachmentId;
 import org.thoughtcrime.securesms.backup.proto.KeyValue;
 import org.thoughtcrime.securesms.backup.proto.SharedPreference;
 import org.thoughtcrime.securesms.backup.proto.SqlStatement;
-import org.signal.core.util.crypto.AttachmentSecret;
-import org.signal.core.util.crypto.ClassicDecryptingPartInputStream;
-import org.signal.core.util.crypto.ModernDecryptingPartInputStream;
+import org.thoughtcrime.securesms.crypto.AttachmentSecret;
+import org.thoughtcrime.securesms.crypto.ClassicDecryptingPartInputStream;
+import org.thoughtcrime.securesms.crypto.ModernDecryptingPartInputStream;
 import org.thoughtcrime.securesms.database.AttachmentTable;
 import org.thoughtcrime.securesms.database.BackupMediaSnapshotTable;
 import org.thoughtcrime.securesms.database.EmojiSearchTable;
@@ -24,8 +24,8 @@ import org.thoughtcrime.securesms.backup.proto.KeyValue;
 import org.thoughtcrime.securesms.backup.proto.SharedPreference;
 import org.thoughtcrime.securesms.backup.proto.SqlStatement;
 import org.thoughtcrime.securesms.backup.proto.Sticker;
-import org.signal.core.util.crypto.AttachmentSecret;
-import org.signal.core.util.crypto.ModernEncryptingPartOutputStream;
+import org.thoughtcrime.securesms.crypto.AttachmentSecret;
+import org.thoughtcrime.securesms.crypto.ModernEncryptingPartOutputStream;
 import org.thoughtcrime.securesms.database.AttachmentTable;
 import org.thoughtcrime.securesms.database.EmojiSearchTable;
 import org.thoughtcrime.securesms.database.KeyValueDatabase;
@@ -16,13 +16,13 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.update
-import org.signal.core.models.database.AttachmentId
 import org.signal.core.util.bytes
 import org.signal.core.util.concurrent.SignalExecutors
 import org.signal.core.util.logging.Log
 import org.signal.core.util.safeUnregisterReceiver
 import org.signal.core.util.throttleLatest
 import org.thoughtcrime.securesms.BuildConfig
+import org.thoughtcrime.securesms.attachments.AttachmentId
 import org.thoughtcrime.securesms.backup.RestoreState
 import org.thoughtcrime.securesms.database.DatabaseObserver
 import org.thoughtcrime.securesms.database.SignalDatabase
@@ -31,9 +31,6 @@ import org.thoughtcrime.securesms.jobmanager.impl.BatteryNotLowConstraint
 import org.thoughtcrime.securesms.jobmanager.impl.DiskSpaceNotLowConstraint
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint
 import org.thoughtcrime.securesms.jobmanager.impl.WifiConstraint
-import org.thoughtcrime.securesms.jobs.CheckRestoreMediaLeftJob
-import org.thoughtcrime.securesms.jobs.RestoreAttachmentJob
-import org.thoughtcrime.securesms.jobs.RestoreLocalAttachmentJob
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.AtomicInteger
@@ -82,7 +79,7 @@ object ArchiveRestoreProgress {
  val stateFlow: Flow<ArchiveRestoreProgressState> = store
    .throttleLatest(1.seconds)
    .distinctUntilChanged()
-    .flowOn(Dispatchers.Default)
+    .flowOn(Dispatchers.IO)

  init {
    SignalExecutors.BOUNDED.execute { update() }
@@ -160,22 +157,6 @@ object ArchiveRestoreProgress {
    update()
  }

-  /**
-   * Self-heal hook for restores that appear active (banner showing, media still remaining) but have no jobs left actually working on them.
-   */
-  fun checkForStalledRestore() {
-    SignalExecutors.BOUNDED.execute {
-      val stalled = SignalStore.backup.restoreState.isMediaRestoreOperation &&
-        SignalDatabase.attachments.getRemainingRestorableAttachmentSize() > 0L &&
-        AppDependencies.jobManager.areFactoriesEmpty(setOf(RestoreAttachmentJob.KEY, RestoreLocalAttachmentJob.KEY, CheckRestoreMediaLeftJob.KEY))
-
-      if (stalled) {
-        Log.w(TAG, "Detected a stalled media restore with no active jobs. Enqueueing a check job to recover.")
-        CheckRestoreMediaLeftJob.enqueueStalledRecoveryCheck()
-      }
-    }
-  }
-
  fun clearLocalRestoreDirectoryError() {
    SignalStore.backup.localRestoreDirectoryError = false
    update()
@@ -34,7 +34,6 @@ import org.signal.core.models.backup.BackupId
 import org.signal.core.models.backup.MediaName
 import org.signal.core.models.backup.MediaRootBackupKey
 import org.signal.core.models.backup.MessageBackupKey
-import org.signal.core.models.database.AttachmentId
 import org.signal.core.util.Base64
 import org.signal.core.util.Base64.decodeBase64OrThrow
 import org.signal.core.util.CursorUtil
@@ -47,7 +46,6 @@ import org.signal.core.util.bytes
 import org.signal.core.util.concurrent.LimitedWorker
 import org.signal.core.util.concurrent.SignalDispatchers
 import org.signal.core.util.concurrent.SignalExecutors
-import org.signal.core.util.crypto.AttachmentSecretProvider
 import org.signal.core.util.decodeOrNull
 import org.signal.core.util.forceForeignKeyConstraintsEnabled
 import org.signal.core.util.fullWalCheckpoint
@@ -74,7 +72,9 @@ import org.signal.network.NetworkResult
 import org.signal.network.StatusCodeErrorAction
 import org.signal.network.api.SvrBApi
 import org.signal.network.exceptions.NonSuccessfulResponseCodeException
+import org.signal.network.rest.toNetworkResult
 import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.attachments.AttachmentId
 import org.thoughtcrime.securesms.attachments.Cdn
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment
 import org.thoughtcrime.securesms.backup.ArchiveUploadProgress
@@ -94,7 +94,7 @@ import org.thoughtcrime.securesms.backup.v2.ui.BackupAlert
 import org.thoughtcrime.securesms.backup.v2.ui.subscription.MessageBackupsType
 import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
 import org.thoughtcrime.securesms.components.settings.app.subscription.RecurringInAppPaymentRepository
-import org.thoughtcrime.securesms.crypto.AppAttachmentSecretStore
+import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider
 import org.thoughtcrime.securesms.crypto.DatabaseSecretProvider
 import org.thoughtcrime.securesms.database.AttachmentTable
 import org.thoughtcrime.securesms.database.BackupMediaSnapshotTable.ArchiveMediaItem
@@ -102,7 +102,6 @@ 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
@@ -142,6 +141,7 @@ import org.thoughtcrime.securesms.logsubmit.SubmitDebugLogRepository
 import org.thoughtcrime.securesms.net.SignalNetwork
 import org.thoughtcrime.securesms.notifications.NotificationChannels
 import org.thoughtcrime.securesms.notifications.NotificationIds
+import org.thoughtcrime.securesms.providers.BlobProvider
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.service.BackupMediaRestoreService
@@ -185,7 +185,6 @@ 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 {

@@ -648,7 +647,7 @@ object BackupRepository {
    val state = SignalStore.backup.backupDownloadNotifierState ?: return null
    val nextSheetDisplayTime = state.lastSheetDisplaySeconds.seconds + state.intervalSeconds.seconds

-    val remainingAttachmentSize = withContext(SignalDispatchers.Default) {
+    val remainingAttachmentSize = withContext(SignalDispatchers.IO) {
      SignalDatabase.attachments.getRemainingRestorableAttachmentSize()
    }

@@ -719,7 +718,7 @@ object BackupRepository {
      SignalDatabase(
        context = context,
        databaseSecret = DatabaseSecretProvider.getOrCreateDatabaseSecret(context),
-        attachmentSecret = AttachmentSecretProvider.getInstance(context, AppAttachmentSecretStore).getOrCreateAttachmentSecret(),
+        attachmentSecret = AttachmentSecretProvider.getInstance(context).getOrCreateAttachmentSecret(),
        name = "$baseName.db"
      )
    }
@@ -1128,7 +1127,7 @@ object BackupRepository {
    }

    return frameReader.use { reader ->
-      import(reader, selfData, backupMode = BackupMode.LOCAL, cancellationSignal = { false })
+      import(reader, selfData, cancellationSignal = { false })
    }
  }

@@ -1159,7 +1158,7 @@ object BackupRepository {
      }

      return frameReader.use { reader ->
-        import(reader, selfData, backupMode = BackupMode.REMOTE, cancellationSignal = cancellationSignal)
+        import(reader, selfData, cancellationSignal)
      }
    } catch (e: IOException) {
      Log.w(TAG, "Unable to restore signal backup", e)
@@ -1187,7 +1186,7 @@ object BackupRepository {
    )

    return frameReader.use { reader ->
-      import(reader, selfData, backupMode = BackupMode.LINK_SYNC, cancellationSignal = cancellationSignal)
+      import(reader, selfData, cancellationSignal)
    }
  }

@@ -1213,7 +1212,7 @@ object BackupRepository {
    }

    return frameReader.use { reader ->
-      import(reader, selfData, backupMode = BackupMode.REMOTE, cancellationSignal = cancellationSignal)
+      import(reader, selfData, cancellationSignal)
    }
  }

@@ -1229,14 +1228,13 @@ object BackupRepository {
    val frameReader = PlainTextBackupReader(inputStreamFactory(), length)

    return frameReader.use { reader ->
-      import(reader, selfData, backupMode = BackupMode.PLAINTEXT_EXPORT, cancellationSignal = cancellationSignal)
+      import(reader, selfData, cancellationSignal)
    }
  }

  private fun import(
    frameReader: BackupImportReader,
    selfData: SelfData,
-    backupMode: BackupMode,
    cancellationSignal: () -> Boolean
  ): ImportResult {
    val stopwatch = Stopwatch("import")
@@ -1253,7 +1251,6 @@ object BackupRepository {
      return ImportResult.Failure
    }
    SignalStore.backup.hasInvalidBackupVersion = false
-    val selfId: RecipientId

    var transactionSuccessful = false
    try {
@@ -1294,16 +1291,7 @@ object BackupRepository {
      }

      Log.d(TAG, "[import] --- Recreating all tables ---")
-      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 skipTables = setOf(KyberPreKeyTable.TABLE_NAME, OneTimePreKeyTable.TABLE_NAME, SignedPreKeyTable.TABLE_NAME)
      val tableMetadata = SignalDatabase.rawDatabase.getAllTableDefinitions().filter { !it.name.startsWith(SearchTable.FTS_TABLE_NAME + "_") }
      for (table in tableMetadata) {
        if (skipTables.contains(table.name)) {
@@ -1334,7 +1322,7 @@ object BackupRepository {
      SignalStore.backup.mediaRootBackupKey = mediaRootBackupKey

      // Add back self after clearing data
-      selfId = SignalDatabase.recipients.getAndPossiblyMerge(selfData.aci, selfData.pni, selfData.e164, pniVerified = true, changeSelf = true)
+      val selfId: RecipientId = SignalDatabase.recipients.getAndPossiblyMerge(selfData.aci, selfData.pni, selfData.e164, pniVerified = true, changeSelf = true)
      SignalDatabase.recipients.setProfileKey(selfId, selfData.profileKey)
      SignalDatabase.recipients.setProfileSharing(selfId, true)

@@ -1477,7 +1465,6 @@ object BackupRepository {
    }

    SignalDatabase.remappedRecords.clearCache()
-    SignalDatabase.remappedRecords.trimStaleMappings()
    AppDependencies.recipientCache.clear()
    AppDependencies.recipientCache.warmUp()
    SignalDatabase.threads.clearCache()
@@ -1545,7 +1532,7 @@ object BackupRepository {
    Log.d(TAG, "[import] Finished! ${eventTimer.stop().summary}")
    stopwatch.stop(TAG)

-    return ImportResult.Success(backupTime = header.backupTimeMs, selfRecipientId = selfId)
+    return ImportResult.Success(backupTime = header.backupTimeMs)
  }

  fun listRemoteMediaObjects(limit: Int, cursor: String? = null): NetworkResult<ArchiveGetMediaItemsResponse> {
@@ -1676,19 +1663,6 @@ 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.
   */
@@ -2261,7 +2235,7 @@ object BackupRepository {
    }

    Log.i(TAG, "[remoteRestore] Downloading backup")
-    val tempBackupFile = AppDependencies.blobs.forNonAutoEncryptingSingleSessionOnDisk(AppDependencies.application)
+    val tempBackupFile = BlobProvider.getInstance().forNonAutoEncryptingSingleSessionOnDisk(AppDependencies.application)
    when (val result = downloadBackupFile(tempBackupFile, progressListener)) {
      is NetworkResult.Success -> Log.i(TAG, "[remoteRestore] Download successful")
      else -> {
@@ -2336,30 +2310,26 @@ object BackupRepository {
      forwardSecrecyToken = forwardSecrecyToken,
      cancellationSignal = cancellationSignal
    )
-
-    return when (result) {
-      is ImportResult.Failure -> {
-        Log.w(TAG, "[remoteRestore] Failed to import backup")
-        RemoteRestoreResult.Failure
-      }
-
-      is ImportResult.Success -> {
-        Log.i(TAG, "[remoteRestore] Restore successful")
-        BackupMediaRestoreService.resetTimeout()
-        AppDependencies.jobManager.add(BackupRestoreMediaJob())
-        RemoteRestoreResult.Success(result.selfRecipientId)
-      }
+    if (result == ImportResult.Failure) {
+      Log.w(TAG, "[remoteRestore] Failed to import backup")
+      return RemoteRestoreResult.Failure
    }
+
+    BackupMediaRestoreService.resetTimeout()
+    AppDependencies.jobManager.add(BackupRestoreMediaJob())
+
+    Log.i(TAG, "[remoteRestore] Restore successful")
+    return RemoteRestoreResult.Success
  }

-  suspend fun restoreLinkAndSyncBackup(response: TransferArchiveResponse, ephemeralBackupKey: MessageBackupKey): RemoteRestoreResult {
+  suspend fun restoreLinkAndSyncBackup(response: TransferArchiveResponse, ephemeralBackupKey: MessageBackupKey) {
    val context = AppDependencies.application
    ArchiveRestoreProgress.onRestorePending()

    try {
      DataRestoreConstraint.isRestoringData = true
      return withContext(Dispatchers.IO) {
-        return@withContext BackupProgressService.start(context, context.getString(RegistrationR.string.MessageSyncScreen__syncing_messages)).use {
+        return@withContext BackupProgressService.start(context, context.getString(R.string.BackupProgressService_title)).use {
          restoreLinkAndSyncBackup(response, ephemeralBackupKey, controller = it, cancellationSignal = { !isActive })
        }
      }
@@ -2374,7 +2344,7 @@ object BackupRepository {
    val progressListener = object : ProgressListener {
      override fun onAttachmentProgress(progress: AttachmentTransferProgress) {
        controller.update(
-          title = AppDependencies.application.getString(RegistrationR.string.MessageSyncScreen__syncing_messages),
+          title = AppDependencies.application.getString(R.string.BackupProgressService_title_downloading),
          progress = progress.value,
          indeterminate = false
        )
@@ -2384,16 +2354,9 @@ object BackupRepository {
      override fun shouldCancel() = cancellationSignal()
    }

-    val cdn = response.cdn
-    val key = response.key
-    if (cdn == null || key == null) {
-      Log.w(TAG, "[restoreLinkAndSyncBackup] Response has no archive location (error=${response.error}); nothing to download.")
-      return RemoteRestoreResult.Failure
-    }
-
    Log.i(TAG, "[restoreLinkAndSyncBackup] Downloading backup")
-    val tempBackupFile = AppDependencies.blobs.forNonAutoEncryptingSingleSessionOnDisk(AppDependencies.application)
-    when (val result = AppDependencies.signalServiceMessageReceiver.retrieveLinkAndSyncBackup(cdn, key, tempBackupFile, progressListener)) {
+    val tempBackupFile = BlobProvider.getInstance().forNonAutoEncryptingSingleSessionOnDisk(AppDependencies.application)
+    when (val result = AppDependencies.signalServiceMessageReceiver.retrieveLinkAndSyncBackup(response.cdn, response.key, tempBackupFile, progressListener)) {
      is NetworkResult.Success -> Log.i(TAG, "[restoreLinkAndSyncBackup] Download successful")
      else -> {
        Log.w(TAG, "[restoreLinkAndSyncBackup] Failed to download backup file", result.getCause())
@@ -2406,7 +2369,7 @@ object BackupRepository {
    }

    controller.update(
-      title = AppDependencies.application.getString(RegistrationR.string.MessageSyncScreen__syncing_messages),
+      title = AppDependencies.application.getString(R.string.BackupProgressService_title),
      progress = 0f,
      indeterminate = true
    )
@@ -2422,19 +2385,16 @@ object BackupRepository {
      cancellationSignal = cancellationSignal
    )

-    return when (result) {
-      is ImportResult.Failure -> {
-        Log.w(TAG, "[restoreLinkAndSyncBackup] Failed to import backup")
-        RemoteRestoreResult.Failure
-      }
-
-      is ImportResult.Success -> {
-        Log.i(TAG, "[restoreLinkAndSyncBackup] Restore successful")
-        BackupMediaRestoreService.resetTimeout()
-        AppDependencies.jobManager.add(BackupRestoreMediaJob())
-        RemoteRestoreResult.Success(result.selfRecipientId)
-      }
+    if (result == ImportResult.Failure) {
+      Log.w(TAG, "[restoreLinkAndSyncBackup] Failed to import backup")
+      return RemoteRestoreResult.Failure
    }
+
+    BackupMediaRestoreService.resetTimeout()
+    AppDependencies.jobManager.add(BackupRestoreMediaJob())
+
+    Log.i(TAG, "[restoreLinkAndSyncBackup] Restore successful")
+    return RemoteRestoreResult.Success
  }

  private fun buildDebugInfo(): ByteString {
@@ -2564,12 +2524,12 @@ data class StagedBackupKeyRotations(
 )

 sealed class ImportResult {
-  data class Success(val backupTime: Long, val selfRecipientId: RecipientId) : ImportResult()
+  data class Success(val backupTime: Long) : ImportResult()
  data object Failure : ImportResult()
 }

 sealed interface RemoteRestoreResult {
-  data class Success(val selfRecipientId: RecipientId) : RemoteRestoreResult
+  data object Success : RemoteRestoreResult
  data object NetworkError : RemoteRestoreResult
  data object Canceled : RemoteRestoreResult
  data object Failure : RemoteRestoreResult
@@ -2598,9 +2558,6 @@ enum class BackupMode {

  val isLocalBackup: Boolean
    get() = this == LOCAL
-
-  val isPlaintextExport: Boolean
-    get() = this == PLAINTEXT_EXPORT
 }

 /**
--- a/Show More
+++ b/Show More