Bump version to 8.4.2

Update website variant manifest.
2026-06-13 10:46:04 +01:00 · 2026-03-30 12:51:59 -04:00 · 2026-03-30 12:51:17 -04:00
2718 changed files with 70165 additions and 178102 deletions
@@ -20,7 +20,6 @@ ktlint_standard_unnecessary-parentheses-before-trailing-lambda = disabled
 ktlint_standard_value-parameter-comment = disabled
 ktlint_standard_class-signature = disabled
 ktlint_standard_function-expression-body = disabled
-ktlint_standard_blank-line-between-when-conditions = disabled

 # Disable ktlint on generated source code, see
 # https://github.com/JLLeitschuh/ktlint-gradle/issues/746
@@ -17,7 +17,7 @@ body:
      label: "Guidelines"
      description: "Search issues here: https://github.com/signalapp/Signal-Android/issues/?q=is%3Aissue+"
      options:
-        - label: I have searched open and closed issues for duplicates
+        - label: I have searched searched open and closed issues for duplicates
          required: true
        - label: I am submitting a bug report for existing functionality that does not work as intended
          required: true
@@ -1,27 +0,0 @@
-version: 2
-updates:
-  # Automatically keep GitHub Actions SHA-pinned to the latest commit SHAs.
-  # Dependabot will update both the SHA and the inline version comment (e.g. # v6)
-  # while leaving any extra documentation comments intact.
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-      day: "monday"
-    labels:
-      - "dependencies"
-    commit-message:
-      prefix: "ci"
-    groups:
-      actions:
-        patterns:
-          - "actions/*"
-      gradle-actions:
-        patterns:
-          - "gradle/*"
-      peter-evans:
-        patterns:
-          - "peter-evans/*"
-      usefulness:
-        patterns:
-          - "usefulness/*"
@@ -0,0 +1,23 @@
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 60
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 7
+
+issues:
+  exemptLabels:
+    - acknowledged
+
+# Comment to post when marking as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+
+# Comment to post when closing a stale Issue or Pull Request.
+closeComment: >
+  This issue has been closed due to inactivity.
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 1
@@ -5,7 +5,7 @@ on:
  push:
    branches:
    - 'main'
-    - '8.**'
+    - '7.**'

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

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

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

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

-    - name: Set up Gradle
-      uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # 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 (ci); pushes to main / 8.x branches run the full
-    # Android lint (qa).
    - name: Build with Gradle
-      env:
-        SIGNAL_BUILD_CACHE_URL: ${{ secrets.SIGNAL_BUILD_CACHE_URL }}
-        SIGNAL_BUILD_CACHE_USER: ${{ secrets.SIGNAL_BUILD_CACHE_USER }}
-        SIGNAL_BUILD_CACHE_PASSWORD: ${{ secrets.SIGNAL_BUILD_CACHE_PASSWORD }}
-        SIGNAL_BUILD_CACHE_PUSH: ${{ startsWith(github.ref, 'refs/heads/8.') }}
-      run: ./gradlew ${{ github.event_name == 'pull_request' && 'ci' || 'qa' }}
+      run: ./gradlew qa

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

    - name: set up JDK 17
-      uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
-      # gh api repos/actions/setup-java/commits/v5 --jq '.sha'
+      uses: actions/setup-java@v3
      with:
        distribution: temurin
        java-version: 17
-
-    - name: Set up Gradle
-      uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # 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 }}
+        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@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6
-      # gh api repos/gradle/actions/commits/v6 --jq '.sha'
+      uses: gradle/actions/wrapper-validation@v5

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

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

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

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

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

-    - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-      # gh api repos/actions/upload-artifact/commits/v7 --jq '.sha'
+    - uses: actions/upload-artifact@v4
      with:
        name: diffuse-output
        path: ${{ steps.diffuse.outputs.diff-file }}
@@ -11,8 +11,7 @@ jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
-        # gh api repos/actions/checkout/commits/v6 --jq '.sha'
+      - uses: actions/checkout@v6
      - name: Build image
        run: |
          cd reproducible-builds
@@ -1,38 +0,0 @@
-name: Mark stale issues and PRs
-
-on:
-  schedule:
-    - cron: '0 2 * * *'  # daily at 02:00 UTC
-  workflow_dispatch:
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      pull-requests: write
-      actions: write
-
-    steps:
-      - uses: actions/stale@eb5cf3af3ac0a1aa4c9c45633dd1ae542a27a899 # v10
-        # gh api repos/actions/stale/commits/v10 --jq '.sha'
-        with:
-          days-before-stale: 60
-          days-before-close: 7
-          exempt-issue-labels: 'acknowledged'
-          exempt-pr-labels: 'acknowledged'
-          stale-issue-label: 'wontfix'
-          stale-pr-label: 'wontfix'
-          stale-issue-message: >
-            This issue has been automatically marked as stale because it has not had
-            recent activity. It will be closed if no further activity occurs. Thank you
-            for your contributions!
-          stale-pr-message: >
-            This pull request has been automatically marked as stale because it has not had
-            recent activity. It will be closed if no further activity occurs. Thank you
-            for your contributions!
-          close-issue-message: >
-            This issue has been closed due to inactivity.
-          close-pr-message: >
-            This pull request has been closed due to inactivity.
-          operations-per-run: 150
@@ -1,6 +1,6 @@
 # Signal Android

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

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

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

 ## License

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

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

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

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

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

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

-val canonicalVersionCode = 1706
-val canonicalVersionName = "8.15.2"
-val currentHotfixVersion = 0
+val canonicalVersionCode = 1670
+val canonicalVersionName = "8.4.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
 val possibleHotfixVersions = (0 until maxHotfixVersions).toList().filter { it % 10 != 0 }

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

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

