Bump version to 6.10.7

.editorconfig

@@ -1,20 +1,4 @@
 root = true
 
-[*.{kt,kts}]
+[*.kt]
 indent_size = 2
-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
-
-# 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/PULL_REQUEST_TEMPLATE.md

@@ -2,7 +2,7 @@
 ### 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 signed the [Contributor License Agreement](https://signal.org/cla/)
+- [ ] I have signed the [Contributor License Agreement](https://whispersystems.org/cla/)
 
 ### Contributor checklist
 <!-- replace the empty checkboxes [ ] below with checked ones [x] accordingly -->

.github/workflows/android.yml

@@ -14,23 +14,23 @@ permissions:
 jobs:
   build:
 
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v3
-      with:
-          submodules: true
 
-    - name: set up JDK 17
+    - name: set up JDK 11
       uses: actions/setup-java@v3
       with:
         distribution: temurin
-        java-version: 17
-        cache: gradle
+        java-version: 11
 
     - name: Validate Gradle Wrapper
       uses: gradle/wrapper-validation-action@v1
 
+    - name: Remove Android 31 (S)
+      run: $ANDROID_HOME/tools/bin/sdkmanager --uninstall "platforms;android-31"
+
     - name: Build with Gradle
       run: ./gradlew qa
 

.github/workflows/diffuse.yml

@@ -1,84 +0,0 @@
-name: APK Diff
-
-on:
-  pull_request:
-
-permissions:
-  contents: read # to fetch code (actions/checkout)
-  pull-requests: write # to comment on PR
-
-jobs:
-  assemble-base:
-    if: ${{ github.repository != 'signalapp/Signal-Android' }}
-    runs-on: ubuntu-latest-8-cores
-    
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        submodules: true
-        ref: ${{ github.event.pull_request.base.sha }}
-
-    - name: set up JDK 17
-      uses: actions/setup-java@v3
-      with:
-        distribution: temurin
-        java-version: 17
-        cache: gradle
-
-    - name: Validate Gradle Wrapper
-      uses: gradle/wrapper-validation-action@v1
-
-    - name: Cache base apk
-      id: cache-base
-      uses: actions/cache@v3
-      with:
-        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
-
-    - name: Copy base apk
-      if: steps.cache-base.outputs.cache-hit != 'true'
-      run: mv app/build/outputs/apk/playProd/release/*arm64*.apk diffuse-base.apk
-
-    - uses: actions/checkout@v3
-      with:
-        submodules: true
-        clean: 'false'
-
-    - name: Build with Gradle
-      run: ./gradlew assemblePlayProdRelease
-
-    - name: Copy PR apk
-      run: mv app/build/outputs/apk/playProd/release/*arm64*.apk diffuse-new.apk
-
-    - id: diffuse
-      uses: usefulness/diffuse-action@v1
-      with:
-        old-file-path: diffuse-base.apk
-        new-file-path: diffuse-new.apk
-
-    - 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@v3
-      with:
-        body: |
-          Diffuse output: 
-
-          ${{ steps.diffuse.outputs.diff-gh-comment }}
-        edit-mode: replace
-        comment-id: ${{ steps.find-comment.outputs.comment-id }}
-        issue-number: ${{ github.event.pull_request.number }}
-        token: ${{ secrets.GITHUB_TOKEN }}
-
-    - uses: actions/upload-artifact@v3
-      with:
-        name: diffuse-output
-        path: ${{ steps.diffuse.outputs.diff-file }}

.gitignore

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

.idea/codeStyles/Project.xml

@@ -41,6 +41,14 @@
         </value>
       </option>
     </JavaCodeStyleSettings>
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+    </JetCodeStyleSettings>
     <codeStyleSettings language="HTML">
       <indentOptions>
         <option name="INDENT_SIZE" value="2" />
@@ -212,12 +220,5 @@
         </rules>
       </arrangement>
     </codeStyleSettings>
-    <codeStyleSettings language="kotlin">
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
   </code_scheme>
 </component>

.idea/copyright/Signal.xml

@@ -1,6 +0,0 @@
-<component name="CopyrightManager">
-  <copyright>
-    <option name="notice" value="Copyright &amp;#36;today.year Signal Messenger, LLC&#10;SPDX-License-Identifier: AGPL-3.0-only" />
-    <option name="myName" value="Signal" />
-  </copyright>
-</component>

.idea/copyright/profiles_settings.xml

@@ -1,7 +0,0 @@
-<component name="CopyrightManager">
-  <settings>
-    <module2copyright>
-      <element module="All" copyright="Signal" />
-    </module2copyright>
-  </settings>
-</component>

.idea/fileTemplates/internal/AnnotationType.java

@@ -1,9 +0,0 @@
-/*
- * Copyright ${YEAR} Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-#if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end
-#parse("File Header.java")
-public @interface ${NAME} {
-}

.idea/fileTemplates/internal/Class.java

@@ -1,9 +0,0 @@
-/*
- * Copyright ${YEAR} Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-#if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end
-#parse("File Header.java")
-public class ${NAME} {
-}

.idea/fileTemplates/internal/Enum.java

@@ -1,9 +0,0 @@
-/*
- * Copyright ${YEAR} Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-#if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end
-#parse("File Header.java")
-public enum ${NAME} {
-}

.idea/fileTemplates/internal/Interface.java

@@ -1,9 +0,0 @@
-/*
- * Copyright ${YEAR} Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-#if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME};#end
-#parse("File Header.java")
-public interface ${NAME} {
-}

.idea/fileTemplates/internal/Kotlin Class.kt

@@ -1,11 +0,0 @@
-/*
- * Copyright ${YEAR} Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-#if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME}
-
-#end
-#parse("File Header.java")
-class ${NAME} {
-}

.idea/fileTemplates/internal/Kotlin Enum.kt

@@ -1,11 +0,0 @@
-/*
- * Copyright ${YEAR} Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-#if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME}
-
-#end
-#parse("File Header.java")
-enum class ${NAME} {
-}

.idea/fileTemplates/internal/Kotlin File.kt

@@ -1,9 +0,0 @@
-/*
- * Copyright ${YEAR} Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-#if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME}
-
-#end
-#parse("File Header.java")

.idea/fileTemplates/internal/Kotlin Interface.kt

@@ -1,11 +0,0 @@
-/*
- * Copyright ${YEAR} Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-#if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME}
-
-#end
-#parse("File Header.java")
-interface ${NAME} {
-}

CONTRIBUTING.md

@@ -15,12 +15,6 @@ 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

LICENSE

@@ -1,21 +1,23 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
                             Preamble
 
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
 
   The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
+the GNU General Public License is intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
-software for all its users.
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
@@ -24,34 +26,44 @@ them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
 
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
 
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
 
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
 
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
@@ -60,7 +72,7 @@ modification follow.
 
   0. Definitions.
 
-  "This License" refers to version 3 of the GNU Affero General Public License.
+  "This License" refers to version 3 of the GNU General Public License.
 
   "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
@@ -537,45 +549,35 @@ to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
 
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
+  13. Use with the GNU Affero General Public License.
 
   Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
+under version 3 of the GNU Affero General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
 
   14. Revised Versions of this License.
 
   The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
   Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
+Program specifies that a certain numbered version of the GNU General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
+GNU General Public License, you may choose any version ever published
 by the Free Software Foundation.
 
   If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
+versions of the GNU General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
 
@@ -617,45 +619,3 @@ Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
 
                      END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.

README.md

@@ -1,4 +1,4 @@
-# Signal Android
+# Signal Android 
 
 Signal is a simple, powerful, and secure messenger.
 
@@ -54,8 +54,8 @@ The form and manner of this distribution makes it eligible for export under the
 
 ## License
 
-Copyright 2013-2024 Signal Messenger, LLC
+Copyright 2013-2022 Signal
 
-Licensed under the GNU AGPLv3: https://www.gnu.org/licenses/agpl-3.0.html
+Licensed under the GPLv3: http://www.gnu.org/licenses/gpl-3.0.html
 
 Google Play and the Google Play logo are trademarks of Google LLC.

apntool/.gitignore

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

apntool/apntool.py

@@ -0,0 +1,106 @@
+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

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

app/build.gradle

@@ -0,0 +1,670 @@
+import com.android.build.api.dsl.ManagedVirtualDevice
+
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'com.google.protobuf'
+apply plugin: 'androidx.navigation.safeargs'
+apply plugin: 'org.jlleitschuh.gradle.ktlint'
+apply from: 'translations.gradle'
+apply plugin: 'org.jetbrains.kotlin.android'
+apply plugin: 'app.cash.exhaustive'
+apply plugin: 'kotlin-parcelize'
+apply from: 'static-ips.gradle'
+
+repositories {
+    maven {
+        url "https://raw.githubusercontent.com/signalapp/maven/master/sqlcipher/release/"
+        content {
+            includeGroupByRegex "org\\.signal.*"
+        }
+    }
+
+    google()
+    mavenCentral()
+    mavenLocal()
+    maven {
+        url "https://dl.cloudsmith.io/qxAgwaeEE1vN8aLU/mobilecoin/mobilecoin/maven/"
+    }
+    jcenter {
+        content {
+            includeVersion "mobi.upod", "time-duration-picker", "1.1.3"
+        }
+    }
+}
+
+protobuf {
+    protoc {
+        artifact = 'com.google.protobuf:protoc:3.18.0'
+    }
+    generateProtoTasks {
+        all().each { task ->
+            task.builtins {
+                java {
+                    option "lite"
+                }
+            }
+        }
+    }
+}
+
+ktlint {
+    // Use a newer version to resolve https://github.com/JLLeitschuh/ktlint-gradle/issues/507
+    version = "0.43.2"
+}
+
+def canonicalVersionCode = 1205
+def canonicalVersionName = "6.10.6"
+
+def postFixSize = 100
+def abiPostFix = ['universal'   : 10,
+                  'armeabi-v7a' : 11,
+                  'arm64-v8a'   : 12,
+                  'x86'         : 13,
+                  'x86_64'      : 14]
+
+def keystores = [ 'debug'  : loadKeystoreProperties('keystore.debug.properties') ]
+
+def selectableVariants = [
+        'nightlyProdSpinner',
+        'nightlyProdPerf',
+        'nightlyProdRelease',
+        'playProdDebug',
+        'playProdSpinner',
+        'playProdPerf',
+        'playProdInstrumentation',
+        'playProdRelease',
+        'playStagingDebug',
+        'playStagingSpinner',
+        'playStagingPerf',
+        'playStagingInstrumentation',
+        'playStagingRelease',
+        'websiteProdSpinner',
+        'websiteProdRelease',
+]
+
+android {
+    buildToolsVersion BUILD_TOOL_VERSION
+    compileSdkVersion COMPILE_SDK
+
+    flavorDimensions 'distribution', 'environment'
+    useLibrary 'org.apache.http.legacy'
+    testBuildType 'instrumentation'
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+        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
+            }
+        }
+    }
+
+    dependenciesInfo {
+        includeInBundle false
+        includeInApk false
+    }
+
+    testOptions {
+        execution 'ANDROIDX_TEST_ORCHESTRATOR'
+
+        unitTests {
+            includeAndroidResources = true
+        }
+
+        managedDevices {
+            devices {
+                pixel3api30 (ManagedVirtualDevice) {
+                    device = "Pixel 3"
+                    apiLevel = 30
+                    systemImageSource = "google-atd"
+                    require64Bit = false
+                }
+            }
+        }
+    }
+
+    lintOptions {
+        checkReleaseBuilds false
+        abortOnError true
+        baseline file("lint-baseline.xml")
+        disable "LintError"
+    }
+
+    sourceSets {
+        test {
+            java.srcDirs += "$projectDir/src/testShared"
+        }
+
+        androidTest {
+            java.srcDirs += "$projectDir/src/testShared"
+        }
+    }
+
+    compileOptions {
+        coreLibraryDesugaringEnabled true
+        sourceCompatibility JAVA_VERSION
+        targetCompatibility JAVA_VERSION
+    }
+
+    packagingOptions {
+        exclude 'LICENSE.txt'
+        exclude 'LICENSE'
+        exclude 'NOTICE'
+        exclude 'asm-license.txt'
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/NOTICE'
+        exclude 'META-INF/proguard/androidx-annotations.pro'
+        exclude 'libsignal_jni.dylib'
+        exclude 'signal_jni.dll'
+    }
+
+    buildFeatures {
+        viewBinding true
+    }
+
+    defaultConfig {
+        versionCode canonicalVersionCode * postFixSize
+        versionName canonicalVersionName
+
+        minSdkVersion MINIMUM_SDK
+        targetSdkVersion TARGET_SDK
+
+        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_CONTACT_DISCOVERY_URL", "\"https://api.directory.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_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_CDS_IPS", cds_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_AGENT", "\"OWA\""
+        buildConfigField "String", "CDS_MRENCLAVE", "\"74778bb0f93ae1f78c26e67152bab0bbeb693cd56d1bb9b4e9244157acc58081\""
+        buildConfigField "String", "CDSI_MRENCLAVE", "\"ef4787a56a154ac6d009138cac17155acd23cfe4329281252365dd7c252e7fbf\""
+        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[]", "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\""
+
+        ndk {
+            abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+        }
+
+        resConfigs autoResConfig()
+
+        splits {
+            abi {
+                enable true
+                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\""
+        }
+    }
+
+    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_CONTACT_DISCOVERY_URL", "\"https://api-staging.directory.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", "CDS_MRENCLAVE", "\"74778bb0f93ae1f78c26e67152bab0bbeb693cd56d1bb9b4e9244157acc58081\""
+            buildConfigField "org.thoughtcrime.securesms.KbsEnclave", "KBS_ENCLAVE", "new org.thoughtcrime.securesms.KbsEnclave(\"39963b736823d5780be96ab174869a9499d56d66497aa8f9b2244f777ebc366b\", " +
+                                                                                                                               "\"9dbc6855c198e04f21b5cc35df839fdcd51b53658454dfa3f817afefaffc95ef\", " +
+                                                                                                                               "\"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", "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\""
+        }
+    }
+
+    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)
+        }
+    }
+}
+
+dependencies {
+    implementation libs.androidx.core.ktx
+    implementation libs.androidx.fragment.ktx
+    lintChecks project(':lintchecks')
+
+    coreLibraryDesugaring libs.android.tools.desugar
+
+    implementation (libs.androidx.appcompat) {
+        version {
+            strictly '1.5.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.cardview
+    implementation libs.androidx.preference
+    implementation libs.androidx.legacy.preference
+    implementation libs.androidx.gridlayout
+    implementation libs.androidx.exifinterface
+    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.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.exoplayer
+
+    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.argon2) {
+        artifact {
+            type = "aar"
+        }
+    }
+
+    implementation libs.signal.ringrtc
+
+    implementation libs.leolin.shortcutbadger
+    implementation libs.emilsjolander.stickylistheaders
+    implementation libs.jpardogo.materialtabstrip
+    implementation libs.apache.httpclient.android
+    implementation libs.glide.glide
+    implementation libs.roundedimageview
+    implementation libs.materialish.progress
+    implementation libs.greenrobot.eventbus
+    implementation libs.waitingdots
+    implementation libs.google.zxing.android.integration
+    implementation libs.time.duration.picker
+    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
+
+    spinnerImplementation project(":spinner")
+    spinnerImplementation 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) {
+        force = true
+    }
+    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.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
+}
+
+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

@@ -1,745 +0,0 @@
-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 {
-  id("com.android.application")
-  id("kotlin-android")
-  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.kts")
-
-val canonicalVersionCode = 1450
-val canonicalVersionName = "7.15.3"
-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 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
-
-  flavorDimensions += listOf("distribution", "environment")
-  useLibrary("org.apache.http.legacy")
-  testBuildType = "instrumentation"
-
-  android.bundle.language.enableSplit = false
-
-  kotlinOptions {
-    jvmTarget = signalKotlinJvmTarget
-  }
-
-  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 {
-    viewBinding = true
-    compose = true
-  }
-
-  composeOptions {
-    kotlinCompilerExtensionVersion = "1.5.4"
-  }
-
-  defaultConfig {
-    versionCode = (canonicalVersionCode * maxHotfixVersions) + currentHotfixVersion
-    versionName = canonicalVersionName
-
-    minSdk = signalMinSdkVersion
-    targetSdk = 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_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", "CDSI_MRENCLAVE", "\"0f6fd79cdfdaa5b2e6337f534d3baf999318b0c462a7ac1f41297a3e4b424a57\"")
-    buildConfigField("String", "SVR2_MRENCLAVE", "\"a6622ad4656e1abcd0bc0ff17c229477747d2ded0495c4ebee7ed35c1789fa97\"")
-    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_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-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\"")
-    }
-
-    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\"")
-    }
-
-    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", "\"acb1973aa0bbbd14b3b4e06f145497d948fd4a98efc500fcce363b3b743ec482\"")
-      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.multidex)
-  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.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.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.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.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")
-    }
-  }
-  testImplementation(testLibs.bouncycastle.bcpkix.jdk15on) {
-    version {
-      strictly("1.70")
-    }
-  }
-  testImplementation(testLibs.conscrypt.openjdk.uber)
-  testImplementation(testLibs.hamcrest.hamcrest)
-  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.mockito.android)
-  androidTestImplementation(testLibs.mockito.kotlin)
-  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.cfg

@@ -2,11 +2,8 @@
 -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*(**);
 }
@@ -14,15 +11,4 @@
 # Protobuf lite
 -keep class * extends com.google.protobuf.GeneratedMessageLite { *; }
 
--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
--dontwarn org.slf4j.impl.StaticLoggerBinder
--dontwarn sun.net.spi.nameservice.NameService
--dontwarn sun.net.spi.nameservice.NameServiceDescriptor
+-keep class androidx.window.** { *; }

app/src/androidTest/java/org/thoughtcrime/securesms/SignalInstrumentationApplicationContext.kt

@@ -1,52 +1,15 @@
 package org.thoughtcrime.securesms
 
-import org.signal.core.util.concurrent.SignalExecutors
-import org.signal.core.util.logging.AndroidLogger
-import org.signal.core.util.logging.Log
-import org.signal.libsignal.protocol.logging.SignalProtocolLoggerProvider
-import org.thoughtcrime.securesms.database.LogDatabase
-import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencyProvider
 import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
-import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger
-import org.thoughtcrime.securesms.logging.PersistentLogger
-import org.thoughtcrime.securesms.testing.InMemoryLogger
 
 /**
  * Application context for running instrumentation tests (aka androidTests).
  */
 class SignalInstrumentationApplicationContext : ApplicationContext() {
-
-  val inMemoryLogger: InMemoryLogger = InMemoryLogger()
-
   override fun initializeAppDependencies() {
     val default = ApplicationDependencyProvider(this)
-    AppDependencies.init(this, InstrumentationApplicationDependencyProvider(this, default))
-    AppDependencies.deadlockDetector.start()
-  }
-
-  override fun initializeLogging() {
-    Log.initialize({ true }, AndroidLogger(), PersistentLogger(this), inMemoryLogger)
-
-    SignalProtocolLoggerProvider.setProvider(CustomSignalProtocolLogger())
-
-    SignalExecutors.UNBOUNDED.execute {
-      Log.blockUntilAllWritesFinished()
-      LogDatabase.getInstance(this).logs.trimToSize()
-    }
-  }
-
-  override fun beginJobLoop() = Unit
-
-  /**
-   * Some of the jobs can interfere with some of the instrumentation tests.
-   *
-   * For example, we may try to create a release channel recipient while doing
-   * an import/backup test.
-   *
-   * This can be used to start the job loop if needed for tests that rely on it.
-   */
-  fun beginJobLoopForTests() {
-    super.beginJobLoop()
+    ApplicationDependencies.init(this, InstrumentationApplicationDependencyProvider(this, default))
   }
 }

app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/ArchiveImportExportTests.kt

@@ -1,287 +0,0 @@
-/*
- * Copyright 2024 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.backup.v2
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import com.github.difflib.DiffUtils
-import com.github.difflib.UnifiedDiffUtils
-import junit.framework.Assert.assertTrue
-import org.junit.Ignore
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.core.util.Base64
-import org.signal.core.util.SqlUtil
-import org.signal.core.util.logging.Log
-import org.signal.core.util.readFully
-import org.signal.libsignal.messagebackup.ComparableBackup
-import org.signal.libsignal.messagebackup.MessageBackup
-import org.signal.libsignal.zkgroup.profiles.ProfileKey
-import org.thoughtcrime.securesms.backup.v2.proto.Frame
-import org.thoughtcrime.securesms.backup.v2.stream.PlainTextBackupReader
-import org.thoughtcrime.securesms.database.DistributionListTables
-import org.thoughtcrime.securesms.database.KeyValueDatabase
-import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.AppDependencies
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.whispersystems.signalservice.api.kbs.MasterKey
-import org.whispersystems.signalservice.api.push.ServiceId
-import java.io.ByteArrayInputStream
-import java.util.UUID
-
-@RunWith(AndroidJUnit4::class)
-class ArchiveImportExportTests {
-
-  companion object {
-    const val TAG = "ImportExport"
-    const val TESTS_FOLDER = "backupTests"
-
-    val SELF_ACI = ServiceId.ACI.from(UUID(100, 100))
-    val SELF_PNI = ServiceId.PNI.from(UUID(101, 101))
-    val SELF_E164 = "+10000000000"
-    val SELF_PROFILE_KEY: ByteArray = Base64.decode("YQKRq+3DQklInaOaMcmlzZnN0m/1hzLiaONX7gB12dg=")
-    val MASTER_KEY = Base64.decode("sHuBMP4ToZk4tcNU+S8eBUeCt8Am5EZnvuqTBJIR4Do")
-  }
-
-  @Test
-  fun all() {
-    runTests()
-  }
-
-  @Ignore("Just for debugging")
-  @Test
-  fun accountData() {
-    runTests { it.startsWith("account_data_") }
-  }
-
-  @Ignore("Just for debugging")
-  @Test
-  fun recipientContacts() {
-    runTests { it.startsWith("recipient_contacts_") }
-  }
-
-  @Ignore("Just for debugging")
-  @Test
-  fun recipientDistributionLists() {
-    runTests { it.startsWith("recipient_distribution_list_") }
-  }
-
-  @Ignore("Just for debugging")
-  @Test
-  fun recipientGroups() {
-    runTests { it.startsWith("recipient_groups_") }
-  }
-
-  @Ignore("Just for debugging")
-  @Test
-  fun chatStandardMessageTextOnly() {
-    runTests { it.startsWith("chat_standard_message_text_only_") }
-  }
-
-  @Ignore("Just for debugging")
-  @Test
-  fun chatStandardMessageFormattedText() {
-    runTests { it.startsWith("chat_standard_message_formatted_text_") }
-  }
-
-  @Ignore("Just for debugging")
-  @Test
-  fun chatStandardMessageLongText() {
-    runTests { it.startsWith("chat_standard_message_long_text_") }
-  }
-
-  @Ignore("Just for debugging")
-  @Test
-  fun chatStandardMessageStandardAttachments() {
-    runTests { it.startsWith("chat_standard_message_standard_attachments_") }
-  }
-
-  @Ignore("Just for debugging")
-  @Test
-  fun chatStandardMessageSpecialAttachments() {
-    runTests { it.startsWith("chat_standard_message_special_attachments_") }
-  }
-
-  @Ignore("Just for debugging")
-  @Test
-  fun chatSimpleUpdates() {
-    runTests { it.startsWith("chat_simple_updates_") }
-  }
-
-  @Ignore("Just for debugging")
-  @Test
-  fun chatContactMessage() {
-    runTests { it.startsWith("chat_contact_message_") }
-  }
-
-  private fun runTests(predicate: (String) -> Boolean = { true }) {
-    val testFiles = InstrumentationRegistry.getInstrumentation().context.resources.assets.list(TESTS_FOLDER)!!.filter(predicate)
-    val results: MutableList<TestResult> = mutableListOf()
-
-    Log.d(TAG, "About to run ${testFiles.size} tests.")
-
-    for (filename in testFiles) {
-      Log.d(TAG, "> $filename")
-      val startTime = System.currentTimeMillis()
-      val result = test(filename)
-      results += result
-
-      if (result is TestResult.Success) {
-        Log.d(TAG, "  \uD83D\uDFE2 Passed in ${System.currentTimeMillis() - startTime} ms")
-      } else {
-        Log.d(TAG, "  \uD83D\uDD34 Failed in ${System.currentTimeMillis() - startTime} ms")
-      }
-    }
-
-    results
-      .filterIsInstance<TestResult.Failure>()
-      .forEach {
-        Log.e(TAG, "Failure: ${it.name}\n${it.message}")
-        Log.e(TAG, "----------------------------------")
-        Log.e(TAG, "----------------------------------")
-        Log.e(TAG, "----------------------------------")
-      }
-
-    if (results.any { it is TestResult.Failure }) {
-      val successCount = results.count { it is TestResult.Success }
-      val failingTestNames = results.filterIsInstance<TestResult.Failure>().joinToString(separator = "\n") { "  \uD83D\uDD34 ${it.name}" }
-      val message = "Some tests failed! Only $successCount/${results.size} passed. Failure details are above. Failing tests:\n$failingTestNames"
-
-      Log.d(TAG, message)
-      throw AssertionError(message)
-    } else {
-      Log.d(TAG, "All ${results.size} tests passed!")
-    }
-  }
-
-  private fun test(filename: String): TestResult {
-    resetAllData()
-
-    val inputFileBytes: ByteArray = InstrumentationRegistry.getInstrumentation().context.resources.assets.open("$TESTS_FOLDER/$filename").readFully(true)
-
-    val importResult = import(inputFileBytes)
-    assertTrue(importResult is ImportResult.Success)
-    val success = importResult as ImportResult.Success
-
-    val generatedBackupData = BackupRepository.debugExport(plaintext = true, currentTime = success.backupTime)
-    checkEquivalent(filename, inputFileBytes, generatedBackupData)?.let { return it }
-
-    return TestResult.Success(filename)
-  }
-
-  private fun resetAllData() {
-    // Need to delete these first to prevent foreign key crash
-    SignalDatabase.rawDatabase.execSQL("DELETE FROM ${DistributionListTables.ListTable.TABLE_NAME}")
-    SignalDatabase.rawDatabase.execSQL("DELETE FROM ${DistributionListTables.MembershipTable.TABLE_NAME}")
-
-    SqlUtil.getAllTables(SignalDatabase.rawDatabase)
-      .filterNot { it.contains("sqlite") || it.contains("fts") || it.startsWith("emoji_search_") } // If we delete these we'll corrupt the DB
-      .sorted()
-      .forEach { table ->
-        SignalDatabase.rawDatabase.execSQL("DELETE FROM $table")
-        SqlUtil.resetAutoIncrementValue(SignalDatabase.rawDatabase, table)
-      }
-
-    AppDependencies.recipientCache.clear()
-    AppDependencies.recipientCache.clearSelf()
-    RecipientId.clearCache()
-
-    KeyValueDatabase.getInstance(AppDependencies.application).clear()
-    SignalStore.resetCache()
-
-    SignalStore.svr.setMasterKey(MasterKey(MASTER_KEY), "1234")
-    SignalStore.account.setE164(SELF_E164)
-    SignalStore.account.setAci(SELF_ACI)
-    SignalStore.account.setPni(SELF_PNI)
-    SignalStore.account.generateAciIdentityKeyIfNecessary()
-    SignalStore.account.generatePniIdentityKeyIfNecessary()
-    SignalStore.backup.backupTier = MessageBackupTier.PAID
-  }
-
-  private fun import(importData: ByteArray): ImportResult {
-    return BackupRepository.import(
-      length = importData.size.toLong(),
-      inputStreamFactory = { ByteArrayInputStream(importData) },
-      selfData = BackupRepository.SelfData(SELF_ACI, SELF_PNI, SELF_E164, ProfileKey(SELF_PROFILE_KEY)),
-      plaintext = true
-    )
-  }
-
-  private fun assertPassesValidator(testName: String, generatedBackupData: ByteArray): TestResult.Failure? {
-    try {
-      BackupRepository.validate(
-        length = generatedBackupData.size.toLong(),
-        inputStreamFactory = { ByteArrayInputStream(generatedBackupData) },
-        selfData = BackupRepository.SelfData(SELF_ACI, SELF_PNI, SELF_E164, ProfileKey(SELF_PROFILE_KEY))
-      )
-    } catch (e: Exception) {
-      return TestResult.Failure(testName, "Generated backup failed validation: ${e.message}")
-    }
-
-    return null
-  }
-
-  private fun checkEquivalent(testName: String, import: ByteArray, export: ByteArray): TestResult.Failure? {
-    val importComparable = try {
-      ComparableBackup.readUnencrypted(MessageBackup.Purpose.REMOTE_BACKUP, import.inputStream(), import.size.toLong())
-    } catch (e: Exception) {
-      return TestResult.Failure(testName, "Imported backup hit a validation error: ${e.message}")
-    }
-
-    val exportComparable = try {
-      ComparableBackup.readUnencrypted(MessageBackup.Purpose.REMOTE_BACKUP, export.inputStream(), import.size.toLong())
-    } catch (e: Exception) {
-      return TestResult.Failure(testName, "Exported backup hit a validation error: ${e.message}")
-    }
-
-    if (importComparable.unknownFieldMessages.isNotEmpty()) {
-      return TestResult.Failure(testName, "Imported backup contains unknown fields: ${importComparable.unknownFieldMessages}")
-    }
-
-    if (exportComparable.unknownFieldMessages.isNotEmpty()) {
-      return TestResult.Failure(testName, "Imported backup contains unknown fields: ${importComparable.unknownFieldMessages}")
-    }
-
-    val canonicalImport = importComparable.comparableString
-    val canonicalExport = exportComparable.comparableString
-
-    if (canonicalImport != canonicalExport) {
-      val importLines = canonicalImport.lines()
-      val exportLines = canonicalExport.lines()
-
-      val patch = DiffUtils.diff(importLines, exportLines)
-      val diff = UnifiedDiffUtils.generateUnifiedDiff("Import", "Export", importLines, patch, 3).joinToString(separator = "\n")
-
-      val importFrames = import.toFrames()
-      val exportFrames = export.toFrames()
-
-      val importGroupFramesByMasterKey = importFrames.mapNotNull { it.recipient?.group }.associateBy { it.masterKey }
-      val exportGroupFramesByMasterKey = exportFrames.mapNotNull { it.recipient?.group }.associateBy { it.masterKey }
-
-      val groupErrorMessage = StringBuilder()
-
-      for ((importKey, importValue) in importGroupFramesByMasterKey) {
-        if (exportGroupFramesByMasterKey[importKey]?.let { it.snapshot != importValue.snapshot } == true) {
-          groupErrorMessage.append("[$importKey] Snapshot mismatch.\nImport:\n${importValue}\n\nExport:\n${exportGroupFramesByMasterKey[importKey]}\n\n")
-        }
-      }
-
-      return TestResult.Failure(testName, "Imported backup does not match exported backup. Diff:\n$diff\n$groupErrorMessage")
-    }
-
-    return null
-  }
-
-  fun ByteArray.toFrames(): List<Frame> {
-    return PlainTextBackupReader(this.inputStream(), this.size.toLong()).use { it.asSequence().toList() }
-  }
-
-  private sealed class TestResult(val name: String) {
-    class Success(name: String) : TestResult(name)
-    class Failure(name: String, val message: String) : TestResult(name)
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/FlakyTestAnnotationTest.kt

@@ -1,32 +0,0 @@
-/*
- * Copyright 2024 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.backup.v2
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Assert.assertEquals
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.thoughtcrime.securesms.testing.SignalFlakyTest
-import org.thoughtcrime.securesms.testing.SignalFlakyTestRule
-
-@RunWith(AndroidJUnit4::class)
-class FlakyTestAnnotationTest {
-
-  @get:Rule
-  val flakyTestRule = SignalFlakyTestRule()
-
-  companion object {
-    private var count = 0
-  }
-
-  @SignalFlakyTest
-  @Test
-  fun purposelyFlaky() {
-    count++
-    assertEquals(3, count)
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/TestRecipientUtils.kt

@@ -1,48 +0,0 @@
-/*
- * Copyright 2024 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.backup.v2
-
-import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
-import org.whispersystems.signalservice.api.util.toByteArray
-import java.util.UUID
-import kotlin.random.Random
-
-object TestRecipientUtils {
-
-  private var upperGenAci = 13131313L
-  private var lowerGenAci = 0L
-
-  private var upperGenPni = 12121212L
-  private var lowerGenPni = 0L
-
-  private var groupMasterKeyRandom = Random(12345)
-
-  fun generateProfileKey(): ByteArray {
-    return ProfileKeyUtil.createNew().serialize()
-  }
-
-  fun nextPni(): ByteArray {
-    synchronized(this) {
-      lowerGenPni++
-      var uuid = UUID(upperGenPni, lowerGenPni)
-      return uuid.toByteArray()
-    }
-  }
-
-  fun nextAci(): ByteArray {
-    synchronized(this) {
-      lowerGenAci++
-      var uuid = UUID(upperGenAci, lowerGenAci)
-      return uuid.toByteArray()
-    }
-  }
-
-  fun generateGroupMasterKey(): ByteArray {
-    val masterKey = ByteArray(32)
-    groupMasterKeyRandom.nextBytes(masterKey)
-    return masterKey
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModelTest.kt

@@ -0,0 +1,380 @@
+package org.thoughtcrime.securesms.components.settings.app.changenumber
+
+import androidx.lifecycle.SavedStateHandle
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.FlakyTest
+import okhttp3.mockwebserver.MockResponse
+import org.junit.After
+import org.junit.Before
+import org.junit.Ignore
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.kotlin.mock
+import org.signal.core.util.ThreadUtil
+import org.signal.libsignal.protocol.state.SignedPreKeyRecord
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.pin.KbsRepository
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.registration.VerifyAccountRepository
+import org.thoughtcrime.securesms.registration.VerifyResponseProcessor
+import org.thoughtcrime.securesms.testing.Get
+import org.thoughtcrime.securesms.testing.MockProvider
+import org.thoughtcrime.securesms.testing.Put
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+import org.thoughtcrime.securesms.testing.assertIs
+import org.thoughtcrime.securesms.testing.assertIsNot
+import org.thoughtcrime.securesms.testing.assertIsNotNull
+import org.thoughtcrime.securesms.testing.assertIsNull
+import org.thoughtcrime.securesms.testing.assertIsSize
+import org.thoughtcrime.securesms.testing.connectionFailure
+import org.thoughtcrime.securesms.testing.failure
+import org.thoughtcrime.securesms.testing.parsedRequestBody
+import org.thoughtcrime.securesms.testing.success
+import org.thoughtcrime.securesms.testing.timeout
+import org.whispersystems.signalservice.api.account.ChangePhoneNumberRequest
+import org.whispersystems.signalservice.api.push.ServiceId
+import org.whispersystems.signalservice.internal.push.MismatchedDevices
+import org.whispersystems.signalservice.internal.push.PreKeyState
+import java.util.UUID
+
+@RunWith(AndroidJUnit4::class)
+class ChangeNumberViewModelTest {
+
+  @get:Rule
+  val harness = SignalActivityRule()
+
+  private lateinit var viewModel: ChangeNumberViewModel
+  private lateinit var kbsRepository: KbsRepository
+
+  @Before
+  fun setUp() {
+    ApplicationDependencies.getSignalServiceAccountManager().setSoTimeoutMillis(1000)
+    kbsRepository = mock()
+    ThreadUtil.runOnMainSync {
+      viewModel = ChangeNumberViewModel(
+        localNumber = harness.self.requireE164(),
+        changeNumberRepository = ChangeNumberRepository(),
+        savedState = SavedStateHandle(),
+        password = SignalStore.account().servicePassword!!,
+        verifyAccountRepository = VerifyAccountRepository(harness.application),
+        kbsRepository = kbsRepository
+      )
+
+      viewModel.setNewCountry(1)
+      viewModel.setNewNationalNumber("5555550102")
+    }
+  }
+
+  @After
+  fun tearDown() {
+    InstrumentationApplicationDependencyProvider.clearHandlers()
+  }
+
+  @Test
+  fun testChangeNumber_givenOnlyPrimaryAndNoRegLock() {
+    // GIVEN
+    val aci = Recipient.self().requireServiceId()
+    val newPni = ServiceId.from(UUID.randomUUID())
+    lateinit var changeNumberRequest: ChangePhoneNumberRequest
+    lateinit var setPreKeysRequest: PreKeyState
+
+    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
+      Get("/v1/devices") { MockResponse().success(MockProvider.primaryOnlyDeviceList) },
+      Put("/v1/accounts/number") { r ->
+        changeNumberRequest = r.parsedRequestBody()
+        MockResponse().success(MockProvider.createVerifyAccountResponse(aci, newPni))
+      },
+      Put("/v2/keys") { r ->
+        setPreKeysRequest = r.parsedRequestBody()
+        MockResponse().success()
+      },
+      Get("/v1/certificate/delivery") { MockResponse().success(MockProvider.senderCertificate) }
+    )
+
+    // WHEN
+    viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet().resultOrThrow
+
+    // THEN
+    assertSuccess(newPni, changeNumberRequest, setPreKeysRequest)
+  }
+
+  /**
+   * If we encounter a server error, this means the server ack our request and rejected it. In this
+   * case we know the change *did not* take on the server and can reset to a clean state.
+   */
+  @Test
+  fun testChangeNumber_givenServerFailedApiCall() {
+    // GIVEN
+    val oldPni = Recipient.self().requirePni()
+    val oldE164 = Recipient.self().requireE164()
+
+    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
+      Get("/v1/devices") { MockResponse().success(MockProvider.primaryOnlyDeviceList) },
+      Put("/v1/accounts/number") { MockResponse().failure(500) },
+    )
+
+    // WHEN
+    val processor: VerifyResponseProcessor = viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet()
+
+    // THEN
+    processor.isServerSentError() assertIs true
+    Recipient.self().requireE164() assertIs oldE164
+    Recipient.self().requirePni() assertIs oldPni
+    SignalStore.misc().pendingChangeNumberMetadata.assertIsNull()
+  }
+
+  /**
+   * If we encounter a non-server error like a timeout or bad SSL, we do not know the state of our change
+   * number on the server side. We have to do a whoami call to query the server for our details and then
+   * respond accordingly.
+   *
+   * In this case, the whoami is our old details, so we can know the change *did not* take on the server
+   * and can reset to a clean state.
+   */
+  @Test
+  fun testChangeNumber_givenNetworkFailedApiCallEnRouteToServer() {
+    // GIVEN
+    val aci = Recipient.self().requireServiceId()
+    val oldPni = Recipient.self().requirePni()
+    val oldE164 = Recipient.self().requireE164()
+
+    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
+      Get("/v1/devices") { MockResponse().success(MockProvider.primaryOnlyDeviceList) },
+      Put("/v1/accounts/number") { MockResponse().connectionFailure() },
+      Get("/v1/accounts/whoami") { MockResponse().success(MockProvider.createWhoAmIResponse(aci, oldPni, oldE164)) }
+    )
+
+    // WHEN
+    val processor: VerifyResponseProcessor = viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet()
+
+    // THEN
+    processor.isServerSentError() assertIs false
+    Recipient.self().requireE164() assertIs oldE164
+    Recipient.self().requirePni() assertIs oldPni
+    SignalStore.misc().isChangeNumberLocked assertIs false
+    SignalStore.misc().pendingChangeNumberMetadata.assertIsNull()
+  }
+
+  /**
+   * If we encounter a non-server error like a timeout or bad SSL, we do not know the state of our change
+   * number on the server side. We have to do a whoami call to query the server for our details and then
+   * respond accordingly.
+   *
+   * In this case, the whoami is our new details, so we can know the change *did* take on the server
+   * and need to keep the app in a locked state. The test then uses the ChangeNumberLockActivity to unlock
+   * and apply the pending state after confirming the change on the server.
+   */
+  @Test
+  @FlakyTest
+  @Ignore("Test sometimes requires manual intervention to continue.")
+  fun testChangeNumber_givenNetworkFailedApiCallEnRouteToClient() {
+    // GIVEN
+    val aci = Recipient.self().requireServiceId()
+    val oldPni = Recipient.self().requirePni()
+    val oldE164 = Recipient.self().requireE164()
+    val newPni = ServiceId.from(UUID.randomUUID())
+
+    lateinit var changeNumberRequest: ChangePhoneNumberRequest
+    lateinit var setPreKeysRequest: PreKeyState
+
+    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
+      Get("/v1/devices") { MockResponse().success(MockProvider.primaryOnlyDeviceList) },
+      Put("/v1/accounts/number") { r ->
+        changeNumberRequest = r.parsedRequestBody()
+        MockResponse().timeout()
+      },
+      Get("/v1/accounts/whoami") { MockResponse().success(MockProvider.createWhoAmIResponse(aci, newPni, "+15555550102")) },
+      Put("/v2/keys") { r ->
+        setPreKeysRequest = r.parsedRequestBody()
+        MockResponse().success()
+      },
+      Get("/v1/certificate/delivery") { MockResponse().success(MockProvider.senderCertificate) }
+    )
+
+    // WHEN
+    val processor: VerifyResponseProcessor = viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet()
+
+    // THEN
+    processor.isServerSentError() assertIs false
+    Recipient.self().requireE164() assertIs oldE164
+    Recipient.self().requirePni() assertIs oldPni
+    SignalStore.misc().isChangeNumberLocked assertIs true
+    SignalStore.misc().pendingChangeNumberMetadata.assertIsNotNull()
+
+    // WHEN AGAIN Processing lock
+    val scenario = harness.launchActivity<ChangeNumberLockActivity>()
+    scenario.onActivity {}
+    ThreadUtil.sleep(500)
+
+    // THEN AGAIN
+    assertSuccess(newPni, changeNumberRequest, setPreKeysRequest)
+  }
+
+  @Test
+  fun testChangeNumber_givenOnlyPrimaryAndRegistrationLock() {
+    // GIVEN
+    val aci = Recipient.self().requireServiceId()
+    val newPni = ServiceId.from(UUID.randomUUID())
+
+    lateinit var changeNumberRequest: ChangePhoneNumberRequest
+    lateinit var setPreKeysRequest: PreKeyState
+
+    MockProvider.mockGetRegistrationLockStringFlow(kbsRepository)
+
+    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
+      Get("/v1/devices") { MockResponse().success(MockProvider.primaryOnlyDeviceList) },
+      Put("/v1/accounts/number") { r ->
+        changeNumberRequest = r.parsedRequestBody()
+        if (changeNumberRequest.registrationLock.isNullOrEmpty()) {
+          MockResponse().failure(423, MockProvider.lockedFailure)
+        } else {
+          MockResponse().success(MockProvider.createVerifyAccountResponse(aci, newPni))
+        }
+      },
+      Put("/v2/keys") { r ->
+        setPreKeysRequest = r.parsedRequestBody()
+        MockResponse().success()
+      },
+      Get("/v1/certificate/delivery") { MockResponse().success(MockProvider.senderCertificate) }
+    )
+
+    // WHEN
+    viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet().also { processor ->
+      processor.registrationLock() assertIs true
+      Recipient.self().requirePni() assertIsNot newPni
+      SignalStore.misc().pendingChangeNumberMetadata.assertIsNull()
+    }
+
+    viewModel.verifyCodeAndRegisterAccountWithRegistrationLock("pin").blockingGet().resultOrThrow
+
+    // THEN
+    assertSuccess(newPni, changeNumberRequest, setPreKeysRequest)
+  }
+
+  @Test
+  fun testChangeNumber_givenMismatchedDevicesOnFirstCall() {
+    // GIVEN
+    val aci = Recipient.self().requireServiceId()
+    val newPni = ServiceId.from(UUID.randomUUID())
+    lateinit var changeNumberRequest: ChangePhoneNumberRequest
+    lateinit var setPreKeysRequest: PreKeyState
+
+    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
+      Get("/v1/devices") { MockResponse().success(MockProvider.primaryOnlyDeviceList) },
+      Put("/v1/accounts/number") { r ->
+        changeNumberRequest = r.parsedRequestBody()
+        if (changeNumberRequest.deviceMessages.isEmpty()) {
+          MockResponse().failure(
+            409,
+            MismatchedDevices().apply {
+              missingDevices = listOf(2)
+              extraDevices = emptyList()
+            }
+          )
+        } else {
+          MockResponse().success(MockProvider.createVerifyAccountResponse(aci, newPni))
+        }
+      },
+      Get("/v2/keys/$aci/2") {
+        MockResponse().success(MockProvider.createPreKeyResponse(deviceId = 2))
+      },
+      Put("/v2/keys") { r ->
+        setPreKeysRequest = r.parsedRequestBody()
+        MockResponse().success()
+      },
+      Get("/v1/certificate/delivery") { MockResponse().success(MockProvider.senderCertificate) }
+    )
+
+    // WHEN
+    viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet().resultOrThrow
+
+    // THEN
+    assertSuccess(newPni, changeNumberRequest, setPreKeysRequest)
+  }
+
+  @Test
+  fun testChangeNumber_givenRegLockAndMismatchedDevicesOnFirstTwoCalls() {
+    // GIVEN
+    val aci = Recipient.self().requireServiceId()
+    val newPni = ServiceId.from(UUID.randomUUID())
+
+    lateinit var changeNumberRequest: ChangePhoneNumberRequest
+    lateinit var setPreKeysRequest: PreKeyState
+
+    MockProvider.mockGetRegistrationLockStringFlow(kbsRepository)
+
+    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
+      Put("/v1/accounts/number") { r ->
+        changeNumberRequest = r.parsedRequestBody()
+        if (changeNumberRequest.registrationLock.isNullOrEmpty()) {
+          MockResponse().failure(423, MockProvider.lockedFailure)
+        } else if (changeNumberRequest.deviceMessages.isEmpty()) {
+          MockResponse().failure(
+            409,
+            MismatchedDevices().apply {
+              missingDevices = listOf(2)
+              extraDevices = emptyList()
+            }
+          )
+        } else if (changeNumberRequest.deviceMessages.size == 1) {
+          MockResponse().failure(
+            409,
+            MismatchedDevices().apply {
+              missingDevices = listOf(2, 3)
+              extraDevices = emptyList()
+            }
+          )
+        } else {
+          MockResponse().success(MockProvider.createVerifyAccountResponse(aci, newPni))
+        }
+      },
+      Get("/v2/keys/$aci/2") {
+        MockResponse().success(MockProvider.createPreKeyResponse(deviceId = 2))
+      },
+      Get("/v2/keys/$aci/3") {
+        MockResponse().success(MockProvider.createPreKeyResponse(deviceId = 3))
+      },
+      Put("/v2/keys") { r ->
+        setPreKeysRequest = r.parsedRequestBody()
+        MockResponse().success()
+      },
+      Get("/v1/certificate/delivery") { MockResponse().success(MockProvider.senderCertificate) }
+    )
+
+    // WHEN
+    viewModel.verifyCodeWithoutRegistrationLock("123456").blockingGet().also { processor ->
+      processor.registrationLock() assertIs true
+      Recipient.self().requirePni() assertIsNot newPni
+      SignalStore.misc().pendingChangeNumberMetadata.assertIsNull()
+    }
+
+    viewModel.verifyCodeAndRegisterAccountWithRegistrationLock("pin").blockingGet().resultOrThrow
+
+    // THEN
+    assertSuccess(newPni, changeNumberRequest, setPreKeysRequest)
+  }
+
+  private fun assertSuccess(newPni: ServiceId, changeNumberRequest: ChangePhoneNumberRequest, setPreKeysRequest: PreKeyState) {
+    val pniProtocolStore = ApplicationDependencies.getProtocolStore().pni()
+    val pniMetadataStore = SignalStore.account().pniPreKeys
+
+    Recipient.self().requireE164() assertIs "+15555550102"
+    Recipient.self().requirePni() assertIs newPni
+
+    SignalStore.account().pniRegistrationId assertIs changeNumberRequest.pniRegistrationIds["1"]!!
+    SignalStore.account().pniIdentityKey.publicKey assertIs changeNumberRequest.pniIdentityKey
+    pniMetadataStore.activeSignedPreKeyId assertIs changeNumberRequest.devicePniSignedPrekeys["1"]!!.keyId
+
+    val activeSignedPreKey: SignedPreKeyRecord = pniProtocolStore.loadSignedPreKey(pniMetadataStore.activeSignedPreKeyId)
+    activeSignedPreKey.keyPair.publicKey assertIs changeNumberRequest.devicePniSignedPrekeys["1"]!!.publicKey
+    activeSignedPreKey.signature assertIs changeNumberRequest.devicePniSignedPrekeys["1"]!!.signature
+
+    setPreKeysRequest.signedPreKey.publicKey assertIs activeSignedPreKey.keyPair.publicKey
+    setPreKeysRequest.preKeys assertIsSize 100
+
+    SignalStore.misc().pendingChangeNumberMetadata.assertIsNull()
+  }
+}

app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/subscription/donate/CheckoutFlowActivityTest__RecurringDonations.kt

@@ -1,133 +0,0 @@
-package org.thoughtcrime.securesms.components.settings.app.subscription.donate
-
-import androidx.test.core.app.ActivityScenario
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions
-import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import androidx.test.espresso.matcher.ViewMatchers.isSelected
-import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.espresso.matcher.ViewMatchers.withText
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import okhttp3.mockwebserver.MockResponse
-import org.junit.Ignore
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.donations.InAppPaymentType
-import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.components.settings.app.subscription.InAppPaymentsRepository
-import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
-import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
-import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.testing.Delete
-import org.thoughtcrime.securesms.testing.Get
-import org.thoughtcrime.securesms.testing.SignalActivityRule
-import org.thoughtcrime.securesms.testing.success
-import org.thoughtcrime.securesms.util.JsonUtils
-import org.whispersystems.signalservice.api.subscriptions.ActiveSubscription
-import org.whispersystems.signalservice.api.subscriptions.SubscriberId
-import org.whispersystems.signalservice.internal.push.SubscriptionsConfiguration
-import java.math.BigDecimal
-import java.util.Currency
-import kotlin.time.Duration.Companion.days
-import kotlin.time.Duration.Companion.milliseconds
-
-@Ignore("Test fails on small screens, requires scrolling.")
-@Suppress("ClassName")
-@RunWith(AndroidJUnit4::class)
-class CheckoutFlowActivityTest__RecurringDonations {
-  @get:Rule
-  val harness = SignalActivityRule(othersCount = 10)
-
-  private val intent = CheckoutFlowActivity.createIntent(InstrumentationRegistry.getInstrumentation().targetContext, InAppPaymentType.RECURRING_DONATION)
-
-  @Test
-  fun givenRecurringDonations_whenILoadScreen_thenIExpectMonthlySelected() {
-    ActivityScenario.launch<CheckoutFlowActivity>(intent)
-    onView(withId(R.id.monthly)).check(matches(isSelected()))
-  }
-
-  @Test
-  fun givenNoCurrentDonation_whenILoadScreen_thenIExpectContinueButton() {
-    ActivityScenario.launch<CheckoutFlowActivity>(intent)
-    onView(withText("Continue")).check(matches(isDisplayed()))
-  }
-
-  @Test
-  fun givenACurrentDonation_whenILoadScreen_thenIExpectUpgradeButton() {
-    initialiseConfigurationResponse()
-    initialiseActiveSubscription()
-
-    ActivityScenario.launch<CheckoutFlowActivity>(intent)
-    onView(withText(R.string.SubscribeFragment__update_subscription)).check(matches(isDisplayed()))
-    onView(withText(R.string.SubscribeFragment__cancel_subscription)).check(matches(isDisplayed()))
-  }
-
-  @Test
-  fun givenACurrentDonation_whenIPressCancel_thenIExpectCancellationDialog() {
-    initialiseConfigurationResponse()
-    initialiseActiveSubscription()
-
-    ActivityScenario.launch<CheckoutFlowActivity>(intent)
-    onView(withText(R.string.SubscribeFragment__cancel_subscription)).check(matches(isDisplayed()))
-    onView(withText(R.string.SubscribeFragment__cancel_subscription)).perform(ViewActions.click())
-    onView(withText(R.string.SubscribeFragment__confirm_cancellation)).check(matches(isDisplayed()))
-    onView(withText(R.string.SubscribeFragment__confirm)).perform(ViewActions.click())
-    onView(withText(R.string.StripePaymentInProgressFragment__cancelling)).check(matches(isDisplayed()))
-  }
-
-  private fun initialiseConfigurationResponse() {
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Get("/v1/subscription/configuration") {
-        val assets = InstrumentationRegistry.getInstrumentation().context.resources.assets
-        assets.open("inAppPaymentsTests/configuration.json").use { stream ->
-          MockResponse().success(JsonUtils.fromJson(stream, SubscriptionsConfiguration::class.java))
-        }
-      }
-    )
-  }
-
-  private fun initialiseActiveSubscription() {
-    val currency = Currency.getInstance("USD")
-    val subscriber = InAppPaymentSubscriberRecord(
-      subscriberId = SubscriberId.generate(),
-      currency = currency,
-      type = InAppPaymentSubscriberRecord.Type.DONATION,
-      requiresCancel = false,
-      paymentMethodType = InAppPaymentData.PaymentMethodType.CARD
-    )
-
-    InAppPaymentsRepository.setSubscriber(subscriber)
-    SignalStore.inAppPayments.setSubscriberCurrency(currency, subscriber.type)
-
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Get("/v1/subscription/${subscriber.subscriberId.serialize()}") {
-        MockResponse().success(
-          ActiveSubscription(
-            ActiveSubscription.Subscription(
-              200,
-              currency.currencyCode,
-              BigDecimal.ONE,
-              System.currentTimeMillis().milliseconds.inWholeSeconds + 30.days.inWholeSeconds,
-              true,
-              System.currentTimeMillis().milliseconds.inWholeSeconds + 30.days.inWholeSeconds,
-              false,
-              "active",
-              "STRIPE",
-              "CARD",
-              false
-            ),
-            null
-          )
-        )
-      },
-      Delete("/v1/subscription/${subscriber.subscriberId.serialize()}") {
-        Thread.sleep(10000)
-        MockResponse().success()
-      }
-    )
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/conversation/ConversationItemPreviewer.kt

@@ -7,15 +7,13 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.signal.core.util.ThreadUtil
-import org.thoughtcrime.securesms.attachments.Cdn
 import org.thoughtcrime.securesms.attachments.PointerAttachment
-import org.thoughtcrime.securesms.conversation.v2.ConversationActivity
-import org.thoughtcrime.securesms.database.MessageType
 import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.mms.IncomingMessage
+import org.thoughtcrime.securesms.mms.IncomingMediaMessage
 import org.thoughtcrime.securesms.mms.OutgoingMessage
 import org.thoughtcrime.securesms.profiles.ProfileName
 import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.releasechannel.ReleaseChannel
 import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentRemoteId
@@ -65,17 +63,16 @@ class ConversationItemPreviewer {
       attachment()
     }
 
-    val message = IncomingMessage(
-      type = MessageType.NORMAL,
+    val message = IncomingMediaMessage(
       from = other.id,
       body = body,
       sentTimeMillis = System.currentTimeMillis(),
       serverTimeMillis = System.currentTimeMillis(),
       receivedTimeMillis = System.currentTimeMillis(),
-      attachments = PointerAttachment.forPointers(Optional.of(attachments))
+      attachments = PointerAttachment.forPointers(Optional.of(attachments)),
     )
 
-    SignalDatabase.messages.insertMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get()
+    SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get()
 
     ThreadUtil.sleep(1)
   }
@@ -85,17 +82,16 @@ class ConversationItemPreviewer {
       attachment()
     }
 
-    val message = IncomingMessage(
-      type = MessageType.NORMAL,
+    val message = IncomingMediaMessage(
       from = other.id,
       body = body,
       sentTimeMillis = System.currentTimeMillis(),
       serverTimeMillis = System.currentTimeMillis(),
       receivedTimeMillis = System.currentTimeMillis(),
-      attachments = PointerAttachment.forPointers(Optional.of(attachments))
+      attachments = PointerAttachment.forPointers(Optional.of(attachments)),
     )
 
-    val insert = SignalDatabase.messages.insertMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get()
+    val insert = SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get()
 
     SignalDatabase.attachments.getAttachmentsForMessage(insert.messageId).forEachIndexed { index, attachment ->
 //      if (index != 1) {
@@ -137,7 +133,7 @@ class ConversationItemPreviewer {
 
   private fun attachment(): SignalServiceAttachmentPointer {
     return SignalServiceAttachmentPointer(
-      Cdn.CDN_3.cdnNumber,
+      ReleaseChannel.CDN_NUMBER,
       SignalServiceAttachmentRemoteId.from(""),
       "image/webp",
       null,
@@ -146,16 +142,13 @@ class ConversationItemPreviewer {
       1024,
       1024,
       Optional.empty(),
-      Optional.empty(),
-      0,
       Optional.of("/not-there.jpg"),
       false,
       false,
       false,
       Optional.empty(),
       Optional.empty(),
-      System.currentTimeMillis(),
-      null
+      System.currentTimeMillis()
     )
   }
 }

app/src/androidTest/java/org/thoughtcrime/securesms/conversation/SafetyNumberChangeDialogPreviewer.kt

@@ -7,12 +7,11 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey
-import org.thoughtcrime.securesms.conversation.v2.ConversationActivity
 import org.thoughtcrime.securesms.database.IdentityTable
 import org.thoughtcrime.securesms.database.SignalDatabase
 import org.thoughtcrime.securesms.database.model.DistributionListId
 import org.thoughtcrime.securesms.database.model.DistributionListPrivacyMode
-import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.profiles.ProfileName
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.safety.SafetyNumberBottomSheet
@@ -64,7 +63,7 @@ class SafetyNumberChangeDialogPreviewer {
     scenario.onActivity { conversationActivity ->
       SafetyNumberBottomSheet
         .forIdentityRecordsAndDestinations(
-          identityRecords = AppDependencies.protocolStore.aci().identities().getIdentityRecords(othersRecipients).identityRecords,
+          identityRecords = ApplicationDependencies.getProtocolStore().aci().identities().getIdentityRecords(othersRecipients).identityRecords,
           destinations = listOf(ContactSearchKey.RecipientSearchKey(myStoryRecipientId, true))
         )
         .show(conversationActivity.supportFragmentManager)

app/src/androidTest/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemShapeTest.kt

@@ -1,338 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.conversation.v2.items
-
-import android.net.Uri
-import android.view.View
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.Observer
-import com.bumptech.glide.RequestManager
-import io.mockk.mockk
-import org.junit.Assert.assertEquals
-import org.junit.Rule
-import org.junit.Test
-import org.signal.ringrtc.CallLinkRootKey
-import org.thoughtcrime.securesms.components.voice.VoiceNotePlaybackState
-import org.thoughtcrime.securesms.contactshare.Contact
-import org.thoughtcrime.securesms.conversation.ConversationAdapter
-import org.thoughtcrime.securesms.conversation.ConversationItem
-import org.thoughtcrime.securesms.conversation.ConversationItemDisplayMode
-import org.thoughtcrime.securesms.conversation.ConversationMessage
-import org.thoughtcrime.securesms.conversation.colors.Colorizer
-import org.thoughtcrime.securesms.conversation.mutiselect.MultiselectPart
-import org.thoughtcrime.securesms.database.FakeMessageRecords
-import org.thoughtcrime.securesms.database.model.InMemoryMessageRecord
-import org.thoughtcrime.securesms.database.model.MessageRecord
-import org.thoughtcrime.securesms.database.model.MmsMessageRecord
-import org.thoughtcrime.securesms.groups.GroupId
-import org.thoughtcrime.securesms.groups.GroupMigrationMembershipChange
-import org.thoughtcrime.securesms.linkpreview.LinkPreview
-import org.thoughtcrime.securesms.mediapreview.MediaIntentFactory
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.stickers.StickerLocator
-import org.thoughtcrime.securesms.testing.SignalActivityRule
-import kotlin.time.Duration.Companion.minutes
-
-class V2ConversationItemShapeTest {
-
-  @get:Rule
-  val harness = SignalActivityRule(othersCount = 10)
-
-  @Test
-  fun givenNextAndPreviousMessageDoNotExist_whenISetMessageShape_thenIExpectSingle() {
-    val testSubject = V2ConversationItemShape(FakeConversationContext())
-
-    val expected = V2ConversationItemShape.MessageShape.SINGLE
-    val actual = testSubject.setMessageShape(
-      currentMessage = getMessageRecord(),
-      isGroupThread = false,
-      adapterPosition = 5
-    )
-
-    assertEquals(expected, actual)
-  }
-
-  @Test
-  fun givenPreviousWithinTimeoutAndNoNext_whenISetMessageShape_thenIExpectEnd() {
-    val now = System.currentTimeMillis()
-    val prev = now - 2.minutes.inWholeMilliseconds
-
-    val testSubject = V2ConversationItemShape(
-      FakeConversationContext(
-        previousMessage = getMessageRecord(prev)
-      )
-    )
-
-    val expected = V2ConversationItemShape.MessageShape.END
-    val actual = testSubject.setMessageShape(
-      currentMessage = getMessageRecord(now),
-      isGroupThread = false,
-      adapterPosition = 5
-    )
-
-    assertEquals(expected, actual)
-  }
-
-  @Test
-  fun givenNextWithinTimeoutAndNoPrevious_whenISetMessageShape_thenIExpectStart() {
-    val now = System.currentTimeMillis()
-    val prev = now - 2.minutes.inWholeMilliseconds
-
-    val testSubject = V2ConversationItemShape(
-      FakeConversationContext(
-        nextMessage = getMessageRecord(now)
-      )
-    )
-
-    val expected = V2ConversationItemShape.MessageShape.START
-    val actual = testSubject.setMessageShape(
-      currentMessage = getMessageRecord(prev),
-      isGroupThread = false,
-      adapterPosition = 5
-    )
-
-    assertEquals(expected, actual)
-  }
-
-  @Test
-  fun givenPreviousAndNextWithinTimeout_whenISetMessageShape_thenIExpectMiddle() {
-    val now = System.currentTimeMillis()
-    val prev = now - 2.minutes.inWholeMilliseconds
-    val next = now + 2.minutes.inWholeMilliseconds
-
-    val testSubject = V2ConversationItemShape(
-      FakeConversationContext(
-        previousMessage = getMessageRecord(prev),
-        nextMessage = getMessageRecord(next)
-      )
-    )
-
-    val expected = V2ConversationItemShape.MessageShape.MIDDLE
-    val actual = testSubject.setMessageShape(
-      currentMessage = getMessageRecord(now),
-      isGroupThread = false,
-      adapterPosition = 5
-    )
-
-    assertEquals(expected, actual)
-  }
-
-  @Test
-  fun givenPreviousOutsideTimeoutAndNoNext_whenISetMessageShape_thenIExpectSingle() {
-    val now = System.currentTimeMillis()
-    val prev = now - 4.minutes.inWholeMilliseconds
-
-    val testSubject = V2ConversationItemShape(
-      FakeConversationContext(
-        previousMessage = getMessageRecord(prev)
-      )
-    )
-
-    val expected = V2ConversationItemShape.MessageShape.SINGLE
-    val actual = testSubject.setMessageShape(
-      currentMessage = getMessageRecord(now),
-      isGroupThread = false,
-      adapterPosition = 5
-    )
-
-    assertEquals(expected, actual)
-  }
-
-  @Test
-  fun givenNextOutsideTimeoutAndNoPrevious_whenISetMessageShape_thenIExpectSingle() {
-    val now = System.currentTimeMillis()
-    val prev = now - 4.minutes.inWholeMilliseconds
-
-    val testSubject = V2ConversationItemShape(
-      FakeConversationContext(
-        nextMessage = getMessageRecord(now)
-      )
-    )
-
-    val expected = V2ConversationItemShape.MessageShape.SINGLE
-    val actual = testSubject.setMessageShape(
-      currentMessage = getMessageRecord(prev),
-      isGroupThread = false,
-      adapterPosition = 5
-    )
-
-    assertEquals(expected, actual)
-  }
-
-  @Test
-  fun givenPreviousAndNextOutsideTimeout_whenISetMessageShape_thenIExpectSingle() {
-    val now = System.currentTimeMillis()
-    val prev = now - 4.minutes.inWholeMilliseconds
-    val next = now + 4.minutes.inWholeMilliseconds
-
-    val testSubject = V2ConversationItemShape(
-      FakeConversationContext(
-        previousMessage = getMessageRecord(prev),
-        nextMessage = getMessageRecord(next)
-      )
-    )
-
-    val expected = V2ConversationItemShape.MessageShape.SINGLE
-    val actual = testSubject.setMessageShape(
-      currentMessage = getMessageRecord(now),
-      isGroupThread = false,
-      adapterPosition = 5
-    )
-
-    assertEquals(expected, actual)
-  }
-
-  private fun getMessageRecord(
-    timestamp: Long = System.currentTimeMillis()
-  ): MessageRecord {
-    return FakeMessageRecords.buildMediaMmsMessageRecord(
-      dateReceived = timestamp,
-      dateSent = timestamp,
-      dateServer = timestamp
-    )
-  }
-
-  private class FakeConversationContext(
-    private val hasWallpaper: Boolean = false,
-    private val previousMessage: MessageRecord? = null,
-    private val nextMessage: MessageRecord? = null
-  ) : V2ConversationContext {
-
-    private val colorizer = Colorizer()
-
-    override val lifecycleOwner: LifecycleOwner = mockk(relaxed = true)
-    override val displayMode: ConversationItemDisplayMode = ConversationItemDisplayMode.Standard
-    override val clickListener: ConversationAdapter.ItemClickListener = FakeConversationItemClickListener
-    override val selectedItems: Set<MultiselectPart> = emptySet()
-    override val isMessageRequestAccepted: Boolean = true
-    override val searchQuery: String? = null
-    override val requestManager: RequestManager = mockk()
-    override val isParentInScroll: Boolean = false
-    override fun getChatColorsData(): ChatColorsDrawable.ChatColorsData = ChatColorsDrawable.ChatColorsData(null, null)
-
-    override fun onStartExpirationTimeout(messageRecord: MessageRecord) = Unit
-
-    override fun hasWallpaper(): Boolean = hasWallpaper
-
-    override fun getColorizer(): Colorizer = colorizer
-
-    override fun getNextMessage(adapterPosition: Int): MessageRecord? = nextMessage
-
-    override fun getPreviousMessage(adapterPosition: Int): MessageRecord? = previousMessage
-  }
-
-  private object FakeConversationItemClickListener : ConversationAdapter.ItemClickListener {
-    override fun onQuoteClicked(messageRecord: MmsMessageRecord?) = Unit
-
-    override fun onLinkPreviewClicked(linkPreview: LinkPreview) = Unit
-
-    override fun onQuotedIndicatorClicked(messageRecord: MessageRecord) = Unit
-
-    override fun onMoreTextClicked(conversationRecipientId: RecipientId, messageId: Long, isMms: Boolean) = Unit
-
-    override fun onStickerClicked(stickerLocator: StickerLocator) = Unit
-
-    override fun onViewOnceMessageClicked(messageRecord: MmsMessageRecord) = Unit
-
-    override fun onSharedContactDetailsClicked(contact: Contact, avatarTransitionView: View) = Unit
-
-    override fun onAddToContactsClicked(contact: Contact) = Unit
-
-    override fun onMessageSharedContactClicked(choices: MutableList<Recipient>) = Unit
-
-    override fun onInviteSharedContactClicked(choices: MutableList<Recipient>) = Unit
-
-    override fun onReactionClicked(multiselectPart: MultiselectPart, messageId: Long, isMms: Boolean) = Unit
-
-    override fun onGroupMemberClicked(recipientId: RecipientId, groupId: GroupId) = Unit
-
-    override fun onMessageWithErrorClicked(messageRecord: MessageRecord) = Unit
-
-    override fun onMessageWithRecaptchaNeededClicked(messageRecord: MessageRecord) = Unit
-
-    override fun onIncomingIdentityMismatchClicked(recipientId: RecipientId) = Unit
-
-    override fun onRegisterVoiceNoteCallbacks(onPlaybackStartObserver: Observer<VoiceNotePlaybackState>) = Unit
-
-    override fun onUnregisterVoiceNoteCallbacks(onPlaybackStartObserver: Observer<VoiceNotePlaybackState>) = Unit
-
-    override fun onVoiceNotePause(uri: Uri) = Unit
-
-    override fun onVoiceNotePlay(uri: Uri, messageId: Long, position: Double) = Unit
-
-    override fun onVoiceNoteSeekTo(uri: Uri, position: Double) = Unit
-
-    override fun onVoiceNotePlaybackSpeedChanged(uri: Uri, speed: Float) = Unit
-
-    override fun onGroupMigrationLearnMoreClicked(membershipChange: GroupMigrationMembershipChange) = Unit
-
-    override fun onChatSessionRefreshLearnMoreClicked() = Unit
-
-    override fun onBadDecryptLearnMoreClicked(author: RecipientId) = Unit
-
-    override fun onSafetyNumberLearnMoreClicked(recipient: Recipient) = Unit
-
-    override fun onJoinGroupCallClicked() = Unit
-
-    override fun onInviteFriendsToGroupClicked(groupId: GroupId.V2) = Unit
-
-    override fun onEnableCallNotificationsClicked() = Unit
-
-    override fun onPlayInlineContent(conversationMessage: ConversationMessage?) = Unit
-
-    override fun onInMemoryMessageClicked(messageRecord: InMemoryMessageRecord) = Unit
-
-    override fun onViewGroupDescriptionChange(groupId: GroupId?, description: String, isMessageRequestAccepted: Boolean) = Unit
-
-    override fun onChangeNumberUpdateContact(recipient: Recipient) = Unit
-
-    override fun onChangeProfileNameUpdateContact(recipient: Recipient) = Unit
-
-    override fun onCallToAction(action: String) = Unit
-
-    override fun onDonateClicked() = Unit
-
-    override fun onBlockJoinRequest(recipient: Recipient) = Unit
-
-    override fun onRecipientNameClicked(target: RecipientId) = Unit
-
-    override fun onInviteToSignalClicked() = Unit
-
-    override fun onActivatePaymentsClicked() = Unit
-
-    override fun onSendPaymentClicked(recipientId: RecipientId) = Unit
-
-    override fun onScheduledIndicatorClicked(view: View, conversationMessage: ConversationMessage) = Unit
-
-    override fun onUrlClicked(url: String): Boolean = false
-
-    override fun onViewGiftBadgeClicked(messageRecord: MessageRecord) = Unit
-
-    override fun onGiftBadgeRevealed(messageRecord: MessageRecord) = Unit
-
-    override fun goToMediaPreview(parent: ConversationItem?, sharedElement: View?, args: MediaIntentFactory.MediaPreviewArgs?) = Unit
-
-    override fun onEditedIndicatorClicked(conversationMessage: ConversationMessage) = Unit
-
-    override fun onShowGroupDescriptionClicked(groupName: String, description: String, shouldLinkifyWebLinks: Boolean) = Unit
-
-    override fun onJoinCallLink(callLinkRootKey: CallLinkRootKey) = Unit
-
-    override fun onItemClick(item: MultiselectPart?) = Unit
-
-    override fun onItemLongClick(itemView: View?, item: MultiselectPart?) = Unit
-
-    override fun onShowSafetyTips(forGroup: Boolean) = Unit
-
-    override fun onReportSpamLearnMoreClicked() = Unit
-
-    override fun onMessageRequestAcceptOptionsClicked() = Unit
-
-    override fun onItemDoubleClick(item: MultiselectPart) = Unit
-    override fun onPaymentTombstoneClicked() = Unit
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTest.kt

@@ -2,20 +2,15 @@ package org.thoughtcrime.securesms.database
 
 import android.net.Uri
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.filters.FlakyTest
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.thoughtcrime.securesms.attachments.AttachmentId
 import org.thoughtcrime.securesms.attachments.UriAttachment
 import org.thoughtcrime.securesms.mms.MediaStream
 import org.thoughtcrime.securesms.mms.SentMediaQuality
 import org.thoughtcrime.securesms.providers.BlobProvider
-import org.thoughtcrime.securesms.testing.assertIs
-import org.thoughtcrime.securesms.testing.assertIsNot
 import org.thoughtcrime.securesms.util.MediaUtil
 import java.util.Optional
 
@@ -39,7 +34,6 @@ class AttachmentTableTest {
     assertEquals(attachment2.fileName, attachment.fileName)
   }
 
-  @FlakyTest
   @Test
   fun givenABlobAndDifferentTransformQuality_whenIInsert2AttachmentsForPreUpload_thenIExpectDifferentFileInfos() {
     val blob = BlobProvider.getInstance().forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory()
@@ -51,22 +45,22 @@ class AttachmentTableTest {
 
     SignalDatabase.attachments.updateAttachmentData(
       attachment,
-      createMediaStream(byteArrayOf(1, 2, 3, 4, 5))
+      createMediaStream(byteArrayOf(1, 2, 3, 4, 5)),
+      false
     )
 
     SignalDatabase.attachments.updateAttachmentData(
       attachment2,
-      createMediaStream(byteArrayOf(1, 2, 3))
+      createMediaStream(byteArrayOf(1, 2, 3)),
+      false
     )
 
-    val attachment1Info = SignalDatabase.attachments.getDataFileInfo(attachment.attachmentId)
-    val attachment2Info = SignalDatabase.attachments.getDataFileInfo(attachment2.attachmentId)
+    val attachment1Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment.attachmentId, AttachmentTable.DATA)
+    val attachment2Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment2.attachmentId, AttachmentTable.DATA)
 
     assertNotEquals(attachment1Info, attachment2Info)
   }
 
-  @FlakyTest
-  @Ignore("test is flaky")
   @Test
   fun givenIdenticalAttachmentsInsertedForPreUpload_whenIUpdateAttachmentDataAndSpecifyOnlyModifyThisAttachment_thenIExpectDifferentFileInfos() {
     val blob = BlobProvider.getInstance().forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory()
@@ -77,92 +71,22 @@ class AttachmentTableTest {
 
     SignalDatabase.attachments.updateAttachmentData(
       attachment,
-      createMediaStream(byteArrayOf(1, 2, 3, 4, 5))
+      createMediaStream(byteArrayOf(1, 2, 3, 4, 5)),
+      true
     )
 
     SignalDatabase.attachments.updateAttachmentData(
       attachment2,
-      createMediaStream(byteArrayOf(1, 2, 3, 4))
+      createMediaStream(byteArrayOf(1, 2, 3, 4)),
+      true
     )
 
-    val attachment1Info = SignalDatabase.attachments.getDataFileInfo(attachment.attachmentId)
-    val attachment2Info = SignalDatabase.attachments.getDataFileInfo(attachment2.attachmentId)
+    val attachment1Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment.attachmentId, AttachmentTable.DATA)
+    val attachment2Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment2.attachmentId, AttachmentTable.DATA)
 
     assertNotEquals(attachment1Info, attachment2Info)
   }
 
-  /**
-   * Given: A previous attachment and two pre-upload attachments with the same data but different transform properties (standard and high).
-   *
-   * When changing content of standard pre-upload attachment to match pre-existing attachment
-   *
-   * Then update standard pre-upload attachment to match previous attachment, do not update high pre-upload attachment, and do
-   * not delete shared pre-upload uri from disk as it is still being used by the high pre-upload attachment.
-   */
-  @Test
-  fun doNotDeleteDedupedFileIfUsedByAnotherAttachmentWithADifferentTransformProperties() {
-    // GIVEN
-    val uncompressData = byteArrayOf(1, 2, 3, 4, 5)
-    val compressedData = byteArrayOf(1, 2, 3)
-
-    val blobUncompressed = BlobProvider.getInstance().forData(uncompressData).createForSingleSessionInMemory()
-
-    val previousAttachment = createAttachment(1, BlobProvider.getInstance().forData(compressedData).createForSingleSessionInMemory(), AttachmentTable.TransformProperties.empty())
-    val previousDatabaseAttachmentId: AttachmentId = SignalDatabase.attachments.insertAttachmentsForMessage(1, listOf(previousAttachment), emptyList()).values.first()
-
-    val standardQualityPreUpload = createAttachment(1, blobUncompressed, AttachmentTable.TransformProperties.empty())
-    val standardDatabaseAttachment = SignalDatabase.attachments.insertAttachmentForPreUpload(standardQualityPreUpload)
-
-    val highQualityPreUpload = createAttachment(1, blobUncompressed, AttachmentTable.TransformProperties.forSentMediaQuality(Optional.empty(), SentMediaQuality.HIGH))
-    val highDatabaseAttachment = SignalDatabase.attachments.insertAttachmentForPreUpload(highQualityPreUpload)
-
-    // WHEN
-    SignalDatabase.attachments.updateAttachmentData(standardDatabaseAttachment, createMediaStream(compressedData))
-
-    // THEN
-    val previousInfo = SignalDatabase.attachments.getDataFileInfo(previousDatabaseAttachmentId)!!
-    val standardInfo = SignalDatabase.attachments.getDataFileInfo(standardDatabaseAttachment.attachmentId)!!
-    val highInfo = SignalDatabase.attachments.getDataFileInfo(highDatabaseAttachment.attachmentId)!!
-
-    assertNotEquals(standardInfo, highInfo)
-    highInfo.file assertIsNot standardInfo.file
-    highInfo.file.exists() assertIs true
-  }
-
-  /**
-   * Given: Three pre-upload attachments with the same data but different transform properties (1x standard and 2x high).
-   *
-   * When inserting content of high pre-upload attachment.
-   *
-   * Then do not deduplicate with standard pre-upload attachment, but do deduplicate second high insert.
-   */
-  @Test
-  fun doNotDedupedFileIfUsedByAnotherAttachmentWithADifferentTransformProperties() {
-    // GIVEN
-    val uncompressData = byteArrayOf(1, 2, 3, 4, 5)
-    val blobUncompressed = BlobProvider.getInstance().forData(uncompressData).createForSingleSessionInMemory()
-
-    val standardQualityPreUpload = createAttachment(1, blobUncompressed, AttachmentTable.TransformProperties.empty())
-    val standardDatabaseAttachment = SignalDatabase.attachments.insertAttachmentForPreUpload(standardQualityPreUpload)
-
-    // WHEN
-    val highQualityPreUpload = createAttachment(1, blobUncompressed, AttachmentTable.TransformProperties.forSentMediaQuality(Optional.empty(), SentMediaQuality.HIGH))
-    val highDatabaseAttachment = SignalDatabase.attachments.insertAttachmentForPreUpload(highQualityPreUpload)
-
-    val secondHighQualityPreUpload = createAttachment(1, blobUncompressed, AttachmentTable.TransformProperties.forSentMediaQuality(Optional.empty(), SentMediaQuality.HIGH))
-    val secondHighDatabaseAttachment = SignalDatabase.attachments.insertAttachmentForPreUpload(secondHighQualityPreUpload)
-
-    // THEN
-    val standardInfo = SignalDatabase.attachments.getDataFileInfo(standardDatabaseAttachment.attachmentId)!!
-    val highInfo = SignalDatabase.attachments.getDataFileInfo(highDatabaseAttachment.attachmentId)!!
-    val secondHighInfo = SignalDatabase.attachments.getDataFileInfo(secondHighDatabaseAttachment.attachmentId)!!
-
-    highInfo.file assertIsNot standardInfo.file
-    secondHighInfo.file assertIs highInfo.file
-    standardInfo.file.exists() assertIs true
-    highInfo.file.exists() assertIs true
-  }
-
   private fun createAttachment(id: Long, uri: Uri, transformProperties: AttachmentTable.TransformProperties): UriAttachment {
     return UriAttachmentBuilder.build(
       id,

app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTest_deduping.kt

@@ -1,838 +0,0 @@
-package org.thoughtcrime.securesms.database
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Assert.assertArrayEquals
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertNotEquals
-import org.junit.Assert.assertNotNull
-import org.junit.Assert.assertNull
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.core.util.Base64
-import org.signal.core.util.update
-import org.thoughtcrime.securesms.attachments.AttachmentId
-import org.thoughtcrime.securesms.attachments.Cdn
-import org.thoughtcrime.securesms.attachments.PointerAttachment
-import org.thoughtcrime.securesms.backup.v2.BackupRepository.getMediaName
-import org.thoughtcrime.securesms.database.AttachmentTable.TransformProperties
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.mms.MediaStream
-import org.thoughtcrime.securesms.mms.OutgoingMessage
-import org.thoughtcrime.securesms.mms.QuoteModel
-import org.thoughtcrime.securesms.mms.SentMediaQuality
-import org.thoughtcrime.securesms.providers.BlobProvider
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.util.MediaUtil
-import org.thoughtcrime.securesms.util.Util
-import org.whispersystems.signalservice.api.backup.MediaId
-import org.whispersystems.signalservice.api.push.ServiceId
-import java.io.File
-import java.util.UUID
-import kotlin.random.Random
-import kotlin.time.Duration.Companion.days
-
-/**
- * Collection of [AttachmentTable] tests focused around deduping logic.
- */
-@RunWith(AndroidJUnit4::class)
-class AttachmentTableTest_deduping {
-
-  companion object {
-    val DATA_A = byteArrayOf(1, 2, 3)
-    val DATA_A_COMPRESSED = byteArrayOf(4, 5, 6)
-    val DATA_A_HASH = byteArrayOf(1, 1, 1)
-
-    val DATA_B = byteArrayOf(7, 8, 9)
-  }
-
-  @Before
-  fun setUp() {
-    SignalStore.account.setAci(ServiceId.ACI.from(UUID.randomUUID()))
-    SignalStore.account.setPni(ServiceId.PNI.from(UUID.randomUUID()))
-    SignalStore.account.setE164("+15558675309")
-
-    SignalDatabase.attachments.deleteAllAttachments()
-  }
-
-  /**
-   * Creates two different files with different data. Should not dedupe.
-   */
-  @Test
-  fun differentFiles() {
-    test {
-      val id1 = insertWithData(DATA_A)
-      val id2 = insertWithData(DATA_B)
-
-      assertDataFilesAreDifferent(id1, id2)
-    }
-  }
-
-  /**
-   * Inserts files with identical data but with transform properties that make them incompatible. Should not dedupe.
-   */
-  @Test
-  fun identicalFiles_incompatibleTransforms() {
-    // Non-matching qualities
-    test {
-      val id1 = insertWithData(DATA_A, TransformProperties(sentMediaQuality = SentMediaQuality.STANDARD.code))
-      val id2 = insertWithData(DATA_A, TransformProperties(sentMediaQuality = SentMediaQuality.HIGH.code))
-
-      assertDataFilesAreDifferent(id1, id2)
-      assertDataHashStartMatches(id1, id2)
-    }
-
-    // Non-matching video trim flag
-    test {
-      val id1 = insertWithData(DATA_A, TransformProperties())
-      val id2 = insertWithData(DATA_A, TransformProperties(videoTrim = true))
-
-      assertDataFilesAreDifferent(id1, id2)
-      assertDataHashStartMatches(id1, id2)
-    }
-
-    // Non-matching video trim start time
-    test {
-      val id1 = insertWithData(DATA_A, TransformProperties(videoTrim = true, videoTrimStartTimeUs = 1, videoTrimEndTimeUs = 2))
-      val id2 = insertWithData(DATA_A, TransformProperties(videoTrim = true, videoTrimStartTimeUs = 0, videoTrimEndTimeUs = 2))
-
-      assertDataFilesAreDifferent(id1, id2)
-      assertDataHashStartMatches(id1, id2)
-    }
-
-    // Non-matching video trim end time
-    test {
-      val id1 = insertWithData(DATA_A, TransformProperties(videoTrim = true, videoTrimStartTimeUs = 0, videoTrimEndTimeUs = 1))
-      val id2 = insertWithData(DATA_A, TransformProperties(videoTrim = true, videoTrimStartTimeUs = 0, videoTrimEndTimeUs = 2))
-
-      assertDataFilesAreDifferent(id1, id2)
-      assertDataHashStartMatches(id1, id2)
-    }
-
-    // Non-matching mp4 fast start
-    test {
-      val id1 = insertWithData(DATA_A, TransformProperties(mp4FastStart = true))
-      val id2 = insertWithData(DATA_A, TransformProperties(mp4FastStart = false))
-
-      assertDataFilesAreDifferent(id1, id2)
-      assertDataHashStartMatches(id1, id2)
-    }
-  }
-
-  /**
-   * Inserts files with identical data and compatible transform properties. Should dedupe.
-   */
-  @Test
-  fun identicalFiles_compatibleTransforms() {
-    test {
-      val id1 = insertWithData(DATA_A)
-      val id2 = insertWithData(DATA_A)
-
-      assertDataFilesAreTheSame(id1, id2)
-      assertDataHashStartMatches(id1, id2)
-      assertSkipTransform(id1, false)
-      assertSkipTransform(id2, false)
-    }
-
-    test {
-      val id1 = insertWithData(DATA_A, TransformProperties(sentMediaQuality = SentMediaQuality.STANDARD.code))
-      val id2 = insertWithData(DATA_A, TransformProperties(sentMediaQuality = SentMediaQuality.STANDARD.code))
-
-      assertDataFilesAreTheSame(id1, id2)
-      assertDataHashStartMatches(id1, id2)
-      assertSkipTransform(id1, false)
-      assertSkipTransform(id2, false)
-    }
-
-    test {
-      val id1 = insertWithData(DATA_A, TransformProperties(sentMediaQuality = SentMediaQuality.HIGH.code))
-      val id2 = insertWithData(DATA_A, TransformProperties(sentMediaQuality = SentMediaQuality.HIGH.code))
-
-      assertDataFilesAreTheSame(id1, id2)
-      assertDataHashStartMatches(id1, id2)
-      assertSkipTransform(id1, false)
-      assertSkipTransform(id2, false)
-    }
-
-    test {
-      val id1 = insertWithData(DATA_A, TransformProperties(videoTrim = true, videoTrimStartTimeUs = 1, videoTrimEndTimeUs = 2))
-      val id2 = insertWithData(DATA_A, TransformProperties(videoTrim = true, videoTrimStartTimeUs = 1, videoTrimEndTimeUs = 2))
-
-      assertDataFilesAreTheSame(id1, id2)
-      assertDataHashStartMatches(id1, id2)
-      assertSkipTransform(id1, false)
-      assertSkipTransform(id2, false)
-    }
-  }
-
-  /**
-   * Walks through various scenarios where files are compressed and uploaded.
-   */
-  @Test
-  fun compressionAndUploads() {
-    // Matches after the first is compressed, skip transform properly set
-    test {
-      val id1 = insertWithData(DATA_A)
-      compress(id1, DATA_A_COMPRESSED)
-
-      val id2 = insertWithData(DATA_A)
-
-      assertDataFilesAreTheSame(id1, id2)
-      assertDataHashStartMatches(id1, id2)
-      assertSkipTransform(id1, true)
-      assertSkipTransform(id2, true)
-    }
-
-    // Matches after the first is uploaded, skip transform and ending hash properly set
-    test {
-      val id1 = insertWithData(DATA_A)
-      compress(id1, DATA_A_COMPRESSED)
-      upload(id1)
-
-      val id2 = insertWithData(DATA_A)
-
-      assertDataFilesAreTheSame(id1, id2)
-      assertDataHashStartMatches(id1, id2)
-      assertDataHashEndMatches(id1, id2)
-      assertSkipTransform(id1, true)
-      assertSkipTransform(id2, true)
-      assertRemoteFieldsMatch(id1, id2)
-      assertArchiveFieldsMatch(id1, id2)
-    }
-
-    // Mimics sending two files at once. Ensures all fields are kept in sync as we compress and upload.
-    test {
-      val id1 = insertWithData(DATA_A)
-      val id2 = insertWithData(DATA_A)
-
-      assertDataFilesAreTheSame(id1, id2)
-      assertDataHashStartMatches(id1, id2)
-      assertSkipTransform(id1, false)
-      assertSkipTransform(id2, false)
-
-      compress(id1, DATA_A_COMPRESSED)
-
-      assertDataFilesAreTheSame(id1, id2)
-      assertDataHashStartMatches(id1, id2)
-      assertSkipTransform(id1, true)
-      assertSkipTransform(id2, true)
-
-      upload(id1)
-
-      assertDataFilesAreTheSame(id1, id2)
-      assertDataHashStartMatches(id1, id2)
-      assertDataHashEndMatches(id1, id2)
-      assertRemoteFieldsMatch(id1, id2)
-      assertArchiveFieldsMatch(id1, id2)
-    }
-
-    // Re-use the upload when uploaded recently
-    test {
-      val id1 = insertWithData(DATA_A)
-      compress(id1, DATA_A_COMPRESSED)
-      upload(id1, uploadTimestamp = System.currentTimeMillis())
-
-      val id2 = insertWithData(DATA_A)
-
-      assertDataFilesAreTheSame(id1, id2)
-      assertDataHashStartMatches(id1, id2)
-      assertDataHashEndMatches(id1, id2)
-      assertRemoteFieldsMatch(id1, id2)
-      assertArchiveFieldsMatch(id1, id2)
-      assertSkipTransform(id1, true)
-      assertSkipTransform(id2, true)
-    }
-
-    // Do not re-use old uploads
-    test {
-      val id1 = insertWithData(DATA_A)
-      compress(id1, DATA_A_COMPRESSED)
-      upload(id1, uploadTimestamp = System.currentTimeMillis() - 100.days.inWholeMilliseconds)
-
-      val id2 = insertWithData(DATA_A)
-
-      assertDataFilesAreTheSame(id1, id2)
-      assertDataHashStartMatches(id1, id2)
-      assertDataHashEndMatches(id1, id2)
-      assertSkipTransform(id1, true)
-      assertSkipTransform(id2, true)
-
-      assertDoesNotHaveRemoteFields(id2)
-      assertArchiveFieldsMatch(id1, id2)
-    }
-
-    // This isn't so much "desirable behavior" as it is documenting how things work.
-    // If an attachment is compressed but not uploaded yet, it will have a DATA_HASH_START that doesn't match the actual file content.
-    // This means that if we insert a new attachment with data that matches the compressed data, we won't find a match.
-    // This is ok because we don't allow forwarding unsent messages, so the chances of the user somehow sending a file that matches data we compressed are very low.
-    // What *is* more common is that the user may send DATA_A again, and in this case we will still catch the dedupe (which is already tested above).
-    test {
-      val id1 = insertWithData(DATA_A)
-      compress(id1, DATA_A_COMPRESSED)
-
-      val id2 = insertWithData(DATA_A_COMPRESSED)
-
-      assertDataFilesAreDifferent(id1, id2)
-    }
-
-    // This represents what would happen if you forward an already-send compressed attachment. We should match, skip transform, and skip upload.
-    test {
-      val id1 = insertWithData(DATA_A)
-      compress(id1, DATA_A_COMPRESSED)
-      upload(id1, uploadTimestamp = System.currentTimeMillis())
-
-      val id2 = insertWithData(DATA_A_COMPRESSED)
-
-      assertDataFilesAreTheSame(id1, id2)
-      assertDataHashEndMatches(id1, id2)
-      assertSkipTransform(id1, true)
-      assertSkipTransform(id1, true)
-      assertRemoteFieldsMatch(id1, id2)
-      assertArchiveFieldsMatch(id1, id2)
-    }
-
-    // This represents what would happen if you edited a video, sent it, then forwarded it. We should match, skip transform, and skip upload.
-    test {
-      val id1 = insertWithData(DATA_A, TransformProperties(videoTrim = true, videoTrimStartTimeUs = 1, videoTrimEndTimeUs = 2))
-      compress(id1, DATA_A_COMPRESSED)
-      upload(id1, uploadTimestamp = System.currentTimeMillis())
-
-      val id2 = insertWithData(DATA_A_COMPRESSED)
-
-      assertDataFilesAreTheSame(id1, id2)
-      assertDataHashEndMatches(id1, id2)
-      assertSkipTransform(id1, true)
-      assertSkipTransform(id1, true)
-      assertRemoteFieldsMatch(id1, id2)
-      assertArchiveFieldsMatch(id1, id2)
-    }
-
-    // This represents what would happen if you edited a video, sent it, then forwarded it, but *edited the forwarded video*. We should not dedupe.
-    test {
-      val id1 = insertWithData(DATA_A, TransformProperties(videoTrim = true, videoTrimStartTimeUs = 1, videoTrimEndTimeUs = 2))
-      compress(id1, DATA_A_COMPRESSED)
-      upload(id1, uploadTimestamp = System.currentTimeMillis())
-
-      val id2 = insertWithData(DATA_A_COMPRESSED, TransformProperties(videoTrim = true, videoTrimStartTimeUs = 1, videoTrimEndTimeUs = 2))
-
-      assertDataFilesAreDifferent(id1, id2)
-      assertSkipTransform(id1, true)
-      assertSkipTransform(id2, false)
-      assertDoesNotHaveRemoteFields(id2)
-    }
-
-    // This represents what would happen if you sent an image using standard quality, then forwarded it using high quality.
-    // Since you're forwarding, it doesn't matter if the new thing has a higher quality, we should still match and skip transform.
-    test {
-      val id1 = insertWithData(DATA_A, TransformProperties(sentMediaQuality = SentMediaQuality.STANDARD.code))
-      compress(id1, DATA_A_COMPRESSED)
-      upload(id1, uploadTimestamp = System.currentTimeMillis())
-
-      val id2 = insertWithData(DATA_A_COMPRESSED, TransformProperties(sentMediaQuality = SentMediaQuality.HIGH.code))
-
-      assertDataFilesAreTheSame(id1, id2)
-      assertDataHashEndMatches(id1, id2)
-      assertSkipTransform(id1, true)
-      assertSkipTransform(id1, true)
-      assertRemoteFieldsMatch(id1, id2)
-      assertArchiveFieldsMatch(id1, id2)
-    }
-
-    // This represents what would happen if you sent an image using high quality, then forwarded it using standard quality.
-    // Since you're forwarding, it doesn't matter if the new thing has a lower quality, we should still match and skip transform.
-    test {
-      val id1 = insertWithData(DATA_A, TransformProperties(sentMediaQuality = SentMediaQuality.HIGH.code))
-      compress(id1, DATA_A_COMPRESSED)
-      upload(id1, uploadTimestamp = System.currentTimeMillis())
-
-      val id2 = insertWithData(DATA_A_COMPRESSED, TransformProperties(sentMediaQuality = SentMediaQuality.STANDARD.code))
-
-      assertDataFilesAreTheSame(id1, id2)
-      assertDataHashEndMatches(id1, id2)
-      assertSkipTransform(id1, true)
-      assertSkipTransform(id1, true)
-      assertRemoteFieldsMatch(id1, id2)
-      assertArchiveFieldsMatch(id1, id2)
-    }
-
-    // Make sure that files marked as unhashable are all updated together
-    test {
-      val id1 = insertWithData(DATA_A)
-      val id2 = insertWithData(DATA_A)
-      upload(id1)
-      upload(id2)
-      clearHashes(id1)
-      clearHashes(id2)
-
-      val file = dataFile(id1)
-      SignalDatabase.attachments.markDataFileAsUnhashable(file)
-
-      assertDataFilesAreTheSame(id1, id2)
-      assertDataHashEndMatches(id1, id2)
-
-      val dataFileInfo = SignalDatabase.attachments.getDataFileInfo(id1)!!
-      assertTrue(dataFileInfo.hashEnd!!.startsWith("UNHASHABLE-"))
-    }
-  }
-
-  /**
-   * Various deletion scenarios to ensure that duped files don't deleted while there's still references.
-   */
-  @Test
-  fun deletions() {
-    // Delete original then dupe
-    test {
-      val id1 = insertWithData(DATA_A)
-      val id2 = insertWithData(DATA_A)
-      val dataFile = dataFile(id1)
-
-      assertDataFilesAreTheSame(id1, id2)
-
-      delete(id1)
-
-      assertDeleted(id1)
-      assertRowAndFileExists(id2)
-      assertTrue(dataFile.exists())
-
-      delete(id2)
-
-      assertDeleted(id2)
-      assertFalse(dataFile.exists())
-    }
-
-    // Delete dupe then original
-    test {
-      val id1 = insertWithData(DATA_A)
-      val id2 = insertWithData(DATA_A)
-      val dataFile = dataFile(id1)
-
-      assertDataFilesAreTheSame(id1, id2)
-
-      delete(id2)
-      assertDeleted(id2)
-      assertRowAndFileExists(id1)
-      assertTrue(dataFile.exists())
-
-      delete(id1)
-      assertDeleted(id1)
-      assertFalse(dataFile.exists())
-    }
-
-    // Delete original after it was compressed
-    test {
-      val id1 = insertWithData(DATA_A)
-      compress(id1, DATA_A_COMPRESSED)
-
-      val id2 = insertWithData(DATA_A)
-
-      delete(id1)
-
-      assertDeleted(id1)
-      assertRowAndFileExists(id2)
-      assertSkipTransform(id2, true)
-    }
-
-    // Quotes are weak references and should not prevent us from deleting the file
-    test {
-      val id1 = insertWithData(DATA_A)
-      val id2 = insertQuote(id1)
-
-      val dataFile = dataFile(id1)
-
-      delete(id1)
-      assertDeleted(id1)
-      assertRowExists(id2)
-      assertFalse(dataFile.exists())
-    }
-  }
-
-  @Test
-  fun quotes() {
-    // Basic quote deduping
-    test {
-      val id1 = insertWithData(DATA_A)
-      val id2 = insertQuote(id1)
-
-      assertDataFilesAreTheSame(id1, id2)
-      assertDataHashStartMatches(id1, id2)
-    }
-
-    // Making sure remote fields carry
-    test {
-      val id1 = insertWithData(DATA_A)
-      val id2 = insertQuote(id1)
-      upload(id1)
-
-      assertDataFilesAreTheSame(id1, id2)
-      assertDataHashStartMatches(id1, id2)
-      assertDataHashEndMatches(id1, id2)
-      assertRemoteFieldsMatch(id1, id2)
-      assertArchiveFieldsMatch(id1, id2)
-    }
-
-    // Making sure things work for quotes of videos, which have trickier transform properties
-    test {
-      val id1 = insertWithData(DATA_A, transformProperties = TransformProperties.forVideoTrim(1, 2))
-      compress(id1, DATA_A_COMPRESSED)
-      upload(id1)
-
-      val id2 = insertQuote(id1)
-
-      assertDataFilesAreTheSame(id1, id2)
-      assertDataHashEndMatches(id1, id2)
-      assertRemoteFieldsMatch(id1, id2)
-      assertArchiveFieldsMatch(id1, id2)
-    }
-  }
-
-  /**
-   * Suite of tests around the migration where we hash all of the attachments and potentially dedupe them.
-   */
-  @Test
-  fun migration() {
-    // Verifying that getUnhashedDataFile only returns if there's actually missing hashes
-    test {
-      val id = insertWithData(DATA_A)
-      upload(id)
-      assertNull(SignalDatabase.attachments.getUnhashedDataFile())
-    }
-
-    // Verifying that getUnhashedDataFile finds the missing hash
-    test {
-      val id = insertWithData(DATA_A)
-      upload(id)
-      clearHashes(id)
-      assertNotNull(SignalDatabase.attachments.getUnhashedDataFile())
-    }
-
-    // Verifying that getUnhashedDataFile doesn't return if the file isn't done downloading
-    test {
-      val id = insertWithData(DATA_A)
-      upload(id)
-      setTransferState(id, AttachmentTable.TRANSFER_PROGRESS_PENDING)
-      clearHashes(id)
-      assertNull(SignalDatabase.attachments.getUnhashedDataFile())
-    }
-
-    // If two attachments share the same file, when we backfill the hash, make sure both get their hashes set
-    test {
-      val id1 = insertWithData(DATA_A)
-      val id2 = insertWithData(DATA_A)
-      upload(id1)
-      upload(id2)
-
-      clearHashes(id1)
-      clearHashes(id2)
-
-      val file = dataFile(id1)
-      SignalDatabase.attachments.setHashForDataFile(file, DATA_A_HASH)
-
-      assertDataHashEnd(id1, DATA_A_HASH)
-      assertDataHashEndMatches(id1, id2)
-    }
-
-    // Creates a situation where two different attachments have the same data but wrote to different files, and verifies the migration dedupes it
-    test {
-      val id1 = insertWithData(DATA_A)
-      upload(id1)
-      clearHashes(id1)
-
-      val id2 = insertWithData(DATA_A)
-      upload(id2)
-      clearHashes(id2)
-
-      assertDataFilesAreDifferent(id1, id2)
-
-      val file1 = dataFile(id1)
-      SignalDatabase.attachments.setHashForDataFile(file1, DATA_A_HASH)
-
-      assertDataHashEnd(id1, DATA_A_HASH)
-      assertDataFilesAreDifferent(id1, id2)
-
-      val file2 = dataFile(id2)
-      SignalDatabase.attachments.setHashForDataFile(file2, DATA_A_HASH)
-
-      assertDataFilesAreTheSame(id1, id2)
-      assertDataHashEndMatches(id1, id2)
-      assertFalse(file2.exists())
-    }
-
-    // We've got three files now with the same data, with two of them sharing a file. We want to make sure *both* entries that share the same file get deduped.
-    test {
-      val id1 = insertWithData(DATA_A)
-      upload(id1)
-      clearHashes(id1)
-
-      val id2 = insertWithData(DATA_A)
-      val id3 = insertWithData(DATA_A)
-      upload(id2)
-      upload(id3)
-      clearHashes(id2)
-      clearHashes(id3)
-
-      assertDataFilesAreDifferent(id1, id2)
-      assertDataFilesAreTheSame(id2, id3)
-
-      val file1 = dataFile(id1)
-      SignalDatabase.attachments.setHashForDataFile(file1, DATA_A_HASH)
-      assertDataHashEnd(id1, DATA_A_HASH)
-
-      val file2 = dataFile(id2)
-      SignalDatabase.attachments.setHashForDataFile(file2, DATA_A_HASH)
-
-      assertDataFilesAreTheSame(id1, id2)
-      assertDataHashEndMatches(id1, id2)
-      assertDataHashEndMatches(id2, id3)
-      assertFalse(file2.exists())
-    }
-
-    // We don't want to mess with files that are still downloading, so this makes sure that even if data matches, we don't dedupe and don't delete the file
-    test {
-      val id1 = insertWithData(DATA_A)
-      upload(id1)
-      clearHashes(id1)
-
-      val id2 = insertWithData(DATA_A)
-      // *not* uploaded
-      clearHashes(id2)
-
-      assertDataFilesAreDifferent(id1, id2)
-
-      val file1 = dataFile(id1)
-      SignalDatabase.attachments.setHashForDataFile(file1, DATA_A_HASH)
-      assertDataHashEnd(id1, DATA_A_HASH)
-
-      val file2 = dataFile(id2)
-      SignalDatabase.attachments.setHashForDataFile(file2, DATA_A_HASH)
-
-      assertDataFilesAreDifferent(id1, id2)
-      assertTrue(file2.exists())
-    }
-  }
-
-  private class TestContext {
-    fun insertWithData(data: ByteArray, transformProperties: TransformProperties = TransformProperties.empty()): AttachmentId {
-      val uri = BlobProvider.getInstance().forData(data).createForSingleSessionInMemory()
-
-      val attachment = UriAttachmentBuilder.build(
-        id = Random.nextLong(),
-        uri = uri,
-        contentType = MediaUtil.IMAGE_JPEG,
-        transformProperties = transformProperties
-      )
-
-      return SignalDatabase.attachments.insertAttachmentForPreUpload(attachment).attachmentId
-    }
-
-    fun insertQuote(attachmentId: AttachmentId): AttachmentId {
-      val originalAttachment = SignalDatabase.attachments.getAttachment(attachmentId)!!
-      val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.self())
-      val messageId = SignalDatabase.messages.insertMessageOutbox(
-        message = OutgoingMessage(
-          threadRecipient = Recipient.self(),
-          sentTimeMillis = System.currentTimeMillis(),
-          body = "some text",
-          outgoingQuote = QuoteModel(
-            id = 123,
-            author = Recipient.self().id,
-            text = "Some quote text",
-            isOriginalMissing = false,
-            attachments = listOf(originalAttachment),
-            mentions = emptyList(),
-            type = QuoteModel.Type.NORMAL,
-            bodyRanges = null
-          )
-        ),
-        threadId = threadId,
-        forceSms = false,
-        insertListener = null
-      )
-
-      val attachments = SignalDatabase.attachments.getAttachmentsForMessage(messageId)
-      return attachments[0].attachmentId
-    }
-
-    fun compress(attachmentId: AttachmentId, newData: ByteArray, mp4FastStart: Boolean = false) {
-      val databaseAttachment = SignalDatabase.attachments.getAttachment(attachmentId)!!
-      SignalDatabase.attachments.updateAttachmentData(databaseAttachment, newData.asMediaStream())
-      SignalDatabase.attachments.markAttachmentAsTransformed(attachmentId, withFastStart = mp4FastStart)
-    }
-
-    fun upload(attachmentId: AttachmentId, uploadTimestamp: Long = System.currentTimeMillis()) {
-      SignalDatabase.attachments.finalizeAttachmentAfterUpload(attachmentId, createPointerAttachment(attachmentId, uploadTimestamp), uploadTimestamp)
-
-      val attachment = SignalDatabase.attachments.getAttachment(attachmentId)!!
-      SignalDatabase.attachments.setArchiveData(
-        attachmentId = attachmentId,
-        archiveCdn = Cdn.CDN_3.cdnNumber,
-        archiveMediaName = attachment.getMediaName().name,
-        archiveThumbnailMediaId = MediaId(Util.getSecretBytes(15)).encode(),
-        archiveMediaId = MediaId(Util.getSecretBytes(15)).encode()
-      )
-    }
-
-    fun delete(attachmentId: AttachmentId) {
-      SignalDatabase.attachments.deleteAttachment(attachmentId)
-    }
-
-    fun dataFile(attachmentId: AttachmentId): File {
-      return SignalDatabase.attachments.getDataFileInfo(attachmentId)!!.file
-    }
-
-    fun setTransferState(attachmentId: AttachmentId, transferState: Int) {
-      // messageId doesn't actually matter -- that's for notifying listeners
-      SignalDatabase.attachments.setTransferState(messageId = -1, attachmentId = attachmentId, transferState = transferState)
-    }
-
-    fun clearHashes(id: AttachmentId) {
-      SignalDatabase.attachments.writableDatabase
-        .update(AttachmentTable.TABLE_NAME)
-        .values(
-          AttachmentTable.DATA_HASH_START to null,
-          AttachmentTable.DATA_HASH_END to null
-        )
-        .where("${AttachmentTable.ID} = ?", id)
-        .run()
-    }
-
-    fun assertDeleted(attachmentId: AttachmentId) {
-      assertNull("$attachmentId exists, but it shouldn't!", SignalDatabase.attachments.getAttachment(attachmentId))
-    }
-
-    fun assertRowAndFileExists(attachmentId: AttachmentId) {
-      val databaseAttachment = SignalDatabase.attachments.getAttachment(attachmentId)
-      assertNotNull("$attachmentId does not exist!", databaseAttachment)
-
-      val dataFileInfo = SignalDatabase.attachments.getDataFileInfo(attachmentId)
-      assertTrue("The file for $attachmentId does not exist!", dataFileInfo!!.file.exists())
-    }
-
-    fun assertRowExists(attachmentId: AttachmentId) {
-      val databaseAttachment = SignalDatabase.attachments.getAttachment(attachmentId)
-      assertNotNull("$attachmentId does not exist!", databaseAttachment)
-    }
-
-    fun assertDataFilesAreTheSame(lhs: AttachmentId, rhs: AttachmentId) {
-      val lhsInfo = SignalDatabase.attachments.getDataFileInfo(lhs)!!
-      val rhsInfo = SignalDatabase.attachments.getDataFileInfo(rhs)!!
-
-      assert(lhsInfo.file.exists())
-      assert(rhsInfo.file.exists())
-
-      assertEquals(lhsInfo.file, rhsInfo.file)
-      assertEquals(lhsInfo.length, rhsInfo.length)
-      assertArrayEquals(lhsInfo.random, rhsInfo.random)
-    }
-
-    fun assertDataFilesAreDifferent(lhs: AttachmentId, rhs: AttachmentId) {
-      val lhsInfo = SignalDatabase.attachments.getDataFileInfo(lhs)!!
-      val rhsInfo = SignalDatabase.attachments.getDataFileInfo(rhs)!!
-
-      assert(lhsInfo.file.exists())
-      assert(rhsInfo.file.exists())
-
-      assertNotEquals(lhsInfo.file, rhsInfo.file)
-    }
-
-    fun assertDataHashStartMatches(lhs: AttachmentId, rhs: AttachmentId) {
-      val lhsInfo = SignalDatabase.attachments.getDataFileInfo(lhs)!!
-      val rhsInfo = SignalDatabase.attachments.getDataFileInfo(rhs)!!
-
-      assertNotNull(lhsInfo.hashStart)
-      assertEquals("DATA_HASH_START's did not match!", lhsInfo.hashStart, rhsInfo.hashStart)
-    }
-
-    fun assertDataHashEndMatches(lhs: AttachmentId, rhs: AttachmentId) {
-      val lhsInfo = SignalDatabase.attachments.getDataFileInfo(lhs)!!
-      val rhsInfo = SignalDatabase.attachments.getDataFileInfo(rhs)!!
-
-      assertNotNull(lhsInfo.hashEnd)
-      assertEquals("DATA_HASH_END's did not match!", lhsInfo.hashEnd, rhsInfo.hashEnd)
-    }
-
-    fun assertDataHashEnd(id: AttachmentId, byteArray: ByteArray) {
-      val dataFileInfo = SignalDatabase.attachments.getDataFileInfo(id)!!
-      assertArrayEquals(byteArray, Base64.decode(dataFileInfo.hashEnd!!))
-    }
-
-    fun assertRemoteFieldsMatch(lhs: AttachmentId, rhs: AttachmentId) {
-      val lhsAttachment = SignalDatabase.attachments.getAttachment(lhs)!!
-      val rhsAttachment = SignalDatabase.attachments.getAttachment(rhs)!!
-
-      assertEquals(lhsAttachment.remoteLocation, rhsAttachment.remoteLocation)
-      assertEquals(lhsAttachment.remoteKey, rhsAttachment.remoteKey)
-      assertArrayEquals(lhsAttachment.remoteDigest, rhsAttachment.remoteDigest)
-      assertArrayEquals(lhsAttachment.incrementalDigest, rhsAttachment.incrementalDigest)
-      assertEquals(lhsAttachment.incrementalMacChunkSize, rhsAttachment.incrementalMacChunkSize)
-      assertEquals(lhsAttachment.cdn.cdnNumber, rhsAttachment.cdn.cdnNumber)
-    }
-
-    fun assertArchiveFieldsMatch(lhs: AttachmentId, rhs: AttachmentId) {
-      val lhsAttachment = SignalDatabase.attachments.getAttachment(lhs)!!
-      val rhsAttachment = SignalDatabase.attachments.getAttachment(rhs)!!
-
-      assertEquals(lhsAttachment.archiveCdn, rhsAttachment.archiveCdn)
-      assertEquals(lhsAttachment.archiveMediaName, rhsAttachment.archiveMediaName)
-      assertEquals(lhsAttachment.archiveMediaId, rhsAttachment.archiveMediaId)
-    }
-
-    fun assertDoesNotHaveRemoteFields(attachmentId: AttachmentId) {
-      val databaseAttachment = SignalDatabase.attachments.getAttachment(attachmentId)!!
-      assertEquals(0, databaseAttachment.uploadTimestamp)
-      assertNull(databaseAttachment.remoteLocation)
-      assertNull(databaseAttachment.remoteDigest)
-      assertNull(databaseAttachment.remoteKey)
-      assertEquals(0, databaseAttachment.cdn.cdnNumber)
-    }
-
-    fun assertSkipTransform(attachmentId: AttachmentId, state: Boolean) {
-      val transformProperties = SignalDatabase.attachments.getTransformProperties(attachmentId)!!
-      assertEquals("Incorrect skipTransform!", transformProperties.skipTransform, state)
-    }
-
-    private fun ByteArray.asMediaStream(): MediaStream {
-      return MediaStream(this.inputStream(), MediaUtil.IMAGE_JPEG, 2, 2)
-    }
-
-    private fun createPointerAttachment(attachmentId: AttachmentId, uploadTimestamp: Long = System.currentTimeMillis()): PointerAttachment {
-      val location = "somewhere-${Random.nextLong()}"
-      val key = "somekey-${Random.nextLong()}"
-      val digest = Random.nextBytes(32)
-      val incrementalDigest = Random.nextBytes(16)
-
-      val databaseAttachment = SignalDatabase.attachments.getAttachment(attachmentId)!!
-
-      return PointerAttachment(
-        "image/jpeg",
-        AttachmentTable.TRANSFER_PROGRESS_DONE,
-        databaseAttachment.size, // size
-        null,
-        Cdn.CDN_3, // cdnNumber
-        location,
-        key,
-        digest,
-        incrementalDigest,
-        5, // incrementalMacChunkSize
-        null,
-        databaseAttachment.voiceNote,
-        databaseAttachment.borderless,
-        databaseAttachment.videoGif,
-        databaseAttachment.width,
-        databaseAttachment.height,
-        uploadTimestamp,
-        databaseAttachment.caption,
-        databaseAttachment.stickerLocator,
-        databaseAttachment.blurHash,
-        databaseAttachment.uuid
-      )
-    }
-  }
-
-  private fun test(content: TestContext.() -> Unit) {
-    SignalDatabase.attachments.deleteAllAttachments()
-    val context = TestContext()
-    context.content()
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/database/CallLinkTableTest.kt

@@ -1,102 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.database
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import junit.framework.Assert.assertEquals
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.thoughtcrime.securesms.calls.log.CallLogFilter
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.service.webrtc.links.CallLinkCredentials
-import org.thoughtcrime.securesms.service.webrtc.links.CallLinkRoomId
-import org.thoughtcrime.securesms.service.webrtc.links.SignalCallLinkState
-import org.thoughtcrime.securesms.testing.SignalActivityRule
-
-@RunWith(AndroidJUnit4::class)
-class CallLinkTableTest {
-
-  companion object {
-    private val ROOM_ID_A = byteArrayOf(1, 2, 3, 4)
-    private val ROOM_ID_B = byteArrayOf(2, 2, 3, 4)
-    private const val TIMESTAMP_A = 1000L
-    private const val TIMESTAMP_B = 2000L
-  }
-
-  @get:Rule
-  val harness = SignalActivityRule(createGroup = true)
-
-  @Test
-  fun givenTwoNonAdminCallLinks_whenIDeleteBeforeFirst_thenIExpectNeitherDeleted() {
-    insertTwoNonAdminCallLinksWithEvents()
-    SignalDatabase.callLinks.deleteNonAdminCallLinksOnOrBefore(TIMESTAMP_A - 500)
-    val callEvents = SignalDatabase.calls.getCalls(0, 2, "", CallLogFilter.ALL)
-    assertEquals(2, callEvents.size)
-  }
-
-  @Test
-  fun givenTwoNonAdminCallLinks_whenIDeleteOnFirst_thenIExpectFirstDeleted() {
-    insertTwoNonAdminCallLinksWithEvents()
-    SignalDatabase.callLinks.deleteNonAdminCallLinksOnOrBefore(TIMESTAMP_A)
-    val callEvents = SignalDatabase.calls.getCalls(0, 2, "", CallLogFilter.ALL)
-    assertEquals(1, callEvents.size)
-    assertEquals(TIMESTAMP_B, callEvents.first().record.timestamp)
-  }
-
-  @Test
-  fun givenTwoNonAdminCallLinks_whenIDeleteAfterFirstAndBeforeSecond_thenIExpectFirstDeleted() {
-    insertTwoNonAdminCallLinksWithEvents()
-    SignalDatabase.callLinks.deleteNonAdminCallLinksOnOrBefore(TIMESTAMP_B - 500)
-    val callEvents = SignalDatabase.calls.getCalls(0, 2, "", CallLogFilter.ALL)
-    assertEquals(1, callEvents.size)
-    assertEquals(TIMESTAMP_B, callEvents.first().record.timestamp)
-  }
-
-  @Test
-  fun givenTwoNonAdminCallLinks_whenIDeleteOnSecond_thenIExpectBothDeleted() {
-    insertTwoNonAdminCallLinksWithEvents()
-    SignalDatabase.callLinks.deleteNonAdminCallLinksOnOrBefore(TIMESTAMP_B)
-    val callEvents = SignalDatabase.calls.getCalls(0, 2, "", CallLogFilter.ALL)
-    assertEquals(0, callEvents.size)
-  }
-
-  @Test
-  fun givenTwoNonAdminCallLinks_whenIDeleteAfterSecond_thenIExpectBothDeleted() {
-    insertTwoNonAdminCallLinksWithEvents()
-    SignalDatabase.callLinks.deleteNonAdminCallLinksOnOrBefore(TIMESTAMP_B + 500)
-    val callEvents = SignalDatabase.calls.getCalls(0, 2, "", CallLogFilter.ALL)
-    assertEquals(0, callEvents.size)
-  }
-
-  private fun insertTwoNonAdminCallLinksWithEvents() {
-    insertCallLinkWithEvent(ROOM_ID_A, 1000)
-    insertCallLinkWithEvent(ROOM_ID_B, 2000)
-  }
-
-  private fun insertCallLinkWithEvent(roomId: ByteArray, timestamp: Long) {
-    SignalDatabase.callLinks.insertCallLink(
-      CallLinkTable.CallLink(
-        recipientId = RecipientId.UNKNOWN,
-        roomId = CallLinkRoomId.fromBytes(roomId),
-        credentials = CallLinkCredentials(
-          linkKeyBytes = roomId,
-          adminPassBytes = null
-        ),
-        state = SignalCallLinkState()
-      )
-    )
-
-    val callLinkRecipient = SignalDatabase.recipients.getByCallLinkRoomId(CallLinkRoomId.fromBytes(roomId)).get()
-
-    SignalDatabase.calls.insertAcceptedGroupCall(
-      1,
-      callLinkRecipient,
-      CallTable.Direction.INCOMING,
-      timestamp
-    )
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/database/CallTableTest.kt

@@ -1,996 +0,0 @@
-package org.thoughtcrime.securesms.database
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNotEquals
-import org.junit.Assert.assertNotNull
-import org.junit.Assert.assertNull
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.ringrtc.CallId
-import org.signal.ringrtc.CallManager
-import org.thoughtcrime.securesms.calls.log.CallLogFilter
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.testing.SignalActivityRule
-
-@RunWith(AndroidJUnit4::class)
-class CallTableTest {
-
-  @get:Rule
-  val harness = SignalActivityRule(createGroup = true)
-
-  private val groupRecipientId: RecipientId
-    get() = harness.group!!.recipientId
-
-  @Test
-  fun givenACall_whenISetTimestamp_thenIExpectUpdatedTimestamp() {
-    val callId = 1L
-    val now = System.currentTimeMillis()
-    SignalDatabase.calls.insertAcceptedGroupCall(
-      callId,
-      groupRecipientId,
-      CallTable.Direction.INCOMING,
-      now
-    )
-
-    SignalDatabase.calls.setTimestamp(callId, groupRecipientId, -1L)
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(-1L, call?.timestamp)
-
-    val messageRecord = SignalDatabase.messages.getMessageRecord(call!!.messageId!!)
-    assertEquals(-1L, messageRecord.dateReceived)
-    assertEquals(-1L, messageRecord.dateSent)
-  }
-
-  @Test
-  fun givenPreExistingEvent_whenIDeleteGroupCall_thenIMarkDeletedAndSetTimestamp() {
-    val callId = 1L
-    val now = System.currentTimeMillis()
-    SignalDatabase.calls.insertAcceptedGroupCall(
-      callId,
-      groupRecipientId,
-      CallTable.Direction.INCOMING,
-      now
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    SignalDatabase.calls.markCallDeletedFromSyncEvent(call!!)
-
-    val deletedCall = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    val oldestDeletionTimestamp = SignalDatabase.calls.getOldestDeletionTimestamp()
-
-    assertEquals(CallTable.Event.DELETE, deletedCall?.event)
-    assertNotEquals(0L, oldestDeletionTimestamp)
-    assertNull(deletedCall!!.messageId)
-  }
-
-  @Test
-  fun givenNoPreExistingEvent_whenIDeleteGroupCall_thenIInsertAndMarkCallDeleted() {
-    val callId = 1L
-    SignalDatabase.calls.insertDeletedCallFromSyncEvent(
-      callId,
-      groupRecipientId,
-      CallTable.Type.GROUP_CALL,
-      CallTable.Direction.OUTGOING,
-      System.currentTimeMillis()
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-
-    val oldestDeletionTimestamp = SignalDatabase.calls.getOldestDeletionTimestamp()
-
-    assertEquals(CallTable.Event.DELETE, call?.event)
-    assertNotEquals(oldestDeletionTimestamp, 0)
-    assertNull(call?.messageId)
-  }
-
-  @Test
-  fun givenNoPriorEvent_whenIInsertAcceptedOutgoingGroupCall_thenIExpectLocalRingerAndOutgoingRing() {
-    val callId = 1L
-    SignalDatabase.calls.insertAcceptedGroupCall(
-      callId,
-      groupRecipientId,
-      CallTable.Direction.OUTGOING,
-      System.currentTimeMillis()
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.OUTGOING_RING, call?.event)
-    assertEquals(harness.self.id, call?.ringerRecipient)
-    assertNotNull(call?.messageId)
-  }
-
-  @Test
-  fun givenNoPriorEvent_whenIInsertAcceptedIncomingGroupCall_thenIExpectJoined() {
-    val callId = 1L
-    SignalDatabase.calls.insertAcceptedGroupCall(
-      callId,
-      groupRecipientId,
-      CallTable.Direction.INCOMING,
-      System.currentTimeMillis()
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.JOINED, call?.event)
-    assertNull(call?.ringerRecipient)
-    assertNotNull(call?.messageId)
-  }
-
-  @Test
-  fun givenARingingCall_whenIAcceptedIncomingGroupCall_thenIExpectAccepted() {
-    val callId = 1L
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      ringId = callId,
-      groupRecipientId = groupRecipientId,
-      ringerRecipient = harness.others[1],
-      dateReceived = System.currentTimeMillis(),
-      ringState = CallManager.RingUpdate.REQUESTED
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.RINGING, call?.event)
-
-    SignalDatabase.calls.acceptIncomingGroupCall(
-      call!!
-    )
-
-    val acceptedCall = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertEquals(CallTable.Event.ACCEPTED, acceptedCall?.event)
-  }
-
-  @Test
-  fun givenAMissedCall_whenIAcceptedIncomingGroupCall_thenIExpectAccepted() {
-    val callId = 1L
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      ringId = callId,
-      groupRecipientId = groupRecipientId,
-      ringerRecipient = harness.others[1],
-      dateReceived = System.currentTimeMillis(),
-      ringState = CallManager.RingUpdate.EXPIRED_REQUEST
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.MISSED, call?.event)
-
-    SignalDatabase.calls.acceptIncomingGroupCall(
-      call!!
-    )
-
-    val acceptedCall = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertEquals(CallTable.Event.ACCEPTED, acceptedCall?.event)
-  }
-
-  @Test
-  fun givenADeclinedCall_whenIAcceptedIncomingGroupCall_thenIExpectAccepted() {
-    val callId = 1L
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      ringId = callId,
-      groupRecipientId = groupRecipientId,
-      ringerRecipient = harness.others[1],
-      dateReceived = System.currentTimeMillis(),
-      ringState = CallManager.RingUpdate.DECLINED_ON_ANOTHER_DEVICE
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.DECLINED, call?.event)
-
-    SignalDatabase.calls.acceptIncomingGroupCall(
-      call!!
-    )
-
-    val acceptedCall = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertEquals(CallTable.Event.ACCEPTED, acceptedCall?.event)
-  }
-
-  @Test
-  fun givenAGenericGroupCall_whenIAcceptedIncomingGroupCall_thenIExpectAccepted() {
-    val era = "aaa"
-    val callId = CallId.fromEra(era).longValue()
-    SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
-      groupRecipientId = groupRecipientId,
-      sender = harness.others[1],
-      timestamp = System.currentTimeMillis(),
-      peekGroupCallEraId = "aaa",
-      peekJoinedUuids = emptyList(),
-      isCallFull = false
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.GENERIC_GROUP_CALL, call?.event)
-
-    SignalDatabase.calls.acceptIncomingGroupCall(
-      call!!
-    )
-
-    val acceptedCall = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertEquals(CallTable.Event.JOINED, acceptedCall?.event)
-  }
-
-  @Test
-  fun givenAnOutgoingRingCall_whenIAcceptedOutgoingGroupCall_thenIExpectOutgoingRing() {
-    val callId = 1L
-    SignalDatabase.calls.insertAcceptedGroupCall(
-      callId = callId,
-      recipientId = groupRecipientId,
-      direction = CallTable.Direction.OUTGOING,
-      timestamp = 1
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.OUTGOING_RING, call?.event)
-
-    SignalDatabase.calls.acceptOutgoingGroupCall(
-      call!!
-    )
-
-    val acceptedCall = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertEquals(CallTable.Event.OUTGOING_RING, acceptedCall?.event)
-  }
-
-  @Test
-  fun givenARingingCall_whenIAcceptedOutgoingGroupCall_thenIExpectAccepted() {
-    val callId = 1L
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      ringId = callId,
-      groupRecipientId = groupRecipientId,
-      ringerRecipient = harness.others[1],
-      dateReceived = System.currentTimeMillis(),
-      ringState = CallManager.RingUpdate.REQUESTED
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.RINGING, call?.event)
-
-    SignalDatabase.calls.acceptOutgoingGroupCall(
-      call!!
-    )
-
-    val acceptedCall = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertEquals(CallTable.Event.ACCEPTED, acceptedCall?.event)
-  }
-
-  @Test
-  fun givenAMissedCall_whenIAcceptedOutgoingGroupCall_thenIExpectAccepted() {
-    val callId = 1L
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      ringId = callId,
-      groupRecipientId = groupRecipientId,
-      ringerRecipient = harness.others[1],
-      dateReceived = System.currentTimeMillis(),
-      ringState = CallManager.RingUpdate.EXPIRED_REQUEST
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.MISSED, call?.event)
-
-    SignalDatabase.calls.acceptOutgoingGroupCall(
-      call!!
-    )
-
-    val acceptedCall = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertEquals(CallTable.Event.ACCEPTED, acceptedCall?.event)
-  }
-
-  @Test
-  fun givenADeclinedCall_whenIAcceptedOutgoingGroupCall_thenIExpectAccepted() {
-    val callId = 1L
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      ringId = callId,
-      groupRecipientId = groupRecipientId,
-      ringerRecipient = harness.others[1],
-      dateReceived = System.currentTimeMillis(),
-      ringState = CallManager.RingUpdate.DECLINED_ON_ANOTHER_DEVICE
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.DECLINED, call?.event)
-
-    SignalDatabase.calls.acceptOutgoingGroupCall(
-      call!!
-    )
-
-    val acceptedCall = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertEquals(CallTable.Event.ACCEPTED, acceptedCall?.event)
-  }
-
-  @Test
-  fun givenAnAcceptedCall_whenIAcceptedOutgoingGroupCall_thenIExpectAccepted() {
-    val callId = 1L
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      ringId = callId,
-      groupRecipientId = groupRecipientId,
-      ringerRecipient = harness.others[1],
-      dateReceived = System.currentTimeMillis(),
-      ringState = CallManager.RingUpdate.REQUESTED
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.RINGING, call?.event)
-
-    SignalDatabase.calls.acceptIncomingGroupCall(
-      call!!
-    )
-
-    SignalDatabase.calls.acceptOutgoingGroupCall(
-      SignalDatabase.calls.getCallById(callId, groupRecipientId)!!
-    )
-
-    val acceptedCall = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertEquals(CallTable.Event.ACCEPTED, acceptedCall?.event)
-  }
-
-  @Test
-  fun givenAGenericGroupCall_whenIAcceptedOutgoingGroupCall_thenIExpectOutgoingRing() {
-    val era = "aaa"
-    val callId = CallId.fromEra(era).longValue()
-    SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
-      groupRecipientId = groupRecipientId,
-      sender = harness.others[1],
-      timestamp = System.currentTimeMillis(),
-      peekGroupCallEraId = "aaa",
-      peekJoinedUuids = emptyList(),
-      isCallFull = false
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.GENERIC_GROUP_CALL, call?.event)
-
-    SignalDatabase.calls.acceptOutgoingGroupCall(
-      call!!
-    )
-
-    val acceptedCall = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertEquals(CallTable.Event.OUTGOING_RING, acceptedCall?.event)
-  }
-
-  @Test
-  fun givenAJoinedGroupCall_whenIAcceptedOutgoingGroupCall_thenIExpectOutgoingRing() {
-    val era = "aaa"
-    val callId = CallId.fromEra(era).longValue()
-    SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
-      groupRecipientId = groupRecipientId,
-      sender = harness.others[1],
-      timestamp = System.currentTimeMillis(),
-      peekGroupCallEraId = "aaa",
-      peekJoinedUuids = emptyList(),
-      isCallFull = false
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.GENERIC_GROUP_CALL, call?.event)
-
-    SignalDatabase.calls.acceptIncomingGroupCall(
-      call!!
-    )
-
-    SignalDatabase.calls.acceptOutgoingGroupCall(SignalDatabase.calls.getCallById(callId, groupRecipientId)!!)
-    val acceptedCall = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertEquals(CallTable.Event.OUTGOING_RING, acceptedCall?.event)
-  }
-
-  @Test
-  fun givenNoPriorCallEvent_whenIReceiveAGroupCallUpdateMessage_thenIExpectAGenericGroupCall() {
-    val era = "aaa"
-    val callId = CallId.fromEra(era).longValue()
-    SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
-      groupRecipientId = groupRecipientId,
-      sender = harness.others[1],
-      timestamp = System.currentTimeMillis(),
-      peekGroupCallEraId = "aaa",
-      peekJoinedUuids = emptyList(),
-      isCallFull = false
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.GENERIC_GROUP_CALL, call?.event)
-  }
-
-  @Test
-  fun givenAPriorCallEventWithNewerTimestamp_whenIReceiveAGroupCallUpdateMessage_thenIExpectAnUpdatedTimestamp() {
-    val era = "aaa"
-    val callId = CallId.fromEra(era).longValue()
-    val now = System.currentTimeMillis()
-    SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
-      groupRecipientId = groupRecipientId,
-      sender = harness.others[1],
-      timestamp = now,
-      peekGroupCallEraId = "aaa",
-      peekJoinedUuids = emptyList(),
-      isCallFull = false
-    )
-
-    SignalDatabase.calls.getCallById(callId, groupRecipientId).let {
-      assertNotNull(it)
-      assertEquals(now, it?.timestamp)
-    }
-
-    SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
-      groupRecipientId = groupRecipientId,
-      sender = harness.others[1],
-      timestamp = 1L,
-      peekGroupCallEraId = "aaa",
-      peekJoinedUuids = emptyList(),
-      isCallFull = false
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.GENERIC_GROUP_CALL, call?.event)
-    assertEquals(1L, call?.timestamp)
-  }
-
-  @Test
-  fun givenADeletedCallEvent_whenIReceiveARingUpdate_thenIIgnoreTheRingUpdate() {
-    val callId = 1L
-    SignalDatabase.calls.insertDeletedCallFromSyncEvent(
-      callId = callId,
-      recipientId = groupRecipientId,
-      direction = CallTable.Direction.INCOMING,
-      timestamp = System.currentTimeMillis(),
-      type = CallTable.Type.GROUP_CALL
-    )
-
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      ringId = callId,
-      groupRecipientId = groupRecipientId,
-      ringerRecipient = harness.others[1],
-      dateReceived = System.currentTimeMillis(),
-      ringState = CallManager.RingUpdate.REQUESTED
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.DELETE, call?.event)
-  }
-
-  @Test
-  fun givenAGenericCallEvent_whenRingRequested_thenISetRingerAndMoveToRingingState() {
-    val era = "aaa"
-    val callId = CallId.fromEra(era).longValue()
-    val now = System.currentTimeMillis()
-    SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
-      groupRecipientId = groupRecipientId,
-      sender = harness.others[1],
-      timestamp = now,
-      peekGroupCallEraId = "aaa",
-      peekJoinedUuids = emptyList(),
-      isCallFull = false
-    )
-
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      callId,
-      groupRecipientId,
-      harness.others[1],
-      System.currentTimeMillis(),
-      CallManager.RingUpdate.REQUESTED
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.RINGING, call?.event)
-    assertEquals(harness.others[1], call?.ringerRecipient)
-  }
-
-  @Test
-  fun givenAJoinedCallEvent_whenRingRequested_thenISetRingerAndMoveToRingingState() {
-    val era = "aaa"
-    val callId = CallId.fromEra(era).longValue()
-    val now = System.currentTimeMillis()
-    SignalDatabase.calls.insertAcceptedGroupCall(
-      callId,
-      groupRecipientId,
-      CallTable.Direction.INCOMING,
-      now
-    )
-
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      callId,
-      groupRecipientId,
-      harness.others[1],
-      System.currentTimeMillis(),
-      CallManager.RingUpdate.REQUESTED
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.ACCEPTED, call?.event)
-    assertEquals(harness.others[1], call?.ringerRecipient)
-  }
-
-  @Test
-  fun givenAGenericCallEvent_whenRingExpired_thenISetRingerAndMoveToMissedState() {
-    val era = "aaa"
-    val callId = CallId.fromEra(era).longValue()
-    val now = System.currentTimeMillis()
-    SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
-      groupRecipientId = groupRecipientId,
-      sender = harness.others[1],
-      timestamp = now,
-      peekGroupCallEraId = "aaa",
-      peekJoinedUuids = emptyList(),
-      isCallFull = false
-    )
-
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      callId,
-      groupRecipientId,
-      harness.others[1],
-      System.currentTimeMillis(),
-      CallManager.RingUpdate.EXPIRED_REQUEST
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.MISSED, call?.event)
-    assertEquals(harness.others[1], call?.ringerRecipient)
-  }
-
-  @Test
-  fun givenARingingCallEvent_whenRingExpired_thenISetRingerAndMoveToMissedState() {
-    val era = "aaa"
-    val callId = CallId.fromEra(era).longValue()
-    val now = System.currentTimeMillis()
-    SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
-      groupRecipientId = groupRecipientId,
-      sender = harness.others[1],
-      timestamp = now,
-      peekGroupCallEraId = "aaa",
-      peekJoinedUuids = emptyList(),
-      isCallFull = false
-    )
-
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      callId,
-      groupRecipientId,
-      harness.others[1],
-      System.currentTimeMillis(),
-      CallManager.RingUpdate.REQUESTED
-    )
-
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      callId,
-      groupRecipientId,
-      harness.others[1],
-      System.currentTimeMillis(),
-      CallManager.RingUpdate.EXPIRED_REQUEST
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.MISSED, call?.event)
-    assertEquals(harness.others[1], call?.ringerRecipient)
-  }
-
-  @Test
-  fun givenAJoinedCallEvent_whenRingIsCancelledBecauseUserIsBusyLocally_thenIMoveToAcceptedState() {
-    val era = "aaa"
-    val callId = CallId.fromEra(era).longValue()
-    val now = System.currentTimeMillis()
-    SignalDatabase.calls.insertAcceptedGroupCall(
-      callId,
-      groupRecipientId,
-      CallTable.Direction.INCOMING,
-      now
-    )
-
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      callId,
-      groupRecipientId,
-      harness.others[1],
-      System.currentTimeMillis(),
-      CallManager.RingUpdate.BUSY_LOCALLY
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.ACCEPTED, call?.event)
-  }
-
-  @Test
-  fun givenAJoinedCallEvent_whenRingIsCancelledBecauseUserIsBusyOnAnotherDevice_thenIMoveToAcceptedState() {
-    val era = "aaa"
-    val callId = CallId.fromEra(era).longValue()
-    val now = System.currentTimeMillis()
-    SignalDatabase.calls.insertAcceptedGroupCall(
-      callId,
-      groupRecipientId,
-      CallTable.Direction.INCOMING,
-      now
-    )
-
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      callId,
-      groupRecipientId,
-      harness.others[1],
-      System.currentTimeMillis(),
-      CallManager.RingUpdate.BUSY_ON_ANOTHER_DEVICE
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.ACCEPTED, call?.event)
-  }
-
-  @Test
-  fun givenARingingCallEvent_whenRingCancelledBecauseUserIsBusyLocally_thenIMoveToMissedState() {
-    val era = "aaa"
-    val callId = CallId.fromEra(era).longValue()
-    val now = System.currentTimeMillis()
-    SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
-      groupRecipientId = groupRecipientId,
-      sender = harness.others[1],
-      timestamp = now,
-      peekGroupCallEraId = "aaa",
-      peekJoinedUuids = emptyList(),
-      isCallFull = false
-    )
-
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      callId,
-      groupRecipientId,
-      harness.others[1],
-      System.currentTimeMillis(),
-      CallManager.RingUpdate.REQUESTED
-    )
-
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      callId,
-      groupRecipientId,
-      harness.others[1],
-      System.currentTimeMillis(),
-      CallManager.RingUpdate.BUSY_LOCALLY
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.MISSED, call?.event)
-  }
-
-  @Test
-  fun givenARingingCallEvent_whenRingCancelledBecauseUserIsBusyOnAnotherDevice_thenIMoveToMissedState() {
-    val era = "aaa"
-    val callId = CallId.fromEra(era).longValue()
-    val now = System.currentTimeMillis()
-    SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
-      groupRecipientId = groupRecipientId,
-      sender = harness.others[1],
-      timestamp = now,
-      peekGroupCallEraId = "aaa",
-      peekJoinedUuids = emptyList(),
-      isCallFull = false
-    )
-
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      callId,
-      groupRecipientId,
-      harness.others[1],
-      System.currentTimeMillis(),
-      CallManager.RingUpdate.REQUESTED
-    )
-
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      callId,
-      groupRecipientId,
-      harness.others[1],
-      System.currentTimeMillis(),
-      CallManager.RingUpdate.BUSY_ON_ANOTHER_DEVICE
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.MISSED, call?.event)
-  }
-
-  @Test
-  fun givenACallEvent_whenRingIsAcceptedOnAnotherDevice_thenIMoveToAcceptedState() {
-    val era = "aaa"
-    val callId = CallId.fromEra(era).longValue()
-    val now = System.currentTimeMillis()
-    SignalDatabase.calls.insertOrUpdateGroupCallFromLocalEvent(
-      groupRecipientId = groupRecipientId,
-      sender = harness.others[1],
-      timestamp = now,
-      peekGroupCallEraId = "aaa",
-      peekJoinedUuids = emptyList(),
-      isCallFull = false
-    )
-
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      callId,
-      groupRecipientId,
-      harness.others[1],
-      System.currentTimeMillis(),
-      CallManager.RingUpdate.ACCEPTED_ON_ANOTHER_DEVICE
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.ACCEPTED, call?.event)
-  }
-
-  @Test
-  fun givenARingingCallEvent_whenRingDeclinedOnAnotherDevice_thenIMoveToDeclinedState() {
-    val era = "aaa"
-    val callId = CallId.fromEra(era).longValue()
-
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      callId,
-      groupRecipientId,
-      harness.others[1],
-      System.currentTimeMillis(),
-      CallManager.RingUpdate.REQUESTED
-    )
-
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      callId,
-      groupRecipientId,
-      harness.others[1],
-      System.currentTimeMillis(),
-      CallManager.RingUpdate.DECLINED_ON_ANOTHER_DEVICE
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.DECLINED, call?.event)
-  }
-
-  @Test
-  fun givenAMissedCallEvent_whenRingDeclinedOnAnotherDevice_thenIMoveToDeclinedState() {
-    val era = "aaa"
-    val callId = CallId.fromEra(era).longValue()
-
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      callId,
-      groupRecipientId,
-      harness.others[1],
-      System.currentTimeMillis(),
-      CallManager.RingUpdate.EXPIRED_REQUEST
-    )
-
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      callId,
-      groupRecipientId,
-      harness.others[1],
-      System.currentTimeMillis(),
-      CallManager.RingUpdate.DECLINED_ON_ANOTHER_DEVICE
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.DECLINED, call?.event)
-  }
-
-  @Test
-  fun givenAnOutgoingRingCallEvent_whenRingDeclinedOnAnotherDevice_thenIDoNotChangeState() {
-    val era = "aaa"
-    val callId = CallId.fromEra(era).longValue()
-
-    SignalDatabase.calls.insertAcceptedGroupCall(
-      callId,
-      groupRecipientId,
-      CallTable.Direction.OUTGOING,
-      System.currentTimeMillis()
-    )
-
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      callId,
-      groupRecipientId,
-      harness.others[1],
-      System.currentTimeMillis(),
-      CallManager.RingUpdate.DECLINED_ON_ANOTHER_DEVICE
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.OUTGOING_RING, call?.event)
-  }
-
-  @Test
-  fun givenNoPriorEvent_whenRingRequested_thenICreateAnEventInTheRingingStateAndSetRinger() {
-    val callId = 1L
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      callId,
-      groupRecipientId,
-      harness.others[1],
-      System.currentTimeMillis(),
-      CallManager.RingUpdate.REQUESTED
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.RINGING, call?.event)
-    assertEquals(harness.others[1], call?.ringerRecipient)
-    assertNotNull(call?.messageId)
-  }
-
-  @Test
-  fun givenNoPriorEvent_whenRingExpired_thenICreateAnEventInTheMissedStateAndSetRinger() {
-    val callId = 1L
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      callId,
-      groupRecipientId,
-      harness.others[1],
-      System.currentTimeMillis(),
-      CallManager.RingUpdate.EXPIRED_REQUEST
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.MISSED, call?.event)
-    assertEquals(harness.others[1], call?.ringerRecipient)
-    assertNotNull(call?.messageId)
-  }
-
-  @Test
-  fun givenNoPriorEvent_whenRingCancelledByRinger_thenICreateAnEventInTheMissedStateAndSetRinger() {
-    val callId = 1L
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      callId,
-      groupRecipientId,
-      harness.others[1],
-      System.currentTimeMillis(),
-      CallManager.RingUpdate.CANCELLED_BY_RINGER
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.MISSED, call?.event)
-    assertEquals(harness.others[1], call?.ringerRecipient)
-    assertNotNull(call?.messageId)
-  }
-
-  @Test
-  fun givenNoPriorEvent_whenRingCancelledBecauseUserIsBusyLocally_thenICreateAnEventInTheMissedState() {
-    val callId = 1L
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      callId,
-      groupRecipientId,
-      harness.others[1],
-      System.currentTimeMillis(),
-      CallManager.RingUpdate.BUSY_LOCALLY
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.MISSED, call?.event)
-    assertNotNull(call?.messageId)
-  }
-
-  @Test
-  fun givenNoPriorEvent_whenRingCancelledBecauseUserIsBusyOnAnotherDevice_thenICreateAnEventInTheMissedState() {
-    val callId = 1L
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      callId,
-      groupRecipientId,
-      harness.others[1],
-      System.currentTimeMillis(),
-      CallManager.RingUpdate.BUSY_ON_ANOTHER_DEVICE
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.MISSED, call?.event)
-    assertNotNull(call?.messageId)
-  }
-
-  @Test
-  fun givenNoPriorEvent_whenRingAcceptedOnAnotherDevice_thenICreateAnEventInTheAcceptedState() {
-    val callId = 1L
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      callId,
-      groupRecipientId,
-      harness.others[1],
-      System.currentTimeMillis(),
-      CallManager.RingUpdate.ACCEPTED_ON_ANOTHER_DEVICE
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.ACCEPTED, call?.event)
-    assertNotNull(call?.messageId)
-  }
-
-  @Test
-  fun givenNoPriorEvent_whenRingDeclinedOnAnotherDevice_thenICreateAnEventInTheDeclinedState() {
-    val callId = 1L
-    SignalDatabase.calls.insertOrUpdateGroupCallFromRingState(
-      callId,
-      groupRecipientId,
-      harness.others[1],
-      System.currentTimeMillis(),
-      CallManager.RingUpdate.DECLINED_ON_ANOTHER_DEVICE
-    )
-
-    val call = SignalDatabase.calls.getCallById(callId, groupRecipientId)
-    assertNotNull(call)
-    assertEquals(CallTable.Event.DECLINED, call?.event)
-    assertNotNull(call?.messageId)
-  }
-
-  @Test
-  fun givenTwoCalls_whenIDeleteBeforeCallB_thenOnlyDeleteCallA() {
-    insertTwoCallEvents()
-
-    SignalDatabase.calls.deleteNonAdHocCallEventsOnOrBefore(1500)
-
-    val allCallEvents = SignalDatabase.calls.getCalls(0, 2, null, CallLogFilter.ALL)
-    assertEquals(1, allCallEvents.size)
-    assertEquals(2, allCallEvents.first().record.callId)
-  }
-
-  @Test
-  fun givenTwoCalls_whenIDeleteBeforeCallA_thenIDoNotDeleteAnyCalls() {
-    insertTwoCallEvents()
-
-    SignalDatabase.calls.deleteNonAdHocCallEventsOnOrBefore(500)
-
-    val allCallEvents = SignalDatabase.calls.getCalls(0, 2, null, CallLogFilter.ALL)
-    assertEquals(2, allCallEvents.size)
-    assertEquals(2, allCallEvents[0].record.callId)
-    assertEquals(1, allCallEvents[1].record.callId)
-  }
-
-  @Test
-  fun givenTwoCalls_whenIDeleteOnCallA_thenIOnlyDeleteCallA() {
-    insertTwoCallEvents()
-
-    SignalDatabase.calls.deleteNonAdHocCallEventsOnOrBefore(1000)
-
-    val allCallEvents = SignalDatabase.calls.getCalls(0, 2, null, CallLogFilter.ALL)
-    assertEquals(1, allCallEvents.size)
-    assertEquals(2, allCallEvents.first().record.callId)
-  }
-
-  @Test
-  fun givenTwoCalls_whenIDeleteOnCallB_thenIDeleteBothCalls() {
-    insertTwoCallEvents()
-
-    SignalDatabase.calls.deleteNonAdHocCallEventsOnOrBefore(2000)
-
-    val allCallEvents = SignalDatabase.calls.getCalls(0, 2, null, CallLogFilter.ALL)
-    assertEquals(0, allCallEvents.size)
-  }
-
-  @Test
-  fun givenTwoCalls_whenIDeleteAfterCallB_thenIDeleteBothCalls() {
-    insertTwoCallEvents()
-
-    SignalDatabase.calls.deleteNonAdHocCallEventsOnOrBefore(2500)
-
-    val allCallEvents = SignalDatabase.calls.getCalls(0, 2, null, CallLogFilter.ALL)
-    assertEquals(0, allCallEvents.size)
-  }
-
-  private fun insertTwoCallEvents() {
-    SignalDatabase.calls.insertAcceptedGroupCall(
-      1,
-      groupRecipientId,
-      CallTable.Direction.INCOMING,
-      1000
-    )
-
-    SignalDatabase.calls.insertAcceptedGroupCall(
-      2,
-      groupRecipientId,
-      CallTable.Direction.OUTGOING,
-      2000
-    )
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/database/DatabaseConsistencyTest.kt

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

app/src/androidTest/java/org/thoughtcrime/securesms/database/DatabaseObserverTest.kt

@@ -8,7 +8,7 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.signal.core.util.concurrent.SignalExecutors
-import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicInteger
@@ -26,7 +26,7 @@ class DatabaseObserverTest {
   @Before
   fun setup() {
     db = SignalDatabase.instance!!.signalWritableDatabase
-    observer = AppDependencies.databaseObserver
+    observer = ApplicationDependencies.getDatabaseObserver()
   }
 
   @Test

app/src/androidTest/java/org/thoughtcrime/securesms/database/DistributionListTablesTest.kt

@@ -7,7 +7,7 @@ import org.thoughtcrime.securesms.database.model.DistributionListId
 import org.thoughtcrime.securesms.database.model.DistributionListRecord
 import org.thoughtcrime.securesms.database.model.StoryType
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import org.whispersystems.signalservice.api.push.ACI
 import java.util.UUID
 
 class DistributionListTablesTest {
@@ -25,6 +25,15 @@ class DistributionListTablesTest {
     Assert.assertNotNull(id)
   }
 
+  @Test
+  fun createList_whenNameConflict_failToInsert() {
+    val id: DistributionListId? = distributionDatabase.createList("test", recipientList(1, 2, 3))
+    Assert.assertNotNull(id)
+
+    val id2: DistributionListId? = distributionDatabase.createList("test", recipientList(1, 2, 3))
+    Assert.assertNull(id2)
+  }
+
   @Test
   fun getList_returnCorrectList() {
     createRecipients(3)

app/src/androidTest/java/org/thoughtcrime/securesms/database/GroupTableTest.kt

@@ -2,11 +2,12 @@ package org.thoughtcrime.securesms.database
 
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotEquals
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.signal.core.util.deleteAll
+import org.signal.core.util.delete
 import org.signal.core.util.readToList
 import org.signal.core.util.requireLong
 import org.signal.core.util.withinTransaction
@@ -32,8 +33,8 @@ class GroupTableTest {
   fun setUp() {
     groupTable = SignalDatabase.groups
 
-    groupTable.writableDatabase.deleteAll(GroupTable.TABLE_NAME)
-    groupTable.writableDatabase.deleteAll(GroupTable.MembershipTable.TABLE_NAME)
+    groupTable.writableDatabase.delete(GroupTable.TABLE_NAME).run()
+    groupTable.writableDatabase.delete(GroupTable.MembershipTable.TABLE_NAME).run()
   }
 
   @Test
@@ -74,6 +75,21 @@ class GroupTableTest {
     assertEquals(2, groups.size)
   }
 
+  @Test
+  fun givenGroups_whenIQueryGroupsByMembership_thenIExpectBothGroups() {
+    insertPushGroup()
+    insertMmsGroup(members = listOf(harness.others[1]))
+
+    val groups = groupTable.queryGroupsByMembership(
+      setOf(harness.self.id, harness.others[1]),
+      includeInactive = false,
+      excludeV1 = false,
+      excludeMms = false
+    )
+
+    assertEquals(2, groups.cursor?.count)
+  }
+
   @Test
   fun givenGroups_whenIGetGroups_thenIExpectBothGroups() {
     insertPushGroup()
@@ -103,38 +119,7 @@ class GroupTableTest {
     }
 
     val groupRecord = groupTable.getGroup(v2Group).get()
-    assertEquals(setOf(harness.self.id, harness.others[1]), groupRecord.members.toSet())
-  }
-
-  @Test
-  fun givenAGroup_whenIRemapRecipientsThatHaveAConflict_thenIExpectDeletion() {
-    val v2Group = insertPushGroupWithSelfAndOthers(
-      listOf(
-        harness.others[0],
-        harness.others[1]
-      )
-    )
-
-    insertThread(v2Group)
-
-    groupTable.remapRecipient(harness.others[0], harness.others[1])
-
-    val groupRecord = groupTable.getGroup(v2Group).get()
-
-    assertEquals(setOf(harness.self.id, harness.others[1]), groupRecord.members.toSet())
-  }
-
-  @Test
-  fun givenAGroup_whenIRemapRecipients_thenIExpectRemap() {
-    val v2Group = insertPushGroup()
-    insertThread(v2Group)
-
-    val newId = harness.others[1]
-    groupTable.remapRecipient(harness.others[0], newId)
-
-    val groupRecord = groupTable.getGroup(v2Group).get()
-
-    assertEquals(setOf(harness.self.id, newId), groupRecord.members.toSet())
+    assertEquals(groupRecord.members.toSet(), setOf(harness.self.id, harness.others[1]))
   }
 
   @Test
@@ -165,10 +150,30 @@ class GroupTableTest {
     assertFalse(actual)
   }
 
+  @Test
+  fun givenAGroup_whenIUpdateMembers_thenIExpectUpdatedMembers() {
+    val v2Group = insertPushGroup()
+    groupTable.updateMembers(v2Group, listOf(harness.self.id, harness.others[1]))
+    val groupRecord = groupTable.getGroup(v2Group)
+
+    assertEquals(setOf(harness.self.id, harness.others[1]), groupRecord.get().members.toSet())
+  }
+
+  @Test
+  fun givenAnMmsGroup_whenIGetOrCreateMmsGroup_thenIExpectMyMmsGroup() {
+    val members: List<RecipientId> = listOf(harness.self.id, harness.others[0])
+    val other = insertMmsGroup(members + listOf(harness.others[1]))
+    val mmsGroup = insertMmsGroup(members)
+    val actual = groupTable.getOrCreateMmsGroupForMembers(members.toSet())
+
+    assertNotEquals(other, actual)
+    assertEquals(mmsGroup, actual)
+  }
+
   @Test
   fun givenTwoGroupsWithoutMembers_whenIQueryThem_thenIExpectEach() {
-    val g1 = insertPushGroup(members = emptyList())
-    val g2 = insertPushGroup(members = emptyList())
+    val g1 = insertPushGroup(listOf())
+    val g2 = insertPushGroup(listOf())
 
     val gr1 = groupTable.getGroup(g1)
     val gr2 = groupTable.getGroup(g2)
@@ -177,103 +182,6 @@ class GroupTableTest {
     assertEquals(g2, gr2.get().id)
   }
 
-  @Test
-  fun givenASharedActiveGroupWithoutAThread_whenISearchForRecipientsWithGroupsInCommon_thenIExpectThatGroup() {
-    val groupInCommon = insertPushGroup()
-    val expected = Recipient.resolved(harness.others[0])
-
-    SignalDatabase.recipients.setProfileSharing(expected.id, false)
-
-    SignalDatabase.recipients.queryGroupMemberContacts("Buddy")!!.use {
-      assertTrue(it.moveToFirst())
-      assertEquals(1, it.count)
-      assertEquals(expected.id.toLong(), it.requireLong(RecipientTable.ID))
-    }
-
-    val groups = groupTable.getPushGroupsContainingMember(expected.id)
-    assertEquals(1, groups.size)
-    assertEquals(groups[0].id, groupInCommon)
-  }
-
-  @Test
-  fun givenTwoGroupsWithANameThatSharesAToken_whenISearchForTheSharedToken_thenIExpectBothGroups() {
-    insertPushGroup("Group Alice")
-    insertPushGroup("Group Bob")
-
-    SignalDatabase.groups.queryGroupsByTitle(
-      inputQuery = "Group",
-      includeInactive = false,
-      excludeV1 = false,
-      excludeMms = false
-    ).use {
-      assertEquals(2, it.cursor?.count)
-
-      val firstGroup = it.getNext()
-      val secondGroup = it.getNext()
-
-      assertEquals("Group Alice", firstGroup?.title)
-      assertEquals("Group Bob", secondGroup?.title)
-    }
-  }
-
-  @Test
-  fun givenTwoGroupsWithANameThatSharesAToken_whenISearchForAnUnsharedToken_thenIExpectOneGroup() {
-    insertPushGroup("Group Alice")
-    insertPushGroup("Group Bob")
-
-    SignalDatabase.groups.queryGroupsByTitle(
-      inputQuery = "Alice",
-      includeInactive = false,
-      excludeV1 = false,
-      excludeMms = false
-    ).use {
-      assertEquals(1, it.cursor?.count)
-
-      val firstGroup = it.getNext()
-
-      assertEquals("Group Alice", firstGroup?.title)
-    }
-  }
-
-  @Test
-  fun givenAGroupWithThreeTokens_whenISearchForTheFirstAndLastToken_thenIExpectThatGroup() {
-    insertPushGroup("Group & Alice")
-
-    SignalDatabase.groups.queryGroupsByTitle(
-      inputQuery = "Group Alice",
-      includeInactive = false,
-      excludeV1 = false,
-      excludeMms = false
-    ).use {
-      assertEquals(1, it.cursor?.count)
-
-      val firstGroup = it.getNext()
-
-      assertEquals("Group & Alice", firstGroup?.title)
-    }
-  }
-
-  @Test
-  fun givenTwoGroupsWithSharedTokens_whenISearchForAnExactMatch_thenIExpectThatGroupFirst() {
-    insertPushGroup("Group Alice Bob")
-    insertPushGroup("Group Bob")
-
-    SignalDatabase.groups.queryGroupsByTitle(
-      inputQuery = "Group Bob",
-      includeInactive = false,
-      excludeV1 = false,
-      excludeMms = false
-    ).use {
-      assertEquals(2, it.cursor?.count)
-
-      val firstGroup = it.getNext()
-      val second = it.getNext()
-
-      assertEquals("Group Bob", firstGroup?.title)
-      assertEquals("Group Alice Bob", second?.title)
-    }
-  }
-
   private fun insertThread(groupId: GroupId): Long {
     val groupRecipient = SignalDatabase.recipients.getByGroupId(groupId).get()
     return SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(groupRecipient))
@@ -293,52 +201,25 @@ class GroupTableTest {
   }
 
   private fun insertPushGroup(
-    title: String = "Test Group",
     members: List<DecryptedMember> = listOf(
-      DecryptedMember.Builder()
-        .aciBytes(harness.self.requireAci().toByteString())
-        .joinedAtRevision(0)
-        .role(Member.Role.DEFAULT)
+      DecryptedMember.newBuilder()
+        .setUuid(harness.self.requireServiceId().toByteString())
+        .setJoinedAtRevision(0)
+        .setRole(Member.Role.DEFAULT)
         .build(),
-      DecryptedMember.Builder()
-        .aciBytes(Recipient.resolved(harness.others[0]).requireAci().toByteString())
-        .joinedAtRevision(0)
-        .role(Member.Role.DEFAULT)
+      DecryptedMember.newBuilder()
+        .setUuid(Recipient.resolved(harness.others[0]).requireServiceId().toByteString())
+        .setJoinedAtRevision(0)
+        .setRole(Member.Role.DEFAULT)
         .build()
     )
   ): GroupId {
     val groupMasterKey = GroupMasterKey(Random.nextBytes(GroupMasterKey.SIZE))
-    val decryptedGroupState = DecryptedGroup.Builder()
-      .title(title)
-      .members(members)
-      .revision(0)
+    val decryptedGroupState = DecryptedGroup.newBuilder()
+      .addAllMembers(members)
+      .setRevision(0)
       .build()
 
-    return groupTable.create(groupMasterKey, decryptedGroupState, null)!!
-  }
-
-  private fun insertPushGroupWithSelfAndOthers(others: List<RecipientId>): GroupId {
-    val groupMasterKey = GroupMasterKey(Random.nextBytes(GroupMasterKey.SIZE))
-
-    val selfMember: DecryptedMember = DecryptedMember.Builder()
-      .aciBytes(harness.self.requireAci().toByteString())
-      .joinedAtRevision(0)
-      .role(Member.Role.DEFAULT)
-      .build()
-
-    val otherMembers: List<DecryptedMember> = others.map { id ->
-      DecryptedMember.Builder()
-        .aciBytes(Recipient.resolved(id).requireAci().toByteString())
-        .joinedAtRevision(0)
-        .role(Member.Role.DEFAULT)
-        .build()
-    }
-
-    val decryptedGroupState = DecryptedGroup.Builder()
-      .members(listOf(selfMember) + otherMembers)
-      .revision(0)
-      .build()
-
-    return groupTable.create(groupMasterKey, decryptedGroupState, null)!!
+    return groupTable.create(groupMasterKey, decryptedGroupState)
   }
 }

app/src/androidTest/java/org/thoughtcrime/securesms/database/KyberPreKeyTableTest.kt

@@ -1,183 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.database
-
-import junit.framework.TestCase.assertEquals
-import junit.framework.TestCase.assertNotNull
-import junit.framework.TestCase.assertNull
-import org.junit.Test
-import org.signal.core.util.readToSingleObject
-import org.signal.core.util.requireLongOrNull
-import org.signal.core.util.select
-import org.signal.core.util.update
-import org.signal.libsignal.protocol.ecc.Curve
-import org.signal.libsignal.protocol.kem.KEMKeyPair
-import org.signal.libsignal.protocol.kem.KEMKeyType
-import org.signal.libsignal.protocol.state.KyberPreKeyRecord
-import org.whispersystems.signalservice.api.push.ServiceId
-import org.whispersystems.signalservice.api.push.ServiceId.ACI
-import org.whispersystems.signalservice.api.push.ServiceId.PNI
-import java.util.UUID
-
-class KyberPreKeyTableTest {
-
-  private val aci: ACI = ACI.from(UUID.randomUUID())
-  private val pni: PNI = PNI.from(UUID.randomUUID())
-
-  @Test
-  fun markAllStaleIfNecessary_onlyUpdatesMatchingAccountAndZeroValues() {
-    insertTestRecord(aci, id = 1)
-    insertTestRecord(aci, id = 2)
-    insertTestRecord(aci, id = 3, staleTime = 42)
-    insertTestRecord(pni, id = 4)
-
-    val now = System.currentTimeMillis()
-    SignalDatabase.kyberPreKeys.markAllStaleIfNecessary(aci, now)
-
-    assertEquals(now, getStaleTime(aci, 1))
-    assertEquals(now, getStaleTime(aci, 2))
-    assertEquals(42L, getStaleTime(aci, 3))
-    assertEquals(0L, getStaleTime(pni, 4))
-  }
-
-  @Test
-  fun deleteAllStaleBefore_deleteOldBeforeThreshold() {
-    insertTestRecord(aci, id = 1, staleTime = 10)
-    insertTestRecord(aci, id = 2, staleTime = 10)
-    insertTestRecord(aci, id = 3, staleTime = 10)
-    insertTestRecord(aci, id = 4, staleTime = 15)
-    insertTestRecord(aci, id = 5, staleTime = 0)
-
-    SignalDatabase.kyberPreKeys.deleteAllStaleBefore(aci, threshold = 11, minCount = 0)
-
-    assertNull(getStaleTime(aci, 1))
-    assertNull(getStaleTime(aci, 2))
-    assertNull(getStaleTime(aci, 3))
-    assertNotNull(getStaleTime(aci, 4))
-    assertNotNull(getStaleTime(aci, 5))
-  }
-
-  @Test
-  fun deleteAllStaleBefore_neverDeleteStaleOfZero() {
-    insertTestRecord(aci, id = 1, staleTime = 0)
-    insertTestRecord(aci, id = 2, staleTime = 0)
-    insertTestRecord(aci, id = 3, staleTime = 0)
-    insertTestRecord(aci, id = 4, staleTime = 0)
-    insertTestRecord(aci, id = 5, staleTime = 0)
-
-    SignalDatabase.kyberPreKeys.deleteAllStaleBefore(aci, threshold = 10, minCount = 1)
-
-    assertNotNull(getStaleTime(aci, 1))
-    assertNotNull(getStaleTime(aci, 2))
-    assertNotNull(getStaleTime(aci, 3))
-    assertNotNull(getStaleTime(aci, 4))
-    assertNotNull(getStaleTime(aci, 5))
-  }
-
-  @Test
-  fun deleteAllStaleBefore_respectMinCount() {
-    insertTestRecord(aci, id = 1, staleTime = 10)
-    insertTestRecord(aci, id = 2, staleTime = 10)
-    insertTestRecord(aci, id = 3, staleTime = 10)
-    insertTestRecord(aci, id = 4, staleTime = 10)
-    insertTestRecord(aci, id = 5, staleTime = 10)
-
-    SignalDatabase.kyberPreKeys.deleteAllStaleBefore(aci, threshold = 11, minCount = 3)
-
-    assertNull(getStaleTime(aci, 1))
-    assertNull(getStaleTime(aci, 2))
-    assertNotNull(getStaleTime(aci, 3))
-    assertNotNull(getStaleTime(aci, 4))
-    assertNotNull(getStaleTime(aci, 5))
-  }
-
-  @Test
-  fun deleteAllStaleBefore_respectAccount() {
-    insertTestRecord(aci, id = 1, staleTime = 10)
-    insertTestRecord(aci, id = 2, staleTime = 10)
-    insertTestRecord(aci, id = 3, staleTime = 10)
-
-    insertTestRecord(pni, id = 4, staleTime = 10)
-    insertTestRecord(pni, id = 5, staleTime = 10)
-
-    SignalDatabase.kyberPreKeys.deleteAllStaleBefore(aci, threshold = 11, minCount = 2)
-
-    assertNull(getStaleTime(aci, 1))
-    assertNotNull(getStaleTime(aci, 2))
-    assertNotNull(getStaleTime(aci, 3))
-    assertNotNull(getStaleTime(pni, 4))
-    assertNotNull(getStaleTime(pni, 5))
-  }
-
-  @Test
-  fun deleteAllStaleBefore_ignoreLastResortForMinCount() {
-    insertTestRecord(aci, id = 1, staleTime = 10)
-    insertTestRecord(aci, id = 2, staleTime = 10)
-    insertTestRecord(aci, id = 3, staleTime = 10)
-    insertTestRecord(aci, id = 4, staleTime = 10)
-    insertTestRecord(aci, id = 5, staleTime = 10, lastResort = true)
-
-    SignalDatabase.kyberPreKeys.deleteAllStaleBefore(aci, threshold = 11, minCount = 3)
-
-    assertNull(getStaleTime(aci, 1))
-    assertNotNull(getStaleTime(aci, 2))
-    assertNotNull(getStaleTime(aci, 3))
-    assertNotNull(getStaleTime(aci, 4))
-    assertNotNull(getStaleTime(aci, 5))
-  }
-
-  @Test
-  fun deleteAllStaleBefore_neverDeleteLastResort() {
-    insertTestRecord(aci, id = 1, staleTime = 10, lastResort = true)
-    insertTestRecord(aci, id = 2, staleTime = 10, lastResort = true)
-    insertTestRecord(aci, id = 3, staleTime = 10, lastResort = true)
-
-    SignalDatabase.oneTimePreKeys.deleteAllStaleBefore(aci, threshold = 11, minCount = 0)
-
-    assertNotNull(getStaleTime(aci, 1))
-    assertNotNull(getStaleTime(aci, 2))
-    assertNotNull(getStaleTime(aci, 3))
-  }
-
-  private fun insertTestRecord(account: ServiceId, id: Int, staleTime: Long = 0, lastResort: Boolean = false) {
-    val kemKeyPair = KEMKeyPair.generate(KEMKeyType.KYBER_1024)
-    SignalDatabase.kyberPreKeys.insert(
-      serviceId = account,
-      keyId = id,
-      record = KyberPreKeyRecord(
-        id,
-        System.currentTimeMillis(),
-        kemKeyPair,
-        Curve.generateKeyPair().privateKey.calculateSignature(kemKeyPair.publicKey.serialize())
-      ),
-      lastResort = lastResort
-    )
-
-    val count = SignalDatabase.rawDatabase
-      .update(KyberPreKeyTable.TABLE_NAME)
-      .values(KyberPreKeyTable.STALE_TIMESTAMP to staleTime)
-      .where("${KyberPreKeyTable.ACCOUNT_ID} = ? AND ${KyberPreKeyTable.KEY_ID} = $id", account.toAccountId())
-      .run()
-
-    assertEquals(1, count)
-  }
-
-  private fun getStaleTime(account: ServiceId, id: Int): Long? {
-    return SignalDatabase.rawDatabase
-      .select(KyberPreKeyTable.STALE_TIMESTAMP)
-      .from(KyberPreKeyTable.TABLE_NAME)
-      .where("${KyberPreKeyTable.ACCOUNT_ID} = ? AND ${KyberPreKeyTable.KEY_ID} = $id", account.toAccountId())
-      .run()
-      .readToSingleObject { it.requireLongOrNull(KyberPreKeyTable.STALE_TIMESTAMP) }
-  }
-
-  private fun ServiceId.toAccountId(): String {
-    return when (this) {
-      is ACI -> this.toString()
-      is PNI -> KyberPreKeyTable.PNI_ACCOUNT_ID
-    }
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/database/LogDatabaseTest.kt

@@ -1,288 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.database
-
-import org.junit.Test
-import org.signal.core.util.forEach
-import org.signal.core.util.requireLong
-import org.signal.core.util.requireNonNullString
-import org.signal.core.util.select
-import org.signal.core.util.updateAll
-import org.thoughtcrime.securesms.crash.CrashConfig
-import org.thoughtcrime.securesms.dependencies.AppDependencies
-import org.thoughtcrime.securesms.testing.assertIs
-
-class LogDatabaseTest {
-
-  private val db: LogDatabase = LogDatabase.getInstance(AppDependencies.application)
-
-  @Test
-  fun crashTable_matchesNamePattern() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Test")
-      ),
-      promptThreshold = currentTime
-    )
-
-    foundMatch assertIs true
-  }
-
-  @Test
-  fun crashTable_matchesMessagePattern() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(messagePattern = "Message")
-      ),
-      promptThreshold = currentTime
-    )
-
-    foundMatch assertIs true
-  }
-
-  @Test
-  fun crashTable_matchesStackTracePattern() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(stackTracePattern = "stack")
-      ),
-      promptThreshold = currentTime
-    )
-
-    foundMatch assertIs true
-  }
-
-  @Test
-  fun crashTable_matchesNameAndMessagePattern() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Test", messagePattern = "Message")
-      ),
-      promptThreshold = currentTime
-    )
-
-    foundMatch assertIs true
-  }
-
-  @Test
-  fun crashTable_matchesNameAndStackTracePattern() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Test", stackTracePattern = "stack")
-      ),
-      promptThreshold = currentTime
-    )
-
-    foundMatch assertIs true
-  }
-
-  @Test
-  fun crashTable_matchesNameAndMessageAndStackTracePattern() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Test", messagePattern = "Message", stackTracePattern = "stack")
-      ),
-      promptThreshold = currentTime
-    )
-
-    foundMatch assertIs true
-  }
-
-  @Test
-  fun crashTable_doesNotMatchNamePattern() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Blah")
-      ),
-      promptThreshold = currentTime
-    )
-
-    foundMatch assertIs false
-  }
-
-  @Test
-  fun crashTable_matchesNameButNotMessagePattern() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Test", messagePattern = "Blah")
-      ),
-      promptThreshold = currentTime
-    )
-
-    foundMatch assertIs false
-  }
-
-  @Test
-  fun crashTable_matchesNameButNotStackTracePattern() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Test", stackTracePattern = "Blah")
-      ),
-      promptThreshold = currentTime
-    )
-
-    foundMatch assertIs false
-  }
-
-  @Test
-  fun crashTable_matchesNamePatternButPromptedTooRecently() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    db.writableDatabase
-      .updateAll(LogDatabase.CrashTable.TABLE_NAME)
-      .values(LogDatabase.CrashTable.LAST_PROMPTED_AT to currentTime)
-      .run()
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Test")
-      ),
-      promptThreshold = currentTime - 100
-    )
-
-    foundMatch assertIs false
-  }
-
-  @Test
-  fun crashTable_noMatches() {
-    val currentTime = System.currentTimeMillis()
-
-    val foundMatch = db.crashes.anyMatch(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Test")
-      ),
-      promptThreshold = currentTime - 100
-    )
-
-    foundMatch assertIs false
-  }
-
-  @Test
-  fun crashTable_updatesLastPromptTime() {
-    val currentTime = System.currentTimeMillis()
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "TestName",
-      message = "Test Message",
-      stackTrace = "test\nstack\ntrace"
-    )
-
-    db.crashes.saveCrash(
-      createdAt = currentTime,
-      name = "XXX",
-      message = "XXX",
-      stackTrace = "XXX"
-    )
-
-    db.crashes.markAsPrompted(
-      listOf(
-        CrashConfig.CrashPattern(namePattern = "Test")
-      ),
-      promptedAt = currentTime
-    )
-
-    db.writableDatabase
-      .select(LogDatabase.CrashTable.NAME, LogDatabase.CrashTable.LAST_PROMPTED_AT)
-      .from(LogDatabase.CrashTable.TABLE_NAME)
-      .run()
-      .forEach {
-        if (it.requireNonNullString(LogDatabase.CrashTable.NAME) == "TestName") {
-          it.requireLong(LogDatabase.CrashTable.LAST_PROMPTED_AT) assertIs currentTime
-        } else {
-          it.requireLong(LogDatabase.CrashTable.LAST_PROMPTED_AT) assertIs 0
-        }
-      }
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/database/MessageTableTest_gifts.kt

@@ -10,8 +10,9 @@ import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.whispersystems.signalservice.api.push.ServiceId.ACI
-import org.whispersystems.signalservice.api.push.ServiceId.PNI
+import org.whispersystems.signalservice.api.push.ACI
+import org.whispersystems.signalservice.api.push.PNI
+import org.whispersystems.signalservice.api.push.ServiceId
 import java.util.UUID
 
 @Suppress("ClassName")
@@ -30,10 +31,10 @@ class MessageTableTest_gifts {
 
     mms.deleteAllThreads()
 
-    SignalStore.account.setAci(localAci)
-    SignalStore.account.setPni(localPni)
+    SignalStore.account().setAci(localAci)
+    SignalStore.account().setPni(localPni)
 
-    recipients = (0 until 5).map { SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID())) }
+    recipients = (0 until 5).map { SignalDatabase.recipients.getOrInsertFromServiceId(ServiceId.from(UUID.randomUUID())) }
   }
 
   @Test
@@ -48,7 +49,7 @@ class MessageTableTest_gifts {
     val messageId = MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
       sentTimeMillis = 1,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
     )
 
     val result = mms.setOutgoingGiftsRevealed(listOf(messageId))
@@ -62,7 +63,7 @@ class MessageTableTest_gifts {
     val messageId = MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
       sentTimeMillis = 1,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
     )
     mms.setOutgoingGiftsRevealed(listOf(messageId))
 
@@ -76,13 +77,13 @@ class MessageTableTest_gifts {
     val messageId = MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
       sentTimeMillis = 1,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
     )
 
     MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 2,
-      giftBadge = GiftBadge()
+      sentTimeMillis = 1,
+      giftBadge = GiftBadge.getDefaultInstance()
     )
 
     val result = mms.setOutgoingGiftsRevealed(listOf(messageId))
@@ -96,13 +97,13 @@ class MessageTableTest_gifts {
     val messageId = MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
       sentTimeMillis = 1,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
     )
 
     val messageId2 = MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 2,
-      giftBadge = GiftBadge()
+      sentTimeMillis = 1,
+      giftBadge = GiftBadge.getDefaultInstance()
     )
 
     val result = mms.setOutgoingGiftsRevealed(listOf(messageId, messageId2))
@@ -115,18 +116,18 @@ class MessageTableTest_gifts {
     val messageId = MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
       sentTimeMillis = 1,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
     )
 
     val messageId2 = MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 2,
-      giftBadge = GiftBadge()
+      sentTimeMillis = 1,
+      giftBadge = GiftBadge.getDefaultInstance()
     )
 
     MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 3,
+      sentTimeMillis = 1,
       giftBadge = null
     )
 
@@ -140,18 +141,18 @@ class MessageTableTest_gifts {
     val messageId = MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
       sentTimeMillis = 1,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
     )
 
     val messageId2 = MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 2,
-      giftBadge = GiftBadge()
+      sentTimeMillis = 1,
+      giftBadge = GiftBadge.getDefaultInstance()
     )
 
     val messageId3 = MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 3,
+      sentTimeMillis = 1,
       giftBadge = null
     )
 
@@ -165,18 +166,18 @@ class MessageTableTest_gifts {
     MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
       sentTimeMillis = 1,
-      giftBadge = GiftBadge()
+      giftBadge = GiftBadge.getDefaultInstance()
     )
 
     MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 2,
-      giftBadge = GiftBadge()
+      sentTimeMillis = 1,
+      giftBadge = GiftBadge.getDefaultInstance()
     )
 
     val messageId3 = MmsHelper.insert(
       recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 3,
+      sentTimeMillis = 1,
       giftBadge = null
     )
 

app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsHelper.kt

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.database
 import org.thoughtcrime.securesms.database.model.ParentStoryId
 import org.thoughtcrime.securesms.database.model.StoryType
 import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
-import org.thoughtcrime.securesms.mms.IncomingMessage
+import org.thoughtcrime.securesms.mms.IncomingMediaMessage
 import org.thoughtcrime.securesms.mms.OutgoingMessage
 import org.thoughtcrime.securesms.recipients.Recipient
 import java.util.Optional
@@ -17,6 +17,7 @@ object MmsHelper {
     recipient: Recipient = Recipient.UNKNOWN,
     body: String = "body",
     sentTimeMillis: Long = System.currentTimeMillis(),
+    subscriptionId: Int = -1,
     expiresIn: Long = 0,
     viewOnce: Boolean = false,
     distributionType: Int = ThreadTable.DistributionTypes.DEFAULT,
@@ -31,6 +32,7 @@ object MmsHelper {
       recipient = recipient,
       body = body,
       timestamp = sentTimeMillis,
+      subscriptionId = subscriptionId,
       expiresIn = expiresIn,
       viewOnce = viewOnce,
       distributionType = distributionType,
@@ -55,9 +57,9 @@ object MmsHelper {
   }
 
   fun insert(
-    message: IncomingMessage,
+    message: IncomingMediaMessage,
     threadId: Long
   ): Optional<MessageTable.InsertResult> {
-    return SignalDatabase.messages.insertMessageInbox(message, threadId)
+    return SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, threadId)
   }
 }

app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsTableTest_stories.kt

@@ -13,11 +13,12 @@ import org.thoughtcrime.securesms.database.model.DistributionListId
 import org.thoughtcrime.securesms.database.model.ParentStoryId
 import org.thoughtcrime.securesms.database.model.StoryType
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.mms.IncomingMessage
+import org.thoughtcrime.securesms.mms.IncomingMediaMessage
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.whispersystems.signalservice.api.push.ServiceId.ACI
-import org.whispersystems.signalservice.api.push.ServiceId.PNI
+import org.whispersystems.signalservice.api.push.ACI
+import org.whispersystems.signalservice.api.push.PNI
+import org.whispersystems.signalservice.api.push.ServiceId
 import java.util.UUID
 import java.util.concurrent.TimeUnit
 
@@ -40,14 +41,14 @@ class MmsTableTest_stories {
 
     mms.deleteAllThreads()
 
-    SignalStore.account.setAci(localAci)
-    SignalStore.account.setPni(localPni)
+    SignalStore.account().setAci(localAci)
+    SignalStore.account().setPni(localPni)
 
     myStory = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromDistributionListId(DistributionListId.MY_STORY))
-    recipients = (0 until 5).map { SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID())) }
+    recipients = (0 until 5).map { SignalDatabase.recipients.getOrInsertFromServiceId(ServiceId.from(UUID.randomUUID())) }
     releaseChannelRecipient = Recipient.resolved(SignalDatabase.recipients.insertReleaseChannelRecipient())
 
-    SignalStore.releaseChannel.setReleaseChannelRecipientId(releaseChannelRecipient.id)
+    SignalStore.releaseChannelValues().setReleaseChannelRecipientId(releaseChannelRecipient.id)
   }
 
   @Test
@@ -73,8 +74,7 @@ class MmsTableTest_stories {
     )
 
     MmsHelper.insert(
-      IncomingMessage(
-        type = MessageType.NORMAL,
+      IncomingMediaMessage(
         from = sender,
         sentTimeMillis = 2,
         serverTimeMillis = 2,
@@ -96,8 +96,7 @@ class MmsTableTest_stories {
     // GIVEN
     val sender = recipients[0]
     val messageId = MmsHelper.insert(
-      IncomingMessage(
-        type = MessageType.NORMAL,
+      IncomingMediaMessage(
         from = sender,
         sentTimeMillis = 2,
         serverTimeMillis = 2,
@@ -124,13 +123,12 @@ class MmsTableTest_stories {
     // GIVEN
     val messageIds = recipients.take(5).map {
       MmsHelper.insert(
-        IncomingMessage(
-          type = MessageType.NORMAL,
+        IncomingMediaMessage(
           from = it,
           sentTimeMillis = 2,
           serverTimeMillis = 2,
           receivedTimeMillis = 2,
-          storyType = StoryType.STORY_WITH_REPLIES
+          storyType = StoryType.STORY_WITH_REPLIES,
         ),
         -1L
       ).get().messageId
@@ -157,13 +155,12 @@ class MmsTableTest_stories {
     val unviewedIds: List<Long> = (0 until 5).map {
       Thread.sleep(5)
       MmsHelper.insert(
-        IncomingMessage(
-          type = MessageType.NORMAL,
+        IncomingMediaMessage(
           from = recipients[it],
           sentTimeMillis = System.currentTimeMillis(),
           serverTimeMillis = 2,
           receivedTimeMillis = 2,
-          storyType = StoryType.STORY_WITH_REPLIES
+          storyType = StoryType.STORY_WITH_REPLIES,
         ),
         -1L
       ).get().messageId
@@ -172,13 +169,12 @@ class MmsTableTest_stories {
     val viewedIds: List<Long> = (0 until 5).map {
       Thread.sleep(5)
       MmsHelper.insert(
-        IncomingMessage(
-          type = MessageType.NORMAL,
+        IncomingMediaMessage(
           from = recipients[it],
           sentTimeMillis = System.currentTimeMillis(),
           serverTimeMillis = 2,
           receivedTimeMillis = 2,
-          storyType = StoryType.STORY_WITH_REPLIES
+          storyType = StoryType.STORY_WITH_REPLIES,
         ),
         -1L
       ).get().messageId
@@ -218,13 +214,12 @@ class MmsTableTest_stories {
   fun givenNoOutgoingStories_whenICheckIsOutgoingStoryAlreadyInDatabase_thenIExpectFalse() {
     // GIVEN
     MmsHelper.insert(
-      IncomingMessage(
-        type = MessageType.NORMAL,
+      IncomingMediaMessage(
         from = recipients[0],
         sentTimeMillis = 200,
         serverTimeMillis = 2,
         receivedTimeMillis = 2,
-        storyType = StoryType.STORY_WITH_REPLIES
+        storyType = StoryType.STORY_WITH_REPLIES,
       ),
       -1L
     )
@@ -258,7 +253,8 @@ class MmsTableTest_stories {
     val groupStoryId = MmsHelper.insert(
       recipient = myStory,
       sentTimeMillis = 200,
-      storyType = StoryType.STORY_WITH_REPLIES
+      storyType = StoryType.STORY_WITH_REPLIES,
+      threadId = -1L
     )
 
     // WHEN
@@ -323,19 +319,19 @@ class MmsTableTest_stories {
     val groupStoryId = MmsHelper.insert(
       recipient = myStory,
       sentTimeMillis = 200,
-      storyType = StoryType.STORY_WITH_REPLIES
+      storyType = StoryType.STORY_WITH_REPLIES,
+      threadId = -1L
     )
 
     MmsHelper.insert(
-      IncomingMessage(
-        type = MessageType.NORMAL,
+      IncomingMediaMessage(
         from = myStory.id,
         sentTimeMillis = 201,
         serverTimeMillis = 201,
         receivedTimeMillis = 202,
         parentStoryId = ParentStoryId.GroupReply(groupStoryId)
       ),
-      SignalDatabase.threads.getOrCreateThreadIdFor(myStory, ThreadTable.DistributionTypes.DEFAULT)
+      -1
     )
 
     // WHEN

app/src/androidTest/java/org/thoughtcrime/securesms/database/NameCollisionTablesTest.kt

@@ -1,239 +0,0 @@
-/*
- * Copyright 2024 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.database
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.storageservice.protos.groups.Member
-import org.signal.storageservice.protos.groups.local.DecryptedMember
-import org.thoughtcrime.securesms.mms.IncomingMessage
-import org.thoughtcrime.securesms.profiles.ProfileName
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.testing.GroupTestingUtils
-import org.thoughtcrime.securesms.testing.SignalActivityRule
-import org.thoughtcrime.securesms.testing.assertIsSize
-
-@RunWith(AndroidJUnit4::class)
-class NameCollisionTablesTest {
-
-  @get:Rule
-  val harness = SignalActivityRule(createGroup = true)
-
-  private lateinit var alice: RecipientId
-  private lateinit var bob: RecipientId
-  private lateinit var charlie: RecipientId
-
-  @Before
-  fun setUp() {
-    alice = setUpRecipient(harness.others[0])
-    bob = setUpRecipient(harness.others[1])
-    charlie = setUpRecipient(harness.others[2])
-  }
-
-  @Test
-  fun givenAUserWithAThreadIdButNoConflicts_whenIGetCollisionsForThreadRecipient_thenIExpectNoCollisions() {
-    val threadRecipientId = alice
-    SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(threadRecipientId))
-    val actual = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(threadRecipientId)
-
-    actual assertIsSize 0
-  }
-
-  @Test
-  fun givenTwoUsers_whenOneChangesTheirProfileNameToMatchTheOther_thenIExpectANameCollision() {
-    setProfileName(alice, ProfileName.fromParts("Alice", "Android"))
-    setProfileName(bob, ProfileName.fromParts("Bob", "Android"))
-    setProfileName(alice, ProfileName.fromParts("Bob", "Android"))
-
-    val actualAlice = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(alice)
-    val actualBob = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(bob)
-
-    actualAlice assertIsSize 2
-    actualBob assertIsSize 2
-  }
-
-  @Test
-  fun givenTwoUsersWithANameCollisions_whenOneChangesToADifferentName_thenIExpectNoNameCollisions() {
-    setProfileName(alice, ProfileName.fromParts("Bob", "Android"))
-    setProfileName(bob, ProfileName.fromParts("Bob", "Android"))
-    setProfileName(alice, ProfileName.fromParts("Alice", "Android"))
-
-    val actualAlice = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(alice)
-    val actualBob = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(bob)
-
-    actualAlice assertIsSize 0
-    actualBob assertIsSize 0
-  }
-
-  @Test
-  fun givenThreeUsersWithANameCollisions_whenOneChangesToADifferentName_thenIExpectTwoNameCollisions() {
-    setProfileName(alice, ProfileName.fromParts("Bob", "Android"))
-    setProfileName(bob, ProfileName.fromParts("Bob", "Android"))
-    setProfileName(charlie, ProfileName.fromParts("Bob", "Android"))
-    setProfileName(alice, ProfileName.fromParts("Alice", "Android"))
-
-    val actualAlice = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(alice)
-    val actualBob = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(bob)
-    val actualCharlie = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(charlie)
-
-    actualAlice assertIsSize 0
-    actualBob assertIsSize 2
-    actualCharlie assertIsSize 2
-  }
-
-  @Test
-  fun givenTwoUsersWithADismissedNameCollision_whenOneChangesToADifferentNameAndBack_thenIExpectANameCollision() {
-    setProfileName(alice, ProfileName.fromParts("Bob", "Android"))
-    setProfileName(bob, ProfileName.fromParts("Bob", "Android"))
-    SignalDatabase.nameCollisions.markCollisionsForThreadRecipientDismissed(alice)
-
-    setProfileName(alice, ProfileName.fromParts("Alice", "Android"))
-    setProfileName(alice, ProfileName.fromParts("Bob", "Android"))
-
-    val actualAlice = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(alice)
-
-    actualAlice assertIsSize 2
-  }
-
-  @Test
-  fun givenADismissedNameCollisionForAlice_whenIGetNameCollisionsForAlice_thenIExpectNoNameCollisions() {
-    setProfileName(alice, ProfileName.fromParts("Bob", "Android"))
-    setProfileName(bob, ProfileName.fromParts("Bob", "Android"))
-    SignalDatabase.nameCollisions.markCollisionsForThreadRecipientDismissed(alice)
-
-    val actualCollisions = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(alice)
-
-    actualCollisions assertIsSize 0
-  }
-
-  @Test
-  fun givenADismissedNameCollisionForAliceThatIUpdate_whenIGetNameCollisionsForAlice_thenIExpectNoNameCollisions() {
-    SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(alice))
-
-    setProfileName(alice, ProfileName.fromParts("Bob", "Android"))
-    setProfileName(bob, ProfileName.fromParts("Bob", "Android"))
-    SignalDatabase.nameCollisions.markCollisionsForThreadRecipientDismissed(alice)
-    setProfileName(bob, ProfileName.fromParts("Bob", "Android"))
-
-    val actualCollisions = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(alice)
-
-    actualCollisions assertIsSize 0
-  }
-
-  @Test
-  fun givenADismissedNameCollisionForAlice_whenIGetNameCollisionsForBob_thenIExpectANameCollisionWithTwoEntries() {
-    SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(alice))
-
-    setProfileName(alice, ProfileName.fromParts("Bob", "Android"))
-    setProfileName(bob, ProfileName.fromParts("Bob", "Android"))
-    SignalDatabase.nameCollisions.markCollisionsForThreadRecipientDismissed(alice)
-
-    val actualCollisions = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(bob)
-
-    actualCollisions assertIsSize 2
-  }
-
-  @Test
-  fun givenAGroupWithAliceAndBob_whenIInsertNameChangeMessageForAlice_thenIExpectAGroupNameCollision() {
-    val alice = Recipient.resolved(alice)
-    val bob = Recipient.resolved(bob)
-    val info = createGroup()
-
-    setProfileName(alice.id, ProfileName.fromParts("Bob", "Android"))
-    setProfileName(bob.id, ProfileName.fromParts("Bob", "Android"))
-
-    SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(info.recipientId))
-    SignalDatabase.messages.insertProfileNameChangeMessages(alice, "Bob Android", "Alice Android")
-
-    val collisions = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(info.recipientId)
-
-    collisions assertIsSize 2
-  }
-
-  @Test
-  fun givenAGroupWithAliceAndBobWithDismissedCollision_whenIInsertNameChangeMessageForAlice_thenIExpectAGroupNameCollision() {
-    val alice = Recipient.resolved(alice)
-    val bob = Recipient.resolved(bob)
-    val info = createGroup()
-
-    setProfileName(alice.id, ProfileName.fromParts("Bob", "Android"))
-    setProfileName(bob.id, ProfileName.fromParts("Bob", "Android"))
-
-    SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(info.recipientId))
-    SignalDatabase.messages.insertProfileNameChangeMessages(alice, "Bob Android", "Alice Android")
-    SignalDatabase.nameCollisions.markCollisionsForThreadRecipientDismissed(info.recipientId)
-    SignalDatabase.messages.insertProfileNameChangeMessages(alice, "Bob Android", "Alice Android")
-
-    val collisions = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(info.recipientId)
-
-    collisions assertIsSize 0
-  }
-
-  @Test
-  fun givenAGroupWithAliceAndBob_whenIInsertNameChangeMessageForAliceWithMismatch_thenIExpectNoGroupNameCollision() {
-    val alice = Recipient.resolved(alice)
-    val bob = Recipient.resolved(bob)
-    val info = createGroup()
-
-    setProfileName(alice.id, ProfileName.fromParts("Alice", "Android"))
-    setProfileName(bob.id, ProfileName.fromParts("Bob", "Android"))
-
-    SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(info.recipientId))
-    SignalDatabase.messages.insertProfileNameChangeMessages(alice, "Alice Android", "Bob Android")
-
-    val collisions = SignalDatabase.nameCollisions.getCollisionsForThreadRecipientId(info.recipientId)
-
-    collisions assertIsSize 0
-  }
-
-  private fun setUpRecipient(recipientId: RecipientId): RecipientId {
-    SignalDatabase.recipients.setProfileSharing(recipientId, false)
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipientId, false)
-
-    MmsHelper.insert(
-      threadId = threadId,
-      message = IncomingMessage(
-        type = MessageType.NORMAL,
-        from = recipientId,
-        groupId = null,
-        body = "hi",
-        sentTimeMillis = 100L,
-        receivedTimeMillis = 200L,
-        serverTimeMillis = 100L,
-        isUnidentified = true
-      )
-    )
-
-    return recipientId
-  }
-
-  private fun setProfileName(recipientId: RecipientId, name: ProfileName) {
-    SignalDatabase.recipients.setProfileName(recipientId, name)
-    SignalDatabase.nameCollisions.handleIndividualNameCollision(recipientId)
-  }
-
-  private fun createGroup(): GroupTestingUtils.TestGroupInfo {
-    return GroupTestingUtils.insertGroup(
-      revision = 0,
-      DecryptedMember(
-        aciBytes = harness.self.requireAci().toByteString(),
-        role = Member.Role.ADMINISTRATOR
-      ),
-      DecryptedMember(
-        aciBytes = Recipient.resolved(alice).requireAci().toByteString(),
-        role = Member.Role.ADMINISTRATOR
-      ),
-      DecryptedMember(
-        aciBytes = Recipient.resolved(bob).requireAci().toByteString(),
-        role = Member.Role.ADMINISTRATOR
-      )
-    )
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/database/OneTimePreKeyTableTest.kt

@@ -1,144 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.database
-
-import junit.framework.TestCase.assertEquals
-import junit.framework.TestCase.assertNotNull
-import junit.framework.TestCase.assertNull
-import org.junit.Test
-import org.signal.core.util.readToSingleObject
-import org.signal.core.util.requireLongOrNull
-import org.signal.core.util.select
-import org.signal.core.util.update
-import org.signal.libsignal.protocol.ecc.Curve
-import org.signal.libsignal.protocol.state.PreKeyRecord
-import org.whispersystems.signalservice.api.push.ServiceId
-import org.whispersystems.signalservice.api.push.ServiceId.ACI
-import org.whispersystems.signalservice.api.push.ServiceId.PNI
-import java.util.UUID
-
-class OneTimePreKeyTableTest {
-
-  private val aci: ACI = ACI.from(UUID.randomUUID())
-  private val pni: PNI = PNI.from(UUID.randomUUID())
-
-  @Test
-  fun markAllStaleIfNecessary_onlyUpdatesMatchingAccountAndZeroValues() {
-    insertTestRecord(aci, id = 1)
-    insertTestRecord(aci, id = 2)
-    insertTestRecord(aci, id = 3, staleTime = 42)
-    insertTestRecord(pni, id = 4)
-
-    val now = System.currentTimeMillis()
-    SignalDatabase.oneTimePreKeys.markAllStaleIfNecessary(aci, now)
-
-    assertEquals(now, getStaleTime(aci, 1))
-    assertEquals(now, getStaleTime(aci, 2))
-    assertEquals(42L, getStaleTime(aci, 3))
-    assertEquals(0L, getStaleTime(pni, 4))
-  }
-
-  @Test
-  fun deleteAllStaleBefore_deleteOldBeforeThreshold() {
-    insertTestRecord(aci, id = 1, staleTime = 10)
-    insertTestRecord(aci, id = 2, staleTime = 10)
-    insertTestRecord(aci, id = 3, staleTime = 10)
-    insertTestRecord(aci, id = 4, staleTime = 15)
-    insertTestRecord(aci, id = 5, staleTime = 0)
-
-    SignalDatabase.oneTimePreKeys.deleteAllStaleBefore(aci, threshold = 11, minCount = 0)
-
-    assertNull(getStaleTime(aci, 1))
-    assertNull(getStaleTime(aci, 2))
-    assertNull(getStaleTime(aci, 3))
-    assertNotNull(getStaleTime(aci, 4))
-    assertNotNull(getStaleTime(aci, 5))
-  }
-
-  @Test
-  fun deleteAllStaleBefore_neverDeleteStaleOfZero() {
-    insertTestRecord(aci, id = 1, staleTime = 0)
-    insertTestRecord(aci, id = 2, staleTime = 0)
-    insertTestRecord(aci, id = 3, staleTime = 0)
-    insertTestRecord(aci, id = 4, staleTime = 0)
-    insertTestRecord(aci, id = 5, staleTime = 0)
-
-    SignalDatabase.oneTimePreKeys.deleteAllStaleBefore(aci, threshold = 10, minCount = 0)
-
-    assertNotNull(getStaleTime(aci, 1))
-    assertNotNull(getStaleTime(aci, 2))
-    assertNotNull(getStaleTime(aci, 3))
-    assertNotNull(getStaleTime(aci, 4))
-    assertNotNull(getStaleTime(aci, 5))
-  }
-
-  @Test
-  fun deleteAllStaleBefore_respectMinCount() {
-    insertTestRecord(aci, id = 1, staleTime = 10)
-    insertTestRecord(aci, id = 2, staleTime = 10)
-    insertTestRecord(aci, id = 3, staleTime = 10)
-    insertTestRecord(aci, id = 4, staleTime = 10)
-    insertTestRecord(aci, id = 5, staleTime = 10)
-
-    SignalDatabase.oneTimePreKeys.deleteAllStaleBefore(aci, threshold = 11, minCount = 3)
-
-    assertNull(getStaleTime(aci, 1))
-    assertNull(getStaleTime(aci, 2))
-    assertNotNull(getStaleTime(aci, 3))
-    assertNotNull(getStaleTime(aci, 4))
-    assertNotNull(getStaleTime(aci, 5))
-  }
-
-  @Test
-  fun deleteAllStaleBefore_respectAccount() {
-    insertTestRecord(aci, id = 1, staleTime = 10)
-    insertTestRecord(aci, id = 2, staleTime = 10)
-    insertTestRecord(aci, id = 3, staleTime = 10)
-
-    insertTestRecord(pni, id = 4, staleTime = 10)
-    insertTestRecord(pni, id = 5, staleTime = 10)
-
-    SignalDatabase.oneTimePreKeys.deleteAllStaleBefore(aci, threshold = 11, minCount = 2)
-
-    assertNull(getStaleTime(aci, 1))
-    assertNotNull(getStaleTime(aci, 2))
-    assertNotNull(getStaleTime(aci, 3))
-    assertNotNull(getStaleTime(pni, 4))
-    assertNotNull(getStaleTime(pni, 5))
-  }
-
-  private fun insertTestRecord(account: ServiceId, id: Int, staleTime: Long = 0) {
-    SignalDatabase.oneTimePreKeys.insert(
-      serviceId = account,
-      keyId = id,
-      record = PreKeyRecord(id, Curve.generateKeyPair())
-    )
-
-    val count = SignalDatabase.rawDatabase
-      .update(OneTimePreKeyTable.TABLE_NAME)
-      .values(OneTimePreKeyTable.STALE_TIMESTAMP to staleTime)
-      .where("${OneTimePreKeyTable.ACCOUNT_ID} = ? AND ${OneTimePreKeyTable.KEY_ID} = $id", account.toAccountId())
-      .run()
-
-    assertEquals(1, count)
-  }
-
-  private fun getStaleTime(account: ServiceId, id: Int): Long? {
-    return SignalDatabase.rawDatabase
-      .select(OneTimePreKeyTable.STALE_TIMESTAMP)
-      .from(OneTimePreKeyTable.TABLE_NAME)
-      .where("${OneTimePreKeyTable.ACCOUNT_ID} = ? AND ${OneTimePreKeyTable.KEY_ID} = $id", account.toAccountId())
-      .run()
-      .readToSingleObject { it.requireLongOrNull(OneTimePreKeyTable.STALE_TIMESTAMP) }
-  }
-
-  private fun ServiceId.toAccountId(): String {
-    return when (this) {
-      is ACI -> this.toString()
-      is PNI -> OneTimePreKeyTable.PNI_ACCOUNT_ID
-    }
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest.kt

@@ -11,9 +11,6 @@ import org.signal.core.util.CursorUtil
 import org.thoughtcrime.securesms.profiles.ProfileName
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.testing.SignalActivityRule
-import org.whispersystems.signalservice.api.push.ServiceId.ACI
-import org.whispersystems.signalservice.api.push.ServiceId.PNI
-import java.util.UUID
 
 @RunWith(AndroidJUnit4::class)
 class RecipientTableTest {
@@ -22,14 +19,14 @@ class RecipientTableTest {
   val harness = SignalActivityRule()
 
   @Test
-  fun givenAHiddenRecipient_whenIQueryAllContacts_thenIExpectHiddenToBeReturned() {
+  fun givenAHiddenRecipient_whenIQueryAllContacts_thenIDoNotExpectHiddenToBeReturned() {
     val hiddenRecipient = harness.others[0]
     SignalDatabase.recipients.setProfileName(hiddenRecipient, ProfileName.fromParts("Hidden", "Person"))
     SignalDatabase.recipients.markHidden(hiddenRecipient)
 
     val results = SignalDatabase.recipients.queryAllContacts("Hidden")!!
 
-    assertEquals(1, results.count)
+    assertEquals(0, results.count)
   }
 
   @Test
@@ -57,7 +54,7 @@ class RecipientTableTest {
     SignalDatabase.recipients.setProfileName(hiddenRecipient, ProfileName.fromParts("Hidden", "Person"))
     SignalDatabase.recipients.markHidden(hiddenRecipient)
 
-    val results = SignalDatabase.recipients.querySignalContacts(RecipientTable.ContactSearchQuery("Hidden", false))!!
+    val results = SignalDatabase.recipients.querySignalContacts("Hidden", false)!!
 
     assertEquals(0, results.count)
   }
@@ -128,7 +125,7 @@ class RecipientTableTest {
     SignalDatabase.recipients.setProfileName(blockedRecipient, ProfileName.fromParts("Blocked", "Person"))
     SignalDatabase.recipients.setBlocked(blockedRecipient, true)
 
-    val results = SignalDatabase.recipients.querySignalContacts(RecipientTable.ContactSearchQuery("Blocked", false))!!
+    val results = SignalDatabase.recipients.querySignalContacts("Blocked", false)!!
 
     assertEquals(0, results.count)
   }
@@ -162,43 +159,4 @@ class RecipientTableTest {
     assertNotEquals(0, results.size)
     assertFalse(blockedRecipient in results)
   }
-
-  @Test
-  fun givenARecipientWithPniAndAci_whenIMarkItUnregistered_thenIExpectItToBeSplit() {
-    val mainId = SignalDatabase.recipients.getAndPossiblyMerge(ACI_A, PNI_A, E164_A)
-
-    SignalDatabase.recipients.markUnregistered(mainId)
-
-    val byAci: RecipientId = SignalDatabase.recipients.getByAci(ACI_A).get()
-
-    val byE164: RecipientId = SignalDatabase.recipients.getByE164(E164_A).get()
-    val byPni: RecipientId = SignalDatabase.recipients.getByPni(PNI_A).get()
-
-    assertEquals(mainId, byAci)
-    assertEquals(byE164, byPni)
-    assertNotEquals(byAci, byE164)
-  }
-
-  @Test
-  fun givenARecipientWithPniAndAci_whenISplitItForStorageSync_thenIExpectItToBeSplit() {
-    val mainId = SignalDatabase.recipients.getAndPossiblyMerge(ACI_A, PNI_A, E164_A)
-    val mainRecord = SignalDatabase.recipients.getRecord(mainId)
-
-    SignalDatabase.recipients.splitForStorageSyncIfNecessary(mainRecord.aci!!)
-
-    val byAci: RecipientId = SignalDatabase.recipients.getByAci(ACI_A).get()
-
-    val byE164: RecipientId = SignalDatabase.recipients.getByE164(E164_A).get()
-    val byPni: RecipientId = SignalDatabase.recipients.getByPni(PNI_A).get()
-
-    assertEquals(mainId, byAci)
-    assertEquals(byE164, byPni)
-    assertNotEquals(byAci, byE164)
-  }
-
-  companion object {
-    val ACI_A = ACI.from(UUID.fromString("aaaa0000-5a76-47fa-a98a-7e72c948a82e"))
-    val PNI_A = PNI.from(UUID.fromString("aaaa1111-c960-4f6c-8385-671ad2ffb999"))
-    const val E164_A = "+12222222222"
-  }
 }

app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_applyStorageSyncContactUpdate.kt

@@ -1,60 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.database
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.thoughtcrime.securesms.dependencies.AppDependencies
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.storage.StorageRecordUpdate
-import org.thoughtcrime.securesms.storage.StorageSyncModels
-import org.thoughtcrime.securesms.testing.SignalActivityRule
-import org.thoughtcrime.securesms.testing.assertIs
-import org.thoughtcrime.securesms.util.MessageTableTestUtils
-import org.whispersystems.signalservice.api.storage.SignalContactRecord
-import org.whispersystems.signalservice.internal.storage.protos.ContactRecord
-
-@Suppress("ClassName")
-@RunWith(AndroidJUnit4::class)
-class RecipientTableTest_applyStorageSyncContactUpdate {
-  @get:Rule
-  val harness = SignalActivityRule()
-
-  @Test
-  fun insertMessageOnVerifiedToDefault() {
-    // GIVEN
-    val identities = AppDependencies.protocolStore.aci().identities()
-    val other = Recipient.resolved(harness.others[0])
-
-    MmsHelper.insert(recipient = other)
-    identities.setVerified(other.id, harness.othersKeys[0].publicKey, IdentityTable.VerifiedStatus.VERIFIED)
-
-    val oldRecord: SignalContactRecord = StorageSyncModels.localToRemoteRecord(SignalDatabase.recipients.getRecordForSync(harness.others[0])!!).contact.get()
-
-    val newProto = oldRecord
-      .toProto()
-      .newBuilder()
-      .identityState(ContactRecord.IdentityState.DEFAULT)
-      .build()
-    val newRecord = SignalContactRecord(oldRecord.id, newProto)
-
-    val update = StorageRecordUpdate<SignalContactRecord>(oldRecord, newRecord)
-
-    // WHEN
-    val oldVerifiedStatus: IdentityTable.VerifiedStatus = identities.getIdentityRecord(other.id).get().verifiedStatus
-    SignalDatabase.recipients.applyStorageSyncContactUpdate(update)
-    val newVerifiedStatus: IdentityTable.VerifiedStatus = identities.getIdentityRecord(other.id).get().verifiedStatus
-
-    // THEN
-    oldVerifiedStatus assertIs IdentityTable.VerifiedStatus.VERIFIED
-    newVerifiedStatus assertIs IdentityTable.VerifiedStatus.DEFAULT
-
-    val messages = MessageTableTestUtils.getMessages(SignalDatabase.threads.getThreadIdFor(other.id)!!)
-    messages.first().isIdentityDefault assertIs true
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_getAndPossiblyMerge.kt

@@ -7,18 +7,13 @@ import org.hamcrest.MatcherAssert
 import org.hamcrest.Matchers
 import org.junit.Assert
 import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.signal.core.util.Base64
 import org.signal.core.util.SqlUtil
-import org.signal.core.util.exists
-import org.signal.core.util.orNull
-import org.signal.core.util.readToSingleBoolean
 import org.signal.core.util.requireLong
 import org.signal.core.util.requireNonNullString
 import org.signal.core.util.select
@@ -34,91 +29,33 @@ import org.thoughtcrime.securesms.database.model.MessageRecord
 import org.thoughtcrime.securesms.database.model.ReactionRecord
 import org.thoughtcrime.securesms.database.model.databaseprotos.SessionSwitchoverEvent
 import org.thoughtcrime.securesms.database.model.databaseprotos.ThreadMergeEvent
-import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.mms.IncomingMessage
+import org.thoughtcrime.securesms.mms.IncomingMediaMessage
 import org.thoughtcrime.securesms.notifications.profiles.NotificationProfile
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.util.Util
-import org.whispersystems.signalservice.api.push.ServiceId.ACI
-import org.whispersystems.signalservice.api.push.ServiceId.PNI
+import org.thoughtcrime.securesms.sms.IncomingEncryptedMessage
+import org.thoughtcrime.securesms.sms.IncomingTextMessage
+import org.thoughtcrime.securesms.util.Base64
+import org.thoughtcrime.securesms.util.FeatureFlags
+import org.thoughtcrime.securesms.util.FeatureFlagsAccessor
+import org.whispersystems.signalservice.api.push.ACI
+import org.whispersystems.signalservice.api.push.PNI
+import org.whispersystems.signalservice.api.push.ServiceId
 import java.util.Optional
 import java.util.UUID
 
-@Suppress("ClassName")
 @RunWith(AndroidJUnit4::class)
 class RecipientTableTest_getAndPossiblyMerge {
 
   @Before
   fun setup() {
-    SignalStore.account.setE164(E164_SELF)
-    SignalStore.account.setAci(ACI_SELF)
-    SignalStore.account.setPni(PNI_SELF)
-  }
-
-  @Test
-  fun allNonMergeTests() {
-    test("e164-only insert") {
-      val id = process(E164_A, null, null)
-      expect(E164_A, null, null)
-
-      val record = SignalDatabase.recipients.getRecord(id)
-      assertEquals(RecipientTable.RegisteredState.UNKNOWN, record.registered)
-    }
-
-    test("pni-only insert") {
-      val id = process(null, PNI_A, null)
-      expect(null, PNI_A, null)
-
-      val record = SignalDatabase.recipients.getRecord(id)
-      assertEquals(RecipientTable.RegisteredState.REGISTERED, record.registered)
-    }
-
-    test("aci-only insert") {
-      val id = process(null, null, ACI_A)
-      expect(null, null, ACI_A)
-
-      val record = SignalDatabase.recipients.getRecord(id)
-      assertEquals(RecipientTable.RegisteredState.REGISTERED, record.registered)
-    }
-
-    test("e164+pni insert") {
-      val id = process(E164_A, PNI_A, null)
-      expect(E164_A, PNI_A, null)
-
-      val record = SignalDatabase.recipients.getRecord(id)
-      assertEquals(RecipientTable.RegisteredState.REGISTERED, record.registered)
-    }
-
-    test("e164+aci insert") {
-      val id = process(E164_A, null, ACI_A)
-      expect(E164_A, null, ACI_A)
-
-      val record = SignalDatabase.recipients.getRecord(id)
-      assertEquals(RecipientTable.RegisteredState.REGISTERED, record.registered)
-    }
-
-    test("e164+pni+aci insert") {
-      val id = process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-
-      val record = SignalDatabase.recipients.getRecord(id)
-      assertEquals(RecipientTable.RegisteredState.REGISTERED, record.registered)
-    }
-
-    test("e164+pni+aci insert, pni verified") {
-      val id = process(E164_A, PNI_A, ACI_A, pniVerified = true)
-      expect(E164_A, PNI_A, ACI_A)
-      expectPniVerified()
-
-      val record = SignalDatabase.recipients.getRecord(id)
-      assertEquals(RecipientTable.RegisteredState.REGISTERED, record.registered)
-
-      process(E164_A, PNI_A, ACI_A, pniVerified = false)
-      expectPniVerified()
-    }
+    SignalStore.account().setE164(E164_SELF)
+    SignalStore.account().setAci(ACI_SELF)
+    SignalStore.account().setPni(PNI_SELF)
+    FeatureFlagsAccessor.forceValue(FeatureFlags.PHONE_NUMBER_PRIVACY, true)
   }
 
   @Test
@@ -128,9 +65,9 @@ class RecipientTableTest_getAndPossiblyMerge {
       expect(E164_A, null, null)
     }
 
-    test("no match, pni-only") {
-      process(null, PNI_A, null)
-      expect(null, PNI_A, null)
+    test("no match, e164 and pni") {
+      process(E164_A, PNI_A, null)
+      expect(E164_A, PNI_A, null)
     }
 
     test("no match, aci-only") {
@@ -138,11 +75,6 @@ class RecipientTableTest_getAndPossiblyMerge {
       expect(null, null, ACI_A)
     }
 
-    test("no match, e164 and pni") {
-      process(E164_A, PNI_A, null)
-      expect(E164_A, PNI_A, null)
-    }
-
     test("no match, e164 and aci") {
       process(E164_A, null, ACI_A)
       expect(E164_A, null, ACI_A)
@@ -152,31 +84,6 @@ class RecipientTableTest_getAndPossiblyMerge {
       process(null, null, null)
     }
 
-    test("pni matches, pni+aci provided, no pni session") {
-      given(E164_A, PNI_A, null)
-      process(null, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-
-      expectNoSessionSwitchoverEvent()
-    }
-
-    test("pni matches, pni+aci provided, pni session") {
-      given(E164_A, PNI_A, null, pniSession = true)
-      process(null, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-
-      expectSessionSwitchoverEvent(E164_A)
-    }
-
-    test("pni matches, pni+aci provided, pni session, pni-verified") {
-      given(E164_A, PNI_A, null, pniSession = true)
-      process(null, PNI_A, ACI_A, pniVerified = true)
-      expect(E164_A, PNI_A, ACI_A)
-
-      expectNoSessionSwitchoverEvent()
-      expectPniVerified()
-    }
-
     test("no match, all fields") {
       process(E164_A, PNI_A, ACI_A)
       expect(E164_A, PNI_A, ACI_A)
@@ -232,14 +139,6 @@ class RecipientTableTest_getAndPossiblyMerge {
       expectSessionSwitchoverEvent(E164_A)
     }
 
-    test("e164 and pni matches, all provided, new aci, existing pni session, pni-verified") {
-      given(E164_A, PNI_A, null, pniSession = true)
-      process(E164_A, PNI_A, ACI_A, pniVerified = true)
-      expect(E164_A, PNI_A, ACI_A)
-
-      expectPniVerified()
-    }
-
     test("e164 and aci matches, all provided, new pni") {
       given(E164_A, null, ACI_A)
       process(E164_A, PNI_A, ACI_A)
@@ -321,12 +220,6 @@ class RecipientTableTest_getAndPossiblyMerge {
       expectSessionSwitchoverEvent(E164_A)
     }
 
-    test("e164 matches, e164 + aci provided") {
-      given(E164_A, PNI_A, null)
-      process(E164_A, null, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-
     test("pni matches, all provided, no pni session") {
       given(null, PNI_A, null)
       process(E164_A, PNI_A, ACI_A)
@@ -382,26 +275,6 @@ class RecipientTableTest_getAndPossiblyMerge {
       expectChangeNumberEvent()
     }
 
-    test("steal, pni is changed") {
-      given(E164_A, PNI_B, ACI_A)
-      given(E164_B, PNI_A, null)
-
-      process(E164_A, PNI_A, null)
-
-      expect(E164_A, PNI_A, ACI_A)
-      expect(E164_B, null, null)
-    }
-
-    test("steal, pni is changed, aci left behind") {
-      given(E164_B, PNI_A, ACI_A)
-      given(E164_A, PNI_B, null)
-
-      process(E164_A, PNI_A, null)
-
-      expect(E164_B, null, ACI_A)
-      expect(E164_A, PNI_A, null)
-    }
-
     test("steal, e164+pni & e164+pni, no aci provided, no pni session") {
       given(E164_A, PNI_B, null)
       given(E164_B, PNI_A, null)
@@ -446,7 +319,7 @@ class RecipientTableTest_getAndPossiblyMerge {
       expectChangeNumberEvent()
     }
 
-    test("steal, e164 & pni+e164, no aci provided, pni session exists") {
+    test("steal, e164 & pni+e164, no aci provided") {
       val id1 = given(E164_A, null, null)
       val id2 = given(E164_B, PNI_A, null, pniSession = true)
 
@@ -459,98 +332,6 @@ class RecipientTableTest_getAndPossiblyMerge {
       expectSessionSwitchoverEvent(id2, E164_B)
     }
 
-    test("steal, e164 & pni+e164, no aci provided, no pni session") {
-      given(E164_A, null, null)
-      given(E164_B, PNI_A, null)
-
-      process(E164_A, PNI_A, null)
-
-      expect(E164_A, PNI_A, null)
-      expect(E164_B, null, null)
-    }
-
-    test("steal, e164+pni+aci & e164+aci, no pni provided, change number") {
-      given(E164_A, PNI_A, ACI_A)
-      given(E164_B, null, ACI_B)
-
-      process(E164_A, null, ACI_B)
-
-      expect(null, PNI_A, ACI_A)
-      expect(E164_A, null, ACI_B)
-
-      expectChangeNumberEvent()
-    }
-
-    test("steal, e164+aci & aci, no pni provided, existing aci session") {
-      given(E164_A, null, ACI_A, aciSession = true)
-      given(null, null, ACI_B)
-
-      process(E164_A, null, ACI_B)
-
-      expect(null, null, ACI_A)
-      expect(E164_A, null, ACI_B)
-
-      expectNoSessionSwitchoverEvent()
-    }
-
-    test("steal, e164+pni+aci & aci, no pni provided, existing aci session") {
-      given(E164_A, PNI_A, ACI_A, aciSession = true)
-      given(null, null, ACI_B)
-
-      process(E164_A, null, ACI_B)
-
-      expect(null, PNI_A, ACI_A)
-      expect(E164_A, null, ACI_B)
-
-      expectNoSessionSwitchoverEvent()
-    }
-
-    test("steal, e164+pni+aci & aci, no pni provided, existing pni session") {
-      given(E164_A, PNI_A, ACI_A, pniSession = true)
-      given(null, null, ACI_B)
-
-      process(E164_A, null, ACI_B)
-
-      expect(null, PNI_A, ACI_A)
-      expect(E164_A, null, ACI_B)
-
-      expectNoSessionSwitchoverEvent()
-    }
-
-    test("steal, e164+pni & aci, no pni provided, no pni session") {
-      given(E164_A, PNI_A, null)
-      given(null, null, ACI_A)
-
-      process(E164_A, null, ACI_A)
-
-      expect(null, PNI_A, null)
-      expect(E164_A, null, ACI_A)
-    }
-
-    test("steal, e164+pni & aci, no pni provided, pni session") {
-      given(E164_A, PNI_A, null, pniSession = true)
-      given(null, null, ACI_A)
-
-      process(E164_A, null, ACI_A)
-
-      expect(null, PNI_A, null)
-      expect(E164_A, null, ACI_A)
-
-      expectNoSessionSwitchoverEvent()
-    }
-
-    test("steal, e164+pni+aci * pni+aci, all provided, aci sessions but not pni sessions, no SSE expected") {
-      given(E164_A, PNI_A, ACI_A, createThread = true, aciSession = true, pniSession = false)
-      given(null, PNI_B, ACI_B, createThread = false, aciSession = true, pniSession = false)
-
-      process(E164_A, PNI_B, ACI_A)
-
-      expect(E164_A, PNI_B, ACI_A)
-      expect(null, null, ACI_B)
-
-      expectNoSessionSwitchoverEvent()
-    }
-
     test("merge, e164 & pni & aci, all provided") {
       given(E164_A, null, null)
       given(null, PNI_A, null)
@@ -565,32 +346,6 @@ class RecipientTableTest_getAndPossiblyMerge {
       expectThreadMergeEvent(E164_A)
     }
 
-    test("merge, e164 & pni & aci, all provided, no threads") {
-      given(E164_A, null, null, createThread = false)
-      given(null, PNI_A, null, createThread = false)
-      given(null, null, ACI_A, createThread = false)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expectDeleted()
-      expectDeleted()
-      expect(E164_A, PNI_A, ACI_A)
-    }
-
-    test("merge, e164 & pni & aci, all provided, pni session no threads") {
-      given(E164_A, null, null, createThread = false)
-      given(null, PNI_A, null, createThread = true, pniSession = true)
-      given(null, null, ACI_A, createThread = false)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expectDeleted()
-      expectDeleted()
-      expect(E164_A, PNI_A, ACI_A)
-
-      expectSessionSwitchoverEvent(E164_A)
-    }
-
     test("merge, e164 & pni, no aci provided") {
       given(E164_A, null, null)
       given(null, PNI_A, null)
@@ -627,7 +382,7 @@ class RecipientTableTest_getAndPossiblyMerge {
       expectThreadMergeEvent("")
     }
 
-    test("merge, e164 & pni, aci provided, existing pni session, thread merge shadows") {
+    test("merge, e164 & pni, aci provided, existing pni session") {
       given(E164_A, null, null)
       given(null, PNI_A, null, pniSession = true)
 
@@ -637,17 +392,6 @@ class RecipientTableTest_getAndPossiblyMerge {
       expectDeleted()
 
       expectThreadMergeEvent("")
-    }
-
-    test("merge, e164 & pni, aci provided, existing pni session, no thread merge") {
-      given(E164_A, null, null, createThread = true)
-      given(null, PNI_A, null, createThread = false, pniSession = true)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expect(E164_A, PNI_A, ACI_A)
-      expectDeleted()
-
       expectSessionSwitchoverEvent(E164_A)
     }
 
@@ -663,7 +407,7 @@ class RecipientTableTest_getAndPossiblyMerge {
       expectThreadMergeEvent("")
     }
 
-    test("merge, e164+pni & aci, no pni session") {
+    test("merge, e164+pni & aci") {
       given(E164_A, PNI_A, null)
       given(null, null, ACI_A)
 
@@ -675,55 +419,6 @@ class RecipientTableTest_getAndPossiblyMerge {
       expectThreadMergeEvent(E164_A)
     }
 
-    test("merge, e164+pni & aci, pni session, thread merge shadows SSE") {
-      given(E164_A, PNI_A, null, pniSession = true)
-      given(null, null, ACI_A)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expectDeleted()
-      expect(E164_A, PNI_A, ACI_A)
-
-      expectThreadMergeEvent(E164_A)
-    }
-
-    test("merge, e164+pni & aci, pni session, no thread merge") {
-      given(E164_A, PNI_A, null, createThread = true, pniSession = true)
-      given(null, null, ACI_A, createThread = false)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expectDeleted()
-      expect(E164_A, PNI_A, ACI_A)
-
-      expectSessionSwitchoverEvent(E164_A)
-    }
-
-    test("merge, e164+pni & aci, pni session, no thread merge, pni verified") {
-      given(E164_A, PNI_A, null, createThread = true, pniSession = true)
-      given(null, null, ACI_A, createThread = false)
-
-      process(E164_A, PNI_A, ACI_A, pniVerified = true)
-
-      expectDeleted()
-      expect(E164_A, PNI_A, ACI_A)
-
-      expectPniVerified()
-    }
-
-    test("merge, e164+pni & aci, pni session, pni verified") {
-      given(E164_A, PNI_A, null, pniSession = true)
-      given(null, null, ACI_A)
-
-      process(E164_A, PNI_A, ACI_A, pniVerified = true)
-
-      expectDeleted()
-      expect(E164_A, PNI_A, ACI_A)
-
-      expectThreadMergeEvent(E164_A)
-      expectPniVerified()
-    }
-
     test("merge, e164+pni & e164+pni+aci, change number") {
       given(E164_A, PNI_A, null)
       given(E164_B, PNI_B, ACI_A)
@@ -776,41 +471,6 @@ class RecipientTableTest_getAndPossiblyMerge {
       expectThreadMergeEvent(E164_A)
     }
 
-    test("merge, e164+pni & e164+aci, pni+aci provided, change number") {
-      given(E164_A, PNI_A, null)
-      given(E164_B, null, ACI_A)
-
-      process(null, PNI_A, ACI_A)
-
-      expect(E164_A, PNI_A, ACI_A)
-
-      expectThreadMergeEvent(E164_A)
-      expectChangeNumberEvent()
-    }
-
-    test("merge, e164 + pni reassigned, aci abandoned") {
-      given(E164_A, PNI_A, ACI_A)
-      given(E164_B, PNI_B, ACI_B)
-
-      process(E164_A, PNI_A, ACI_B)
-
-      expect(null, null, ACI_A)
-      expect(E164_A, PNI_A, ACI_B)
-
-      expectChangeNumberEvent()
-    }
-
-    test("merge, e164 follows pni+aci") {
-      given(E164_A, PNI_A, null)
-      given(null, null, ACI_A)
-
-      process(null, PNI_A, ACI_A, pniVerified = true)
-
-      expect(E164_A, PNI_A, ACI_A)
-      expectThreadMergeEvent(E164_A)
-      expectPniVerified()
-    }
-
     test("local user, local e164 and aci provided, changeSelf=false, leave e164 alone") {
       given(E164_SELF, null, ACI_SELF)
       given(null, null, ACI_A)
@@ -832,22 +492,6 @@ class RecipientTableTest_getAndPossiblyMerge {
       process(E164_A, null, ACI_SELF, changeSelf = true)
       expect(E164_A, null, ACI_SELF)
     }
-
-    test("local user, local e164+aci provided, changeSelf=false, leave pni alone") {
-      given(E164_SELF, PNI_SELF, ACI_SELF)
-
-      process(E164_SELF, PNI_A, ACI_A)
-
-      expect(E164_SELF, PNI_SELF, ACI_SELF)
-    }
-
-    test("local user, local e164+aci provided, changeSelf=false, leave pni alone") {
-      given(E164_SELF, PNI_A, ACI_SELF)
-
-      process(E164_SELF, PNI_SELF, ACI_A)
-
-      expect(E164_SELF, PNI_A, ACI_SELF)
-    }
   }
 
   /**
@@ -864,9 +508,9 @@ class RecipientTableTest_getAndPossiblyMerge {
     val smsId2: Long = SignalDatabase.messages.insertMessageInbox(smsMessage(sender = recipientIdE164, time = 1, body = "1")).get().messageId
     val smsId3: Long = SignalDatabase.messages.insertMessageInbox(smsMessage(sender = recipientIdAci, time = 2, body = "2")).get().messageId
 
-    val mmsId1: Long = SignalDatabase.messages.insertMessageInbox(mmsMessage(sender = recipientIdAci, time = 3, body = "3"), -1).get().messageId
-    val mmsId2: Long = SignalDatabase.messages.insertMessageInbox(mmsMessage(sender = recipientIdE164, time = 4, body = "4"), -1).get().messageId
-    val mmsId3: Long = SignalDatabase.messages.insertMessageInbox(mmsMessage(sender = recipientIdAci, time = 5, body = "5"), -1).get().messageId
+    val mmsId1: Long = SignalDatabase.messages.insertSecureDecryptedMessageInbox(mmsMessage(sender = recipientIdAci, time = 3, body = "3"), -1).get().messageId
+    val mmsId2: Long = SignalDatabase.messages.insertSecureDecryptedMessageInbox(mmsMessage(sender = recipientIdE164, time = 4, body = "4"), -1).get().messageId
+    val mmsId3: Long = SignalDatabase.messages.insertSecureDecryptedMessageInbox(mmsMessage(sender = recipientIdAci, time = 5, body = "5"), -1).get().messageId
 
     val threadIdAci: Long = SignalDatabase.threads.getThreadIdFor(recipientIdAci)!!
     val threadIdE164: Long = SignalDatabase.threads.getThreadIdFor(recipientIdE164)!!
@@ -913,17 +557,17 @@ class RecipientTableTest_getAndPossiblyMerge {
 
     // Thread validation
     assertEquals(threadIdAci, retrievedThreadId)
-    assertNull(SignalDatabase.threads.getThreadIdFor(recipientIdE164))
-    assertNull(SignalDatabase.threads.getThreadRecord(threadIdE164))
+    Assert.assertNull(SignalDatabase.threads.getThreadIdFor(recipientIdE164))
+    Assert.assertNull(SignalDatabase.threads.getThreadRecord(threadIdE164))
 
     // SMS validation
     val sms1: MessageRecord = SignalDatabase.messages.getMessageRecord(smsId1)!!
     val sms2: MessageRecord = SignalDatabase.messages.getMessageRecord(smsId2)!!
     val sms3: MessageRecord = SignalDatabase.messages.getMessageRecord(smsId3)!!
 
-    assertEquals(retrievedId, sms1.fromRecipient.id)
-    assertEquals(retrievedId, sms2.fromRecipient.id)
-    assertEquals(retrievedId, sms3.fromRecipient.id)
+    assertEquals(retrievedId, sms1.recipient.id)
+    assertEquals(retrievedId, sms2.recipient.id)
+    assertEquals(retrievedId, sms3.recipient.id)
 
     assertEquals(retrievedThreadId, sms1.threadId)
     assertEquals(retrievedThreadId, sms2.threadId)
@@ -934,9 +578,9 @@ class RecipientTableTest_getAndPossiblyMerge {
     val mms2: MessageRecord = SignalDatabase.messages.getMessageRecord(mmsId2)!!
     val mms3: MessageRecord = SignalDatabase.messages.getMessageRecord(mmsId3)!!
 
-    assertEquals(retrievedId, mms1.fromRecipient.id)
-    assertEquals(retrievedId, mms2.fromRecipient.id)
-    assertEquals(retrievedId, mms3.fromRecipient.id)
+    assertEquals(retrievedId, mms1.recipient.id)
+    assertEquals(retrievedId, mms2.recipient.id)
+    assertEquals(retrievedId, mms3.recipient.id)
 
     assertEquals(retrievedThreadId, mms1.threadId)
     assertEquals(retrievedThreadId, mms2.threadId)
@@ -958,10 +602,10 @@ class RecipientTableTest_getAndPossiblyMerge {
 
     // Identity validation
     assertEquals(identityKeyAci, SignalDatabase.identities.getIdentityStoreRecord(ACI_A.toString())!!.identityKey)
-    assertNull(SignalDatabase.identities.getIdentityStoreRecord(E164_A))
+    Assert.assertNull(SignalDatabase.identities.getIdentityStoreRecord(E164_A))
 
     // Session validation
-    assertNotNull(SignalDatabase.sessions.load(ACI_SELF, SignalProtocolAddress(ACI_A.toString(), 1)))
+    Assert.assertNotNull(SignalDatabase.sessions.load(ACI_SELF, SignalProtocolAddress(ACI_A.toString(), 1)))
 
     // Reaction validation
     val reactionsSms: List<ReactionRecord> = SignalDatabase.reactions.getReactions(MessageId(smsId1))
@@ -986,42 +630,18 @@ class RecipientTableTest_getAndPossiblyMerge {
     MatcherAssert.assertThat("Distribution list should have updated $recipientIdE164 to $recipientIdAci", updatedList.members, Matchers.containsInAnyOrder(recipientIdAci, recipientIdAciB))
   }
 
-  private fun smsMessage(sender: RecipientId, time: Long = 0, body: String = "", groupId: Optional<GroupId> = Optional.empty()): IncomingMessage {
-    return IncomingMessage(
-      type = MessageType.NORMAL,
-      from = sender,
-      sentTimeMillis = time,
-      serverTimeMillis = time,
-      receivedTimeMillis = time,
-      body = body,
-      groupId = groupId.orNull(),
-      isUnidentified = true
-    )
+  private fun smsMessage(sender: RecipientId, time: Long = 0, body: String = "", groupId: Optional<GroupId> = Optional.empty()): IncomingTextMessage {
+    return IncomingTextMessage(sender, 1, time, time, time, body, groupId, 0, true, null)
   }
 
-  private fun mmsMessage(sender: RecipientId, time: Long = 0, body: String = "", groupId: Optional<GroupId> = Optional.empty()): IncomingMessage {
-    return IncomingMessage(
-      type = MessageType.NORMAL,
-      from = sender,
-      groupId = groupId.orNull(),
-      body = body,
-      sentTimeMillis = time,
-      receivedTimeMillis = time,
-      serverTimeMillis = time,
-      isUnidentified = true
-    )
+  private fun mmsMessage(sender: RecipientId, time: Long = 0, body: String = "", groupId: Optional<GroupId> = Optional.empty()): IncomingMediaMessage {
+    return IncomingMediaMessage(sender, groupId, body, time, time, time, emptyList(), 0, 0, false, false, true, Optional.empty(), false, false)
   }
 
   private fun identityKey(value: Byte): IdentityKey {
-    val byteArray = ByteArray(32)
-    byteArray[0] = value
-    return identityKey(byteArray)
-  }
-
-  private fun identityKey(value: ByteArray): IdentityKey {
     val bytes = ByteArray(33)
     bytes[0] = 0x05
-    value.copyInto(bytes, 1)
+    bytes[1] = value
     return IdentityKey(bytes)
   }
 
@@ -1076,10 +696,6 @@ class RecipientTableTest_getAndPossiblyMerge {
       if (!test.sessionSwitchoverExpected) {
         test.expectNoSessionSwitchoverEvent()
       }
-
-      if (!test.pniVerifiedExpected) {
-        test.expectPniNotVerified()
-      }
     } catch (e: Throwable) {
       if (e.javaClass != exception) {
         val error = java.lang.AssertionError("[$name] ${e.message}")
@@ -1099,12 +715,11 @@ class RecipientTableTest_getAndPossiblyMerge {
     var changeNumberExpected = false
     var threadMergeExpected = false
     var sessionSwitchoverExpected = false
-    var pniVerifiedExpected = false
 
     init {
       // Need to delete these first to prevent foreign key crash
-      SignalDatabase.rawDatabase.execSQL("DELETE FROM ${DistributionListTables.ListTable.TABLE_NAME}")
-      SignalDatabase.rawDatabase.execSQL("DELETE FROM ${DistributionListTables.MembershipTable.TABLE_NAME}")
+      SignalDatabase.rawDatabase.execSQL("DELETE FROM distribution_list")
+      SignalDatabase.rawDatabase.execSQL("DELETE FROM distribution_list_member")
 
       SqlUtil.getAllTables(SignalDatabase.rawDatabase)
         .filterNot { it.contains("sqlite") || it.contains("fts") || it.startsWith("emoji_search_") } // If we delete these we'll corrupt the DB
@@ -1113,8 +728,7 @@ class RecipientTableTest_getAndPossiblyMerge {
           SignalDatabase.rawDatabase.execSQL("DELETE FROM $table")
         }
 
-      AppDependencies.recipientCache.clear()
-      AppDependencies.recipientCache.clearSelf()
+      ApplicationDependencies.getRecipientCache().clear()
       RecipientId.clearCache()
     }
 
@@ -1123,15 +737,14 @@ class RecipientTableTest_getAndPossiblyMerge {
       pni: PNI?,
       aci: ACI?,
       createThread: Boolean = true,
-      pniSession: Boolean = false,
-      aciSession: Boolean = false
+      pniSession: Boolean = false
     ): RecipientId {
       val id = insert(e164, pni, aci)
       generatedIds += id
       if (createThread) {
         // Create a thread and throw a dummy message in it so it doesn't get automatically deleted
-        val result = SignalDatabase.messages.insertMessageInbox(smsMessage(sender = id, time = (Math.random() * 10000000).toLong(), body = "1"))
-        SignalDatabase.threads.markAsActiveEarly(result.get().threadId)
+        SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(id))
+        SignalDatabase.messages.insertMessageInbox(IncomingEncryptedMessage(IncomingTextMessage(id, 1, 0, 0, 0, "", Optional.empty(), 0, false, ""), ""))
       }
 
       if (pniSession) {
@@ -1142,44 +755,12 @@ class RecipientTableTest_getAndPossiblyMerge {
         SignalDatabase.sessions.store(pni, SignalProtocolAddress(pni.toString(), 1), SessionRecord())
       }
 
-      if (aciSession) {
-        if (aci == null) {
-          throw IllegalArgumentException("aciSession = true but aci is null!")
-        }
-
-        SignalDatabase.sessions.store(aci, SignalProtocolAddress(aci.toString(), 1), SessionRecord())
-      }
-
-      if (aci != null) {
-        SignalDatabase.identities.saveIdentity(
-          addressName = aci.toString(),
-          recipientId = id,
-          identityKey = identityKey(Util.getSecretBytes(32)),
-          verifiedStatus = IdentityTable.VerifiedStatus.DEFAULT,
-          firstUse = true,
-          timestamp = 0,
-          nonBlockingApproval = false
-        )
-      }
-      if (pni != null) {
-        SignalDatabase.identities.saveIdentity(
-          addressName = pni.toString(),
-          recipientId = id,
-          identityKey = identityKey(Util.getSecretBytes(32)),
-          verifiedStatus = IdentityTable.VerifiedStatus.DEFAULT,
-          firstUse = true,
-          timestamp = 0,
-          nonBlockingApproval = false
-        )
-      }
-
       return id
     }
 
-    fun process(e164: String?, pni: PNI?, aci: ACI?, changeSelf: Boolean = false, pniVerified: Boolean = false): RecipientId {
-      outputRecipientId = SignalDatabase.recipients.getAndPossiblyMerge(aci = aci, pni = pni, e164 = e164, pniVerified = pniVerified, changeSelf = changeSelf)
+    fun process(e164: String?, pni: PNI?, aci: ACI?, changeSelf: Boolean = false) {
+      outputRecipientId = SignalDatabase.recipients.getAndPossiblyMerge(serviceId = aci ?: pni, pni = pni, e164 = e164, pniVerified = false, changeSelf = changeSelf)
       generatedIds += outputRecipientId
-      return outputRecipientId
     }
 
     fun expect(e164: String?, pni: PNI?, aci: ACI?) {
@@ -1191,15 +772,15 @@ class RecipientTableTest_getAndPossiblyMerge {
       val expected = RecipientTuple(
         e164 = e164,
         pni = pni,
-        aci = aci
+        serviceId = aci ?: pni
       )
       val actual = RecipientTuple(
         e164 = recipient.e164.orElse(null),
         pni = recipient.pni.orElse(null),
-        aci = recipient.aci.orElse(null)
+        serviceId = recipient.serviceId.orElse(null)
       )
 
-      assertEquals("Recipient $id did not match expected result!", expected, actual)
+      assertEquals(expected, actual)
     }
 
     fun expectDeleted() {
@@ -1207,21 +788,21 @@ class RecipientTableTest_getAndPossiblyMerge {
     }
 
     fun expectDeleted(id: RecipientId) {
-      val found = SignalDatabase.rawDatabase
-        .exists(RecipientTable.TABLE_NAME)
+      SignalDatabase.rawDatabase
+        .select("1")
+        .from(RecipientTable.TABLE_NAME)
         .where("${RecipientTable.ID} = ?", id)
         .run()
-
-      assertFalse("Expected $id to be deleted, but it's still present!", found)
+        .use { !it.moveToFirst() }
     }
 
     fun expectChangeNumberEvent() {
-      assertEquals("Missing change number event!", 1, SignalDatabase.messages.getChangeNumberMessageCount(outputRecipientId))
+      assertEquals(1, SignalDatabase.messages.getChangeNumberMessageCount(outputRecipientId))
       changeNumberExpected = true
     }
 
     fun expectNoChangeNumberEvent() {
-      assertEquals("Unexpected change number event!", 0, SignalDatabase.messages.getChangeNumberMessageCount(outputRecipientId))
+      assertEquals(0, SignalDatabase.messages.getChangeNumberMessageCount(outputRecipientId))
       changeNumberExpected = false
     }
 
@@ -1231,57 +812,42 @@ class RecipientTableTest_getAndPossiblyMerge {
 
     fun expectSessionSwitchoverEvent(recipientId: RecipientId, e164: String) {
       val event: SessionSwitchoverEvent? = getLatestSessionSwitchoverEvent(recipientId)
-      assertNotNull("Missing session switchover event! Expected one with e164 = $e164", event)
+      assertNotNull(event)
       assertEquals(e164, event!!.e164)
       sessionSwitchoverExpected = true
     }
 
     fun expectNoSessionSwitchoverEvent() {
-      assertNull("Unexpected session switchover event!", getLatestSessionSwitchoverEvent(outputRecipientId))
+      assertNull(getLatestSessionSwitchoverEvent(outputRecipientId))
     }
 
     fun expectThreadMergeEvent(previousE164: String) {
       val event: ThreadMergeEvent? = getLatestThreadMergeEvent(outputRecipientId)
-      assertNotNull("Missing thread merge event! Expected one with e164 = $previousE164", event)
-      assertEquals("E164 on thread merge event doesn't match!", previousE164, event!!.previousE164)
+      assertNotNull(event)
+      assertEquals(previousE164, event!!.previousE164)
       threadMergeExpected = true
     }
 
     fun expectNoThreadMergeEvent() {
-      assertNull("Unexpected thread merge event!", getLatestThreadMergeEvent(outputRecipientId))
-    }
-
-    fun expectPniVerified() {
-      assertTrue("Expected PNI to be verified!", isPniVerified(outputRecipientId))
-      pniVerifiedExpected = true
-    }
-
-    fun expectPniNotVerified() {
-      assertFalse("Expected PNI to be not be verified!", isPniVerified(outputRecipientId))
-    }
-
-    private fun isPniVerified(recipientId: RecipientId): Boolean {
-      return SignalDatabase.rawDatabase
-        .select(RecipientTable.PNI_SIGNATURE_VERIFIED)
-        .from(RecipientTable.TABLE_NAME)
-        .where("${RecipientTable.ID} = ?", recipientId)
-        .run()
-        .readToSingleBoolean(false)
+      assertNull(getLatestThreadMergeEvent(outputRecipientId))
     }
 
     private fun insert(e164: String?, pni: PNI?, aci: ACI?): RecipientId {
+      val serviceIdString: String? = (aci ?: pni)?.toString()
+      val pniString: String? = pni?.toString()
+
       val id: Long = SignalDatabase.rawDatabase.insert(
         RecipientTable.TABLE_NAME,
         null,
         contentValuesOf(
-          RecipientTable.E164 to e164,
-          RecipientTable.ACI_COLUMN to aci?.toString(),
-          RecipientTable.PNI_COLUMN to pni?.toString(),
+          RecipientTable.PHONE to e164,
+          RecipientTable.SERVICE_ID to serviceIdString,
+          RecipientTable.PNI_COLUMN to pniString,
           RecipientTable.REGISTERED to RecipientTable.RegisteredState.REGISTERED.id
         )
       )
 
-      assertTrue("Failed to insert! E164: $e164, ACI: $aci, PNI: $pni", id > 0)
+      assertTrue("Failed to insert! E164: $e164, ServiceId: $serviceIdString, PNI: $pniString", id > 0)
 
       return RecipientId.from(id)
     }
@@ -1290,14 +856,14 @@ class RecipientTableTest_getAndPossiblyMerge {
   data class RecipientTuple(
     val e164: String?,
     val pni: PNI?,
-    val aci: ACI?
+    val serviceId: ServiceId?
   ) {
 
     /**
      * The intent here is to give nice diffs with the name of the constants rather than the values.
      */
     override fun toString(): String {
-      return "(${e164.e164String()}, ${pni.pniString()}, ${aci.aciString()})"
+      return "(${e164.e164String()}, ${pni.pniString()}, ${serviceId.serviceIdString()})"
     }
 
     private fun String?.e164String(): String {
@@ -1321,9 +887,12 @@ class RecipientTableTest_getAndPossiblyMerge {
       } ?: "null"
     }
 
-    private fun ACI?.aciString(): String {
+    private fun ServiceId?.serviceIdString(): String {
       return this?.let {
         when (it) {
+          PNI_A -> "PNI_A"
+          PNI_B -> "PNI_B"
+          PNI_SELF -> "PNI_SELF"
           ACI_A -> "ACI_A"
           ACI_B -> "ACI_B"
           ACI_SELF -> "ACI_SELF"
@@ -1337,14 +906,14 @@ class RecipientTableTest_getAndPossiblyMerge {
     return SignalDatabase.rawDatabase
       .select(MessageTable.BODY)
       .from(MessageTable.TABLE_NAME)
-      .where("${MessageTable.FROM_RECIPIENT_ID} = ? AND ${MessageTable.TYPE} = ?", recipientId, MessageTypes.THREAD_MERGE_TYPE)
+      .where("${MessageTable.RECIPIENT_ID} = ? AND ${MessageTable.TYPE} = ?", recipientId, MessageTypes.THREAD_MERGE_TYPE)
       .orderBy("${MessageTable.DATE_RECEIVED} DESC")
       .limit(1)
       .run()
       .use { cursor: Cursor ->
         if (cursor.moveToFirst()) {
           val bytes = Base64.decode(cursor.requireNonNullString(MessageTable.BODY))
-          ThreadMergeEvent.ADAPTER.decode(bytes)
+          ThreadMergeEvent.parseFrom(bytes)
         } else {
           null
         }
@@ -1355,14 +924,14 @@ class RecipientTableTest_getAndPossiblyMerge {
     return SignalDatabase.rawDatabase
       .select(MessageTable.BODY)
       .from(MessageTable.TABLE_NAME)
-      .where("${MessageTable.FROM_RECIPIENT_ID} = ? AND ${MessageTable.TYPE} = ?", recipientId, MessageTypes.SESSION_SWITCHOVER_TYPE)
+      .where("${MessageTable.RECIPIENT_ID} = ? AND ${MessageTable.TYPE} = ?", recipientId, MessageTypes.SESSION_SWITCHOVER_TYPE)
       .orderBy("${MessageTable.DATE_RECEIVED} DESC")
       .limit(1)
       .run()
       .use { cursor: Cursor ->
         if (cursor.moveToFirst()) {
           val bytes = Base64.decode(cursor.requireNonNullString(MessageTable.BODY))
-          SessionSwitchoverEvent.ADAPTER.decode(bytes)
+          SessionSwitchoverEvent.parseFrom(bytes)
         } else {
           null
         }

app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_processPnpTupleToChangeSet.kt

@@ -0,0 +1,842 @@
+package org.thoughtcrime.securesms.database
+
+import androidx.core.content.contentValuesOf
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.testing.SignalDatabaseRule
+import org.thoughtcrime.securesms.util.Util
+import org.whispersystems.signalservice.api.push.ACI
+import org.whispersystems.signalservice.api.push.PNI
+import org.whispersystems.signalservice.api.push.ServiceId
+import java.lang.AssertionError
+import java.lang.IllegalStateException
+import java.util.UUID
+
+@RunWith(AndroidJUnit4::class)
+class RecipientTableTest_processPnpTupleToChangeSet {
+
+  @Rule
+  @JvmField
+  val databaseRule = SignalDatabaseRule(deleteAllThreadsOnEachRun = false)
+
+  private lateinit var db: RecipientTable
+
+  @Before
+  fun setup() {
+    db = SignalDatabase.recipients
+  }
+
+  @Test
+  fun noMatch_e164Only() {
+    val changeSet = db.processPnpTupleToChangeSet(E164_A, null, null, pniVerified = false)
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpInsert(E164_A, null, null)
+      ),
+      changeSet
+    )
+  }
+
+  @Test
+  fun noMatch_e164AndPni() {
+    val changeSet = db.processPnpTupleToChangeSet(E164_A, PNI_A, null, pniVerified = false)
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpInsert(E164_A, PNI_A, null)
+      ),
+      changeSet
+    )
+  }
+
+  @Test
+  fun noMatch_aciOnly() {
+    val changeSet = db.processPnpTupleToChangeSet(null, null, ACI_A, pniVerified = false)
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpInsert(null, null, ACI_A)
+      ),
+      changeSet
+    )
+  }
+
+  @Test(expected = IllegalStateException::class)
+  fun noMatch_noData() {
+    db.processPnpTupleToChangeSet(null, null, null, pniVerified = false)
+  }
+
+  @Test
+  fun noMatch_allFields() {
+    val changeSet = db.processPnpTupleToChangeSet(E164_A, PNI_A, ACI_A, pniVerified = false)
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpInsert(E164_A, PNI_A, ACI_A)
+      ),
+      changeSet
+    )
+  }
+
+  @Test
+  fun fullMatch() {
+    val result = applyAndAssert(
+      Input(E164_A, PNI_A, ACI_A),
+      Update(E164_A, PNI_A, ACI_A),
+      Output(E164_A, PNI_A, ACI_A)
+    )
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpNoopId(result.id)
+      ),
+      result.changeSet
+    )
+  }
+
+  @Test
+  fun onlyE164Matches() {
+    val result = applyAndAssert(
+      Input(E164_A, null, null),
+      Update(E164_A, PNI_A, ACI_A),
+      Output(E164_A, PNI_A, ACI_A)
+    )
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpNoopId(result.id),
+        operations = linkedSetOf(
+          PnpOperation.SetPni(result.id, PNI_A),
+          PnpOperation.SetAci(result.id, ACI_A)
+        )
+      ),
+      result.changeSet
+    )
+  }
+
+  @Test
+  fun onlyE164Matches_pniChanges_noAciProvided_existingPniSession() {
+    val result = applyAndAssert(
+      Input(E164_A, PNI_B, null, pniSession = true),
+      Update(E164_A, PNI_A, null),
+      Output(E164_A, PNI_A, null)
+    )
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpNoopId(result.id),
+        operations = linkedSetOf(
+          PnpOperation.SetPni(result.id, PNI_A),
+          PnpOperation.SessionSwitchoverInsert(result.id, E164_A)
+        )
+      ),
+      result.changeSet
+    )
+  }
+
+  @Test
+  fun onlyE164Matches_pniChanges_noAciProvided_noPniSession() {
+    val result = applyAndAssert(
+      Input(E164_A, PNI_B, null),
+      Update(E164_A, PNI_A, null),
+      Output(E164_A, PNI_A, null)
+    )
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpNoopId(result.id),
+        operations = linkedSetOf(
+          PnpOperation.SetPni(result.id, PNI_A)
+        )
+      ),
+      result.changeSet
+    )
+  }
+
+  @Test
+  fun e164AndPniMatches_noExistingSession() {
+    val result = applyAndAssert(
+      Input(E164_A, PNI_A, null),
+      Update(E164_A, PNI_A, ACI_A),
+      Output(E164_A, PNI_A, ACI_A)
+    )
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpNoopId(result.id),
+        operations = linkedSetOf(
+          PnpOperation.SetAci(result.id, ACI_A)
+        )
+      ),
+      result.changeSet
+    )
+  }
+
+  @Test
+  fun e164AndPniMatches_existingPniSession() {
+    val result = applyAndAssert(
+      Input(E164_A, PNI_A, null, pniSession = true),
+      Update(E164_A, PNI_A, ACI_A),
+      Output(E164_A, PNI_A, ACI_A)
+    )
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpNoopId(result.id),
+        operations = linkedSetOf(
+          PnpOperation.SetAci(result.id, ACI_A),
+          PnpOperation.SessionSwitchoverInsert(result.id, E164_A)
+        )
+      ),
+      result.changeSet
+    )
+  }
+
+  @Test
+  fun e164AndAciMatches() {
+    val result = applyAndAssert(
+      Input(E164_A, null, ACI_A),
+      Update(E164_A, PNI_A, ACI_A),
+      Output(E164_A, PNI_A, ACI_A)
+    )
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpNoopId(result.id),
+        operations = linkedSetOf(
+          PnpOperation.SetPni(result.id, PNI_A)
+        )
+      ),
+      result.changeSet
+    )
+  }
+
+  @Test
+  fun onlyPniMatches_noExistingSession() {
+    val result = applyAndAssert(
+      Input(null, PNI_A, null),
+      Update(E164_A, PNI_A, ACI_A),
+      Output(E164_A, PNI_A, ACI_A)
+    )
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpNoopId(result.id),
+        operations = linkedSetOf(
+          PnpOperation.SetE164(result.id, E164_A),
+          PnpOperation.SetAci(result.id, ACI_A)
+        )
+      ),
+      result.changeSet
+    )
+  }
+
+  @Test
+  fun onlyPniMatches_existingPniSession() {
+    val result = applyAndAssert(
+      Input(null, PNI_A, null, pniSession = true),
+      Update(E164_A, PNI_A, ACI_A),
+      Output(E164_A, PNI_A, ACI_A)
+    )
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpNoopId(result.id),
+        operations = linkedSetOf(
+          PnpOperation.SetE164(result.id, E164_A),
+          PnpOperation.SetAci(result.id, ACI_A),
+          PnpOperation.SessionSwitchoverInsert(result.id, E164_A)
+        )
+      ),
+      result.changeSet
+    )
+  }
+
+  @Test
+  fun onlyPniMatches_existingPniSession_changeNumber() {
+    val result = applyAndAssert(
+      Input(E164_B, PNI_A, null, pniSession = true),
+      Update(E164_A, PNI_A, ACI_A),
+      Output(E164_A, PNI_A, ACI_A)
+    )
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpNoopId(result.id),
+        operations = linkedSetOf(
+          PnpOperation.SetE164(result.id, E164_A),
+          PnpOperation.SetAci(result.id, ACI_A),
+          PnpOperation.ChangeNumberInsert(
+            recipientId = result.id,
+            oldE164 = E164_B,
+            newE164 = E164_A
+          ),
+          PnpOperation.SessionSwitchoverInsert(result.id, E164_A)
+        )
+      ),
+      result.changeSet
+    )
+  }
+
+  @Test
+  fun pniAndAciMatches() {
+    val result = applyAndAssert(
+      Input(null, PNI_A, ACI_A),
+      Update(E164_A, PNI_A, ACI_A),
+      Output(E164_A, PNI_A, ACI_A)
+    )
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpNoopId(result.id),
+        operations = linkedSetOf(
+          PnpOperation.SetE164(result.id, E164_A),
+        )
+      ),
+      result.changeSet
+    )
+  }
+
+  @Test
+  fun pniAndAciMatches_changeNumber() {
+    val result = applyAndAssert(
+      Input(E164_B, PNI_A, ACI_A),
+      Update(E164_A, PNI_A, ACI_A),
+      Output(E164_A, PNI_A, ACI_A)
+    )
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpNoopId(result.id),
+        operations = linkedSetOf(
+          PnpOperation.SetE164(result.id, E164_A),
+          PnpOperation.ChangeNumberInsert(
+            recipientId = result.id,
+            oldE164 = E164_B,
+            newE164 = E164_A
+          )
+        )
+      ),
+      result.changeSet
+    )
+  }
+
+  @Test
+  fun onlyAciMatches() {
+    val result = applyAndAssert(
+      Input(null, null, ACI_A),
+      Update(E164_A, PNI_A, ACI_A),
+      Output(E164_A, PNI_A, ACI_A)
+    )
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpNoopId(result.id),
+        operations = linkedSetOf(
+          PnpOperation.SetE164(result.id, E164_A),
+          PnpOperation.SetPni(result.id, PNI_A)
+        )
+      ),
+      result.changeSet
+    )
+  }
+
+  @Test
+  fun onlyAciMatches_changeNumber() {
+    val result = applyAndAssert(
+      Input(E164_B, null, ACI_A),
+      Update(E164_A, PNI_A, ACI_A),
+      Output(E164_A, PNI_A, ACI_A)
+    )
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpNoopId(result.id),
+        operations = linkedSetOf(
+          PnpOperation.SetE164(result.id, E164_A),
+          PnpOperation.SetPni(result.id, PNI_A),
+          PnpOperation.ChangeNumberInsert(
+            recipientId = result.id,
+            oldE164 = E164_B,
+            newE164 = E164_A
+          )
+        )
+      ),
+      result.changeSet
+    )
+  }
+
+  @Test
+  fun merge_e164Only_pniOnly_aciOnly() {
+    val result = applyAndAssert(
+      listOf(
+        Input(E164_A, null, null),
+        Input(null, PNI_A, null),
+        Input(null, null, ACI_A)
+      ),
+      Update(E164_A, PNI_A, ACI_A),
+      Output(E164_A, PNI_A, ACI_A)
+    )
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpNoopId(result.thirdId),
+        operations = linkedSetOf(
+          PnpOperation.Merge(
+            primaryId = result.firstId,
+            secondaryId = result.secondId
+          ),
+          PnpOperation.Merge(
+            primaryId = result.thirdId,
+            secondaryId = result.firstId
+          )
+        )
+      ),
+      result.changeSet
+    )
+  }
+
+  @Test
+  fun merge_e164Only_pniOnly_noAciProvided() {
+    val result = applyAndAssert(
+      listOf(
+        Input(E164_A, null, null),
+        Input(null, PNI_A, null),
+      ),
+      Update(E164_A, PNI_A, null),
+      Output(E164_A, PNI_A, null)
+    )
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpNoopId(result.firstId),
+        operations = linkedSetOf(
+          PnpOperation.Merge(
+            primaryId = result.firstId,
+            secondaryId = result.secondId
+          )
+        )
+      ),
+      result.changeSet
+    )
+  }
+
+  @Test
+  fun merge_e164Only_pniOnly_aciProvidedButNoAciRecord() {
+    val result = applyAndAssert(
+      listOf(
+        Input(E164_A, null, null),
+        Input(null, PNI_A, null),
+      ),
+      Update(E164_A, PNI_A, ACI_A),
+      Output(E164_A, PNI_A, ACI_A)
+    )
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpNoopId(result.firstId),
+        operations = linkedSetOf(
+          PnpOperation.Merge(
+            primaryId = result.firstId,
+            secondaryId = result.secondId
+          ),
+          PnpOperation.SetAci(
+            recipientId = result.firstId,
+            aci = ACI_A
+          )
+        )
+      ),
+      result.changeSet
+    )
+  }
+
+  @Test
+  fun merge_e164Only_pniAndE164_noAciProvided() {
+    val result = applyAndAssert(
+      listOf(
+        Input(E164_A, null, null),
+        Input(E164_B, PNI_A, null),
+      ),
+      Update(E164_A, PNI_A, null),
+      Output(E164_A, PNI_A, null)
+    )
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpNoopId(result.firstId),
+        operations = linkedSetOf(
+          PnpOperation.RemovePni(result.secondId),
+          PnpOperation.SetPni(
+            recipientId = result.firstId,
+            pni = PNI_A
+          ),
+        )
+      ),
+      result.changeSet
+    )
+  }
+
+  @Test
+  fun merge_e164AndPni_pniOnly_noAciProvided() {
+    val result = applyAndAssert(
+      listOf(
+        Input(E164_A, PNI_B, null),
+        Input(null, PNI_A, null),
+      ),
+      Update(E164_A, PNI_A, null),
+      Output(E164_A, PNI_A, null)
+    )
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpNoopId(result.firstId),
+        operations = linkedSetOf(
+          PnpOperation.RemovePni(result.firstId),
+          PnpOperation.Merge(
+            primaryId = result.firstId,
+            secondaryId = result.secondId
+          ),
+        )
+      ),
+      result.changeSet
+    )
+  }
+
+  @Test
+  fun merge_e164AndPni_e164AndPni_noAciProvided_noSessions() {
+    val result = applyAndAssert(
+      listOf(
+        Input(E164_A, PNI_B, null),
+        Input(E164_B, PNI_A, null),
+      ),
+      Update(E164_A, PNI_A, null),
+      Output(E164_A, PNI_A, null)
+    )
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpNoopId(result.firstId),
+        operations = linkedSetOf(
+          PnpOperation.RemovePni(result.secondId),
+          PnpOperation.SetPni(result.firstId, PNI_A)
+        )
+      ),
+      result.changeSet
+    )
+  }
+
+  @Test
+  fun merge_e164AndPni_e164AndPni_noAciProvided_sessionsExist() {
+    val result = applyAndAssert(
+      listOf(
+        Input(E164_A, PNI_B, null, pniSession = true),
+        Input(E164_B, PNI_A, null, pniSession = true),
+      ),
+      Update(E164_A, PNI_A, null),
+      Output(E164_A, PNI_A, null)
+    )
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpNoopId(result.firstId),
+        operations = linkedSetOf(
+          PnpOperation.RemovePni(result.secondId),
+          PnpOperation.SetPni(result.firstId, PNI_A),
+          PnpOperation.SessionSwitchoverInsert(result.secondId, E164_A),
+          PnpOperation.SessionSwitchoverInsert(result.firstId, E164_A)
+        )
+      ),
+      result.changeSet
+    )
+  }
+
+  @Test
+  fun merge_e164AndPni_aciOnly() {
+    val result = applyAndAssert(
+      listOf(
+        Input(E164_A, PNI_A, null),
+        Input(null, null, ACI_A),
+      ),
+      Update(E164_A, PNI_A, ACI_A),
+      Output(E164_A, PNI_A, ACI_A)
+    )
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpNoopId(result.secondId),
+        operations = linkedSetOf(
+          PnpOperation.Merge(
+            primaryId = result.secondId,
+            secondaryId = result.firstId
+          ),
+        )
+      ),
+      result.changeSet
+    )
+  }
+
+  @Test
+  fun merge_e164AndPni_aciOnly_e164RecordHasSeparateE164() {
+    val result = applyAndAssert(
+      listOf(
+        Input(E164_B, PNI_A, null),
+        Input(null, null, ACI_A),
+      ),
+      Update(E164_A, PNI_A, ACI_A),
+      Output(E164_A, PNI_A, ACI_A)
+    )
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpNoopId(result.secondId),
+        operations = linkedSetOf(
+          PnpOperation.RemovePni(result.firstId),
+          PnpOperation.SetPni(
+            recipientId = result.secondId,
+            pni = PNI_A,
+          ),
+          PnpOperation.SetE164(
+            recipientId = result.secondId,
+            e164 = E164_A,
+          )
+        )
+      ),
+      result.changeSet
+    )
+  }
+
+  @Test
+  fun merge_e164AndPni_aciOnly_e164RecordHasSeparateE164_changeNumber() {
+    val result = applyAndAssert(
+      listOf(
+        Input(E164_B, PNI_A, null),
+        Input(E164_C, null, ACI_A),
+      ),
+      Update(E164_A, PNI_A, ACI_A),
+      Output(E164_A, PNI_A, ACI_A)
+    )
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpNoopId(result.secondId),
+        operations = linkedSetOf(
+          PnpOperation.RemovePni(result.firstId),
+          PnpOperation.SetPni(
+            recipientId = result.secondId,
+            pni = PNI_A,
+          ),
+          PnpOperation.SetE164(
+            recipientId = result.secondId,
+            e164 = E164_A,
+          ),
+          PnpOperation.ChangeNumberInsert(
+            recipientId = result.secondId,
+            oldE164 = E164_C,
+            newE164 = E164_A
+          )
+        )
+      ),
+      result.changeSet
+    )
+  }
+
+  @Test
+  fun merge_e164AndPni_e164AndPniAndAci_changeNumber() {
+    val result = applyAndAssert(
+      listOf(
+        Input(E164_A, PNI_A, null),
+        Input(E164_B, PNI_B, ACI_A),
+      ),
+      Update(E164_A, PNI_A, ACI_A),
+      Output(E164_A, PNI_A, ACI_A)
+    )
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpNoopId(result.secondId),
+        operations = linkedSetOf(
+          PnpOperation.RemovePni(result.secondId),
+          PnpOperation.RemoveE164(result.secondId),
+          PnpOperation.Merge(
+            primaryId = result.secondId,
+            secondaryId = result.firstId
+          ),
+          PnpOperation.ChangeNumberInsert(
+            recipientId = result.secondId,
+            oldE164 = E164_B,
+            newE164 = E164_A
+          )
+        )
+      ),
+      result.changeSet
+    )
+  }
+
+  @Test
+  fun merge_e164AndPni_e164Aci_changeNumber() {
+    val result = applyAndAssert(
+      listOf(
+        Input(E164_A, PNI_A, null),
+        Input(E164_B, null, ACI_A),
+      ),
+      Update(E164_A, PNI_A, ACI_A),
+      Output(E164_A, PNI_A, ACI_A)
+    )
+
+    assertEquals(
+      PnpChangeSet(
+        id = PnpIdResolver.PnpNoopId(result.secondId),
+        operations = linkedSetOf(
+          PnpOperation.RemoveE164(result.secondId),
+          PnpOperation.Merge(
+            primaryId = result.secondId,
+            secondaryId = result.firstId
+          ),
+          PnpOperation.ChangeNumberInsert(
+            recipientId = result.secondId,
+            oldE164 = E164_B,
+            newE164 = E164_A
+          )
+        )
+      ),
+      result.changeSet
+    )
+  }
+
+  private fun insert(e164: String?, pni: PNI?, aci: ACI?): RecipientId {
+    val id: Long = SignalDatabase.rawDatabase.insert(
+      RecipientTable.TABLE_NAME,
+      null,
+      contentValuesOf(
+        RecipientTable.PHONE to e164,
+        RecipientTable.SERVICE_ID to (aci ?: pni)?.toString(),
+        RecipientTable.PNI_COLUMN to pni?.toString(),
+        RecipientTable.REGISTERED to RecipientTable.RegisteredState.REGISTERED.id
+      )
+    )
+
+    return RecipientId.from(id)
+  }
+
+  private fun insertMockSessionFor(account: ServiceId, address: ServiceId) {
+    SignalDatabase.rawDatabase.insert(
+      SessionTable.TABLE_NAME, null,
+      contentValuesOf(
+        SessionTable.ACCOUNT_ID to account.toString(),
+        SessionTable.ADDRESS to address.toString(),
+        SessionTable.DEVICE to 1,
+        SessionTable.RECORD to Util.getSecretBytes(32)
+      )
+    )
+  }
+
+  data class Input(val e164: String?, val pni: PNI?, val aci: ACI?, val pniSession: Boolean = false, val aciSession: Boolean = false)
+  data class Update(val e164: String?, val pni: PNI?, val aci: ACI?, val pniVerified: Boolean = false)
+  data class Output(val e164: String?, val pni: PNI?, val aci: ACI?)
+  data class PnpMatchResult(val ids: List<RecipientId>, val changeSet: PnpChangeSet) {
+    val id
+      get() = if (ids.size == 1) {
+        ids[0]
+      } else {
+        throw IllegalStateException("There are multiple IDs, but you assumed 1!")
+      }
+
+    val firstId
+      get() = ids[0]
+
+    val secondId
+      get() = ids[1]
+
+    val thirdId
+      get() = ids[2]
+  }
+
+  private fun applyAndAssert(input: Input, update: Update, output: Output): PnpMatchResult {
+    return applyAndAssert(listOf(input), update, output)
+  }
+
+  /**
+   * Helper method that will call insert your recipients, call [RecipientTable.processPnpTupleToChangeSet] with your params,
+   * and then verify your output matches what you expect.
+   *
+   * It results the inserted ID's and changeset for additional verification.
+   *
+   * But basically this is here to make the tests more readable. It gives you a clear list of:
+   * - input
+   * - update
+   * - output
+   *
+   * that you can spot check easily.
+   *
+   * Important: The output will only include records that contain fields from the input. That means
+   * for:
+   *
+   * Input:  E164_B, PNI_A, null
+   * Update: E164_A, PNI_A, null
+   *
+   * You will get:
+   * Output: E164_A, PNI_A, null
+   *
+   * Even though there was an update that will also result in the row (E164_B, null, null)
+   */
+  private fun applyAndAssert(input: List<Input>, update: Update, output: Output): PnpMatchResult {
+    val ids = input.map { insert(it.e164, it.pni, it.aci) }
+
+    input
+      .filter { it.pniSession }
+      .forEach { insertMockSessionFor(databaseRule.localAci, it.pni!!) }
+
+    input
+      .filter { it.aciSession }
+      .forEach { insertMockSessionFor(databaseRule.localAci, it.aci!!) }
+
+    val byE164 = update.e164?.let { db.getByE164(it).orElse(null) }
+    val byPniSid = update.pni?.let { db.getByServiceId(it).orElse(null) }
+    val byAciSid = update.aci?.let { db.getByServiceId(it).orElse(null) }
+
+    val data = PnpDataSet(
+      e164 = update.e164,
+      pni = update.pni,
+      aci = update.aci,
+      byE164 = byE164,
+      byPniSid = byPniSid,
+      byPniOnly = update.pni?.let { db.getByPni(it).orElse(null) },
+      byAciSid = byAciSid,
+      e164Record = byE164?.let { db.getRecord(it) },
+      pniSidRecord = byPniSid?.let { db.getRecord(it) },
+      aciSidRecord = byAciSid?.let { db.getRecord(it) }
+    )
+    val changeSet = db.processPnpTupleToChangeSet(update.e164, update.pni, update.aci, pniVerified = update.pniVerified)
+
+    val finalData = data.perform(changeSet.operations)
+
+    val finalRecords = setOfNotNull(finalData.e164Record, finalData.pniSidRecord, finalData.aciSidRecord)
+    assertEquals("There's still multiple records in the resulting record set! $finalRecords", 1, finalRecords.size)
+
+    finalRecords.firstOrNull { record -> record.e164 == output.e164 && record.pni == output.pni && record.serviceId == (output.aci ?: output.pni) }
+      ?: throw AssertionError("Expected output was not found in the result set! Expected: $output")
+
+    return PnpMatchResult(
+      ids = ids,
+      changeSet = changeSet
+    )
+  }
+
+  companion object {
+    val ACI_A = ACI.from(UUID.fromString("3436efbe-5a76-47fa-a98a-7e72c948a82e"))
+    val ACI_B = ACI.from(UUID.fromString("8de7f691-0b60-4a68-9cd9-ed2f8453f9ed"))
+
+    val PNI_A = PNI.from(UUID.fromString("154b8d92-c960-4f6c-8385-671ad2ffb999"))
+    val PNI_B = PNI.from(UUID.fromString("ba92b1fb-cd55-40bf-adda-c35a85375533"))
+
+    const val E164_A = "+12221234567"
+    const val E164_B = "+13331234567"
+    const val E164_C = "+14441234567"
+  }
+}

app/src/androidTest/java/org/thoughtcrime/securesms/database/SQLiteDatabaseTest.kt

@@ -4,12 +4,9 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import junit.framework.Assert.assertFalse
 import junit.framework.Assert.assertTrue
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.signal.core.util.concurrent.SignalExecutors
-import org.thoughtcrime.securesms.testing.SignalFlakyTest
-import org.thoughtcrime.securesms.testing.SignalFlakyTestRule
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.atomic.AtomicBoolean
 
@@ -21,9 +18,6 @@ class SQLiteDatabaseTest {
 
   private lateinit var db: SQLiteDatabase
 
-  @get:Rule
-  val flakyTestRule = SignalFlakyTestRule()
-
   @Before
   fun setup() {
     db = SignalDatabase.instance!!.signalWritableDatabase
@@ -186,46 +180,4 @@ class SQLiteDatabaseTest {
     assertTrue(hasRun1.get())
     assertTrue(hasRun2.get())
   }
-
-  @SignalFlakyTest
-  @Test
-  fun runPostSuccessfulTransaction_runsAfterMainTransactionInNestedTransaction() {
-    val hasRun1 = AtomicBoolean(false)
-    val hasRun2 = AtomicBoolean(false)
-
-    db.beginTransaction()
-
-    db.runPostSuccessfulTransaction {
-      assertFalse(hasRun1.get())
-      assertFalse(hasRun2.get())
-      hasRun1.set(true)
-    }
-
-    assertFalse(hasRun1.get())
-    assertFalse(hasRun2.get())
-
-    db.beginTransaction()
-
-    db.runPostSuccessfulTransaction {
-      assertTrue(hasRun1.get())
-      assertFalse(hasRun2.get())
-      hasRun2.set(true)
-    }
-
-    db.setTransactionSuccessful()
-
-    assertFalse(hasRun1.get())
-    assertFalse(hasRun2.get())
-
-    db.endTransaction()
-    db.setTransactionSuccessful()
-
-    assertFalse(hasRun1.get())
-    assertFalse(hasRun2.get())
-
-    db.endTransaction()
-
-    assertTrue(hasRun1.get())
-    assertTrue(hasRun2.get())
-  }
 }

app/src/androidTest/java/org/thoughtcrime/securesms/database/SmsDatabaseTest_collapseJoinRequestEventsIfPossible.kt

@@ -10,9 +10,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.signal.core.util.Hex
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey
-import org.thoughtcrime.securesms.database.model.GroupsV2UpdateMessageConverter
 import org.thoughtcrime.securesms.database.model.databaseprotos.DecryptedGroupV2Context
-import org.thoughtcrime.securesms.database.model.databaseprotos.GV2UpdateDescription
 import org.thoughtcrime.securesms.database.model.databaseprotos.addMember
 import org.thoughtcrime.securesms.database.model.databaseprotos.addRequestingMember
 import org.thoughtcrime.securesms.database.model.databaseprotos.deleteRequestingMember
@@ -20,10 +18,13 @@ import org.thoughtcrime.securesms.database.model.databaseprotos.groupChange
 import org.thoughtcrime.securesms.database.model.databaseprotos.groupContext
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.mms.IncomingMessage
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.whispersystems.signalservice.api.push.ServiceId.ACI
-import org.whispersystems.signalservice.api.push.ServiceId.PNI
+import org.thoughtcrime.securesms.sms.IncomingGroupUpdateMessage
+import org.thoughtcrime.securesms.sms.IncomingTextMessage
+import org.whispersystems.signalservice.api.push.ACI
+import org.whispersystems.signalservice.api.push.PNI
+import org.whispersystems.signalservice.api.push.ServiceId
+import java.util.Optional
 import java.util.UUID
 
 @Suppress("ClassName", "TestFunctionName")
@@ -46,8 +47,8 @@ class SmsDatabaseTest_collapseJoinRequestEventsIfPossible {
     recipients = SignalDatabase.recipients
     sms = SignalDatabase.messages
 
-    SignalStore.account.setAci(localAci)
-    SignalStore.account.setPni(localPni)
+    SignalStore.account().setAci(localAci)
+    SignalStore.account().setPni(localPni)
 
     alice = recipients.getOrInsertFromServiceId(aliceServiceId)
     bob = recipients.getOrInsertFromServiceId(bobServiceId)
@@ -272,41 +273,18 @@ class SmsDatabaseTest_collapseJoinRequestEventsIfPossible {
     assertThat("latest message should be deleted", sms.getMessageRecordOrNull(latestMessage.messageId), nullValue())
   }
 
-  private fun smsMessage(sender: RecipientId, body: String? = ""): IncomingMessage {
+  private fun smsMessage(sender: RecipientId, body: String? = ""): IncomingTextMessage {
     wallClock++
-    return IncomingMessage(
-      type = MessageType.NORMAL,
-      from = sender,
-      sentTimeMillis = wallClock,
-      serverTimeMillis = wallClock,
-      receivedTimeMillis = wallClock,
-      body = body,
-      groupId = groupId,
-      isUnidentified = true
-    )
+    return IncomingTextMessage(sender, 1, wallClock, wallClock, wallClock, body, Optional.of(groupId), 0, true, null)
   }
 
-  private fun groupUpdateMessage(sender: RecipientId, groupContext: DecryptedGroupV2Context): IncomingMessage {
-    wallClock++
-
-    val updateDescription = GV2UpdateDescription(
-      gv2ChangeDescription = groupContext,
-      groupChangeUpdate = GroupsV2UpdateMessageConverter.translateDecryptedChangeUpdate(SignalStore.account.getServiceIds(), groupContext)
-    )
-
-    return IncomingMessage.groupUpdate(
-      from = sender,
-      timestamp = wallClock,
-      groupId = groupId,
-      update = updateDescription,
-      isGroupAdd = false,
-      serverGuid = null
-    )
+  private fun groupUpdateMessage(sender: RecipientId, groupContext: DecryptedGroupV2Context): IncomingGroupUpdateMessage {
+    return IncomingGroupUpdateMessage(smsMessage(sender, null), groupContext)
   }
 
   companion object {
-    private val aliceServiceId: ACI = ACI.from(UUID.fromString("3436efbe-5a76-47fa-a98a-7e72c948a82e"))
-    private val bobServiceId: ACI = ACI.from(UUID.fromString("8de7f691-0b60-4a68-9cd9-ed2f8453f9ed"))
+    private val aliceServiceId: ServiceId = ACI.from(UUID.fromString("3436efbe-5a76-47fa-a98a-7e72c948a82e"))
+    private val bobServiceId: ServiceId = ACI.from(UUID.fromString("8de7f691-0b60-4a68-9cd9-ed2f8453f9ed"))
 
     private val masterKey = GroupMasterKey(Hex.fromStringCondensed("0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"))
     private val groupId = GroupId.v2(masterKey)

app/src/androidTest/java/org/thoughtcrime/securesms/database/StorySendTableTest.kt

@@ -12,24 +12,19 @@ import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertTrue
 import org.junit.Assert.fail
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.thoughtcrime.securesms.database.model.DistributionListId
 import org.thoughtcrime.securesms.database.model.StoryType
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.whispersystems.signalservice.api.push.DistributionId
-import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import org.whispersystems.signalservice.api.push.ServiceId
 import java.util.UUID
 
 @RunWith(AndroidJUnit4::class)
 class StorySendTableTest {
 
-  @get:Rule
-  val harness = SignalActivityRule(othersCount = 0, createGroup = false)
-
   private val distributionId1 = DistributionId.from(UUID.randomUUID())
   private val distributionId2 = DistributionId.from(UUID.randomUUID())
   private val distributionId3 = DistributionId.from(UUID.randomUUID())
@@ -70,17 +65,17 @@ class StorySendTableTest {
 
     messageId1 = MmsHelper.insert(
       recipient = distributionListRecipient1,
-      storyType = StoryType.STORY_WITHOUT_REPLIES
+      storyType = StoryType.STORY_WITHOUT_REPLIES,
     )
 
     messageId2 = MmsHelper.insert(
       recipient = distributionListRecipient2,
-      storyType = StoryType.STORY_WITH_REPLIES
+      storyType = StoryType.STORY_WITH_REPLIES,
     )
 
     messageId3 = MmsHelper.insert(
       recipient = distributionListRecipient3,
-      storyType = StoryType.STORY_WITHOUT_REPLIES
+      storyType = StoryType.STORY_WITHOUT_REPLIES,
     )
 
     recipients6to15 = recipients1to10.takeLast(5) + recipients11to20.take(5)
@@ -465,7 +460,7 @@ class StorySendTableTest {
 
   private fun makeRecipients(count: Int): List<RecipientId> {
     return (1..count).map {
-      SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID()))
+      SignalDatabase.recipients.getOrInsertFromServiceId(ServiceId.from(UUID.randomUUID()))
     }
   }
 }

app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadTableTest_active.kt

@@ -1,144 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.database
-
-import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNotNull
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.thoughtcrime.securesms.conversationlist.model.ConversationFilter
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.testing.SignalDatabaseRule
-import org.whispersystems.signalservice.api.push.ServiceId.ACI
-import java.util.UUID
-
-@Suppress("ClassName")
-class ThreadTableTest_active {
-
-  @Rule
-  @JvmField
-  val databaseRule = SignalDatabaseRule()
-
-  private lateinit var recipient: Recipient
-
-  @Before
-  fun setUp() {
-    recipient = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID())))
-  }
-
-  @Test
-  fun givenActiveUnarchivedThread_whenIGetUnarchivedConversationList_thenIExpectThread() {
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
-    MmsHelper.insert(recipient = recipient, threadId = threadId)
-    SignalDatabase.threads.update(threadId, false)
-
-    SignalDatabase.threads.getUnarchivedConversationList(
-      ConversationFilter.OFF,
-      false,
-      0,
-      10
-    ).use { threads ->
-      assertEquals(1, threads.count)
-
-      val record = ThreadTable.StaticReader(threads, InstrumentationRegistry.getInstrumentation().context).getNext()
-
-      assertNotNull(record)
-      assertEquals(record!!.recipient.id, recipient.id)
-    }
-  }
-
-  @Test
-  fun givenInactiveUnarchivedThread_whenIGetUnarchivedConversationList_thenIExpectNoThread() {
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
-    MmsHelper.insert(recipient = recipient, threadId = threadId)
-    SignalDatabase.threads.update(threadId, false)
-    SignalDatabase.threads.deleteConversation(threadId)
-
-    SignalDatabase.threads.getUnarchivedConversationList(
-      ConversationFilter.OFF,
-      false,
-      0,
-      10
-    ).use { threads ->
-      assertEquals(0, threads.count)
-    }
-
-    val threadId2 = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
-    assertEquals(threadId2, threadId)
-  }
-
-  @Test
-  fun givenActiveArchivedThread_whenIGetUnarchivedConversationList_thenIExpectNoThread() {
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
-    MmsHelper.insert(recipient = recipient, threadId = threadId)
-    SignalDatabase.threads.update(threadId, false)
-    SignalDatabase.threads.setArchived(setOf(threadId), true)
-
-    SignalDatabase.threads.getUnarchivedConversationList(
-      ConversationFilter.OFF,
-      false,
-      0,
-      10
-    ).use { threads ->
-      assertEquals(0, threads.count)
-    }
-  }
-
-  @Test
-  fun givenActiveArchivedThread_whenIGetArchivedConversationList_thenIExpectThread() {
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
-    MmsHelper.insert(recipient = recipient, threadId = threadId)
-    SignalDatabase.threads.update(threadId, false)
-    SignalDatabase.threads.setArchived(setOf(threadId), true)
-
-    SignalDatabase.threads.getArchivedConversationList(
-      ConversationFilter.OFF,
-      0,
-      10
-    ).use { threads ->
-      assertEquals(1, threads.count)
-    }
-  }
-
-  @Test
-  fun givenInactiveArchivedThread_whenIGetArchivedConversationList_thenIExpectNoThread() {
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
-    MmsHelper.insert(recipient = recipient, threadId = threadId)
-    SignalDatabase.threads.update(threadId, false)
-    SignalDatabase.threads.deleteConversation(threadId)
-    SignalDatabase.threads.setArchived(setOf(threadId), true)
-
-    SignalDatabase.threads.getArchivedConversationList(
-      ConversationFilter.OFF,
-      0,
-      10
-    ).use { threads ->
-      assertEquals(0, threads.count)
-    }
-
-    val threadId2 = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
-    assertEquals(threadId2, threadId)
-  }
-
-  @Test
-  fun givenActiveArchivedThread_whenIDeactivateThread_thenIExpectNoMessages() {
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
-    MmsHelper.insert(recipient = recipient, threadId = threadId)
-    SignalDatabase.threads.update(threadId, false)
-
-    SignalDatabase.messages.getConversation(threadId).use {
-      assertEquals(1, it.count)
-    }
-
-    SignalDatabase.threads.deleteConversation(threadId)
-
-    SignalDatabase.messages.getConversation(threadId).use {
-      assertEquals(0, it.count)
-    }
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadTableTest_pinned.kt

@@ -9,7 +9,7 @@ import org.signal.core.util.CursorUtil
 import org.thoughtcrime.securesms.conversationlist.model.ConversationFilter
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.testing.SignalDatabaseRule
-import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import org.whispersystems.signalservice.api.push.ServiceId
 import java.util.UUID
 
 @Suppress("ClassName")
@@ -23,7 +23,7 @@ class ThreadTableTest_pinned {
 
   @Before
   fun setUp() {
-    recipient = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID())))
+    recipient = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromServiceId(ServiceId.from(UUID.randomUUID())))
   }
 
   @Test

app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadTableTest_recents.kt

@@ -10,7 +10,7 @@ import org.signal.core.util.CursorUtil
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.recipients.RecipientId
 import org.thoughtcrime.securesms.testing.SignalDatabaseRule
-import org.whispersystems.signalservice.api.push.ServiceId.ACI
+import org.whispersystems.signalservice.api.push.ServiceId
 import java.util.UUID
 
 @Suppress("ClassName")
@@ -25,7 +25,7 @@ class ThreadTableTest_recents {
 
   @Before
   fun setUp() {
-    recipient = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID())))
+    recipient = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromServiceId(ServiceId.from(UUID.randomUUID())))
   }
 
   @Test

app/src/androidTest/java/org/thoughtcrime/securesms/database/UriAttachmentBuilder.kt

@@ -5,7 +5,6 @@ import org.thoughtcrime.securesms.attachments.UriAttachment
 import org.thoughtcrime.securesms.audio.AudioHash
 import org.thoughtcrime.securesms.blurhash.BlurHash
 import org.thoughtcrime.securesms.stickers.StickerLocator
-import java.util.UUID
 
 object UriAttachmentBuilder {
   fun build(
@@ -23,28 +22,23 @@ object UriAttachmentBuilder {
     stickerLocator: StickerLocator? = null,
     blurHash: BlurHash? = null,
     audioHash: AudioHash? = null,
-    transformProperties: AttachmentTable.TransformProperties? = null,
-    uuid: UUID? = UUID.randomUUID()
+    transformProperties: AttachmentTable.TransformProperties? = null
   ): UriAttachment {
     return UriAttachment(
-      dataUri = uri,
-      contentType = contentType,
-      transferState = transferState,
-      size = size,
-      width = 0,
-      height = 0,
-      fileName = fileName,
-      fastPreflightId = null,
-      voiceNote = voiceNote,
-      borderless = borderless,
-      videoGif = videoGif,
-      quote = quote,
-      caption = caption,
-      stickerLocator = stickerLocator,
-      blurHash = blurHash,
-      audioHash = audioHash,
-      transformProperties = transformProperties,
-      uuid = uuid
+      uri,
+      contentType,
+      transferState,
+      size,
+      fileName,
+      voiceNote,
+      borderless,
+      videoGif,
+      quote,
+      caption,
+      stickerLocator,
+      blurHash,
+      audioHash,
+      transformProperties
     )
   }
 }

app/src/androidTest/java/org/thoughtcrime/securesms/database/helpers/migration/FixInAppCurrencyIfAbleTest.kt

@@ -1,148 +0,0 @@
-/*
- * Copyright 2024 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.database.helpers.migration
-
-import android.app.Application
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.core.util.readToSingleObject
-import org.signal.core.util.requireNonNullString
-import org.signal.core.util.select
-import org.signal.core.util.update
-import org.signal.donations.InAppPaymentType
-import org.thoughtcrime.securesms.components.settings.app.subscription.DonationSerializationHelper.toDecimalValue
-import org.thoughtcrime.securesms.database.InAppPaymentSubscriberTable
-import org.thoughtcrime.securesms.database.InAppPaymentTable
-import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
-import org.thoughtcrime.securesms.database.model.databaseprotos.FiatValue
-import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
-import org.thoughtcrime.securesms.testing.SignalDatabaseRule
-import org.thoughtcrime.securesms.testing.assertIs
-import org.whispersystems.signalservice.api.subscriptions.SubscriberId
-import java.math.BigDecimal
-import java.util.Currency
-
-@RunWith(AndroidJUnit4::class)
-class FixInAppCurrencyIfAbleTest {
-
-  @get:Rule
-  val harness = SignalDatabaseRule(deleteAllThreadsOnEachRun = false)
-
-  @Test
-  fun givenNoSubscribers_whenIMigrate_thenIDoNothing() {
-    migrate()
-  }
-
-  @Test
-  fun givenASubscriberButNoPayment_whenIMigrate_thenIDoNothing() {
-    val subscriber = insertSubscriber("USD")
-    clearCurrencyCode(subscriber)
-    migrate()
-
-    getCurrencyCode(subscriber) assertIs ""
-  }
-
-  @Test
-  fun givenASubscriberAndMismatchedPayment_whenIMigrate_thenIDoNothing() {
-    val subscriber = insertSubscriber("USD")
-    val otherSubscriber = insertSubscriber("EUR")
-    insertPayment(otherSubscriber)
-    clearCurrencyCode(subscriber)
-    migrate()
-
-    getCurrencyCode(subscriber) assertIs ""
-  }
-
-  @Test
-  fun givenASubscriberAndPaymentWithNoSubscriber_whenIMigrate_thenDoNothing() {
-    val subscriber = insertSubscriber("USD")
-    insertPayment(null)
-    clearCurrencyCode(subscriber)
-    migrate()
-
-    getCurrencyCode(subscriber) assertIs ""
-  }
-
-  @Test
-  fun givenASubscriberAndMatchingPayment_whenIMigrate_thenUpdateCurrencyCode() {
-    val subscriber = insertSubscriber("USD")
-    insertPayment(subscriber)
-    clearCurrencyCode(subscriber)
-    migrate()
-
-    getCurrencyCode(subscriber) assertIs "USD"
-  }
-
-  @Test
-  fun givenASupercededSubscriber_whenIMigrate_thenIDoNothing() {
-    val oldSubscriber = insertSubscriber("USD")
-    insertPayment(oldSubscriber)
-    clearCurrencyCode(oldSubscriber)
-    insertSubscriber("USD")
-    migrate()
-  }
-
-  private fun migrate() {
-    V236_FixInAppSubscriberCurrencyIfAble.migrate(
-      context = InstrumentationRegistry.getInstrumentation().targetContext.applicationContext as Application,
-      db = SignalDatabase.rawDatabase,
-      oldVersion = 0,
-      newVersion = 0
-    )
-  }
-
-  private fun insertSubscriber(currencyCode: String): InAppPaymentSubscriberRecord {
-    val record = InAppPaymentSubscriberRecord(
-      subscriberId = SubscriberId.generate(),
-      currency = Currency.getInstance(currencyCode),
-      type = InAppPaymentSubscriberRecord.Type.DONATION,
-      requiresCancel = false,
-      paymentMethodType = InAppPaymentData.PaymentMethodType.PAYPAL
-    )
-
-    SignalDatabase.inAppPaymentSubscribers.insertOrReplace(record)
-
-    return record
-  }
-
-  private fun clearCurrencyCode(inAppPaymentSubscriberRecord: InAppPaymentSubscriberRecord) {
-    SignalDatabase.rawDatabase.update(InAppPaymentSubscriberTable.TABLE_NAME)
-      .values(InAppPaymentSubscriberTable.CURRENCY_CODE to "")
-      .where("${InAppPaymentSubscriberTable.SUBSCRIBER_ID} = ?", inAppPaymentSubscriberRecord.subscriberId.serialize())
-      .run()
-  }
-
-  private fun getCurrencyCode(inAppPaymentSubscriberRecord: InAppPaymentSubscriberRecord): String {
-    return SignalDatabase.rawDatabase.select(InAppPaymentSubscriberTable.CURRENCY_CODE)
-      .from(InAppPaymentSubscriberTable.TABLE_NAME)
-      .where("${InAppPaymentSubscriberTable.SUBSCRIBER_ID} = ?", inAppPaymentSubscriberRecord.subscriberId.serialize())
-      .run()
-      .readToSingleObject { it.requireNonNullString(InAppPaymentSubscriberTable.CURRENCY_CODE) }!!
-  }
-
-  private fun insertPayment(inAppPaymentSubscriberRecord: InAppPaymentSubscriberRecord?): InAppPaymentTable.InAppPayment {
-    val id = SignalDatabase.inAppPayments.insert(
-      type = InAppPaymentType.RECURRING_DONATION,
-      state = InAppPaymentTable.State.END,
-      subscriberId = inAppPaymentSubscriberRecord?.subscriberId,
-      endOfPeriod = null,
-      inAppPaymentData = InAppPaymentData(
-        amount = FiatValue(
-          currencyCode = inAppPaymentSubscriberRecord?.currency?.currencyCode ?: "USD",
-          amount = BigDecimal.ONE.toDecimalValue()
-        ),
-        level = 200,
-        paymentMethodType = inAppPaymentSubscriberRecord?.paymentMethodType ?: InAppPaymentData.PaymentMethodType.UNKNOWN
-      )
-    )
-
-    return SignalDatabase.inAppPayments.getById(id)!!
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/dependencies/InstrumentationApplicationDependencyProvider.kt

@@ -1,95 +1,80 @@
 package org.thoughtcrime.securesms.dependencies
 
 import android.app.Application
-import io.mockk.spyk
 import okhttp3.ConnectionSpec
-import okhttp3.Response
-import okhttp3.WebSocket
-import okhttp3.WebSocketListener
 import okhttp3.mockwebserver.Dispatcher
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
 import okhttp3.mockwebserver.RecordedRequest
-import okio.ByteString
 import org.mockito.kotlin.any
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
-import org.signal.core.util.Base64
-import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.BuildConfig
+import org.thoughtcrime.securesms.KbsEnclave
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess
 import org.thoughtcrime.securesms.push.SignalServiceTrustStore
 import org.thoughtcrime.securesms.recipients.LiveRecipientCache
-import org.thoughtcrime.securesms.testing.Get
 import org.thoughtcrime.securesms.testing.Verb
 import org.thoughtcrime.securesms.testing.runSync
-import org.thoughtcrime.securesms.testing.success
-import org.whispersystems.signalservice.api.SignalServiceDataStore
-import org.whispersystems.signalservice.api.SignalServiceMessageSender
-import org.whispersystems.signalservice.api.SignalWebSocket
+import org.thoughtcrime.securesms.util.Base64
+import org.whispersystems.signalservice.api.KeyBackupService
+import org.whispersystems.signalservice.api.SignalServiceAccountManager
 import org.whispersystems.signalservice.api.push.TrustStore
 import org.whispersystems.signalservice.internal.configuration.SignalCdnUrl
 import org.whispersystems.signalservice.internal.configuration.SignalCdsiUrl
+import org.whispersystems.signalservice.internal.configuration.SignalContactDiscoveryUrl
+import org.whispersystems.signalservice.internal.configuration.SignalKeyBackupServiceUrl
 import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration
 import org.whispersystems.signalservice.internal.configuration.SignalServiceUrl
 import org.whispersystems.signalservice.internal.configuration.SignalStorageUrl
-import org.whispersystems.signalservice.internal.configuration.SignalSvr2Url
+import java.security.KeyStore
 import java.util.Optional
 
 /**
  * Dependency provider used for instrumentation tests (aka androidTests).
  *
- * Handles setting up a mock web server for API calls, and provides mockable versions of [SignalServiceNetworkAccess].
+ * Handles setting up a mock web server for API calls, and provides mockable versions of [SignalServiceNetworkAccess] and
+ * [KeyBackupService].
  */
-class InstrumentationApplicationDependencyProvider(val application: Application, private val default: ApplicationDependencyProvider) : AppDependencies.Provider by default {
+class InstrumentationApplicationDependencyProvider(application: Application, default: ApplicationDependencyProvider) : ApplicationDependencies.Provider by default {
 
   private val serviceTrustStore: TrustStore
   private val uncensoredConfiguration: SignalServiceConfiguration
   private val serviceNetworkAccessMock: SignalServiceNetworkAccess
+  private val keyBackupService: KeyBackupService
   private val recipientCache: LiveRecipientCache
-  private var signalServiceMessageSender: SignalServiceMessageSender? = null
 
   init {
     runSync {
       webServer = MockWebServer()
       baseUrl = webServer.url("").toString()
-
-      addMockWebRequestHandlers(
-        Get("/v1/websocket/?login=") {
-          MockResponse().success().withWebSocketUpgrade(mockIdentifiedWebSocket)
-        },
-        Get("/v1/websocket", {
-          val path = it.path
-          return@Get path == null || !path.contains("login")
-        }) {
-          MockResponse().success().withWebSocketUpgrade(object : WebSocketListener() {})
-        }
-      )
     }
 
-    webServer.dispatcher = object : Dispatcher() {
+    webServer.setDispatcher(object : Dispatcher() {
       override fun dispatch(request: RecordedRequest): MockResponse {
-        val handler = handlers.firstOrNull { it.requestPredicate(request) }
+        val handler = handlers.firstOrNull {
+          request.method == it.verb && request.path.startsWith("/${it.path}")
+        }
         return handler?.responseFactory?.invoke(request) ?: MockResponse().setResponseCode(500)
       }
-    }
+    })
 
     serviceTrustStore = SignalServiceTrustStore(application)
     uncensoredConfiguration = SignalServiceConfiguration(
-      signalServiceUrls = arrayOf(SignalServiceUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT)),
-      signalCdnUrlMap = mapOf(
+      arrayOf(SignalServiceUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT)),
+      mapOf(
         0 to arrayOf(SignalCdnUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT)),
         2 to arrayOf(SignalCdnUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT))
       ),
-      signalStorageUrls = arrayOf(SignalStorageUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT)),
-      signalCdsiUrls = arrayOf(SignalCdsiUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT)),
-      signalSvr2Urls = arrayOf(SignalSvr2Url(baseUrl, serviceTrustStore, "localhost", ConnectionSpec.CLEARTEXT)),
-      networkInterceptors = emptyList(),
-      dns = Optional.of(SignalServiceNetworkAccess.DNS),
-      signalProxy = Optional.empty(),
-      zkGroupServerPublicParams = Base64.decode(BuildConfig.ZKGROUP_SERVER_PUBLIC_PARAMS),
-      genericServerPublicParams = Base64.decode(BuildConfig.GENERIC_SERVER_PUBLIC_PARAMS),
-      backupServerPublicParams = Base64.decode(BuildConfig.BACKUP_SERVER_PUBLIC_PARAMS)
+      arrayOf(SignalContactDiscoveryUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT)),
+      arrayOf(SignalKeyBackupServiceUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT)),
+      arrayOf(SignalStorageUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT)),
+      arrayOf(SignalCdsiUrl(baseUrl, "localhost", serviceTrustStore, ConnectionSpec.CLEARTEXT)),
+      emptyList(),
+      Optional.of(SignalServiceNetworkAccess.DNS),
+      Optional.empty(),
+      Base64.decode(BuildConfig.ZKGROUP_SERVER_PUBLIC_PARAMS),
+      true
     )
 
     serviceNetworkAccessMock = mock {
@@ -98,6 +83,8 @@ class InstrumentationApplicationDependencyProvider(val application: Application,
       on { uncensoredConfiguration } doReturn uncensoredConfiguration
     }
 
+    keyBackupService = mock()
+
     recipientCache = LiveRecipientCache(application) { r -> r.run() }
   }
 
@@ -105,66 +92,26 @@ class InstrumentationApplicationDependencyProvider(val application: Application,
     return serviceNetworkAccessMock
   }
 
+  override fun provideKeyBackupService(signalServiceAccountManager: SignalServiceAccountManager, keyStore: KeyStore, enclave: KbsEnclave): KeyBackupService {
+    return keyBackupService
+  }
+
   override fun provideRecipientCache(): LiveRecipientCache {
     return recipientCache
   }
 
-  override fun provideSignalServiceMessageSender(
-    signalWebSocket: SignalWebSocket,
-    protocolStore: SignalServiceDataStore,
-    signalServiceConfiguration: SignalServiceConfiguration
-  ): SignalServiceMessageSender {
-    if (signalServiceMessageSender == null) {
-      signalServiceMessageSender = spyk(objToCopy = default.provideSignalServiceMessageSender(signalWebSocket, protocolStore, signalServiceConfiguration))
-    }
-    return signalServiceMessageSender!!
-  }
-
-  class MockWebSocket : WebSocketListener() {
-    private val TAG = "MockWebSocket"
-
-    var webSocket: WebSocket? = null
-      private set
-
-    override fun onOpen(webSocket: WebSocket, response: Response) {
-      Log.i(TAG, "onOpen(${webSocket.hashCode()})")
-      this.webSocket = webSocket
-    }
-
-    override fun onClosing(webSocket: WebSocket, code: Int, reason: String) {
-      Log.i(TAG, "onClosing(${webSocket.hashCode()}): $code, $reason")
-      this.webSocket = null
-    }
-
-    override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
-      Log.i(TAG, "onClosed(${webSocket.hashCode()}): $code, $reason")
-      this.webSocket = null
-    }
-
-    override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
-      Log.w(TAG, "onFailure(${webSocket.hashCode()})", t)
-      this.webSocket = null
-    }
-  }
-
   companion object {
     lateinit var webServer: MockWebServer
       private set
     lateinit var baseUrl: String
       private set
 
-    val mockIdentifiedWebSocket = MockWebSocket()
-
     private val handlers: MutableList<Verb> = mutableListOf()
 
     fun addMockWebRequestHandlers(vararg verbs: Verb) {
       handlers.addAll(verbs)
     }
 
-    fun injectWebSocketMessage(value: ByteString) {
-      mockIdentifiedWebSocket.webSocket!!.send(value)
-    }
-
     fun clearHandlers() {
       handlers.clear()
     }

app/src/androidTest/java/org/thoughtcrime/securesms/jobs/AttachmentCompressionJobTest.kt

@@ -1,84 +0,0 @@
-/*
- * Copyright 2023 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.jobs
-
-import android.net.Uri
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.core.util.StreamUtil
-import org.thoughtcrime.securesms.attachments.UriAttachment
-import org.thoughtcrime.securesms.database.AttachmentTable
-import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.database.UriAttachmentBuilder
-import org.thoughtcrime.securesms.dependencies.AppDependencies
-import org.thoughtcrime.securesms.jobmanager.Job
-import org.thoughtcrime.securesms.mms.SentMediaQuality
-import org.thoughtcrime.securesms.providers.BlobProvider
-import org.thoughtcrime.securesms.testing.SignalActivityRule
-import org.thoughtcrime.securesms.testing.assertIs
-import org.thoughtcrime.securesms.util.MediaUtil
-import java.util.Optional
-import java.util.concurrent.CountDownLatch
-
-@RunWith(AndroidJUnit4::class)
-class AttachmentCompressionJobTest {
-
-  @get:Rule
-  val harness = SignalActivityRule()
-
-  @Test
-  fun testCompressionJobsWithDifferentTransformPropertiesCompleteSuccessfully() {
-    val imageBytes: ByteArray = InstrumentationRegistry.getInstrumentation().context.resources.assets.open("images/sample_image.png").use {
-      StreamUtil.readFully(it)
-    }
-
-    val blob = BlobProvider.getInstance().forData(imageBytes).createForSingleSessionOnDisk(AppDependencies.application)
-
-    val firstPreUpload = createAttachment(1, blob, AttachmentTable.TransformProperties.empty())
-    val firstDatabaseAttachment = SignalDatabase.attachments.insertAttachmentForPreUpload(firstPreUpload)
-
-    val firstCompressionJob: AttachmentCompressionJob = AttachmentCompressionJob.fromAttachment(firstDatabaseAttachment, false, -1)
-
-    var secondCompressionJob: AttachmentCompressionJob? = null
-    var firstJobResult: Job.Result? = null
-    var secondJobResult: Job.Result? = null
-
-    val secondJobLatch = CountDownLatch(1)
-    val jobThread = Thread {
-      firstCompressionJob.setContext(AppDependencies.application)
-      firstJobResult = firstCompressionJob.run()
-
-      secondJobLatch.await()
-
-      secondCompressionJob!!.setContext(AppDependencies.application)
-      secondJobResult = secondCompressionJob!!.run()
-    }
-
-    jobThread.start()
-    val secondPreUpload = createAttachment(1, blob, AttachmentTable.TransformProperties.forSentMediaQuality(Optional.empty(), SentMediaQuality.HIGH))
-    val secondDatabaseAttachment = SignalDatabase.attachments.insertAttachmentForPreUpload(secondPreUpload)
-    secondCompressionJob = AttachmentCompressionJob.fromAttachment(secondDatabaseAttachment, false, -1)
-
-    secondJobLatch.countDown()
-
-    jobThread.join()
-
-    firstJobResult!!.isSuccess assertIs true
-    secondJobResult!!.isSuccess assertIs true
-  }
-
-  private fun createAttachment(id: Long, uri: Uri, transformProperties: AttachmentTable.TransformProperties): UriAttachment {
-    return UriAttachmentBuilder.build(
-      id,
-      uri = uri,
-      contentType = MediaUtil.IMAGE_JPEG,
-      transformProperties = transformProperties
-    )
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/jobs/JobManagerPerformanceTests.kt

@@ -1,117 +0,0 @@
-/*
- * Copyright 2024 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.jobs
-
-import android.app.Application
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Ignore
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.core.util.EventTimer
-import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.database.JobDatabase.Companion.getInstance
-import org.thoughtcrime.securesms.dependencies.AppDependencies
-import org.thoughtcrime.securesms.jobmanager.Job
-import org.thoughtcrime.securesms.jobmanager.JobManager
-import org.thoughtcrime.securesms.jobmanager.JobMigrator
-import org.thoughtcrime.securesms.jobmanager.JobTracker
-import org.thoughtcrime.securesms.util.TextSecurePreferences
-import java.util.concurrent.CountDownLatch
-import kotlin.random.Random
-
-@Ignore("This is just for testing performance, not correctness, and they can therefore take a long time. Run them manually when you need to.")
-@RunWith(AndroidJUnit4::class)
-class JobManagerPerformanceTests {
-
-  companion object {
-    val TAG = Log.tag(JobManagerPerformanceTests::class.java)
-  }
-
-  @Test
-  fun testPerformance_singleQueue() {
-    runTest("singleQueue", 2000) { TestJob(queue = "queue") }
-  }
-
-  @Test
-  fun testPerformance_fourQueues() {
-    runTest("fourQueues", 2000) { TestJob(queue = "queue-${Random.nextInt(1, 5)}") }
-  }
-
-  @Test
-  fun testPerformance_noQueues() {
-    runTest("noQueues", 2000) { TestJob(queue = null) }
-  }
-
-  private fun runTest(name: String, count: Int, jobCreator: () -> TestJob) {
-    val context = AppDependencies.application
-    val jobManager = testJobManager(context)
-
-    jobManager.beginJobLoop()
-
-    val eventTimer = EventTimer()
-
-    val latch = CountDownLatch(count)
-    var seenStart = false
-    jobManager.addListener({ it.factoryKey == TestJob.KEY }) { _, state ->
-      if (!seenStart && state == JobTracker.JobState.RUNNING) {
-        // Adding the jobs can take a while (and runs on a background thread), so we want to reset the timer the first time we see a job run so the first job
-        // doesn't have a skewed time
-        eventTimer.reset()
-        seenStart = true
-      }
-      if (state.isComplete) {
-        eventTimer.emit("job")
-        latch.countDown()
-        if (latch.count % 100 == 0L) {
-          Log.d(TAG, "[$name] Finished ${count - latch.count}/$count jobs")
-        }
-      }
-    }
-
-    Log.i(TAG, "[$name] Adding jobs...")
-    jobManager.addAll((1..count).map { jobCreator() })
-
-    Log.i(TAG, "[$name] Waiting for jobs to complete...")
-    latch.await()
-    Log.i(TAG, "[$name] Jobs complete!")
-    Log.i(TAG, eventTimer.stop().summary)
-  }
-
-  private fun testJobManager(context: Application): JobManager {
-    val config = JobManager.Configuration.Builder()
-      .setJobFactories(
-        JobManagerFactories.getJobFactories(context) + mapOf(
-          TestJob.KEY to TestJob.Factory()
-        )
-      )
-      .setConstraintFactories(JobManagerFactories.getConstraintFactories(context))
-      .setConstraintObservers(JobManagerFactories.getConstraintObservers(context))
-      .setJobStorage(FastJobStorage(getInstance(context)))
-      .setJobMigrator(JobMigrator(TextSecurePreferences.getJobManagerVersion(context), JobManager.CURRENT_VERSION, JobManagerFactories.getJobMigrations(context)))
-      .build()
-
-    return JobManager(context, config)
-  }
-
-  private class TestJob(params: Parameters) : Job(params) {
-    companion object {
-      const val KEY = "test"
-    }
-
-    constructor(queue: String?) : this(Parameters.Builder().setQueue(queue).build())
-
-    override fun serialize(): ByteArray? = null
-    override fun getFactoryKey(): String = KEY
-    override fun run(): Result = Result.success()
-    override fun onFailure() = Unit
-
-    class Factory : Job.Factory<TestJob> {
-      override fun create(parameters: Parameters, serializedData: ByteArray?): TestJob {
-        return TestJob(parameters)
-      }
-    }
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/jobs/PreKeysSyncJobTest.kt

@@ -0,0 +1,212 @@
+package org.thoughtcrime.securesms.jobs
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import okhttp3.mockwebserver.MockResponse
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.signal.libsignal.protocol.ecc.Curve
+import org.thoughtcrime.securesms.crypto.storage.PreKeyMetadataStore
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
+import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
+import org.thoughtcrime.securesms.jobmanager.Job
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.thoughtcrime.securesms.testing.Get
+import org.thoughtcrime.securesms.testing.Put
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+import org.thoughtcrime.securesms.testing.assertIs
+import org.thoughtcrime.securesms.testing.assertIsNot
+import org.thoughtcrime.securesms.testing.parsedRequestBody
+import org.thoughtcrime.securesms.testing.success
+import org.whispersystems.signalservice.api.push.SignedPreKeyEntity
+import org.whispersystems.signalservice.internal.push.PreKeyState
+import org.whispersystems.signalservice.internal.push.PreKeyStatus
+
+@RunWith(AndroidJUnit4::class)
+class PreKeysSyncJobTest {
+
+  @get:Rule
+  val harness = SignalActivityRule()
+
+  private val aciPreKeyMeta: PreKeyMetadataStore
+    get() = SignalStore.account().aciPreKeys
+
+  private val pniPreKeyMeta: PreKeyMetadataStore
+    get() = SignalStore.account().pniPreKeys
+
+  private lateinit var job: PreKeysSyncJob
+
+  @Before
+  fun setUp() {
+    job = PreKeysSyncJob()
+  }
+
+  @After
+  fun tearDown() {
+    InstrumentationApplicationDependencyProvider.clearHandlers()
+  }
+
+  /**
+   * Create signed prekeys for both identities when both do not have registered prekeys according
+   * to our local state.
+   */
+  @Test
+  fun runWithoutRegisteredKeysForBothIdentities() {
+    // GIVEN
+    aciPreKeyMeta.isSignedPreKeyRegistered = false
+    pniPreKeyMeta.isSignedPreKeyRegistered = false
+
+    lateinit var aciSignedPreKey: SignedPreKeyEntity
+    lateinit var pniSignedPreKey: SignedPreKeyEntity
+
+    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
+      Put("/v2/keys/signed?identity=aci") { r ->
+        aciSignedPreKey = r.parsedRequestBody()
+        MockResponse().success()
+      },
+      Put("/v2/keys/signed?identity=pni") { r ->
+        pniSignedPreKey = r.parsedRequestBody()
+        MockResponse().success()
+      },
+    )
+
+    // WHEN
+    val result: Job.Result = job.run()
+
+    // THEN
+    result.isSuccess assertIs true
+
+    aciPreKeyMeta.isSignedPreKeyRegistered assertIs true
+    pniPreKeyMeta.isSignedPreKeyRegistered assertIs true
+
+    val aciVerifySignatureResult = Curve.verifySignature(
+      ApplicationDependencies.getProtocolStore().aci().identityKeyPair.publicKey.publicKey,
+      aciSignedPreKey.publicKey.serialize(),
+      aciSignedPreKey.signature
+    )
+    aciVerifySignatureResult assertIs true
+
+    val pniVerifySignatureResult = Curve.verifySignature(
+      ApplicationDependencies.getProtocolStore().pni().identityKeyPair.publicKey.publicKey,
+      pniSignedPreKey.publicKey.serialize(),
+      pniSignedPreKey.signature
+    )
+    pniVerifySignatureResult assertIs true
+  }
+
+  /**
+   * With 100 prekeys registered for each identity, do nothing.
+   */
+  @Test
+  fun runWithRegisteredKeysForBothIdentities() {
+    // GIVEN
+    val currentAciKeyId = aciPreKeyMeta.activeSignedPreKeyId
+    val currentPniKeyId = pniPreKeyMeta.activeSignedPreKeyId
+
+    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
+      Get("/v2/keys?identity=aci") { MockResponse().success(PreKeyStatus(100)) },
+      Get("/v2/keys?identity=pni") { MockResponse().success(PreKeyStatus(100)) },
+    )
+
+    // WHEN
+    val result: Job.Result = job.run()
+
+    // THEN
+    result.isSuccess assertIs true
+
+    aciPreKeyMeta.activeSignedPreKeyId assertIs currentAciKeyId
+    pniPreKeyMeta.activeSignedPreKeyId assertIs currentPniKeyId
+  }
+
+  /**
+   * With 100 prekeys registered for ACI, but no PNI prekeys registered according to local state,
+   * do nothing for ACI but create PNI prekeys and update local state.
+   */
+  @Test
+  fun runWithRegisteredKeysForAciIdentityOnly() {
+    // GIVEN
+    pniPreKeyMeta.isSignedPreKeyRegistered = false
+
+    val currentAciKeyId = aciPreKeyMeta.activeSignedPreKeyId
+    val currentPniKeyId = pniPreKeyMeta.activeSignedPreKeyId
+
+    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
+      Get("/v2/keys?identity=aci") { MockResponse().success(PreKeyStatus(100)) },
+      Put("/v2/keys/signed?identity=pni") { MockResponse().success() },
+    )
+
+    // WHEN
+    val result: Job.Result = job.run()
+
+    // THEN
+    result.isSuccess assertIs true
+
+    pniPreKeyMeta.isSignedPreKeyRegistered assertIs true
+    aciPreKeyMeta.activeSignedPreKeyId assertIs currentAciKeyId
+    pniPreKeyMeta.activeSignedPreKeyId assertIsNot currentPniKeyId
+  }
+
+  /**
+   * With <10 prekeys registered for each identity, upload new.
+   */
+  @Test
+  fun runWithLowNumberOfRegisteredKeysForBothIdentities() {
+    // GIVEN
+    val currentAciKeyId = aciPreKeyMeta.activeSignedPreKeyId
+    val currentPniKeyId = pniPreKeyMeta.activeSignedPreKeyId
+
+    val currentNextAciPreKeyId = aciPreKeyMeta.nextOneTimePreKeyId
+    val currentNextPniPreKeyId = pniPreKeyMeta.nextOneTimePreKeyId
+
+    lateinit var aciPreKeyStateRequest: PreKeyState
+    lateinit var pniPreKeyStateRequest: PreKeyState
+
+    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
+      Get("/v2/keys?identity=aci") { MockResponse().success(PreKeyStatus(5)) },
+      Get("/v2/keys?identity=pni") { MockResponse().success(PreKeyStatus(5)) },
+      Put("/v2/keys/?identity=aci") { r ->
+        aciPreKeyStateRequest = r.parsedRequestBody()
+        MockResponse().success()
+      },
+      Put("/v2/keys/?identity=pni") { r ->
+        pniPreKeyStateRequest = r.parsedRequestBody()
+        MockResponse().success()
+      },
+    )
+
+    // WHEN
+    val result: Job.Result = job.run()
+
+    // THEN
+    result.isSuccess assertIs true
+    aciPreKeyMeta.activeSignedPreKeyId assertIsNot currentAciKeyId
+    pniPreKeyMeta.activeSignedPreKeyId assertIsNot currentPniKeyId
+
+    aciPreKeyMeta.nextOneTimePreKeyId assertIsNot currentNextAciPreKeyId
+    pniPreKeyMeta.nextOneTimePreKeyId assertIsNot currentNextPniPreKeyId
+
+    ApplicationDependencies.getProtocolStore().aci().identityKeyPair.publicKey.let { aciIdentityKey ->
+      aciPreKeyStateRequest.identityKey assertIs aciIdentityKey
+
+      val verifySignatureResult = Curve.verifySignature(
+        aciIdentityKey.publicKey,
+        aciPreKeyStateRequest.signedPreKey.publicKey.serialize(),
+        aciPreKeyStateRequest.signedPreKey.signature
+      )
+      verifySignatureResult assertIs true
+    }
+
+    ApplicationDependencies.getProtocolStore().pni().identityKeyPair.publicKey.let { pniIdentityKey ->
+      pniPreKeyStateRequest.identityKey assertIs pniIdentityKey
+
+      val verifySignatureResult = Curve.verifySignature(
+        pniIdentityKey.publicKey,
+        pniPreKeyStateRequest.signedPreKey.publicKey.serialize(),
+        pniPreKeyStateRequest.signedPreKey.signature
+      )
+      verifySignatureResult assertIs true
+    }
+  }
+}

app/src/androidTest/java/org/thoughtcrime/securesms/lock/PinHashing_hashPin_Test.java

@@ -5,10 +5,9 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.signal.core.util.Hex;
-import org.signal.libsignal.svr2.PinHash;
+import org.whispersystems.signalservice.api.kbs.HashedPin;
 import org.whispersystems.signalservice.api.kbs.KbsData;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
-import org.whispersystems.signalservice.api.kbs.PinHashUtil;
 
 import java.io.IOException;
 
@@ -22,76 +21,77 @@ public final class PinHashing_hashPin_Test {
   @Test
   public void argon2_hashed_pin_password() throws IOException {
     String    pin       = "password";
-    byte[]    salt      = Hex.fromStringCondensed("000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f");
+    byte[]    backupId  = Hex.fromStringCondensed("000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f");
     MasterKey masterKey = new MasterKey(Hex.fromStringCondensed("202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f"));
 
-    PinHash hashedPin = PinHashUtil.hashPin(pin, salt);
-    KbsData kbsData   = PinHashUtil.createNewKbsData(hashedPin, masterKey);
+    HashedPin hashedPin = PinHashing.hashPin(pin, () -> backupId);
+    KbsData   kbsData   = hashedPin.createNewKbsData(masterKey);
 
-    assertArrayEquals(hashedPin.accessKey(), kbsData.getKbsAccessKey());
+    assertArrayEquals(hashedPin.getKbsAccessKey(), kbsData.getKbsAccessKey());
     assertArrayEquals(Hex.fromStringCondensed("ab7e8499d21f80a6600b3b9ee349ac6d72c07e3359fe885a934ba7aa844429f8"), kbsData.getKbsAccessKey());
     assertArrayEquals(Hex.fromStringCondensed("3f33ce58eb25b40436592a30eae2a8fabab1899095f4e2fba6e2d0dc43b4a2d9cac5a3931748522393951e0e54dec769"), kbsData.getCipherText());
     assertEquals(masterKey, kbsData.getMasterKey());
 
-    String localPinHash = PinHashUtil.localPinHash(pin);
-    assertTrue(PinHashUtil.verifyLocalPinHash(localPinHash, pin));
+    String localPinHash = PinHashing.localPinHash(pin);
+    assertTrue(PinHashing.verifyLocalPinHash(localPinHash, pin));
   }
 
   @Test
   public void argon2_hashed_pin_another_password() throws IOException {
     String    pin       = "anotherpassword";
-    byte[]    salt      = Hex.fromStringCondensed("202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f");
+    byte[]    backupId  = Hex.fromStringCondensed("202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f");
     MasterKey masterKey = new MasterKey(Hex.fromStringCondensed("88a787415a2ecd79da0d1016a82a27c5c695c9a19b88b0aa1d35683280aa9a67"));
 
-    PinHash hashedPin = PinHashUtil.hashPin(pin, salt);
-    KbsData kbsData   = PinHashUtil.createNewKbsData(hashedPin, masterKey);
+    HashedPin hashedPin = PinHashing.hashPin(pin, () -> backupId);
+    KbsData   kbsData   = hashedPin.createNewKbsData(masterKey);
 
-    assertArrayEquals(hashedPin.accessKey(), kbsData.getKbsAccessKey());
+    assertArrayEquals(hashedPin.getKbsAccessKey(), kbsData.getKbsAccessKey());
     assertArrayEquals(Hex.fromStringCondensed("301d9dd1e96f20ce51083f67d3298fd37b97525de8324d5e12ed2d407d3d927b"), kbsData.getKbsAccessKey());
     assertArrayEquals(Hex.fromStringCondensed("9d9b05402ea39c17ff1c9298c8a0e86784a352aa02a74943bf8bcf07ec0f4b574a5b786ad0182c8d308d9eb06538b8c9"), kbsData.getCipherText());
     assertEquals(masterKey, kbsData.getMasterKey());
 
-    String localPinHash = PinHashUtil.localPinHash(pin);
-    assertTrue(PinHashUtil.verifyLocalPinHash(localPinHash, pin));
+    String localPinHash = PinHashing.localPinHash(pin);
+    assertTrue(PinHashing.verifyLocalPinHash(localPinHash, pin));
   }
 
   @Test
   public void argon2_hashed_pin_password_with_spaces_diacritics_and_non_arabic_numerals() throws IOException {
     String    pin       = " Pass६örd ";
-    byte[]    salt      = Hex.fromStringCondensed("cba811749042b303a6a7efa5ccd160aea5e3ea243c8d2692bd13d515732f51a8");
+    byte[]    backupId  = Hex.fromStringCondensed("cba811749042b303a6a7efa5ccd160aea5e3ea243c8d2692bd13d515732f51a8");
     MasterKey masterKey = new MasterKey(Hex.fromStringCondensed("9571f3fde1e58588ba49bcf82be1b301ca3859a6f59076f79a8f47181ef952bf"));
 
-    PinHash hashedPin = PinHashUtil.hashPin(pin, salt);
-    KbsData kbsData   = PinHashUtil.createNewKbsData(hashedPin, masterKey);
+    HashedPin hashedPin = PinHashing.hashPin(pin, () -> backupId);
+    KbsData   kbsData   = hashedPin.createNewKbsData(masterKey);
 
-    assertArrayEquals(hashedPin.accessKey(), kbsData.getKbsAccessKey());
+    assertArrayEquals(hashedPin.getKbsAccessKey(), kbsData.getKbsAccessKey());
     assertArrayEquals(Hex.fromStringCondensed("ab645acdccc1652a48a34b2ac6926340ff35c03034013f68760f20013f028dd8"), kbsData.getKbsAccessKey());
     assertArrayEquals(Hex.fromStringCondensed("11c0ba1834db15e47c172f6c987c64bd4cfc69c6047dd67a022afeec0165a10943f204d5b8f37b3cb7bab21c6dfc39c8"), kbsData.getCipherText());
     assertEquals(masterKey, kbsData.getMasterKey());
 
     assertEquals("577939bccb2b6638c39222d5a97998a867c5e154e30b82cc120f2dd07a3de987", kbsData.getMasterKey().deriveRegistrationLock());
 
-    String localPinHash = PinHashUtil.localPinHash(pin);
-    assertTrue(PinHashUtil.verifyLocalPinHash(localPinHash, pin));
+    String localPinHash = PinHashing.localPinHash(pin);
+    assertTrue(PinHashing.verifyLocalPinHash(localPinHash, pin));
   }
 
   @Test
   public void argon2_hashed_pin_password_with_just_non_arabic_numerals() throws IOException {
     String    pin       = " ६१८ ";
-    byte[]    salt      = Hex.fromStringCondensed("717dc111a98423a57196512606822fca646c653facd037c10728f14ba0be2ab3");
+    byte[]    backupId  = Hex.fromStringCondensed("717dc111a98423a57196512606822fca646c653facd037c10728f14ba0be2ab3");
     MasterKey masterKey = new MasterKey(Hex.fromStringCondensed("0432d735b32f66d0e3a70d4f9cc821a8529521a4937d26b987715d8eff4e4c54"));
 
-    PinHash hashedPin = PinHashUtil.hashPin(pin, salt);
-    KbsData kbsData   = PinHashUtil.createNewKbsData(hashedPin, masterKey);
+    HashedPin hashedPin = PinHashing.hashPin(pin, () -> backupId);
+    KbsData   kbsData   = hashedPin.createNewKbsData(masterKey);
 
-    assertArrayEquals(hashedPin.accessKey(), kbsData.getKbsAccessKey());
+
+    assertArrayEquals(hashedPin.getKbsAccessKey(), kbsData.getKbsAccessKey());
     assertArrayEquals(Hex.fromStringCondensed("d2fedabd0d4c17a371491c9722578843a26be3b4923e28d452ab2fc5491e794b"), kbsData.getKbsAccessKey());
     assertArrayEquals(Hex.fromStringCondensed("877ef871ef1fc668401c717ef21aa12e8523579fb1ff4474b76f28c2293537c80cc7569996c9e0229bea7f378e3a824e"), kbsData.getCipherText());
     assertEquals(masterKey, kbsData.getMasterKey());
 
     assertEquals("23a75cb1df1a87df45cc2ed167c2bdc85ab1220b847c88761b0005cac907fce5", kbsData.getMasterKey().deriveRegistrationLock());
 
-    String localPinHash = PinHashUtil.localPinHash(pin);
-    assertTrue(PinHashUtil.verifyLocalPinHash(localPinHash, pin));
+    String localPinHash = PinHashing.localPinHash(pin);
+    assertTrue(PinHashing.verifyLocalPinHash(localPinHash, pin));
   }
 }

app/src/androidTest/java/org/thoughtcrime/securesms/messages/EditMessageSyncProcessorTest.kt

@@ -1,253 +0,0 @@
-package org.thoughtcrime.securesms.messages
-
-import android.database.Cursor
-import android.util.Base64
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.core.util.ThreadUtil
-import org.signal.core.util.readToList
-import org.signal.core.util.select
-import org.signal.core.util.withinTransaction
-import org.thoughtcrime.securesms.database.AttachmentTable
-import org.thoughtcrime.securesms.database.MessageTable
-import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.database.ThreadTable
-import org.thoughtcrime.securesms.database.model.toBodyRangeList
-import org.thoughtcrime.securesms.mms.OutgoingMessage
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.testing.MessageContentFuzzer
-import org.thoughtcrime.securesms.testing.SignalActivityRule
-import org.thoughtcrime.securesms.testing.assertIs
-import org.thoughtcrime.securesms.util.MessageTableTestUtils
-import org.whispersystems.signalservice.internal.push.Content
-import org.whispersystems.signalservice.internal.push.EditMessage
-import org.whispersystems.signalservice.internal.push.SyncMessage
-import kotlin.time.Duration.Companion.seconds
-
-@RunWith(AndroidJUnit4::class)
-class EditMessageSyncProcessorTest {
-
-  companion object {
-    private val IGNORE_MESSAGE_COLUMNS = listOf(
-      MessageTable.DATE_RECEIVED,
-      MessageTable.NOTIFIED_TIMESTAMP,
-      MessageTable.REACTIONS_LAST_SEEN,
-      MessageTable.NOTIFIED
-    )
-
-    private val IGNORE_ATTACHMENT_COLUMNS = listOf(
-      AttachmentTable.TRANSFER_FILE
-    )
-  }
-
-  @get:Rule
-  val harness = SignalActivityRule()
-
-  private lateinit var processorV2: MessageContentProcessor
-  private lateinit var testResult: TestResults
-  private var envelopeTimestamp: Long = 0
-
-  @Before
-  fun setup() {
-    processorV2 = MessageContentProcessor(harness.context)
-    envelopeTimestamp = System.currentTimeMillis()
-    testResult = TestResults()
-  }
-
-  @Test
-  fun textMessage() {
-    var originalTimestamp = envelopeTimestamp + 200
-    for (i in 1..10) {
-      originalTimestamp += 400
-
-      val toRecipient = Recipient.resolved(harness.others[0])
-
-      val content = MessageContentFuzzer.fuzzTextMessage()
-      val metadata = MessageContentFuzzer.envelopeMetadata(harness.self.id, toRecipient.id)
-      val syncContent = Content.Builder().syncMessage(
-        SyncMessage.Builder().sent(
-          SyncMessage.Sent.Builder()
-            .destinationServiceId(metadata.destinationServiceId.toString())
-            .timestamp(originalTimestamp)
-            .expirationStartTimestamp(originalTimestamp)
-            .message(content.dataMessage)
-            .build()
-        ).build()
-      ).build()
-      SignalDatabase.recipients.setExpireMessages(toRecipient.id, content.dataMessage?.expireTimer ?: 0)
-      val syncTextMessage = TestMessage(
-        envelope = MessageContentFuzzer.envelope(originalTimestamp),
-        content = syncContent,
-        metadata = metadata,
-        serverDeliveredTimestamp = MessageContentFuzzer.fuzzServerDeliveredTimestamp(originalTimestamp)
-      )
-
-      val editTimestamp = originalTimestamp + 200
-      val editedContent = MessageContentFuzzer.fuzzTextMessage()
-      val editSyncContent = Content.Builder().syncMessage(
-        SyncMessage.Builder().sent(
-          SyncMessage.Sent.Builder()
-            .destinationServiceId(metadata.destinationServiceId.toString())
-            .timestamp(editTimestamp)
-            .expirationStartTimestamp(editTimestamp)
-            .editMessage(
-              EditMessage.Builder()
-                .dataMessage(editedContent.dataMessage)
-                .targetSentTimestamp(originalTimestamp)
-                .build()
-            )
-            .build()
-        ).build()
-      ).build()
-
-      val syncEditMessage = TestMessage(
-        envelope = MessageContentFuzzer.envelope(editTimestamp),
-        content = editSyncContent,
-        metadata = metadata,
-        serverDeliveredTimestamp = MessageContentFuzzer.fuzzServerDeliveredTimestamp(editTimestamp)
-      )
-
-      testResult.runSync(listOf(syncTextMessage, syncEditMessage))
-
-      SignalDatabase.recipients.setExpireMessages(toRecipient.id, (content.dataMessage?.expireTimer ?: 0) / 1000)
-      val originalTextMessage = OutgoingMessage(
-        threadRecipient = toRecipient,
-        sentTimeMillis = originalTimestamp,
-        body = content.dataMessage?.body ?: "",
-        expiresIn = content.dataMessage?.expireTimer?.seconds?.inWholeMilliseconds ?: 0,
-        isUrgent = true,
-        isSecure = true,
-        bodyRanges = content.dataMessage?.bodyRanges.toBodyRangeList()
-      )
-      val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(toRecipient)
-      val originalMessageId = SignalDatabase.messages.insertMessageOutbox(originalTextMessage, threadId, false, null)
-      SignalDatabase.messages.markAsSent(originalMessageId, true)
-      if ((content.dataMessage?.expireTimer ?: 0) > 0) {
-        SignalDatabase.messages.markExpireStarted(originalMessageId, originalTimestamp)
-      }
-
-      val editMessage = OutgoingMessage(
-        threadRecipient = toRecipient,
-        sentTimeMillis = editTimestamp,
-        body = editedContent.dataMessage?.body ?: "",
-        expiresIn = content.dataMessage?.expireTimer?.seconds?.inWholeMilliseconds ?: 0,
-        isUrgent = true,
-        isSecure = true,
-        bodyRanges = editedContent.dataMessage?.bodyRanges.toBodyRangeList(),
-        messageToEdit = originalMessageId
-      )
-
-      val editMessageId = SignalDatabase.messages.insertMessageOutbox(editMessage, threadId, false, null)
-      SignalDatabase.messages.markAsSent(editMessageId, true)
-
-      if ((content.dataMessage?.expireTimer ?: 0) > 0) {
-        SignalDatabase.messages.markExpireStarted(editMessageId, originalTimestamp)
-      }
-      testResult.collectLocal()
-      testResult.assert()
-    }
-  }
-
-  private inner class TestResults {
-
-    private lateinit var localMessages: List<List<Pair<String, String?>>>
-    private lateinit var localAttachments: List<List<Pair<String, String?>>>
-
-    private lateinit var syncMessages: List<List<Pair<String, String?>>>
-    private lateinit var syncAttachments: List<List<Pair<String, String?>>>
-
-    fun collectLocal() {
-      harness.inMemoryLogger.clear()
-
-      localMessages = dumpMessages()
-      localAttachments = dumpAttachments()
-
-      cleanup()
-    }
-
-    fun runSync(messages: List<TestMessage>) {
-      messages.forEach { (envelope, content, metadata, serverDeliveredTimestamp) ->
-        if (content.syncMessage != null) {
-          processorV2.process(
-            envelope,
-            content,
-            metadata,
-            serverDeliveredTimestamp,
-            false
-          )
-          ThreadUtil.sleep(1)
-        }
-      }
-      harness.inMemoryLogger.clear()
-
-      syncMessages = dumpMessages()
-      syncAttachments = dumpAttachments()
-
-      cleanup()
-    }
-
-    fun cleanup() {
-      SignalDatabase.rawDatabase.withinTransaction { db ->
-        SignalDatabase.threads.deleteAllConversations()
-        db.execSQL("DELETE FROM sqlite_sequence WHERE name = '${MessageTable.TABLE_NAME}'")
-        db.execSQL("DELETE FROM sqlite_sequence WHERE name = '${ThreadTable.TABLE_NAME}'")
-        db.execSQL("DELETE FROM sqlite_sequence WHERE name = '${AttachmentTable.TABLE_NAME}'")
-      }
-    }
-
-    fun assert() {
-      syncMessages.zip(localMessages)
-        .forEach { (v2, v1) ->
-          v2.assertIs(v1)
-        }
-
-      syncAttachments.zip(localAttachments)
-        .forEach { (v2, v1) ->
-          v2.assertIs(v1)
-        }
-    }
-
-    private fun dumpMessages(): List<List<Pair<String, String?>>> {
-      return dumpTable(MessageTable.TABLE_NAME)
-        .map { row ->
-          val newRow = row.toMutableList()
-          newRow.removeIf { IGNORE_MESSAGE_COLUMNS.contains(it.first) }
-          newRow
-        }
-    }
-
-    private fun dumpAttachments(): List<List<Pair<String, String?>>> {
-      return dumpTable(AttachmentTable.TABLE_NAME)
-        .map { row ->
-          val newRow = row.toMutableList()
-          newRow.removeIf { IGNORE_ATTACHMENT_COLUMNS.contains(it.first) }
-          newRow
-        }
-    }
-
-    private fun dumpTable(table: String): List<List<Pair<String, String?>>> {
-      return SignalDatabase.rawDatabase
-        .select()
-        .from(table)
-        .run()
-        .readToList { cursor ->
-          val map: List<Pair<String, String?>> = cursor.columnNames.map { column ->
-            val index = cursor.getColumnIndex(column)
-            var data: String? = when (cursor.getType(index)) {
-              Cursor.FIELD_TYPE_BLOB -> Base64.encodeToString(cursor.getBlob(index), 0)
-              else -> cursor.getString(index)
-            }
-            if (table == MessageTable.TABLE_NAME && column == MessageTable.TYPE) {
-              data = MessageTableTestUtils.typeColumnToString(cursor.getLong(index))
-            }
-
-            column to data
-          }
-          map
-        }
-    }
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessorTest.kt

@@ -0,0 +1,62 @@
+package org.thoughtcrime.securesms.messages
+
+import android.app.Application
+import androidx.test.core.app.ApplicationProvider
+import org.junit.Rule
+import org.thoughtcrime.securesms.messages.MessageContentProcessor.ExceptionMetadata
+import org.thoughtcrime.securesms.messages.MessageContentProcessor.MessageState
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.testing.SignalActivityRule
+import org.thoughtcrime.securesms.testing.TestProtos
+import org.whispersystems.signalservice.api.messages.SignalServiceContent
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos
+import org.whispersystems.signalservice.internal.serialize.protos.SignalServiceContentProto
+
+abstract class MessageContentProcessorTest {
+
+  @get:Rule
+  val harness = SignalActivityRule()
+
+  protected fun MessageContentProcessor.doProcess(
+    messageState: MessageState = MessageState.DECRYPTED_OK,
+    content: SignalServiceContent,
+    exceptionMetadata: ExceptionMetadata = ExceptionMetadata("sender", 1),
+    timestamp: Long = 100L,
+    smsMessageId: Long = -1L
+  ) {
+    process(messageState, content, exceptionMetadata, timestamp, smsMessageId)
+  }
+
+  protected fun createNormalContentTestSubject(): MessageContentProcessor {
+    val context = ApplicationProvider.getApplicationContext<Application>()
+
+    return MessageContentProcessor.forNormalContent(context)
+  }
+
+  /**
+   * Creates a valid ServiceContentProto with a data message which can be built via
+   * `injectDataMessage`. This function is intended to be built on-top of for more
+   * specific scenario in subclasses.
+   *
+   * Example can be seen in __handleStoryMessageTest
+   */
+  protected fun createServiceContentWithDataMessage(
+    messageSender: Recipient = Recipient.resolved(harness.others.first()),
+    injectDataMessage: SignalServiceProtos.DataMessage.Builder.() -> Unit
+  ): SignalServiceContentProto {
+    return TestProtos.build {
+      serviceContent(
+        localAddress = address(uuid = harness.self.requireServiceId().uuid()).build(),
+        metadata = metadata(
+          address = address(uuid = messageSender.requireServiceId().uuid()).build()
+        ).build()
+      ).apply {
+        content = content().apply {
+          dataMessage = dataMessage().apply {
+            injectDataMessage()
+          }.build()
+        }.build()
+      }.build()
+    }
+  }
+}

app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessor__handleStoryMessageTest.kt

@@ -0,0 +1,181 @@
+package org.thoughtcrime.securesms.messages
+
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.signal.core.util.requireLong
+import org.signal.libsignal.zkgroup.groups.GroupMasterKey
+import org.signal.storageservice.protos.groups.Member
+import org.signal.storageservice.protos.groups.local.DecryptedGroup
+import org.signal.storageservice.protos.groups.local.DecryptedMember
+import org.thoughtcrime.securesms.database.MessageTable
+import org.thoughtcrime.securesms.database.MmsHelper
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.model.DistributionListId
+import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord
+import org.thoughtcrime.securesms.database.model.ParentStoryId
+import org.thoughtcrime.securesms.database.model.StoryType
+import org.thoughtcrime.securesms.mms.IncomingMediaMessage
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.testing.TestProtos
+import org.whispersystems.signalservice.api.messages.SignalServiceContent
+import org.whispersystems.signalservice.api.push.DistributionId
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos.DataMessage
+import org.whispersystems.signalservice.internal.serialize.protos.SignalServiceContentProto
+import kotlin.random.Random
+
+@Suppress("ClassName")
+class MessageContentProcessor__handleStoryMessageTest : MessageContentProcessorTest() {
+
+  @Before
+  fun setUp() {
+    SignalDatabase.messages.deleteAllThreads()
+  }
+
+  @After
+  fun tearDown() {
+    SignalDatabase.messages.deleteAllThreads()
+  }
+
+  @Test
+  fun givenContentWithADirectStoryReplyWhenIProcessThenIInsertAReplyInTheCorrectThread() {
+    val sender = Recipient.resolved(harness.others.first())
+    val senderThreadId = SignalDatabase.threads.getOrCreateThreadIdFor(sender)
+    val myStory = Recipient.resolved(SignalDatabase.distributionLists.getRecipientId(DistributionListId.MY_STORY)!!)
+    val myStoryThread = SignalDatabase.threads.getOrCreateThreadIdFor(myStory)
+    val expectedSentTime = 200L
+    val storyMessageId = MmsHelper.insert(
+      sentTimeMillis = expectedSentTime,
+      recipient = myStory,
+      storyType = StoryType.STORY_WITH_REPLIES,
+      threadId = myStoryThread
+    )
+
+    SignalDatabase.storySends.insert(
+      messageId = storyMessageId,
+      recipientIds = listOf(sender.id),
+      sentTimestamp = expectedSentTime,
+      allowsReplies = true,
+      distributionId = DistributionId.MY_STORY
+    )
+
+    val expectedBody = "Hello!"
+
+    val storyContent: SignalServiceContentProto = createServiceContentWithStoryContext(
+      messageSender = sender,
+      storyAuthor = harness.self,
+      storySentTimestamp = expectedSentTime
+    ) {
+      body = expectedBody
+    }
+
+    runTestWithContent(contentProto = storyContent)
+
+    val replyId = SignalDatabase.messages.getConversation(senderThreadId, 0, 1).use {
+      it.moveToFirst()
+      it.requireLong(MessageTable.ID)
+    }
+
+    val replyRecord = SignalDatabase.messages.getMessageRecord(replyId) as MediaMmsMessageRecord
+    assertEquals(ParentStoryId.DirectReply(storyMessageId).serialize(), replyRecord.parentStoryId!!.serialize())
+    assertEquals(expectedBody, replyRecord.body)
+
+    SignalDatabase.messages.deleteAllThreads()
+  }
+
+  @Test
+  fun givenContentWithAGroupStoryReplyWhenIProcessThenIInsertAReplyToTheCorrectStory() {
+    val sender = Recipient.resolved(harness.others[0])
+    val groupMasterKey = GroupMasterKey(Random.nextBytes(GroupMasterKey.SIZE))
+    val decryptedGroupState = DecryptedGroup.newBuilder()
+      .addAllMembers(
+        listOf(
+          DecryptedMember.newBuilder()
+            .setUuid(harness.self.requireServiceId().toByteString())
+            .setJoinedAtRevision(0)
+            .setRole(Member.Role.DEFAULT)
+            .build(),
+          DecryptedMember.newBuilder()
+            .setUuid(sender.requireServiceId().toByteString())
+            .setJoinedAtRevision(0)
+            .setRole(Member.Role.DEFAULT)
+            .build()
+        )
+      )
+      .setRevision(0)
+      .build()
+
+    val group = SignalDatabase.groups.create(
+      groupMasterKey,
+      decryptedGroupState
+    )
+
+    val groupRecipient = Recipient.externalGroupExact(group)
+    val threadForGroup = SignalDatabase.threads.getOrCreateThreadIdFor(groupRecipient)
+
+    val insertResult = MmsHelper.insert(
+      message = IncomingMediaMessage(
+        from = sender.id,
+        sentTimeMillis = 100L,
+        serverTimeMillis = 101L,
+        receivedTimeMillis = 102L,
+        storyType = StoryType.STORY_WITH_REPLIES
+      ),
+      threadId = threadForGroup
+    )
+
+    val expectedBody = "Hello, World!"
+    val storyContent: SignalServiceContentProto = createServiceContentWithStoryContext(
+      messageSender = sender,
+      storyAuthor = sender,
+      storySentTimestamp = 100L
+    ) {
+      groupV2 = TestProtos.build { groupContextV2(masterKeyBytes = groupMasterKey.serialize()).build() }
+      body = expectedBody
+    }
+
+    runTestWithContent(storyContent)
+
+    val replyId = SignalDatabase.messages.getStoryReplies(insertResult.get().messageId).use { cursor ->
+      assertEquals(1, cursor.count)
+      cursor.moveToFirst()
+      cursor.requireLong(MessageTable.ID)
+    }
+
+    val replyRecord = SignalDatabase.messages.getMessageRecord(replyId) as MediaMmsMessageRecord
+    assertEquals(ParentStoryId.GroupReply(insertResult.get().messageId).serialize(), replyRecord.parentStoryId?.serialize())
+    assertEquals(threadForGroup, replyRecord.threadId)
+    assertEquals(expectedBody, replyRecord.body)
+
+    SignalDatabase.messages.deleteGroupStoryReplies(insertResult.get().messageId)
+    SignalDatabase.messages.deleteAllThreads()
+  }
+
+  /**
+   * Creates a ServiceContent proto with a StoryContext, and then
+   * uses `injectDataMessage` to fill in the data message object.
+   */
+  private fun createServiceContentWithStoryContext(
+    messageSender: Recipient,
+    storyAuthor: Recipient,
+    storySentTimestamp: Long,
+    injectDataMessage: DataMessage.Builder.() -> Unit
+  ): SignalServiceContentProto {
+    return createServiceContentWithDataMessage(messageSender) {
+      storyContext = TestProtos.build {
+        storyContext(
+          sentTimestamp = storySentTimestamp,
+          authorUuid = storyAuthor.requireServiceId().toString()
+        ).build()
+      }
+      injectDataMessage()
+    }
+  }
+
+  private fun runTestWithContent(contentProto: SignalServiceContentProto) {
+    val content = SignalServiceContent.createFromProto(contentProto)
+    val testSubject = createNormalContentTestSubject()
+    testSubject.doProcess(content = content!!)
+  }
+}

app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessor__handleTextMessageTest.kt

@@ -0,0 +1,33 @@
+package org.thoughtcrime.securesms.messages
+
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.thoughtcrime.securesms.database.SignalDatabase
+import org.whispersystems.signalservice.api.messages.SignalServiceContent
+import org.whispersystems.signalservice.internal.serialize.protos.SignalServiceContentProto
+
+@Suppress("ClassName")
+class MessageContentProcessor__handleTextMessageTest : MessageContentProcessorTest() {
+  @Test
+  fun givenContentWithATextMessageWhenIProcessThenIInsertTheTextMessage() {
+    val testSubject: MessageContentProcessor = createNormalContentTestSubject()
+    val expectedBody = "Hello, World!"
+    val contentProto: SignalServiceContentProto = createServiceContentWithDataMessage {
+      body = expectedBody
+    }
+
+    val content = SignalServiceContent.createFromProto(contentProto)
+
+    // WHEN
+    testSubject.doProcess(content = content!!)
+
+    // THEN
+    val record = SignalDatabase.messages.getMessageRecord(1)
+    val threadSize = SignalDatabase.messages.getMessageCountForThread(record.threadId)
+    assertEquals(1, threadSize)
+
+    assertTrue(record.isSecure)
+    assertEquals(expectedBody, record.body)
+  }
+}

app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessor__recipientStatusTest.kt

@@ -1,84 +0,0 @@
-package org.thoughtcrime.securesms.messages
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import okio.ByteString.Companion.toByteString
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.thoughtcrime.securesms.database.GroupReceiptTable
-import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.messages.SignalServiceProtoUtil.buildWith
-import org.thoughtcrime.securesms.testing.GroupTestingUtils
-import org.thoughtcrime.securesms.testing.GroupTestingUtils.asMember
-import org.thoughtcrime.securesms.testing.MessageContentFuzzer
-import org.thoughtcrime.securesms.testing.SignalActivityRule
-import org.thoughtcrime.securesms.testing.assertIs
-import org.thoughtcrime.securesms.util.MessageTableTestUtils
-import org.whispersystems.signalservice.internal.push.DataMessage
-import org.whispersystems.signalservice.internal.push.GroupContextV2
-
-@Suppress("ClassName")
-@RunWith(AndroidJUnit4::class)
-class MessageContentProcessor__recipientStatusTest {
-
-  @get:Rule
-  val harness = SignalActivityRule()
-
-  private lateinit var processor: MessageContentProcessor
-  private var envelopeTimestamp: Long = 0
-
-  @Before
-  fun setup() {
-    processor = MessageContentProcessor(harness.context)
-    envelopeTimestamp = System.currentTimeMillis()
-  }
-
-  /**
-   * Process sync group sent text transcript with partial send and then process second sync with recipient update
-   * flag set to true with the rest of the send completed.
-   */
-  @Test
-  fun syncGroupSentTextMessageWithRecipientUpdateFollowup() {
-    val (groupId, masterKey, groupRecipientId) = GroupTestingUtils.insertGroup(revision = 0, harness.self.asMember(), harness.others[0].asMember(), harness.others[1].asMember())
-    val groupContextV2 = GroupContextV2.Builder().revision(0).masterKey(masterKey.serialize().toByteString()).build()
-
-    val initialTextMessage = DataMessage.Builder().buildWith {
-      body = MessageContentFuzzer.string()
-      groupV2 = groupContextV2
-      timestamp = envelopeTimestamp
-    }
-
-    processor.process(
-      envelope = MessageContentFuzzer.envelope(envelopeTimestamp),
-      content = MessageContentFuzzer.syncSentTextMessage(initialTextMessage, deliveredTo = listOf(harness.others[0])),
-      metadata = MessageContentFuzzer.envelopeMetadata(harness.self.id, harness.self.id, groupId = groupId),
-      serverDeliveredTimestamp = MessageContentFuzzer.fuzzServerDeliveredTimestamp(envelopeTimestamp)
-    )
-
-    val threadId = SignalDatabase.threads.getThreadIdFor(groupRecipientId)!!
-    val firstSyncMessages = MessageTableTestUtils.getMessages(threadId)
-    val firstMessageId = firstSyncMessages[0].id
-    val firstReceiptInfo = SignalDatabase.groupReceipts.getGroupReceiptInfo(firstMessageId)
-
-    processor.process(
-      envelope = MessageContentFuzzer.envelope(envelopeTimestamp),
-      content = MessageContentFuzzer.syncSentTextMessage(initialTextMessage, deliveredTo = listOf(harness.others[0], harness.others[1]), recipientUpdate = true),
-      metadata = MessageContentFuzzer.envelopeMetadata(harness.self.id, harness.self.id, groupId = groupId),
-      serverDeliveredTimestamp = MessageContentFuzzer.fuzzServerDeliveredTimestamp(envelopeTimestamp)
-    )
-
-    val secondSyncMessages = MessageTableTestUtils.getMessages(threadId)
-    val secondReceiptInfo = SignalDatabase.groupReceipts.getGroupReceiptInfo(firstMessageId)
-
-    firstSyncMessages.size assertIs 1
-    firstSyncMessages[0].body assertIs initialTextMessage.body
-    firstReceiptInfo.first { it.recipientId == harness.others[0] }.status assertIs GroupReceiptTable.STATUS_UNDELIVERED
-    firstReceiptInfo.first { it.recipientId == harness.others[1] }.status assertIs GroupReceiptTable.STATUS_UNKNOWN
-
-    secondSyncMessages.size assertIs 1
-    secondSyncMessages[0].body assertIs initialTextMessage.body
-    secondReceiptInfo.first { it.recipientId == harness.others[0] }.status assertIs GroupReceiptTable.STATUS_UNDELIVERED
-    secondReceiptInfo.first { it.recipientId == harness.others[1] }.status assertIs GroupReceiptTable.STATUS_UNDELIVERED
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageHelper.kt

@@ -1,290 +0,0 @@
-/*
- * Copyright 2024 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.messages
-
-import android.net.Uri
-import io.mockk.every
-import io.mockk.mockkStatic
-import io.mockk.slot
-import io.mockk.unmockkStatic
-import org.thoughtcrime.securesms.attachments.Attachment
-import org.thoughtcrime.securesms.attachments.UriAttachment
-import org.thoughtcrime.securesms.database.AttachmentTable
-import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.database.UriAttachmentBuilder
-import org.thoughtcrime.securesms.database.model.GroupsV2UpdateMessageConverter
-import org.thoughtcrime.securesms.database.model.databaseprotos.DecryptedGroupV2Context
-import org.thoughtcrime.securesms.database.model.databaseprotos.GV2UpdateDescription
-import org.thoughtcrime.securesms.jobs.ThreadUpdateJob
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.mms.OutgoingMessage
-import org.thoughtcrime.securesms.providers.BlobProvider
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.testing.GroupTestingUtils
-import org.thoughtcrime.securesms.testing.MessageContentFuzzer
-import org.thoughtcrime.securesms.testing.SignalActivityRule
-import org.thoughtcrime.securesms.util.MediaUtil
-import java.util.UUID
-import kotlin.random.Random
-
-/**
- * Makes inserting messages through the "normal" code paths simpler. Mostly focused on incoming messages.
- */
-class MessageHelper(private val harness: SignalActivityRule, var startTime: Long = System.currentTimeMillis()) {
-
-  val alice: RecipientId = harness.others[0]
-  val bob: RecipientId = harness.others[1]
-  val group: GroupTestingUtils.TestGroupInfo = harness.group!!
-  val processor: MessageContentProcessor = MessageContentProcessor(harness.context)
-
-  init {
-    val threadIdSlot = slot<Long>()
-    mockkStatic(ThreadUpdateJob::class)
-    every { ThreadUpdateJob.enqueue(capture(threadIdSlot)) } answers {
-      SignalDatabase.threads.update(threadIdSlot.captured, false)
-    }
-  }
-
-  fun tearDown() {
-    unmockkStatic(ThreadUpdateJob::class)
-  }
-
-  fun incomingText(sender: RecipientId = alice, destination: RecipientId = harness.self.id): MessageData {
-    startTime = nextStartTime()
-
-    val messageData = MessageData(author = sender, timestamp = startTime)
-
-    processor.process(
-      envelope = MessageContentFuzzer.envelope(messageData.timestamp, serverGuid = messageData.serverGuid),
-      content = MessageContentFuzzer.fuzzTextMessage(
-        sentTimestamp = messageData.timestamp,
-        groupContextV2 = if (destination == group.recipientId) group.groupV2Context else null,
-        allowExpireTimeChanges = false
-      ),
-      metadata = MessageContentFuzzer.envelopeMetadata(
-        source = sender,
-        destination = harness.self.id,
-        groupId = if (destination == group.recipientId) group.groupId else null
-      ),
-      serverDeliveredTimestamp = messageData.timestamp + 10
-    )
-
-    return messageData
-  }
-
-  fun outgoingText(conversationId: RecipientId = alice, successfulSend: Boolean = true, updateMessage: ((OutgoingMessage) -> OutgoingMessage)? = null): MessageData {
-    startTime = nextStartTime()
-
-    val messageData = MessageData(author = harness.self.id, timestamp = startTime)
-    val threadRecipient = Recipient.resolved(conversationId)
-
-    val message = OutgoingMessage(
-      threadRecipient = threadRecipient,
-      body = MessageContentFuzzer.string(),
-      sentTimeMillis = messageData.timestamp,
-      isUrgent = true,
-      isSecure = true
-    ).let { updateMessage?.invoke(it) ?: it }
-
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(threadRecipient)
-    val messageId = SignalDatabase.messages.insertMessageOutbox(message, threadId, false, null)
-
-    if (successfulSend) {
-      SignalDatabase.messages.markAsSent(messageId, true)
-    }
-
-    return messageData.copy(messageId = messageId)
-  }
-
-  fun outgoingMessage(conversationId: RecipientId = alice, updateMessage: OutgoingMessage.() -> OutgoingMessage): MessageData {
-    startTime = nextStartTime()
-
-    val messageData = MessageData(author = harness.self.id, timestamp = startTime)
-    val threadRecipient = Recipient.resolved(conversationId)
-
-    val message = OutgoingMessage(
-      threadRecipient = threadRecipient,
-      sentTimeMillis = messageData.timestamp,
-      isUrgent = true,
-      isSecure = true
-    ).apply { updateMessage() }
-
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(threadRecipient)
-    val messageId = SignalDatabase.messages.insertMessageOutbox(message, threadId, false, null)
-
-    return messageData.copy(messageId = messageId)
-  }
-
-  fun outgoingAttachment(data: ByteArray, uuid: UUID? = UUID.randomUUID()): Attachment {
-    val uri: Uri = BlobProvider.getInstance().forData(data).createForSingleSessionInMemory()
-
-    val attachment: UriAttachment = UriAttachmentBuilder.build(
-      id = Random.nextLong(),
-      uri = uri,
-      contentType = MediaUtil.IMAGE_JPEG,
-      transformProperties = AttachmentTable.TransformProperties(),
-      uuid = uuid
-    )
-
-    return attachment
-  }
-
-  fun outgoingGroupChange(): MessageData {
-    startTime = nextStartTime()
-
-    val messageData = MessageData(author = harness.self.id, timestamp = startTime)
-    val groupRecipient = Recipient.resolved(group.recipientId)
-    val decryptedGroupV2Context = DecryptedGroupV2Context(
-      context = group.groupV2Context,
-      groupState = SignalDatabase.groups.getGroup(group.groupId).get().requireV2GroupProperties().decryptedGroup
-    )
-
-    val updateDescription = GV2UpdateDescription.Builder()
-      .gv2ChangeDescription(decryptedGroupV2Context)
-      .groupChangeUpdate(GroupsV2UpdateMessageConverter.translateDecryptedChange(SignalStore.account.getServiceIds(), decryptedGroupV2Context))
-      .build()
-
-    val outgoingMessage = OutgoingMessage.groupUpdateMessage(groupRecipient, updateDescription, startTime)
-
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(groupRecipient)
-    val messageId = SignalDatabase.messages.insertMessageOutbox(outgoingMessage, threadId, false, null)
-    SignalDatabase.messages.markAsSent(messageId, true)
-
-    return messageData.copy(messageId = messageId)
-  }
-
-  fun incomingMedia(sender: RecipientId = alice, destination: RecipientId = harness.self.id): MessageData {
-    startTime = nextStartTime()
-
-    val messageData = MessageData(author = sender, timestamp = startTime)
-
-    processor.process(
-      envelope = MessageContentFuzzer.envelope(messageData.timestamp, serverGuid = messageData.serverGuid),
-      content = MessageContentFuzzer.fuzzStickerMediaMessage(
-        sentTimestamp = messageData.timestamp,
-        groupContextV2 = if (destination == group.recipientId) group.groupV2Context else null
-      ),
-      metadata = MessageContentFuzzer.envelopeMetadata(
-        source = sender,
-        destination = harness.self.id,
-        groupId = if (destination == group.recipientId) group.groupId else null
-      ),
-      serverDeliveredTimestamp = messageData.timestamp + 10
-    )
-
-    return messageData
-  }
-
-  fun incomingEditText(targetTimestamp: Long = System.currentTimeMillis(), sender: RecipientId = alice, destination: RecipientId = harness.self.id): MessageData {
-    startTime = nextStartTime()
-
-    val messageData = MessageData(author = sender, timestamp = startTime)
-
-    processor.process(
-      envelope = MessageContentFuzzer.envelope(messageData.timestamp, serverGuid = messageData.serverGuid),
-      content = MessageContentFuzzer.editTextMessage(
-        targetTimestamp = targetTimestamp,
-        editedDataMessage = MessageContentFuzzer.fuzzTextMessage(
-          sentTimestamp = messageData.timestamp,
-          groupContextV2 = if (destination == group.recipientId) group.groupV2Context else null
-        ).dataMessage!!
-      ),
-      metadata = MessageContentFuzzer.envelopeMetadata(
-        source = sender,
-        destination = harness.self.id,
-        groupId = if (destination == group.recipientId) group.groupId else null
-      ),
-      serverDeliveredTimestamp = messageData.timestamp + 10
-    )
-
-    return messageData
-  }
-
-  fun syncReadMessage(vararg reads: Pair<RecipientId, Long>): MessageData {
-    startTime = nextStartTime()
-    val messageData = MessageData(timestamp = startTime)
-
-    processor.process(
-      envelope = MessageContentFuzzer.envelope(messageData.timestamp, serverGuid = messageData.serverGuid),
-      content = MessageContentFuzzer.syncReadsMessage(reads.toList()),
-      metadata = MessageContentFuzzer.envelopeMetadata(harness.self.id, harness.self.id, sourceDeviceId = 2),
-      serverDeliveredTimestamp = messageData.timestamp + 10
-    )
-
-    return messageData
-  }
-
-  fun syncDeleteForMeMessage(vararg deletes: MessageContentFuzzer.DeleteForMeSync): MessageData {
-    startTime = nextStartTime()
-    val messageData = MessageData(timestamp = startTime)
-
-    processor.process(
-      envelope = MessageContentFuzzer.envelope(messageData.timestamp, serverGuid = messageData.serverGuid),
-      content = MessageContentFuzzer.syncDeleteForMeMessage(deletes.toList()),
-      metadata = MessageContentFuzzer.envelopeMetadata(harness.self.id, harness.self.id, sourceDeviceId = 2),
-      serverDeliveredTimestamp = messageData.timestamp + 10
-    )
-
-    return messageData
-  }
-
-  fun syncDeleteForMeConversation(vararg deletes: MessageContentFuzzer.DeleteForMeSync): MessageData {
-    startTime = nextStartTime()
-    val messageData = MessageData(timestamp = startTime)
-
-    processor.process(
-      envelope = MessageContentFuzzer.envelope(messageData.timestamp, serverGuid = messageData.serverGuid),
-      content = MessageContentFuzzer.syncDeleteForMeConversation(deletes.toList()),
-      metadata = MessageContentFuzzer.envelopeMetadata(harness.self.id, harness.self.id, sourceDeviceId = 2),
-      serverDeliveredTimestamp = messageData.timestamp + 10
-    )
-
-    return messageData
-  }
-
-  fun syncDeleteForMeLocalOnlyConversation(vararg conversations: RecipientId): MessageData {
-    startTime = nextStartTime()
-    val messageData = MessageData(timestamp = startTime)
-
-    processor.process(
-      envelope = MessageContentFuzzer.envelope(messageData.timestamp, serverGuid = messageData.serverGuid),
-      content = MessageContentFuzzer.syncDeleteForMeLocalOnlyConversation(conversations.toList()),
-      metadata = MessageContentFuzzer.envelopeMetadata(harness.self.id, harness.self.id, sourceDeviceId = 2),
-      serverDeliveredTimestamp = messageData.timestamp + 10
-    )
-
-    return messageData
-  }
-
-  fun syncDeleteForMeAttachment(conversationId: RecipientId, message: Pair<RecipientId, Long>, uuid: UUID?, digest: ByteArray?, plainTextHash: String?): MessageData {
-    startTime = nextStartTime()
-    val messageData = MessageData(timestamp = startTime)
-
-    processor.process(
-      envelope = MessageContentFuzzer.envelope(messageData.timestamp, serverGuid = messageData.serverGuid),
-      content = MessageContentFuzzer.syncDeleteForMeAttachment(conversationId, message, uuid, digest, plainTextHash),
-      metadata = MessageContentFuzzer.envelopeMetadata(harness.self.id, harness.self.id, sourceDeviceId = 2),
-      serverDeliveredTimestamp = messageData.timestamp + 10
-    )
-
-    return messageData
-  }
-
-  /**
-   * Get the next "sentTimestamp" for current + [nextMessageOffset]th message. Useful for early message processing and future message timestamps.
-   */
-  fun nextStartTime(nextMessageOffset: Int = 1): Long {
-    return startTime + 1000 * nextMessageOffset
-  }
-
-  data class MessageData(
-    val author: RecipientId = RecipientId.UNKNOWN,
-    val serverGuid: UUID = UUID.randomUUID(),
-    val timestamp: Long,
-    val messageId: Long = -1L
-  )
-}

app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageProcessingPerformanceTest.kt

@@ -1,196 +0,0 @@
-package org.thoughtcrime.securesms.messages
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.mockk.every
-import io.mockk.mockkObject
-import io.mockk.mockkStatic
-import io.mockk.unmockkStatic
-import okio.ByteString
-import org.junit.After
-import org.junit.Before
-import org.junit.Ignore
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.core.util.logging.Log
-import org.signal.libsignal.protocol.ecc.Curve
-import org.signal.libsignal.protocol.ecc.ECKeyPair
-import org.signal.libsignal.zkgroup.profiles.ProfileKey
-import org.thoughtcrime.securesms.crypto.SealedSenderAccessUtil
-import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.testing.AliceClient
-import org.thoughtcrime.securesms.testing.BobClient
-import org.thoughtcrime.securesms.testing.Entry
-import org.thoughtcrime.securesms.testing.FakeClientHelpers
-import org.thoughtcrime.securesms.testing.SignalActivityRule
-import org.thoughtcrime.securesms.testing.awaitFor
-import org.whispersystems.signalservice.internal.push.Envelope
-import org.whispersystems.signalservice.internal.websocket.WebSocketMessage
-import org.whispersystems.signalservice.internal.websocket.WebSocketRequestMessage
-import java.util.regex.Pattern
-import kotlin.random.Random
-import kotlin.time.Duration.Companion.minutes
-import kotlin.time.Duration.Companion.seconds
-import android.util.Log as AndroidLog
-
-/**
- * Sends N messages from Bob to Alice to track performance of Alice's processing of messages.
- */
-@Ignore("Ignore test in normal testing as it's a performance test with no assertions")
-@RunWith(AndroidJUnit4::class)
-class MessageProcessingPerformanceTest {
-
-  companion object {
-    private val TAG = Log.tag(MessageProcessingPerformanceTest::class.java)
-    private val TIMING_TAG = "TIMING_$TAG".substring(0..23)
-
-    private val DECRYPTION_TIME_PATTERN = Pattern.compile("^Decrypted (?<count>\\d+) envelopes in (?<duration>\\d+) ms.*$")
-  }
-
-  @get:Rule
-  val harness = SignalActivityRule()
-
-  private val trustRoot: ECKeyPair = Curve.generateKeyPair()
-
-  @Before
-  fun setup() {
-    mockkStatic(SealedSenderAccessUtil::class)
-    every { SealedSenderAccessUtil.getCertificateValidator() } returns FakeClientHelpers.noOpCertificateValidator
-
-    mockkObject(MessageContentProcessor)
-    every { MessageContentProcessor.create(harness.application) } returns TimingMessageContentProcessor(harness.application)
-  }
-
-  @After
-  fun after() {
-    unmockkStatic(SealedSenderAccessUtil::class)
-    unmockkStatic(MessageContentProcessor::class)
-  }
-
-  @Test
-  fun testPerformance() {
-    val aliceClient = AliceClient(
-      serviceId = harness.self.requireServiceId(),
-      e164 = harness.self.requireE164(),
-      trustRoot = trustRoot
-    )
-
-    val bob = Recipient.resolved(harness.others[0])
-    val bobClient = BobClient(
-      serviceId = bob.requireServiceId(),
-      e164 = bob.requireE164(),
-      identityKeyPair = harness.othersKeys[0],
-      trustRoot = trustRoot,
-      profileKey = ProfileKey(bob.profileKey)
-    )
-
-    // Send the initial messages to get past the prekey phase
-    establishSession(aliceClient, bobClient, bob)
-
-    // Have Bob generate N messages that will be received by Alice
-    val messageCount = 100
-    val envelopes = generateInboundEnvelopes(bobClient, messageCount)
-    val firstTimestamp = envelopes.first().timestamp
-    val lastTimestamp = envelopes.last().timestamp ?: 0
-
-    // Inject the envelopes into the websocket
-    Thread {
-      for (envelope in envelopes) {
-        Log.i(TIMING_TAG, "Retrieved envelope! ${envelope.timestamp}")
-        InstrumentationApplicationDependencyProvider.injectWebSocketMessage(envelope.toWebSocketPayload())
-      }
-      InstrumentationApplicationDependencyProvider.injectWebSocketMessage(webSocketTombstone())
-    }.start()
-
-    // Wait until they've all been fully decrypted + processed
-    harness
-      .inMemoryLogger
-      .getLockForUntil(TimingMessageContentProcessor.endTagPredicate(lastTimestamp))
-      .awaitFor(1.minutes)
-
-    harness.inMemoryLogger.flush()
-
-    // Process logs for timing data
-    val entries = harness.inMemoryLogger.entries()
-
-    // Calculate decryption average
-    val totalDecryptDuration: Long = entries
-      .mapNotNull { entry -> entry.message?.let { DECRYPTION_TIME_PATTERN.matcher(it) } }
-      .filter { it.matches() }
-      .drop(1) // Ignore the first message, which represents the prekey exchange
-      .sumOf { it.group("duration")!!.toLong() }
-
-    AndroidLog.w(TAG, "Decryption: Average runtime: ${totalDecryptDuration.toFloat() / messageCount.toFloat()}ms")
-
-    // Calculate MessageContentProcessor
-
-    val takeLast: List<Entry> = entries.filter { it.tag == TimingMessageContentProcessor.TAG }.drop(2)
-    val iterator = takeLast.iterator()
-    var processCount = 0L
-    var processDuration = 0L
-    while (iterator.hasNext()) {
-      val start = iterator.next()
-      val end = iterator.next()
-      processCount++
-      processDuration += end.timestamp - start.timestamp
-    }
-
-    AndroidLog.w(TAG, "MessageContentProcessor.process: Average runtime: ${processDuration.toFloat() / processCount.toFloat()}ms")
-
-    // Calculate messages per second from "retrieving" first message post session initialization to processing last message
-
-    val start = entries.first { it.message == "Retrieved envelope! $firstTimestamp" }
-    val end = entries.first { it.message == TimingMessageContentProcessor.endTag(lastTimestamp) }
-
-    val duration = (end.timestamp - start.timestamp).toFloat() / 1000f
-    val messagePerSecond = messageCount.toFloat() / duration
-
-    AndroidLog.w(TAG, "Processing $messageCount messages took ${duration}s or ${messagePerSecond}m/s")
-  }
-
-  private fun establishSession(aliceClient: AliceClient, bobClient: BobClient, bob: Recipient) {
-    // Send message from Bob to Alice (self)
-    val firstPreKeyMessageTimestamp = System.currentTimeMillis()
-    val encryptedEnvelope = bobClient.encrypt(firstPreKeyMessageTimestamp)
-
-    val aliceProcessFirstMessageLatch = harness
-      .inMemoryLogger
-      .getLockForUntil(TimingMessageContentProcessor.endTagPredicate(firstPreKeyMessageTimestamp))
-
-    Thread { aliceClient.process(encryptedEnvelope, System.currentTimeMillis()) }.start()
-    aliceProcessFirstMessageLatch.awaitFor(15.seconds)
-
-    // Send message from Alice to Bob
-    val aliceNow = System.currentTimeMillis()
-    bobClient.decrypt(aliceClient.encrypt(aliceNow, bob), aliceNow)
-  }
-
-  private fun generateInboundEnvelopes(bobClient: BobClient, count: Int): List<Envelope> {
-    val envelopes = ArrayList<Envelope>(count)
-    var now = System.currentTimeMillis()
-    for (i in 0..count) {
-      envelopes += bobClient.encrypt(now)
-      now += 3
-    }
-
-    return envelopes
-  }
-
-  private fun webSocketTombstone(): ByteString {
-    return WebSocketMessage(request = WebSocketRequestMessage(verb = "PUT", path = "/api/v1/queue/empty")).encodeByteString()
-  }
-
-  private fun Envelope.toWebSocketPayload(): ByteString {
-    return WebSocketMessage(
-      type = WebSocketMessage.Type.REQUEST,
-      request = WebSocketRequestMessage(
-        verb = "PUT",
-        path = "/api/v1/message",
-        id = Random(System.currentTimeMillis()).nextLong(),
-        headers = listOf("X-Signal-Timestamp: ${this.timestamp}"),
-        body = this.encodeByteString()
-      )
-    ).encodeByteString()
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/messages/SyncMessageProcessorTest_readSyncs.kt

@@ -1,107 +0,0 @@
-/*
- * Copyright 2024 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.messages
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.After
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.testing.SignalActivityRule
-import org.thoughtcrime.securesms.testing.assertIs
-
-@Suppress("ClassName")
-@RunWith(AndroidJUnit4::class)
-class SyncMessageProcessorTest_readSyncs {
-
-  @get:Rule
-  val harness = SignalActivityRule(createGroup = true)
-
-  private lateinit var messageHelper: MessageHelper
-
-  @Before
-  fun setUp() {
-    messageHelper = MessageHelper(harness)
-  }
-
-  @After
-  fun tearDown() {
-    messageHelper.tearDown()
-  }
-
-  @Test
-  fun handleSynchronizeReadMessage() {
-    val message1Timestamp = messageHelper.incomingText().timestamp
-    val message2Timestamp = messageHelper.incomingText().timestamp
-
-    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
-    var threadRecord = SignalDatabase.threads.getThreadRecord(threadId)!!
-    threadRecord.unreadCount assertIs 2
-
-    messageHelper.syncReadMessage(messageHelper.alice to message1Timestamp, messageHelper.alice to message2Timestamp)
-
-    threadRecord = SignalDatabase.threads.getThreadRecord(threadId)!!
-    threadRecord.unreadCount assertIs 0
-  }
-
-  @Test
-  fun handleSynchronizeReadMessageMissingTimestamp() {
-    messageHelper.incomingText().timestamp
-    val message2Timestamp = messageHelper.incomingText().timestamp
-
-    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
-    var threadRecord = SignalDatabase.threads.getThreadRecord(threadId)!!
-    threadRecord.unreadCount assertIs 2
-
-    messageHelper.syncReadMessage(messageHelper.alice to message2Timestamp)
-
-    threadRecord = SignalDatabase.threads.getThreadRecord(threadId)!!
-    threadRecord.unreadCount assertIs 0
-  }
-
-  @Test
-  fun handleSynchronizeReadWithEdits() {
-    val message1Timestamp = messageHelper.incomingText().timestamp
-    messageHelper.syncReadMessage(messageHelper.alice to message1Timestamp)
-
-    val editMessage1Timestamp1 = messageHelper.incomingEditText(message1Timestamp).timestamp
-    val editMessage1Timestamp2 = messageHelper.incomingEditText(editMessage1Timestamp1).timestamp
-
-    val message2Timestamp = messageHelper.incomingMedia().timestamp
-
-    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
-    var threadRecord = SignalDatabase.threads.getThreadRecord(threadId)!!
-    threadRecord.unreadCount assertIs 2
-
-    messageHelper.syncReadMessage(messageHelper.alice to message2Timestamp, messageHelper.alice to editMessage1Timestamp1, messageHelper.alice to editMessage1Timestamp2)
-
-    threadRecord = SignalDatabase.threads.getThreadRecord(threadId)!!
-    threadRecord.unreadCount assertIs 0
-  }
-
-  @Test
-  fun handleSynchronizeReadWithEditsInGroup() {
-    val message1Timestamp = messageHelper.incomingText(sender = messageHelper.alice, destination = messageHelper.group.recipientId).timestamp
-
-    messageHelper.syncReadMessage(messageHelper.alice to message1Timestamp)
-
-    val editMessage1Timestamp1 = messageHelper.incomingEditText(targetTimestamp = message1Timestamp, sender = messageHelper.alice, destination = messageHelper.group.recipientId).timestamp
-    val editMessage1Timestamp2 = messageHelper.incomingEditText(targetTimestamp = editMessage1Timestamp1, sender = messageHelper.alice, destination = messageHelper.group.recipientId).timestamp
-
-    val message2Timestamp = messageHelper.incomingMedia(sender = messageHelper.bob, destination = messageHelper.group.recipientId).timestamp
-
-    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.group.recipientId)!!
-    var threadRecord = SignalDatabase.threads.getThreadRecord(threadId)!!
-    threadRecord.unreadCount assertIs 2
-
-    messageHelper.syncReadMessage(messageHelper.bob to message2Timestamp, messageHelper.alice to editMessage1Timestamp1, messageHelper.alice to editMessage1Timestamp2)
-
-    threadRecord = SignalDatabase.threads.getThreadRecord(threadId)!!
-    threadRecord.unreadCount assertIs 0
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/messages/SyncMessageProcessorTest_synchronizeDeleteForMe.kt

@@ -1,703 +0,0 @@
-/*
- * Copyright 2024 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.thoughtcrime.securesms.messages
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.hamcrest.Matchers.greaterThan
-import org.junit.After
-import org.junit.Before
-import org.junit.Ignore
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.core.util.logging.Log
-import org.signal.core.util.update
-import org.signal.core.util.withinTransaction
-import org.thoughtcrime.securesms.attachments.Attachment
-import org.thoughtcrime.securesms.attachments.DatabaseAttachment
-import org.thoughtcrime.securesms.database.AttachmentTable
-import org.thoughtcrime.securesms.database.CallTable
-import org.thoughtcrime.securesms.database.MessageTable
-import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.database.model.databaseprotos.SessionSwitchoverEvent
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.testing.MessageContentFuzzer.DeleteForMeSync
-import org.thoughtcrime.securesms.testing.SignalActivityRule
-import org.thoughtcrime.securesms.testing.assert
-import org.thoughtcrime.securesms.testing.assertIs
-import org.thoughtcrime.securesms.testing.assertIsNot
-import org.thoughtcrime.securesms.testing.assertIsNotNull
-import org.thoughtcrime.securesms.testing.assertIsSize
-import org.thoughtcrime.securesms.util.IdentityUtil
-import java.util.UUID
-
-@Suppress("ClassName")
-@RunWith(AndroidJUnit4::class)
-class SyncMessageProcessorTest_synchronizeDeleteForMe {
-
-  companion object {
-    private val TAG = "SyncDeleteForMeTest"
-  }
-
-  @get:Rule
-  val harness = SignalActivityRule(createGroup = true)
-
-  private lateinit var messageHelper: MessageHelper
-
-  @Before
-  fun setUp() {
-    messageHelper = MessageHelper(harness)
-  }
-
-  @After
-  fun tearDown() {
-    messageHelper.tearDown()
-  }
-
-  @Test
-  fun singleMessageDelete() {
-    // GIVEN
-    val message1Timestamp = messageHelper.incomingText().timestamp
-    messageHelper.incomingText()
-
-    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
-    var messageCount = SignalDatabase.messages.getMessageCountForThread(threadId)
-    messageCount assertIs 2
-
-    // WHEN
-    messageHelper.syncDeleteForMeMessage(
-      DeleteForMeSync(conversationId = messageHelper.alice, messageHelper.alice to message1Timestamp)
-    )
-
-    // THEN
-    messageCount = SignalDatabase.messages.getMessageCountForThread(threadId)
-    messageCount assertIs 1
-  }
-
-  @Test
-  fun singleOutgoingMessageDelete() {
-    // GIVEN
-    val message1Timestamp = messageHelper.outgoingText().timestamp
-    messageHelper.incomingText()
-
-    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
-    var messageCount = SignalDatabase.messages.getMessageCountForThread(threadId)
-    messageCount assertIs 2
-
-    // WHEN
-    messageHelper.syncDeleteForMeMessage(
-      DeleteForMeSync(conversationId = messageHelper.alice, harness.self.id to message1Timestamp)
-    )
-
-    // THEN
-    messageCount = SignalDatabase.messages.getMessageCountForThread(threadId)
-    messageCount assertIs 1
-  }
-
-  @Test
-  fun singleGroupMessageDelete() {
-    // GIVEN
-    val message1Timestamp = messageHelper.incomingText(sender = messageHelper.alice, destination = messageHelper.group.recipientId).timestamp
-    messageHelper.incomingText(sender = messageHelper.alice, destination = messageHelper.group.recipientId)
-    messageHelper.incomingText(sender = messageHelper.bob, destination = messageHelper.group.recipientId)
-
-    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.group.recipientId)!!
-    var messageCount = SignalDatabase.messages.getMessageCountForThread(threadId)
-    messageCount assertIs 3
-
-    // WHEN
-    messageHelper.syncDeleteForMeMessage(
-      DeleteForMeSync(conversationId = messageHelper.group.recipientId, messageHelper.alice to message1Timestamp)
-    )
-
-    // THEN
-    messageCount = SignalDatabase.messages.getMessageCountForThread(threadId)
-    messageCount assertIs 2
-  }
-
-  @Test
-  fun multipleGroupMessageDelete() {
-    // GIVEN
-    val message1Timestamp = messageHelper.incomingText(sender = messageHelper.alice, destination = messageHelper.group.recipientId).timestamp
-    messageHelper.incomingText(sender = messageHelper.alice, destination = messageHelper.group.recipientId)
-    val message3Timestamp = messageHelper.incomingText(sender = messageHelper.bob, destination = messageHelper.group.recipientId).timestamp
-
-    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.group.recipientId)!!
-    var messageCount = SignalDatabase.messages.getMessageCountForThread(threadId)
-    messageCount assertIs 3
-
-    // WHEN
-    messageHelper.syncDeleteForMeMessage(
-      DeleteForMeSync(conversationId = messageHelper.group.recipientId, messageHelper.alice to message1Timestamp, messageHelper.bob to message3Timestamp)
-    )
-
-    // THEN
-    messageCount = SignalDatabase.messages.getMessageCountForThread(threadId)
-    messageCount assertIs 1
-  }
-
-  @Test
-  fun allMessagesDelete() {
-    // GIVEN
-    val message1Timestamp = messageHelper.incomingText().timestamp
-    val message2Timestamp = messageHelper.incomingText().timestamp
-
-    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
-    var messageCount = SignalDatabase.messages.getMessageCountForThread(threadId)
-    messageCount assertIs 2
-
-    // WHEN
-    messageHelper.syncDeleteForMeMessage(
-      DeleteForMeSync(conversationId = messageHelper.alice, messageHelper.alice to message1Timestamp, messageHelper.alice to message2Timestamp)
-    )
-
-    // THEN
-    messageCount = SignalDatabase.messages.getMessageCountForThread(threadId)
-    messageCount assertIs 0
-
-    val threadRecord = SignalDatabase.threads.getThreadRecord(threadId)
-    threadRecord assertIs null
-  }
-
-  @Test
-  fun earlyMessagesDelete() {
-    // GIVEN
-    messageHelper.incomingText().timestamp
-
-    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
-    var messageCount = SignalDatabase.messages.getMessageCountForThread(threadId)
-    messageCount assertIs 1
-
-    // WHEN
-    val nextTextMessageTimestamp = messageHelper.nextStartTime(2)
-    messageHelper.syncDeleteForMeMessage(
-      DeleteForMeSync(conversationId = messageHelper.alice, messageHelper.alice to nextTextMessageTimestamp)
-    )
-    messageHelper.incomingText()
-
-    // THEN
-    messageCount = SignalDatabase.messages.getMessageCountForThread(threadId)
-    messageCount assertIs 1
-  }
-
-  @Test
-  fun multipleConversationMessagesDelete() {
-    // GIVEN
-    messageHelper.incomingText(sender = messageHelper.alice)
-    val aliceMessage2 = messageHelper.incomingText(sender = messageHelper.alice).timestamp
-
-    messageHelper.incomingText(sender = messageHelper.bob)
-    val bobMessage2 = messageHelper.incomingText(sender = messageHelper.bob).timestamp
-
-    val aliceThreadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
-    var aliceMessageCount = SignalDatabase.messages.getMessageCountForThread(aliceThreadId)
-    aliceMessageCount assertIs 2
-
-    val bobThreadId = SignalDatabase.threads.getThreadIdFor(messageHelper.bob)!!
-    var bobMessageCount = SignalDatabase.messages.getMessageCountForThread(bobThreadId)
-    bobMessageCount assertIs 2
-
-    // WHEN
-    messageHelper.syncDeleteForMeMessage(
-      DeleteForMeSync(conversationId = messageHelper.alice, messageHelper.alice to aliceMessage2),
-      DeleteForMeSync(conversationId = messageHelper.bob, messageHelper.bob to bobMessage2)
-    )
-
-    // THEN
-    aliceMessageCount = SignalDatabase.messages.getMessageCountForThread(aliceThreadId)
-    aliceMessageCount assertIs 1
-
-    bobMessageCount = SignalDatabase.messages.getMessageCountForThread(bobThreadId)
-    bobMessageCount assertIs 1
-  }
-
-  @Test
-  fun singleConversationDelete() {
-    // GIVEN
-    val messages = mutableListOf<MessageTable.SyncMessageId>()
-
-    for (i in 0 until 10) {
-      messages += MessageTable.SyncMessageId(messageHelper.alice, messageHelper.incomingText().timestamp)
-      messages += MessageTable.SyncMessageId(harness.self.id, messageHelper.outgoingText().timestamp)
-    }
-
-    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
-    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 20
-
-    // WHEN
-    messageHelper.syncDeleteForMeConversation(
-      DeleteForMeSync(
-        conversationId = messageHelper.alice,
-        messages = messages.takeLast(5).map { it.recipientId to it.timetamp },
-        isFullDelete = true
-      )
-    )
-
-    // THEN
-    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 0
-    SignalDatabase.threads.getThreadRecord(threadId) assertIs null
-  }
-
-  @Test
-  fun singleConversationNoRecentsFoundDelete() {
-    // GIVEN
-    val messages = mutableListOf<MessageTable.SyncMessageId>()
-
-    for (i in 0 until 10) {
-      messages += MessageTable.SyncMessageId(messageHelper.alice, messageHelper.incomingText().timestamp)
-      messages += MessageTable.SyncMessageId(harness.self.id, messageHelper.outgoingText().timestamp)
-    }
-
-    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
-    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 20
-
-    // WHEN
-    val randomFutureMessages = (1..5).map {
-      messageHelper.alice to messageHelper.nextStartTime(it)
-    }
-
-    messageHelper.syncDeleteForMeConversation(
-      DeleteForMeSync(conversationId = messageHelper.alice, randomFutureMessages, isFullDelete = true)
-    )
-
-    // THEN
-    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 20
-    SignalDatabase.threads.getThreadRecord(threadId).assertIsNotNull()
-
-    harness.inMemoryLogger.flush()
-    harness.inMemoryLogger.entries().filter { it.message?.contains("Unable to find most recent received at timestamp") == true }.size assertIs 1
-  }
-
-  @Test
-  fun singleConversationNoRecentsFoundNonExpiringRecentsFoundDelete() {
-    // GIVEN
-    val messages = mutableListOf<MessageTable.SyncMessageId>()
-
-    for (i in 0 until 10) {
-      messages += MessageTable.SyncMessageId(messageHelper.alice, messageHelper.incomingText().timestamp)
-      messages += MessageTable.SyncMessageId(harness.self.id, messageHelper.outgoingText().timestamp)
-    }
-
-    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
-    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 20
-
-    // WHEN
-    val nonExpiringMessages = messages.takeLast(5).map { it.recipientId to it.timetamp }
-
-    val randomFutureMessages = (1..5).map {
-      messageHelper.alice to messageHelper.nextStartTime(it)
-    }
-
-    messageHelper.syncDeleteForMeConversation(
-      DeleteForMeSync(conversationId = messageHelper.alice, randomFutureMessages, nonExpiringMessages, true)
-    )
-
-    // THEN
-    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 0
-    SignalDatabase.threads.getThreadRecord(threadId) assertIs null
-
-    harness.inMemoryLogger.flush()
-    harness.inMemoryLogger.entries().filter { it.message?.contains("Using backup non-expiring messages") == true }.size assertIs 1
-  }
-
-  @Test
-  fun localOnlyRemainingAfterConversationDeleteWithFullDelete() {
-    // GIVEN
-    val messages = mutableListOf<MessageTable.SyncMessageId>()
-
-    Log.v(TAG, "Adding normal messages")
-    for (i in 0 until 10) {
-      messages += MessageTable.SyncMessageId(messageHelper.alice, messageHelper.incomingText().timestamp)
-      messages += MessageTable.SyncMessageId(harness.self.id, messageHelper.outgoingText().timestamp)
-    }
-
-    val alice = Recipient.resolved(messageHelper.alice)
-    Log.v(TAG, "Adding identity message")
-    IdentityUtil.markIdentityVerified(harness.context, alice, true, true)
-    Log.v(TAG, "Adding profile message")
-    SignalDatabase.messages.insertProfileNameChangeMessages(alice, "new name", "previous name")
-    Log.v(TAG, "Adding call message")
-    SignalDatabase.calls.insertOneToOneCall(1, System.currentTimeMillis(), alice.id, CallTable.Type.AUDIO_CALL, CallTable.Direction.OUTGOING, CallTable.Event.ACCEPTED)
-
-    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
-    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 23
-
-    // WHEN
-    Log.v(TAG, "Processing sync message")
-    messageHelper.syncDeleteForMeConversation(
-      DeleteForMeSync(
-        conversationId = messageHelper.alice,
-        messages = messages.takeLast(5).map { it.recipientId to it.timetamp },
-        isFullDelete = true
-      )
-    )
-
-    // THEN
-    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 0
-    SignalDatabase.threads.getThreadRecord(threadId) assertIs null
-  }
-
-  @Test
-  fun localOnlyRemainingAfterConversationDeleteWithoutFullDelete() {
-    // GIVEN
-    val messages = mutableListOf<MessageTable.SyncMessageId>()
-
-    for (i in 0 until 10) {
-      messages += MessageTable.SyncMessageId(messageHelper.alice, messageHelper.incomingText().timestamp)
-      messages += MessageTable.SyncMessageId(harness.self.id, messageHelper.outgoingText().timestamp)
-    }
-
-    val alice = Recipient.resolved(messageHelper.alice)
-    IdentityUtil.markIdentityVerified(harness.context, alice, true, true)
-    SignalDatabase.messages.insertProfileNameChangeMessages(alice, "new name", "previous name")
-    SignalDatabase.calls.insertOneToOneCall(1, System.currentTimeMillis(), alice.id, CallTable.Type.AUDIO_CALL, CallTable.Direction.OUTGOING, CallTable.Event.ACCEPTED)
-
-    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
-    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 23
-
-    // WHEN
-    messageHelper.syncDeleteForMeConversation(
-      DeleteForMeSync(
-        conversationId = messageHelper.alice,
-        messages = messages.takeLast(5).map { it.recipientId to it.timetamp },
-        isFullDelete = false
-      )
-    )
-
-    // THEN
-    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 3
-    SignalDatabase.threads.getThreadRecord(threadId).assertIsNotNull()
-  }
-
-  @Test
-  fun groupConversationDelete() {
-    // GIVEN
-    val messages = mutableListOf<MessageTable.SyncMessageId>()
-
-    for (i in 0 until 50) {
-      messages += when (i % 3) {
-        1 -> MessageTable.SyncMessageId(messageHelper.alice, messageHelper.incomingText(sender = messageHelper.alice, destination = messageHelper.group.recipientId).timestamp)
-        2 -> MessageTable.SyncMessageId(messageHelper.bob, messageHelper.incomingText(sender = messageHelper.bob, destination = messageHelper.group.recipientId).timestamp)
-        else -> MessageTable.SyncMessageId(harness.self.id, messageHelper.outgoingText(messageHelper.group.recipientId).timestamp)
-      }
-    }
-
-    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.group.recipientId)!!
-
-    // WHEN
-    messageHelper.syncDeleteForMeConversation(
-      DeleteForMeSync(
-        conversationId = messageHelper.group.recipientId,
-        messages = messages.takeLast(5).map { it.recipientId to it.timetamp },
-        isFullDelete = true
-      )
-    )
-
-    // THEN
-    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 0
-    SignalDatabase.threads.getThreadRecord(threadId) assertIs null
-  }
-
-  @Test
-  fun multipleConversationDelete() {
-    // GIVEN
-    val allMessages = mapOf<RecipientId, MutableList<MessageTable.SyncMessageId>>(
-      messageHelper.alice to mutableListOf(),
-      messageHelper.bob to mutableListOf()
-    )
-
-    allMessages.forEach { (conversation, messages) ->
-      for (i in 0 until 10) {
-        messages += MessageTable.SyncMessageId(conversation, messageHelper.incomingText(sender = conversation).timestamp)
-        messages += MessageTable.SyncMessageId(harness.self.id, messageHelper.outgoingText(conversationId = conversation).timestamp)
-      }
-    }
-
-    val threadIds = allMessages.keys.map { SignalDatabase.threads.getThreadIdFor(it)!! }
-    threadIds.forEach { SignalDatabase.messages.getMessageCountForThread(it) assertIs 20 }
-
-    // WHEN
-    messageHelper.syncDeleteForMeConversation(
-      DeleteForMeSync(conversationId = messageHelper.alice, allMessages[messageHelper.alice]!!.takeLast(5).map { it.recipientId to it.timetamp }, isFullDelete = true),
-      DeleteForMeSync(conversationId = messageHelper.bob, allMessages[messageHelper.bob]!!.takeLast(5).map { it.recipientId to it.timetamp }, isFullDelete = true)
-    )
-
-    // THEN
-    threadIds.forEach {
-      SignalDatabase.messages.getMessageCountForThread(it) assertIs 0
-      SignalDatabase.threads.getThreadRecord(it) assertIs null
-    }
-  }
-
-  @Test
-  fun singleLocalOnlyConversation() {
-    // GIVEN
-    val alice = Recipient.resolved(messageHelper.alice)
-
-    // Insert placeholder message to prevent early thread update deletes
-    val oneToOnePlaceHolderMessage = messageHelper.outgoingText().messageId
-
-    val aliceThreadId = SignalDatabase.threads.getOrCreateThreadIdFor(messageHelper.alice, isGroup = false)
-
-    IdentityUtil.markIdentityVerified(harness.context, alice, true, false)
-    SignalDatabase.calls.insertOneToOneCall(1, System.currentTimeMillis(), alice.id, CallTable.Type.AUDIO_CALL, CallTable.Direction.OUTGOING, CallTable.Event.ACCEPTED)
-    SignalDatabase.messages.insertProfileNameChangeMessages(alice, "new name", "previous name")
-    SignalDatabase.messages.markAsSentFailed(messageHelper.outgoingText().messageId)
-
-    // Cleanup and confirm setup
-    SignalDatabase.messages.deleteMessage(messageId = oneToOnePlaceHolderMessage, threadId = aliceThreadId, notify = false, updateThread = false)
-    SignalDatabase.messages.getMessageCountForThread(aliceThreadId) assert greaterThan(0)
-
-    // WHEN
-    messageHelper.syncDeleteForMeLocalOnlyConversation(messageHelper.alice)
-
-    // THEN
-    SignalDatabase.messages.getMessageCountForThread(aliceThreadId) assertIs 0
-    SignalDatabase.threads.getThreadRecord(aliceThreadId) assertIs null
-  }
-
-  @Ignore("counts are consistent for some reason")
-  @Test
-  fun multipleLocalOnlyConversation() {
-    // GIVEN
-    val alice = Recipient.resolved(messageHelper.alice)
-
-    // Insert placeholder messages in group and alice thread to prevent early thread update deletes
-    val groupPlaceholderMessage = messageHelper.outgoingText(conversationId = messageHelper.group.recipientId).messageId
-    val oneToOnePlaceHolderMessage = messageHelper.outgoingText().messageId
-
-    val aliceThreadId = SignalDatabase.threads.getOrCreateThreadIdFor(messageHelper.alice, isGroup = false)
-    val groupThreadId = SignalDatabase.threads.getOrCreateThreadIdFor(messageHelper.group.recipientId, isGroup = true)
-
-    // Identity changes
-    IdentityUtil.markIdentityVerified(harness.context, alice, true, true)
-    IdentityUtil.markIdentityVerified(harness.context, alice, false, true)
-    IdentityUtil.markIdentityVerified(harness.context, alice, true, false)
-    IdentityUtil.markIdentityVerified(harness.context, alice, false, false)
-
-    IdentityUtil.markIdentityUpdate(harness.context, alice.id)
-
-    // Calls
-    SignalDatabase.calls.insertOneToOneCall(1, System.currentTimeMillis(), alice.id, CallTable.Type.AUDIO_CALL, CallTable.Direction.OUTGOING, CallTable.Event.ACCEPTED)
-    SignalDatabase.calls.insertOneToOneCall(2, System.currentTimeMillis(), alice.id, CallTable.Type.VIDEO_CALL, CallTable.Direction.INCOMING, CallTable.Event.MISSED)
-    SignalDatabase.calls.insertOneToOneCall(3, System.currentTimeMillis(), alice.id, CallTable.Type.AUDIO_CALL, CallTable.Direction.INCOMING, CallTable.Event.MISSED_NOTIFICATION_PROFILE)
-
-    SignalDatabase.calls.insertAcceptedGroupCall(4, messageHelper.group.recipientId, CallTable.Direction.INCOMING, System.currentTimeMillis())
-    SignalDatabase.calls.insertDeclinedGroupCall(5, messageHelper.group.recipientId, System.currentTimeMillis())
-
-    // Detected changes
-    SignalDatabase.messages.insertProfileNameChangeMessages(alice, "new name", "previous name")
-    SignalDatabase.messages.insertLearnedProfileNameChangeMessage(alice, null, "username.42")
-    SignalDatabase.messages.insertNumberChangeMessages(alice.id)
-    SignalDatabase.messages.insertSmsExportMessage(alice.id, SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!)
-    SignalDatabase.messages.insertSessionSwitchoverEvent(alice.id, aliceThreadId, SessionSwitchoverEvent())
-
-    // Sent failed
-    SignalDatabase.messages.markAsSending(messageHelper.outgoingText().messageId)
-    SignalDatabase.messages.markAsSentFailed(messageHelper.outgoingText().messageId)
-    messageHelper.outgoingText().let {
-      SignalDatabase.messages.markAsSending(it.messageId)
-      SignalDatabase.messages.markAsRateLimited(it.messageId)
-    }
-
-    // Group change
-    messageHelper.outgoingGroupChange()
-
-    // Cleanup and confirm setup
-    SignalDatabase.messages.deleteMessage(messageId = oneToOnePlaceHolderMessage, threadId = aliceThreadId, notify = false, updateThread = false)
-    SignalDatabase.messages.deleteMessage(messageId = groupPlaceholderMessage, threadId = aliceThreadId, notify = false, updateThread = false)
-
-    SignalDatabase.rawDatabase.withinTransaction {
-      SignalDatabase.messages.getMessageCountForThread(aliceThreadId) assertIs 16
-      SignalDatabase.messages.getMessageCountForThread(groupThreadId) assertIs 10
-    }
-
-    // WHEN
-    messageHelper.syncDeleteForMeLocalOnlyConversation(messageHelper.alice, messageHelper.group.recipientId)
-
-    // THEN
-    SignalDatabase.messages.getMessageCountForThread(aliceThreadId) assertIs 0
-    SignalDatabase.threads.getThreadRecord(aliceThreadId) assertIs null
-
-    SignalDatabase.messages.getMessageCountForThread(groupThreadId) assertIs 0
-    SignalDatabase.threads.getThreadRecord(groupThreadId) assertIs null
-  }
-
-  @Test
-  fun singleLocalOnlyConversationHasAddressable() {
-    // GIVEN
-    val messages = mutableListOf<MessageTable.SyncMessageId>()
-
-    for (i in 0 until 10) {
-      messages += MessageTable.SyncMessageId(messageHelper.alice, messageHelper.incomingText().timestamp)
-      messages += MessageTable.SyncMessageId(harness.self.id, messageHelper.outgoingText().timestamp)
-    }
-
-    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
-    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 20
-
-    // WHEN
-    messageHelper.syncDeleteForMeLocalOnlyConversation(messageHelper.alice)
-
-    // THEN
-    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 20
-    SignalDatabase.threads.getThreadRecord(threadId).assertIsNotNull()
-
-    harness.inMemoryLogger.flush()
-    harness.inMemoryLogger.entries().filter { it.message?.contains("Thread is not local only") == true }.size assertIs 1
-  }
-
-  @Test
-  fun singleAttachmentDeletes() {
-    // GIVEN
-    val message1 = messageHelper.outgoingText { message ->
-      message.copy(
-        attachments = listOf(
-          messageHelper.outgoingAttachment(byteArrayOf(1, 2, 3)),
-          messageHelper.outgoingAttachment(byteArrayOf(2, 3, 4), null),
-          messageHelper.outgoingAttachment(byteArrayOf(5, 6, 7), null),
-          messageHelper.outgoingAttachment(byteArrayOf(10, 11, 12))
-        )
-      )
-    }
-
-    var attachments = SignalDatabase.attachments.getAttachmentsForMessage(message1.messageId)
-    attachments assertIsSize 4
-
-    val threadId = SignalDatabase.threads.getThreadIdFor(messageHelper.alice)!!
-    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 1
-
-    // Has all three
-    SignalDatabase.attachments.finalizeAttachmentAfterUpload(
-      id = attachments[0].attachmentId,
-      attachment = attachments[0].copy(digest = byteArrayOf(attachments[0].attachmentId.id.toByte())),
-      uploadTimestamp = message1.timestamp + 1
-    )
-
-    // Missing uuid and digest
-    SignalDatabase.attachments.finalizeAttachmentAfterUpload(
-      id = attachments[1].attachmentId,
-      attachment = attachments[1],
-      uploadTimestamp = message1.timestamp + 1
-    )
-
-    // Missing uuid and plain text
-    SignalDatabase.attachments.finalizeAttachmentAfterUpload(
-      id = attachments[2].attachmentId,
-      attachment = attachments[2].copy(digest = byteArrayOf(attachments[2].attachmentId.id.toByte())),
-      uploadTimestamp = message1.timestamp + 1
-    )
-    SignalDatabase.rawDatabase.update(AttachmentTable.TABLE_NAME).values(AttachmentTable.DATA_HASH_END to null).where("${AttachmentTable.ID} = ?", attachments[2].attachmentId).run()
-
-    // Different has all three
-    SignalDatabase.attachments.finalizeAttachmentAfterUpload(
-      id = attachments[3].attachmentId,
-      attachment = attachments[3].copy(digest = byteArrayOf(attachments[3].attachmentId.id.toByte())),
-      uploadTimestamp = message1.timestamp + 1
-    )
-
-    attachments = SignalDatabase.attachments.getAttachmentsForMessage(message1.messageId)
-
-    // WHEN
-    messageHelper.syncDeleteForMeAttachment(
-      conversationId = messageHelper.alice,
-      message = message1.author to message1.timestamp,
-      attachments[0].uuid,
-      attachments[0].remoteDigest,
-      attachments[0].dataHash
-    )
-
-    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 1
-    var updatedAttachments = SignalDatabase.attachments.getAttachmentsForMessage(message1.messageId)
-    updatedAttachments assertIsSize 3
-    updatedAttachments.forEach { it.attachmentId assertIsNot attachments[0].attachmentId }
-
-    messageHelper.syncDeleteForMeAttachment(
-      conversationId = messageHelper.alice,
-      message = message1.author to message1.timestamp,
-      attachments[1].uuid,
-      attachments[1].remoteDigest,
-      attachments[1].dataHash
-    )
-
-    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 1
-    updatedAttachments = SignalDatabase.attachments.getAttachmentsForMessage(message1.messageId)
-    updatedAttachments assertIsSize 2
-    updatedAttachments.forEach { it.attachmentId assertIsNot attachments[1].attachmentId }
-
-    messageHelper.syncDeleteForMeAttachment(
-      conversationId = messageHelper.alice,
-      message = message1.author to message1.timestamp,
-      attachments[2].uuid,
-      attachments[2].remoteDigest,
-      attachments[2].dataHash
-    )
-
-    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 1
-    updatedAttachments = SignalDatabase.attachments.getAttachmentsForMessage(message1.messageId)
-    updatedAttachments assertIsSize 1
-    updatedAttachments.forEach { it.attachmentId assertIsNot attachments[2].attachmentId }
-
-    messageHelper.syncDeleteForMeAttachment(
-      conversationId = messageHelper.alice,
-      message = message1.author to message1.timestamp,
-      attachments[3].uuid,
-      attachments[3].remoteDigest,
-      attachments[3].dataHash
-    )
-
-    SignalDatabase.messages.getMessageCountForThread(threadId) assertIs 0
-    updatedAttachments = SignalDatabase.attachments.getAttachmentsForMessage(message1.messageId)
-    updatedAttachments assertIsSize 0
-
-    SignalDatabase.threads.getThreadRecord(threadId) assertIs null
-  }
-
-  private fun DatabaseAttachment.copy(
-    uuid: UUID? = this.uuid,
-    digest: ByteArray? = this.remoteDigest
-  ): Attachment {
-    return DatabaseAttachment(
-      attachmentId = this.attachmentId,
-      mmsId = this.mmsId,
-      hasData = this.hasData,
-      hasThumbnail = false,
-      hasArchiveThumbnail = false,
-      contentType = this.contentType,
-      transferProgress = this.transferState,
-      size = this.size,
-      fileName = this.fileName,
-      cdn = this.cdn,
-      location = this.remoteLocation,
-      key = this.remoteKey,
-      digest = digest,
-      incrementalDigest = this.incrementalDigest,
-      incrementalMacChunkSize = this.incrementalMacChunkSize,
-      fastPreflightId = this.fastPreflightId,
-      voiceNote = this.voiceNote,
-      borderless = this.borderless,
-      videoGif = this.videoGif,
-      width = this.width,
-      height = this.height,
-      quote = this.quote,
-      caption = this.caption,
-      stickerLocator = this.stickerLocator,
-      blurHash = this.blurHash,
-      audioHash = this.audioHash,
-      transformProperties = this.transformProperties,
-      displayOrder = this.displayOrder,
-      uploadTimestamp = this.uploadTimestamp,
-      dataHash = this.dataHash,
-      archiveCdn = this.archiveCdn,
-      archiveThumbnailCdn = this.archiveThumbnailCdn,
-      archiveMediaName = this.archiveMediaName,
-      archiveMediaId = this.archiveMediaId,
-      thumbnailRestoreState = this.thumbnailRestoreState,
-      uuid = uuid
-    )
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/messages/TestMessage.kt

@@ -1,12 +0,0 @@
-package org.thoughtcrime.securesms.messages
-
-import org.whispersystems.signalservice.api.crypto.EnvelopeMetadata
-import org.whispersystems.signalservice.internal.push.Content
-import org.whispersystems.signalservice.internal.push.Envelope
-
-data class TestMessage(
-  val envelope: Envelope,
-  val content: Content,
-  val metadata: EnvelopeMetadata,
-  val serverDeliveredTimestamp: Long
-)

app/src/androidTest/java/org/thoughtcrime/securesms/messages/TimingMessageContentProcessor.kt

@@ -1,28 +0,0 @@
-package org.thoughtcrime.securesms.messages
-
-import android.content.Context
-import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.testing.LogPredicate
-import org.thoughtcrime.securesms.util.SignalLocalMetrics
-import org.whispersystems.signalservice.api.crypto.EnvelopeMetadata
-import org.whispersystems.signalservice.internal.push.Content
-import org.whispersystems.signalservice.internal.push.Envelope
-
-class TimingMessageContentProcessor(context: Context) : MessageContentProcessor(context) {
-  companion object {
-    val TAG = Log.tag(TimingMessageContentProcessor::class.java)
-
-    fun endTagPredicate(timestamp: Long): LogPredicate = { entry ->
-      entry.tag == TAG && entry.message == endTag(timestamp)
-    }
-
-    private fun startTag(timestamp: Long) = "$timestamp start"
-    fun endTag(timestamp: Long) = "$timestamp end"
-  }
-
-  override fun process(envelope: Envelope, content: Content, metadata: EnvelopeMetadata, serverDeliveredTimestamp: Long, processingEarlyContent: Boolean, localMetric: SignalLocalMetrics.MessageReceive?) {
-    Log.d(TAG, startTag(envelope.timestamp!!))
-    super.process(envelope, content, metadata, serverDeliveredTimestamp, processingEarlyContent, localMetric)
-    Log.d(TAG, endTag(envelope.timestamp!!))
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/migrations/SubscriberIdMigrationJobTest.kt

@@ -1,55 +0,0 @@
-package org.thoughtcrime.securesms.migrations
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.core.util.count
-import org.signal.core.util.readToSingleInt
-import org.signal.donations.PaymentSourceType
-import org.thoughtcrime.securesms.database.InAppPaymentSubscriberTable
-import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.database.model.InAppPaymentSubscriberRecord
-import org.thoughtcrime.securesms.database.model.databaseprotos.InAppPaymentData
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.testing.assertIs
-import org.thoughtcrime.securesms.testing.assertIsNotNull
-import org.whispersystems.signalservice.api.subscriptions.SubscriberId
-import java.util.Currency
-
-@RunWith(AndroidJUnit4::class)
-class SubscriberIdMigrationJobTest {
-
-  private val testSubject = SubscriberIdMigrationJob()
-
-  @Test
-  fun givenNoSubscriber_whenIRunSubscriberIdMigrationJob_thenIExpectNoDatabaseEntries() {
-    testSubject.run()
-
-    val actual = SignalDatabase.inAppPaymentSubscribers.readableDatabase.count()
-      .from(InAppPaymentSubscriberTable.TABLE_NAME)
-      .run()
-      .readToSingleInt()
-
-    actual assertIs 0
-  }
-
-  @Test
-  fun givenUSDSubscriber_whenIRunSubscriberIdMigrationJob_thenIExpectASingleEntry() {
-    val subscriberId = SubscriberId.generate()
-    SignalStore.inAppPayments.setSubscriberCurrency(Currency.getInstance("USD"), InAppPaymentSubscriberRecord.Type.DONATION)
-    SignalStore.inAppPayments.setSubscriber("USD", subscriberId)
-    SignalStore.inAppPayments.setSubscriptionPaymentSourceType(PaymentSourceType.PayPal)
-    SignalStore.inAppPayments.shouldCancelSubscriptionBeforeNextSubscribeAttempt = true
-
-    testSubject.run()
-
-    val actual = SignalDatabase.inAppPaymentSubscribers.getByCurrencyCode("USD", InAppPaymentSubscriberRecord.Type.DONATION)
-
-    actual.assertIsNotNull()
-    actual!!.subscriberId.bytes assertIs subscriberId.bytes
-    actual.paymentMethodType assertIs InAppPaymentData.PaymentMethodType.PAYPAL
-    actual.requiresCancel assertIs true
-    actual.currency assertIs Currency.getInstance("USD")
-    actual.type assertIs InAppPaymentSubscriberRecord.Type.DONATION
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditFragmentTest.kt

@@ -33,7 +33,6 @@ import org.thoughtcrime.securesms.testing.SignalActivityRule
 import org.thoughtcrime.securesms.testing.assertIsNotNull
 import org.thoughtcrime.securesms.testing.assertIsNull
 import org.thoughtcrime.securesms.testing.success
-import org.whispersystems.signalservice.api.util.Usernames
 import org.whispersystems.signalservice.internal.push.ReserveUsernameResponse
 import java.util.concurrent.TimeUnit
 
@@ -57,10 +56,27 @@ class UsernameEditFragmentTest {
     InstrumentationApplicationDependencyProvider.clearHandlers()
   }
 
+  @Test
+  fun testUsernameCreationInRegistration() {
+    val scenario = createScenario(true)
+
+    scenario.moveToState(Lifecycle.State.RESUMED)
+
+    onView(withId(R.id.toolbar)).check { view, noViewFoundException ->
+      noViewFoundException.assertIsNull()
+      val toolbar = view as Toolbar
+
+      toolbar.navigationIcon.assertIsNull()
+    }
+
+    onView(withText(R.string.UsernameEditFragment__add_a_username)).check(matches(isDisplayed()))
+    onView(withContentDescription(R.string.load_more_header__loading)).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.GONE)))
+  }
+
   @Ignore("Flakey espresso test.")
   @Test
   fun testUsernameCreationOutsideOfRegistration() {
-    val scenario = createScenario(UsernameEditMode.NORMAL)
+    val scenario = createScenario()
 
     scenario.moveToState(Lifecycle.State.RESUMED)
 
@@ -80,18 +96,18 @@ class UsernameEditFragmentTest {
   fun testNicknameUpdateHappyPath() {
     val nickname = "Spiderman"
     val discriminator = "4578"
-    val username = "$nickname${Usernames.DELIMITER}$discriminator"
+    val username = "$nickname${UsernameState.DELIMITER}$discriminator"
 
     InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
       Put("/v1/accounts/username/reserved") {
-        MockResponse().success(ReserveUsernameResponse(username))
+        MockResponse().success(ReserveUsernameResponse(username, "reservationToken"))
       },
       Put("/v1/accounts/username/confirm") {
         MockResponse().success()
       }
     )
 
-    val scenario = createScenario(UsernameEditMode.NORMAL)
+    val scenario = createScenario(isInRegistration = true)
     scenario.moveToState(Lifecycle.State.RESUMED)
 
     onView(withId(R.id.username_text)).perform(typeText(nickname))
@@ -115,8 +131,8 @@ class UsernameEditFragmentTest {
     onView(withId(R.id.username_done_button)).check(matches(isNotEnabled()))
   }
 
-  private fun createScenario(mode: UsernameEditMode = UsernameEditMode.NORMAL): FragmentScenario<UsernameEditFragment> {
-    val fragmentArgs = UsernameEditFragmentArgs.Builder().setMode(mode).build().toBundle()
+  private fun createScenario(isInRegistration: Boolean = false): FragmentScenario<UsernameEditFragment> {
+    val fragmentArgs = UsernameEditFragmentArgs.Builder().setIsInRegistration(isInRegistration).build().toBundle()
     return launchFragmentInContainer(
       fragmentArgs = fragmentArgs,
       themeResId = R.style.Signal_DayNight_NoActionBar

app/src/androidTest/java/org/thoughtcrime/securesms/safety/SafetyNumberBottomSheetRepositoryTest.kt

@@ -90,10 +90,10 @@ class SafetyNumberBottomSheetRepositoryTest {
     subjectUnderTest.removeFromStories(toRemove, listOf(destinationKey)).subscribe()
     testSubscriber.request(1)
     testScheduler.triggerActions()
-    testSubscriber.awaitCount(2)
+    testSubscriber.awaitCount(3)
 
     // THEN
-    testSubscriber.assertValueAt(1) { map ->
+    testSubscriber.assertValueAt(2) { map ->
       assertMatch(
         map,
         mapOf(
@@ -116,10 +116,10 @@ class SafetyNumberBottomSheetRepositoryTest {
     subjectUnderTest.removeAllFromStory(distributionListMembers, distributionList).subscribe()
     testSubscriber.request(1)
     testScheduler.triggerActions()
-    testSubscriber.awaitCount(2)
+    testSubscriber.awaitCount(3)
 
     // THEN
-    testSubscriber.assertValueAt(1) { map ->
+    testSubscriber.assertValueAt(2) { map ->
       assertMatch(map, mapOf())
     }
   }

app/src/androidTest/java/org/thoughtcrime/securesms/storage/ContactRecordProcessorTest.kt

@@ -1,164 +0,0 @@
-package org.thoughtcrime.securesms.storage
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNotEquals
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.core.util.Base64
-import org.signal.core.util.update
-import org.thoughtcrime.securesms.database.RecipientTable
-import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.whispersystems.signalservice.api.push.ServiceId.ACI
-import org.whispersystems.signalservice.api.push.ServiceId.PNI
-import org.whispersystems.signalservice.api.storage.SignalContactRecord
-import org.whispersystems.signalservice.api.storage.StorageId
-import org.whispersystems.signalservice.internal.storage.protos.ContactRecord
-import java.util.UUID
-
-@RunWith(AndroidJUnit4::class)
-class ContactRecordProcessorTest {
-
-  @Before
-  fun setup() {
-    SignalStore.account.setE164(E164_SELF)
-    SignalStore.account.setAci(ACI_SELF)
-    SignalStore.account.setPni(PNI_SELF)
-  }
-
-  @Test
-  fun process_splitContact_normalSplit_twoRecords() {
-    // GIVEN
-    val originalId = SignalDatabase.recipients.getAndPossiblyMerge(ACI_A, PNI_A, E164_A)
-    setStorageId(originalId, STORAGE_ID_A)
-
-    val remote1 = buildRecord(
-      STORAGE_ID_B,
-      ContactRecord(
-        aci = ACI_A.toString(),
-        unregisteredAtTimestamp = 100
-      )
-    )
-
-    val remote2 = buildRecord(
-      STORAGE_ID_C,
-      ContactRecord(
-        pni = PNI_A.toString(),
-        e164 = E164_A
-      )
-    )
-
-    // WHEN
-    val subject = ContactRecordProcessor()
-    subject.process(listOf(remote1, remote2), StorageSyncHelper.KEY_GENERATOR)
-
-    // THEN
-    val byAci: RecipientId = SignalDatabase.recipients.getByAci(ACI_A).get()
-
-    val byE164: RecipientId = SignalDatabase.recipients.getByE164(E164_A).get()
-    val byPni: RecipientId = SignalDatabase.recipients.getByPni(PNI_A).get()
-
-    assertEquals(originalId, byAci)
-    assertEquals(byE164, byPni)
-    assertNotEquals(byAci, byE164)
-  }
-
-  @Test
-  fun process_splitContact_normalSplit_oneRecord() {
-    // GIVEN
-    val originalId = SignalDatabase.recipients.getAndPossiblyMerge(ACI_A, PNI_A, E164_A)
-    setStorageId(originalId, STORAGE_ID_A)
-
-    val remote = buildRecord(
-      STORAGE_ID_B,
-      ContactRecord(
-        aci = ACI_A.toString(),
-        unregisteredAtTimestamp = 100
-      )
-    )
-
-    // WHEN
-    val subject = ContactRecordProcessor()
-    subject.process(listOf(remote), StorageSyncHelper.KEY_GENERATOR)
-
-    // THEN
-    val byAci: RecipientId = SignalDatabase.recipients.getByAci(ACI_A).get()
-
-    val byE164: RecipientId = SignalDatabase.recipients.getByE164(E164_A).get()
-    val byPni: RecipientId = SignalDatabase.recipients.getByPni(PNI_A).get()
-
-    assertEquals(originalId, byAci)
-    assertEquals(byE164, byPni)
-    assertNotEquals(byAci, byE164)
-  }
-
-  @Test
-  fun process_splitContact_doNotSplitIfAciRecordIsRegistered() {
-    // GIVEN
-    val originalId = SignalDatabase.recipients.getAndPossiblyMerge(ACI_A, PNI_A, E164_A)
-    setStorageId(originalId, STORAGE_ID_A)
-
-    val remote1 = buildRecord(
-      STORAGE_ID_B,
-      ContactRecord(
-        aci = ACI_A.toString(),
-        unregisteredAtTimestamp = 0
-      )
-    )
-
-    val remote2 = buildRecord(
-      STORAGE_ID_C,
-      ContactRecord(
-        aci = PNI_A.toString(),
-        pni = PNI_A.toString(),
-        e164 = E164_A
-      )
-    )
-
-    // WHEN
-    val subject = ContactRecordProcessor()
-    subject.process(listOf(remote1, remote2), StorageSyncHelper.KEY_GENERATOR)
-
-    // THEN
-    val byAci: RecipientId = SignalDatabase.recipients.getByAci(ACI_A).get()
-    val byE164: RecipientId = SignalDatabase.recipients.getByE164(E164_A).get()
-    val byPni: RecipientId = SignalDatabase.recipients.getByPni(PNI_A).get()
-
-    assertEquals(originalId, byAci)
-    assertEquals(byE164, byPni)
-    assertEquals(byAci, byE164)
-  }
-
-  private fun buildRecord(id: StorageId, record: ContactRecord): SignalContactRecord {
-    return SignalContactRecord(id, record)
-  }
-
-  private fun setStorageId(recipientId: RecipientId, storageId: StorageId) {
-    SignalDatabase.rawDatabase
-      .update(RecipientTable.TABLE_NAME)
-      .values(RecipientTable.STORAGE_SERVICE_ID to Base64.encodeWithPadding(storageId.raw))
-      .where("${RecipientTable.ID} = ?", recipientId)
-      .run()
-  }
-
-  companion object {
-    val ACI_A = ACI.from(UUID.fromString("aaaa0000-5a76-47fa-a98a-7e72c948a82e"))
-    val ACI_B = ACI.from(UUID.fromString("bbbb0000-0b60-4a68-9cd9-ed2f8453f9ed"))
-    val ACI_SELF = ACI.from(UUID.fromString("77770000-b477-4f35-a824-d92987a63641"))
-
-    val PNI_A = PNI.from(UUID.fromString("aaaa1111-c960-4f6c-8385-671ad2ffb999"))
-    val PNI_B = PNI.from(UUID.fromString("bbbb1111-cd55-40bf-adda-c35a85375533"))
-    val PNI_SELF = PNI.from(UUID.fromString("77771111-b014-41fb-bf73-05cb2ec52910"))
-
-    const val E164_A = "+12222222222"
-    const val E164_B = "+13333333333"
-    const val E164_SELF = "+10000000000"
-
-    val STORAGE_ID_A: StorageId = StorageId.forContact(byteArrayOf(1, 2, 3, 4))
-    val STORAGE_ID_B: StorageId = StorageId.forContact(byteArrayOf(5, 6, 7, 8))
-    val STORAGE_ID_C: StorageId = StorageId.forContact(byteArrayOf(9, 10, 11, 12))
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/testing/AliceClient.kt

@@ -1,58 +0,0 @@
-package org.thoughtcrime.securesms.testing
-
-import org.signal.core.util.logging.Log
-import org.signal.libsignal.protocol.ecc.ECKeyPair
-import org.signal.libsignal.zkgroup.profiles.ProfileKey
-import org.thoughtcrime.securesms.dependencies.AppDependencies
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.messages.protocol.BufferedProtocolStore
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.testing.FakeClientHelpers.toEnvelope
-import org.whispersystems.signalservice.api.push.ServiceId
-import org.whispersystems.signalservice.api.push.SignalServiceAddress
-import org.whispersystems.signalservice.internal.push.Envelope
-
-/**
- * Welcome to Alice's Client.
- *
- * Alice represent the Android instrumentation test user. Unlike [BobClient] much less is needed here
- * as it can make use of the standard Signal Android App infrastructure.
- */
-class AliceClient(val serviceId: ServiceId, val e164: String, val trustRoot: ECKeyPair) {
-
-  companion object {
-    val TAG = Log.tag(AliceClient::class.java)
-  }
-
-  private val aliceSenderCertificate = FakeClientHelpers.createCertificateFor(
-    trustRoot = trustRoot,
-    uuid = serviceId.rawUuid,
-    e164 = e164,
-    deviceId = 1,
-    identityKey = SignalStore.account.aciIdentityKey.publicKey.publicKey,
-    expires = 31337
-  )
-
-  fun process(envelope: Envelope, serverDeliveredTimestamp: Long) {
-    val start = System.currentTimeMillis()
-    val bufferedStore = BufferedProtocolStore.create()
-    AppDependencies.incomingMessageObserver
-      .processEnvelope(bufferedStore, envelope, serverDeliveredTimestamp)
-      ?.mapNotNull { it.run() }
-      ?.forEach { it.enqueue() }
-
-    bufferedStore.flushToDisk()
-    val end = System.currentTimeMillis()
-    Log.d(TAG, "${end - start}")
-  }
-
-  fun encrypt(now: Long, destination: Recipient): Envelope {
-    return AppDependencies.signalServiceMessageSender.getEncryptedMessage(
-      SignalServiceAddress(destination.requireServiceId(), destination.requireE164()),
-      FakeClientHelpers.getSealedSenderAccess(ProfileKey(destination.profileKey), aliceSenderCertificate),
-      1,
-      FakeClientHelpers.encryptedTextMessage(now),
-      false
-    ).toEnvelope(now, destination.requireServiceId())
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/testing/BobClient.kt

@@ -1,180 +0,0 @@
-package org.thoughtcrime.securesms.testing
-
-import org.signal.core.util.readToSingleInt
-import org.signal.core.util.select
-import org.signal.libsignal.protocol.IdentityKey
-import org.signal.libsignal.protocol.IdentityKeyPair
-import org.signal.libsignal.protocol.SessionBuilder
-import org.signal.libsignal.protocol.SignalProtocolAddress
-import org.signal.libsignal.protocol.ecc.ECKeyPair
-import org.signal.libsignal.protocol.groups.state.SenderKeyRecord
-import org.signal.libsignal.protocol.state.IdentityKeyStore
-import org.signal.libsignal.protocol.state.KyberPreKeyRecord
-import org.signal.libsignal.protocol.state.PreKeyBundle
-import org.signal.libsignal.protocol.state.PreKeyRecord
-import org.signal.libsignal.protocol.state.SessionRecord
-import org.signal.libsignal.protocol.state.SignedPreKeyRecord
-import org.signal.libsignal.protocol.util.KeyHelper
-import org.signal.libsignal.zkgroup.profiles.ProfileKey
-import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
-import org.thoughtcrime.securesms.crypto.SealedSenderAccessUtil
-import org.thoughtcrime.securesms.database.OneTimePreKeyTable
-import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.database.SignedPreKeyTable
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.testing.FakeClientHelpers.toEnvelope
-import org.whispersystems.signalservice.api.SignalServiceAccountDataStore
-import org.whispersystems.signalservice.api.SignalSessionLock
-import org.whispersystems.signalservice.api.crypto.SealedSenderAccess
-import org.whispersystems.signalservice.api.crypto.SignalServiceCipher
-import org.whispersystems.signalservice.api.crypto.SignalSessionBuilder
-import org.whispersystems.signalservice.api.push.DistributionId
-import org.whispersystems.signalservice.api.push.ServiceId
-import org.whispersystems.signalservice.api.push.SignalServiceAddress
-import org.whispersystems.signalservice.internal.push.Envelope
-import java.util.UUID
-import java.util.concurrent.locks.ReentrantLock
-
-/**
- * Welcome to Bob's Client.
- *
- * Bob is a "fake" client that can start a session with the Android instrumentation test user (Alice).
- *
- * Bob can create a new session using a prekey bundle created from Alice's prekeys, send a message, decrypt
- * a return message from Alice, and that'll start a standard Signal session with normal keys/ratcheting.
- */
-class BobClient(val serviceId: ServiceId, val e164: String, val identityKeyPair: IdentityKeyPair, val trustRoot: ECKeyPair, val profileKey: ProfileKey) {
-
-  private val serviceAddress = SignalServiceAddress(serviceId, e164)
-  private val registrationId = KeyHelper.generateRegistrationId(false)
-  private val aciStore = BobSignalServiceAccountDataStore(registrationId, identityKeyPair)
-  private val senderCertificate = FakeClientHelpers.createCertificateFor(trustRoot, serviceId.rawUuid, e164, 1, identityKeyPair.publicKey.publicKey, 31337)
-  private val sessionLock = object : SignalSessionLock {
-    private val lock = ReentrantLock()
-
-    override fun acquire(): SignalSessionLock.Lock {
-      lock.lock()
-      return SignalSessionLock.Lock { lock.unlock() }
-    }
-  }
-
-  /** Inspired by SignalServiceMessageSender#getEncryptedMessage */
-  fun encrypt(now: Long): Envelope {
-    val envelopeContent = FakeClientHelpers.encryptedTextMessage(now)
-
-    val cipher = SignalServiceCipher(serviceAddress, 1, aciStore, sessionLock, null)
-
-    if (!aciStore.containsSession(getAliceProtocolAddress())) {
-      val sessionBuilder = SignalSessionBuilder(sessionLock, SessionBuilder(aciStore, getAliceProtocolAddress()))
-      sessionBuilder.process(getAlicePreKeyBundle())
-    }
-
-    return cipher.encrypt(getAliceProtocolAddress(), getAliceUnidentifiedAccess(), envelopeContent)
-      .toEnvelope(envelopeContent.content.get().dataMessage!!.timestamp!!, getAliceServiceId())
-  }
-
-  fun decrypt(envelope: Envelope, serverDeliveredTimestamp: Long) {
-    val cipher = SignalServiceCipher(serviceAddress, 1, aciStore, sessionLock, SealedSenderAccessUtil.getCertificateValidator())
-    cipher.decrypt(envelope, serverDeliveredTimestamp)
-  }
-
-  private fun getAliceServiceId(): ServiceId {
-    return SignalStore.account.requireAci()
-  }
-
-  private fun getAlicePreKeyBundle(): PreKeyBundle {
-    val selfPreKeyId = SignalDatabase.rawDatabase
-      .select(OneTimePreKeyTable.KEY_ID)
-      .from(OneTimePreKeyTable.TABLE_NAME)
-      .where("${OneTimePreKeyTable.ACCOUNT_ID} = ?", getAliceServiceId().toString())
-      .run()
-      .readToSingleInt(-1)
-
-    val selfPreKeyRecord = SignalDatabase.oneTimePreKeys.get(getAliceServiceId(), selfPreKeyId)!!
-
-    val selfSignedPreKeyId = SignalDatabase.rawDatabase
-      .select(SignedPreKeyTable.KEY_ID)
-      .from(SignedPreKeyTable.TABLE_NAME)
-      .where("${SignedPreKeyTable.ACCOUNT_ID} = ?", getAliceServiceId().toString())
-      .run()
-      .readToSingleInt(-1)
-
-    val selfSignedPreKeyRecord = SignalDatabase.signedPreKeys.get(getAliceServiceId(), selfSignedPreKeyId)!!
-
-    return PreKeyBundle(
-      SignalStore.account.registrationId,
-      1,
-      selfPreKeyId,
-      selfPreKeyRecord.keyPair.publicKey,
-      selfSignedPreKeyId,
-      selfSignedPreKeyRecord.keyPair.publicKey,
-      selfSignedPreKeyRecord.signature,
-      getAlicePublicKey()
-    )
-  }
-
-  private fun getAliceProtocolAddress(): SignalProtocolAddress {
-    return SignalProtocolAddress(SignalStore.account.requireAci().toString(), 1)
-  }
-
-  private fun getAlicePublicKey(): IdentityKey {
-    return SignalStore.account.aciIdentityKey.publicKey
-  }
-
-  private fun getAliceProfileKey(): ProfileKey {
-    return ProfileKeyUtil.getSelfProfileKey()
-  }
-
-  private fun getAliceUnidentifiedAccess(): SealedSenderAccess? {
-    return FakeClientHelpers.getSealedSenderAccess(getAliceProfileKey(), senderCertificate)
-  }
-
-  private class BobSignalServiceAccountDataStore(private val registrationId: Int, private val identityKeyPair: IdentityKeyPair) : SignalServiceAccountDataStore {
-    private var aliceSessionRecord: SessionRecord? = null
-
-    override fun getIdentityKeyPair(): IdentityKeyPair = identityKeyPair
-
-    override fun getLocalRegistrationId(): Int = registrationId
-    override fun isTrustedIdentity(address: SignalProtocolAddress?, identityKey: IdentityKey?, direction: IdentityKeyStore.Direction?): Boolean = true
-    override fun loadSession(address: SignalProtocolAddress?): SessionRecord = aliceSessionRecord ?: SessionRecord()
-    override fun saveIdentity(address: SignalProtocolAddress?, identityKey: IdentityKey?): Boolean = false
-    override fun storeSession(address: SignalProtocolAddress?, record: SessionRecord?) {
-      aliceSessionRecord = record
-    }
-    override fun getSubDeviceSessions(name: String?): List<Int> = emptyList()
-    override fun containsSession(address: SignalProtocolAddress?): Boolean = aliceSessionRecord != null
-    override fun getIdentity(address: SignalProtocolAddress?): IdentityKey = SignalStore.account.aciIdentityKey.publicKey
-    override fun loadPreKey(preKeyId: Int): PreKeyRecord = throw UnsupportedOperationException()
-    override fun storePreKey(preKeyId: Int, record: PreKeyRecord?) = throw UnsupportedOperationException()
-    override fun containsPreKey(preKeyId: Int): Boolean = throw UnsupportedOperationException()
-    override fun removePreKey(preKeyId: Int) = throw UnsupportedOperationException()
-    override fun loadExistingSessions(addresses: MutableList<SignalProtocolAddress>?): MutableList<SessionRecord> = throw UnsupportedOperationException()
-    override fun deleteSession(address: SignalProtocolAddress?) = throw UnsupportedOperationException()
-    override fun deleteAllSessions(name: String?) = throw UnsupportedOperationException()
-    override fun loadSignedPreKey(signedPreKeyId: Int): SignedPreKeyRecord = throw UnsupportedOperationException()
-    override fun loadSignedPreKeys(): MutableList<SignedPreKeyRecord> = throw UnsupportedOperationException()
-    override fun storeSignedPreKey(signedPreKeyId: Int, record: SignedPreKeyRecord?) = throw UnsupportedOperationException()
-    override fun containsSignedPreKey(signedPreKeyId: Int): Boolean = throw UnsupportedOperationException()
-    override fun removeSignedPreKey(signedPreKeyId: Int) = throw UnsupportedOperationException()
-    override fun loadKyberPreKey(kyberPreKeyId: Int): KyberPreKeyRecord = throw UnsupportedOperationException()
-    override fun loadKyberPreKeys(): MutableList<KyberPreKeyRecord> = throw UnsupportedOperationException()
-    override fun storeKyberPreKey(kyberPreKeyId: Int, record: KyberPreKeyRecord?) = throw UnsupportedOperationException()
-    override fun containsKyberPreKey(kyberPreKeyId: Int): Boolean = throw UnsupportedOperationException()
-    override fun markKyberPreKeyUsed(kyberPreKeyId: Int) = throw UnsupportedOperationException()
-    override fun deleteAllStaleOneTimeEcPreKeys(threshold: Long, minCount: Int) = throw UnsupportedOperationException()
-    override fun markAllOneTimeEcPreKeysStaleIfNecessary(staleTime: Long) = throw UnsupportedOperationException()
-    override fun storeSenderKey(sender: SignalProtocolAddress?, distributionId: UUID?, record: SenderKeyRecord?) = throw UnsupportedOperationException()
-    override fun loadSenderKey(sender: SignalProtocolAddress?, distributionId: UUID?): SenderKeyRecord = throw UnsupportedOperationException()
-    override fun archiveSession(address: SignalProtocolAddress?) = throw UnsupportedOperationException()
-    override fun getAllAddressesWithActiveSessions(addressNames: MutableList<String>?): MutableMap<SignalProtocolAddress, SessionRecord> = throw UnsupportedOperationException()
-    override fun getSenderKeySharedWith(distributionId: DistributionId?): MutableSet<SignalProtocolAddress> = throw UnsupportedOperationException()
-    override fun markSenderKeySharedWith(distributionId: DistributionId?, addresses: MutableCollection<SignalProtocolAddress>?) = throw UnsupportedOperationException()
-    override fun clearSenderKeySharedWith(addresses: MutableCollection<SignalProtocolAddress>?) = throw UnsupportedOperationException()
-    override fun storeLastResortKyberPreKey(kyberPreKeyId: Int, kyberPreKeyRecord: KyberPreKeyRecord) = throw UnsupportedOperationException()
-    override fun removeKyberPreKey(kyberPreKeyId: Int) = throw UnsupportedOperationException()
-    override fun markAllOneTimeKyberPreKeysStaleIfNecessary(staleTime: Long) = throw UnsupportedOperationException()
-    override fun deleteAllStaleOneTimeKyberPreKeys(threshold: Long, minCount: Int) = throw UnsupportedOperationException()
-    override fun loadLastResortKyberPreKeys(): List<KyberPreKeyRecord> = throw UnsupportedOperationException()
-    override fun isMultiDevice(): Boolean = throw UnsupportedOperationException()
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/testing/FakeClientHelpers.kt

@@ -1,80 +0,0 @@
-package org.thoughtcrime.securesms.testing
-
-import okio.ByteString.Companion.toByteString
-import org.signal.core.util.Base64
-import org.signal.libsignal.internal.Native
-import org.signal.libsignal.internal.NativeHandleGuard
-import org.signal.libsignal.metadata.certificate.CertificateValidator
-import org.signal.libsignal.metadata.certificate.SenderCertificate
-import org.signal.libsignal.metadata.certificate.ServerCertificate
-import org.signal.libsignal.protocol.ecc.Curve
-import org.signal.libsignal.protocol.ecc.ECKeyPair
-import org.signal.libsignal.protocol.ecc.ECPublicKey
-import org.signal.libsignal.zkgroup.profiles.ProfileKey
-import org.thoughtcrime.securesms.messages.SignalServiceProtoUtil.buildWith
-import org.whispersystems.signalservice.api.crypto.ContentHint
-import org.whispersystems.signalservice.api.crypto.EnvelopeContent
-import org.whispersystems.signalservice.api.crypto.SealedSenderAccess
-import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess
-import org.whispersystems.signalservice.api.push.ServiceId
-import org.whispersystems.signalservice.internal.push.Content
-import org.whispersystems.signalservice.internal.push.DataMessage
-import org.whispersystems.signalservice.internal.push.Envelope
-import org.whispersystems.signalservice.internal.push.OutgoingPushMessage
-import java.util.Optional
-import java.util.UUID
-
-object FakeClientHelpers {
-
-  val noOpCertificateValidator = object : CertificateValidator(null) {
-    override fun validate(certificate: SenderCertificate, validationTime: Long) = Unit
-  }
-
-  fun createCertificateFor(trustRoot: ECKeyPair, uuid: UUID, e164: String, deviceId: Int, identityKey: ECPublicKey, expires: Long): SenderCertificate {
-    val serverKey: ECKeyPair = Curve.generateKeyPair()
-    NativeHandleGuard(serverKey.publicKey).use { serverPublicGuard ->
-      NativeHandleGuard(trustRoot.privateKey).use { trustRootPrivateGuard ->
-        val serverCertificate = ServerCertificate(Native.ServerCertificate_New(1, serverPublicGuard.nativeHandle(), trustRootPrivateGuard.nativeHandle()))
-        NativeHandleGuard(identityKey).use { identityGuard ->
-          NativeHandleGuard(serverCertificate).use { serverCertificateGuard ->
-            NativeHandleGuard(serverKey.privateKey).use { serverPrivateGuard ->
-              return SenderCertificate(Native.SenderCertificate_New(uuid.toString(), e164, deviceId, identityGuard.nativeHandle(), expires, serverCertificateGuard.nativeHandle(), serverPrivateGuard.nativeHandle()))
-            }
-          }
-        }
-      }
-    }
-  }
-
-  fun getSealedSenderAccess(theirProfileKey: ProfileKey, senderCertificate: SenderCertificate): SealedSenderAccess? {
-    val themUnidentifiedAccessKey = UnidentifiedAccess(UnidentifiedAccess.deriveAccessKeyFrom(theirProfileKey), senderCertificate.serialized, false)
-
-    return SealedSenderAccess.forIndividual(themUnidentifiedAccessKey)
-  }
-
-  fun encryptedTextMessage(now: Long, message: String = "Test body message"): EnvelopeContent {
-    val content = Content.Builder().apply {
-      dataMessage(
-        DataMessage.Builder().buildWith {
-          body = message
-          timestamp = now
-        }
-      )
-    }
-    return EnvelopeContent.encrypted(content.build(), ContentHint.RESENDABLE, Optional.empty())
-  }
-
-  fun OutgoingPushMessage.toEnvelope(timestamp: Long, destination: ServiceId): Envelope {
-    return Envelope.Builder()
-      .type(Envelope.Type.fromValue(this.type))
-      .sourceDevice(1)
-      .timestamp(timestamp)
-      .serverTimestamp(timestamp + 1)
-      .destinationServiceId(destination.toString())
-      .serverGuid(UUID.randomUUID().toString())
-      .content(Base64.decode(this.content).toByteString())
-      .urgent(true)
-      .story(false)
-      .build()
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/testing/GroupTestingUtils.kt

@@ -1,55 +0,0 @@
-package org.thoughtcrime.securesms.testing
-
-import okio.ByteString.Companion.toByteString
-import org.signal.libsignal.zkgroup.groups.GroupMasterKey
-import org.signal.storageservice.protos.groups.Member
-import org.signal.storageservice.protos.groups.local.DecryptedGroup
-import org.signal.storageservice.protos.groups.local.DecryptedMember
-import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.groups.GroupId
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.whispersystems.signalservice.api.push.ServiceId.ACI
-import org.whispersystems.signalservice.internal.push.GroupContextV2
-import kotlin.random.Random
-
-/**
- * Helper methods for creating groups for message processing tests et al.
- */
-object GroupTestingUtils {
-  fun member(aci: ACI, revision: Int = 0, role: Member.Role = Member.Role.ADMINISTRATOR): DecryptedMember {
-    return DecryptedMember.Builder()
-      .aciBytes(aci.toByteString())
-      .joinedAtRevision(revision)
-      .role(role)
-      .build()
-  }
-
-  fun insertGroup(revision: Int = 0, vararg members: DecryptedMember): TestGroupInfo {
-    val groupMasterKey = GroupMasterKey(Random.nextBytes(GroupMasterKey.SIZE))
-    val decryptedGroupState = DecryptedGroup.Builder()
-      .members(members.toList())
-      .revision(revision)
-      .title(MessageContentFuzzer.string())
-      .build()
-
-    val groupId = SignalDatabase.groups.create(groupMasterKey, decryptedGroupState, null)!!
-    val groupRecipientId = SignalDatabase.recipients.getOrInsertFromGroupId(groupId)
-    SignalDatabase.recipients.setProfileSharing(groupRecipientId, true)
-
-    return TestGroupInfo(groupId, groupMasterKey, groupRecipientId)
-  }
-
-  fun RecipientId.asMember(): DecryptedMember {
-    return Recipient.resolved(this).asMember()
-  }
-
-  fun Recipient.asMember(): DecryptedMember {
-    return member(aci = requireAci())
-  }
-
-  data class TestGroupInfo(val groupId: GroupId.V2, val masterKey: GroupMasterKey, val recipientId: RecipientId) {
-    val groupV2Context: GroupContextV2
-      get() = GroupContextV2(masterKey = masterKey.serialize().toByteString(), revision = 0)
-  }
-}

app/src/androidTest/java/org/thoughtcrime/securesms/testing/InMemoryLogger.kt

@@ -1,97 +0,0 @@
-package org.thoughtcrime.securesms.testing
-
-import org.signal.core.util.ThreadUtil
-import org.signal.core.util.concurrent.SignalExecutors
-import org.signal.core.util.logging.Log
-import java.util.concurrent.CountDownLatch
-
-typealias LogPredicate = (Entry) -> Boolean
-
-/**
- * Logging implementation that holds logs in memory as they are added to be retrieve at a later time by a test.
- * Can also be used for multithreaded synchronization and waiting until certain logs are emitted before continuing
- * a test.
- */
-class InMemoryLogger : Log.Logger() {
-
-  private val executor = SignalExecutors.newCachedSingleThreadExecutor("inmemory-logger", ThreadUtil.PRIORITY_BACKGROUND_THREAD)
-  private val predicates = mutableListOf<LogPredicate>()
-  private val logEntries = mutableListOf<Entry>()
-
-  override fun v(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) = add(Verbose(tag, message, t, System.currentTimeMillis()))
-  override fun d(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) = add(Debug(tag, message, t, System.currentTimeMillis()))
-  override fun i(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) = add(Info(tag, message, t, System.currentTimeMillis()))
-  override fun w(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) = add(Warn(tag, message, t, System.currentTimeMillis()))
-  override fun e(tag: String, message: String?, t: Throwable?, keepLonger: Boolean) = add(Error(tag, message, t, System.currentTimeMillis()))
-
-  override fun flush() {
-    val latch = CountDownLatch(1)
-    executor.execute { latch.countDown() }
-    latch.await()
-  }
-
-  fun clear() {
-    val latch = CountDownLatch(1)
-    executor.execute {
-      predicates.clear()
-      logEntries.clear()
-      latch.countDown()
-    }
-    latch.await()
-  }
-
-  private fun add(entry: Entry) {
-    executor.execute {
-      logEntries += entry
-
-      val iterator = predicates.iterator()
-      while (iterator.hasNext()) {
-        val predicate = iterator.next()
-        if (predicate(entry)) {
-          iterator.remove()
-        }
-      }
-    }
-  }
-
-  /** Blocks until a snapshot of all log entries can be taken in a thread-safe way. */
-  fun entries(): List<Entry> {
-    val latch = CountDownLatch(1)
-    var entries: List<Entry> = emptyList()
-    executor.execute {
-      entries = logEntries.toList()
-      latch.countDown()
-    }
-    latch.await()
-    return entries
-  }
-
-  /** Returns a countdown latch that'll fire at a future point when an [Entry] is received that matches the predicate. */
-  fun getLockForUntil(predicate: LogPredicate): CountDownLatch {
-    val latch = CountDownLatch(1)
-    executor.execute {
-      predicates += { entry ->
-        if (predicate(entry)) {
-          latch.countDown()
-          true
-        } else {
-          false
-        }
-      }
-    }
-    return latch
-  }
-}
-
-sealed interface Entry {
-  val tag: String
-  val message: String?
-  val throwable: Throwable?
-  val timestamp: Long
-}
-
-data class Verbose(override val tag: String, override val message: String?, override val throwable: Throwable?, override val timestamp: Long) : Entry
-data class Debug(override val tag: String, override val message: String?, override val throwable: Throwable?, override val timestamp: Long) : Entry
-data class Info(override val tag: String, override val message: String?, override val throwable: Throwable?, override val timestamp: Long) : Entry
-data class Warn(override val tag: String, override val message: String?, override val throwable: Throwable?, override val timestamp: Long) : Entry
-data class Error(override val tag: String, override val message: String?, override val throwable: Throwable?, override val timestamp: Long) : Entry

app/src/androidTest/java/org/thoughtcrime/securesms/testing/MessageContentFuzzer.kt

@@ -1,421 +0,0 @@
-package org.thoughtcrime.securesms.testing
-
-import okio.ByteString
-import okio.ByteString.Companion.toByteString
-import org.signal.core.util.Base64
-import org.thoughtcrime.securesms.database.AttachmentTable
-import org.thoughtcrime.securesms.groups.GroupId
-import org.thoughtcrime.securesms.messages.SignalServiceProtoUtil.buildWith
-import org.thoughtcrime.securesms.messages.TestMessage
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.whispersystems.signalservice.api.crypto.EnvelopeMetadata
-import org.whispersystems.signalservice.api.util.UuidUtil
-import org.whispersystems.signalservice.internal.push.AttachmentPointer
-import org.whispersystems.signalservice.internal.push.BodyRange
-import org.whispersystems.signalservice.internal.push.Content
-import org.whispersystems.signalservice.internal.push.DataMessage
-import org.whispersystems.signalservice.internal.push.EditMessage
-import org.whispersystems.signalservice.internal.push.Envelope
-import org.whispersystems.signalservice.internal.push.GroupContextV2
-import org.whispersystems.signalservice.internal.push.SyncMessage
-import java.util.UUID
-import kotlin.random.Random
-import kotlin.random.nextInt
-import kotlin.time.Duration.Companion.days
-
-/**
- * Random but deterministic fuzzer for create various message content protos.
- */
-object MessageContentFuzzer {
-
-  private val mediaTypes = listOf("image/png", "image/jpeg", "image/heic", "image/heif", "image/avif", "image/webp", "image/gif", "audio/aac", "audio/*", "video/mp4", "video/*", "text/x-vcard", "text/x-signal-plain", "application/x-signal-view-once", "*/*", "application/octet-stream")
-  private val emojis = listOf("😂", "❤️", "🔥", "😍", "👀", "🤔", "🙏", "👍", "🤷", "🥺")
-
-  private val random = Random(1)
-
-  /**
-   * Create an [Envelope].
-   */
-  fun envelope(timestamp: Long, serverGuid: UUID = UUID.randomUUID()): Envelope {
-    return Envelope.Builder()
-      .timestamp(timestamp)
-      .serverTimestamp(timestamp + 5)
-      .serverGuid(serverGuid.toString())
-      .build()
-  }
-
-  /**
-   * Create metadata to match an [Envelope].
-   */
-  fun envelopeMetadata(source: RecipientId, destination: RecipientId, sourceDeviceId: Int = 1, groupId: GroupId.V2? = null): EnvelopeMetadata {
-    return EnvelopeMetadata(
-      sourceServiceId = Recipient.resolved(source).requireServiceId(),
-      sourceE164 = null,
-      sourceDeviceId = sourceDeviceId,
-      sealedSender = true,
-      groupId = groupId?.decodedId,
-      destinationServiceId = Recipient.resolved(destination).requireServiceId()
-    )
-  }
-
-  /**
-   * Create a random text message that will contain a body but may also contain
-   * - An expire timer value
-   * - Bold style body ranges
-   */
-  fun fuzzTextMessage(sentTimestamp: Long? = null, groupContextV2: GroupContextV2? = null, allowExpireTimeChanges: Boolean = true): Content {
-    return Content.Builder()
-      .dataMessage(
-        DataMessage.Builder().buildWith {
-          timestamp = sentTimestamp
-          body = string()
-          if (allowExpireTimeChanges && random.nextBoolean()) {
-            expireTimer = random.nextInt(0..28.days.inWholeSeconds.toInt())
-          }
-          if (random.nextBoolean()) {
-            bodyRanges(
-              listOf(
-                BodyRange.Builder().buildWith {
-                  start = 0
-                  length = 1
-                  style = BodyRange.Style.BOLD
-                }
-              )
-            )
-          }
-          if (groupContextV2 != null) {
-            groupV2 = groupContextV2
-          }
-        }
-      )
-      .build()
-  }
-
-  /**
-   * Create an edit message.
-   */
-  fun editTextMessage(targetTimestamp: Long, editedDataMessage: DataMessage): Content {
-    return Content.Builder()
-      .editMessage(
-        EditMessage.Builder().buildWith {
-          targetSentTimestamp = targetTimestamp
-          dataMessage = editedDataMessage
-        }
-      )
-      .build()
-  }
-
-  /**
-   * Create a sync sent text message for the given [DataMessage].
-   */
-  fun syncSentTextMessage(
-    textMessage: DataMessage,
-    deliveredTo: List<RecipientId>,
-    recipientUpdate: Boolean = false
-  ): Content {
-    return Content
-      .Builder()
-      .syncMessage(
-        SyncMessage.Builder().buildWith {
-          sent = SyncMessage.Sent.Builder().buildWith {
-            timestamp = textMessage.timestamp
-            message = textMessage
-            isRecipientUpdate = recipientUpdate
-            unidentifiedStatus(
-              deliveredTo.map {
-                SyncMessage.Sent.UnidentifiedDeliveryStatus.Builder().buildWith {
-                  destinationServiceId = Recipient.resolved(it).requireServiceId().toString()
-                  unidentified = true
-                }
-              }
-            )
-          }
-        }
-      ).build()
-  }
-
-  /**
-   * Create a sync reads message for the given [RecipientId] and message timestamp pairings.
-   */
-  fun syncReadsMessage(timestamps: List<Pair<RecipientId, Long>>): Content {
-    return Content
-      .Builder()
-      .syncMessage(
-        SyncMessage.Builder().buildWith {
-          read = timestamps.map { (senderId, timestamp) ->
-            SyncMessage.Read.Builder().buildWith {
-              this.senderAci = Recipient.resolved(senderId).requireAci().toString()
-              this.timestamp = timestamp
-            }
-          }
-        }
-      ).build()
-  }
-
-  fun syncDeleteForMeMessage(allDeletes: List<DeleteForMeSync>): Content {
-    return Content
-      .Builder()
-      .syncMessage(
-        SyncMessage(
-          deleteForMe = SyncMessage.DeleteForMe(
-            messageDeletes = allDeletes.map { (conversationId, conversationDeletes) ->
-              val conversation = Recipient.resolved(conversationId)
-              SyncMessage.DeleteForMe.MessageDeletes(
-                conversation = if (conversation.isGroup) {
-                  SyncMessage.DeleteForMe.ConversationIdentifier(threadGroupId = conversation.requireGroupId().decodedId.toByteString())
-                } else {
-                  SyncMessage.DeleteForMe.ConversationIdentifier(threadServiceId = conversation.requireAci().toString())
-                },
-
-                messages = conversationDeletes.map { (author, timestamp) ->
-                  SyncMessage.DeleteForMe.AddressableMessage(
-                    authorServiceId = Recipient.resolved(author).requireAci().toString(),
-                    sentTimestamp = timestamp
-                  )
-                }
-              )
-            }
-          )
-        )
-      ).build()
-  }
-
-  fun syncDeleteForMeConversation(allDeletes: List<DeleteForMeSync>): Content {
-    return Content
-      .Builder()
-      .syncMessage(
-        SyncMessage(
-          deleteForMe = SyncMessage.DeleteForMe(
-            conversationDeletes = allDeletes.map { delete ->
-              val conversation = Recipient.resolved(delete.conversationId)
-              SyncMessage.DeleteForMe.ConversationDelete(
-                conversation = if (conversation.isGroup) {
-                  SyncMessage.DeleteForMe.ConversationIdentifier(threadGroupId = conversation.requireGroupId().decodedId.toByteString())
-                } else {
-                  SyncMessage.DeleteForMe.ConversationIdentifier(threadServiceId = conversation.requireAci().toString())
-                },
-
-                mostRecentMessages = delete.messages.map { (author, timestamp) ->
-                  SyncMessage.DeleteForMe.AddressableMessage(
-                    authorServiceId = Recipient.resolved(author).requireAci().toString(),
-                    sentTimestamp = timestamp
-                  )
-                },
-
-                mostRecentNonExpiringMessages = delete.nonExpiringMessages.map { (author, timestamp) ->
-                  SyncMessage.DeleteForMe.AddressableMessage(
-                    authorServiceId = Recipient.resolved(author).requireAci().toString(),
-                    sentTimestamp = timestamp
-                  )
-                },
-
-                isFullDelete = delete.isFullDelete
-              )
-            }
-          )
-        )
-      ).build()
-  }
-
-  fun syncDeleteForMeLocalOnlyConversation(conversations: List<RecipientId>): Content {
-    return Content
-      .Builder()
-      .syncMessage(
-        SyncMessage(
-          deleteForMe = SyncMessage.DeleteForMe(
-            localOnlyConversationDeletes = conversations.map { conversationId ->
-              val conversation = Recipient.resolved(conversationId)
-              SyncMessage.DeleteForMe.LocalOnlyConversationDelete(
-                conversation = if (conversation.isGroup) {
-                  SyncMessage.DeleteForMe.ConversationIdentifier(threadGroupId = conversation.requireGroupId().decodedId.toByteString())
-                } else {
-                  SyncMessage.DeleteForMe.ConversationIdentifier(threadServiceId = conversation.requireAci().toString())
-                }
-              )
-            }
-          )
-        )
-      ).build()
-  }
-
-  fun syncDeleteForMeAttachment(conversationId: RecipientId, message: Pair<RecipientId, Long>, uuid: UUID?, digest: ByteArray?, plainTextHash: String?): Content {
-    val conversation = Recipient.resolved(conversationId)
-
-    return Content
-      .Builder()
-      .syncMessage(
-        SyncMessage(
-          deleteForMe = SyncMessage.DeleteForMe(
-            attachmentDeletes = listOf(
-              SyncMessage.DeleteForMe.AttachmentDelete(
-                conversation = if (conversation.isGroup) {
-                  SyncMessage.DeleteForMe.ConversationIdentifier(threadGroupId = conversation.requireGroupId().decodedId.toByteString())
-                } else {
-                  SyncMessage.DeleteForMe.ConversationIdentifier(threadServiceId = conversation.requireAci().toString())
-                },
-                targetMessage = SyncMessage.DeleteForMe.AddressableMessage(
-                  authorServiceId = Recipient.resolved(message.first).requireAci().toString(),
-                  sentTimestamp = message.second
-                ),
-                uuid = uuid?.let { UuidUtil.toByteString(it) },
-                fallbackDigest = digest?.toByteString(),
-                fallbackPlaintextHash = plainTextHash?.let { Base64.decodeOrNull(it)?.toByteString() }
-              )
-            )
-          )
-        )
-      ).build()
-  }
-
-  /**
-   * Create a random media message that may be:
-   * - A text body
-   * - A text body with a quote that references an existing message
-   * - A text body with a quote that references a non existing message
-   * - A message with 0-2 attachment pointers and may contain a text body
-   */
-  fun fuzzMediaMessageWithBody(quoteAble: List<TestMessage> = emptyList()): Content {
-    return Content.Builder()
-      .dataMessage(
-        DataMessage.Builder().buildWith {
-          if (random.nextBoolean()) {
-            body = string()
-          }
-
-          if (random.nextBoolean() && quoteAble.isNotEmpty()) {
-            body = string()
-            val quoted = quoteAble.random(random)
-            quote = DataMessage.Quote.Builder().buildWith {
-              id = quoted.envelope.timestamp
-              authorAci = quoted.metadata.sourceServiceId.toString()
-              text = quoted.content.dataMessage?.body
-              attachments(quoted.content.dataMessage?.attachments ?: emptyList())
-              bodyRanges(quoted.content.dataMessage?.bodyRanges ?: emptyList())
-              type = DataMessage.Quote.Type.NORMAL
-            }
-          }
-
-          if (random.nextFloat() < 0.1 && quoteAble.isNotEmpty()) {
-            val quoted = quoteAble.random(random)
-            quote = DataMessage.Quote.Builder().buildWith {
-              id = random.nextLong(quoted.envelope.timestamp!! - 1000000, quoted.envelope.timestamp!!)
-              authorAci = quoted.metadata.sourceServiceId.toString()
-              text = quoted.content.dataMessage?.body
-            }
-          }
-
-          if (random.nextFloat() < 0.25) {
-            val total = random.nextInt(1, 2)
-            attachments((0..total).map { attachmentPointer() })
-          }
-        }
-      )
-      .build()
-  }
-
-  /**
-   * Creates a random media message that contains no traditional media content. It may be:
-   * - A reaction to a prior message
-   */
-  fun fuzzMediaMessageNoContent(previousMessages: List<TestMessage> = emptyList()): Content {
-    return Content.Builder()
-      .dataMessage(
-        DataMessage.Builder().buildWith {
-          if (random.nextFloat() < 0.25) {
-            val reactTo = previousMessages.random(random)
-            reaction = DataMessage.Reaction.Builder().buildWith {
-              emoji = emojis.random(random)
-              remove = false
-              targetAuthorAci = reactTo.metadata.sourceServiceId.toString()
-              targetSentTimestamp = reactTo.envelope.timestamp
-            }
-          }
-        }
-      ).build()
-  }
-
-  /**
-   * Create a random media message that contains a sticker.
-   */
-  fun fuzzStickerMediaMessage(sentTimestamp: Long? = null, groupContextV2: GroupContextV2? = null): Content {
-    return Content.Builder()
-      .dataMessage(
-        DataMessage.Builder().buildWith {
-          timestamp = sentTimestamp
-          sticker = DataMessage.Sticker.Builder().buildWith {
-            packId = byteString(length = 24)
-            packKey = byteString(length = 128)
-            stickerId = random.nextInt()
-            data_ = attachmentPointer()
-            emoji = emojis.random(random)
-          }
-          groupV2 = groupContextV2
-        }
-      ).build()
-  }
-
-  /**
-   * Generate a random [String].
-   */
-  fun string(length: Int = 10, allowNullString: Boolean = false): String {
-    var string = ""
-
-    if (allowNullString && random.nextBoolean()) {
-      return string
-    }
-
-    for (i in 0 until length) {
-      string += random.nextInt(65..90).toChar()
-    }
-    return string
-  }
-
-  /**
-   * Generate a random [ByteString].
-   */
-  fun byteString(length: Int = 512): ByteString {
-    return random.nextBytes(length).toByteString()
-  }
-
-  /**
-   * Generate a random [AttachmentPointer].
-   */
-  fun attachmentPointer(): AttachmentPointer {
-    return AttachmentPointer.Builder().run {
-      cdnKey = string()
-      contentType = mediaTypes.random(random)
-      key = byteString()
-      size = random.nextInt(1024 * 1024 * 50)
-      thumbnail = byteString()
-      digest = byteString()
-      fileName = string()
-      flags = 0
-      width = random.nextInt(until = 1024)
-      height = random.nextInt(until = 1024)
-      caption = string(allowNullString = true)
-      blurHash = string()
-      uploadTimestamp = random.nextLong()
-      cdnNumber = 2
-
-      build()
-    }
-  }
-
-  /**
-   * Creates a server delivered timestamp that is always later than the envelope and server "received" timestamp.
-   */
-  fun fuzzServerDeliveredTimestamp(envelopeTimestamp: Long): Long {
-    return envelopeTimestamp + 10
-  }
-
-  data class DeleteForMeSync(
-    val conversationId: RecipientId,
-    val messages: List<Pair<RecipientId, Long>>,
-    val nonExpiringMessages: List<Pair<RecipientId, Long>> = emptyList(),
-    val isFullDelete: Boolean = true,
-    val attachments: List<Pair<Long, AttachmentTable.SyncAttachmentId>> = emptyList()
-  ) {
-    constructor(conversationId: RecipientId, vararg messages: Pair<RecipientId, Long>) : this(conversationId, messages.toList())
-  }
-}