Bump version to 8.4.2

Update website variant manifest.
2026-06-14 19:26:05 +01:00 · 2026-03-30 12:51:59 -04:00 · 2026-03-30 12:51:17 -04:00
1745 changed files with 53627 additions and 114698 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
@@ -16,30 +16,26 @@ jobs:
    runs-on: ubuntu-latest-8-cores

    steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-      # 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: Build with Gradle
      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,17 +14,15 @@ jobs:
  assemble-base:
    if: ${{ github.repository != 'signalapp/Signal-Android' }}
    runs-on: ubuntu-latest-8-cores
-
+    
    steps:
-    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-      # 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
@@ -34,13 +32,11 @@ jobs:
      run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;${{ env.NDK_VERSION }}"

    - name: Validate Gradle Wrapper
-      uses: gradle/actions/wrapper-validation@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 }}
@@ -53,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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-      # gh api repos/actions/checkout/commits/v6 --jq '.sha'
+    - uses: actions/checkout@v4
      with:
        submodules: true
        clean: 'false'
@@ -66,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:
@@ -91,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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-        # 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@b5d41d4e1d5dceea10e7104786b73624c18a190f # 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 = 1687
-val canonicalVersionName = "8.10.3"
+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"))
 }

@@ -84,24 +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")
-  }
-}
-
 wire {
  kotlin {
    javaInterop = true
@@ -113,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 {
@@ -125,7 +105,7 @@ android {
  namespace = "org.thoughtcrime.securesms"

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

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

  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")
@@ -150,8 +136,8 @@ android {
    }

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

+  composeOptions {
+    kotlinCompilerExtensionVersion = "1.5.4"
+  }
+
  defaultConfig {
    if (currentHotfixVersion >= maxHotfixVersions) {
      throw AssertionError("Hotfix version offset is too large!")
@@ -300,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",
@@ -317,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(
@@ -490,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"

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

-androidComponents {
-  beforeVariants { variant ->
-    variant.enable = variant.name in selectableVariants
-  }
-  onVariants(selector().all()) { variant: com.android.build.api.variant.ApplicationVariant ->
-    // Rename APK to include version name
-    val renameTask = tasks.register<RenameApkTask>("renameApk${variant.name.replaceFirstChar { it.uppercase() }}")
-    val renameRequest = variant.artifacts.use(renameTask)
-      .wiredWithDirectories(RenameApkTask::apkFolder, RenameApkTask::outFolder)
-      .toTransformMany(SingleArtifact.APK)
-    renameTask.configure {
-      transformationRequest.set(renameRequest)
-    }
-
-    // Include the test-only library on debug builds.
-    if (variant.buildType != "instrumentation") {
-      variant.packaging.jniLibs.excludes.add("**/libsignal_jni_testing.so")
-    }
-
-    // Starting with minSdk 23, Android leaves native libraries uncompressed, which is fine for the Play Store, but not for our self-distributed APKs.
-    // This reverts it to the legacy behavior, compressing the native libraries, and drastically reducing the APK file size.
-    if (variant.name.contains("website", ignoreCase = true) || variant.name.contains("github", ignoreCase = true)) {
-      variant.packaging.jniLibs.useLegacyPackaging.set(true)
-    }
-
-    // Version overrides
-    if (variant.name.contains("nightly", ignoreCase = true)) {
-      var tag = getNightlyTagForCurrentCommit()
-      if (!tag.isNullOrEmpty()) {
-        if (tag.startsWith("v")) {
-          tag = tag.substring(1)
-        }
-
-        // We add a multiple of maxHotfixVersions to nightlies to ensure we're always at least that many versions ahead
-        val nightlyBuffer = (5 * maxHotfixVersions)
-        val nightlyVersionCode = (canonicalVersionCode * maxHotfixVersions) + (getNightlyBuildNumber(tag) * 10) + nightlyBuffer
-
-        variant.outputs.forEach { output ->
-          output.versionName.set("$tag | ${getLastCommitDateTimeUtc()}")
-          output.versionCode.set(nightlyVersionCode)
-        }
+  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 {
@@ -600,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"))
@@ -634,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)
@@ -693,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)
@@ -703,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)
@@ -757,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)
@@ -872,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
@@ -880,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) }
@@ -952,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
-    }
-  }
-}
@@ -26454,6 +26454,61 @@
            column="7"/>
    </issue>

+    <issue
+        id="Recycle"
+        message="This `Cursor` should be freed up after use with `#close()`"
+        errorLine1="      Cursor mmsCursor          = db.query(&quot;mms&quot;, new String[] {&quot;_id&quot;},"
+        errorLine2="                                     ~~~~~">
+        <location
+            file="src/main/java/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java"
+            line="298"
+            column="38"/>
+    </issue>
+
+    <issue
+        id="Recycle"
+        message="This `Cursor` should be freed up after use with `#close()`"
+        errorLine1="        Cursor partCursor = db.query(&quot;part&quot;, new String[] {&quot;_id&quot;, &quot;ct&quot;, &quot;_data&quot;, &quot;encrypted&quot;},"
+        errorLine2="                               ~~~~~">
+        <location
+            file="src/main/java/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java"
+            line="310"
+            column="32"/>
+    </issue>
+
+    <issue
+        id="Recycle"
+        message="This `Cursor` should be freed up after use with `#close()`"
+        errorLine1="      Cursor threadCursor = db.query(&quot;thread&quot;, new String[] {&quot;_id&quot;}, null, null, null, null, null);"
+        errorLine2="                               ~~~~~">
+        <location
+            file="src/main/java/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java"
+            line="708"
+            column="32"/>
+    </issue>
+
+    <issue
+        id="Recycle"
+        message="This `Cursor` should be freed up after use with `#close()`"
+        errorLine1="        Cursor cursor = db.rawQuery(&quot;SELECT DISTINCT date AS date_received, status, &quot; +"
+        errorLine2="                           ~~~~~~~~">
+        <location
+            file="src/main/java/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java"
+            line="713"
+            column="28"/>
+    </issue>
+
+    <issue
+        id="Recycle"
+        message="This `Cursor` should be freed up after use with `#close()`"
+        errorLine1="      cursor = db.query(&quot;mms&quot;, new String[] {&quot;_id&quot;, &quot;network_failures&quot;}, &quot;network_failures IS NOT NULL&quot;, null, null, null, null);"
+        errorLine2="                  ~~~~~">
+        <location
+            file="src/main/java/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java"
+            line="1037"
+            column="19"/>
+    </issue>
+
    <issue
        id="ObsoleteSdkInt"
        message="Unnecessary; SDK_INT is always >= 21"
@@ -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
@@ -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
@@ -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
  }
 }
@@ -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,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,56 +1,53 @@
-/*
- * 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 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.Rule
+import org.junit.Ignore
 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.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.mms.OutgoingMessage
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.testutil.RecipientTestRule
-import java.util.Optional
+import java.util.UUID
 import java.util.concurrent.TimeUnit

@Suppress("ClassName")
-@RunWith(RobolectricTestRunner::class)
-@Config(manifest = Config.NONE, application = Application::class)
-class MessageTableTest_stories {
-
-  @get:Rule
-  val recipients = RecipientTestRule()
+@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 others: List<RecipientId>
+  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))
-    others = (0 until 5).map { recipients.createRecipient("Other $it") }
+    recipients = (0 until 5).map { SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID())) }
    releaseChannelRecipient = Recipient.resolved(SignalDatabase.recipients.insertReleaseChannelRecipient())

-    every { recipients.signalStore.releaseChannel.releaseChannelRecipientId } returns releaseChannelRecipient.id
+    SignalStore.releaseChannel.setReleaseChannelRecipientId(releaseChannelRecipient.id)
  }

  @Test
@@ -66,10 +63,26 @@ class MessageTableTest_stories {
  fun givenOneOutgoingAndOneIncomingStory_whenIGetOrderedStoryRecipientsAndIds_thenIExpectIncomingThenOutgoing() {
    // GIVEN
    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(myStory)
-    val sender = others[0]
+    val sender = recipients[0]

-    insertOutgoingStory(recipient = myStory, sentTimeMillis = 1, threadId = threadId)
-    insertIncomingStory(from = sender, sentTimeMillis = 2)
+    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)
@@ -81,35 +94,56 @@ class MessageTableTest_stories {
  @Test
  fun givenAStory_whenISetIncomingStoryMessageViewed_thenIExpectASetReceiptTimestamp() {
    // GIVEN
-    val sender = others[0]
-    val messageId = insertIncomingStory(from = sender, sentTimeMillis = 2).get().messageId
+    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 = mms.getMessageRecord(messageId)
+    val messageBeforeMark = SignalDatabase.messages.getMessageRecord(messageId)
    assertFalse(messageBeforeMark.incomingStoryViewedAtTimestamp > 0)

    // WHEN
-    mms.setIncomingMessageViewed(messageId)
+    SignalDatabase.messages.setIncomingMessageViewed(messageId)

    // THEN
-    val messageAfterMark = mms.getMessageRecord(messageId)
+    val messageAfterMark = SignalDatabase.messages.getMessageRecord(messageId)
    assertTrue(messageAfterMark.incomingStoryViewedAtTimestamp > 0)
  }

+  @Ignore
  @Test
  fun given5ViewedStories_whenIGetOrderedStoryRecipientsAndIds_thenIExpectLatestViewedFirst() {
    // GIVEN
-    val messageIds = others.take(5).map {
-      insertIncomingStory(from = it, sentTimeMillis = 2).get().messageId
+    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 {
-      mms.setIncomingMessageViewed(it)
+      SignalDatabase.messages.setIncomingMessageViewed(it)
      Thread.sleep(5)
    }

    // WHEN
-    val result = mms.getOrderedStoryRecipientsAndIds(false)
+    val result = SignalDatabase.messages.getOrderedStoryRecipientsAndIds(false)
    val resultOrderedIds = result.map { it.messageId }

    // THEN
@@ -122,25 +156,50 @@ class MessageTableTest_stories {

    val unviewedIds: List<Long> = (0 until 5).map {
      Thread.sleep(5)
-      insertIncomingStory(from = others[it], sentTimeMillis = System.currentTimeMillis()).get().messageId
+      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)
-      insertIncomingStory(from = others[it], sentTimeMillis = System.currentTimeMillis()).get().messageId
+      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) {
-        mms.setIncomingMessageViewed(viewedIds[it / 2])
+        SignalDatabase.messages.setIncomingMessageViewed(viewedIds[it / 2])
        viewedIds[it / 2]
      } else {
-        insertOutgoingStory(recipient = myStory, sentTimeMillis = System.currentTimeMillis(), threadId = myStoryThread)
+        MmsHelper.insert(
+          recipient = myStory,
+          sentTimeMillis = System.currentTimeMillis(),
+          storyType = StoryType.STORY_WITH_REPLIES,
+          threadId = myStoryThread
+        )
      }
    }

-    val result = mms.getOrderedStoryRecipientsAndIds(false)
+    val result = SignalDatabase.messages.getOrderedStoryRecipientsAndIds(false)
    val resultOrderedIds = result.map { it.messageId }

    assertEquals(unviewedIds.reversed() + interspersedIds.reversed(), resultOrderedIds)
@@ -149,7 +208,7 @@ class MessageTableTest_stories {
  @Test
  fun givenNoStories_whenICheckIsOutgoingStoryAlreadyInDatabase_thenIExpectFalse() {
    // WHEN
-    val result = mms.isOutgoingStoryAlreadyInDatabase(others[0], 200)
+    val result = mms.isOutgoingStoryAlreadyInDatabase(recipients[0], 200)

    // THEN
    assertFalse(result)
@@ -158,10 +217,20 @@ class MessageTableTest_stories {
  @Test
  fun givenNoOutgoingStories_whenICheckIsOutgoingStoryAlreadyInDatabase_thenIExpectFalse() {
    // GIVEN
-    insertIncomingStory(from = others[0], sentTimeMillis = 200)
+    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(others[0], 200)
+    val result = mms.isOutgoingStoryAlreadyInDatabase(recipients[0], 200)

    // THEN
    assertFalse(result)
@@ -170,7 +239,11 @@ class MessageTableTest_stories {
  @Test
  fun givenOutgoingStoryExistsForRecipientAndTime_whenICheckIsOutgoingStoryAlreadyInDatabase_thenIExpectTrue() {
    // GIVEN
-    insertOutgoingStory(recipient = myStory, sentTimeMillis = 200)
+    MmsHelper.insert(
+      recipient = myStory,
+      sentTimeMillis = 200,
+      storyType = StoryType.STORY_WITH_REPLIES
+    )

    // WHEN
    val result = mms.isOutgoingStoryAlreadyInDatabase(myStory.id, 200)
@@ -182,7 +255,11 @@ class MessageTableTest_stories {
  @Test
  fun givenAGroupStoryWithNoReplies_whenICheckHasSelfReplyInGroupStory_thenIExpectFalse() {
    // GIVEN
-    val groupStoryId = insertOutgoingStory(recipient = myStory, sentTimeMillis = 200)
+    val groupStoryId = MmsHelper.insert(
+      recipient = myStory,
+      sentTimeMillis = 200,
+      storyType = StoryType.STORY_WITH_REPLIES
+    )

    // WHEN
    val result = mms.hasGroupReplyOrReactionInStory(groupStoryId)
@@ -191,12 +268,23 @@ class MessageTableTest_stories {
    assertFalse(result)
  }

+  @Ignore
  @Test
  fun givenAGroupStoryWithAReplyFromSelf_whenICheckHasSelfReplyInGroupStory_thenIExpectTrue() {
    // GIVEN
-    val groupStoryId = insertOutgoingStory(recipient = myStory, sentTimeMillis = 200)
+    val groupStoryId = MmsHelper.insert(
+      recipient = myStory,
+      sentTimeMillis = 200,
+      storyType = StoryType.STORY_WITH_REPLIES,
+      threadId = -1L
+    )

-    insertOutgoingStoryReply(recipient = myStory, sentTimeMillis = 201, parentStoryId = ParentStoryId.GroupReply(groupStoryId))
+    MmsHelper.insert(
+      recipient = myStory,
+      sentTimeMillis = 201,
+      storyType = StoryType.NONE,
+      parentStoryId = ParentStoryId.GroupReply(groupStoryId)
+    )

    // WHEN
    val result = mms.hasGroupReplyOrReactionInStory(groupStoryId)
@@ -208,11 +296,16 @@ class MessageTableTest_stories {
  @Test
  fun givenAGroupStoryWithAReactionFromSelf_whenICheckHasSelfReplyInGroupStory_thenIExpectTrue() {
    // GIVEN
-    val groupStoryId = insertOutgoingStory(recipient = myStory, sentTimeMillis = 200)
+    val groupStoryId = MmsHelper.insert(
+      recipient = myStory,
+      sentTimeMillis = 200,
+      storyType = StoryType.STORY_WITH_REPLIES
+    )

-    insertOutgoingStoryReply(
+    MmsHelper.insert(
      recipient = myStory,
      sentTimeMillis = 201,
+      storyType = StoryType.NONE,
      parentStoryId = ParentStoryId.GroupReply(groupStoryId),
      isStoryReaction = true
    )
@@ -227,10 +320,13 @@ class MessageTableTest_stories {
  @Test
  fun givenAGroupStoryWithAReplyFromSomeoneElse_whenICheckHasSelfReplyInGroupStory_thenIExpectFalse() {
    // GIVEN
-    val groupStoryId = insertOutgoingStory(recipient = myStory, sentTimeMillis = 200)
+    val groupStoryId = MmsHelper.insert(
+      recipient = myStory,
+      sentTimeMillis = 200,
+      storyType = StoryType.STORY_WITH_REPLIES
+    )

-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(myStory, ThreadTable.DistributionTypes.DEFAULT)
-    mms.insertMessageInbox(
+    MmsHelper.insert(
      IncomingMessage(
        type = MessageType.NORMAL,
        from = myStory.id,
@@ -239,7 +335,7 @@ class MessageTableTest_stories {
        receivedTimeMillis = 202,
        parentStoryId = ParentStoryId.GroupReply(groupStoryId)
      ),
-      threadId
+      SignalDatabase.threads.getOrCreateThreadIdFor(myStory, ThreadTable.DistributionTypes.DEFAULT)
    )

    // WHEN
@@ -253,14 +349,15 @@ class MessageTableTest_stories {
  fun givenNotViewedOnboardingAndOnlyStoryIsOnboardingAndAdded2DaysAgo_whenIGetOldestStoryTimestamp_thenIExpectNull() {
    // GIVEN
    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(releaseChannelRecipient)
-    insertOutgoingStory(
+    MmsHelper.insert(
      recipient = releaseChannelRecipient,
      sentTimeMillis = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(2),
+      storyType = StoryType.STORY_WITH_REPLIES,
      threadId = threadId
    )

    // WHEN
-    val oldestTimestamp = mms.getOldestStorySendTimestamp(false)
+    val oldestTimestamp = SignalDatabase.messages.getOldestStorySendTimestamp(false)

    // THEN
    assertNull(oldestTimestamp)
@@ -271,60 +368,17 @@ class MessageTableTest_stories {
    // GIVEN
    val expected = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(2)
    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(releaseChannelRecipient)
-    insertOutgoingStory(recipient = releaseChannelRecipient, sentTimeMillis = expected, threadId = threadId)
+    MmsHelper.insert(
+      recipient = releaseChannelRecipient,
+      sentTimeMillis = expected,
+      storyType = StoryType.STORY_WITH_REPLIES,
+      threadId = threadId
+    )

    // WHEN
-    val oldestTimestamp = mms.getOldestStorySendTimestamp(true)
+    val oldestTimestamp = SignalDatabase.messages.getOldestStorySendTimestamp(true)

    // THEN
    assertEquals(expected, oldestTimestamp)
  }
-
-  private fun insertOutgoingStory(
-    recipient: Recipient,
-    sentTimeMillis: Long,
-    threadId: Long = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
-  ): Long {
-    val message = OutgoingMessage(
-      recipient = recipient,
-      body = "body",
-      timestamp = sentTimeMillis,
-      storyType = StoryType.STORY_WITH_REPLIES,
-      isSecure = true
-    )
-    return recipients.insertOutgoingMessage(message, threadId)
-  }
-
-  private fun insertOutgoingStoryReply(
-    recipient: Recipient,
-    sentTimeMillis: Long,
-    parentStoryId: ParentStoryId,
-    isStoryReaction: Boolean = false,
-    threadId: Long = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
-  ): Long {
-    val message = OutgoingMessage(
-      recipient = recipient,
-      body = "body",
-      timestamp = sentTimeMillis,
-      storyType = StoryType.NONE,
-      parentStoryId = parentStoryId,
-      isStoryReaction = isStoryReaction,
-      isSecure = true
-    )
-    return recipients.insertOutgoingMessage(message, threadId)
-  }
-
-  private fun insertIncomingStory(from: RecipientId, sentTimeMillis: Long): Optional<MessageTable.InsertResult> {
-    return mms.insertMessageInbox(
-      IncomingMessage(
-        type = MessageType.NORMAL,
-        from = from,
-        sentTimeMillis = sentTimeMillis,
-        serverTimeMillis = sentTimeMillis,
-        receivedTimeMillis = sentTimeMillis,
-        storyType = StoryType.STORY_WITH_REPLIES
-      ),
-      -1L
-    )
-  }
 }
@@ -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
+      )
+    )
+  }
 }
@@ -1,48 +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.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)!!

@@ -51,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>()
@@ -61,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))!!

@@ -79,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>()
@@ -92,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)!!

@@ -107,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>()
@@ -120,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))!!

@@ -135,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>()
@@ -148,7 +138,7 @@ class RecipientTableTest {
    }!!

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

  @Test
@@ -158,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()

@@ -174,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()

@@ -313,7 +313,7 @@ class SmsDatabaseTest_collapseJoinRequestEventsIfPossible {
      timestamp = wallClock,
      groupId = groupId,
      update = updateDescription,
-      isNotifiable = false,
+      isGroupAdd = false,
      serverGuid = null
    )
  }
@@ -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)
+  }
+}
@@ -4,12 +4,12 @@ import android.app.Application
 import io.mockk.mockk
 import io.mockk.spyk
 import org.signal.core.util.billing.BillingApi
-import org.signal.network.api.ArchiveApi
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess
 import org.thoughtcrime.securesms.recipients.LiveRecipientCache
 import org.whispersystems.signalservice.api.SignalServiceDataStore
 import org.whispersystems.signalservice.api.SignalServiceMessageSender
 import org.whispersystems.signalservice.api.account.AccountApi
+import org.whispersystems.signalservice.api.archive.ArchiveApi
 import org.whispersystems.signalservice.api.attachment.AttachmentApi
 import org.whispersystems.signalservice.api.donations.DonationsApi
 import org.whispersystems.signalservice.api.keys.KeysApi
@@ -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
@@ -43,7 +43,7 @@ object MessageContentFuzzer {
   */
  fun envelope(timestamp: Long, serverGuid: UUID = UUID.randomUUID()): Envelope {
    return Envelope.Builder()
-      .clientTimestamp(timestamp)
+      .timestamp(timestamp)
      .serverTimestamp(timestamp + 5)
      .serverGuidBinary(serverGuid.toByteArray().toByteString())
      .build()
@@ -292,7 +292,7 @@ object MessageContentFuzzer {
            body = string()
            val quoted = quoteAble.random(random)
            quote = DataMessage.Quote.Builder().buildWith {
-              id = quoted.envelope.clientTimestamp
+              id = quoted.envelope.timestamp
              authorAciBinary = quoted.metadata.sourceServiceId.toByteString()
              text = quoted.content.dataMessage?.body
              attachments(quoted.content.dataMessage?.attachments ?: emptyList())
@@ -304,7 +304,7 @@ object MessageContentFuzzer {
          if (random.nextFloat() < 0.1 && quoteAble.isNotEmpty()) {
            val quoted = quoteAble.random(random)
            quote = DataMessage.Quote.Builder().buildWith {
-              id = random.nextLong(quoted.envelope.clientTimestamp!! - 1000000, quoted.envelope.clientTimestamp!!)
+              id = random.nextLong(quoted.envelope.timestamp!! - 1000000, quoted.envelope.timestamp!!)
              authorAciBinary = quoted.metadata.sourceServiceId.toByteString()
              text = quoted.content.dataMessage?.body
            }
@@ -333,7 +333,7 @@ object MessageContentFuzzer {
              emoji = emojis.random(random)
              remove = false
              targetAuthorAciBinary = reactTo.metadata.sourceServiceId.toByteString()
-              targetSentTimestamp = reactTo.envelope.clientTimestamp
+              targetSentTimestamp = reactTo.envelope.timestamp
            }
          }
        }
@@ -75,8 +75,8 @@ object MockProvider {
    val device = PreKeyResponseItem().apply {
      this.deviceId = deviceId
      registrationId = KeyHelper.generateRegistrationId(false)
-      signedPreKey = SignedPreKeyEntity(signedPreKeyRecord.id.toLong(), signedPreKeyRecord.keyPair.publicKey, signedPreKeyRecord.signature)
-      preKey = PreKeyEntity(oneTimePreKey.id.toLong(), oneTimePreKey.keyPair.publicKey)
+      signedPreKey = SignedPreKeyEntity(signedPreKeyRecord.id, signedPreKeyRecord.keyPair.publicKey, signedPreKeyRecord.signature)
+      preKey = PreKeyEntity(oneTimePreKey.id, oneTimePreKey.keyPair.publicKey)
    }

    return PreKeyResponse().apply {
@@ -212,7 +212,7 @@ class BenchmarkCommandReceiver : BroadcastReceiver() {
      verb = "PUT",
      path = "/api/v1/message",
      id = Random.nextLong(),
-      headers = listOf("X-Signal-Timestamp: ${this.serverTimestamp}"),
+      headers = listOf("X-Signal-Timestamp: ${this.timestamp}"),
      body = this.encodeByteString()
    )
  }
@@ -70,8 +70,8 @@ object Generator {
    val serverGuid = UUID.randomUUID()
    return Envelope.Builder()
      .type(Envelope.Type.fromValue(this.type))
-      .sourceDeviceId(1)
-      .clientTimestamp(timestamp)
+      .sourceDevice(1)
+      .timestamp(timestamp)
      .serverTimestamp(timestamp + 1)
      .destinationServiceId(destination.toString())
      .destinationServiceIdBinary(destination.toByteString())
@@ -74,7 +74,7 @@ class OtherClient(val serviceId: ServiceId, val e164: String, val identityKeyPai
    val cipher = SignalServiceCipher(serviceAddress, 1, aciStore, sessionLock, null)

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

@@ -9,7 +9,6 @@ import org.thoughtcrime.securesms.conversation.ConversationMessage.ConversationM
 import org.thoughtcrime.securesms.conversation.v2.data.ConversationElementKey
 import org.thoughtcrime.securesms.conversation.v2.data.IncomingTextOnly
 import org.thoughtcrime.securesms.conversation.v2.data.OutgoingTextOnly
-import org.thoughtcrime.securesms.database.CollapsedState
 import org.thoughtcrime.securesms.database.MessageTypes
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord
 import org.thoughtcrime.securesms.database.model.StoryType
@@ -123,10 +122,7 @@ class ConversationElementGenerator {
      false,
      0,
      null,
-      CollapsedState.NONE,
-      0,
-      null,
-      false
+      null
    )

    val conversationMessage = ConversationMessageFactory.createWithUnresolvedData(
@@ -353,13 +353,5 @@ class InternalConversationTestFragment : Fragment(R.layout.conversation_test_fra
    override fun onViewPinnedMessage(messageId: Long) {
      Toast.makeText(requireContext(), "Can't touch this.", Toast.LENGTH_SHORT).show()
    }
-
-    override fun onExpandEvents(messageId: Long, itemView: View, collapsedSize: Int) {
-      Toast.makeText(requireContext(), "Can't touch this.", Toast.LENGTH_SHORT).show()
-    }
-
-    override fun onCollapseEvents(messageId: Long, itemView: View, collapsedSize: Int) {
-      Toast.makeText(requireContext(), "Can't touch this.", Toast.LENGTH_SHORT).show()
-    }
  }
 }
@@ -458,13 +458,6 @@
            android:label="@string/AndroidManifest__select_contacts"
            android:windowSoftInputMode="stateHidden" />

-        <activity
-            android:name=".search.SingleContactSelectionActivity"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:exported="false"
-            android:label="@string/AndroidManifest__select_contacts"
-            android:windowSoftInputMode="stateHidden" />
-
        <activity
            android:name=".giph.ui.GiphyActivity"
            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
@@ -482,7 +475,7 @@
            android:windowSoftInputMode="stateAlwaysHidden|adjustNothing" />

        <activity
-            android:name=".mediasend.v3.MediaSendV3Activity"
+            android:name="org.signal.mediasend.MediaSendActivity"
            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
            android:exported="false"
            android:launchMode="singleTop"
@@ -675,13 +668,6 @@
            android:theme="@style/TextSecure.DarkNoActionBar"
            android:windowSoftInputMode="stateHidden" />

-        <activity
-            android:name=".starred.StarredMessagesActivity"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:exported="false"
-            android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-            android:windowSoftInputMode="stateHidden" />
-
        <activity
            android:name=".mediaoverview.MediaOverviewActivity"
            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
--- 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