Bump version to 7.31.1

Fixes #13889

.editorconfig

@@ -6,4 +6,15 @@ ij_kotlin_allow_trailing_comma_on_call_site = false
 ij_kotlin_allow_trailing_comma = false
 ktlint_code_style = intellij_idea
 twitter_compose_allowed_composition_locals=LocalExtendedColors
-ktlint_standard_class-naming = disabled
+ktlint_standard_class-naming = disabled
+
+# below rules disabled during ktlint version migration because they were preexisting but should be corrected and re-enabled ASAP
+ktlint_function_naming_ignore_when_annotated_with = Composable
+ktlint_standard_property-naming = disabled
+ktlint_standard_enum-wrapping = disabled
+ktlint_standard_multiline-if-else = disabled
+ktlint_standard_backing-property-naming = disabled
+ktlint_standard_statement-wrapping = disabled
+internal:ktlint-suppression = disabled
+ktlint_standard_unnecessary-parentheses-before-trailing-lambda = disabled
+ktlint_standard_value-parameter-comment = disabled

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,54 +0,0 @@
----
-name: 🛠️ Bug report
-about: Let us know that something isn't working as intended
-title: ''
-labels: ''
-assignees: ''
-
----
-
-<!-- This is a bug report template. By following the instructions below and filling out the sections with your information, you will help the developers get all the necessary data to fix your issue.
-You can also preview your report before submitting it. You may remove sections that aren't relevant to your particular case.
-
-Before we begin, please note that this tracker is only for issues. It is not for questions, comments, or feature requests.
-
-If you would like to discuss a new feature or submit suggestions, please visit the community forum:
-https://community.signalusers.org
-
-If you are looking for support, please visit our support center:
-https://support.signal.org/
-or email support@signal.org
-
-Let's begin with a checklist: Replace the empty checkboxes [ ] below with checked ones [x] accordingly. -->
-
-- [ ] I have searched open and closed issues for duplicates
-- [ ] I am submitting a bug report for existing functionality that does not work as intended
-- [ ] I have read https://github.com/signalapp/Signal-Android/wiki/Submitting-useful-bug-reports
-- [ ] This isn't a feature request or a discussion topic
-
-----------------------------------------
-
-### Bug description
-Describe here the issue that you are experiencing.
-
-### Steps to reproduce
-- using hyphens as bullet points
-- list the steps
-- that reproduce the bug
-
-**Actual result:** Describe here what happens after you run the steps above (i.e. the buggy behaviour)
-**Expected result:** Describe here what should happen after you run the steps above (i.e. what would be the correct behaviour)
-
-### Screenshots
-<!-- you can drag and drop images below -->
-
-
-### Device info
-<!-- replace the examples with your info -->
-**Device:** Manufacturer Model XVI
-**Android version:** 0.0.0
-**Signal version:** 0.0.0
-
-### Link to debug log
-<!-- immediately after the bug has happened capture a debug log via Signal's settings (Help -> Debug log) and paste the link below -->
-

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -0,0 +1,75 @@
+name: 🛠️ Bug report
+description:  Let us know that something isn't working as intended
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Before we begin, please note that this tracker is only for issues. It is not for questions, comments, or feature requests.
+        
+        If you would like to discuss a new feature or submit suggestions, please visit the [community forum](https://community.signalusers.org).
+
+        If you are looking for support, please visit our [support center](https://support.signal.org/) or email support@signal.org.
+        
+  - type: checkboxes
+    id: guidelines
+    attributes:
+      label: "Guidelines"
+      description: "Search issues here: https://github.com/signalapp/Signal-Android/issues/?q=is%3Aissue+"
+      options:
+        - 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
+        - label: This isn't a feature request or a discussion topic
+          required: true
+  - type: textarea
+    id: description-of-bug
+    attributes:
+      label: Bug description
+      description: A clear and concise description of what the problem is that made you submit this report.
+      placeholder: When trying to do this, then...
+    validations:
+      required: true
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots
+      description: "How to take screenshots on Android: https://support.google.com/android/answer/9075928"
+      placeholder: You can drag and drop images into this text box.
+    validations:
+      required: false
+  - type: input
+    id: device-model
+    attributes:
+      label: Device
+      description: Usually located in system settings -> About Phone
+      placeholder: Manufacturer and model, e.g. Samsung S24
+    validations:
+      required: false
+  - type: input
+    id: android-version
+    attributes:
+      label: Android version
+      description: Usually located in system settings -> About Phone
+      placeholder: Android version, e.g. 14
+    validations:
+      required: false
+  - type: input
+    id: signal-version
+    attributes:
+      label: Signal version
+      description: You can see Signal's version number at Settings -> Help
+      placeholder: App version, e.g. 7.17.6
+    validations:
+      required: false
+  - type: textarea
+    id: debug-log
+    attributes:
+      label: Link to debug log
+      description: |
+        Submit a debug log via Settings -> Help -> Debug Log, then copy that URL here. Logs can only reliably cover ~24 hours, so please try to capture it as soon as you experience the bug!
+        See https://support.signal.org/hc/en-us/articles/360007318591#android_debug
+      placeholder: Debug log link, e.g. https://debuglogs.org/...
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -1,6 +1,6 @@
 blank_issues_enabled: false
 contact_links:
-  - name: 📃Support Center
+  - name: 📃 Support Center
     url: https://support.signal.org/
     about: Find answers to many common questions.
   - name: ✨ Feature request

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,8 +1,8 @@
 <!-- You can remove this first section if you have contributed before -->
 ### First time contributor checklist
 <!-- replace the empty checkboxes [ ] below with checked ones [x] accordingly -->
-- [ ] I have read [how to contribute](https://github.com/signalapp/Signal-Android/blob/master/CONTRIBUTING.md) to this project
+- [ ] I have read [how to contribute](https://github.com/signalapp/Signal-Android/blob/main/CONTRIBUTING.md) to this project
-- [ ] I have signed the [Contributor License Agreement](https://whispersystems.org/cla/)
+- [ ] I have signed the [Contributor License Agreement](https://signal.org/cla/)
 
 ### Contributor checklist
 <!-- replace the empty checkboxes [ ] below with checked ones [x] accordingly -->

.github/workflows/android.yml

@@ -5,8 +5,7 @@ on:
   push:
     branches:
     - 'main'
-    - '4.**'
+    - '7.**'
-    - '5.**'
 
 permissions:
   contents: read # to fetch code (actions/checkout)
@@ -18,6 +17,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+      with:
+          submodules: true
 
     - name: set up JDK 17
       uses: actions/setup-java@v3
@@ -30,11 +31,11 @@ jobs:
       uses: gradle/wrapper-validation-action@v1
 
     - name: Build with Gradle
-      run: ./gradlew qa --parallel
+      run: ./gradlew qa
 
     - name: Archive reports for failed build
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: reports
         path: '*/build/reports'

.github/workflows/diffuse.yml

@@ -7,6 +7,9 @@ permissions:
   contents: read # to fetch code (actions/checkout)
   pull-requests: write # to comment on PR
 
+env:
+  NDK_VERSION: '27.0.12077973'
+
 jobs:
   assemble-base:
     if: ${{ github.repository != 'signalapp/Signal-Android' }}
@@ -15,6 +18,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
       with:
+        submodules: true
         ref: ${{ github.event.pull_request.base.sha }}
 
     - name: set up JDK 17
@@ -24,6 +28,9 @@ jobs:
         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/wrapper-validation-action@v1
 
@@ -34,10 +41,9 @@ jobs:
         path: diffuse-base.apk
         key: diffuse-${{ github.event.pull_request.base.sha }}
 
-
     - name: Build with Gradle
       if: steps.cache-base.outputs.cache-hit != 'true'
-      run: ./gradlew assemblePlayProdRelease --parallel
+      run: ./gradlew assemblePlayProdRelease
 
     - name: Copy base apk
       if: steps.cache-base.outputs.cache-hit != 'true'
@@ -45,10 +51,11 @@ jobs:
 
     - uses: actions/checkout@v3
       with:
+        submodules: true
         clean: 'false'
 
     - name: Build with Gradle
-      run: ./gradlew assemblePlayProdRelease --parallel
+      run: ./gradlew assemblePlayProdRelease
 
     - name: Copy PR apk
       run: mv app/build/outputs/apk/playProd/release/*arm64*.apk diffuse-new.apk
@@ -68,7 +75,7 @@ jobs:
     - uses: peter-evans/create-or-update-comment@v3
       with:
         body: |
-          Diffuse output: 
+          Diffuse output:
 
           ${{ steps.diffuse.outputs.diff-gh-comment }}
         edit-mode: replace
@@ -76,7 +83,7 @@ jobs:
         issue-number: ${{ github.event.pull_request.number }}
         token: ${{ secrets.GITHUB_TOKEN }}
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: diffuse-output
         path: ${{ steps.diffuse.outputs.diff-file }}

.gitignore

@@ -3,6 +3,7 @@ captures/
 project.properties
 keystore.debug.properties
 keystore.staging.properties
+nightly-url.txt
 .project
 .settings
 bin/
@@ -28,4 +29,6 @@ jni/libspeex/.deps/
 pkcs11.password
 dev.keystore
 maps.key
-local/
+/local/
+kls_database.db
+.kotlin

.idea/codeStyles/Project.xml

@@ -1,5 +1,11 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <option name="OTHER_INDENT_OPTIONS">
+      <value>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </value>
+    </option>
     <option name="RIGHT_MARGIN" value="240" />
     <option name="FORMATTER_TAGS_ENABLED" value="true" />
     <option name="SOFT_MARGINS" value="160" />

.tool-versions

@@ -0,0 +1 @@
+java 17.0.2

CONTRIBUTING.md

@@ -15,6 +15,12 @@ Truths which we believe to be self-evident:
 1. **There is no such thing as time.**  Protocol ideas that require synchronized clocks are doomed to failure.
 
 
+## Building
+
+1. You'll need to get the `libwebp` submodule after checking out the repository with `git submodule init && git submodule update`
+1. Most things are pretty straightforward, and opening the project in Android Studio should get you most of the way there.
+1. Depending on your configuration, you'll also likely need to install additional SDK Tool components, namely the versions of NDK and CMake we are currently using in our [Docker](https://github.com/signalapp/Signal-Android/blob/main/reproducible-builds/Dockerfile#L30) configuration.
+
 ## Issues
 
 ### Useful bug reports
@@ -57,6 +63,8 @@ You will need to [sign our CLA](https://signal.org/cla/) before your pull reques
 ### Follow the Code Style Guidelines
 Ensure that your code adheres to the [Code Style Guidelines](https://github.com/signalapp/Signal-Android/wiki/Code-Style-Guidelines) before submitting a pull request.
 
+You can run `./gradlew format` to automatically check conformance with some of these guidelines.
+
 ### Submit finished and well-tested pull requests
 Please do not submit pull requests that are still a work in progress. Pull requests should be thoroughly tested and ready to merge before they are submitted.
 

README.md

@@ -1,4 +1,4 @@
-# Signal Android 
+# Signal Android
 
 Signal is a simple, powerful, and secure messenger.
 
@@ -23,7 +23,7 @@ If you're interested in a life of peace and tranquility, stick with the standard
 
 ## Contributing Code
 
-If you're new to the Signal codebase, we recommend going through our issues and picking out a simple bug to fix (check the "easy" label in our issues) in order to get yourself familiar. Also please have a look at the [CONTRIBUTING.md](https://github.com/signalapp/Signal-Android/blob/main/CONTRIBUTING.md), that might answer some of your questions.
+If you're new to the Signal codebase, we recommend going through our issues and picking out a simple bug to fix in order to get yourself familiar. Also please have a look at the [CONTRIBUTING.md](https://github.com/signalapp/Signal-Android/blob/main/CONTRIBUTING.md), that might answer some of your questions.
 
 For larger changes and feature ideas, we ask that you propose it on the [unofficial Community Forum](https://community.signalusers.org) for a high-level discussion with the wider community before implementation.
 
@@ -54,7 +54,7 @@ The form and manner of this distribution makes it eligible for export under the
 
 ## License
 
-Copyright 2013-2023 Signal
+Copyright 2013-2024 Signal Messenger, LLC
 
 Licensed under the GNU AGPLv3: https://www.gnu.org/licenses/agpl-3.0.html
 

apntool/.gitignore

@@ -1,2 +0,0 @@
-*.db
-*.db.gz

apntool/apntool.py

@@ -1,106 +0,0 @@
-import sys
-import re
-import argparse
-import sqlite3
-import gzip
-from progressbar import ProgressBar, Counter, Timer
-from lxml import etree
-
-parser = argparse.ArgumentParser(prog='apntool', description="""Process Android's apn xml files and drop them into an
-                                                             easily queryable SQLite db. Tested up to version 9 of
-                                                             their APN file.""")
-parser.add_argument('-v', '--version', action='version', version='%(prog)s v1.1')
-parser.add_argument('-i', '--input', help='the xml file to parse', default='apns.xml', required=False)
-parser.add_argument('-o', '--output', help='the sqlite db output file', default='apns.db', required=False)
-parser.add_argument('--quiet', help='do not show progress or verbose instructions', action='store_true', required=False)
-parser.add_argument('--no-gzip', help="do not gzip after creation", action='store_true', required=False)
-args = parser.parse_args()
-
-
-def normalized(target):
-    o2_typo = re.compile(r"02\.co\.uk")
-    port_typo = re.compile(r"(\d+\.\d+\.\d+\.\d+)\.(\d+)")
-    leading_zeros = re.compile(r"(/|\.|^)0+(\d+)")
-    subbed = o2_typo.sub(r'o2.co.uk', target)
-    subbed = port_typo.sub(r'\1:\2', subbed)
-    subbed = leading_zeros.sub(r'\1\2', subbed)
-    return subbed
-
-try:
-    connection = sqlite3.connect(args.output)
-    cursor = connection.cursor()
-    cursor.execute('SELECT SQLITE_VERSION()')
-    version = cursor.fetchone()
-    if not args.quiet:
-        print("SQLite version: %s" % version)
-        print("Opening %s" % args.input)
-
-    cursor.execute("PRAGMA legacy_file_format=ON")
-    cursor.execute("PRAGMA journal_mode=DELETE")
-    cursor.execute("PRAGMA page_size=32768")
-    cursor.execute("VACUUM")
-    cursor.execute("DROP TABLE IF EXISTS apns")
-    cursor.execute("""CREATE TABLE apns(_id INTEGER PRIMARY KEY, mccmnc TEXT, mcc TEXT, mnc TEXT, carrier TEXT,
-                apn TEXT, mmsc TEXT, port INTEGER, type TEXT, protocol TEXT, bearer TEXT, roaming_protocol TEXT,
-                carrier_enabled INTEGER, mmsproxy TEXT, mmsport INTEGER, proxy TEXT,  mvno_match_data TEXT,
-                mvno_type TEXT, authtype INTEGER, user TEXT, password TEXT, server TEXT)""")
-
-    apns = etree.parse(args.input)
-    root = apns.getroot()
-    pbar = None
-    if not args.quiet:
-        pbar = ProgressBar(widgets=['Processed: ', Counter(), ' apns (', Timer(), ')'], maxval=len(list(root))).start()
-
-    count = 0
-    for apn in root.iter("apn"):
-        if apn.get("mmsc") is None:
-            continue
-        sqlvars = ["?" for x in apn.attrib.keys()] + ["?"]
-        mccmnc = "%s%s" % (apn.get("mcc"), apn.get("mnc"))
-        normalized_mmsc = normalized(apn.get("mmsc"))
-        if normalized_mmsc != apn.get("mmsc"):
-            print("normalize MMSC: %s => %s" % (apn.get("mmsc"), normalized_mmsc))
-            apn.set("mmsc", normalized_mmsc)
-
-        if not apn.get("mmsproxy") is None:
-            normalized_mmsproxy = normalized(apn.get("mmsproxy"))
-            if normalized_mmsproxy != apn.get("mmsproxy"):
-                print("normalize proxy: %s => %s" % (apn.get("mmsproxy"), normalized_mmsproxy))
-                apn.set("mmsproxy", normalized_mmsproxy)
-
-        values = [apn.get(attrib) for attrib in apn.attrib.keys()] + [mccmnc]
-        keys = apn.attrib.keys() + ["mccmnc"]
-
-        cursor.execute("SELECT 1 FROM apns WHERE mccmnc = ? AND apn = ?", [mccmnc, apn.get("apn")])
-        if cursor.fetchone() is None:
-            statement = "INSERT INTO apns (%s) VALUES (%s)" % (", ".join(keys), ", ".join(sqlvars))
-            cursor.execute(statement, values)
-
-        count += 1
-        if not args.quiet:
-            pbar.update(count)
-
-    if not args.quiet:
-        pbar.finish()
-    connection.commit()
-    print("Successfully written to %s" % args.output)
-
-    if not args.no_gzip:
-        gzipped_file = "%s.gz" % (args.output,)
-        with open(args.output, 'rb') as orig:
-            with gzip.open(gzipped_file, 'wb') as gzipped:
-                gzipped.writelines(orig)
-        print("Successfully gzipped to %s" % gzipped_file)
-
-    if not args.quiet:
-        print("\nTo include this in the distribution, copy it to the project's assets/databases/ directory.")
-        print("If you support API 10 or lower, you must use the gzipped version to avoid corruption.")
-
-except sqlite3.Error as e:
-    if connection:
-        connection.rollback()
-    print("Error: %s" % e.args[0])
-    sys.exit(1)
-finally:
-    if connection:
-        connection.close()

apntool/requirements.txt

@@ -1,3 +0,0 @@
-argparse>=1.2.1
-lxml>=3.3.3
-progressbar-latest>=2.4

app/build.gradle

@@ -1,719 +0,0 @@
-import com.android.build.api.dsl.ManagedVirtualDevice
-
-plugins {
-    id 'com.android.application'
-    id 'kotlin-android'
-    id 'com.google.protobuf'
-    id 'androidx.navigation.safeargs'
-    id 'org.jlleitschuh.gradle.ktlint'
-    id 'org.jetbrains.kotlin.android'
-    id 'app.cash.exhaustive'
-    id 'kotlin-parcelize'
-    id 'com.squareup.wire'
-    id 'translations'
-    id 'licenses'
-}
-
-apply from: 'static-ips.gradle'
-
-protobuf {
-    protoc {
-        artifact = 'com.google.protobuf:protoc:3.18.0'
-    }
-    generateProtoTasks {
-        all().each { task ->
-            task.builtins {
-                java {
-                    option "lite"
-                }
-            }
-        }
-    }
-}
-
-wire {
-    kotlin {
-        javaInterop = true
-    }
-
-    sourcePath {
-        srcDir 'src/main/protowire'
-    }
-
-    protoPath {
-        srcDir "${project.rootDir}/libsignal/service/src/main/protowire"
-    }
-}
-
-ktlint {
-    version = "0.49.1"
-}
-
-def canonicalVersionCode = 1330
-def canonicalVersionName = "6.33.2"
-
-def postFixSize = 100
-def abiPostFix = ['universal'   : 0,
-                  'armeabi-v7a' : 1,
-                  'arm64-v8a'   : 2,
-                  'x86'         : 3,
-                  'x86_64'      : 4]
-
-def keystores = [ 'debug'  : loadKeystoreProperties('keystore.debug.properties') ]
-
-def selectableVariants = [
-        'nightlyProdSpinner',
-        'nightlyProdPerf',
-        'nightlyProdRelease',
-        'nightlyStagingRelease',
-        'nightlyPnpPerf',
-        'nightlyPnpRelease',
-        'playProdDebug',
-        'playProdSpinner',
-        'playProdCanary',
-        'playProdPerf',
-        'playProdBenchmark',
-        'playProdInstrumentation',
-        'playProdRelease',
-        'playStagingDebug',
-        'playStagingCanary',
-        'playStagingSpinner',
-        'playStagingPerf',
-        'playStagingInstrumentation',
-        'playPnpDebug',
-        'playPnpSpinner',
-        'playStagingRelease',
-        'websiteProdSpinner',
-        'websiteProdRelease',
-]
-
-android {
-    namespace 'org.thoughtcrime.securesms'
-
-    buildToolsVersion = signalBuildToolsVersion
-    compileSdkVersion = signalCompileSdkVersion
-
-    flavorDimensions 'distribution', 'environment'
-    useLibrary 'org.apache.http.legacy'
-    testBuildType 'instrumentation'
-
-    kotlinOptions {
-        jvmTarget = signalKotlinJvmTarget
-        freeCompilerArgs = ["-Xallow-result-return-type"]
-    }
-
-    signingConfigs {
-        if (keystores.debug != null) {
-            debug {
-                storeFile file("${project.rootDir}/${keystores.debug.storeFile}")
-                storePassword keystores.debug.storePassword
-                keyAlias keystores.debug.keyAlias
-                keyPassword keystores.debug.keyPassword
-            }
-        }
-    }
-
-    testOptions {
-        execution 'ANDROIDX_TEST_ORCHESTRATOR'
-
-        unitTests {
-            includeAndroidResources = true
-        }
-
-        managedDevices {
-            devices {
-                pixel3api30 (ManagedVirtualDevice) {
-                    device = "Pixel 3"
-                    apiLevel = 30
-                    systemImageSource = "google-atd"
-                    require64Bit = false
-                }
-            }
-        }
-    }
-
-
-    sourceSets {
-        test {
-            java.srcDirs += "$projectDir/src/testShared"
-        }
-
-        androidTest {
-            java.srcDirs += "$projectDir/src/testShared"
-        }
-    }
-
-    compileOptions {
-        coreLibraryDesugaringEnabled true
-        sourceCompatibility signalJavaVersion
-        targetCompatibility signalJavaVersion
-    }
-
-    packagingOptions {
-        resources {
-            excludes += ['LICENSE.txt', 'LICENSE', 'NOTICE', 'asm-license.txt', 'META-INF/LICENSE', 'META-INF/LICENSE.md', 'META-INF/NOTICE', 'META-INF/LICENSE-notice.md', 'META-INF/proguard/androidx-annotations.pro', 'libsignal_jni.dylib', 'signal_jni.dll']
-        }
-    }
-
-
-    buildFeatures {
-        viewBinding true
-        compose true
-    }
-
-    composeOptions {
-        kotlinCompilerExtensionVersion = '1.4.4'
-    }
-
-    defaultConfig {
-        versionCode canonicalVersionCode * postFixSize
-        versionName canonicalVersionName
-
-        minSdkVersion signalMinSdkVersion
-        targetSdkVersion signalTargetSdkVersion
-
-        multiDexEnabled true
-
-        vectorDrawables.useSupportLibrary = true
-        project.ext.set("archivesBaseName", "Signal")
-
-        manifestPlaceholders = [mapsKey:"AIzaSyCSx9xea86GwDKGznCAULE9Y5a8b-TfN9U"]
-
-        buildConfigField "long", "BUILD_TIMESTAMP", getLastCommitTimestamp() + "L"
-        buildConfigField "String", "GIT_HASH", "\"${getGitHash()}\""
-        buildConfigField "String", "SIGNAL_URL", "\"https://chat.signal.org\""
-        buildConfigField "String", "STORAGE_URL", "\"https://storage.signal.org\""
-        buildConfigField "String", "SIGNAL_CDN_URL", "\"https://cdn.signal.org\""
-        buildConfigField "String", "SIGNAL_CDN2_URL", "\"https://cdn2.signal.org\""
-        buildConfigField "String", "SIGNAL_CDN3_URL", "\"https://cdn3.signal.org\""
-        buildConfigField "String", "SIGNAL_CDSI_URL", "\"https://cdsi.signal.org\""
-        buildConfigField "String", "SIGNAL_SERVICE_STATUS_URL", "\"uptime.signal.org\""
-        buildConfigField "String", "SIGNAL_KEY_BACKUP_URL", "\"https://api.backup.signal.org\""
-        buildConfigField "String", "SIGNAL_SVR2_URL", "\"https://svr2.signal.org\""
-        buildConfigField "String", "SIGNAL_SFU_URL", "\"https://sfu.voip.signal.org\""
-        buildConfigField "String", "SIGNAL_STAGING_SFU_URL", "\"https://sfu.staging.voip.signal.org\""
-        buildConfigField "String[]", "SIGNAL_SFU_INTERNAL_NAMES", "new String[]{\"Test\", \"Staging\", \"Development\"}"
-        buildConfigField "String[]", "SIGNAL_SFU_INTERNAL_URLS", "new String[]{\"https://sfu.test.voip.signal.org\", \"https://sfu.staging.voip.signal.org\", \"https://sfu.staging.test.voip.signal.org\"}"
-        buildConfigField "String", "CONTENT_PROXY_HOST", "\"contentproxy.signal.org\""
-        buildConfigField "int", "CONTENT_PROXY_PORT", "443"
-        buildConfigField "String[]", "SIGNAL_SERVICE_IPS", service_ips
-        buildConfigField "String[]", "SIGNAL_STORAGE_IPS", storage_ips
-        buildConfigField "String[]", "SIGNAL_CDN_IPS", cdn_ips
-        buildConfigField "String[]", "SIGNAL_CDN2_IPS", cdn2_ips
-        buildConfigField "String[]", "SIGNAL_CDN3_IPS", cdn3_ips
-        buildConfigField "String[]", "SIGNAL_KBS_IPS", kbs_ips
-        buildConfigField "String[]", "SIGNAL_SFU_IPS", sfu_ips
-        buildConfigField "String[]", "SIGNAL_CONTENT_PROXY_IPS", content_proxy_ips
-        buildConfigField "String[]", "SIGNAL_CDSI_IPS", cdsi_ips
-        buildConfigField "String[]", "SIGNAL_SVR2_IPS", svr2_ips
-        buildConfigField "String", "SIGNAL_AGENT", "\"OWA\""
-        buildConfigField "String", "CDSI_MRENCLAVE", "\"0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57\""
-        buildConfigField "String", "SVR2_MRENCLAVE", "\"6ee1042f9e20f880326686dd4ba50c25359f01e9f733eeba4382bca001d45094\""
-        buildConfigField "org.thoughtcrime.securesms.KbsEnclave", "KBS_ENCLAVE", "new org.thoughtcrime.securesms.KbsEnclave(\"e18376436159cda3ad7a45d9320e382e4a497f26b0dca34d8eab0bd0139483b5\", " +
-                                                                                                                           "\"3a485adb56e2058ef7737764c738c4069dd62bc457637eafb6bbce1ce29ddb89\", " +
-                                                                                                                           "\"45627094b2ea4a66f4cf0b182858a8dcf4b8479122c3820fe7fd0551a6d4cf5c\")"
-        buildConfigField "org.thoughtcrime.securesms.KbsEnclave[]", "KBS_FALLBACKS", "new org.thoughtcrime.securesms.KbsEnclave[] { new org.thoughtcrime.securesms.KbsEnclave(\"0cedba03535b41b67729ce9924185f831d7767928a1d1689acb689bc079c375f\", " +
-                                                                                                                                                                             "\"187d2739d22be65e74b65f0055e74d31310e4267e5fac2b1246cc8beba81af39\", " +
-                                                                                                                                                                             "\"ee19f1965b1eefa3dc4204eb70c04f397755f771b8c1909d080c04dad2a6a9ba\") }"
-        buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF\""
-        buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY/JYJHRooo5CEqYKBqdFnmbTVGEkCvJKxLnjwKWf+fEPoWeQFj5ObDjcKMZf2Jm2Ae69x+ikU5gBXsRmoF94GXTLfN0/vLt98KDPnxwAQL9j5V1jGOY8jQl6MLxEs56cwXN0dqCnImzVH3TZT1cJ8SW1BRX6qIVxEzjsSGx3yxF3suAilPMqGRp4ffyopjMD1JXiKR2RwLKzizUe5e8XyGOy9fplzhw3jVzTRyUZTRSZKkMLWcQ/gv0E4aONNqs4P\""
-        buildConfigField "String", "GENERIC_SERVER_PUBLIC_PARAMS", "\"AByD873dTilmOSG0TjKrvpeaKEsUmIO8Vx9BeMmftwUs9v7ikPwM8P3OHyT0+X3EUMZrSe9VUp26Wai51Q9I8mdk0hX/yo7CeFGJyzoOqn8e/i4Ygbn5HoAyXJx5eXfIbqpc0bIxzju4H/HOQeOpt6h742qii5u/cbwOhFZCsMIbElZTaeU+BWMBQiZHIGHT5IE0qCordQKZ5iPZom0HeFa8Yq0ShuEyAl0WINBiY6xE3H/9WnvzXBbMuuk//eRxXgzO8ieCeK8FwQNxbfXqZm6Ro1cMhCOF3u7xoX83QhpN\""
-        buildConfigField "String[]", "LANGUAGES", "new String[]{\"" + autoResConfig().collect { s -> s.replace('-r', '_') }.join('", "') + '"}'
-        buildConfigField "int", "CANONICAL_VERSION_CODE", "$canonicalVersionCode"
-        buildConfigField "String", "DEFAULT_CURRENCIES", "\"EUR,AUD,GBP,CAD,CNY\""
-        buildConfigField "String", "GIPHY_API_KEY", "\"3o6ZsYH6U6Eri53TXy\""
-        buildConfigField "String", "SIGNAL_CAPTCHA_URL", "\"https://signalcaptchas.org/registration/generate.html\""
-        buildConfigField "String", "RECAPTCHA_PROOF_URL", "\"https://signalcaptchas.org/challenge/generate.html\""
-
-        buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"unset\""
-        buildConfigField "String", "BUILD_ENVIRONMENT_TYPE", "\"unset\""
-        buildConfigField "String", "BUILD_VARIANT_TYPE", "\"unset\""
-        buildConfigField "String", "BADGE_STATIC_ROOT", "\"https://updates2.signal.org/static/badges/\""
-        buildConfigField "String", "STRIPE_PUBLISHABLE_KEY", "\"pk_live_6cmGZopuTsV8novGgJJW9JpC00vLIgtQ1D\""
-        buildConfigField "boolean", "TRACING_ENABLED", "false"
-
-        ndk {
-            abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
-        }
-        resourceConfigurations += []
-
-
-        splits {
-            abi {
-                enable !project.hasProperty('generateBaselineProfile')
-                reset()
-                include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
-                universalApk true
-            }
-        }
-
-        testInstrumentationRunner "org.thoughtcrime.securesms.testing.SignalTestRunner"
-        testInstrumentationRunnerArguments clearPackageData: 'true'
-    }
-
-    buildTypes {
-        debug {
-            if (keystores['debug'] != null) {
-                signingConfig signingConfigs.debug
-            }
-            isDefault true
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'),
-                    'proguard/proguard-firebase-messaging.pro',
-                    'proguard/proguard-google-play-services.pro',
-                    'proguard/proguard-jackson.pro',
-                    'proguard/proguard-sqlite.pro',
-                    'proguard/proguard-appcompat-v7.pro',
-                    'proguard/proguard-square-okhttp.pro',
-                    'proguard/proguard-square-okio.pro',
-                    'proguard/proguard-rounded-image-view.pro',
-                    'proguard/proguard-glide.pro',
-                    'proguard/proguard-shortcutbadger.pro',
-                    'proguard/proguard-retrofit.pro',
-                    'proguard/proguard-webrtc.pro',
-                    'proguard/proguard-klinker.pro',
-                    'proguard/proguard-mobilecoin.pro',
-                    'proguard/proguard-retrolambda.pro',
-                    'proguard/proguard-okhttp.pro',
-                    'proguard/proguard-ez-vcard.pro',
-                    'proguard/proguard.cfg'
-            testProguardFiles 'proguard/proguard-automation.pro',
-                    'proguard/proguard.cfg'
-
-            manifestPlaceholders = [mapsKey:getMapsKey()]
-
-            buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Debug\""
-        }
-
-        instrumentation {
-            initWith debug
-            isDefault false
-            minifyEnabled false
-            matchingFallbacks = ['debug']
-            applicationIdSuffix ".instrumentation"
-
-            buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Instrumentation\""
-        }
-
-        spinner {
-            initWith debug
-            isDefault false
-            minifyEnabled false
-            matchingFallbacks = ['debug']
-            buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Spinner\""
-        }
-
-        release {
-            minifyEnabled true
-            proguardFiles = buildTypes.debug.proguardFiles
-            buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Release\""
-        }
-
-        perf {
-            initWith debug
-            isDefault false
-            debuggable false
-            minifyEnabled true
-            matchingFallbacks = ['debug']
-            buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Perf\""
-            buildConfigField "boolean", "TRACING_ENABLED", "true"
-        }
-
-        benchmark {
-            initWith debug
-            isDefault false
-            debuggable false
-            minifyEnabled true
-            matchingFallbacks = ['debug']
-            buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Benchmark\""
-            buildConfigField "boolean", "TRACING_ENABLED", "true"
-        }
-
-        canary {
-            initWith debug
-            isDefault false
-            minifyEnabled false
-            matchingFallbacks = ['debug']
-            buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Canary\""
-        }
-    }
-
-    productFlavors {
-        play {
-            dimension 'distribution'
-            isDefault true
-            ext.websiteUpdateUrl = "null"
-            buildConfigField "boolean", "PLAY_STORE_DISABLED", "false"
-            buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
-            buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"play\""
-        }
-
-        website {
-            dimension 'distribution'
-            ext.websiteUpdateUrl = "https://updates.signal.org/android"
-            buildConfigField "boolean", "PLAY_STORE_DISABLED", "true"
-            buildConfigField "String", "NOPLAY_UPDATE_URL", "\"$ext.websiteUpdateUrl\""
-            buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"website\""
-        }
-
-        nightly {
-            dimension 'distribution'
-            versionNameSuffix "-nightly-untagged-${getDateSuffix()}"
-            ext.websiteUpdateUrl = "null"
-            buildConfigField "boolean", "PLAY_STORE_DISABLED", "false"
-            buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
-            buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"nightly\""
-        }
-
-        prod {
-            dimension 'environment'
-
-            isDefault true
-
-            buildConfigField "String", "MOBILE_COIN_ENVIRONMENT", "\"mainnet\""
-            buildConfigField "String", "BUILD_ENVIRONMENT_TYPE", "\"Prod\""
-        }
-
-        staging {
-            dimension 'environment'
-
-            applicationIdSuffix ".staging"
-
-            buildConfigField "String", "SIGNAL_URL", "\"https://chat.staging.signal.org\""
-            buildConfigField "String", "STORAGE_URL", "\"https://storage-staging.signal.org\""
-            buildConfigField "String", "SIGNAL_CDN_URL", "\"https://cdn-staging.signal.org\""
-            buildConfigField "String", "SIGNAL_CDN2_URL", "\"https://cdn2-staging.signal.org\""
-            buildConfigField "String", "SIGNAL_CDN3_URL", "\"https://cdn3-staging.signal.org\""
-            buildConfigField "String", "SIGNAL_CDSI_URL", "\"https://cdsi.staging.signal.org\""
-            buildConfigField "String", "SIGNAL_KEY_BACKUP_URL", "\"https://api-staging.backup.signal.org\""
-            buildConfigField "String", "SIGNAL_SVR2_URL", "\"https://svr2.staging.signal.org\""
-            buildConfigField "String", "SVR2_MRENCLAVE", "\"a8a261420a6bb9b61aa25bf8a79e8bd20d7652531feb3381cbffd446d270be95\""
-            buildConfigField "org.thoughtcrime.securesms.KbsEnclave", "KBS_ENCLAVE", "new org.thoughtcrime.securesms.KbsEnclave(\"39963b736823d5780be96ab174869a9499d56d66497aa8f9b2244f777ebc366b\", " +
-                                                                                                                               "\"ee1d0d972b7ea903615670de43ab1b6e7a825e811c70a29bb5fe0f819e0975fa\", " +
-                                                                                                                               "\"45627094b2ea4a66f4cf0b182858a8dcf4b8479122c3820fe7fd0551a6d4cf5c\")"
-            buildConfigField "org.thoughtcrime.securesms.KbsEnclave[]", "KBS_FALLBACKS", "new org.thoughtcrime.securesms.KbsEnclave[] { new org.thoughtcrime.securesms.KbsEnclave(\"dd6f66d397d9e8cf6ec6db238e59a7be078dd50e9715427b9c89b409ffe53f99\", " +
-                                                                                                                                                                                 "\"4200003414528c151e2dccafbc87aa6d3d66a5eb8f8c05979a6e97cb33cd493a\", " +
-                                                                                                                                                                                 "\"ee19f1965b1eefa3dc4204eb70c04f397755f771b8c1909d080c04dad2a6a9ba\") }"
-            buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx\""
-            buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXZSSsOZ6s7M1+rTJN0bI5CKY2PX29y5Ok3jSWufIKcgKOnWoP67d5b2du2ZVJjpjfibNIHbT/cegy/sBLoFwtHogVYUewANUAXIaMPyCLRArsKhfJ5wBtTminG/PAvuBdJ70Z/bXVPf8TVsR292zQ65xwvWTejROW6AZX6aqucUj\""
-            buildConfigField "String", "GENERIC_SERVER_PUBLIC_PARAMS", "\"AHILOIrFPXX9laLbalbA9+L1CXpSbM/bTJXZGZiuyK1JaI6dK5FHHWL6tWxmHKYAZTSYmElmJ5z2A5YcirjO/yfoemE03FItyaf8W1fE4p14hzb5qnrmfXUSiAIVrhaXVwIwSzH6RL/+EO8jFIjJ/YfExfJ8aBl48CKHgu1+A6kWynhttonvWWx6h7924mIzW0Czj2ROuh4LwQyZypex4GuOPW8sgIT21KNZaafgg+KbV7XM1x1tF3XA17B4uGUaDbDw2O+nR1+U5p6qHPzmJ7ggFjSN6Utu+35dS1sS0P9N\""
-            buildConfigField "String", "MOBILE_COIN_ENVIRONMENT", "\"testnet\""
-            buildConfigField "String", "SIGNAL_CAPTCHA_URL", "\"https://signalcaptchas.org/staging/registration/generate.html\""
-            buildConfigField "String", "RECAPTCHA_PROOF_URL", "\"https://signalcaptchas.org/staging/challenge/generate.html\""
-
-            buildConfigField "String", "BUILD_ENVIRONMENT_TYPE", "\"Staging\""
-            buildConfigField "String", "STRIPE_PUBLISHABLE_KEY", "\"pk_test_sngOd8FnXNkpce9nPXawKrJD00kIDngZkD\""
-        }
-
-        pnp {
-            dimension 'environment'
-
-            initWith staging
-            applicationIdSuffix ".pnp"
-
-            buildConfigField "String", "BUILD_ENVIRONMENT_TYPE", "\"Pnp\""
-        }
-    }
-
-    lint {
-        abortOnError true
-        baseline file('lint-baseline.xml')
-        checkReleaseBuilds false
-        disable 'LintError'
-    }
-
-    android.applicationVariants.all { variant ->
-        variant.outputs.each { output ->
-            if (output.baseName.contains('nightly')) {
-                output.versionCodeOverride = canonicalVersionCode * postFixSize + 5
-                def tag = getCurrentGitTag()
-                if (tag != null && tag.length() > 0) {
-                    if (tag.startsWith("v")) {
-                        tag = tag.substring(1)
-                    }
-                    output.versionNameOverride = tag
-                }
-            } else {
-                output.outputFileName = output.outputFileName.replace(".apk", "-${variant.versionName}.apk")
-                def abiName = output.getFilter("ABI") ?: 'universal'
-                def postFix = abiPostFix.get(abiName, 0)
-
-                if (postFix >= postFixSize) throw new AssertionError("postFix is too large")
-
-                output.versionCodeOverride = canonicalVersionCode * postFixSize + postFix
-            }
-        }
-    }
-
-    android.variantFilter { variant ->
-        def distribution = variant.getFlavors().get(0).name
-        def environment  = variant.getFlavors().get(1).name
-        def buildType    = variant.buildType.name
-        def fullName     = distribution + environment.capitalize() + buildType.capitalize()
-
-        if (!selectableVariants.contains(fullName)) {
-            variant.setIgnore(true)
-        }
-    }
-
-    android.buildTypes.each {
-        if (it.name != 'release') {
-            sourceSets.findByName(it.name).java.srcDirs += "$projectDir/src/debug/java"
-        } else {
-            sourceSets.findByName(it.name).java.srcDirs += "$projectDir/src/release/java"
-        }
-    }
-}
-
-dependencies {
-    implementation libs.androidx.fragment.ktx
-    lintChecks project(':lintchecks')
-
-    coreLibraryDesugaring libs.android.tools.desugar
-
-    implementation (libs.androidx.appcompat) {
-        version {
-            strictly '1.6.1'
-        }
-    }
-    implementation libs.androidx.window.window
-    implementation libs.androidx.window.java
-    implementation libs.androidx.recyclerview
-    implementation libs.material.material
-    implementation libs.androidx.legacy.support
-    implementation libs.androidx.preference
-    implementation libs.androidx.legacy.preference
-    implementation libs.androidx.gridlayout
-    implementation libs.androidx.exifinterface
-    implementation libs.androidx.compose.rxjava3
-    implementation libs.androidx.compose.runtime.livedata
-    implementation libs.androidx.constraintlayout
-    implementation libs.androidx.multidex
-    implementation libs.androidx.navigation.fragment.ktx
-    implementation libs.androidx.navigation.ui.ktx
-    implementation libs.androidx.lifecycle.viewmodel.ktx
-    implementation libs.androidx.lifecycle.livedata.ktx
-    implementation libs.androidx.lifecycle.process
-    implementation libs.androidx.lifecycle.viewmodel.savedstate
-    implementation libs.androidx.lifecycle.common.java8
-    implementation libs.androidx.lifecycle.reactivestreams.ktx
-    implementation libs.androidx.camera.core
-    implementation libs.androidx.camera.camera2
-    implementation libs.androidx.camera.lifecycle
-    implementation libs.androidx.camera.view
-    implementation libs.androidx.concurrent.futures
-    implementation libs.androidx.autofill
-    implementation libs.androidx.biometric
-    implementation libs.androidx.sharetarget
-    implementation libs.androidx.profileinstaller
-    implementation libs.androidx.asynclayoutinflater
-    implementation libs.androidx.asynclayoutinflater.appcompat
-
-    implementation (libs.firebase.messaging) {
-        exclude group: 'com.google.firebase', module: 'firebase-core'
-        exclude group: 'com.google.firebase', module: 'firebase-analytics'
-        exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
-    }
-
-    implementation libs.google.play.services.maps
-    implementation libs.google.play.services.auth
-
-    implementation libs.bundles.media3
-
-    implementation libs.conscrypt.android
-    implementation libs.signal.aesgcmprovider
-
-    implementation project(':libsignal-service')
-    implementation project(':paging')
-    implementation project(':core-util')
-    implementation project(':glide-config')
-    implementation project(':video')
-    implementation project(':device-transfer')
-    implementation project(':image-editor')
-    implementation project(':donations')
-    implementation project(':contacts')
-    implementation project(':qr')
-    implementation project(':sms-exporter')
-    implementation project(':sticky-header-grid')
-    implementation project(':photoview')
-
-    implementation libs.libsignal.android
-    implementation libs.google.protobuf.javalite
-
-    implementation(libs.mobilecoin) {
-        exclude group: 'com.google.protobuf'
-    }
-
-    implementation libs.signal.ringrtc
-
-    implementation libs.leolin.shortcutbadger
-    implementation libs.emilsjolander.stickylistheaders
-    implementation libs.apache.httpclient.android
-    implementation libs.glide.glide
-    implementation libs.roundedimageview
-    implementation libs.materialish.progress
-    implementation libs.greenrobot.eventbus
-    implementation libs.google.zxing.android.integration
-    implementation libs.google.zxing.core
-    implementation libs.google.flexbox
-    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.android.smsmms) {
-        exclude group: 'com.squareup.okhttp', module: 'okhttp'
-        exclude group: 'com.squareup.okhttp', module: 'okhttp-urlconnection'
-    }
-    implementation libs.stream
-
-    implementation libs.lottie
-
-    implementation libs.signal.android.database.sqlcipher
-    implementation libs.androidx.sqlite
-
-    implementation (libs.google.ez.vcard) {
-        exclude group: 'com.fasterxml.jackson.core'
-        exclude group: 'org.freemarker'
-    }
-    implementation libs.dnsjava
-    implementation libs.kotlinx.collections.immutable
-    implementation libs.accompanist.permissions
-
-    spinnerImplementation project(":spinner")
-
-    canaryImplementation libs.square.leakcanary
-
-    testImplementation testLibs.junit.junit
-    testImplementation testLibs.assertj.core
-    testImplementation testLibs.mockito.core
-    testImplementation testLibs.mockito.kotlin
-
-    testImplementation testLibs.androidx.test.core
-    testImplementation (testLibs.robolectric.robolectric) {
-        exclude group: 'com.google.protobuf', module: 'protobuf-java'
-    }
-    testImplementation testLibs.robolectric.shadows.multidex
-    testImplementation (testLibs.bouncycastle.bcprov.jdk15on) { version { strictly "1.70" } } // Used by roboelectric
-    testImplementation (testLibs.bouncycastle.bcpkix.jdk15on) { version { strictly "1.70" } } // Used by roboelectric
-    testImplementation testLibs.conscrypt.openjdk.uber // Used by robolectric
-    testImplementation testLibs.hamcrest.hamcrest
-    testImplementation testLibs.mockk
-
-    testImplementation(testFixtures(project(":libsignal-service")))
-
-    androidTestImplementation testLibs.androidx.test.ext.junit
-    androidTestImplementation testLibs.espresso.core
-    androidTestImplementation testLibs.androidx.test.core
-    androidTestImplementation testLibs.androidx.test.core.ktx
-    androidTestImplementation testLibs.androidx.test.ext.junit.ktx
-    androidTestImplementation testLibs.mockito.android
-    androidTestImplementation testLibs.mockito.kotlin
-    androidTestImplementation testLibs.mockk.android
-    androidTestImplementation testLibs.square.okhttp.mockserver
-
-    instrumentationImplementation (libs.androidx.fragment.testing) {
-        exclude group: 'androidx.test', module: 'core'
-    }
-
-    testImplementation testLibs.espresso.core
-
-    implementation libs.kotlin.stdlib.jdk8
-    implementation libs.kotlin.reflect
-    implementation libs.jackson.module.kotlin
-
-    implementation libs.rxjava3.rxandroid
-    implementation libs.rxjava3.rxkotlin
-    implementation libs.rxdogtag
-
-    androidTestUtil testLibs.androidx.test.orchestrator
-
-    implementation project(':core-ui')
-    ktlintRuleset libs.ktlint.twitter.compose
-}
-
-def getLastCommitTimestamp() {
-    if (!(new File('.git').exists())) {
-        return System.currentTimeMillis().toString()
-    }
-
-    new ByteArrayOutputStream().withStream { os ->
-        exec {
-            executable = 'git'
-            args = ['log', '-1', '--pretty=format:%ct']
-            standardOutput = os
-        }
-
-        return os.toString() + "000"
-    }
-}
-
-def getGitHash() {
-    if (!(new File('.git').exists())) {
-        throw new IllegalStateException("Must be a git repository to guarantee reproducible builds! (git hash is part of APK)")
-    }
-
-    def stdout = new ByteArrayOutputStream()
-    exec {
-        commandLine 'git', 'rev-parse', 'HEAD'
-        standardOutput = stdout
-    }
-    return stdout.toString().trim().substring(0, 12)
-}
-
-def getCurrentGitTag() {
-    if (!(new File('.git').exists())) {
-        throw new IllegalStateException("Must be a git repository to guarantee reproducible builds! (git hash is part of APK)")
-    }
-
-    def stdout = new ByteArrayOutputStream()
-    exec {
-        commandLine 'git', 'tag', '--points-at', 'HEAD'
-        standardOutput = stdout
-    }
-
-    def output = stdout.toString().trim()
-
-    if (output != null && output.size() > 0) {
-        def tags = output.split('\n').toList()
-        return tags.stream().filter(t -> t.contains('nightly')).findFirst().orElse(tags.get(0))
-    } else {
-        return null
-    }
-}
-
-tasks.withType(Test) {
-    testLogging {
-        events "failed"
-        exceptionFormat "full"
-        showCauses true
-        showExceptions true
-        showStackTraces true
-    }
-}
-
-def loadKeystoreProperties(filename) {
-    def keystorePropertiesFile = file("${project.rootDir}/${filename}")
-    if (keystorePropertiesFile.exists()) {
-        def keystoreProperties = new Properties()
-        keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-        return keystoreProperties
-    } else {
-        return null
-    }
-}
-
-static def getDateSuffix() {
-    def date = new Date()
-    def formattedDate = date.format('yyyy-MM-dd-HH:mm')
-    return formattedDate
-}
-
-def getMapsKey() {
-    def mapKey = file("${project.rootDir}/maps.key")
-    if (mapKey.exists()) {
-        return mapKey.readLines()[0]
-    }
-    return "AIzaSyCSx9xea86GwDKGznCAULE9Y5a8b-TfN9U"
-}

app/build.gradle.kts

@@ -0,0 +1,741 @@
+import com.android.build.api.dsl.ManagedVirtualDevice
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import java.io.ByteArrayOutputStream
+import java.io.FileInputStream
+import java.text.SimpleDateFormat
+import java.util.Date
+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)
+  id("androidx.navigation.safeargs")
+  id("kotlin-parcelize")
+  id("com.squareup.wire")
+  id("translations")
+  id("licenses")
+}
+
+apply(from = "static-ips.gradle.kts")
+
+val canonicalVersionCode = 1506
+val canonicalVersionName = "7.31.1"
+val currentHotfixVersion = 0
+val maxHotfixVersions = 100
+
+val keystores: Map<String, Properties?> = mapOf("debug" to loadKeystoreProperties("keystore.debug.properties"))
+
+val selectableVariants = listOf(
+  "nightlyProdSpinner",
+  "nightlyProdPerf",
+  "nightlyProdRelease",
+  "nightlyStagingRelease",
+  "playProdDebug",
+  "playProdSpinner",
+  "playProdCanary",
+  "playProdPerf",
+  "playProdBenchmark",
+  "playProdInstrumentation",
+  "playProdRelease",
+  "playStagingDebug",
+  "playStagingCanary",
+  "playStagingSpinner",
+  "playStagingPerf",
+  "playStagingInstrumentation",
+  "playStagingRelease",
+  "websiteProdSpinner",
+  "websiteProdRelease"
+)
+
+val signalBuildToolsVersion: String by rootProject.extra
+val signalCompileSdkVersion: String by rootProject.extra
+val signalTargetSdkVersion: Int by rootProject.extra
+val signalMinSdkVersion: Int by rootProject.extra
+val signalNdkVersion: String by rootProject.extra
+val signalJavaVersion: JavaVersion by rootProject.extra
+val signalKotlinJvmTarget: String by rootProject.extra
+
+wire {
+  kotlin {
+    javaInterop = true
+  }
+
+  sourcePath {
+    srcDir("src/main/protowire")
+  }
+
+  protoPath {
+    srcDir("${project.rootDir}/libsignal-service/src/main/protowire")
+  }
+}
+
+ktlint {
+  version.set("1.2.1")
+}
+
+android {
+  namespace = "org.thoughtcrime.securesms"
+
+  buildToolsVersion = signalBuildToolsVersion
+  compileSdkVersion = signalCompileSdkVersion
+  ndkVersion = signalNdkVersion
+
+  flavorDimensions += listOf("distribution", "environment")
+  testBuildType = "instrumentation"
+
+  android.bundle.language.enableSplit = false
+
+  kotlinOptions {
+    jvmTarget = signalKotlinJvmTarget
+    freeCompilerArgs = listOf("-Xjvm-default=all")
+  }
+
+  keystores["debug"]?.let { properties ->
+    signingConfigs.getByName("debug").apply {
+      storeFile = file("${project.rootDir}/${properties.getProperty("storeFile")}")
+      storePassword = properties.getProperty("storePassword")
+      keyAlias = properties.getProperty("keyAlias")
+      keyPassword = properties.getProperty("keyPassword")
+    }
+  }
+
+  testOptions {
+    execution = "ANDROIDX_TEST_ORCHESTRATOR"
+
+    unitTests {
+      isIncludeAndroidResources = true
+    }
+
+    managedDevices {
+      devices {
+        create<ManagedVirtualDevice>("pixel3api30") {
+          device = "Pixel 3"
+          apiLevel = 30
+          systemImageSource = "google-atd"
+          require64Bit = false
+        }
+      }
+    }
+  }
+
+  sourceSets {
+    getByName("test") {
+      java.srcDir("$projectDir/src/testShared")
+    }
+
+    getByName("androidTest") {
+      java.srcDir("$projectDir/src/testShared")
+    }
+  }
+
+  compileOptions {
+    isCoreLibraryDesugaringEnabled = true
+    sourceCompatibility = signalJavaVersion
+    targetCompatibility = signalJavaVersion
+  }
+
+  packaging {
+    jniLibs {
+      excludes += setOf(
+        "**/*.dylib",
+        "**/*.dll"
+      )
+    }
+    resources {
+      excludes += setOf(
+        "LICENSE.txt",
+        "LICENSE",
+        "NOTICE",
+        "asm-license.txt",
+        "META-INF/LICENSE",
+        "META-INF/LICENSE.md",
+        "META-INF/NOTICE",
+        "META-INF/LICENSE-notice.md",
+        "META-INF/proguard/androidx-annotations.pro",
+        "**/*.dylib",
+        "**/*.dll"
+      )
+    }
+  }
+
+  buildFeatures {
+    buildConfig = true
+    viewBinding = true
+    compose = true
+  }
+
+  composeOptions {
+    kotlinCompilerExtensionVersion = "1.5.4"
+  }
+
+  defaultConfig {
+    versionCode = (canonicalVersionCode * maxHotfixVersions) + currentHotfixVersion
+    versionName = canonicalVersionName
+
+    minSdk = signalMinSdkVersion
+    targetSdk = signalTargetSdkVersion
+
+    vectorDrawables.useSupportLibrary = true
+    project.ext.set("archivesBaseName", "Signal")
+
+    manifestPlaceholders["mapsKey"] = "AIzaSyCSx9xea86GwDKGznCAULE9Y5a8b-TfN9U"
+
+    buildConfigField("long", "BUILD_TIMESTAMP", getLastCommitTimestamp() + "L")
+    buildConfigField("String", "GIT_HASH", "\"${getGitHash()}\"")
+    buildConfigField("String", "SIGNAL_URL", "\"https://chat.signal.org\"")
+    buildConfigField("String", "STORAGE_URL", "\"https://storage.signal.org\"")
+    buildConfigField("String", "SIGNAL_CDN_URL", "\"https://cdn.signal.org\"")
+    buildConfigField("String", "SIGNAL_CDN2_URL", "\"https://cdn2.signal.org\"")
+    buildConfigField("String", "SIGNAL_CDN3_URL", "\"https://cdn3.signal.org\"")
+    buildConfigField("String", "SIGNAL_CDSI_URL", "\"https://cdsi.signal.org\"")
+    buildConfigField("String", "SIGNAL_SERVICE_STATUS_URL", "\"uptime.signal.org\"")
+    buildConfigField("String", "SIGNAL_SVR2_URL", "\"https://svr2.signal.org\"")
+    buildConfigField("String", "SIGNAL_SFU_URL", "\"https://sfu.voip.signal.org\"")
+    buildConfigField("String", "SIGNAL_STAGING_SFU_URL", "\"https://sfu.staging.voip.signal.org\"")
+    buildConfigField("String[]", "SIGNAL_SFU_INTERNAL_NAMES", "new String[]{\"Test\", \"Staging\", \"Development\"}")
+    buildConfigField("String[]", "SIGNAL_SFU_INTERNAL_URLS", "new String[]{\"https://sfu.test.voip.signal.org\", \"https://sfu.staging.voip.signal.org\", \"https://sfu.staging.test.voip.signal.org\"}")
+    buildConfigField("String", "CONTENT_PROXY_HOST", "\"contentproxy.signal.org\"")
+    buildConfigField("int", "CONTENT_PROXY_PORT", "443")
+    buildConfigField("String[]", "SIGNAL_SERVICE_IPS", rootProject.extra["service_ips"] as String)
+    buildConfigField("String[]", "SIGNAL_STORAGE_IPS", rootProject.extra["storage_ips"] as String)
+    buildConfigField("String[]", "SIGNAL_CDN_IPS", rootProject.extra["cdn_ips"] as String)
+    buildConfigField("String[]", "SIGNAL_CDN2_IPS", rootProject.extra["cdn2_ips"] as String)
+    buildConfigField("String[]", "SIGNAL_CDN3_IPS", rootProject.extra["cdn3_ips"] as String)
+    buildConfigField("String[]", "SIGNAL_SFU_IPS", rootProject.extra["sfu_ips"] as String)
+    buildConfigField("String[]", "SIGNAL_CONTENT_PROXY_IPS", rootProject.extra["content_proxy_ips"] as String)
+    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", "\"a6622ad4656e1abcd0bc0ff17c229477747d2ded0495c4ebee7ed35c1789fa97\"")
+    buildConfigField("String", "SVR2_MRENCLAVE", "\"9314436a9a144992bb3680770ea5fd7934a7ffd29257844a33763a238903d570\"")
+    buildConfigField("String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF\"")
+    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\"")
+    buildConfigField("String", "BACKUP_SERVER_PUBLIC_PARAMS", "\"AJwNSU55fsFCbgaxGRD11wO1juAs8Yr5GF8FPlGzzvdJJIKH5/4CC7ZJSOe3yL2vturVaRU2Cx0n751Vt8wkj1bozK3CBV1UokxV09GWf+hdVImLGjXGYLLhnI1J2TWEe7iWHyb553EEnRb5oxr9n3lUbNAJuRmFM7hrr0Al0F0wrDD4S8lo2mGaXe0MJCOM166F8oYRQqpFeEHfiLnxA1O8ZLh7vMdv4g9jI5phpRBTsJ5IjiJrWeP0zdIGHEssUeprDZ9OUJ14m0v61eYJMKsf59Bn+mAT2a7YfB+Don9O\"")
+    buildConfigField("String[]", "LANGUAGES", "new String[]{ ${languageList().map { "\"$it\"" }.joinToString(separator = ", ")} }")
+    buildConfigField("int", "CANONICAL_VERSION_CODE", "$canonicalVersionCode")
+    buildConfigField("String", "DEFAULT_CURRENCIES", "\"EUR,AUD,GBP,CAD,CNY\"")
+    buildConfigField("String", "GIPHY_API_KEY", "\"3o6ZsYH6U6Eri53TXy\"")
+    buildConfigField("String", "SIGNAL_CAPTCHA_URL", "\"https://signalcaptchas.org/registration/generate.html\"")
+    buildConfigField("String", "RECAPTCHA_PROOF_URL", "\"https://signalcaptchas.org/challenge/generate.html\"")
+    buildConfigField("org.signal.libsignal.net.Network.Environment", "LIBSIGNAL_NET_ENV", "org.signal.libsignal.net.Network.Environment.PRODUCTION")
+    buildConfigField("int", "LIBSIGNAL_LOG_LEVEL", "org.signal.libsignal.protocol.logging.SignalProtocolLogger.INFO")
+
+    buildConfigField("String", "BUILD_DISTRIBUTION_TYPE", "\"unset\"")
+    buildConfigField("String", "BUILD_ENVIRONMENT_TYPE", "\"unset\"")
+    buildConfigField("String", "BUILD_VARIANT_TYPE", "\"unset\"")
+    buildConfigField("String", "BADGE_STATIC_ROOT", "\"https://updates2.signal.org/static/badges/\"")
+    buildConfigField("String", "STRIPE_BASE_URL", "\"https://api.stripe.com/v1\"")
+    buildConfigField("String", "STRIPE_PUBLISHABLE_KEY", "\"pk_live_6cmGZopuTsV8novGgJJW9JpC00vLIgtQ1D\"")
+    buildConfigField("boolean", "TRACING_ENABLED", "false")
+    buildConfigField("boolean", "MESSAGE_BACKUP_RESTORE_ENABLED", "false")
+
+    ndk {
+      abiFilters += listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
+    }
+    resourceConfigurations += listOf()
+
+    splits {
+      abi {
+        isEnable = !project.hasProperty("generateBaselineProfile")
+        reset()
+        include("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
+        isUniversalApk = true
+      }
+    }
+
+    testInstrumentationRunner = "org.thoughtcrime.securesms.testing.SignalTestRunner"
+    testInstrumentationRunnerArguments["clearPackageData"] = "true"
+  }
+
+  buildTypes {
+    getByName("debug") {
+      if (keystores["debug"] != null) {
+        signingConfig = signingConfigs["debug"]
+      }
+      isDefault = true
+      isMinifyEnabled = false
+      proguardFiles(
+        getDefaultProguardFile("proguard-android.txt"),
+        "proguard/proguard-firebase-messaging.pro",
+        "proguard/proguard-google-play-services.pro",
+        "proguard/proguard-jackson.pro",
+        "proguard/proguard-sqlite.pro",
+        "proguard/proguard-appcompat-v7.pro",
+        "proguard/proguard-square-okhttp.pro",
+        "proguard/proguard-square-okio.pro",
+        "proguard/proguard-rounded-image-view.pro",
+        "proguard/proguard-glide.pro",
+        "proguard/proguard-shortcutbadger.pro",
+        "proguard/proguard-retrofit.pro",
+        "proguard/proguard-klinker.pro",
+        "proguard/proguard-mobilecoin.pro",
+        "proguard/proguard-retrolambda.pro",
+        "proguard/proguard-okhttp.pro",
+        "proguard/proguard-ez-vcard.pro",
+        "proguard/proguard.cfg"
+      )
+      testProguardFiles(
+        "proguard/proguard-automation.pro",
+        "proguard/proguard.cfg"
+      )
+
+      manifestPlaceholders["mapsKey"] = getMapsKey()
+
+      buildConfigField("String", "BUILD_VARIANT_TYPE", "\"Debug\"")
+    }
+
+    getByName("release") {
+      isMinifyEnabled = true
+      proguardFiles(*buildTypes["debug"].proguardFiles.toTypedArray())
+      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
+      isMinifyEnabled = false
+      matchingFallbacks += "debug"
+      buildConfigField("String", "BUILD_VARIANT_TYPE", "\"Spinner\"")
+    }
+
+    create("perf") {
+      initWith(getByName("debug"))
+      isDefault = false
+      isDebuggable = false
+      isMinifyEnabled = true
+      matchingFallbacks += "debug"
+      buildConfigField("String", "BUILD_VARIANT_TYPE", "\"Perf\"")
+      buildConfigField("boolean", "TRACING_ENABLED", "true")
+    }
+
+    create("benchmark") {
+      initWith(getByName("debug"))
+      isDefault = false
+      isDebuggable = false
+      isMinifyEnabled = true
+      matchingFallbacks += "debug"
+      buildConfigField("String", "BUILD_VARIANT_TYPE", "\"Benchmark\"")
+      buildConfigField("boolean", "TRACING_ENABLED", "true")
+    }
+
+    create("canary") {
+      initWith(getByName("debug"))
+      isDefault = false
+      isMinifyEnabled = false
+      matchingFallbacks += "debug"
+      buildConfigField("String", "BUILD_VARIANT_TYPE", "\"Canary\"")
+    }
+  }
+
+  productFlavors {
+    create("play") {
+      dimension = "distribution"
+      isDefault = true
+      buildConfigField("boolean", "MANAGES_APP_UPDATES", "false")
+      buildConfigField("String", "APK_UPDATE_MANIFEST_URL", "null")
+      buildConfigField("String", "BUILD_DISTRIBUTION_TYPE", "\"play\"")
+    }
+
+    create("website") {
+      dimension = "distribution"
+      buildConfigField("boolean", "MANAGES_APP_UPDATES", "true")
+      buildConfigField("String", "APK_UPDATE_MANIFEST_URL", "\"https://updates.signal.org/android/latest.json\"")
+      buildConfigField("String", "BUILD_DISTRIBUTION_TYPE", "\"website\"")
+    }
+
+    create("nightly") {
+      val apkUpdateManifestUrl = if (file("${project.rootDir}/nightly-url.txt").exists()) {
+        file("${project.rootDir}/nightly-url.txt").readText().trim()
+      } else {
+        "<unset>"
+      }
+
+      dimension = "distribution"
+      versionNameSuffix = "-nightly-untagged-${getDateSuffix()}"
+      buildConfigField("boolean", "MANAGES_APP_UPDATES", "true")
+      buildConfigField("String", "APK_UPDATE_MANIFEST_URL", "\"${apkUpdateManifestUrl}\"")
+      buildConfigField("String", "BUILD_DISTRIBUTION_TYPE", "\"nightly\"")
+    }
+
+    create("prod") {
+      dimension = "environment"
+
+      isDefault = true
+
+      buildConfigField("String", "MOBILE_COIN_ENVIRONMENT", "\"mainnet\"")
+      buildConfigField("String", "BUILD_ENVIRONMENT_TYPE", "\"Prod\"")
+    }
+
+    create("staging") {
+      dimension = "environment"
+
+      applicationIdSuffix = ".staging"
+
+      buildConfigField("String", "SIGNAL_URL", "\"https://chat.staging.signal.org\"")
+      buildConfigField("String", "STORAGE_URL", "\"https://storage-staging.signal.org\"")
+      buildConfigField("String", "SIGNAL_CDN_URL", "\"https://cdn-staging.signal.org\"")
+      buildConfigField("String", "SIGNAL_CDN2_URL", "\"https://cdn2-staging.signal.org\"")
+      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", "\"acb1973aa0bbbd14b3b4e06f145497d948fd4a98efc500fcce363b3b743ec482\"")
+      buildConfigField("String", "SVR2_MRENCLAVE", "\"38e01eff4fe357dc0b0e8ef7a44b4abc5489fbccba3a78780f3872c277f62bf3\"")
+      buildConfigField("String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx\"")
+      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\"")
+      buildConfigField("String", "BACKUP_SERVER_PUBLIC_PARAMS", "\"AHYrGb9IfugAAJiPKp+mdXUx+OL9zBolPYHYQz6GI1gWjpEu5me3zVNSvmYY4zWboZHif+HG1sDHSuvwFd0QszSwuSF4X4kRP3fJREdTZ5MCR0n55zUppTwfHRW2S4sdQ0JGz7YDQIJCufYSKh0pGNEHL6hv79Agrdnr4momr3oXdnkpVBIp3HWAQ6IbXQVSG18X36GaicI1vdT0UFmTwU2KTneluC2eyL9c5ff8PcmiS+YcLzh0OKYQXB5ZfQ06d6DiINvDQLy75zcfUOniLAj0lGJiHxGczin/RXisKSR8\"")
+      buildConfigField("String", "MOBILE_COIN_ENVIRONMENT", "\"testnet\"")
+      buildConfigField("String", "SIGNAL_CAPTCHA_URL", "\"https://signalcaptchas.org/staging/registration/generate.html\"")
+      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("String", "BUILD_ENVIRONMENT_TYPE", "\"Staging\"")
+      buildConfigField("String", "STRIPE_PUBLISHABLE_KEY", "\"pk_test_sngOd8FnXNkpce9nPXawKrJD00kIDngZkD\"")
+      buildConfigField("boolean", "MESSAGE_BACKUP_RESTORE_ENABLED", "true")
+    }
+  }
+
+  lint {
+    abortOnError = true
+    baseline = file("lint-baseline.xml")
+    checkReleaseBuilds = false
+    disable += "LintError"
+  }
+
+  applicationVariants.all {
+    outputs
+      .map { it as com.android.build.gradle.internal.api.ApkVariantOutputImpl }
+      .forEach { output ->
+        if (output.baseName.contains("nightly")) {
+          var tag = getCurrentGitTag()
+          if (!tag.isNullOrEmpty()) {
+            if (tag.startsWith("v")) {
+              tag = tag.substring(1)
+            }
+            output.versionNameOverride = tag
+            output.outputFileName = output.outputFileName.replace(".apk", "-${output.versionNameOverride}.apk")
+          } else {
+            output.outputFileName = output.outputFileName.replace(".apk", "-$versionName.apk")
+          }
+        } else {
+          output.outputFileName = output.outputFileName.replace(".apk", "-$versionName.apk")
+
+          if (currentHotfixVersion >= maxHotfixVersions) {
+            throw AssertionError("Hotfix version is too large!")
+          }
+        }
+      }
+  }
+
+  androidComponents {
+    beforeVariants { variant ->
+      variant.enable = variant.name in selectableVariants
+    }
+    onVariants { variant ->
+      // Include the test-only library on debug builds.
+      if (variant.buildType != "instrumentation") {
+        variant.packaging.jniLibs.excludes.add("**/libsignal_jni_testing.so")
+      }
+    }
+  }
+
+  val releaseDir = "$projectDir/src/release/java"
+  val debugDir = "$projectDir/src/debug/java"
+
+  android.buildTypes.configureEach {
+    val path = if (name == "release") releaseDir else debugDir
+    sourceSets.named(name) {
+      java.srcDir(path)
+    }
+  }
+}
+
+dependencies {
+  lintChecks(project(":lintchecks"))
+  ktlintRuleset(libs.ktlint.twitter.compose)
+  coreLibraryDesugaring(libs.android.tools.desugar)
+
+  implementation(project(":libsignal-service"))
+  implementation(project(":paging"))
+  implementation(project(":core-util"))
+  implementation(project(":glide-config"))
+  implementation(project(":video"))
+  implementation(project(":device-transfer"))
+  implementation(project(":image-editor"))
+  implementation(project(":donations"))
+  implementation(project(":contacts"))
+  implementation(project(":qr"))
+  implementation(project(":sticky-header-grid"))
+  implementation(project(":photoview"))
+  implementation(project(":core-ui"))
+
+  implementation(libs.androidx.fragment.ktx)
+  implementation(libs.androidx.appcompat) {
+    version {
+      strictly("1.6.1")
+    }
+  }
+  implementation(libs.androidx.window.window)
+  implementation(libs.androidx.window.java)
+  implementation(libs.androidx.recyclerview)
+  implementation(libs.material.material)
+  implementation(libs.androidx.legacy.support)
+  implementation(libs.androidx.preference)
+  implementation(libs.androidx.legacy.preference)
+  implementation(libs.androidx.gridlayout)
+  implementation(libs.androidx.exifinterface)
+  implementation(libs.androidx.compose.rxjava3)
+  implementation(libs.androidx.compose.runtime.livedata)
+  implementation(libs.androidx.activity.compose)
+  implementation(libs.androidx.constraintlayout)
+  implementation(libs.androidx.navigation.fragment.ktx)
+  implementation(libs.androidx.navigation.ui.ktx)
+  implementation(libs.androidx.navigation.compose)
+  implementation(libs.androidx.lifecycle.viewmodel.ktx)
+  implementation(libs.androidx.lifecycle.livedata.ktx)
+  implementation(libs.androidx.lifecycle.process)
+  implementation(libs.androidx.lifecycle.viewmodel.savedstate)
+  implementation(libs.androidx.lifecycle.common.java8)
+  implementation(libs.androidx.lifecycle.reactivestreams.ktx)
+  implementation(libs.androidx.lifecycle.runtime.compose)
+  implementation(libs.androidx.activity.compose)
+  implementation(libs.androidx.camera.core)
+  implementation(libs.androidx.camera.camera2)
+  implementation(libs.androidx.camera.extensions)
+  implementation(libs.androidx.camera.lifecycle)
+  implementation(libs.androidx.camera.view)
+  implementation(libs.androidx.concurrent.futures)
+  implementation(libs.androidx.autofill)
+  implementation(libs.androidx.biometric)
+  implementation(libs.androidx.sharetarget)
+  implementation(libs.androidx.profileinstaller)
+  implementation(libs.androidx.asynclayoutinflater)
+  implementation(libs.androidx.asynclayoutinflater.appcompat)
+  implementation(libs.androidx.emoji2)
+  implementation(libs.firebase.messaging) {
+    exclude(group = "com.google.firebase", module = "firebase-core")
+    exclude(group = "com.google.firebase", module = "firebase-analytics")
+    exclude(group = "com.google.firebase", module = "firebase-measurement-connector")
+  }
+  implementation(libs.google.play.services.maps)
+  implementation(libs.google.play.services.auth)
+  implementation(libs.bundles.media3)
+  implementation(libs.conscrypt.android)
+  implementation(libs.signal.aesgcmprovider)
+  implementation(libs.libsignal.android)
+  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)
+  implementation(libs.greenrobot.eventbus)
+  implementation(libs.google.zxing.android.integration)
+  implementation(libs.google.zxing.core)
+  implementation(libs.google.flexbox)
+  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)
+  implementation(libs.androidx.sqlite)
+  implementation(libs.google.ez.vcard) {
+    exclude(group = "com.fasterxml.jackson.core")
+    exclude(group = "org.freemarker")
+  }
+  implementation(libs.dnsjava)
+  implementation(libs.kotlinx.collections.immutable)
+  implementation(libs.accompanist.permissions)
+  implementation(libs.accompanist.drawablepainter)
+  implementation(libs.kotlin.stdlib.jdk8)
+  implementation(libs.kotlin.reflect)
+  implementation(libs.kotlinx.coroutines.play.services)
+  implementation(libs.kotlinx.coroutines.rx3)
+  implementation(libs.jackson.module.kotlin)
+  implementation(libs.rxjava3.rxandroid)
+  implementation(libs.rxjava3.rxkotlin)
+  implementation(libs.rxdogtag)
+
+  "playImplementation"(project(":billing"))
+  "nightlyImplementation"(project(":billing"))
+
+  "spinnerImplementation"(project(":spinner"))
+
+  "canaryImplementation"(libs.square.leakcanary)
+
+  "instrumentationImplementation"(libs.androidx.fragment.testing) {
+    exclude(group = "androidx.test", module = "core")
+  }
+
+  testImplementation(testLibs.junit.junit)
+  testImplementation(testLibs.assertk)
+  testImplementation(testLibs.androidx.test.core)
+  testImplementation(testLibs.robolectric.robolectric) {
+    exclude(group = "com.google.protobuf", module = "protobuf-java")
+  }
+  testImplementation(testLibs.bouncycastle.bcprov.jdk15on) {
+    version {
+      strictly("1.70")
+    }
+  }
+  testImplementation(testLibs.bouncycastle.bcpkix.jdk15on) {
+    version {
+      strictly("1.70")
+    }
+  }
+  testImplementation(testLibs.conscrypt.openjdk.uber)
+  testImplementation(testLibs.mockk)
+  testImplementation(testFixtures(project(":libsignal-service")))
+  testImplementation(testLibs.espresso.core)
+
+  androidTestImplementation(testLibs.androidx.test.ext.junit)
+  androidTestImplementation(testLibs.espresso.core)
+  androidTestImplementation(testLibs.androidx.test.core)
+  androidTestImplementation(testLibs.androidx.test.core.ktx)
+  androidTestImplementation(testLibs.androidx.test.ext.junit.ktx)
+  androidTestImplementation(testLibs.assertk)
+  androidTestImplementation(testLibs.mockk.android)
+  androidTestImplementation(testLibs.square.okhttp.mockserver)
+  androidTestImplementation(testLibs.diff.utils)
+
+  androidTestUtil(testLibs.androidx.test.orchestrator)
+}
+
+fun assertIsGitRepo() {
+  if (!file("${project.rootDir}/.git").exists()) {
+    throw IllegalStateException("Must be a git repository to guarantee reproducible builds! (git hash is part of APK)")
+  }
+}
+
+fun getLastCommitTimestamp(): String {
+  assertIsGitRepo()
+
+  ByteArrayOutputStream().use { os ->
+    exec {
+      executable = "git"
+      args = listOf("log", "-1", "--pretty=format:%ct")
+      standardOutput = os
+    }
+
+    return os.toString() + "000"
+  }
+}
+
+fun getGitHash(): String {
+  assertIsGitRepo()
+
+  val stdout = ByteArrayOutputStream()
+  exec {
+    commandLine = listOf("git", "rev-parse", "HEAD")
+    standardOutput = stdout
+  }
+
+  return stdout.toString().trim().substring(0, 12)
+}
+
+fun getCurrentGitTag(): String? {
+  assertIsGitRepo()
+
+  val stdout = ByteArrayOutputStream()
+  exec {
+    commandLine = listOf("git", "tag", "--points-at", "HEAD")
+    standardOutput = stdout
+  }
+
+  val output: String = stdout.toString().trim()
+
+  return if (output.isNotEmpty()) {
+    val tags = output.split("\n").toList()
+    tags.firstOrNull { it.contains("nightly") } ?: tags[0]
+  } else {
+    null
+  }
+}
+
+tasks.withType<Test>().configureEach {
+  testLogging {
+    events("failed")
+    exceptionFormat = TestExceptionFormat.FULL
+    showCauses = true
+    showExceptions = true
+    showStackTraces = true
+  }
+}
+
+project.tasks.configureEach {
+  if (name.lowercase().contains("nightly") && name != "checkNightlyParams") {
+    dependsOn(tasks.getByName("checkNightlyParams"))
+  }
+}
+
+tasks.register("checkNightlyParams") {
+  doFirst {
+    if (project.gradle.startParameter.taskNames.any { it.lowercase().contains("nightly") }) {
+
+      if (!file("${project.rootDir}/nightly-url.txt").exists()) {
+        throw GradleException("Cannot find 'nightly-url.txt' for nightly build! It must exist in the root of this project and contain the location of the nightly manifest.")
+      }
+    }
+  }
+}
+
+fun loadKeystoreProperties(filename: String): Properties? {
+  val keystorePropertiesFile = file("${project.rootDir}/$filename")
+
+  return if (keystorePropertiesFile.exists()) {
+    val keystoreProperties = Properties()
+    keystoreProperties.load(FileInputStream(keystorePropertiesFile))
+    keystoreProperties
+  } else {
+    null
+  }
+}
+
+fun getDateSuffix(): String {
+  return SimpleDateFormat("yyyy-MM-dd-HH:mm").format(Date())
+}
+
+fun getMapsKey(): String {
+  val mapKey = file("${project.rootDir}/maps.key")
+
+  return if (mapKey.exists()) {
+    mapKey.readLines()[0]
+  } else {
+    "AIzaSyCSx9xea86GwDKGznCAULE9Y5a8b-TfN9U"
+  }
+}
+
+fun Project.languageList(): List<String> {
+  return fileTree("src/main/res") { include("**/strings.xml") }
+    .map { stringFile -> stringFile.parentFile.name }
+    .map { valuesFolderName -> valuesFolderName.replace("values-", "") }
+    .filter { valuesFolderName -> valuesFolderName != "values" }
+    .map { languageCode -> languageCode.replace("-r", "_") }
+    .distinct()
+    .sorted() + "en"
+}
+
+fun String.capitalize(): String {
+  return this.replaceFirstChar { it.uppercase() }
+}

