Bump version to 7.70.2

.editorconfig

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

.gitattributes

@@ -1,2 +1 @@
 *.ai binary
-**/src/screenshotTest*/reference/**/*.png filter=lfs diff=lfs merge=lfs -text

.github/ISSUE_TEMPLATE/bug_report.yaml

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

.github/dependabot.yml

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

.github/stale.yml

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

.github/workflows/android.yml

@@ -5,7 +5,7 @@ on:
   push:
     branches:
     - 'main'
-    - '8.**'
+    - '7.**'
 
 permissions:
   contents: read # to fetch code (actions/checkout)
@@ -16,50 +16,26 @@ jobs:
     runs-on: ubuntu-latest-8-cores
 
     steps:
-    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
-      # gh api repos/actions/checkout/commits/v6 --jq '.sha'
+    - uses: actions/checkout@v4
       with:
           submodules: true
-          lfs: true
 
-    - name: set up JDK 21
-      uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5
-      # gh api repos/actions/setup-java/commits/v5 --jq '.sha'
+    - name: set up JDK 17
+      uses: actions/setup-java@v4
       with:
         distribution: temurin
-        java-version: 21
+        java-version: 17
+        cache: gradle
 
     - name: Validate Gradle Wrapper
-      uses: gradle/actions/wrapper-validation@3f131e8634966bd73d06cc69884922b02e6faf92 # v6
-      # gh api repos/gradle/actions/commits/v6 --jq '.sha'
+      uses: gradle/actions/wrapper-validation@v5
 
-    - name: Set up Gradle
-      uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6
-      # gh api repos/gradle/actions/commits/v6 --jq '.sha'
-      with:
-        # Only 8.** branch builds write to the cache; everything else (PRs, etc.) reads only.
-        cache-read-only: ${{ !startsWith(github.ref, 'refs/heads/8.') }}
-        # Required to persist the Gradle configuration cache across runs.
-        cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
-
-    # Pull requests run the fast custom linter (ciRemote); pushes to main / 8.x branches run the
-    # full Android lint (qaRemote). Both include screenshot validation, which is deliberately kept
-    # out of the local qa/ci tasks because screenshot rendering is host-OS dependent.
     - name: Build with Gradle
-      env:
-        SIGNAL_BUILD_CACHE_URL: ${{ secrets.SIGNAL_BUILD_CACHE_URL }}
-        SIGNAL_BUILD_CACHE_USER: ${{ secrets.SIGNAL_BUILD_CACHE_USER }}
-        SIGNAL_BUILD_CACHE_PASSWORD: ${{ secrets.SIGNAL_BUILD_CACHE_PASSWORD }}
-        SIGNAL_BUILD_CACHE_PUSH: ${{ startsWith(github.ref, 'refs/heads/8.') }}
-      run: ./gradlew ${{ github.event_name == 'pull_request' && 'ciRemote' || 'qaRemote' }}
+      run: ./gradlew qa
 
     - name: Archive reports for failed build
       if: ${{ failure() }}
-      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
-          **/build/test-results
-        if-no-files-found: ignore
+        path: '*/build/reports'

.github/workflows/diffuse.yml

@@ -14,41 +14,29 @@ jobs:
   assemble-base:
     if: ${{ github.repository != 'signalapp/Signal-Android' }}
     runs-on: ubuntu-latest-8-cores
-
+    
     steps:
-    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
-      # 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 21
-      uses: actions/setup-java@0f481fcb613427c0f801b606911222b5b6f3083a # v5
-      # gh api repos/actions/setup-java/commits/v5 --jq '.sha'
+    - name: set up JDK 17
+      uses: actions/setup-java@v3
       with:
         distribution: temurin
-        java-version: 21
-
-    - name: Set up Gradle
-      uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6
-      # gh api repos/gradle/actions/commits/v6 --jq '.sha'
-      with:
-        # PR-only workflow: always read from the cache, never write.
-        cache-read-only: true
-        # Required to read the Gradle configuration cache persisted by 8.** builds.
-        cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
+        java-version: 17
+        cache: gradle
 
     - name: Install NDK
       run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;${{ env.NDK_VERSION }}"
 
     - name: Validate Gradle Wrapper
-      uses: gradle/actions/wrapper-validation@3f131e8634966bd73d06cc69884922b02e6faf92 # v6
-      # 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@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v5
-      # gh api repos/actions/cache/commits/v5 --jq '.sha'
+      uses: actions/cache@v4
       with:
         path: diffuse-base.apk
         key: diffuse-${{ github.event.pull_request.base.sha }}