@@ -56,11 +53,6 @@ val localProperties: Properties? = if (localPropertiesFile.exists()) {
 val quickstartCredentialsDir: String? = localProperties?.getProperty("quickstart.credentials.dir")
 val benchmarkBackupFile: String? = localProperties?.getProperty("benchmark.backup.file")

-val isInstrumentationTestRun = gradle.startParameter.taskNames.any { taskName ->
-  val lower = taskName.lowercase()
-  lower.contains("androidtest") || lower.contains("connectedcheck")
-}
-
 val selectableVariants = listOf(
  "nightlyProdSpinner",
  "nightlyProdPerf",
@@ -73,11 +65,13 @@ val selectableVariants = listOf(
  "playProdMocked",
  "playProdNonMinifiedMocked",
  "playProdBenchmark",
+  "playProdInstrumentation",
  "playProdRelease",
  "playStagingDebug",
  "playStagingCanary",
  "playStagingSpinner",
  "playStagingPerf",
+  "playStagingInstrumentation",
  "playStagingRelease",
  "playProdQuickstart",
  "playStagingQuickstart",
@@ -87,27 +81,6 @@ val selectableVariants = listOf(
  "githubProdRelease"
 )

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

  protoPath {
    srcDir("${project.rootDir}/lib/libsignal-service/src/main/protowire")
-    srcDir("${project.rootDir}/lib/archive/src/main/protowire")
  }
+  // Handled by libsignal
+  prune("signalservice.DecryptionErrorMessage")
 }

 ktlint {
@@ -131,14 +105,21 @@ android {
  namespace = "org.thoughtcrime.securesms"

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

  flavorDimensions += listOf("distribution", "environment")
+  testBuildType = "instrumentation"

  android.bundle.language.enableSplit = false

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

    managedDevices {
-      localDevices {
-        create("pixel3api30") {
+      devices {
+        create<ManagedVirtualDevice>("pixel3api30") {
          device = "Pixel 3"
          apiLevel = 30
          systemImageSource = "google-atd"
@@ -173,7 +154,6 @@ android {

    getByName("androidTest") {
      java.srcDir("$projectDir/src/testShared")
-      java.srcDir("$projectDir/src/benchmarkShared/java")
    }
  }

@@ -214,6 +194,10 @@ android {
    compose = true
  }

+  composeOptions {
+    kotlinCompilerExtensionVersion = "1.5.4"
+  }
+
  defaultConfig {
    if (currentHotfixVersion >= maxHotfixVersions) {
      throw AssertionError("Hotfix version offset is too large!")
@@ -221,10 +205,6 @@ android {
    versionCode = (canonicalVersionCode * maxHotfixVersions) + possibleHotfixVersions[currentHotfixVersion]
    versionName = canonicalVersionName

-    if (isInstrumentationTestRun) {
-      applicationIdSuffix = ".test_run"
-    }
-
    minSdk = libs.versions.minSdk.get().toInt()
    targetSdk = libs.versions.targetSdk.get().toInt()

@@ -259,8 +239,8 @@ android {
    buildConfigField("String[]", "SIGNAL_CDSI_IPS", rootProject.extra["cdsi_ips"] as String)
    buildConfigField("String[]", "SIGNAL_SVR2_IPS", rootProject.extra["svr2_ips"] as String)
    buildConfigField("String", "SIGNAL_AGENT", "\"OWA\"")
-    buildConfigField("String", "SVR2_MRENCLAVE_LEGACY", "\"1240acbd4aa26974184844c8a46b1022d3957ac8a76c1fd8f5b1a15141ee0708\"")
-    buildConfigField("String", "SVR2_MRENCLAVE", "\"ced8217b26228e4b210c985786999d095c4958a94faf37b14acaf25c4cbb02a4\"")
+    buildConfigField("String", "SVR2_MRENCLAVE_LEGACY", "\"29cd63c87bea751e3bfd0fbd401279192e2e5c99948b4ee9437eafc4968355fb\"")
+    buildConfigField("String", "SVR2_MRENCLAVE", "\"1240acbd4aa26974184844c8a46b1022d3957ac8a76c1fd8f5b1a15141ee0708\"")
    buildConfigField("String[]", "UNIDENTIFIED_SENDER_TRUST_ROOTS", "new String[]{ \"BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF\", \"BUkY0I+9+oPgDCn4+Ac6Iu813yvqkDr/ga8DzLxFxuk6\"}")
    buildConfigField("String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY/JYJHRooo5CEqYKBqdFnmbTVGEkCvJKxLnjwKWf+fEPoWeQFj5ObDjcKMZf2Jm2Ae69x+ikU5gBXsRmoF94GXTLfN0/vLt98KDPnxwAQL9j5V1jGOY8jQl6MLxEs56cwXN0dqCnImzVH3TZT1cJ8SW1BRX6qIVxEzjsSGx3yxF3suAilPMqGRp4ffyopjMD1JXiKR2RwLKzizUe5e8XyGOy9fplzhw3jVzTRyUZTRSZKkMLWcQ/gv0E4aONNqs4P+NameAZYOD12qRkxosQQP5uux6B2nRyZ7sAV54DgFyLiRcq1FvwKw2EPQdk4HDoePrO/RNUbyNddnM/mMgj4FW65xCoT1LmjrIjsv/Ggdlx46ueczhMgtBunx1/w8k8V+l8LVZ8gAT6wkU5J+DPQalQguMg12Jzug3q4TbdHiGCmD9EunCwOmsLuLJkz6EcSYXtrlDEnAM+hicw7iergYLLlMXpfTdGxJCWJmP4zqUFeTTmsmhsjGBt7NiEB/9pFFEB3pSbf4iiUukw63Eo8Aqnf4iwob6X1QviCWuc8t0LUlT9vALgh/f2DPVOOmR0RW6bgRvc7DSF20V/omg+YBw==\"")
    buildConfigField("String", "GENERIC_SERVER_PUBLIC_PARAMS", "\"AByD873dTilmOSG0TjKrvpeaKEsUmIO8Vx9BeMmftwUs9v7ikPwM8P3OHyT0+X3EUMZrSe9VUp26Wai51Q9I8mdk0hX/yo7CeFGJyzoOqn8e/i4Ygbn5HoAyXJx5eXfIbqpc0bIxzju4H/HOQeOpt6h742qii5u/cbwOhFZCsMIbElZTaeU+BWMBQiZHIGHT5IE0qCordQKZ5iPZom0HeFa8Yq0ShuEyAl0WINBiY6xE3H/9WnvzXBbMuuk//eRxXgzO8ieCeK8FwQNxbfXqZm6Ro1cMhCOF3u7xoX83QhpN\"")
@@ -282,6 +262,7 @@ android {
    buildConfigField("String", "STRIPE_PUBLISHABLE_KEY", "\"pk_live_6cmGZopuTsV8novGgJJW9JpC00vLIgtQ1D\"")
    buildConfigField("boolean", "TRACING_ENABLED", "false")
    buildConfigField("boolean", "LINK_DEVICE_UX_ENABLED", "false")
+    buildConfigField("boolean", "USE_STRING_ID", "false")

    ndk {
      abiFilters += listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
@@ -297,11 +278,7 @@ android {
      }
    }

-    testInstrumentationRunner = if (project.hasProperty("imoTests")) {
-      "org.thoughtcrime.securesms.testing.incomingmessageobserver.IncomingMessageObserverTestRunner"
-    } else {
-      "org.thoughtcrime.securesms.testing.SignalTestRunner"
-    }
+    testInstrumentationRunner = "org.thoughtcrime.securesms.testing.SignalTestRunner"
    testInstrumentationRunnerArguments["clearPackageData"] = "true"
  }

@@ -313,7 +290,7 @@ android {
      isDefault = true
      isMinifyEnabled = false
      proguardFiles(
-        getDefaultProguardFile("proguard-android-optimize.txt"),
+        getDefaultProguardFile("proguard-android.txt"),
        "proguard/proguard-firebase-messaging.pro",
        "proguard/proguard-google-play-services.pro",
        "proguard/proguard-jackson.pro",
@@ -330,7 +307,6 @@ android {
        "proguard/proguard-retrolambda.pro",
        "proguard/proguard-okhttp.pro",
        "proguard/proguard-ez-vcard.pro",
-        "proguard/proguard-dnsjava.pro",
        "proguard/proguard.cfg"
      )
      testProguardFiles(
@@ -350,6 +326,17 @@ android {
      buildConfigField("String", "BUILD_VARIANT_TYPE", "\"Release\"")
    }

+    create("instrumentation") {
+      initWith(getByName("debug"))
+      isDefault = false
+      isMinifyEnabled = false
+      matchingFallbacks += "debug"
+      applicationIdSuffix = ".instrumentation"
+
+      buildConfigField("String", "BUILD_VARIANT_TYPE", "\"Instrumentation\"")
+      buildConfigField("String", "STRIPE_BASE_URL", "\"http://127.0.0.1:8080/stripe\"")
+    }
+
    create("spinner") {
      initWith(getByName("debug"))
      isDefault = false
@@ -465,8 +452,8 @@ android {
      buildConfigField("String", "SIGNAL_CDN3_URL", "\"https://cdn3-staging.signal.org\"")
      buildConfigField("String", "SIGNAL_CDSI_URL", "\"https://cdsi.staging.signal.org\"")
      buildConfigField("String", "SIGNAL_SVR2_URL", "\"https://svr2.staging.signal.org\"")
-      buildConfigField("String", "SVR2_MRENCLAVE_LEGACY", "\"97f151f6ed078edbbfd72fa9cae694dcc08353f1f5e8d9ccd79a971b10ffc535\"")
-      buildConfigField("String", "SVR2_MRENCLAVE", "\"3c699f4975aaa3d172c0aad042f94f031b2b03e10b9c19a45116a01693d83302\"")
+      buildConfigField("String", "SVR2_MRENCLAVE_LEGACY", "\"a75542d82da9f6914a1e31f8a7407053b99cc99a0e7291d8fbd394253e19b036\"")
+      buildConfigField("String", "SVR2_MRENCLAVE", "\"97f151f6ed078edbbfd72fa9cae694dcc08353f1f5e8d9ccd79a971b10ffc535\"")
      buildConfigField("String[]", "UNIDENTIFIED_SENDER_TRUST_ROOTS", "new String[]{\"BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx\", \"BYhU6tPjqP46KGZEzRs1OL4U39V5dlPJ/X09ha4rErkm\"}")
      buildConfigField("String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXZSSsOZ6s7M1+rTJN0bI5CKY2PX29y5Ok3jSWufIKcgKOnWoP67d5b2du2ZVJjpjfibNIHbT/cegy/sBLoFwtHogVYUewANUAXIaMPyCLRArsKhfJ5wBtTminG/PAvuBdJ70Z/bXVPf8TVsR292zQ65xwvWTejROW6AZX6aqucUjlENAErBme1YHmOSpU6tr6doJ66dPzVAWIanmO/5mgjNEDeK7DDqQdB1xd03HT2Qs2TxY3kCK8aAb/0iM0HQiXjxZ9HIgYhbtvGEnDKW5ILSUydqH/KBhW4Pb0jZWnqN/YgbWDKeJxnDbYcUob5ZY5Lt5ZCMKuaGUvCJRrCtuugSMaqjowCGRempsDdJEt+cMaalhZ6gczklJB/IbdwENW9KeVFPoFNFzhxWUIS5ML9riVYhAtE6JE5jX0xiHNVIIPthb458cfA8daR0nYfYAUKogQArm0iBezOO+mPk5vCNWI+wwkyFCqNDXz/qxl1gAntuCJtSfq9OC3NkdhQlgYQ==\"")
      buildConfigField("String", "GENERIC_SERVER_PUBLIC_PARAMS", "\"AHILOIrFPXX9laLbalbA9+L1CXpSbM/bTJXZGZiuyK1JaI6dK5FHHWL6tWxmHKYAZTSYmElmJ5z2A5YcirjO/yfoemE03FItyaf8W1fE4p14hzb5qnrmfXUSiAIVrhaXVwIwSzH6RL/+EO8jFIjJ/YfExfJ8aBl48CKHgu1+A6kWynhttonvWWx6h7924mIzW0Czj2ROuh4LwQyZypex4GuOPW8sgIT21KNZaafgg+KbV7XM1x1tF3XA17B4uGUaDbDw2O+nR1+U5p6qHPzmJ7ggFjSN6Utu+35dS1sS0P9N\"")
@@ -492,6 +479,70 @@ android {
    lintConfig = rootProject.file("lint.xml")
  }

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

@@ -513,83 +564,15 @@ android {
      manifest.srcFile("$projectDir/src/benchmarkShared/AndroidManifest.xml")
    }
  }
-}

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

 baselineProfile {
@@ -606,22 +589,12 @@ baselineProfile {
  dexLayoutOptimization = false
 }

-kotlin {
-  compilerOptions {
-    jvmTarget = JvmTarget.fromTarget(libs.versions.kotlinJvmTarget.get())
-    freeCompilerArgs.addAll("-Xjvm-default=all")
-    suppressWarnings = true
-  }
-}
-
 dependencies {
  lintChecks(project(":lintchecks"))
  ktlintRuleset(libs.ktlint.twitter.compose)
  coreLibraryDesugaring(libs.android.tools.desugar)

-  implementation(project(":lib:archive"))
  implementation(project(":lib:libsignal-service"))
-  implementation(project(":lib:network"))
  implementation(project(":lib:paging"))
  implementation(project(":core:util"))
  implementation(project(":lib:glide"))
@@ -640,10 +613,13 @@ dependencies {
  implementation(project(":core:models-jvm"))
  implementation(project(":feature:camera"))
  implementation(project(":feature:registration"))
-  implementation(project(":lib:apng"))

  implementation(libs.androidx.fragment.ktx)
-  implementation(libs.androidx.appcompat)
+  implementation(libs.androidx.appcompat) {
+    version {
+      strictly("1.6.1")
+    }
+  }
  implementation(libs.androidx.window.window)
  implementation(libs.androidx.window.java)
  implementation(libs.androidx.recyclerview)
@@ -692,7 +668,6 @@ dependencies {
  implementation(libs.google.play.services.maps)
  implementation(libs.google.play.services.auth)
  implementation(libs.google.signin)
-  implementation(libs.androidx.media)
  implementation(libs.bundles.media3)
  implementation(libs.conscrypt.android)
  implementation(libs.signal.aesgcmprovider)
@@ -700,6 +675,7 @@ dependencies {
  implementation(libs.mobilecoin)
  implementation(libs.signal.ringrtc)
  implementation(libs.leolin.shortcutbadger)
+  implementation(libs.emilsjolander.stickylistheaders)
  implementation(libs.glide.glide)
  implementation(libs.roundedimageview)
  implementation(libs.materialish.progress)
@@ -710,6 +686,10 @@ dependencies {
  implementation(libs.subsampling.scale.image.view) {
    exclude(group = "com.android.support", module = "support-annotations")
  }
+  implementation(libs.android.tooltips) {
+    exclude(group = "com.android.support", module = "appcompat-v7")
+  }
+  implementation(libs.stream)
  implementation(libs.lottie)
  implementation(libs.lottie.compose)
  implementation(libs.signal.android.database.sqlcipher)
@@ -721,7 +701,6 @@ dependencies {
  }
  implementation(libs.dnsjava)
  implementation(libs.kotlinx.collections.immutable)
-  implementation(libs.arrow.core)
  implementation(libs.accompanist.permissions)
  implementation(libs.accompanist.drawablepainter)
  implementation(libs.kotlin.stdlib.jdk8)
@@ -743,7 +722,7 @@ dependencies {

  "canaryImplementation"(libs.square.leakcanary)

-  androidTestImplementation(libs.androidx.fragment.testing) {
+  "instrumentationImplementation"(libs.androidx.fragment.testing) {
    exclude(group = "androidx.test", module = "core")
  }

@@ -765,11 +744,9 @@ dependencies {
  }
  testImplementation(testLibs.conscrypt.openjdk.uber)
  testImplementation(testLibs.mockk)
-  testImplementation(testFixtures(project(":core:ui")))
  testImplementation(testFixtures(project(":lib:libsignal-service")))
  testImplementation(testLibs.espresso.core)
  testImplementation(testLibs.kotlinx.coroutines.test)
-  testImplementation(testLibs.sqlite.jdbc)
  testImplementation(libs.androidx.compose.ui.test.junit4)

  "perfImplementation"(libs.androidx.compose.ui.test.manifest)
@@ -880,7 +857,7 @@ abstract class LanguageListValueSource : ValueSource<List<String>, LanguageListV
  }
 }

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

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

    return Properties().apply {
      f.inputStream().use { load(it) }
@@ -960,30 +937,3 @@ abstract class CopyBenchmarkBackupTask : DefaultTask() {
    backupFile.copyTo(dest.resolve("backup.binproto"), overwrite = true)
  }
 }
-
-abstract class RenameApkTask : DefaultTask() {
-  @get:InputFiles
-  abstract val apkFolder: DirectoryProperty
-
-  @get:OutputDirectory
-  abstract val outFolder: DirectoryProperty
-
-  @get:Internal
-  abstract val transformationRequest: Property<ArtifactTransformationRequest<RenameApkTask>>
-
-  @TaskAction
-  fun rename() {
-    transformationRequest.get().submit(this) { artifact ->
-      val originalFile = File(artifact.outputFile)
-      val versionName = artifact.versionName?.substringBefore(" |")
-      val newName = if (!versionName.isNullOrEmpty()) {
-        originalFile.name.replace(".apk", "-$versionName.apk")
-      } else {
-        originalFile.name
-      }
-      val newFile = File(outFolder.get().asFile, newName)
-      originalFile.copyTo(newFile, overwrite = true)
-      newFile
-    }
-  }
-}
@@ -1,4 +0,0 @@
-# dnsjava references desktop/server-only classes that are absent on Android.
-dontwarn com.sun.jna.**
-dontwarn javax.naming.**
-dontwarn lombok.Generated
@@ -7,7 +7,6 @@
 -keep class org.signal.libsignal.usernames.** { *; }
 -keep class org.thoughtcrime.securesms.** { *; }
 -keep class org.signal.donations.json.** { *; }
-keep class org.signal.network.** { *; }
 -keepclassmembers class ** {
    public void onEvent*(**);
 }
@@ -17,14 +16,6 @@

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

-# Workaround for R8 non-determinism in AGP 9.x. R8 inconsistently keeps or strips
-# the Signature attribute on this Kotlin lambda subclass of the generic
-# LottieValueCallback, causing intermittent dex byte differences. Explicitly
-# keeping the class stabilizes R8's attribute decisions.
-keep class com.airbnb.lottie.compose.LottieDynamicPropertiesKt$toValueCallback$1 {
-  *;
-}
-
 -keepclassmembers class * extends androidx.constraintlayout.motion.widget.Key {
  public <init>();
 }
@@ -1,36 +0,0 @@
-package org.thoughtcrime.securesms
-
-import org.signal.core.util.logging.AndroidLogger
-import org.signal.core.util.logging.Log
-import org.signal.libsignal.protocol.logging.SignalProtocolLoggerProvider
-import org.thoughtcrime.securesms.dependencies.AppDependencies
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencyProvider
-import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger
-import org.thoughtcrime.securesms.testing.incomingmessageobserver.IncomingMessageObserverDependencyProvider
-import org.thoughtcrime.securesms.testing.incomingmessageobserver.IncomingMessageObserverTestRunner
-
-/**
- * Application used when running `IncomingMessageObserver` instrumentation tests. Installs
- * [IncomingMessageObserverDependencyProvider] so the websocket and job manager are replaced
- * with test-friendly implementations. Selected by [IncomingMessageObserverTestRunner] when
- * gradle is invoked with `-PimoTests`.
- */
-class IncomingMessageObserverInstrumentationApplicationContext : ApplicationContext() {
-
-  override fun initializeAppDependencies() {
-    val default = ApplicationDependencyProvider(this)
-    AppDependencies.init(this, IncomingMessageObserverDependencyProvider(this, default))
-    AppDependencies.deadlockDetector.start()
-  }
-
-  override fun initializeLogging() {
-    Log.initialize({ true }, AndroidLogger)
-    SignalProtocolLoggerProvider.setProvider(CustomSignalProtocolLogger())
-  }
-
-  override fun beginJobLoop() = Unit
-
-  fun beginJobLoopForTests() {
-    super.beginJobLoop()
-  }
-}
@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms

-import android.content.Context
 import org.signal.core.util.concurrent.SignalExecutors
 import org.signal.core.util.logging.AndroidLogger
 import org.signal.core.util.logging.Log
@@ -12,7 +11,6 @@ import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDepende
 import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger
 import org.thoughtcrime.securesms.logging.PersistentLogger
 import org.thoughtcrime.securesms.testing.InMemoryLogger
-import org.thoughtcrime.securesms.util.Environment

 /**
 * Application context for running instrumentation tests (aka androidTests).
@@ -21,11 +19,6 @@ class SignalInstrumentationApplicationContext : ApplicationContext() {

  val inMemoryLogger: InMemoryLogger = InMemoryLogger()

-  override fun attachBaseContext(base: Context?) {
-    Environment.IS_INSTRUMENTATION = true
-    super.attachBaseContext(base)
-  }
-
  override fun initializeAppDependencies() {
    val default = ApplicationDependencyProvider(this)
    AppDependencies.init(this, InstrumentationApplicationDependencyProvider(this, default))
@@ -13,8 +13,6 @@ import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.signal.archive.proto.Frame
-import org.signal.archive.stream.PlainTextBackupReader
 import org.signal.core.models.ServiceId
 import org.signal.core.util.Base64
 import org.signal.core.util.logging.Log
@@ -22,6 +20,8 @@ import org.signal.core.util.readFully
 import org.signal.libsignal.messagebackup.ComparableBackup
 import org.signal.libsignal.messagebackup.MessageBackup
 import org.signal.libsignal.zkgroup.profiles.ProfileKey
+import org.thoughtcrime.securesms.backup.v2.proto.Frame
+import org.thoughtcrime.securesms.backup.v2.stream.PlainTextBackupReader
 import org.thoughtcrime.securesms.database.KeyValueDatabase
 import org.thoughtcrime.securesms.dependencies.AppDependencies
 import org.thoughtcrime.securesms.keyvalue.SignalStore
@@ -16,7 +16,6 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.signal.donations.InAppPaymentType
-import org.signal.network.NetworkResult
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
 import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
@@ -27,6 +26,7 @@ import org.thoughtcrime.securesms.testing.InAppPaymentsRule
 import org.thoughtcrime.securesms.testing.RxTestSchedulerRule
 import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.thoughtcrime.securesms.testing.actions.RecyclerViewScrollToBottomAction
+import org.whispersystems.signalservice.api.NetworkResult
 import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
 import org.whispersystems.signalservice.api.subscriptions.SubscriberId
 import java.math.BigDecimal
@@ -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,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)
-    }
-  }
-}
@@ -358,9 +358,5 @@ class V2ConversationItemShapeTest {
    override fun onToggleVote(poll: PollRecord, pollOption: PollOption, isChecked: Boolean) = Unit

    override fun onViewPinnedMessage(messageId: Long) = Unit
-
-    override fun onExpandEvents(messageId: Long, itemView: View, collapsedSize: Int) = Unit
-
-    override fun onCollapseEvents(messageId: Long, itemView: View, collapsedSize: Int) = Unit
  }
 }
@@ -7,9 +7,9 @@ package org.thoughtcrime.securesms.database

 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.attachment.AttachmentUploadResult
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId
 import kotlin.random.Random

@@ -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),
@@ -431,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)
  }

@@ -1,11 +1,11 @@
 /*
- * Copyright 2026 Signal Messenger, LLC
+ * Copyright 2024 Signal Messenger, LLC
 * SPDX-License-Identifier: AGPL-3.0-only
 */

 package org.thoughtcrime.securesms.database

-import android.app.Application
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import okio.ByteString.Companion.toByteString
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
@@ -14,8 +14,7 @@ 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.util.UuidUtil
 import org.signal.core.util.deleteAll
 import org.thoughtcrime.securesms.components.settings.app.chats.folders.ChatFolderId
@@ -23,18 +22,18 @@ import org.thoughtcrime.securesms.components.settings.app.chats.folders.ChatFold
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.storage.StorageSyncHelper
-import org.thoughtcrime.securesms.testutil.RecipientTestRule
+import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.whispersystems.signalservice.api.storage.SignalChatFolderRecord
 import org.whispersystems.signalservice.api.storage.StorageId
+import java.util.UUID
 import org.whispersystems.signalservice.internal.storage.protos.ChatFolderRecord as RemoteChatFolderRecord
 import org.whispersystems.signalservice.internal.storage.protos.Recipient as RemoteRecipient

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

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

  private lateinit var alice: RecipientId
  private lateinit var bob: RecipientId
@@ -45,15 +44,19 @@ class ChatFolderTablesTest {
  private lateinit var folder3: ChatFolderRecord
  private lateinit var folder4: ChatFolderRecord

+  private lateinit var recipientIds: List<RecipientId>
+
  private var aliceThread: Long = 0
  private var bobThread: Long = 0
  private var charlieThread: Long = 0

  @Before
  fun setUp() {
-    alice = recipients.createRecipient("Alice One")
-    bob = recipients.createRecipient("Bob Two")
-    charlie = recipients.createRecipient("Charlie Three")
+    recipientIds = createRecipients(5)
+
+    alice = recipientIds[0]
+    bob = recipientIds[1]
+    charlie = recipientIds[2]

    aliceThread = SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(alice))
    bobThread = SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(bob))
@@ -186,6 +189,7 @@ class ChatFolderTablesTest {
          excludedRecipients = listOf(
            RemoteRecipient(RemoteRecipient.Contact(Recipient.resolved(charlie).serviceId.get().toString()))
          )
+
        )
      )

@@ -219,4 +223,10 @@ class ChatFolderTablesTest {

    assertTrue(actualFolderIsEmpty)
  }
+
+  private fun createRecipients(count: Int): List<RecipientId> {
+    return (1..count).map {
+      SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID()))
+    }
+  }
 }
@@ -0,0 +1,541 @@
+package org.thoughtcrime.securesms.database
+
+import android.app.Application
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import net.zetetic.database.sqlcipher.SQLiteDatabase
+import net.zetetic.database.sqlcipher.SQLiteOpenHelper
+import org.junit.Assert.assertTrue
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.signal.core.util.ForeignKeyConstraint
+import org.signal.core.util.Index
+import org.signal.core.util.getForeignKeys
+import org.signal.core.util.getIndexes
+import org.signal.core.util.readToList
+import org.signal.core.util.requireNonNullString
+import org.thoughtcrime.securesms.database.helpers.SignalDatabaseMigrations
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+import org.thoughtcrime.securesms.database.SQLiteDatabase as SignalSQLiteDatabase
+
+/**
+ * A test that guarantees that a freshly-created database looks the same as one that went through the upgrade path.
+ */
+@RunWith(AndroidJUnit4::class)
+class DatabaseConsistencyTest {
+
+  @get:Rule
+  val harness = SignalActivityRule()
+
+  @Test
+  fun testUpgradeConsistency() {
+    val currentVersionStatements = SignalDatabase.rawDatabase.getAllCreateStatements()
+    val testHelper = InMemoryTestHelper(AppDependencies.application).also {
+      it.onUpgrade(it.writableDatabase, 181, SignalDatabaseMigrations.DATABASE_VERSION)
+    }
+
+    val upgradedStatements = testHelper.readableDatabase.getAllCreateStatements()
+
+    if (currentVersionStatements != upgradedStatements) {
+      var message = "\n"
+
+      val currentByName = currentVersionStatements.associateBy { it.name }
+      val upgradedByName = upgradedStatements.associateBy { it.name }
+
+      if (currentByName.keys != upgradedByName.keys) {
+        val exclusiveToCurrent = currentByName.keys - upgradedByName.keys
+        val exclusiveToUpgrade = upgradedByName.keys - currentByName.keys
+
+        message += "SQL entities exclusive to the newly-created database: $exclusiveToCurrent\n"
+        message += "SQL entities exclusive to the upgraded database: $exclusiveToUpgrade\n\n"
+      } else {
+        for (currentEntry in currentByName) {
+          val upgradedValue: Statement = upgradedByName[currentEntry.key]!!
+          if (upgradedValue.sql != currentEntry.value.sql) {
+            message += "Statement differed:\n"
+            message += "newly-created:\n"
+            message += "${currentEntry.value.sql}\n\n"
+            message += "upgraded:\n"
+            message += "${upgradedValue.sql}\n\n"
+          }
+        }
+      }
+
+      assertTrue(message, false)
+    }
+  }
+
+  @Test
+  fun testForeignKeyIndexCoverage() {
+    /** We may deem certain indexes non-critical if deletion frequency is low or table size is small. */
+    val ignoredColumns: List<Pair<String, String>> = listOf(
+      StorySendTable.TABLE_NAME to StorySendTable.DISTRIBUTION_ID
+    )
+
+    val foreignKeys: List<ForeignKeyConstraint> = SignalDatabase.rawDatabase.getForeignKeys()
+    val indexesByFirstColumn: List<Index> = SignalDatabase.rawDatabase.getIndexes()
+
+    val notFound: List<Pair<String, String>> = foreignKeys
+      .filterNot { ignoredColumns.contains(it.table to it.column) }
+      .filterNot { foreignKey ->
+        indexesByFirstColumn.hasPrimaryIndexFor(foreignKey.table, foreignKey.column)
+      }
+      .map { it.table to it.column }
+
+    assertTrue("Missing indexes to cover: $notFound", notFound.isEmpty())
+  }
+
+  private fun List<Index>.hasPrimaryIndexFor(table: String, column: String): Boolean {
+    return this.any { index -> index.table == table && index.columns[0] == column }
+  }
+
+  private data class Statement(
+    val name: String,
+    val sql: String
+  )
+
+  private fun SQLiteDatabase.getAllCreateStatements(): List<Statement> {
+    return this.rawQuery("SELECT name, sql FROM sqlite_schema WHERE sql NOT NULL AND name != 'sqlite_sequence'")
+      .readToList { cursor ->
+        Statement(
+          name = cursor.requireNonNullString("name"),
+          sql = cursor.requireNonNullString("sql").normalizeSql()
+        )
+      }
+      .filterNot { it.name.startsWith("sqlite_stat") }
+      .sortedBy { it.name }
+  }
+
+  private fun String.normalizeSql(): String {
+    return this
+      .split("\n")
+      .map { it.trim() }
+      .joinToString(separator = " ")
+      .replace(Regex.fromLiteral(" ,"), ",")
+      .replace(",([^\\s])".toRegex(), ", $1")
+      .replace(Regex("\\s+"), " ")
+      .replace(Regex.fromLiteral("( "), "(")
+      .replace(Regex.fromLiteral(" )"), ")")
+      .replace(Regex("CREATE TABLE \"([a-zA-Z_]+)\""), "CREATE TABLE $1") // for some reason SQLite will wrap table names in quotes for upgraded tables. This unwraps them.
+  }
+
+  private class InMemoryTestHelper(private val application: Application) : SQLiteOpenHelper(application, null, null, 1) {
+
+    override fun onCreate(db: SQLiteDatabase) {
+      for (statement in SNAPSHOT_V181) {
+        db.execSQL(statement.sql)
+      }
+    }
+
+    override fun onUpgrade(db: SQLiteDatabase, oldVersion: Int, newVersion: Int) {
+      SignalDatabaseMigrations.migrate(application, SignalSQLiteDatabase(db), 181, SignalDatabaseMigrations.DATABASE_VERSION)
+    }
+
+    /**
+     * This is the list of statements that existed at version 181. Never change this.
+     */
+    private val SNAPSHOT_V181 = listOf(
+      Statement(
+        name = "message",
+        sql = "CREATE TABLE message (\n        _id INTEGER PRIMARY KEY AUTOINCREMENT,\n        date_sent INTEGER NOT NULL,\n        date_received INTEGER NOT NULL,\n        date_server INTEGER DEFAULT -1,\n        thread_id INTEGER NOT NULL REFERENCES thread (_id) ON DELETE CASCADE,\n        recipient_id INTEGER NOT NULL REFERENCES recipient (_id) ON DELETE CASCADE,\n        recipient_device_id INTEGER,\n        type INTEGER NOT NULL,\n        body TEXT,\n        read INTEGER DEFAULT 0,\n        ct_l TEXT,\n        exp INTEGER,\n        m_type INTEGER,\n        m_size INTEGER,\n        st INTEGER,\n        tr_id TEXT,\n        subscription_id INTEGER DEFAULT -1, \n        receipt_timestamp INTEGER DEFAULT -1, \n        delivery_receipt_count INTEGER DEFAULT 0, \n        read_receipt_count INTEGER DEFAULT 0, \n        viewed_receipt_count INTEGER DEFAULT 0,\n        mismatched_identities TEXT DEFAULT NULL,\n        network_failures TEXT DEFAULT NULL,\n        expires_in INTEGER DEFAULT 0,\n        expire_started INTEGER DEFAULT 0,\n        notified INTEGER DEFAULT 0,\n        quote_id INTEGER DEFAULT 0,\n        quote_author INTEGER DEFAULT 0,\n        quote_body TEXT DEFAULT NULL,\n        quote_missing INTEGER DEFAULT 0,\n        quote_mentions BLOB DEFAULT NULL,\n        quote_type INTEGER DEFAULT 0,\n        shared_contacts TEXT DEFAULT NULL,\n        unidentified INTEGER DEFAULT 0,\n        link_previews TEXT DEFAULT NULL,\n        view_once INTEGER DEFAULT 0,\n        reactions_unread INTEGER DEFAULT 0,\n        reactions_last_seen INTEGER DEFAULT -1,\n        remote_deleted INTEGER DEFAULT 0,\n        mentions_self INTEGER DEFAULT 0,\n        notified_timestamp INTEGER DEFAULT 0,\n        server_guid TEXT DEFAULT NULL,\n        message_ranges BLOB DEFAULT NULL,\n        story_type INTEGER DEFAULT 0,\n        parent_story_id INTEGER DEFAULT 0,\n        export_state BLOB DEFAULT NULL,\n        exported INTEGER DEFAULT 0,\n        scheduled_date INTEGER DEFAULT -1\n      )"
+      ),
+      Statement(
+        name = "part",
+        sql = "CREATE TABLE part (_id INTEGER PRIMARY KEY, mid INTEGER, seq INTEGER DEFAULT 0, ct TEXT, name TEXT, chset INTEGER, cd TEXT, fn TEXT, cid TEXT, cl TEXT, ctt_s INTEGER, ctt_t TEXT, encrypted INTEGER, pending_push INTEGER, _data TEXT, data_size INTEGER, file_name TEXT, unique_id INTEGER NOT NULL, digest BLOB, fast_preflight_id TEXT, voice_note INTEGER DEFAULT 0, borderless INTEGER DEFAULT 0, video_gif INTEGER DEFAULT 0, data_random BLOB, quote INTEGER DEFAULT 0, width INTEGER DEFAULT 0, height INTEGER DEFAULT 0, caption TEXT DEFAULT NULL, sticker_pack_id TEXT DEFAULT NULL, sticker_pack_key DEFAULT NULL, sticker_id INTEGER DEFAULT -1, sticker_emoji STRING DEFAULT NULL, data_hash TEXT DEFAULT NULL, blur_hash TEXT DEFAULT NULL, transform_properties TEXT DEFAULT NULL, transfer_file TEXT DEFAULT NULL, display_order INTEGER DEFAULT 0, upload_timestamp INTEGER DEFAULT 0, cdn_number INTEGER DEFAULT 0)"
+      ),
+      Statement(
+        name = "thread",
+        sql = "CREATE TABLE thread (\n  _id INTEGER PRIMARY KEY AUTOINCREMENT, \n  date INTEGER DEFAULT 0, \n  meaningful_messages INTEGER DEFAULT 0,\n  recipient_id INTEGER NOT NULL UNIQUE REFERENCES recipient (_id) ON DELETE CASCADE,\n  read INTEGER DEFAULT 1, \n  type INTEGER DEFAULT 0, \n  error INTEGER DEFAULT 0, \n  snippet TEXT, \n  snippet_type INTEGER DEFAULT 0, \n  snippet_uri TEXT DEFAULT NULL, \n  snippet_content_type TEXT DEFAULT NULL, \n  snippet_extras TEXT DEFAULT NULL, \n  unread_count INTEGER DEFAULT 0, \n  archived INTEGER DEFAULT 0, \n  status INTEGER DEFAULT 0, \n  delivery_receipt_count INTEGER DEFAULT 0, \n  read_receipt_count INTEGER DEFAULT 0, \n  expires_in INTEGER DEFAULT 0, \n  last_seen INTEGER DEFAULT 0, \n  has_sent INTEGER DEFAULT 0, \n  last_scrolled INTEGER DEFAULT 0, \n  pinned INTEGER DEFAULT 0, \n  unread_self_mention_count INTEGER DEFAULT 0\n)"
+      ),
+      Statement(
+        name = "identities",
+        sql = "CREATE TABLE identities (\n        _id INTEGER PRIMARY KEY AUTOINCREMENT, \n        address INTEGER UNIQUE, \n        identity_key TEXT, \n        first_use INTEGER DEFAULT 0, \n        timestamp INTEGER DEFAULT 0, \n        verified INTEGER DEFAULT 0, \n        nonblocking_approval INTEGER DEFAULT 0\n      )"
+      ),
+      Statement(
+        name = "drafts",
+        sql = "CREATE TABLE drafts (\n        _id INTEGER PRIMARY KEY, \n        thread_id INTEGER, \n        type TEXT, \n        value TEXT\n      )"
+      ),
+      Statement(
+        name = "push",
+        sql = "CREATE TABLE push (_id INTEGER PRIMARY KEY, type INTEGER, source TEXT, source_uuid TEXT, device_id INTEGER, body TEXT, content TEXT, timestamp INTEGER, server_timestamp INTEGER DEFAULT 0, server_delivered_timestamp INTEGER DEFAULT 0, server_guid TEXT DEFAULT NULL)"
+      ),
+      Statement(
+        name = "groups",
+        sql = "CREATE TABLE groups (\n        _id INTEGER PRIMARY KEY, \n        group_id TEXT, \n        recipient_id INTEGER,\n        title TEXT,\n        avatar_id INTEGER, \n        avatar_key BLOB,\n        avatar_content_type TEXT, \n        avatar_relay TEXT,\n        timestamp INTEGER,\n        active INTEGER DEFAULT 1,\n        avatar_digest BLOB, \n        mms INTEGER DEFAULT 0, \n        master_key BLOB, \n        revision BLOB, \n        decrypted_group BLOB, \n        expected_v2_id TEXT DEFAULT NULL, \n        former_v1_members TEXT DEFAULT NULL, \n        distribution_id TEXT DEFAULT NULL, \n        display_as_story INTEGER DEFAULT 0, \n        auth_service_id TEXT DEFAULT NULL, \n        last_force_update_timestamp INTEGER DEFAULT 0\n      )"
+      ),
+      Statement(
+        name = "group_membership",
+        sql = "CREATE TABLE group_membership (     _id INTEGER PRIMARY KEY,     group_id TEXT NOT NULL,     recipient_id INTEGER NOT NULL,     UNIQUE(group_id, recipient_id) )"
+      ),
+      Statement(
+        name = "recipient",
+        sql = "CREATE TABLE recipient (\n  _id INTEGER PRIMARY KEY AUTOINCREMENT,\n  uuid TEXT UNIQUE DEFAULT NULL,\n  username TEXT UNIQUE DEFAULT NULL,\n  phone TEXT UNIQUE DEFAULT NULL,\n  email TEXT UNIQUE DEFAULT NULL,\n  group_id TEXT UNIQUE DEFAULT NULL,\n  group_type INTEGER DEFAULT 0,\n  blocked INTEGER DEFAULT 0,\n  message_ringtone TEXT DEFAULT NULL, \n  message_vibrate INTEGER DEFAULT 0, \n  call_ringtone TEXT DEFAULT NULL, \n  call_vibrate INTEGER DEFAULT 0, \n  notification_channel TEXT DEFAULT NULL, \n  mute_until INTEGER DEFAULT 0, \n  color TEXT DEFAULT NULL, \n  seen_invite_reminder INTEGER DEFAULT 0,\n  default_subscription_id INTEGER DEFAULT -1,\n  message_expiration_time INTEGER DEFAULT 0,\n  registered INTEGER DEFAULT 0,\n  system_given_name TEXT DEFAULT NULL, \n  system_family_name TEXT DEFAULT NULL, \n  system_display_name TEXT DEFAULT NULL, \n  system_photo_uri TEXT DEFAULT NULL, \n  system_phone_label TEXT DEFAULT NULL, \n  system_phone_type INTEGER DEFAULT -1, \n  system_contact_uri TEXT DEFAULT NULL, \n  system_info_pending INTEGER DEFAULT 0, \n  profile_key TEXT DEFAULT NULL, \n  profile_key_credential TEXT DEFAULT NULL, \n  signal_profile_name TEXT DEFAULT NULL, \n  profile_family_name TEXT DEFAULT NULL, \n  profile_joined_name TEXT DEFAULT NULL, \n  signal_profile_avatar TEXT DEFAULT NULL, \n  profile_sharing INTEGER DEFAULT 0, \n  last_profile_fetch INTEGER DEFAULT 0, \n  unidentified_access_mode INTEGER DEFAULT 0, \n  force_sms_selection INTEGER DEFAULT 0, \n  storage_service_key TEXT UNIQUE DEFAULT NULL, \n  mention_setting INTEGER DEFAULT 0, \n  storage_proto TEXT DEFAULT NULL,\n  capabilities INTEGER DEFAULT 0,\n  last_session_reset BLOB DEFAULT NULL,\n  wallpaper BLOB DEFAULT NULL,\n  wallpaper_file TEXT DEFAULT NULL,\n  about TEXT DEFAULT NULL,\n  about_emoji TEXT DEFAULT NULL,\n  extras BLOB DEFAULT NULL,\n  groups_in_common INTEGER DEFAULT 0,\n  chat_colors BLOB DEFAULT NULL,\n  custom_chat_colors_id INTEGER DEFAULT 0,\n  badges BLOB DEFAULT NULL,\n  pni TEXT DEFAULT NULL,\n  distribution_list_id INTEGER DEFAULT NULL,\n  needs_pni_signature INTEGER DEFAULT 0,\n  unregistered_timestamp INTEGER DEFAULT 0,\n  hidden INTEGER DEFAULT 0,\n  reporting_token BLOB DEFAULT NULL,\n  system_nickname TEXT DEFAULT NULL\n)"
+      ),
+      Statement(
+        name = "group_receipts",
+        sql = "CREATE TABLE group_receipts (\n        _id INTEGER PRIMARY KEY, \n        mms_id INTEGER, \n        address INTEGER, \n        status INTEGER, \n        timestamp INTEGER, \n        unidentified INTEGER DEFAULT 0\n      )"
+      ),
+      Statement(
+        name = "one_time_prekeys",
+        sql = "CREATE TABLE one_time_prekeys (\n        _id INTEGER PRIMARY KEY,\n        account_id TEXT NOT NULL,\n        key_id INTEGER UNIQUE, \n        public_key TEXT NOT NULL, \n        private_key TEXT NOT NULL,\n        UNIQUE(account_id, key_id)\n      )"
+      ),
+      Statement(
+        name = "signed_prekeys",
+        sql = "CREATE TABLE signed_prekeys (\n        _id INTEGER PRIMARY KEY,\n        account_id TEXT NOT NULL,\n        key_id INTEGER UNIQUE, \n        public_key TEXT NOT NULL,\n        private_key TEXT NOT NULL,\n        signature TEXT NOT NULL, \n        timestamp INTEGER DEFAULT 0,\n        UNIQUE(account_id, key_id)\n    )"
+      ),
+      Statement(
+        name = "sessions",
+        sql = "CREATE TABLE sessions (\n        _id INTEGER PRIMARY KEY AUTOINCREMENT,\n        account_id TEXT NOT NULL,\n        address TEXT NOT NULL,\n        device INTEGER NOT NULL,\n        record BLOB NOT NULL,\n        UNIQUE(account_id, address, device)\n      )"
+      ),
+      Statement(
+        name = "sender_keys",
+        sql = "CREATE TABLE sender_keys (\n        _id INTEGER PRIMARY KEY AUTOINCREMENT, \n        address TEXT NOT NULL, \n        device INTEGER NOT NULL, \n        distribution_id TEXT NOT NULL,\n        record BLOB NOT NULL, \n        created_at INTEGER NOT NULL, \n        UNIQUE(address,device, distribution_id) ON CONFLICT REPLACE\n      )"
+      ),
+      Statement(
+        name = "sender_key_shared",
+        sql = "CREATE TABLE sender_key_shared (\n        _id INTEGER PRIMARY KEY AUTOINCREMENT, \n        distribution_id TEXT NOT NULL, \n        address TEXT NOT NULL, \n        device INTEGER NOT NULL, \n        timestamp INTEGER DEFAULT 0, \n        UNIQUE(distribution_id,address, device) ON CONFLICT REPLACE\n      )"
+      ),
+      Statement(
+        name = "pending_retry_receipts",
+        sql = "CREATE TABLE pending_retry_receipts(_id INTEGER PRIMARY KEY AUTOINCREMENT, author TEXT NOT NULL, device INTEGER NOT NULL, sent_timestamp INTEGER NOT NULL, received_timestamp TEXT NOT NULL, thread_id INTEGER NOT NULL, UNIQUE(author,sent_timestamp) ON CONFLICT REPLACE)"
+      ),
+      Statement(
+        name = "sticker",
+        sql = "CREATE TABLE sticker (_id INTEGER PRIMARY KEY AUTOINCREMENT, pack_id TEXT NOT NULL, pack_key TEXT NOT NULL, pack_title TEXT NOT NULL, pack_author TEXT NOT NULL, sticker_id INTEGER, cover INTEGER, pack_order INTEGER, emoji TEXT NOT NULL, content_type TEXT DEFAULT NULL, last_used INTEGER, installed INTEGER,file_path TEXT NOT NULL, file_length INTEGER, file_random BLOB, UNIQUE(pack_id, sticker_id, cover) ON CONFLICT IGNORE)"
+      ),
+      Statement(
+        name = "storage_key",
+        sql = "CREATE TABLE storage_key (_id INTEGER PRIMARY KEY AUTOINCREMENT, type INTEGER, key TEXT UNIQUE)"
+      ),
+      Statement(
+        name = "mention",
+        sql = "CREATE TABLE mention(_id INTEGER PRIMARY KEY AUTOINCREMENT, thread_id INTEGER, message_id INTEGER, recipient_id INTEGER, range_start INTEGER, range_length INTEGER)"
+      ),
+      Statement(
+        name = "payments",
+        sql = "CREATE TABLE payments(_id INTEGER PRIMARY KEY, uuid TEXT DEFAULT NULL, recipient INTEGER DEFAULT 0, recipient_address TEXT DEFAULT NULL, timestamp INTEGER, note TEXT DEFAULT NULL, direction INTEGER, state INTEGER, failure_reason INTEGER, amount BLOB NOT NULL, fee BLOB NOT NULL, transaction_record BLOB DEFAULT NULL, receipt BLOB DEFAULT NULL, payment_metadata BLOB DEFAULT NULL, receipt_public_key TEXT DEFAULT NULL, block_index INTEGER DEFAULT 0, block_timestamp INTEGER DEFAULT 0, seen INTEGER, UNIQUE(uuid) ON CONFLICT ABORT)"
+      ),
+      Statement(
+        name = "chat_colors",
+        sql = "CREATE TABLE chat_colors (\n  _id INTEGER PRIMARY KEY AUTOINCREMENT,\n  chat_colors BLOB\n)"
+      ),
+      Statement(
+        name = "emoji_search",
+        sql = "CREATE TABLE emoji_search (\n        _id INTEGER PRIMARY KEY,\n        label TEXT NOT NULL,\n        emoji TEXT NOT NULL,\n        rank INTEGER DEFAULT 2147483647 \n      )"
+      ),
+      Statement(
+        name = "avatar_picker",
+        sql = "CREATE TABLE avatar_picker (\n  _id INTEGER PRIMARY KEY AUTOINCREMENT,\n  last_used INTEGER DEFAULT 0,\n  group_id TEXT DEFAULT NULL,\n  avatar BLOB NOT NULL\n)"
+      ),
+      Statement(
+        name = "group_call_ring",
+        sql = "CREATE TABLE group_call_ring (\n  _id INTEGER PRIMARY KEY,\n  ring_id INTEGER UNIQUE,\n  date_received INTEGER,\n  ring_state INTEGER\n)"
+      ),
+      Statement(
+        name = "reaction",
+        sql = "CREATE TABLE reaction (\n  _id INTEGER PRIMARY KEY,\n  message_id INTEGER NOT NULL REFERENCES message (_id) ON DELETE CASCADE,\n  author_id INTEGER NOT NULL REFERENCES recipient (_id) ON DELETE CASCADE,\n  emoji TEXT NOT NULL,\n  date_sent INTEGER NOT NULL,\n  date_received INTEGER NOT NULL,\n  UNIQUE(message_id, author_id) ON CONFLICT REPLACE\n)"
+      ),
+      Statement(
+        name = "donation_receipt",
+        sql = "CREATE TABLE donation_receipt (\n  _id INTEGER PRIMARY KEY AUTOINCREMENT,\n  receipt_type TEXT NOT NULL,\n  receipt_date INTEGER NOT NULL,\n  amount TEXT NOT NULL,\n  currency TEXT NOT NULL,\n  subscription_level INTEGER NOT NULL\n)"
+      ),
+      Statement(
+        name = "story_sends",
+        sql = "CREATE TABLE story_sends (\n  _id INTEGER PRIMARY KEY,\n  message_id INTEGER NOT NULL REFERENCES message (_id) ON DELETE CASCADE,\n  recipient_id INTEGER NOT NULL REFERENCES recipient (_id) ON DELETE CASCADE,\n  sent_timestamp INTEGER NOT NULL,\n  allows_replies INTEGER NOT NULL,\n  distribution_id TEXT NOT NULL REFERENCES distribution_list (distribution_id) ON DELETE CASCADE\n)"
+      ),
+      Statement(
+        name = "cds",
+        sql = "CREATE TABLE cds (\n        _id INTEGER PRIMARY KEY,\n        e164 TEXT NOT NULL UNIQUE ON CONFLICT IGNORE,\n        last_seen_at INTEGER DEFAULT 0\n      )"
+      ),
+      Statement(
+        name = "remote_megaphone",
+        sql = "CREATE TABLE remote_megaphone (\n  _id INTEGER PRIMARY KEY,\n  uuid TEXT UNIQUE NOT NULL,\n  priority INTEGER NOT NULL,\n  countries TEXT,\n  minimum_version INTEGER NOT NULL,\n  dont_show_before INTEGER NOT NULL,\n  dont_show_after INTEGER NOT NULL,\n  show_for_days INTEGER NOT NULL,\n  conditional_id TEXT,\n  primary_action_id TEXT,\n  secondary_action_id TEXT,\n  image_url TEXT,\n  image_uri TEXT DEFAULT NULL,\n  title TEXT NOT NULL,\n  body TEXT NOT NULL,\n  primary_action_text TEXT,\n  secondary_action_text TEXT,\n  shown_at INTEGER DEFAULT 0,\n  finished_at INTEGER DEFAULT 0,\n  primary_action_data TEXT DEFAULT NULL,\n  secondary_action_data TEXT DEFAULT NULL,\n  snoozed_at INTEGER DEFAULT 0,\n  seen_count INTEGER DEFAULT 0\n)"
+      ),
+      Statement(
+        name = "pending_pni_signature_message",
+        sql = "CREATE TABLE pending_pni_signature_message (\n        _id INTEGER PRIMARY KEY,\n        recipient_id INTEGER NOT NULL REFERENCES recipient (_id) ON DELETE CASCADE,\n        sent_timestamp INTEGER NOT NULL,\n        device_id INTEGER NOT NULL\n      )"
+      ),
+      Statement(
+        name = "call",
+        sql = "CREATE TABLE call (\n  _id INTEGER PRIMARY KEY,\n  call_id INTEGER NOT NULL UNIQUE,\n  message_id INTEGER NOT NULL REFERENCES message (_id) ON DELETE CASCADE,\n  peer INTEGER NOT NULL REFERENCES recipient (_id) ON DELETE CASCADE,\n  type INTEGER NOT NULL,\n  direction INTEGER NOT NULL,\n  event INTEGER NOT NULL\n)"
+      ),
+      Statement(
+        name = "message_fts",
+        sql = "CREATE VIRTUAL TABLE message_fts USING fts5(body, thread_id UNINDEXED, content=message, content_rowid=_id)"
+      ),
+      Statement(
+        name = "remapped_recipients",
+        sql = "CREATE TABLE remapped_recipients (\n        _id INTEGER PRIMARY KEY AUTOINCREMENT, \n        old_id INTEGER UNIQUE, \n        new_id INTEGER\n      )"
+      ),
+      Statement(
+        name = "remapped_threads",
+        sql = "CREATE TABLE remapped_threads (\n        _id INTEGER PRIMARY KEY AUTOINCREMENT, \n        old_id INTEGER UNIQUE, \n        new_id INTEGER\n      )"
+      ),
+      Statement(
+        name = "msl_payload",
+        sql = "CREATE TABLE msl_payload (\n        _id INTEGER PRIMARY KEY,\n        date_sent INTEGER NOT NULL,\n        content BLOB NOT NULL,\n        content_hint INTEGER NOT NULL,\n        urgent INTEGER NOT NULL DEFAULT 1\n      )"
+      ),
+      Statement(
+        name = "msl_recipient",
+        sql = "CREATE TABLE msl_recipient (\n        _id INTEGER PRIMARY KEY,\n        payload_id INTEGER NOT NULL REFERENCES msl_payload (_id) ON DELETE CASCADE,\n        recipient_id INTEGER NOT NULL, \n        device INTEGER NOT NULL\n      )"
+      ),
+      Statement(
+        name = "msl_message",
+        sql = "CREATE TABLE msl_message (\n        _id INTEGER PRIMARY KEY,\n        payload_id INTEGER NOT NULL REFERENCES msl_payload (_id) ON DELETE CASCADE,\n        message_id INTEGER NOT NULL\n      )"
+      ),
+      Statement(
+        name = "notification_profile",
+        sql = "CREATE TABLE notification_profile (\n  _id INTEGER PRIMARY KEY AUTOINCREMENT,\n  name TEXT NOT NULL UNIQUE,\n  emoji TEXT NOT NULL,\n  color TEXT NOT NULL,\n  created_at INTEGER NOT NULL,\n  allow_all_calls INTEGER NOT NULL DEFAULT 0,\n  allow_all_mentions INTEGER NOT NULL DEFAULT 0\n)"
+      ),
+      Statement(
+        name = "notification_profile_schedule",
+        sql = "CREATE TABLE notification_profile_schedule (\n  _id INTEGER PRIMARY KEY AUTOINCREMENT,\n  notification_profile_id INTEGER NOT NULL REFERENCES notification_profile (_id) ON DELETE CASCADE,\n  enabled INTEGER NOT NULL DEFAULT 0,\n  start INTEGER NOT NULL,\n  end INTEGER NOT NULL,\n  days_enabled TEXT NOT NULL\n)"
+      ),
+      Statement(
+        name = "notification_profile_allowed_members",
+        sql = "CREATE TABLE notification_profile_allowed_members (\n  _id INTEGER PRIMARY KEY AUTOINCREMENT,\n  notification_profile_id INTEGER NOT NULL REFERENCES notification_profile (_id) ON DELETE CASCADE,\n  recipient_id INTEGER NOT NULL,\n  UNIQUE(notification_profile_id, recipient_id) ON CONFLICT REPLACE\n)"
+      ),
+      Statement(
+        name = "distribution_list",
+        sql = "CREATE TABLE distribution_list (\n        _id INTEGER PRIMARY KEY AUTOINCREMENT,\n        name TEXT UNIQUE NOT NULL,\n        distribution_id TEXT UNIQUE NOT NULL,\n        recipient_id INTEGER UNIQUE REFERENCES recipient (_id),\n        allows_replies INTEGER DEFAULT 1,\n        deletion_timestamp INTEGER DEFAULT 0,\n        is_unknown INTEGER DEFAULT 0,\n        privacy_mode INTEGER DEFAULT 0\n      )"
+      ),
+      Statement(
+        name = "distribution_list_member",
+        sql = "CREATE TABLE distribution_list_member (\n        _id INTEGER PRIMARY KEY AUTOINCREMENT,\n        list_id INTEGER NOT NULL REFERENCES distribution_list (_id) ON DELETE CASCADE,\n        recipient_id INTEGER NOT NULL REFERENCES recipient (_id),\n        privacy_mode INTEGER DEFAULT 0\n      )"
+      ),
+      Statement(
+        name = "recipient_group_type_index",
+        sql = "CREATE INDEX recipient_group_type_index ON recipient (group_type)"
+      ),
+      Statement(
+        name = "recipient_pni_index",
+        sql = "CREATE UNIQUE INDEX recipient_pni_index ON recipient (pni)"
+      ),
+      Statement(
+        name = "recipient_service_id_profile_key",
+        sql = "CREATE INDEX recipient_service_id_profile_key ON recipient (uuid, profile_key) WHERE uuid NOT NULL AND profile_key NOT NULL"
+      ),
+      Statement(
+        name = "mms_read_and_notified_and_thread_id_index",
+        sql = "CREATE INDEX mms_read_and_notified_and_thread_id_index ON message (read, notified, thread_id)"
+      ),
+      Statement(
+        name = "mms_type_index",
+        sql = "CREATE INDEX mms_type_index ON message (type)"
+      ),
+      Statement(
+        name = "mms_date_sent_index",
+        sql = "CREATE INDEX mms_date_sent_index ON message (date_sent, recipient_id, thread_id)"
+      ),
+      Statement(
+        name = "mms_date_server_index",
+        sql = "CREATE INDEX mms_date_server_index ON message (date_server)"
+      ),
+      Statement(
+        name = "mms_thread_date_index",
+        sql = "CREATE INDEX mms_thread_date_index ON message (thread_id, date_received)"
+      ),
+      Statement(
+        name = "mms_reactions_unread_index",
+        sql = "CREATE INDEX mms_reactions_unread_index ON message (reactions_unread)"
+      ),
+      Statement(
+        name = "mms_story_type_index",
+        sql = "CREATE INDEX mms_story_type_index ON message (story_type)"
+      ),
+      Statement(
+        name = "mms_parent_story_id_index",
+        sql = "CREATE INDEX mms_parent_story_id_index ON message (parent_story_id)"
+      ),
+      Statement(
+        name = "mms_thread_story_parent_story_scheduled_date_index",
+        sql = "CREATE INDEX mms_thread_story_parent_story_scheduled_date_index ON message (thread_id, date_received, story_type, parent_story_id, scheduled_date)"
+      ),
+      Statement(
+        name = "message_quote_id_quote_author_scheduled_date_index",
+        sql = "CREATE INDEX message_quote_id_quote_author_scheduled_date_index ON message (quote_id, quote_author, scheduled_date)"
+      ),
+      Statement(
+        name = "mms_exported_index",
+        sql = "CREATE INDEX mms_exported_index ON message (exported)"
+      ),
+      Statement(
+        name = "mms_id_type_payment_transactions_index",
+        sql = "CREATE INDEX mms_id_type_payment_transactions_index ON message (_id,type) WHERE type & 12884901888 != 0"
+      ),
+      Statement(
+        name = "part_mms_id_index",
+        sql = "CREATE INDEX part_mms_id_index ON part (mid)"
+      ),
+      Statement(
+        name = "pending_push_index",
+        sql = "CREATE INDEX pending_push_index ON part (pending_push)"
+      ),
+      Statement(
+        name = "part_sticker_pack_id_index",
+        sql = "CREATE INDEX part_sticker_pack_id_index ON part (sticker_pack_id)"
+      ),
+      Statement(
+        name = "part_data_hash_index",
+        sql = "CREATE INDEX part_data_hash_index ON part (data_hash)"
+      ),
+      Statement(
+        name = "part_data_index",
+        sql = "CREATE INDEX part_data_index ON part (_data)"
+      ),
+      Statement(
+        name = "thread_recipient_id_index",
+        sql = "CREATE INDEX thread_recipient_id_index ON thread (recipient_id)"
+      ),
+      Statement(
+        name = "archived_count_index",
+        sql = "CREATE INDEX archived_count_index ON thread (archived, meaningful_messages)"
+      ),
+      Statement(
+        name = "thread_pinned_index",
+        sql = "CREATE INDEX thread_pinned_index ON thread (pinned)"
+      ),
+      Statement(
+        name = "thread_read",
+        sql = "CREATE INDEX thread_read ON thread (read)"
+      ),
+      Statement(
+        name = "draft_thread_index",
+        sql = "CREATE INDEX draft_thread_index ON drafts (thread_id)"
+      ),
+      Statement(
+        name = "group_id_index",
+        sql = "CREATE UNIQUE INDEX group_id_index ON groups (group_id)"
+      ),
+      Statement(
+        name = "group_recipient_id_index",
+        sql = "CREATE UNIQUE INDEX group_recipient_id_index ON groups (recipient_id)"
+      ),
+      Statement(
+        name = "expected_v2_id_index",
+        sql = "CREATE UNIQUE INDEX expected_v2_id_index ON groups (expected_v2_id)"
+      ),
+      Statement(
+        name = "group_distribution_id_index",
+        sql = "CREATE UNIQUE INDEX group_distribution_id_index ON groups(distribution_id)"
+      ),
+      Statement(
+        name = "group_receipt_mms_id_index",
+        sql = "CREATE INDEX group_receipt_mms_id_index ON group_receipts (mms_id)"
+      ),
+      Statement(
+        name = "sticker_pack_id_index",
+        sql = "CREATE INDEX sticker_pack_id_index ON sticker (pack_id)"
+      ),
+      Statement(
+        name = "sticker_sticker_id_index",
+        sql = "CREATE INDEX sticker_sticker_id_index ON sticker (sticker_id)"
+      ),
+      Statement(
+        name = "storage_key_type_index",
+        sql = "CREATE INDEX storage_key_type_index ON storage_key (type)"
+      ),
+      Statement(
+        name = "mention_message_id_index",
+        sql = "CREATE INDEX mention_message_id_index ON mention (message_id)"
+      ),
+      Statement(
+        name = "mention_recipient_id_thread_id_index",
+        sql = "CREATE INDEX mention_recipient_id_thread_id_index ON mention (recipient_id, thread_id)"
+      ),
+      Statement(
+        name = "timestamp_direction_index",
+        sql = "CREATE INDEX timestamp_direction_index ON payments (timestamp, direction)"
+      ),
+      Statement(
+        name = "timestamp_index",
+        sql = "CREATE INDEX timestamp_index ON payments (timestamp)"
+      ),
+      Statement(
+        name = "receipt_public_key_index",
+        sql = "CREATE UNIQUE INDEX receipt_public_key_index ON payments (receipt_public_key)"
+      ),
+      Statement(
+        name = "msl_payload_date_sent_index",
+        sql = "CREATE INDEX msl_payload_date_sent_index ON msl_payload (date_sent)"
+      ),
+      Statement(
+        name = "msl_recipient_recipient_index",
+        sql = "CREATE INDEX msl_recipient_recipient_index ON msl_recipient (recipient_id, device, payload_id)"
+      ),
+      Statement(
+        name = "msl_recipient_payload_index",
+        sql = "CREATE INDEX msl_recipient_payload_index ON msl_recipient (payload_id)"
+      ),
+      Statement(
+        name = "msl_message_message_index",
+        sql = "CREATE INDEX msl_message_message_index ON msl_message (message_id, payload_id)"
+      ),
+      Statement(
+        name = "date_received_index",
+        sql = "CREATE INDEX date_received_index on group_call_ring (date_received)"
+      ),
+      Statement(
+        name = "notification_profile_schedule_profile_index",
+        sql = "CREATE INDEX notification_profile_schedule_profile_index ON notification_profile_schedule (notification_profile_id)"
+      ),
+      Statement(
+        name = "notification_profile_allowed_members_profile_index",
+        sql = "CREATE INDEX notification_profile_allowed_members_profile_index ON notification_profile_allowed_members (notification_profile_id)"
+      ),
+      Statement(
+        name = "donation_receipt_type_index",
+        sql = "CREATE INDEX donation_receipt_type_index ON donation_receipt (receipt_type)"
+      ),
+      Statement(
+        name = "donation_receipt_date_index",
+        sql = "CREATE INDEX donation_receipt_date_index ON donation_receipt (receipt_date)"
+      ),
+      Statement(
+        name = "story_sends_recipient_id_sent_timestamp_allows_replies_index",
+        sql = "CREATE INDEX story_sends_recipient_id_sent_timestamp_allows_replies_index ON story_sends (recipient_id, sent_timestamp, allows_replies)"
+      ),
+      Statement(
+        name = "story_sends_message_id_distribution_id_index",
+        sql = "CREATE INDEX story_sends_message_id_distribution_id_index ON story_sends (message_id, distribution_id)"
+      ),
+      Statement(
+        name = "distribution_list_member_list_id_recipient_id_privacy_mode_index",
+        sql = "CREATE UNIQUE INDEX distribution_list_member_list_id_recipient_id_privacy_mode_index ON distribution_list_member (list_id, recipient_id, privacy_mode)"
+      ),
+      Statement(
+        name = "pending_pni_recipient_sent_device_index",
+        sql = "CREATE UNIQUE INDEX pending_pni_recipient_sent_device_index ON pending_pni_signature_message (recipient_id, sent_timestamp, device_id)"
+      ),
+      Statement(
+        name = "call_call_id_index",
+        sql = "CREATE INDEX call_call_id_index ON call (call_id)"
+      ),
+      Statement(
+        name = "call_message_id_index",
+        sql = "CREATE INDEX call_message_id_index ON call (message_id)"
+      ),
+      Statement(
+        name = "message_ai",
+        sql = "CREATE TRIGGER message_ai AFTER INSERT ON message BEGIN\n          INSERT INTO message_fts(rowid, body, thread_id) VALUES (new._id, new.body, new.thread_id);\n        END"
+      ),
+      Statement(
+        name = "message_ad",
+        sql = "CREATE TRIGGER message_ad AFTER DELETE ON message BEGIN\n          INSERT INTO message_fts(message_fts, rowid, body, thread_id) VALUES('delete', old._id, old.body, old.thread_id);\n        END"
+      ),
+      Statement(
+        name = "message_au",
+        sql = "CREATE TRIGGER message_au AFTER UPDATE ON message BEGIN\n          INSERT INTO message_fts(message_fts, rowid, body, thread_id) VALUES('delete', old._id, old.body, old.thread_id);\n          INSERT INTO message_fts(rowid, body, thread_id) VALUES (new._id, new.body, new.thread_id);\n        END"
+      ),
+      Statement(
+        name = "msl_message_delete",
+        sql = "CREATE TRIGGER msl_message_delete AFTER DELETE ON message \n        BEGIN \n        \tDELETE FROM msl_payload WHERE _id IN (SELECT payload_id FROM msl_message WHERE message_id = old._id);\n        END"
+      ),
+      Statement(
+        name = "msl_attachment_delete",
+        sql = "CREATE TRIGGER msl_attachment_delete AFTER DELETE ON part\n        BEGIN\n        \tDELETE FROM msl_payload WHERE _id IN (SELECT payload_id FROM msl_message WHERE message_id = old.mid);\n        END"
+      )
+    )
+  }
+}
@@ -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,11 +1,6 @@
-/*
- * Copyright 2026 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 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.isNotNull
@@ -15,27 +10,27 @@ 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.util.CursorUtil
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
 import org.thoughtcrime.securesms.mms.IncomingMessage
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.testutil.RecipientTestRule
+import org.thoughtcrime.securesms.testing.SignalDatabaseRule
+import java.util.UUID

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

  @get:Rule
-  val recipients = RecipientTestRule()
+  val databaseRule = SignalDatabaseRule()

  private lateinit var senderId: RecipientId
  private var threadId: Long = 0

  @Before
  fun setUp() {
-    senderId = recipients.createRecipient("Sender Name")
+    val senderAci = ACI.from(UUID.randomUUID())
+    senderId = SignalDatabase.recipients.getOrInsertFromServiceId(senderAci)
    threadId = SignalDatabase.threads.getOrCreateThreadIdFor(senderId, false, ThreadTable.DistributionTypes.DEFAULT)
  }

@@ -197,7 +192,7 @@ class EditMessageRevisionTest {
  }

  private fun getLatestRevisionId(messageId: Long): Long? {
-    return SignalDatabase.writableDatabase
+    return SignalDatabase.rawDatabase
      .query(MessageTable.TABLE_NAME, arrayOf(MessageTable.LATEST_REVISION_ID), "${MessageTable.ID} = ?", arrayOf(messageId.toString()), null, null, null)
      .use { cursor ->
        if (cursor.moveToFirst()) {
@@ -220,14 +215,14 @@ class EditMessageRevisionTest {
  }

  private fun markAsRead(messageId: Long) {
-    SignalDatabase.writableDatabase.execSQL(
+    SignalDatabase.rawDatabase.execSQL(
      "UPDATE ${MessageTable.TABLE_NAME} SET ${MessageTable.READ} = 1 WHERE ${MessageTable.ID} = ?",
      arrayOf(messageId)
    )
  }

  private fun markAsReadAndNotified(messageId: Long) {
-    SignalDatabase.writableDatabase.execSQL(
+    SignalDatabase.rawDatabase.execSQL(
      "UPDATE ${MessageTable.TABLE_NAME} SET ${MessageTable.READ} = 1, ${MessageTable.NOTIFIED} = 1 WHERE ${MessageTable.ID} = ?",
      arrayOf(messageId)
    )
@@ -1,20 +1,11 @@
-/*
- * Copyright 2026 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 package org.thoughtcrime.securesms.database

-import android.app.Application
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 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.signal.core.util.readToList
 import org.signal.core.util.requireLong
@@ -26,20 +17,16 @@ import org.signal.storageservice.storage.protos.groups.local.DecryptedMember
 import org.thoughtcrime.securesms.groups.GroupId
 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 java.security.SecureRandom
 import kotlin.random.Random

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

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

  private lateinit var groupTable: GroupTable
-  private lateinit var alice: RecipientId
-  private lateinit var bob: RecipientId

  @Before
  fun setUp() {
@@ -47,9 +34,6 @@ class GroupTableTest {

    groupTable.writableDatabase.deleteAll(GroupTable.TABLE_NAME)
    groupTable.writableDatabase.deleteAll(GroupTable.MembershipTable.TABLE_NAME)
-
-    alice = recipients.createRecipient("Buddy #0")
-    bob = recipients.createRecipient("Buddy #1")
  }

  @Test
@@ -59,7 +43,7 @@ class GroupTableTest {
    //language=sql
    val members: List<RecipientId> = groupTable.writableDatabase.query(
      """
-      SELECT ${GroupTable.MembershipTable.RECIPIENT_ID}
+      SELECT ${GroupTable.MembershipTable.RECIPIENT_ID} 
      FROM ${GroupTable.MembershipTable.TABLE_NAME}
      WHERE ${GroupTable.MembershipTable.GROUP_ID} = "${groupId.serialize()}"
      """.trimIndent()
@@ -75,7 +59,7 @@ class GroupTableTest {
    val groupId = insertPushGroup()
    insertThread(groupId)

-    val groups = groupTable.getGroupsContainingMember(alice, false)
+    val groups = groupTable.getGroupsContainingMember(harness.others[0], false)

    assertEquals(1, groups.size)
    assertEquals(groupId, groups[0].id)
@@ -93,7 +77,7 @@ class GroupTableTest {
  @Test
  fun givenGroups_whenIGetGroups_thenIExpectBothGroups() {
    insertPushGroup()
-    insertMmsGroup(members = listOf(bob))
+    insertMmsGroup(members = listOf(harness.others[1]))

    val groups = groupTable.getGroups()

@@ -106,7 +90,7 @@ class GroupTableTest {
    insertThread(v2Group)

    val groupRecord = groupTable.getGroup(v2Group).get()
-    assertEquals(setOf(recipients.self, alice), groupRecord.members.toSet())
+    assertEquals(setOf(harness.self.id, harness.others[0]), groupRecord.members.toSet())
  }

  @Test
@@ -115,24 +99,29 @@ class GroupTableTest {
    insertThread(v2Group)

    groupTable.writableDatabase.withinTransaction {
-      RemappedRecords.getInstance().addRecipient(alice, bob)
+      RemappedRecords.getInstance().addRecipient(harness.others[0], harness.others[1])
    }

    val groupRecord = groupTable.getGroup(v2Group).get()
-    assertEquals(setOf(recipients.self, bob), groupRecord.members.toSet())
+    assertEquals(setOf(harness.self.id, harness.others[1]), groupRecord.members.toSet())
  }

  @Test
  fun givenAGroup_whenIRemapRecipientsThatHaveAConflict_thenIExpectDeletion() {
-    val v2Group = insertPushGroupWithSelfAndOthers(listOf(alice, bob))
+    val v2Group = insertPushGroupWithSelfAndOthers(
+      listOf(
+        harness.others[0],
+        harness.others[1]
+      )
+    )

    insertThread(v2Group)

-    groupTable.remapRecipient(alice, bob)
+    groupTable.remapRecipient(harness.others[0], harness.others[1])

    val groupRecord = groupTable.getGroup(v2Group).get()

-    assertEquals(setOf(recipients.self, bob), groupRecord.members.toSet())
+    assertEquals(setOf(harness.self.id, harness.others[1]), groupRecord.members.toSet())
  }

  @Test
@@ -140,18 +129,19 @@ class GroupTableTest {
    val v2Group = insertPushGroup()
    insertThread(v2Group)

-    groupTable.remapRecipient(alice, bob)
+    val newId = harness.others[1]
+    groupTable.remapRecipient(harness.others[0], newId)

    val groupRecord = groupTable.getGroup(v2Group).get()

-    assertEquals(setOf(recipients.self, bob), groupRecord.members.toSet())
+    assertEquals(setOf(harness.self.id, newId), groupRecord.members.toSet())
  }

  @Test
  fun givenAGroupAndMember_whenIIsCurrentMember_thenIExpectTrue() {
    val v2Group = insertPushGroup()

-    val actual = groupTable.isCurrentMember(v2Group.requirePush(), alice)
+    val actual = groupTable.isCurrentMember(v2Group.requirePush(), harness.others[0])

    assertTrue(actual)
  }
@@ -160,8 +150,8 @@ class GroupTableTest {
  fun givenAGroupAndMember_whenIRemove_thenIExpectNotAMember() {
    val v2Group = insertPushGroup()

-    groupTable.remove(v2Group, alice)
-    val actual = groupTable.isCurrentMember(v2Group.requirePush(), alice)
+    groupTable.remove(v2Group, harness.others[0])
+    val actual = groupTable.isCurrentMember(v2Group.requirePush(), harness.others[0])

    assertFalse(actual)
  }
@@ -170,7 +160,7 @@ class GroupTableTest {
  fun givenAGroupAndNonMember_whenIIsCurrentMember_thenIExpectFalse() {
    val v2Group = insertPushGroup()

-    val actual = groupTable.isCurrentMember(v2Group.requirePush(), bob)
+    val actual = groupTable.isCurrentMember(v2Group.requirePush(), harness.others[1])

    assertFalse(actual)
  }
@@ -190,7 +180,7 @@ class GroupTableTest {
  @Test
  fun givenASharedActiveGroupWithoutAThread_whenISearchForRecipientsWithGroupsInCommon_thenIExpectThatGroup() {
    val groupInCommon = insertPushGroup()
-    val expected = Recipient.resolved(alice)
+    val expected = Recipient.resolved(harness.others[0])

    SignalDatabase.recipients.setProfileSharing(expected.id, false)

@@ -289,9 +279,16 @@ class GroupTableTest {
    return SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(groupRecipient))
  }

-  private fun insertMmsGroup(members: List<RecipientId> = listOf(recipients.self, alice)): GroupId {
+  private fun insertMmsGroup(members: List<RecipientId> = listOf(harness.self.id, harness.others[0])): GroupId {
    val id = GroupId.createMms(SecureRandom())
-    groupTable.create(id, null, members)
+    groupTable.create(
+      id,
+      null,
+      members.apply {
+        println("Creating a group with ${members.size} members")
+      }
+    )
+
    return id
  }

@@ -299,12 +296,12 @@ class GroupTableTest {
    title: String = "Test Group",
    members: List<DecryptedMember> = listOf(
      DecryptedMember.Builder()
-        .aciBytes(recipients.selfAci.toByteString())
+        .aciBytes(harness.self.requireAci().toByteString())
        .joinedAtRevision(0)
        .role(Member.Role.DEFAULT)
        .build(),
      DecryptedMember.Builder()
-        .aciBytes(Recipient.resolved(alice).requireAci().toByteString())
+        .aciBytes(Recipient.resolved(harness.others[0]).requireAci().toByteString())
        .joinedAtRevision(0)
        .role(Member.Role.DEFAULT)
        .build()
@@ -324,7 +321,7 @@ class GroupTableTest {
    val groupMasterKey = GroupMasterKey(Random.nextBytes(GroupMasterKey.SIZE))

    val selfMember: DecryptedMember = DecryptedMember.Builder()
-      .aciBytes(recipients.selfAci.toByteString())
+      .aciBytes(harness.self.requireAci().toByteString())
      .joinedAtRevision(0)
      .role(Member.Role.DEFAULT)
      .build()
@@ -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,384 @@
+package org.thoughtcrime.securesms.database
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Ignore
+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.thoughtcrime.securesms.database.model.DistributionListId
+import org.thoughtcrime.securesms.database.model.ParentStoryId
+import org.thoughtcrime.securesms.database.model.StoryType
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.mms.IncomingMessage
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.recipients.RecipientId
+import java.util.UUID
+import java.util.concurrent.TimeUnit
+
+@Suppress("ClassName")
+@RunWith(AndroidJUnit4::class)
+class MmsTableTest_stories {
+
+  private lateinit var mms: MessageTable
+
+  private val localAci = ACI.from(UUID.randomUUID())
+  private val localPni = PNI.from(UUID.randomUUID())
+
+  private lateinit var myStory: Recipient
+  private lateinit var recipients: List<RecipientId>
+  private lateinit var releaseChannelRecipient: Recipient
+
+  @Before
+  fun setUp() {
+    mms = SignalDatabase.messages
+
+    mms.deleteAllThreads()
+
+    SignalStore.account.setAci(localAci)
+    SignalStore.account.setPni(localPni)
+
+    myStory = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromDistributionListId(DistributionListId.MY_STORY))
+    recipients = (0 until 5).map { SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID())) }
+    releaseChannelRecipient = Recipient.resolved(SignalDatabase.recipients.insertReleaseChannelRecipient())
+
+    SignalStore.releaseChannel.setReleaseChannelRecipientId(releaseChannelRecipient.id)
+  }
+
+  @Test
+  fun givenNoStories_whenIGetOrderedStoryRecipientsAndIds_thenIExpectAnEmptyList() {
+    // WHEN
+    val result = mms.getOrderedStoryRecipientsAndIds(false)
+
+    // THEN
+    assertEquals(0, result.size)
+  }
+
+  @Test
+  fun givenOneOutgoingAndOneIncomingStory_whenIGetOrderedStoryRecipientsAndIds_thenIExpectIncomingThenOutgoing() {
+    // GIVEN
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(myStory)
+    val sender = recipients[0]
+
+    MmsHelper.insert(
+      recipient = myStory,
+      sentTimeMillis = 1,
+      storyType = StoryType.STORY_WITH_REPLIES,
+      threadId = threadId
+    )
+
+    MmsHelper.insert(
+      IncomingMessage(
+        type = MessageType.NORMAL,
+        from = sender,
+        sentTimeMillis = 2,
+        serverTimeMillis = 2,
+        receivedTimeMillis = 2,
+        storyType = StoryType.STORY_WITH_REPLIES
+      ),
+      -1L
+    )
+
+    // WHEN
+    val result = mms.getOrderedStoryRecipientsAndIds(false)
+
+    // THEN
+    assertEquals(listOf(sender.toLong(), myStory.id.toLong()), result.map { it.recipientId.toLong() })
+  }
+
+  @Test
+  fun givenAStory_whenISetIncomingStoryMessageViewed_thenIExpectASetReceiptTimestamp() {
+    // GIVEN
+    val sender = recipients[0]
+    val messageId = MmsHelper.insert(
+      IncomingMessage(
+        type = MessageType.NORMAL,
+        from = sender,
+        sentTimeMillis = 2,
+        serverTimeMillis = 2,
+        receivedTimeMillis = 2,
+        storyType = StoryType.STORY_WITH_REPLIES
+      ),
+      -1L
+    ).get().messageId
+
+    val messageBeforeMark = SignalDatabase.messages.getMessageRecord(messageId)
+    assertFalse(messageBeforeMark.incomingStoryViewedAtTimestamp > 0)
+
+    // WHEN
+    SignalDatabase.messages.setIncomingMessageViewed(messageId)
+
+    // THEN
+    val messageAfterMark = SignalDatabase.messages.getMessageRecord(messageId)
+    assertTrue(messageAfterMark.incomingStoryViewedAtTimestamp > 0)
+  }
+
+  @Ignore
+  @Test
+  fun given5ViewedStories_whenIGetOrderedStoryRecipientsAndIds_thenIExpectLatestViewedFirst() {
+    // GIVEN
+    val messageIds = recipients.take(5).map {
+      MmsHelper.insert(
+        IncomingMessage(
+          type = MessageType.NORMAL,
+          from = it,
+          sentTimeMillis = 2,
+          serverTimeMillis = 2,
+          receivedTimeMillis = 2,
+          storyType = StoryType.STORY_WITH_REPLIES
+        ),
+        -1L
+      ).get().messageId
+    }
+
+    val randomizedOrderedIds = messageIds.shuffled()
+    randomizedOrderedIds.forEach {
+      SignalDatabase.messages.setIncomingMessageViewed(it)
+      Thread.sleep(5)
+    }
+
+    // WHEN
+    val result = SignalDatabase.messages.getOrderedStoryRecipientsAndIds(false)
+    val resultOrderedIds = result.map { it.messageId }
+
+    // THEN
+    assertEquals(randomizedOrderedIds.reversed(), resultOrderedIds)
+  }
+
+  @Test
+  fun given15Stories_whenIGetOrderedStoryRecipientsAndIds_thenIExpectUnviewedThenInterspersedViewedAndSelfSendsAllDescending() {
+    val myStoryThread = SignalDatabase.threads.getOrCreateThreadIdFor(myStory)
+
+    val unviewedIds: List<Long> = (0 until 5).map {
+      Thread.sleep(5)
+      MmsHelper.insert(
+        IncomingMessage(
+          type = MessageType.NORMAL,
+          from = recipients[it],
+          sentTimeMillis = System.currentTimeMillis(),
+          serverTimeMillis = 2,
+          receivedTimeMillis = 2,
+          storyType = StoryType.STORY_WITH_REPLIES
+        ),
+        -1L
+      ).get().messageId
+    }
+
+    val viewedIds: List<Long> = (0 until 5).map {
+      Thread.sleep(5)
+      MmsHelper.insert(
+        IncomingMessage(
+          type = MessageType.NORMAL,
+          from = recipients[it],
+          sentTimeMillis = System.currentTimeMillis(),
+          serverTimeMillis = 2,
+          receivedTimeMillis = 2,
+          storyType = StoryType.STORY_WITH_REPLIES
+        ),
+        -1L
+      ).get().messageId
+    }
+
+    val interspersedIds: List<Long> = (0 until 10).map {
+      Thread.sleep(5)
+      if (it % 2 == 0) {
+        SignalDatabase.messages.setIncomingMessageViewed(viewedIds[it / 2])
+        viewedIds[it / 2]
+      } else {
+        MmsHelper.insert(
+          recipient = myStory,
+          sentTimeMillis = System.currentTimeMillis(),
+          storyType = StoryType.STORY_WITH_REPLIES,
+          threadId = myStoryThread
+        )
+      }
+    }
+
+    val result = SignalDatabase.messages.getOrderedStoryRecipientsAndIds(false)
+    val resultOrderedIds = result.map { it.messageId }
+
+    assertEquals(unviewedIds.reversed() + interspersedIds.reversed(), resultOrderedIds)
+  }
+
+  @Test
+  fun givenNoStories_whenICheckIsOutgoingStoryAlreadyInDatabase_thenIExpectFalse() {
+    // WHEN
+    val result = mms.isOutgoingStoryAlreadyInDatabase(recipients[0], 200)
+
+    // THEN
+    assertFalse(result)
+  }
+
+  @Test
+  fun givenNoOutgoingStories_whenICheckIsOutgoingStoryAlreadyInDatabase_thenIExpectFalse() {
+    // GIVEN
+    MmsHelper.insert(
+      IncomingMessage(
+        type = MessageType.NORMAL,
+        from = recipients[0],
+        sentTimeMillis = 200,
+        serverTimeMillis = 2,
+        receivedTimeMillis = 2,
+        storyType = StoryType.STORY_WITH_REPLIES
+      ),
+      -1L
+    )
+
+    // WHEN
+    val result = mms.isOutgoingStoryAlreadyInDatabase(recipients[0], 200)
+
+    // THEN
+    assertFalse(result)
+  }
+
+  @Test
+  fun givenOutgoingStoryExistsForRecipientAndTime_whenICheckIsOutgoingStoryAlreadyInDatabase_thenIExpectTrue() {
+    // GIVEN
+    MmsHelper.insert(
+      recipient = myStory,
+      sentTimeMillis = 200,
+      storyType = StoryType.STORY_WITH_REPLIES
+    )
+
+    // WHEN
+    val result = mms.isOutgoingStoryAlreadyInDatabase(myStory.id, 200)
+
+    // THEN
+    assertTrue(result)
+  }
+
+  @Test
+  fun givenAGroupStoryWithNoReplies_whenICheckHasSelfReplyInGroupStory_thenIExpectFalse() {
+    // GIVEN
+    val groupStoryId = MmsHelper.insert(
+      recipient = myStory,
+      sentTimeMillis = 200,
+      storyType = StoryType.STORY_WITH_REPLIES
+    )
+
+    // WHEN
+    val result = mms.hasGroupReplyOrReactionInStory(groupStoryId)
+
+    // THEN
+    assertFalse(result)
+  }
+
+  @Ignore
+  @Test
+  fun givenAGroupStoryWithAReplyFromSelf_whenICheckHasSelfReplyInGroupStory_thenIExpectTrue() {
+    // GIVEN
+    val groupStoryId = MmsHelper.insert(
+      recipient = myStory,
+      sentTimeMillis = 200,
+      storyType = StoryType.STORY_WITH_REPLIES,
+      threadId = -1L
+    )
+
+    MmsHelper.insert(
+      recipient = myStory,
+      sentTimeMillis = 201,
+      storyType = StoryType.NONE,
+      parentStoryId = ParentStoryId.GroupReply(groupStoryId)
+    )
+
+    // WHEN
+    val result = mms.hasGroupReplyOrReactionInStory(groupStoryId)
+
+    // THEN
+    assertTrue(result)
+  }
+
+  @Test
+  fun givenAGroupStoryWithAReactionFromSelf_whenICheckHasSelfReplyInGroupStory_thenIExpectTrue() {
+    // GIVEN
+    val groupStoryId = MmsHelper.insert(
+      recipient = myStory,
+      sentTimeMillis = 200,
+      storyType = StoryType.STORY_WITH_REPLIES
+    )
+
+    MmsHelper.insert(
+      recipient = myStory,
+      sentTimeMillis = 201,
+      storyType = StoryType.NONE,
+      parentStoryId = ParentStoryId.GroupReply(groupStoryId),
+      isStoryReaction = true
+    )
+
+    // WHEN
+    val result = mms.hasGroupReplyOrReactionInStory(groupStoryId)
+
+    // THEN
+    assertTrue(result)
+  }
+
+  @Test
+  fun givenAGroupStoryWithAReplyFromSomeoneElse_whenICheckHasSelfReplyInGroupStory_thenIExpectFalse() {
+    // GIVEN
+    val groupStoryId = MmsHelper.insert(
+      recipient = myStory,
+      sentTimeMillis = 200,
+      storyType = StoryType.STORY_WITH_REPLIES
+    )
+
+    MmsHelper.insert(
+      IncomingMessage(
+        type = MessageType.NORMAL,
+        from = myStory.id,
+        sentTimeMillis = 201,
+        serverTimeMillis = 201,
+        receivedTimeMillis = 202,
+        parentStoryId = ParentStoryId.GroupReply(groupStoryId)
+      ),
+      SignalDatabase.threads.getOrCreateThreadIdFor(myStory, ThreadTable.DistributionTypes.DEFAULT)
+    )
+
+    // WHEN
+    val result = mms.hasGroupReplyOrReactionInStory(groupStoryId)
+
+    // THEN
+    assertFalse(result)
+  }
+
+  @Test
+  fun givenNotViewedOnboardingAndOnlyStoryIsOnboardingAndAdded2DaysAgo_whenIGetOldestStoryTimestamp_thenIExpectNull() {
+    // GIVEN
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(releaseChannelRecipient)
+    MmsHelper.insert(
+      recipient = releaseChannelRecipient,
+      sentTimeMillis = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(2),
+      storyType = StoryType.STORY_WITH_REPLIES,
+      threadId = threadId
+    )
+
+    // WHEN
+    val oldestTimestamp = SignalDatabase.messages.getOldestStorySendTimestamp(false)
+
+    // THEN
+    assertNull(oldestTimestamp)
+  }
+
+  @Test
+  fun givenViewedOnboardingAndOnlyStoryIsOnboardingAndAdded2DaysAgo_whenIGetOldestStoryTimestamp_thenIExpectNotNull() {
+    // GIVEN
+    val expected = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(2)
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(releaseChannelRecipient)
+    MmsHelper.insert(
+      recipient = releaseChannelRecipient,
+      sentTimeMillis = expected,
+      storyType = StoryType.STORY_WITH_REPLIES,
+      threadId = threadId
+    )
+
+    // WHEN
+    val oldestTimestamp = SignalDatabase.messages.getOldestStorySendTimestamp(true)
+
+    // THEN
+    assertEquals(expected, oldestTimestamp)
+  }
+}
@@ -1,30 +1,32 @@
 /*
- * Copyright 2026 Signal Messenger, LLC
+ * Copyright 2024 Signal Messenger, LLC
 * SPDX-License-Identifier: AGPL-3.0-only
 */

 package org.thoughtcrime.securesms.database

-import android.app.Application
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import assertk.assertThat
 import assertk.assertions.hasSize
 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.storageservice.storage.protos.groups.Member
+import org.signal.storageservice.storage.protos.groups.local.DecryptedMember
+import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.mms.IncomingMessage
 import org.thoughtcrime.securesms.profiles.ProfileName
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.testutil.RecipientTestRule
+import org.thoughtcrime.securesms.testing.GroupTestingUtils
+import org.thoughtcrime.securesms.testing.SignalActivityRule

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

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

  private lateinit var alice: RecipientId
  private lateinit var bob: RecipientId
@@ -32,24 +34,27 @@ class NameCollisionTablesTest {

  @Before
  fun setUp() {
-    alice = recipients.createRecipient("Buddy #0", profileSharing = false).also { recipients.insertIncomingMessage(it) }
-    bob = recipients.createRecipient("Buddy #1", profileSharing = false).also { recipients.insertIncomingMessage(it) }
-    charlie = recipients.createRecipient("Buddy #2", profileSharing = false).also { recipients.insertIncomingMessage(it) }
+    alice = setUpRecipient(harness.others[0])
+    bob = setUpRecipient(harness.others[1])
+    charlie = setUpRecipient(harness.others[2])
  }

  @Test
  fun givenAUserWithAThreadIdButNoConflicts_whenIGetCollisionsForThreadRecipient_thenIExpectNoCollisions() {
-    SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(alice))
-    val actual = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(alice)
+    val threadRecipientId = alice
+    SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(threadRecipientId))
+    val actual = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(threadRecipientId)

    assertThat(actual).hasSize(0)
  }

  @Test
  fun givenTwoUsers_whenOneChangesTheirProfileNameToMatchTheOther_thenIExpectANameCollision() {
-    setProfileNameAndCheckCollision(alice, ProfileName.fromParts("Alice", "Android"))
-    setProfileNameAndCheckCollision(bob, ProfileName.fromParts("Bob", "Android"))
-    setProfileNameAndCheckCollision(alice, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(alice, ProfileName.fromParts("Alice", "Android"))
+    setProfileName(bob, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(alice, ProfileName.fromParts("Bob", "Android"))
+
+    AppDependencies.recipientCache.clear()

    val actualAlice = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(alice)
    val actualBob = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(bob)
@@ -60,9 +65,9 @@ class NameCollisionTablesTest {

  @Test
  fun givenTwoUsersWithANameCollisions_whenOneChangesToADifferentName_thenIExpectNoNameCollisions() {
-    setProfileNameAndCheckCollision(alice, ProfileName.fromParts("Bob", "Android"))
-    setProfileNameAndCheckCollision(bob, ProfileName.fromParts("Bob", "Android"))
-    setProfileNameAndCheckCollision(alice, ProfileName.fromParts("Alice", "Android"))
+    setProfileName(alice, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(bob, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(alice, ProfileName.fromParts("Alice", "Android"))

    val actualAlice = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(alice)
    val actualBob = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(bob)
@@ -73,10 +78,12 @@ class NameCollisionTablesTest {

  @Test
  fun givenThreeUsersWithANameCollisions_whenOneChangesToADifferentName_thenIExpectTwoNameCollisions() {
-    setProfileNameAndCheckCollision(alice, ProfileName.fromParts("Bob", "Android"))
-    setProfileNameAndCheckCollision(bob, ProfileName.fromParts("Bob", "Android"))
-    setProfileNameAndCheckCollision(charlie, ProfileName.fromParts("Bob", "Android"))
-    setProfileNameAndCheckCollision(alice, ProfileName.fromParts("Alice", "Android"))
+    setProfileName(alice, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(bob, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(charlie, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(alice, ProfileName.fromParts("Alice", "Android"))
+
+    AppDependencies.recipientCache.clear()

    val actualAlice = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(alice)
    val actualBob = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(bob)
@@ -89,12 +96,14 @@ class NameCollisionTablesTest {

  @Test
  fun givenTwoUsersWithADismissedNameCollision_whenOneChangesToADifferentNameAndBack_thenIExpectANameCollision() {
-    setProfileNameAndCheckCollision(alice, ProfileName.fromParts("Bob", "Android"))
-    setProfileNameAndCheckCollision(bob, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(alice, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(bob, ProfileName.fromParts("Bob", "Android"))
    SignalDatabase.nameCollisions.markCollisionsForThreadRecipientDismissed(alice)

-    setProfileNameAndCheckCollision(alice, ProfileName.fromParts("Alice", "Android"))
-    setProfileNameAndCheckCollision(alice, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(alice, ProfileName.fromParts("Alice", "Android"))
+    setProfileName(alice, ProfileName.fromParts("Bob", "Android"))
+
+    AppDependencies.recipientCache.clear()

    val actualAlice = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(alice)

@@ -103,8 +112,8 @@ class NameCollisionTablesTest {

  @Test
  fun givenADismissedNameCollisionForAlice_whenIGetNameCollisionsForAlice_thenIExpectNoNameCollisions() {
-    setProfileNameAndCheckCollision(alice, ProfileName.fromParts("Bob", "Android"))
-    setProfileNameAndCheckCollision(bob, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(alice, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(bob, ProfileName.fromParts("Bob", "Android"))
    SignalDatabase.nameCollisions.markCollisionsForThreadRecipientDismissed(alice)

    val actualCollisions = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(alice)
@@ -116,10 +125,10 @@ class NameCollisionTablesTest {
  fun givenADismissedNameCollisionForAliceThatIUpdate_whenIGetNameCollisionsForAlice_thenIExpectNoNameCollisions() {
    SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(alice))

-    setProfileNameAndCheckCollision(alice, ProfileName.fromParts("Bob", "Android"))
-    setProfileNameAndCheckCollision(bob, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(alice, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(bob, ProfileName.fromParts("Bob", "Android"))
    SignalDatabase.nameCollisions.markCollisionsForThreadRecipientDismissed(alice)
-    setProfileNameAndCheckCollision(bob, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(bob, ProfileName.fromParts("Bob", "Android"))

    val actualCollisions = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(alice)

@@ -130,10 +139,12 @@ class NameCollisionTablesTest {
  fun givenADismissedNameCollisionForAlice_whenIGetNameCollisionsForBob_thenIExpectANameCollisionWithTwoEntries() {
    SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(alice))

-    setProfileNameAndCheckCollision(alice, ProfileName.fromParts("Bob", "Android"))
-    setProfileNameAndCheckCollision(bob, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(alice, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(bob, ProfileName.fromParts("Bob", "Android"))
    SignalDatabase.nameCollisions.markCollisionsForThreadRecipientDismissed(alice)

+    AppDependencies.recipientCache.clear()
+
    val actualCollisions = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(bob)

    assertThat(actualCollisions).hasSize(2)
@@ -141,13 +152,17 @@ class NameCollisionTablesTest {

  @Test
  fun givenAGroupWithAliceAndBob_whenIInsertNameChangeMessageForAlice_thenIExpectAGroupNameCollision() {
-    val info = recipients.createGroup(alice, bob)
+    val alice = Recipient.resolved(alice)
+    val bob = Recipient.resolved(bob)
+    val info = createGroup()

-    setProfileNameAndCheckCollision(alice, ProfileName.fromParts("Bob", "Android"))
-    setProfileNameAndCheckCollision(bob, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(alice.id, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(bob.id, ProfileName.fromParts("Bob", "Android"))

    SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(info.recipientId))
-    SignalDatabase.messages.insertProfileNameChangeMessages(Recipient.resolved(alice), "Bob Android", "Alice Android")
+    SignalDatabase.messages.insertProfileNameChangeMessages(alice, "Bob Android", "Alice Android")
+
+    AppDependencies.recipientCache.clear()

    val collisions = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(info.recipientId)

@@ -156,15 +171,17 @@ class NameCollisionTablesTest {

  @Test
  fun givenAGroupWithAliceAndBobWithDismissedCollision_whenIInsertNameChangeMessageForAlice_thenIExpectAGroupNameCollision() {
-    val info = recipients.createGroup(alice, bob)
+    val alice = Recipient.resolved(alice)
+    val bob = Recipient.resolved(bob)
+    val info = createGroup()

-    setProfileNameAndCheckCollision(alice, ProfileName.fromParts("Bob", "Android"))
-    setProfileNameAndCheckCollision(bob, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(alice.id, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(bob.id, ProfileName.fromParts("Bob", "Android"))

    SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(info.recipientId))
-    SignalDatabase.messages.insertProfileNameChangeMessages(Recipient.resolved(alice), "Bob Android", "Alice Android")
+    SignalDatabase.messages.insertProfileNameChangeMessages(alice, "Bob Android", "Alice Android")
    SignalDatabase.nameCollisions.markCollisionsForThreadRecipientDismissed(info.recipientId)
-    SignalDatabase.messages.insertProfileNameChangeMessages(Recipient.resolved(alice), "Bob Android", "Alice Android")
+    SignalDatabase.messages.insertProfileNameChangeMessages(alice, "Bob Android", "Alice Android")

    val collisions = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(info.recipientId)

@@ -173,32 +190,63 @@ class NameCollisionTablesTest {

  @Test
  fun givenAGroupWithAliceAndBob_whenIInsertNameChangeMessageForAliceWithMismatch_thenIExpectNoGroupNameCollision() {
-    val info = recipients.createGroup(alice, bob)
+    val alice = Recipient.resolved(alice)
+    val bob = Recipient.resolved(bob)
+    val info = createGroup()

-    setProfileNameAndCheckCollision(alice, ProfileName.fromParts("Alice", "Android"))
-    setProfileNameAndCheckCollision(bob, ProfileName.fromParts("Bob", "Android"))
+    setProfileName(alice.id, ProfileName.fromParts("Alice", "Android"))
+    setProfileName(bob.id, ProfileName.fromParts("Bob", "Android"))

    SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(info.recipientId))
-    SignalDatabase.messages.insertProfileNameChangeMessages(Recipient.resolved(alice), "Alice Android", "Bob Android")
+    SignalDatabase.messages.insertProfileNameChangeMessages(alice, "Alice Android", "Bob Android")

    val collisions = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(info.recipientId)

    assertThat(collisions).hasSize(0)
  }

-  @Test
-  fun givenTwoUsersInTheSameNameCollision_whenIRemapOneToTheOther_thenIExpectNoConstraintViolation() {
-    setProfileNameAndCheckCollision(alice, ProfileName.fromParts("Bob", "Android"))
-    setProfileNameAndCheckCollision(bob, ProfileName.fromParts("Bob", "Android"))
+  private fun setUpRecipient(recipientId: RecipientId): RecipientId {
+    SignalDatabase.recipients.setProfileSharing(recipientId, false)
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipientId, false)

-    SignalDatabase.nameCollisions.remapRecipient(alice, bob)
+    MmsHelper.insert(
+      threadId = threadId,
+      message = IncomingMessage(
+        type = MessageType.NORMAL,
+        from = recipientId,
+        groupId = null,
+        body = "hi",
+        sentTimeMillis = 100L,
+        receivedTimeMillis = 200L,
+        serverTimeMillis = 100L,
+        isUnidentified = true
+      )
+    )

-    assertThat(SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(alice)).hasSize(0)
-    assertThat(SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(bob)).hasSize(0)
+    return recipientId
  }

-  private fun setProfileNameAndCheckCollision(recipientId: RecipientId, name: ProfileName) {
-    recipients.setProfileName(recipientId, name)
+  private fun setProfileName(recipientId: RecipientId, name: ProfileName) {
+    SignalDatabase.recipients.setProfileName(recipientId, name)
+    Recipient.live(recipientId).refresh()
    SignalDatabase.nameCollisions.handleIndividualNameCollision(recipientId)
  }
+
+  private fun createGroup(): GroupTestingUtils.TestGroupInfo {
+    return GroupTestingUtils.insertGroup(
+      revision = 0,
+      DecryptedMember(
+        aciBytes = harness.self.requireAci().toByteString(),
+        role = Member.Role.ADMINISTRATOR
+      ),
+      DecryptedMember(
+        aciBytes = Recipient.resolved(alice).requireAci().toByteString(),
+        role = Member.Role.ADMINISTRATOR
+      ),
+      DecryptedMember(
+        aciBytes = Recipient.resolved(bob).requireAci().toByteString(),
+        role = Member.Role.ADMINISTRATOR
+      )
+    )
+  }
 }
@@ -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
@@ -1,49 +1,31 @@
-/*
- * Copyright 2026 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 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.assertFalse
 import org.junit.Assert.assertNotEquals
-import org.junit.Assert.assertNotNull
-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.CursorUtil
 import org.thoughtcrime.securesms.profiles.ProfileName
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.testutil.RecipientTestRule
+import org.thoughtcrime.securesms.testing.SignalActivityRule
 import java.util.UUID

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

  @get:Rule
-  val recipients = RecipientTestRule()
-
-  private lateinit var target: RecipientId
-  private lateinit var other: RecipientId
-
-  @Before
-  fun setUp() {
-    target = recipients.createRecipient("Target Person")
-    other = recipients.createRecipient("Other Person")
-  }
+  val harness = SignalActivityRule()

  @Test
  fun givenAHiddenRecipient_whenIQueryAllContacts_thenIExpectHiddenToBeReturned() {
-    SignalDatabase.recipients.setProfileName(target, ProfileName.fromParts("Hidden", "Person"))
-    SignalDatabase.recipients.markHidden(target)
+    val hiddenRecipient = harness.others[0]
+    SignalDatabase.recipients.setProfileName(hiddenRecipient, ProfileName.fromParts("Hidden", "Person"))
+    SignalDatabase.recipients.markHidden(hiddenRecipient)

    val results = SignalDatabase.recipients.queryAllContacts("Hidden", RecipientTable.IncludeSelfMode.Exclude)!!

@@ -52,8 +34,9 @@ class RecipientTableTest {

  @Test
  fun givenAHiddenRecipient_whenIGetSignalContacts_thenIDoNotExpectHiddenToBeReturned() {
-    SignalDatabase.recipients.setProfileName(target, ProfileName.fromParts("Hidden", "Person"))
-    SignalDatabase.recipients.markHidden(target)
+    val hiddenRecipient = harness.others[0]
+    SignalDatabase.recipients.setProfileName(hiddenRecipient, ProfileName.fromParts("Hidden", "Person"))
+    SignalDatabase.recipients.markHidden(hiddenRecipient)

    val results: MutableList<RecipientId> = SignalDatabase.recipients.getSignalContacts(RecipientTable.IncludeSelfMode.Exclude).use {
      val ids = mutableListOf<RecipientId>()
@@ -62,16 +45,17 @@ class RecipientTableTest {
      }

      ids
-    }
+    }!!

    assertNotEquals(0, results.size)
-    assertFalse(target in results)
+    assertFalse(hiddenRecipient in results)
  }

  @Test
  fun givenAHiddenRecipient_whenIQuerySignalContacts_thenIDoNotExpectHiddenToBeReturned() {
-    SignalDatabase.recipients.setProfileName(target, ProfileName.fromParts("Hidden", "Person"))
-    SignalDatabase.recipients.markHidden(target)
+    val hiddenRecipient = harness.others[0]
+    SignalDatabase.recipients.setProfileName(hiddenRecipient, ProfileName.fromParts("Hidden", "Person"))
+    SignalDatabase.recipients.markHidden(hiddenRecipient)

    val results = SignalDatabase.recipients.querySignalContacts(RecipientTable.ContactSearchQuery("Hidden", RecipientTable.IncludeSelfMode.Exclude))!!

@@ -80,8 +64,9 @@ class RecipientTableTest {

  @Test
  fun givenAHiddenRecipient_whenIGetNonGroupContacts_thenIDoNotExpectHiddenToBeReturned() {
-    SignalDatabase.recipients.setProfileName(target, ProfileName.fromParts("Hidden", "Person"))
-    SignalDatabase.recipients.markHidden(target)
+    val hiddenRecipient = harness.others[0]
+    SignalDatabase.recipients.setProfileName(hiddenRecipient, ProfileName.fromParts("Hidden", "Person"))
+    SignalDatabase.recipients.markHidden(hiddenRecipient)

    val results: MutableList<RecipientId> = SignalDatabase.recipients.getNonGroupContacts(RecipientTable.IncludeSelfMode.Exclude)?.use {
      val ids = mutableListOf<RecipientId>()
@@ -93,13 +78,14 @@ class RecipientTableTest {
    }!!

    assertNotEquals(0, results.size)
-    assertFalse(target in results)
+    assertFalse(hiddenRecipient in results)
  }

  @Test
  fun givenABlockedRecipient_whenIQueryAllContacts_thenIDoNotExpectBlockedToBeReturned() {
-    SignalDatabase.recipients.setProfileName(target, ProfileName.fromParts("Blocked", "Person"))
-    SignalDatabase.recipients.setBlocked(target, true)
+    val blockedRecipient = harness.others[0]
+    SignalDatabase.recipients.setProfileName(blockedRecipient, ProfileName.fromParts("Blocked", "Person"))
+    SignalDatabase.recipients.setBlocked(blockedRecipient, true)

    val results = SignalDatabase.recipients.queryAllContacts("Blocked", RecipientTable.IncludeSelfMode.Exclude)!!

@@ -108,8 +94,9 @@ class RecipientTableTest {

  @Test
  fun givenABlockedRecipient_whenIGetSignalContacts_thenIDoNotExpectBlockedToBeReturned() {
-    SignalDatabase.recipients.setProfileName(target, ProfileName.fromParts("Blocked", "Person"))
-    SignalDatabase.recipients.setBlocked(target, true)
+    val blockedRecipient = harness.others[0]
+    SignalDatabase.recipients.setProfileName(blockedRecipient, ProfileName.fromParts("Blocked", "Person"))
+    SignalDatabase.recipients.setBlocked(blockedRecipient, true)

    val results: MutableList<RecipientId> = SignalDatabase.recipients.getSignalContacts(RecipientTable.IncludeSelfMode.Exclude).use {
      val ids = mutableListOf<RecipientId>()
@@ -121,13 +108,14 @@ class RecipientTableTest {
    }

    assertNotEquals(0, results.size)
-    assertFalse(target in results)
+    assertFalse(blockedRecipient in results)
  }

  @Test
  fun givenABlockedRecipient_whenIQuerySignalContacts_thenIDoNotExpectBlockedToBeReturned() {
-    SignalDatabase.recipients.setProfileName(target, ProfileName.fromParts("Blocked", "Person"))
-    SignalDatabase.recipients.setBlocked(target, true)
+    val blockedRecipient = harness.others[0]
+    SignalDatabase.recipients.setProfileName(blockedRecipient, ProfileName.fromParts("Blocked", "Person"))
+    SignalDatabase.recipients.setBlocked(blockedRecipient, true)

    val results = SignalDatabase.recipients.querySignalContacts(RecipientTable.ContactSearchQuery("Blocked", RecipientTable.IncludeSelfMode.Exclude))!!

@@ -136,8 +124,9 @@ class RecipientTableTest {

  @Test
  fun givenABlockedRecipient_whenIGetNonGroupContacts_thenIDoNotExpectBlockedToBeReturned() {
-    SignalDatabase.recipients.setProfileName(target, ProfileName.fromParts("Blocked", "Person"))
-    SignalDatabase.recipients.setBlocked(target, true)
+    val blockedRecipient = harness.others[0]
+    SignalDatabase.recipients.setProfileName(blockedRecipient, ProfileName.fromParts("Blocked", "Person"))
+    SignalDatabase.recipients.setBlocked(blockedRecipient, true)

    val results: MutableList<RecipientId> = SignalDatabase.recipients.getNonGroupContacts(RecipientTable.IncludeSelfMode.Exclude)?.use {
      val ids = mutableListOf<RecipientId>()
@@ -149,7 +138,7 @@ class RecipientTableTest {
    }!!

    assertNotEquals(0, results.size)
-    assertFalse(target in results)
+    assertFalse(blockedRecipient in results)
  }

  @Test
@@ -159,6 +148,7 @@ class RecipientTableTest {
    SignalDatabase.recipients.markUnregistered(mainId)

    val byAci: RecipientId = SignalDatabase.recipients.getByAci(ACI_A).get()
+
    val byE164: RecipientId = SignalDatabase.recipients.getByE164(E164_A).get()
    val byPni: RecipientId = SignalDatabase.recipients.getByPni(PNI_A).get()

@@ -175,6 +165,7 @@ class RecipientTableTest {
    SignalDatabase.recipients.splitForStorageSyncIfNecessary(mainRecord.aci!!)

    val byAci: RecipientId = SignalDatabase.recipients.getByAci(ACI_A).get()
+
    val byE164: RecipientId = SignalDatabase.recipients.getByE164(E164_A).get()
    val byPni: RecipientId = SignalDatabase.recipients.getByPni(PNI_A).get()

@@ -183,27 +174,6 @@ class RecipientTableTest {
    assertNotEquals(byAci, byE164)
  }

-  @Test
-  fun givenAnAlreadySyncedRecipient_whenIMarkItUnregistered_thenItsStorageIdRotatesSoTheChangePublishes() {
-    // GIVEN a registered contact that already has a storage service id
-    val mainId = SignalDatabase.recipients.getAndPossiblyMerge(ACI_A, PNI_A, E164_A)
-    SignalDatabase.recipients.markRegistered(mainId, ACI_A)
-
-    val originalStorageId: ByteArray? = SignalDatabase.recipients.getRecord(mainId).storageId
-    assertNotNull("Precondition: an already-synced contact should have a storage id", originalStorageId)
-
-    // WHEN it is marked unregistered
-    SignalDatabase.recipients.markUnregistered(mainId)
-
-    // THEN its storage id must rotate
-    val updatedStorageId: ByteArray? = SignalDatabase.recipients.getRecord(mainId).storageId
-    assertNotNull("Storage id should still be set after unregistering an already-synced contact", updatedStorageId)
-    assertFalse(
-      "Storage id should rotate when an already-synced contact is unregistered, so the change publishes to storage service",
-      originalStorageId!!.contentEquals(updatedStorageId!!)
-    )
-  }
-
  companion object {
    val ACI_A = ACI.from(UUID.fromString("aaaa0000-5a76-47fa-a98a-7e72c948a82e"))
    val PNI_A = PNI.from(UUID.fromString("aaaa1111-c960-4f6c-8385-671ad2ffb999"))
@@ -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)
@@ -322,7 +313,7 @@ class SmsDatabaseTest_collapseJoinRequestEventsIfPossible {
      timestamp = wallClock,
      groupId = groupId,
      update = updateDescription,
-      isNotifiable = false,
+      isGroupAdd = false,
      serverGuid = null
    )
  }
@@ -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())
@@ -1,46 +1,49 @@
 /*
- * Copyright 2026 Signal Messenger, LLC
+ * Copyright 2023 Signal Messenger, LLC
 * SPDX-License-Identifier: AGPL-3.0-only
 */

 package org.thoughtcrime.securesms.database

-import android.app.Application
-import androidx.test.core.app.ApplicationProvider
+import androidx.test.platform.app.InstrumentationRegistry
+import io.mockk.every
+import io.mockk.mockkStatic
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 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.components.settings.app.chats.folders.ChatFolderRecord
 import org.thoughtcrime.securesms.conversationlist.model.ConversationFilter
 import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.testutil.RecipientTestRule
+import org.thoughtcrime.securesms.testing.SignalDatabaseRule
+import org.thoughtcrime.securesms.util.RemoteConfig
+import java.util.UUID

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

-  @get:Rule
-  val recipients = RecipientTestRule()
+  @Rule
+  @JvmField
+  val databaseRule = SignalDatabaseRule()

-  private lateinit var recipientId: RecipientId
+  private lateinit var recipient: Recipient
  private val allChats: ChatFolderRecord = ChatFolderRecord(folderType = ChatFolderRecord.FolderType.ALL)

  @Before
  fun setUp() {
-    recipientId = recipients.createRecipient("Alice Android")
+    mockkStatic(RemoteConfig::class)
+
+    every { RemoteConfig.showChatFolders } returns true
+
+    recipient = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID())))
  }

  @Test
  fun givenActiveUnarchivedThread_whenIGetUnarchivedConversationList_thenIExpectThread() {
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(recipientId))
-    recipients.insertOutgoingMessage(recipientId)
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
+    MmsHelper.insert(recipient = recipient, threadId = threadId)
    SignalDatabase.threads.update(threadId, false)

    SignalDatabase.threads.getUnarchivedConversationList(
@@ -52,17 +55,17 @@ class ThreadTableTest_active {
    ).use { threads ->
      assertEquals(1, threads.count)

-      val record = ThreadTable.StaticReader(threads, ApplicationProvider.getApplicationContext()).getNext()
+      val record = ThreadTable.StaticReader(threads, InstrumentationRegistry.getInstrumentation().context).getNext()

      assertNotNull(record)
-      assertEquals(record!!.recipient.id, recipientId)
+      assertEquals(record!!.recipient.id, recipient.id)
    }
  }

  @Test
  fun givenInactiveUnarchivedThread_whenIGetUnarchivedConversationList_thenIExpectNoThread() {
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(recipientId))
-    recipients.insertOutgoingMessage(recipientId)
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
+    MmsHelper.insert(recipient = recipient, threadId = threadId)
    SignalDatabase.threads.update(threadId, false)
    SignalDatabase.threads.deleteConversation(threadId)

@@ -76,14 +79,14 @@ class ThreadTableTest_active {
      assertEquals(0, threads.count)
    }

-    val threadId2 = SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(recipientId))
+    val threadId2 = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
    assertEquals(threadId2, threadId)
  }

  @Test
  fun givenActiveArchivedThread_whenIGetUnarchivedConversationList_thenIExpectNoThread() {
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(recipientId))
-    recipients.insertOutgoingMessage(recipientId)
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
+    MmsHelper.insert(recipient = recipient, threadId = threadId)
    SignalDatabase.threads.update(threadId, false)
    SignalDatabase.threads.setArchived(setOf(threadId), true)

@@ -100,8 +103,8 @@ class ThreadTableTest_active {

  @Test
  fun givenActiveArchivedThread_whenIGetArchivedConversationList_thenIExpectThread() {
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(recipientId))
-    recipients.insertOutgoingMessage(recipientId)
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
+    MmsHelper.insert(recipient = recipient, threadId = threadId)
    SignalDatabase.threads.update(threadId, false)
    SignalDatabase.threads.setArchived(setOf(threadId), true)

@@ -116,8 +119,8 @@ class ThreadTableTest_active {

  @Test
  fun givenInactiveArchivedThread_whenIGetArchivedConversationList_thenIExpectNoThread() {
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(recipientId))
-    recipients.insertOutgoingMessage(recipientId)
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
+    MmsHelper.insert(recipient = recipient, threadId = threadId)
    SignalDatabase.threads.update(threadId, false)
    SignalDatabase.threads.deleteConversation(threadId)
    SignalDatabase.threads.setArchived(setOf(threadId), true)
@@ -130,14 +133,14 @@ class ThreadTableTest_active {
      assertEquals(0, threads.count)
    }

-    val threadId2 = SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(recipientId))
+    val threadId2 = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
    assertEquals(threadId2, threadId)
  }

  @Test
  fun givenActiveArchivedThread_whenIDeactivateThread_thenIExpectNoMessages() {
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(recipientId))
-    recipients.insertOutgoingMessage(recipientId)
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
+    MmsHelper.insert(recipient = recipient, threadId = threadId)
    SignalDatabase.threads.update(threadId, false)

    SignalDatabase.messages.getConversation(threadId).use {
@@ -1,47 +1,45 @@
-/*
- * Copyright 2026 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
 package org.thoughtcrime.securesms.database

-import android.app.Application
+import io.mockk.every
+import io.mockk.mockkStatic
 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.util.CursorUtil
 import org.thoughtcrime.securesms.components.settings.app.chats.folders.ChatFolderRecord
 import org.thoughtcrime.securesms.conversationlist.model.ConversationFilter
 import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.testutil.RecipientTestRule
+import org.thoughtcrime.securesms.testing.SignalDatabaseRule
+import org.thoughtcrime.securesms.util.RemoteConfig
+import java.util.UUID

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

-  @get:Rule
-  val recipients = RecipientTestRule()
+  @Rule
+  @JvmField
+  val databaseRule = SignalDatabaseRule()

-  private lateinit var recipient: RecipientId
+  private lateinit var recipient: Recipient
  private val allChats: ChatFolderRecord = ChatFolderRecord(folderType = ChatFolderRecord.FolderType.ALL)

  @Before
  fun setUp() {
-    recipient = recipients.createRecipient("Alice Android")
+    mockkStatic(RemoteConfig::class)
+
+    every { RemoteConfig.showChatFolders } returns true
+
+    recipient = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID())))
  }

  @Test
  fun givenAPinnedThread_whenIDeleteTheLastMessage_thenIDoNotDeleteOrUnpinTheThread() {
    // GIVEN
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(recipient))
-    val messageId = recipients.insertOutgoingMessage(recipient)
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
+    val messageId = MmsHelper.insert(recipient = recipient, threadId = threadId)
    SignalDatabase.threads.pinConversations(listOf(threadId))

    // WHEN
@@ -55,8 +53,8 @@ class ThreadTableTest_pinned {
  @Test
  fun givenAPinnedThread_whenIDeleteTheLastMessage_thenIExpectTheThreadInUnarchivedCount() {
    // GIVEN
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(recipient))
-    val messageId = recipients.insertOutgoingMessage(recipient)
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
+    val messageId = MmsHelper.insert(recipient = recipient, threadId = threadId)
    SignalDatabase.threads.pinConversations(listOf(threadId))

    // WHEN
@@ -70,8 +68,8 @@ class ThreadTableTest_pinned {
  @Test
  fun givenAPinnedThread_whenIDeleteTheLastMessage_thenIExpectPinnedThreadInUnarchivedList() {
    // GIVEN
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(recipient))
-    val messageId = recipients.insertOutgoingMessage(recipient)
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
+    val messageId = MmsHelper.insert(recipient = recipient, threadId = threadId)
    SignalDatabase.threads.pinConversations(listOf(threadId))

    // WHEN
@@ -0,0 +1,52 @@
+package org.thoughtcrime.securesms.database
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Assert.assertFalse
+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.CursorUtil
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.testing.SignalDatabaseRule
+import java.util.UUID
+
+@Suppress("ClassName")
+@RunWith(AndroidJUnit4::class)
+class ThreadTableTest_recents {
+
+  @Rule
+  @JvmField
+  val databaseRule = SignalDatabaseRule()
+
+  private lateinit var recipient: Recipient
+
+  @Before
+  fun setUp() {
+    recipient = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID())))
+  }
+
+  @Test
+  fun givenARecentRecipient_whenIBlockAndGetRecents_thenIDoNotExpectToSeeThatRecipient() {
+    // GIVEN
+    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
+    MmsHelper.insert(recipient = recipient, threadId = threadId)
+    SignalDatabase.threads.update(threadId, true)
+
+    // WHEN
+    SignalDatabase.recipients.setBlocked(recipient.id, true)
+    val results: MutableList<RecipientId> = SignalDatabase.threads.getRecentConversationList(10, false, false, false, false, false, false).use { cursor ->
+      val ids = mutableListOf<RecipientId>()
+      while (cursor.moveToNext()) {
+        ids.add(RecipientId.from(CursorUtil.requireLong(cursor, ThreadTable.RECIPIENT_ID)))
+      }
+
+      ids
+    }
+
+    // THEN
+    assertFalse(recipient.id in results)
+  }
+}
@@ -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
+    )
+  }
+}
@@ -4,17 +4,17 @@ import android.app.Application
 import io.mockk.mockk
 import io.mockk.spyk
 import org.signal.core.util.billing.BillingApi
-import org.signal.network.api.ArchiveApi
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess
 import org.thoughtcrime.securesms.recipients.LiveRecipientCache
 import org.whispersystems.signalservice.api.SignalServiceDataStore
 import org.whispersystems.signalservice.api.SignalServiceMessageSender
 import org.whispersystems.signalservice.api.account.AccountApi
+import org.whispersystems.signalservice.api.archive.ArchiveApi
+import org.whispersystems.signalservice.api.attachment.AttachmentApi
 import org.whispersystems.signalservice.api.donations.DonationsApi
 import org.whispersystems.signalservice.api.keys.KeysApi
 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

 /**
@@ -41,7 +41,7 @@ class InstrumentationApplicationDependencyProvider(val application: Application,
    return recipientCache
  }

-  override fun provideArchiveApi(authWebSocket: SignalWebSocket.AuthenticatedWebSocket, unauthWebSocket: SignalWebSocket.UnauthenticatedWebSocket, pushServiceSocket: PushServiceSocket, signalServiceConfiguration: SignalServiceConfiguration): ArchiveApi {
+  override fun provideArchiveApi(authWebSocket: SignalWebSocket.AuthenticatedWebSocket, unauthWebSocket: SignalWebSocket.UnauthenticatedWebSocket, pushServiceSocket: PushServiceSocket): ArchiveApi {
    return mockk()
  }

@@ -52,11 +52,12 @@ class InstrumentationApplicationDependencyProvider(val application: Application,
  override fun provideSignalServiceMessageSender(
    protocolStore: SignalServiceDataStore,
    pushServiceSocket: PushServiceSocket,
+    attachmentApi: AttachmentApi,
    messageApi: MessageApi,
    keysApi: KeysApi
  ): SignalServiceMessageSender {
    if (signalServiceMessageSender == null) {
-      signalServiceMessageSender = spyk(objToCopy = default.provideSignalServiceMessageSender(protocolStore, pushServiceSocket, messageApi, keysApi))
+      signalServiceMessageSender = spyk(objToCopy = default.provideSignalServiceMessageSender(protocolStore, pushServiceSocket, attachmentApi, messageApi, keysApi))
    }
    return signalServiceMessageSender!!
  }
@@ -19,8 +19,6 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.signal.network.NetworkResult
-import org.signal.network.exceptions.NonSuccessfulResponseCodeException
 import org.thoughtcrime.securesms.backup.DeletionState
 import org.thoughtcrime.securesms.backup.v2.BackupRepository
 import org.thoughtcrime.securesms.backup.v2.MessageBackupTier
@@ -29,6 +27,8 @@ import org.thoughtcrime.securesms.jobs.protos.BackupDeleteJobData
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.thoughtcrime.securesms.util.RemoteConfig
+import org.whispersystems.signalservice.api.NetworkResult
+import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException

 class BackupDeleteJobTest {

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

  private fun insertPoll(allowMultiple: Boolean = true): Long {
    val envelope = MessageContentFuzzer.envelope(100)
-    val pollMessage = IncomingMessage(type = MessageType.NORMAL, from = alice.id, sentTimeMillis = envelope.clientTimestamp!!, serverTimeMillis = envelope.serverTimestamp!!, receivedTimeMillis = 0, groupId = groupId)
+    val pollMessage = IncomingMessage(type = MessageType.NORMAL, from = alice.id, sentTimeMillis = envelope.timestamp!!, serverTimeMillis = envelope.serverTimestamp!!, receivedTimeMillis = 0, groupId = groupId)
    val messageId = SignalDatabase.messages.insertMessageInbox(pollMessage).get()
    SignalDatabase.polls.insertPoll("question?", allowMultiple, listOf("a", "b", "c"), alice.id.toLong(), messageId.messageId)
    return messageId.messageId
@@ -75,14 +75,6 @@ class EditMessageSyncProcessorTest {
            .timestamp(originalTimestamp)
            .expirationStartTimestamp(originalTimestamp)
            .message(content.dataMessage)
-            .unidentifiedStatus(
-              listOf(
-                SyncMessage.Sent.UnidentifiedDeliveryStatus.Builder()
-                  .destinationServiceIdBinary(toRecipient.requireServiceId().toByteString())
-                  .unidentified(true)
-                  .build()
-              )
-            )
            .build()
        ).build()
      ).build()
@@ -108,14 +100,6 @@ class EditMessageSyncProcessorTest {
                .targetSentTimestamp(originalTimestamp)
                .build()
            )
-            .unidentifiedStatus(
-              listOf(
-                SyncMessage.Sent.UnidentifiedDeliveryStatus.Builder()
-                  .destinationServiceIdBinary(toRecipient.requireServiceId().toByteString())
-                  .unidentified(true)
-                  .build()
-              )
-            )
            .build()
        ).build()
      ).build()
@@ -13,6 +13,7 @@ import assertk.assertions.isEqualTo
 import assertk.assertions.isGreaterThan
 import assertk.assertions.isNotEqualTo
 import assertk.assertions.isNotNull
+import assertk.assertions.isNull
 import org.junit.After
 import org.junit.Before
 import org.junit.Ignore
@@ -24,7 +25,6 @@ import org.signal.core.util.Util
 import org.signal.core.util.logging.Log
 import org.signal.core.util.update
 import org.signal.core.util.withinTransaction
-import org.signal.network.api.AttachmentUploadResult
 import org.thoughtcrime.securesms.attachments.Attachment
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment
 import org.thoughtcrime.securesms.database.AttachmentTable
@@ -37,6 +37,7 @@ import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.testing.MessageContentFuzzer.DeleteForMeSync
 import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.thoughtcrime.securesms.util.IdentityUtil
+import org.whispersystems.signalservice.api.attachment.AttachmentUploadResult
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId
 import java.util.UUID

@@ -165,7 +166,7 @@ class SyncMessageProcessorTest_synchronizeDeleteForMe {
    assertThat(messageCount).isEqualTo(0)

    val threadRecord = SignalDatabase.threads.getThreadRecord(threadId)
-    assertThat(threadRecord?.active).isEqualTo(false)
+    assertThat(threadRecord).isNull()
  }

  @Test
@@ -244,7 +245,7 @@ class SyncMessageProcessorTest_synchronizeDeleteForMe {

    // THEN
    assertThat(SignalDatabase.messages.getMessageCountForThread(threadId)).isEqualTo(0)
-    assertThat(SignalDatabase.threads.getThreadRecord(threadId)?.active).isEqualTo(false)
+    assertThat(SignalDatabase.threads.getThreadRecord(threadId)).isNull()
  }

  @Test
@@ -303,7 +304,7 @@ class SyncMessageProcessorTest_synchronizeDeleteForMe {

    // THEN
    assertThat(SignalDatabase.messages.getMessageCountForThread(threadId)).isEqualTo(0)
-    assertThat(SignalDatabase.threads.getThreadRecord(threadId)?.active).isEqualTo(false)
+    assertThat(SignalDatabase.threads.getThreadRecord(threadId)).isNull()

    harness.inMemoryLogger.flush()
    assertThat(harness.inMemoryLogger.entries().filter { it.message?.contains("Using backup non-expiring messages") == true }).hasSize(1)
@@ -343,7 +344,7 @@ class SyncMessageProcessorTest_synchronizeDeleteForMe {

    // THEN
    assertThat(SignalDatabase.messages.getMessageCountForThread(threadId)).isEqualTo(0)
-    assertThat(SignalDatabase.threads.getThreadRecord(threadId)?.active).isEqualTo(false)
+    assertThat(SignalDatabase.threads.getThreadRecord(threadId)).isNull()
  }

  @Test
@@ -375,7 +376,7 @@ class SyncMessageProcessorTest_synchronizeDeleteForMe {

    // THEN
    assertThat(SignalDatabase.messages.getMessageCountForThread(threadId)).isEqualTo(3)
-    assertThat(SignalDatabase.threads.getThreadRecord(threadId)?.active).isEqualTo(true)
+    assertThat(SignalDatabase.threads.getThreadRecord(threadId)).isNotNull()
  }

  @Test
@@ -404,7 +405,7 @@ class SyncMessageProcessorTest_synchronizeDeleteForMe {

    // THEN
    assertThat(SignalDatabase.messages.getMessageCountForThread(threadId)).isEqualTo(0)
-    assertThat(SignalDatabase.threads.getThreadRecord(threadId)?.active).isEqualTo(false)
+    assertThat(SignalDatabase.threads.getThreadRecord(threadId)).isNull()
  }

  @Test
@@ -434,7 +435,7 @@ class SyncMessageProcessorTest_synchronizeDeleteForMe {
    // THEN
    threadIds.forEach {
      assertThat(SignalDatabase.messages.getMessageCountForThread(it)).isEqualTo(0)
-      assertThat(SignalDatabase.threads.getThreadRecord(it)?.active).isEqualTo(false)
+      assertThat(SignalDatabase.threads.getThreadRecord(it)).isNull()
    }
  }

@@ -462,7 +463,7 @@ class SyncMessageProcessorTest_synchronizeDeleteForMe {

    // THEN
    assertThat(SignalDatabase.messages.getMessageCountForThread(aliceThreadId)).isEqualTo(0)
-    assertThat(SignalDatabase.threads.getThreadRecord(aliceThreadId)?.active).isEqualTo(false)
+    assertThat(SignalDatabase.threads.getThreadRecord(aliceThreadId)).isNull()
  }

  @Ignore("counts are consistent for some reason")
@@ -526,10 +527,10 @@ class SyncMessageProcessorTest_synchronizeDeleteForMe {

    // THEN
    assertThat(SignalDatabase.messages.getMessageCountForThread(aliceThreadId)).isEqualTo(0)
-    assertThat(SignalDatabase.threads.getThreadRecord(aliceThreadId)?.active).isEqualTo(false)
+    assertThat(SignalDatabase.threads.getThreadRecord(aliceThreadId)).isNull()

    assertThat(SignalDatabase.messages.getMessageCountForThread(groupThreadId)).isEqualTo(0)
-    assertThat(SignalDatabase.threads.getThreadRecord(groupThreadId)?.active).isEqualTo(false)
+    assertThat(SignalDatabase.threads.getThreadRecord(groupThreadId)).isNull()
  }

  @Test
@@ -550,7 +551,7 @@ class SyncMessageProcessorTest_synchronizeDeleteForMe {

    // THEN
    assertThat(SignalDatabase.messages.getMessageCountForThread(threadId)).isEqualTo(20)
-    assertThat(SignalDatabase.threads.getThreadRecord(threadId)?.active).isEqualTo(true)
+    assertThat(SignalDatabase.threads.getThreadRecord(threadId)).isNotNull()

    harness.inMemoryLogger.flush()
    assertThat(harness.inMemoryLogger.entries().filter { it.message?.contains("Thread is not local only") == true }).hasSize(1)
@@ -664,7 +665,7 @@ class SyncMessageProcessorTest_synchronizeDeleteForMe {
    updatedAttachments = SignalDatabase.attachments.getAttachmentsForMessage(message1.messageId)
    assertThat(updatedAttachments).isEmpty()

-    assertThat(SignalDatabase.threads.getThreadRecord(threadId)?.active).isEqualTo(false)
+    assertThat(SignalDatabase.threads.getThreadRecord(threadId)).isNull()
  }

  private fun DatabaseAttachment.copy(
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Greyson Parrelli	abdad4cde8	Bump version to 8.4.2	2026-03-30 12:51:59 -04:00
Greyson Parrelli	fecb30a86e	Update website variant manifest.	2026-03-30 12:51:17 -04:00