app/proguard/proguard-automation.pro

@@ -5,9 +5,7 @@
 -dontwarn com.android.support.test.**
 -dontwarn sun.reflect.**
 -dontwarn sun.misc.**
--dontwarn org.assertj.**
+-dontwarn assertk.**
--dontwarn org.hamcrest.**
--dontwarn org.mockito.**
 -dontwarn com.squareup.**
 
--dontobfuscate
+-dontobfuscate

app/proguard/proguard.cfg

@@ -2,8 +2,11 @@
 -dontobfuscate
 -keepattributes SourceFile,LineNumberTable
 -keep class org.whispersystems.** { *; }
+-keep class org.signal.libsignal.net.** { *; }
 -keep class org.signal.libsignal.protocol.** { *; }
+-keep class org.signal.libsignal.usernames.** { *; }
 -keep class org.thoughtcrime.securesms.** { *; }
+-keep class org.signal.donations.json.** { *; }
 -keepclassmembers class ** {
     public void onEvent*(**);
 }
@@ -13,6 +16,10 @@
 
 -keep class androidx.window.** { *; }
 
+-keepclassmembers class * extends androidx.constraintlayout.motion.widget.Key {
+  public <init>();
+}
+
 # AGP generated dont warns
 -dontwarn com.android.org.conscrypt.SSLParametersImpl
 -dontwarn org.apache.harmony.xnet.provider.jsse.SSLParametersImpl