@@ -61,8 +49,7 @@ jobs:
       if: steps.cache-base.outputs.cache-hit != 'true'
       run: mv app/build/outputs/apk/playProd/release/*arm64*.apk diffuse-base.apk
 
-    - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
-      # gh api repos/actions/checkout/commits/v6 --jq '.sha'
+    - uses: actions/checkout@v4
       with:
         submodules: true
         clean: 'false'
@@ -74,21 +61,18 @@ jobs:
       run: mv app/build/outputs/apk/playProd/release/*arm64*.apk diffuse-new.apk
 
     - id: diffuse
-      uses: usefulness/diffuse-action@41995fe8ff6be0a8847e63bdc5a4679c704b455c # v1
-      # gh api repos/usefulness/diffuse-action/commits/v1 --jq '.sha'
+      uses: usefulness/diffuse-action@v1
       with:
         old-file-path: diffuse-base.apk
         new-file-path: diffuse-new.apk
 
-    - uses: peter-evans/find-comment@b30e6a3c0ed37e7c023ccd3f1db5c6c0b0c23aad # v4
-      # gh api repos/peter-evans/find-comment/commits/v4 --jq '.sha'
+    - uses: peter-evans/find-comment@v2
       id: find-comment
       with:
         issue-number: ${{ github.event.pull_request.number }}
         body-includes: Diffuse output
 
-    - uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5
-      # gh api repos/peter-evans/create-or-update-comment/commits/v5 --jq '.sha'
+    - uses: peter-evans/create-or-update-comment@v3
       with:
         body: |
           Diffuse output:
@@ -99,8 +83,7 @@ jobs:
         issue-number: ${{ github.event.pull_request.number }}
         token: ${{ secrets.GITHUB_TOKEN }}
 
-    - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
-      # gh api repos/actions/upload-artifact/commits/v7 --jq '.sha'
+    - uses: actions/upload-artifact@v4
       with:
         name: diffuse-output
         path: ${{ steps.diffuse.outputs.diff-file }}

.github/workflows/docker.yml

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

.github/workflows/stale.yml

@@ -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@1e223db275d687790206a7acac4d1a11bd6fe629 # 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

.gitignore

@@ -33,4 +33,3 @@ maps.key
 kls_database.db
 .kotlin
 lefthook-local.yml
-sample-videos/

.tool-versions

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

README.md

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

app/build.gradle.kts

@@ -1,27 +1,25 @@
 @file:Suppress("UnstableApiUsage")
 
-import com.android.build.api.artifact.ArtifactTransformationRequest
-import com.android.build.api.artifact.SingleArtifact
-import com.android.build.api.variant.HasAndroidTest
+import com.android.build.api.dsl.ManagedVirtualDevice
+import org.gradle.api.file.DirectoryProperty
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.ValueSource
+import org.gradle.api.provider.ValueSourceParameters
+import org.gradle.api.tasks.InputDirectory
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.Optional
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
-import org.gradle.process.ExecOperations
-import org.gradle.work.DisableCachingByDefault
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
-import java.time.Instant
-import java.time.ZoneOffset
-import java.time.format.DateTimeFormatter
-import java.util.Locale
+import java.io.File
 import java.util.Properties
-import javax.inject.Inject
 
 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)
-  alias(testLibs.plugins.compose.screenshot)
-  alias(benchmarkLibs.plugins.baselineprofile)
   id("androidx.navigation.safeargs")
   id("kotlin-parcelize")
   id("com.squareup.wire")
@@ -29,22 +27,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 = 1722
-val canonicalVersionName = "8.20.2"
-val currentHotfixVersion = 0
+val canonicalVersionCode = 1638
+val canonicalVersionName = "7.70.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"))
 }
 
@@ -52,21 +49,9 @@ val languagesForBuildConfigProvider = languagesProvider.map { languages ->
   languages.joinToString(separator = ", ") { language -> "\"$language\"" }
 }
 
-val localPropertiesFile = File(rootProject.projectDir, "local.properties")
-val localProperties: Properties? = if (localPropertiesFile.exists()) {
-  Properties().apply { localPropertiesFile.inputStream().use { load(it) } }
-} else {
-  null
-}
-val quickstartCredentialsDir: String? = localProperties?.getProperty("quickstart.credentials.dir")
-val benchmarkBackupFile: String? = localProperties?.getProperty("benchmark.backup.file")
-
-val isInstrumentationTestRun = gradle.startParameter.taskNames.any { taskName ->
-  val lower = taskName.lowercase()
-  lower.contains("androidtest") || lower.contains("connectedcheck")
-}
-
 val selectableVariants = listOf(
+  "nightlyBackupRelease",
+  "nightlyBackupSpinner",
   "nightlyProdSpinner",
   "nightlyProdPerf",
   "nightlyProdRelease",
@@ -75,44 +60,19 @@ val selectableVariants = listOf(
   "playProdSpinner",
   "playProdCanary",
   "playProdPerf",
-  "playProdMocked",
-  "playProdNonMinifiedMocked",
   "playProdBenchmark",
+  "playProdInstrumentation",
   "playProdRelease",
   "playStagingDebug",
   "playStagingCanary",
   "playStagingSpinner",
   "playStagingPerf",
+  "playStagingInstrumentation",
   "playStagingRelease",
-  "playProdQuickstart",
-  "playStagingQuickstart",
   "websiteProdSpinner",
-  "websiteProdRelease",
-  "githubProdSpinner",
-  "githubProdRelease"
+  "websiteProdRelease"
 )
 
-// Wire 5.x iterates Android source sets and expects matching Kotlin source sets.
-// AGP 9.0's built-in Kotlin doesn't create all source sets automatically.
-val kotlinExt = extensions.getByName("kotlin") as KotlinAndroidProjectExtension
-android.sourceSets.all {
-  kotlinExt.sourceSets.findByName(name) ?: kotlinExt.sourceSets.create(name)
-}
-// AGP 9.0's built-in Kotlin doesn't pick up extra java.srcDir entries from Android
-// source sets, so add shared dirs directly to the relevant Kotlin compile tasks.
-tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class.java).configureEach {
-  val isTestTask = name.contains("UnitTest") || name.contains("AndroidTest")
-  if (isTestTask) {
-    source("$projectDir/src/testShared")
-  }
-  if (!isTestTask && (name.contains("Mocked") || name.contains("Benchmark"))) {
-    source("$projectDir/src/benchmarkShared/java")
-  }
-  if (isTestTask && name.contains("AndroidTest")) {
-    source("$projectDir/src/benchmarkShared/java")
-  }
-}
-
 wire {
   kotlin {
     javaInterop = true
@@ -124,44 +84,34 @@ 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 {
   version.set("1.5.0")
 }
 
-// ktlint only scans convention source dirs, so the shared dirs added to the compile tasks are
-// otherwise skipped. Add them to the base test/androidTest ktlint tasks so ktlintCheck/format cover them.
-tasks.withType(org.jlleitschuh.gradle.ktlint.tasks.BaseKtLintCheckTask::class.java).configureEach {
-  if (name.endsWith("OverTestSourceSet") || name.endsWith("OverAndroidTestSourceSet")) {
-    source("$projectDir/src/testShared")
-  }
-  if (name.endsWith("OverAndroidTestSourceSet")) {
-    source("$projectDir/src/benchmarkShared/java")
-  }
-}
-
-screenshotTests {
-  // Fraction of differing pixels tolerated before a screenshot test fails (0.0001 = 0.01%).
-  imageDifferenceThreshold = 0.0001f
-}
-
 android {
   namespace = "org.thoughtcrime.securesms"
 
-  experimentalProperties["android.experimental.enableScreenshotTest"] = true
-
   buildToolsVersion = libs.versions.buildTools.get()
-  compileSdkVersion(libs.versions.compileSdk.get())
+  compileSdkVersion = libs.versions.compileSdk.get()
   ndkVersion = libs.versions.ndk.get()
 
   flavorDimensions += listOf("distribution", "environment")
+  testBuildType = "instrumentation"
 
   android.bundle.language.enableSplit = false
 
-  debugKeystorePropertiesProvider.get().takeIf { it.isNotEmpty() }?.let { properties ->
+  kotlinOptions {
+    jvmTarget = libs.versions.kotlinJvmTarget.get()
+    freeCompilerArgs = listOf("-Xjvm-default=all")
+    suppressWarnings = true
+  }
+
+  debugKeystorePropertiesProvider.orNull?.let { properties ->
     signingConfigs.getByName("debug").apply {
       storeFile = file("${project.rootDir}/${properties.getProperty("storeFile")}")
       storePassword = properties.getProperty("storePassword")
@@ -178,8 +128,8 @@ android {
     }
 
     managedDevices {
-      localDevices {
-        create("pixel3api30") {
+      devices {
+        create<ManagedVirtualDevice>("pixel3api30") {
           device = "Pixel 3"
           apiLevel = 30
           systemImageSource = "google-atd"
@@ -196,7 +146,6 @@ android {
 
     getByName("androidTest") {
       java.srcDir("$projectDir/src/testShared")
-      java.srcDir("$projectDir/src/benchmarkShared/java")
     }
   }
 
@@ -225,8 +174,7 @@ android {
         "META-INF/LICENSE-notice.md",
         "META-INF/proguard/androidx-annotations.pro",
         "**/*.dylib",
