Bump version to 7.74.5

Move getParameterDescriptor and setParameters calls to after
configure/start, since they require the codec to be in the
Executing state. Always set KEY_COLOR_TRANSFER_REQUEST in the
format before configure as the primary tone-mapping mechanism.

.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

.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

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

.github/workflows/diffuse.yml

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

.github/workflows/docker.yml

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

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

.gitignore

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

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,18 +1,12 @@
 @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
-import java.util.Locale
 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 +18,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 = 1686
-val canonicalVersionName = "8.10.1"
-val currentHotfixVersion = 0
+val canonicalVersionCode = 1651
+val canonicalVersionName = "7.74.5"
+val currentHotfixVersion = 2
 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"))
 }
 
@@ -47,16 +40,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 selectableVariants = listOf(
+  "nightlyBackupRelease",
+  "nightlyBackupSpinner",
   "nightlyProdSpinner",
   "nightlyProdPerf",
   "nightlyProdRelease",
@@ -76,32 +62,12 @@ val selectableVariants = listOf(
   "playStagingPerf",
   "playStagingInstrumentation",
   "playStagingRelease",
-  "playProdQuickstart",
-  "playStagingQuickstart",
   "websiteProdSpinner",
   "websiteProdRelease",
   "githubProdSpinner",
   "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 +79,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 +92,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 +100,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 +123,8 @@ android {
     }
 
     managedDevices {
-      localDevices {
-        create("pixel3api30") {
+      devices {
+        create<ManagedVirtualDevice>("pixel3api30") {
           device = "Pixel 3"
           apiLevel = 30
           systemImageSource = "google-atd"
@@ -208,6 +181,10 @@ android {
     compose = true
   }
 
+  composeOptions {
+    kotlinCompilerExtensionVersion = "1.5.4"
+  }
+
   defaultConfig {
     if (currentHotfixVersion >= maxHotfixVersions) {
       throw AssertionError("Hotfix version offset is too large!")
@@ -272,7 +249,7 @@ android {
     buildConfigField("String", "STRIPE_PUBLISHABLE_KEY", "\"pk_live_6cmGZopuTsV8novGgJJW9JpC00vLIgtQ1D\"")
     buildConfigField("boolean", "TRACING_ENABLED", "false")
     buildConfigField("boolean", "LINK_DEVICE_UX_ENABLED", "false")
-    buildConfigField("boolean", "USE_STRING_ID", "false")
+    buildConfigField("boolean", "USE_STRING_ID", "true")
 
     ndk {
       abiFilters += listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
@@ -300,7 +277,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 +294,6 @@ android {
         "proguard/proguard-retrolambda.pro",
         "proguard/proguard-okhttp.pro",
         "proguard/proguard-ez-vcard.pro",
-        "proguard/proguard-dnsjava.pro",
         "proguard/proguard.cfg"
       )
       testProguardFiles(
@@ -372,13 +348,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") {
@@ -389,8 +360,6 @@ android {
       matchingFallbacks += "debug"
       buildConfigField("String", "BUILD_VARIANT_TYPE", "\"Benchmark\"")
       buildConfigField("boolean", "TRACING_ENABLED", "true")
-
-      manifestPlaceholders["applicationClass"] = "org.thoughtcrime.securesms.ApplicationContext"
     }
 
     create("canary") {
@@ -400,14 +369,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 {
@@ -474,10 +435,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 {
@@ -490,6 +463,43 @@ 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)
+            output.versionCode.set(nightlyVersionCode)
+          }
+        }
+      }
+    }
+  }
+
   val releaseDir = "$projectDir/src/release/java"
   val debugDir = "$projectDir/src/debug/java"
 
@@ -511,79 +521,14 @@ 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) {
+        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 }
-  }
 }
 
 baselineProfile {
@@ -600,22 +545,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"))
@@ -633,11 +568,13 @@ dependencies {
   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)
@@ -672,7 +609,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)
@@ -693,6 +629,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 +640,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 +698,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)
@@ -824,16 +763,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")
@@ -872,7 +801,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 +809,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) }
@@ -893,89 +822,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)
-  }
-}
-
-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-baseline.xml

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

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