-        "**/*.dll",
-        "**/*.proto"
+        "**/*.dll"
       )
     }
   }
@@ -237,6 +185,10 @@ android {
     compose = true
   }
 
+  composeOptions {
+    kotlinCompilerExtensionVersion = "1.5.4"
+  }
+
   defaultConfig {
     if (currentHotfixVersion >= maxHotfixVersions) {
       throw AssertionError("Hotfix version offset is too large!")
@@ -244,10 +196,6 @@ android {
     versionCode = (canonicalVersionCode * maxHotfixVersions) + possibleHotfixVersions[currentHotfixVersion]
     versionName = canonicalVersionName
 
-    if (isInstrumentationTestRun) {
-      applicationIdSuffix = ".test_run"
-    }
-
     minSdk = libs.versions.minSdk.get().toInt()
     targetSdk = libs.versions.targetSdk.get().toInt()
 
@@ -282,8 +230,8 @@ android {
     buildConfigField("String[]", "SIGNAL_CDSI_IPS", rootProject.extra["cdsi_ips"] as String)
     buildConfigField("String[]", "SIGNAL_SVR2_IPS", rootProject.extra["svr2_ips"] as String)
     buildConfigField("String", "SIGNAL_AGENT", "\"OWA\"")
-    buildConfigField("String", "SVR2_MRENCLAVE_LEGACY", "\"1240acbd4aa26974184844c8a46b1022d3957ac8a76c1fd8f5b1a15141ee0708\"")
-    buildConfigField("String", "SVR2_MRENCLAVE", "\"ced8217b26228e4b210c985786999d095c4958a94faf37b14acaf25c4cbb02a4\"")
+    buildConfigField("String", "SVR2_MRENCLAVE_LEGACY", "\"093be9ea32405e85ae28dbb48eb668aebeb7dbe29517b9b86ad4bec4dfe0e6a6\"")
+    buildConfigField("String", "SVR2_MRENCLAVE", "\"29cd63c87bea751e3bfd0fbd401279192e2e5c99948b4ee9437eafc4968355fb\"")
     buildConfigField("String[]", "UNIDENTIFIED_SENDER_TRUST_ROOTS", "new String[]{ \"BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF\", \"BUkY0I+9+oPgDCn4+Ac6Iu813yvqkDr/ga8DzLxFxuk6\"}")
     buildConfigField("String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY/JYJHRooo5CEqYKBqdFnmbTVGEkCvJKxLnjwKWf+fEPoWeQFj5ObDjcKMZf2Jm2Ae69x+ikU5gBXsRmoF94GXTLfN0/vLt98KDPnxwAQL9j5V1jGOY8jQl6MLxEs56cwXN0dqCnImzVH3TZT1cJ8SW1BRX6qIVxEzjsSGx3yxF3suAilPMqGRp4ffyopjMD1JXiKR2RwLKzizUe5e8XyGOy9fplzhw3jVzTRyUZTRSZKkMLWcQ/gv0E4aONNqs4P+NameAZYOD12qRkxosQQP5uux6B2nRyZ7sAV54DgFyLiRcq1FvwKw2EPQdk4HDoePrO/RNUbyNddnM/mMgj4FW65xCoT1LmjrIjsv/Ggdlx46ueczhMgtBunx1/w8k8V+l8LVZ8gAT6wkU5J+DPQalQguMg12Jzug3q4TbdHiGCmD9EunCwOmsLuLJkz6EcSYXtrlDEnAM+hicw7iergYLLlMXpfTdGxJCWJmP4zqUFeTTmsmhsjGBt7NiEB/9pFFEB3pSbf4iiUukw63Eo8Aqnf4iwob6X1QviCWuc8t0LUlT9vALgh/f2DPVOOmR0RW6bgRvc7DSF20V/omg+YBw==\"")
     buildConfigField("String", "GENERIC_SERVER_PUBLIC_PARAMS", "\"AByD873dTilmOSG0TjKrvpeaKEsUmIO8Vx9BeMmftwUs9v7ikPwM8P3OHyT0+X3EUMZrSe9VUp26Wai51Q9I8mdk0hX/yo7CeFGJyzoOqn8e/i4Ygbn5HoAyXJx5eXfIbqpc0bIxzju4H/HOQeOpt6h742qii5u/cbwOhFZCsMIbElZTaeU+BWMBQiZHIGHT5IE0qCordQKZ5iPZom0HeFa8Yq0ShuEyAl0WINBiY6xE3H/9WnvzXBbMuuk//eRxXgzO8ieCeK8FwQNxbfXqZm6Ro1cMhCOF3u7xoX83QhpN\"")
@@ -305,6 +253,7 @@ android {
     buildConfigField("String", "STRIPE_PUBLISHABLE_KEY", "\"pk_live_6cmGZopuTsV8novGgJJW9JpC00vLIgtQ1D\"")
     buildConfigField("boolean", "TRACING_ENABLED", "false")
     buildConfigField("boolean", "LINK_DEVICE_UX_ENABLED", "false")
+    buildConfigField("boolean", "USE_STRING_ID", "true")
 
     ndk {
       abiFilters += listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
@@ -320,11 +269,7 @@ android {
       }
     }
 
-    testInstrumentationRunner = if (project.hasProperty("imoTests")) {
-      "org.thoughtcrime.securesms.testing.incomingmessageobserver.IncomingMessageObserverTestRunner"
-    } else {
-      "org.thoughtcrime.securesms.testing.SignalTestRunner"
-    }
+    testInstrumentationRunner = "org.thoughtcrime.securesms.testing.SignalTestRunner"
     testInstrumentationRunnerArguments["clearPackageData"] = "true"
   }
 
@@ -336,7 +281,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",
@@ -353,7 +298,6 @@ android {
         "proguard/proguard-retrolambda.pro",
         "proguard/proguard-okhttp.pro",
         "proguard/proguard-ez-vcard.pro",
-        "proguard/proguard-dnsjava.pro",
         "proguard/proguard.cfg"
       )
       testProguardFiles(
@@ -373,6 +317,17 @@ android {
       buildConfigField("String", "BUILD_VARIANT_TYPE", "\"Release\"")
     }
 
+    create("instrumentation") {
+      initWith(getByName("debug"))
+      isDefault = false
+      isMinifyEnabled = false
+      matchingFallbacks += "debug"
+      applicationIdSuffix = ".instrumentation"
+
+      buildConfigField("String", "BUILD_VARIANT_TYPE", "\"Instrumentation\"")
+      buildConfigField("String", "STRIPE_BASE_URL", "\"http://127.0.0.1:8080/stripe\"")
+    }
+
     create("spinner") {
       initWith(getByName("debug"))
       isDefault = false
@@ -397,25 +352,8 @@ android {
       isDebuggable = false
       isMinifyEnabled = true
       matchingFallbacks += "debug"
-      applicationIdSuffix = ".benchmark"
-
       buildConfigField("String", "BUILD_VARIANT_TYPE", "\"Benchmark\"")
       buildConfigField("boolean", "TRACING_ENABLED", "true")
-      buildConfigField("String[]", "UNIDENTIFIED_SENDER_TRUST_ROOTS", "new String[]{ \"BVT/2gHqbrG1xzuIypLIOjFgMtihrMld1/5TGADL6Dhv\"}")
-
-      manifestPlaceholders["applicationClass"] = "org.thoughtcrime.securesms.BenchmarkApplicationContext"
-    }
-
-    create("mocked") {
-      initWith(getByName("debug"))
-      isDefault = false
-      isDebuggable = false
-      isMinifyEnabled = true
-      matchingFallbacks += "debug"
-      buildConfigField("String", "BUILD_VARIANT_TYPE", "\"Benchmark\"")
-      buildConfigField("boolean", "TRACING_ENABLED", "true")
-
-      manifestPlaceholders["applicationClass"] = "org.thoughtcrime.securesms.ApplicationContext"
     }
 
     create("canary") {
@@ -425,14 +363,6 @@ android {
       matchingFallbacks += "debug"
       buildConfigField("String", "BUILD_VARIANT_TYPE", "\"Canary\"")
     }
-
-    create("quickstart") {
-      initWith(getByName("debug"))
-      isDefault = false
-      isMinifyEnabled = false
-      matchingFallbacks += "debug"
-      buildConfigField("String", "BUILD_VARIANT_TYPE", "\"Quickstart\"")
-    }
   }
 
   productFlavors {
@@ -451,13 +381,6 @@ android {
       buildConfigField("String", "BUILD_DISTRIBUTION_TYPE", "\"website\"")
     }
 
-    create("github") {
-      dimension = "distribution"
-      buildConfigField("boolean", "MANAGES_APP_UPDATES", "false")
-      buildConfigField("String", "APK_UPDATE_MANIFEST_URL", "null")
-      buildConfigField("String", "BUILD_DISTRIBUTION_TYPE", "\"github\"")
-    }
-
     create("nightly") {
       dimension = "distribution"
       versionNameSuffix = "-nightly-untagged-${getGitHash()}"
@@ -488,8 +411,8 @@ android {
       buildConfigField("String", "SIGNAL_CDN3_URL", "\"https://cdn3-staging.signal.org\"")
       buildConfigField("String", "SIGNAL_CDSI_URL", "\"https://cdsi.staging.signal.org\"")
       buildConfigField("String", "SIGNAL_SVR2_URL", "\"https://svr2.staging.signal.org\"")
-      buildConfigField("String", "SVR2_MRENCLAVE_LEGACY", "\"97f151f6ed078edbbfd72fa9cae694dcc08353f1f5e8d9ccd79a971b10ffc535\"")
-      buildConfigField("String", "SVR2_MRENCLAVE", "\"3c699f4975aaa3d172c0aad042f94f031b2b03e10b9c19a45116a01693d83302\"")
+      buildConfigField("String", "SVR2_MRENCLAVE_LEGACY", "\"2e8cefe6e3f389d8426adb24e9b7fb7adf10902c96f06f7bbcee36277711ed91\"")
+      buildConfigField("String", "SVR2_MRENCLAVE", "\"a75542d82da9f6914a1e31f8a7407053b99cc99a0e7291d8fbd394253e19b036\"")
       buildConfigField("String[]", "UNIDENTIFIED_SENDER_TRUST_ROOTS", "new String[]{\"BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx\", \"BYhU6tPjqP46KGZEzRs1OL4U39V5dlPJ/X09ha4rErkm\"}")
       buildConfigField("String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXZSSsOZ6s7M1+rTJN0bI5CKY2PX29y5Ok3jSWufIKcgKOnWoP67d5b2du2ZVJjpjfibNIHbT/cegy/sBLoFwtHogVYUewANUAXIaMPyCLRArsKhfJ5wBtTminG/PAvuBdJ70Z/bXVPf8TVsR292zQ65xwvWTejROW6AZX6aqucUjlENAErBme1YHmOSpU6tr6doJ66dPzVAWIanmO/5mgjNEDeK7DDqQdB1xd03HT2Qs2TxY3kCK8aAb/0iM0HQiXjxZ9HIgYhbtvGEnDKW5ILSUydqH/KBhW4Pb0jZWnqN/YgbWDKeJxnDbYcUob5ZY5Lt5ZCMKuaGUvCJRrCtuugSMaqjowCGRempsDdJEt+cMaalhZ6gczklJB/IbdwENW9KeVFPoFNFzhxWUIS5ML9riVYhAtE6JE5jX0xiHNVIIPthb458cfA8daR0nYfYAUKogQArm0iBezOO+mPk5vCNWI+wwkyFCqNDXz/qxl1gAntuCJtSfq9OC3NkdhQlgYQ==\"")
       buildConfigField("String", "GENERIC_SERVER_PUBLIC_PARAMS", "\"AHILOIrFPXX9laLbalbA9+L1CXpSbM/bTJXZGZiuyK1JaI6dK5FHHWL6tWxmHKYAZTSYmElmJ5z2A5YcirjO/yfoemE03FItyaf8W1fE4p14hzb5qnrmfXUSiAIVrhaXVwIwSzH6RL/+EO8jFIjJ/YfExfJ8aBl48CKHgu1+A6kWynhttonvWWx6h7924mIzW0Czj2ROuh4LwQyZypex4GuOPW8sgIT21KNZaafgg+KbV7XM1x1tF3XA17B4uGUaDbDw2O+nR1+U5p6qHPzmJ7ggFjSN6Utu+35dS1sS0P9N\"")
@@ -499,10 +422,22 @@ android {
       buildConfigField("String", "RECAPTCHA_PROOF_URL", "\"https://signalcaptchas.org/staging/challenge/generate.html\"")
       buildConfigField("org.signal.libsignal.net.Network.Environment", "LIBSIGNAL_NET_ENV", "org.signal.libsignal.net.Network.Environment.STAGING")
       buildConfigField("int", "LIBSIGNAL_LOG_LEVEL", "org.signal.libsignal.protocol.logging.SignalProtocolLogger.DEBUG")
+      buildConfigField("boolean", "USE_STRING_ID", "false")
 
       buildConfigField("String", "BUILD_ENVIRONMENT_TYPE", "\"Staging\"")
       buildConfigField("String", "STRIPE_PUBLISHABLE_KEY", "\"pk_test_sngOd8FnXNkpce9nPXawKrJD00kIDngZkD\"")
     }
+
+    create("backup") {
+      initWith(getByName("staging"))
+
+      dimension = "environment"
+
+      applicationIdSuffix = ".backup"
+
+      buildConfigField("boolean", "MANAGES_APP_UPDATES", "true")
+      buildConfigField("String", "BUILD_ENVIRONMENT_TYPE", "\"Backup\"")
+    }
   }
 
   lint {
@@ -512,7 +447,43 @@ android {
     ignoreWarnings = true
     quiet = true
     disable += "LintError"
-    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.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)
+            output.versionCode.set(nightlyVersionCode)
+          }
+        }
+      }
+    }
   }
 
   val releaseDir = "$projectDir/src/release/java"
@@ -525,153 +496,13 @@ android {
     }
   }
 
-  sourceSets {
-    getByName("mocked") {
-      java.srcDir("$projectDir/src/benchmarkShared/java")
-      manifest.srcFile("$projectDir/src/benchmarkShared/AndroidManifest.xml")
-    }
-
-    getByName("benchmark") {
-      java.srcDir("$projectDir/src/benchmarkShared/java")
-      manifest.srcFile("$projectDir/src/benchmarkShared/AndroidManifest.xml")
-    }
-  }
-}
-
-androidComponents {
-  beforeVariants { variant ->
-    variant.enable = variant.name in selectableVariants
-    if (variant.enable) {
-      (variant as? com.android.build.api.variant.HasUnitTestBuilder)?.enableUnitTest = true
-    }
-  }
-  onVariants(selector().all()) { variant: com.android.build.api.variant.ApplicationVariant ->
-    // Rename APK to include version name
-    val renameTask = tasks.register<RenameApkTask>("renameApk${variant.name.replaceFirstChar { it.uppercase() }}")
-    val renameRequest = variant.artifacts.use(renameTask)
-      .wiredWithDirectories(RenameApkTask::apkFolder, RenameApkTask::outFolder)
-      .toTransformMany(SingleArtifact.APK)
-    renameTask.configure {
-      transformationRequest.set(renameRequest)
-    }
-
-    // Include the test-only library on non-release builds.
-    if (variant.buildType == "release") {
-      variant.packaging.jniLibs.excludes.add("**/libsignal_jni_testing.so")
-      variant.androidResources.ignoreAssetsPatterns.add("libsignal-testing.md")
-    }
-
-    // Starting with minSdk 23, Android leaves native libraries uncompressed, which is fine for the Play Store, but not for our self-distributed APKs.
-    // This reverts it to the legacy behavior, compressing the native libraries, and drastically reducing the APK file size.
-    if (variant.name.contains("website", ignoreCase = true) || variant.name.contains("github", ignoreCase = true)) {
-      variant.packaging.jniLibs.useLegacyPackaging.set(true)
-    }
-
-    // Version overrides
-    if (variant.name.contains("nightly", ignoreCase = true)) {
-      var tag = getNightlyTagForCurrentCommit()
-      if (!tag.isNullOrEmpty()) {
-        if (tag.startsWith("v")) {
-          tag = tag.substring(1)
-        }
-
-        // We add a multiple of maxHotfixVersions to nightlies to ensure we're always at least that many versions ahead
-        val nightlyBuffer = (5 * maxHotfixVersions)
-        val nightlyVersionCode = (canonicalVersionCode * maxHotfixVersions) + (getNightlyBuildNumber(tag) * 10) + nightlyBuffer
-
-        variant.outputs.forEach { output ->
-          output.versionName.set("$tag | ${getLastCommitDateTimeUtc()}")
-          output.versionCode.set(nightlyVersionCode)
-        }
+  applicationVariants.configureEach {
+    outputs.configureEach {
+      if (this is com.android.build.gradle.internal.api.BaseVariantOutputImpl) {
+        outputFileName = outputFileName.replace(".apk", "-$versionName.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 }
-  }
-
-  onVariants(selector().withName("playProdDebug")) { variant ->
-    val androidTest = (variant as? HasAndroidTest)?.androidTest ?: return@onVariants
-
-    tasks.register<FirebaseTestLabTask>("firebaseTestLab") {
-      group = "Verification"
-      description = "Runs the ${variant.name} instrumentation tests on Firebase Test Lab via the gcloud CLI. Run a single class with -Pftl.class=<fqcn>[#method]; override other defaults with -Pftl.* properties."
-
-      appApkDirectory.set(variant.artifacts.get(SingleArtifact.APK))
-      testApkDirectory.set(androidTest.artifacts.get(SingleArtifact.APK))
-
-      val deviceOverride = project.providers.gradleProperty("ftl.devices").orNull
-      devices.set(
-        deviceOverride?.split(";")?.map { it.trim() }?.filter { it.isNotEmpty() }
-          ?: listOf("model=Pixel2.arm,version=31,locale=en,orientation=portrait")
-      )
-
-      useOrchestrator.set(true)
-      environmentVariables.set(mapOf("clearPackageData" to "true"))
-      testTimeout.set(project.providers.gradleProperty("ftl.timeout").getOrElse("30m"))
-      numFlakyTestAttempts.set(project.providers.gradleProperty("ftl.numFlakyTestAttempts").map { it.toInt() }.getOrElse(1))
-      gcloudProject.set(project.providers.gradleProperty("ftl.project"))
-      resultsBucket.set(project.providers.gradleProperty("ftl.resultsBucket"))
-      resultsDir.set(project.providers.gradleProperty("ftl.resultsDir"))
-
-      val testClass = project.providers.gradleProperty("ftl.class").orNull?.takeIf { it.isNotBlank() }
-      testTargets.set(
-        if (testClass != null) "class $testClass" else project.providers.gradleProperty("ftl.testTargets").orNull
-      )
-      gcloudExecutable.set(project.providers.gradleProperty("ftl.gcloud").getOrElse("gcloud"))
-      extraArgs.set(
-        project.providers.gradleProperty("ftl.extraArgs").orNull
-          ?.split(" ")?.map { it.trim() }?.filter { it.isNotEmpty() }
-          ?: emptyList()
-      )
-    }
-  }
-}
-
-baselineProfile {
-  warnings {
-    disabledVariants = false
-  }
-
-  mergeIntoMain = true
-
-  variants.create("mocked") {
-    from(project(":baseline-profile"))
-  }
-
-  dexLayoutOptimization = false
-}
-
-kotlin {
-  compilerOptions {
-    jvmTarget = JvmTarget.fromTarget(libs.versions.kotlinJvmTarget.get())
-    freeCompilerArgs.addAll("-Xjvm-default=all")
-    suppressWarnings = true
-  }
 }
 
 dependencies {
@@ -679,12 +510,10 @@ dependencies {
   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"))
+  implementation(project(":lib:glide-config"))
   implementation(project(":lib:video"))
   implementation(project(":lib:device-transfer"))
   implementation(project(":lib:image-editor"))
@@ -694,16 +523,15 @@ dependencies {
   implementation(project(":lib:qr"))
   implementation(project(":lib:sticky-header-grid"))
   implementation(project(":lib:photoview"))
-  implementation(project(":lib:blurhash"))
   implementation(project(":core:ui"))
   implementation(project(":core:models"))
-  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)
@@ -720,9 +548,6 @@ dependencies {
   implementation(libs.androidx.navigation.fragment.ktx)
   implementation(libs.androidx.navigation.ui.ktx)
   implementation(libs.androidx.navigation.compose)
-  implementation(libs.androidx.navigation3.runtime)
-  implementation(libs.androidx.navigation3.ui)
-  implementation(libs.androidx.lifecycle.viewmodel.navigation3)
   implementation(libs.androidx.lifecycle.viewmodel.ktx)
   implementation(libs.androidx.lifecycle.livedata.ktx)
   implementation(libs.androidx.lifecycle.process)
@@ -739,7 +564,6 @@ dependencies {
   implementation(libs.androidx.concurrent.futures)
   implementation(libs.androidx.autofill)
   implementation(libs.androidx.biometric)
-  implementation(libs.androidx.core.telecom)
   implementation(libs.androidx.sharetarget)
   implementation(libs.androidx.profileinstaller)
   implementation(libs.androidx.asynclayoutinflater)
@@ -753,7 +577,6 @@ dependencies {
   implementation(libs.google.play.services.maps)
   implementation(libs.google.play.services.auth)
   implementation(libs.google.signin)
-  implementation(libs.androidx.media)
   implementation(libs.bundles.media3)
   implementation(libs.conscrypt.android)
   implementation(libs.signal.aesgcmprovider)
@@ -761,6 +584,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)
@@ -771,13 +595,12 @@ 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)
-
-  // Compose screenshot testing
-  screenshotTestImplementation(testLibs.compose.screenshot.validation.api)
-  screenshotTestImplementation(libs.androidx.compose.ui.tooling.core)
-  screenshotTestImplementation(libs.androidx.compose.ui.tooling.preview)
   implementation(libs.signal.android.database.sqlcipher)
   implementation(libs.androidx.sqlite)
   testImplementation(libs.androidx.sqlite.framework)
@@ -787,7 +610,6 @@ dependencies {
   }
   implementation(libs.dnsjava)
   implementation(libs.kotlinx.collections.immutable)
-  implementation(libs.arrow.core)
   implementation(libs.accompanist.permissions)
   implementation(libs.accompanist.drawablepainter)
   implementation(libs.kotlin.stdlib.jdk8)
@@ -803,13 +625,12 @@ dependencies {
   implementation(libs.kotlinx.serialization.json)
 
   implementation(project(":lib:billing"))
-  implementation(project(":feature:media-send"))
 
   "spinnerImplementation"(project(":lib:spinner"))
 
   "canaryImplementation"(libs.square.leakcanary)
 
-  androidTestImplementation(libs.androidx.fragment.testing) {
+  "instrumentationImplementation"(libs.androidx.fragment.testing) {
     exclude(group = "androidx.test", module = "core")
   }
 
@@ -831,29 +652,17 @@ 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)
 
   androidTestImplementation(platform(libs.androidx.compose.bom))
   androidTestImplementation(libs.androidx.compose.ui.test.junit4)
-  androidTestImplementation(libs.androidx.compose.ui.test.manifest)
   androidTestImplementation(testLibs.androidx.test.ext.junit)
   androidTestImplementation(testLibs.espresso.core)
-  androidTestImplementation(testLibs.espresso.contrib) {
-    // espresso-contrib transitively pulls the full checkerframework jar (only its annotations are needed),
-    // whose MANIFEST.MF collides with other test dependencies during androidTest resource merging.
-    exclude(group = "org.checkerframework", module = "checker")
-    // accessibility-test-framework drags in an ancient com.google.protobuf:protobuf-lite:3.0.1 whose
-    // GeneratedMessageLite wins the merged dex and lacks registerDefaultInstance(Class, GeneratedMessageLite),
-    // crashing tests at runtime. We only use RecyclerViewActions from contrib, not the accessibility checks.
-    exclude(group = "com.google.android.apps.common.testing.accessibility.framework")
-  }
   androidTestImplementation(testLibs.androidx.test.core)
   androidTestImplementation(testLibs.androidx.test.core.ktx)
   androidTestImplementation(testLibs.androidx.test.ext.junit.ktx)
@@ -908,16 +717,6 @@ fun getNightlyBuildNumber(tag: String?): Int {
   return match?.groupValues?.get(1)?.toIntOrNull() ?: 0
 }
 
-fun getLastCommitDateTimeUtc(): String {
-  val timestamp = providers.exec {
-    commandLine("git", "log", "-1", "--pretty=format:%ct")
-  }.standardOutput.asText.get().trim().toLong()
-  val instant = Instant.ofEpochSecond(timestamp)
-  val formatter = DateTimeFormatter.ofPattern("MMM d '@' HH:mm 'UTC'", Locale.US)
-    .withZone(ZoneOffset.UTC)
-  return formatter.format(instant)
-}
-
 fun getMapsKey(): String {
   return providers
     .gradleProperty("mapsKey")
@@ -956,7 +755,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
@@ -964,9 +763,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) }
@@ -977,193 +776,3 @@ abstract class PropertiesFileValueSource : ValueSource<Properties, PropertiesFil
 fun String.capitalize(): String {
   return this.replaceFirstChar { it.uppercase() }
 }
-
-abstract class CopyQuickstartCredentialsTask : DefaultTask() {
-  @get:InputDirectory
-  @get:Optional
-  abstract val inputDir: DirectoryProperty
-
-  @get:Input
-  abstract val filePrefix: Property<String>
-
-  @get:OutputDirectory
-  abstract val outputDir: DirectoryProperty
-
-  @TaskAction
-  fun copy() {
-    if (!inputDir.isPresent) {
-      throw GradleException("quickstart.credentials.dir is not set in local.properties. This is required for quickstart builds.")
-    }
-
-    val prefix = filePrefix.get()
-    val candidates = inputDir.get().asFile.listFiles()
-      ?.filter { it.extension == "json" && it.name.startsWith(prefix) }
-      ?: emptyList()
-
-    if (candidates.isEmpty()) {
-      throw GradleException("No credential files matching '$prefix*.json' found in ${inputDir.get().asFile}. Add files like '${prefix}account1.json' to your credentials directory.")
-    }
-
-    val chosen = candidates.random()
-    logger.lifecycle("Selected quickstart credential: ${chosen.name}")
-
-    val dest = outputDir.get().asFile.resolve("quickstart")
-    dest.mkdirs()
-    chosen.copyTo(dest.resolve(chosen.name), overwrite = true)
-  }
-}
-
-abstract class CopyBenchmarkBackupTask : DefaultTask() {
-  @get:InputFile
-  @get:Optional
-  abstract val inputFile: RegularFileProperty
-
-  @get:OutputDirectory
-  abstract val outputDir: DirectoryProperty
-
-  @TaskAction
-  fun copy() {
-    val dest = outputDir.get().asFile.resolve("backups")
-    dest.mkdirs()
-
-    if (!inputFile.isPresent) {
-      logger.lifecycle("benchmark.backup.file is not set in local.properties. Benchmark tests using backup data will crash at runtime.")
-      return
-    }
-
-    val backupFile = inputFile.get().asFile
-    logger.lifecycle("Using benchmark backup: ${backupFile.absolutePath} (${backupFile.length() / 1024}KB)")
-    backupFile.copyTo(dest.resolve("backup.binproto"), overwrite = true)
-  }
-}
-
-/**
- * Runs an instrumentation test suite on Firebase Test Lab by shelling out to `gcloud firebase test android run`.
- *
- * The `gcloud` CLI must be installed and authenticated (`gcloud auth login` and a configured project, or an
- * activated service account) before invoking this task.
- */
-@DisableCachingByDefault(because = "Executes tests on remote devices; results must never be served from the build cache")
-abstract class FirebaseTestLabTask
-@Inject
-constructor(
-  private val execOperations: ExecOperations
-) : DefaultTask() {
-  @get:InputFiles
-  @get:PathSensitive(PathSensitivity.RELATIVE)
-  abstract val appApkDirectory: DirectoryProperty
-
-  @get:InputFiles
-  @get:PathSensitive(PathSensitivity.RELATIVE)
-  abstract val testApkDirectory: DirectoryProperty
-
-  @get:Input
-  abstract val devices: ListProperty<String>
-
-  @get:Input
-  abstract val useOrchestrator: Property<Boolean>
-
-  @get:Input
-  abstract val environmentVariables: MapProperty<String, String>
-
-  @get:Input
-  abstract val testTimeout: Property<String>
-
-  @get:Input
-  abstract val numFlakyTestAttempts: Property<Int>
-
-  @get:Input
-  @get:Optional
-  abstract val gcloudProject: Property<String>
-
-  @get:Input
-  @get:Optional
-  abstract val resultsBucket: Property<String>
-
-  @get:Input
-  @get:Optional
-  abstract val resultsDir: Property<String>
-
-  @get:Input
-  @get:Optional
-  abstract val testTargets: Property<String>
-
-  @get:Input
-  abstract val gcloudExecutable: Property<String>
-
-  @get:Input
-  abstract val extraArgs: ListProperty<String>
-
-  @TaskAction
-  fun run() {
-    val appApk = findApk(appApkDirectory.get().asFile, "app")
-    val testApk = findApk(testApkDirectory.get().asFile, "instrumentation test")
-
-    val arguments = mutableListOf(
-      gcloudExecutable.get(),
-      "firebase", "test", "android", "run",
-      "--type", "instrumentation",
-      "--app", appApk.absolutePath,
-      "--test", testApk.absolutePath,
-      "--timeout", testTimeout.get(),
-      "--num-flaky-test-attempts", numFlakyTestAttempts.get().toString()
-    )
-
-    devices.get().forEach { device ->
-      arguments += listOf("--device", device)
-    }
-
-    if (useOrchestrator.get()) {
-      arguments += "--use-orchestrator"
-    }
-
-    val environment = environmentVariables.get()
-    if (environment.isNotEmpty()) {
-      arguments += "--environment-variables"
-      arguments += environment.entries.joinToString(",") { "${it.key}=${it.value}" }
-    }
-
-    gcloudProject.orNull?.takeIf { it.isNotBlank() }?.let { arguments += listOf("--project", it) }
-    resultsBucket.orNull?.takeIf { it.isNotBlank() }?.let { arguments += listOf("--results-bucket", it) }
-    resultsDir.orNull?.takeIf { it.isNotBlank() }?.let { arguments += listOf("--results-dir", it) }
-    testTargets.orNull?.takeIf { it.isNotBlank() }?.let { arguments += listOf("--test-targets", it) }
-    arguments += extraArgs.get()
-
-    logger.lifecycle("Running Firebase Test Lab:\n  ${arguments.joinToString(" ")}")
-    execOperations.exec {
-      commandLine(arguments)
-    }
-  }
-
-  private fun findApk(directory: File, label: String): File {
-    return directory.walkTopDown().firstOrNull { it.isFile && it.extension == "apk" }
-      ?: throw GradleException("No $label APK found under ${directory.absolutePath}. Was the assemble task run?")
-  }
-}
-
-abstract class RenameApkTask : DefaultTask() {
-  @get:InputFiles
-  abstract val apkFolder: DirectoryProperty
-
-  @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
-    }
-  }
-}

app/lint.xml

@@ -22,9 +22,7 @@
 
     <issue id="CanvasSize" severity="error" />
     <issue id="HardcodedText" severity="error" />
-    <issue id="VectorRaster" severity="error">
-        <ignore path="*/donate_with_googlepay_button_content.xml" /> <!-- Externally provided by Google -->
-    </issue>
+    <issue id="VectorRaster" severity="error" />
     <issue id="ButtonOrder" severity="error" />
     <issue id="ExtraTranslation" severity="warning" />
     <issue id="UnspecifiedImmutableFlag" severity="error" />

app/proguard/proguard-dnsjava.pro

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

app/proguard/proguard.cfg

@@ -7,12 +7,6 @@
 -keep class org.signal.libsignal.usernames.** { *; }
 -keep class org.thoughtcrime.securesms.** { *; }
 -keep class org.signal.donations.json.** { *; }
--keep class org.signal.network.** { *; }
-
--keep class org.signal.core.util.crypto.AttachmentSecret { *; }
--keep class org.signal.core.util.crypto.AttachmentSecret$* { *; }
--keep class org.signal.core.util.crypto.KeyStoreHelper$SealedData { *; }
--keep class org.signal.core.util.crypto.KeyStoreHelper$SealedData$* { *; }
 -keepclassmembers class ** {
     public void onEvent*(**);
 }
@@ -22,14 +16,6 @@
 
 -keep class androidx.window.** { *; }
 
-# Workaround for R8 non-determinism in AGP 9.x. R8 inconsistently keeps or strips
-# the Signature attribute on this Kotlin lambda subclass of the generic
-# LottieValueCallback, causing intermittent dex byte differences. Explicitly
-# keeping the class stabilizes R8's attribute decisions.
--keep class com.airbnb.lottie.compose.LottieDynamicPropertiesKt$toValueCallback$1 {
-  *;
-}
-
 -keepclassmembers class * extends androidx.constraintlayout.motion.widget.Key {
   public <init>();
 }