Bump version to 5.0.9

Add extra conditions for the SMS banner.
Allow empty group creation.
2026-04-11 12:40:57 +01:00 · 2021-01-08 17:39:13 -05:00 · 2021-01-08 17:31:54 -05:00 · 2021-01-08 12:55:04 -04:00
6100 changed files with 254336 additions and 712937 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,4 +0,0 @@
-root = true
-
-[*.kt]
-indent_size = 2
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +0,0 @@
-custom: https://signal.org/donate/
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,45 @@
+<!-- This is a bug report template. By following the instructions below and filling out the sections with your information, you will help the developers get all the necessary data to fix your issue.
+You can also preview your report before submitting it. You may remove sections that aren't relevant to your particular case.
+
+Before we begin, please note that this tracker is only for issues. It is not for questions, comments, or feature requests.
+
+If you would like to discuss a new feature or submit suggestions, please visit the community forum:
+https://community.signalusers.org
+
+If you are looking for support, please visit our support center:
+https://support.signal.org/
+or email support@signal.org
+
+Let's begin with a checklist: Replace the empty checkboxes [ ] below with checked ones [x] accordingly. -->
+
+- [ ] I have searched open and closed issues for duplicates
+- [ ] I am submitting a bug report for existing functionality that does not work as intended
+- [ ] I have read https://github.com/signalapp/Signal-Android/wiki/Submitting-useful-bug-reports
+- [ ] This isn't a feature request or a discussion topic
+
+----------------------------------------
+
+### Bug description
+Describe here the issue that you are experiencing.
+
+### Steps to reproduce
+- using hyphens as bullet points
+- list the steps
+- that reproduce the bug
+
+**Actual result:** Describe here what happens after you run the steps above (i.e. the buggy behaviour)
+**Expected result:** Describe here what should happen after you run the steps above (i.e. what would be the correct behaviour)
+
+### Screenshots
+<!-- you can drag and drop images below -->
+
+
+### Device info
+<!-- replace the examples with your info -->
+**Device:** Manufacturer Model XVI
+**Android version:** 0.0.0
+**Signal version:** 0.0.0
+
+### Link to debug log
+<!-- immediately after the bug has happened capture a debug log via Signal's advanced settings and paste the link below -->
+
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,54 +0,0 @@
---
-name: 🛠️ Bug report
-about: Let us know that something isn't working as intended
-title: ''
-labels: ''
-assignees: ''
-
---
-
-<!-- This is a bug report template. By following the instructions below and filling out the sections with your information, you will help the developers get all the necessary data to fix your issue.
-You can also preview your report before submitting it. You may remove sections that aren't relevant to your particular case.
-
-Before we begin, please note that this tracker is only for issues. It is not for questions, comments, or feature requests.
-
-If you would like to discuss a new feature or submit suggestions, please visit the community forum:
-https://community.signalusers.org
-
-If you are looking for support, please visit our support center:
-https://support.signal.org/
-or email support@signal.org
-
-Let's begin with a checklist: Replace the empty checkboxes [ ] below with checked ones [x] accordingly. -->
-
- [ ] I have searched open and closed issues for duplicates
- [ ] I am submitting a bug report for existing functionality that does not work as intended
- [ ] I have read https://github.com/signalapp/Signal-Android/wiki/Submitting-useful-bug-reports
- [ ] This isn't a feature request or a discussion topic
-
----------------------------------------
-
-### Bug description
-Describe here the issue that you are experiencing.
-
-### Steps to reproduce
- using hyphens as bullet points
- list the steps
- that reproduce the bug
-
-**Actual result:** Describe here what happens after you run the steps above (i.e. the buggy behaviour)
-**Expected result:** Describe here what should happen after you run the steps above (i.e. what would be the correct behaviour)
-
-### Screenshots
-<!-- you can drag and drop images below -->
-
-
-### Device info
-<!-- replace the examples with your info -->
-**Device:** Manufacturer Model XVI
-**Android version:** 0.0.0
-**Signal version:** 0.0.0
-
-### Link to debug log
-<!-- immediately after the bug has happened capture a debug log via Signal's settings (Help -> Debug log) and paste the link below -->
-
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,20 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: 📃Support Center
-    url: https://support.signal.org/
-    about: Find answers to many common questions.
-  - name: ✨ Feature request
-    url: https://community.signalusers.org/c/feature-requests/
-    about: Missing something in Signal? Let us know.
-  - name: 💬 Community support
-    url: https://community.signalusers.org/c/support/
-    about: Feel free to ask anything.
-  - name: 📖 Developer documentation
-    url: https://signal.org/docs/
-    about: Official Signal developer documentation.
-  - name: 📚 Translation feedback.
-    url: https://community.signalusers.org/c/translation-feedback/
-    about: Share feedback on translations.
-  - name: ❓ Other issue?
-    url: https://community.signalusers.org/
-    about: Search on the community forums.
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -1,23 +0,0 @@
-# Number of days of inactivity before an Issue or Pull Request becomes stale
-daysUntilStale: 60
-
-# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
-# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
-daysUntilClose: 7
-
-issues:
-  exemptLabels:
-    - acknowledged
-
-# Comment to post when marking as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-
-# Comment to post when closing a stale Issue or Pull Request.
-closeComment: >
-  This issue has been closed due to inactivity.
-
-# Limit the number of actions per hour, from 1-30. Default is 30
-limitPerRun: 1
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -4,39 +4,28 @@ on:
  pull_request:
  push:
    branches:
-    - 'main'
+    - 'master'
    - '4.**'
    - '5.**'

-permissions:
-  contents: read # to fetch code (actions/checkout)
-
 jobs:
  build:

    runs-on: ubuntu-latest

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v1

-    - name: set up JDK 11
-      uses: actions/setup-java@v3
+    - name: set up JDK 1.8
+      uses: actions/setup-java@v1
      with:
-        distribution: temurin
-        java-version: 11
+        java-version: 1.8
+
+    - name: Install NDK
+      run: echo "y" | sudo /usr/local/lib/android/sdk/tools/bin/sdkmanager --install "ndk;21.0.6113669" --sdk_root=${ANDROID_SDK_ROOT}

    - 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
-
-    - name: Archive reports for failed build
-      if: ${{ failure() }}
-      uses: actions/upload-artifact@v3
-      with:
-        name: reports
-        path: '*/build/reports'
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -4,18 +4,15 @@ on:
  schedule:
    - cron: '0 5 * * *'

-permissions:
-  contents: read # to fetch code (actions/checkout)
-
 jobs:
  build:

    runs-on: ubuntu-latest

    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
    - name: Build image
      run: cd reproducible-builds && docker build -t signal-android . && cd ..

    - name: Test build
-      run: docker run --rm -v $(pwd):/project -w /project signal-android ./gradlew clean assemblePlayProdRelease
+      run: docker run --rm -v $(pwd):/project -w /project signal-android ./gradlew clean assembleRelease
--- a/.gitignore
+++ b/.gitignore
@@ -27,4 +27,3 @@ obj/
 jni/libspeex/.deps/
 pkcs11.password
 dev.keystore
-maps.key
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,224 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <option name="RIGHT_MARGIN" value="240" />
-    <option name="FORMATTER_TAGS_ENABLED" value="true" />
-    <option name="SOFT_MARGINS" value="160" />
-    <JavaCodeStyleSettings>
-      <option name="GENERATE_FINAL_LOCALS" value="true" />
-      <option name="DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION" value="true" />
-      <option name="ALIGN_MULTILINE_ANNOTATION_PARAMETERS" value="true" />
-      <option name="ALIGN_MULTILINE_TEXT_BLOCKS" value="true" />
-      <option name="IMPORT_LAYOUT_TABLE">
-        <value>
-          <package name="android" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="androidx" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="com" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="junit" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="net" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="org" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="java" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="javax" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="android" withSubpackages="true" static="true" />
-          <package name="androidx" withSubpackages="true" static="true" />
-          <package name="com" withSubpackages="true" static="true" />
-          <package name="junit" withSubpackages="true" static="true" />
-          <package name="net" withSubpackages="true" static="true" />
-          <package name="org" withSubpackages="true" static="true" />
-          <package name="java" withSubpackages="true" static="true" />
-          <package name="javax" withSubpackages="true" static="true" />
-          <package name="" withSubpackages="true" static="true" />
-          <emptyLine />
-        </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" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="JAVA">
-      <option name="BRACE_STYLE" value="5" />
-      <option name="CLASS_BRACE_STYLE" value="5" />
-      <option name="METHOD_BRACE_STYLE" value="5" />
-      <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
-      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
-      <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
-      <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
-      <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
-      <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
-      <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
-      <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
-      <option name="ALIGN_GROUP_FIELD_DECLARATIONS" value="true" />
-      <option name="ALIGN_CONSECUTIVE_VARIABLE_DECLARATIONS" value="true" />
-      <option name="ALIGN_CONSECUTIVE_ASSIGNMENTS" value="true" />
-      <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
-      <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
-      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
-      <option name="WRAP_FIRST_METHOD_IN_CALL_CHAIN" value="true" />
-      <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
-      <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
-      <option name="KEEP_SIMPLE_BLOCKS_IN_ONE_LINE" value="true" />
-      <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
-      <option name="KEEP_SIMPLE_LAMBDAS_IN_ONE_LINE" value="true" />
-      <option name="KEEP_MULTIPLE_EXPRESSIONS_IN_ONE_LINE" value="true" />
-      <option name="METHOD_ANNOTATION_WRAP" value="0" />
-      <option name="CLASS_ANNOTATION_WRAP" value="0" />
-      <option name="FIELD_ANNOTATION_WRAP" value="0" />
-      <option name="ENUM_CONSTANTS_WRAP" value="5" />
-      <option name="WRAP_ON_TYPING" value="0" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-      <arrangement>
-        <groups>
-          <group>
-            <type>GETTERS_AND_SETTERS</type>
-            <order>KEEP</order>
-          </group>
-          <group>
-            <type>OVERRIDDEN_METHODS</type>
-            <order>KEEP</order>
-          </group>
-          <group>
-            <type>DEPENDENT_METHODS</type>
-            <order>BREADTH_FIRST</order>
-          </group>
-        </groups>
-      </arrangement>
-    </codeStyleSettings>
-    <codeStyleSettings language="XML">
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-  </code_scheme>
-</component>
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>
--- a/.idea/file.template.settings.xml
+++ b/.idea/file.template.settings.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExportableFileTemplateSettings">
-    <default_templates>
-      <template name="ViewModel.kt" file-name="${NAME}ViewModel" reformat="true" live-template-enabled="false" />
-    </default_templates>
-  </component>
-</project>
--- a/.idea/fileTemplates/ViewModel.kt
+++ b/.idea/fileTemplates/ViewModel.kt
@@ -1,20 +0,0 @@
-#if (${PACKAGE_NAME} && ${PACKAGE_NAME} != "")package ${PACKAGE_NAME}
-
-import androidx.lifecycle.ViewModel
-import io.reactivex.rxjava3.core.Flowable
-import io.reactivex.rxjava3.disposables.CompositeDisposable
-import org.thoughtcrime.securesms.util.rx.RxStore
-
-#end
-#parse("File Header.java")
-class ${NAME}ViewModel : ViewModel() {
-
-  private val store = RxStore(${NAME}State())
-  private val disposables = CompositeDisposable()
-  
-  val state: Flowable<${NAME}State> = store.stateFlowable
-
-  override fun onCleared() {
-    disposables.clear()
-  }
-}
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -15,6 +15,11 @@ 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.


+## Translations
+
+Thanks to a dedicated community of volunteer translators, Signal is now available in more than one hundred languages. We use Transifex to manage our translation efforts, not GitHub. Any suggestions, corrections, or new translations should be submitted to the [Signal localization project for Android](https://www.transifex.com/signalapp/signal-android/).
+
+
 ## Issues

 ### Useful bug reports
@@ -70,6 +75,10 @@ There are several other ways to get involved:
  * Redirect support questions to support@signal.org and the [Signal Support Center](https://support.signal.org/).
  * Redirect non-bug discussions to the [community forum](https://community.signalusers.org).
 * Improve documentation in the [wiki](https://github.com/signalapp/Signal-Android/wiki).
+* Join the community of volunteer translators on Transifex:
+  * [Android](https://www.transifex.com/signalapp/signal-android/)
+  * [iOS](https://www.transifex.com/signalapp/signal-ios/)
+  * [Desktop](https://www.transifex.com/signalapp/signal-desktop/)
 * Find and mark duplicate issues.
 * Try to reproduce issues and help with troubleshooting.
 * Discover solutions to open issues and post any relevant findings.
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
 # Signal Android 

-Signal is a simple, powerful, and secure messenger.
+Signal is a messaging app for simple private communication with friends.

-Signal uses your phone's data connection (WiFi/3G/4G/5G) to communicate securely. Millions of people use Signal every day for free and instantaneous communication anywhere in the world. Send and receive high-fidelity messages, participate in HD voice/video calls, and explore a growing set of new features that help you stay connected. Signal’s advanced privacy-preserving technology is always enabled, so you can focus on sharing the moments that matter with the people who matter to you.
+Signal uses your phone's data connection (WiFi/3G/4G) to communicate securely, optionally supports plain SMS/MMS to function as a unified messenger, and can also encrypt the stored messages on your phone.

-Currently available on the Play Store and [signal.org](https://signal.org/android/apk/).
+Currently available on the Play store.

 <a href='https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height='80px'/></a>

@@ -18,17 +18,22 @@ Want to live life on the bleeding edge and help out with testing?

 You can subscribe to Signal Android Beta releases here:
 https://play.google.com/apps/testing/org.thoughtcrime.securesms
-
+ 
 If you're interested in a life of peace and tranquility, stick with the standard releases.

+## Contributing Translations
+Interested in helping to translate Signal? Contribute here:
+
+https://www.transifex.com/projects/p/signal-android/
+
 ## Contributing Code

-If you're new to the Signal codebase, we recommend going through our issues and picking out a simple bug to fix (check the "easy" label in our issues) in order to get yourself familiar. Also please have a look at the [CONTRIBUTING.md](https://github.com/signalapp/Signal-Android/blob/main/CONTRIBUTING.md), that might answer some of your questions.
+If you're new to the Signal codebase, we recommend going through our issues and picking out a simple bug to fix (check the "easy" label in our issues) in order to get yourself familiar. Also please have a look at the [CONTRIBUTING.md](https://github.com/signalapp/Signal-Android/blob/master/CONTRIBUTING.md), that might answer some of your questions.

 For larger changes and feature ideas, we ask that you propose it on the [unofficial Community Forum](https://community.signalusers.org) for a high-level discussion with the wider community before implementation.

 ## Contributing Ideas
-Have something you want to say about Signal projects or want to be part of the conversation? Get involved in the [community forum](https://community.signalusers.org).
+Have something you want to say about Open Whisper Systems projects or want to be part of the conversation? Get involved in the [community forum](https://community.signalusers.org).

 Help
 ====
@@ -54,8 +59,8 @@ The form and manner of this distribution makes it eligible for export under the

 ## License

-Copyright 2013-2022 Signal
+Copyright 2013-2020 Signal

 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.
+Google Play and the Google Play logo are trademarks of Google Inc.
--- a/apntool/apntool.py
+++ b/apntool/apntool.py
@@ -96,7 +96,7 @@ try:
        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:
+except sqlite3.Error, e:
    if connection:
        connection.rollback()
    print("Error: %s" % e.args[0])
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,40 +1,54 @@
-import com.android.build.api.dsl.ManagedVirtualDevice
+import org.signal.signing.ApkSignerUtil
+
+import java.security.MessageDigest

 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 plugin: 'witness'
 apply from: 'translations.gradle'
-apply plugin: 'org.jetbrains.kotlin.android'
-apply plugin: 'app.cash.exhaustive'
-apply plugin: 'kotlin-parcelize'
-apply from: 'static-ips.gradle'
+apply from: 'witness-verifications.gradle'

 repositories {
    maven {
-        url "https://raw.githubusercontent.com/signalapp/maven/master/sqlcipher/release/"
+        url "https://raw.github.com/signalapp/maven/master/photoview/releases/"
+        content {
+            includeGroupByRegex "com\\.github\\.chrisbanes.*"
+        }
+    }
+    maven {
+        url "https://raw.github.com/signalapp/maven/master/shortcutbadger/releases/"
+        content {
+            includeGroupByRegex "me\\.leolin.*"
+        }
+    }
+    maven {
+        url "https://raw.github.com/signalapp/maven/master/circular-progress-button/releases/"
+        content {
+            includeGroupByRegex "com\\.github\\.dmytrodanylyk\\.circular-progress-button\\.*"
+        }
+    }
+    maven {
+        url "https://raw.github.com/signalapp/maven/master/sqlcipher/release/"
        content {
            includeGroupByRegex "org\\.signal.*"
        }
    }
-
-    google()
-    mavenCentral()
-    mavenLocal()
-    maven {
-        url "https://dl.cloudsmith.io/qxAgwaeEE1vN8aLU/mobilecoin/mobilecoin/maven/"
-    }
-    jcenter {
+    maven { // textdrawable
+        url 'https://dl.bintray.com/amulyakhare/maven'
        content {
-            includeVersion "mobi.upod", "time-duration-picker", "1.1.3"
+            includeGroupByRegex "com\\.amulyakhare.*"
        }
    }
+    google()
+    mavenCentral()
+    jcenter()
+    mavenLocal()
 }

 protobuf {
    protoc {
-        artifact = 'com.google.protobuf:protoc:3.18.0'
+        artifact = 'com.google.protobuf:protoc:3.10.0'
    }
    generateProtoTasks {
        all().each { task ->
@@ -47,15 +61,10 @@ protobuf {
    }
 }

-ktlint {
-    // Use a newer version to resolve https://github.com/JLLeitschuh/ktlint-gradle/issues/507
-    version = "0.43.2"
-}
+def canonicalVersionCode = 759
+def canonicalVersionName = "5.0.9"

-def canonicalVersionCode = 1205
-def canonicalVersionName = "6.10.6"
-
-def postFixSize = 100
+def postFixSize = 10
 def abiPostFix = ['universal'   : 5,
                  'armeabi-v7a' : 6,
                  'arm64-v8a'   : 7,
@@ -64,35 +73,15 @@ def abiPostFix = ['universal'   : 5,

 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"]
+    dexOptions {
+        javaMaxHeapSize "4g"
    }

    signingConfigs {
@@ -106,69 +95,6 @@ android {
        }
    }

-    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
@@ -179,57 +105,30 @@ android {
        multiDexEnabled true

        vectorDrawables.useSupportLibrary = true
-        project.ext.set("archivesBaseName", "Signal")
-
-        manifestPlaceholders = [mapsKey:"AIzaSyCSx9xea86GwDKGznCAULE9Y5a8b-TfN9U"]
+        project.ext.set("archivesBaseName", "Signal");

        buildConfigField "long", "BUILD_TIMESTAMP", getLastCommitTimestamp() + "L"
-        buildConfigField "String", "GIT_HASH", "\"${getGitHash()}\""
-        buildConfigField "String", "SIGNAL_URL", "\"https://chat.signal.org\""
+        buildConfigField "String", "SIGNAL_URL", "\"https://textsecure-service.whispersystems.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", "CDS_MRENCLAVE", "\"c98e00a4e3ff977a56afefe7362a27e4961e4f19e211febfbb19b897e6b80b15\""
+        buildConfigField "KbsEnclave", "KBS_ENCLAVE", "new KbsEnclave(\"fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe\"," +
+                                                                     "\"fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe\", " +
+                                                                     "\"a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87\")";
+        buildConfigField "KbsEnclave[]", "KBS_FALLBACKS", "new KbsEnclave[0]"
        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", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X0=\""
        buildConfigField "String[]", "LANGUAGES", "new String[]{\"" + autoResConfig().collect { s -> s.replace('-r', '_') }.join('", "') + '"}'
        buildConfigField "int", "CANONICAL_VERSION_CODE", "$canonicalVersionCode"
-        buildConfigField "String", "DEFAULT_CURRENCIES", "\"EUR,AUD,GBP,CAD,CNY\""
-        buildConfigField "String", "GIPHY_API_KEY", "\"3o6ZsYH6U6Eri53TXy\""
-        buildConfigField "String", "SIGNAL_CAPTCHA_URL", "\"https://signalcaptchas.org/registration/generate.html\""
-        buildConfigField "String", "RECAPTCHA_PROOF_URL", "\"https://signalcaptchas.org/challenge/generate.html\""
-
-        buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"unset\""
-        buildConfigField "String", "BUILD_ENVIRONMENT_TYPE", "\"unset\""
-        buildConfigField "String", "BUILD_VARIANT_TYPE", "\"unset\""
-        buildConfigField "String", "BADGE_STATIC_ROOT", "\"https://updates2.signal.org/static/badges/\""
-        buildConfigField "String", "STRIPE_PUBLISHABLE_KEY", "\"pk_live_6cmGZopuTsV8novGgJJW9JpC00vLIgtQ1D\""
+        buildConfigField "int", "TRACE_EVENT_MAX", "3500"

        ndk {
            abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
@@ -246,8 +145,26 @@ android {
            }
        }

-        testInstrumentationRunner "org.thoughtcrime.securesms.testing.SignalTestRunner"
-        testInstrumentationRunnerArguments clearPackageData: 'true'
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    compileOptions {
+        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'
+    }
+
+    aaptOptions {
+        ignoreAssetsPattern '!contours.tfl:!LMprec_600.emd:!blazeface.tfl'
    }

    buildTypes {
@@ -256,7 +173,7 @@ android {
                signingConfig signingConfigs.debug
            }
            isDefault true
-            minifyEnabled false
+            minifyEnabled true
            proguardFiles getDefaultProguardFile('proguard-android.txt'),
                    'proguard/proguard-firebase-messaging.pro',
                    'proguard/proguard-google-play-services.pro',
@@ -265,54 +182,29 @@ android {
                    'proguard/proguard-appcompat-v7.pro',
                    'proguard/proguard-square-okhttp.pro',
                    'proguard/proguard-square-okio.pro',
+                    'proguard/proguard-spongycastle.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 {
+        flipper {
            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\""
        }
    }

@@ -323,7 +215,6 @@ android {
            ext.websiteUpdateUrl = "null"
            buildConfigField "boolean", "PLAY_STORE_DISABLED", "false"
            buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
-            buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"play\""
        }

        website {
@@ -331,25 +222,20 @@ android {
            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 {
+        internal {
            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\""
+            buildConfigField "int", "TRACE_EVENT_MAX", "30_000"
        }

        prod {
            dimension 'environment'

            isDefault true
-
-            buildConfigField "String", "MOBILE_COIN_ENVIRONMENT", "\"mainnet\""
-            buildConfigField "String", "BUILD_ENVIRONMENT_TYPE", "\"Prod\""
        }

        staging {
@@ -357,240 +243,242 @@ android {

            applicationIdSuffix ".staging"

-            buildConfigField "String", "SIGNAL_URL", "\"https://chat.staging.signal.org\""
+            buildConfigField "String", "SIGNAL_URL", "\"https://textsecure-service-staging.whispersystems.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", "CDS_MRENCLAVE", "\"c98e00a4e3ff977a56afefe7362a27e4961e4f19e211febfbb19b897e6b80b15\""
+            buildConfigField "KbsEnclave", "KBS_ENCLAVE", "new KbsEnclave(\"823a3b2c037ff0cbe305cc48928cfcc97c9ed4a8ca6d49af6f7d6981fb60a4e9\", " +
+                                                                         "\"038c40bbbacdc873caa81ac793bb75afde6dfe436a99ab1f15e3f0cbb7434ced\", " +
+                                                                         "\"a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87\")"
+            buildConfigField "KbsEnclave[]", "KBS_FALLBACKS", "new KbsEnclave[0]"
            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\""
+            buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdls=\""
        }
    }

    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)
+            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")
+            if (postFix >= postFixSize) throw new AssertionError("postFix is too large")

-                output.versionCodeOverride = canonicalVersionCode * postFixSize + postFix
-            }
+            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()
+    lintOptions {
+        abortOnError true
+        baseline file("lint-baseline.xml")
+        disable "LintError"
+    }

-        if (!selectableVariants.contains(fullName)) {
-            variant.setIgnore(true)
+    testOptions {
+        unitTests {
+            includeAndroidResources = 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 ('androidx.appcompat:appcompat:1.2.0') {
+        force = true
    }
-    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 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.preference:preference:1.0.0'
+    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
+    implementation 'androidx.gridlayout:gridlayout:1.0.0'
+    implementation 'androidx.exifinterface:exifinterface:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.multidex:multidex:2.0.1'
+    implementation 'androidx.navigation:navigation-fragment:2.1.0'
+    implementation 'androidx.navigation:navigation-ui:2.1.0'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:1.0.0-alpha05'
+    implementation 'androidx.lifecycle:lifecycle-common-java8:2.1.0'
+    implementation "androidx.camera:camera-core:1.0.0-beta11"
+    implementation "androidx.camera:camera-camera2:1.0.0-beta11"
+    implementation "androidx.camera:camera-lifecycle:1.0.0-beta11"
+    implementation "androidx.camera:camera-view:1.0.0-alpha18"
+    implementation "androidx.concurrent:concurrent-futures:1.0.0"
+    implementation "androidx.autofill:autofill:1.0.0"
+    implementation "androidx.paging:paging-common:2.1.2"
+    implementation "androidx.paging:paging-runtime:2.1.2"
+    implementation 'com.google.firebase:firebase-ml-vision:24.0.3'
+    implementation 'com.google.firebase:firebase-ml-vision-face-model:20.0.1'

-    implementation (libs.firebase.messaging) {
+    implementation ('com.google.firebase:firebase-messaging:20.2.0') {
        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 'com.google.android.gms:play-services-maps:16.1.0'
+    implementation 'com.google.android.gms:play-services-auth:16.0.1'

-    implementation libs.bundles.exoplayer
+    implementation 'com.google.android.exoplayer:exoplayer-core:2.9.1'
+    implementation 'com.google.android.exoplayer:exoplayer-ui:2.9.1'
+    implementation 'com.google.android.exoplayer:extension-mediasession:2.9.1'

-    implementation libs.conscrypt.android
-    implementation libs.signal.aesgcmprovider
+    implementation 'org.conscrypt:conscrypt-android:2.0.0'
+    implementation 'org.signal:aesgcmprovider:0.0.3'

    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 'org.signal:zkgroup-android:0.7.0'
+    implementation 'org.whispersystems:signal-client-android:0.1.5'
+    implementation 'com.google.protobuf:protobuf-javalite:3.10.0'
+    implementation 'org.signal:argon2:13.1@aar'

-    implementation libs.libsignal.android
-    implementation libs.google.protobuf.javalite
+    implementation 'org.signal:ringrtc-android:2.8.7'

-    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) {
+    implementation "me.leolin:ShortcutBadger:1.1.16"
+    implementation 'se.emilsjolander:stickylistheaders:2.7.0'
+    implementation 'com.jpardogo.materialtabstrip:library:1.0.9'
+    implementation 'org.apache.httpcomponents:httpclient-android:4.3.5'
+    implementation 'com.github.chrisbanes:PhotoView:2.1.3'
+    implementation 'com.github.bumptech.glide:glide:4.11.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
+    annotationProcessor 'androidx.annotation:annotation:1.1.0'
+    implementation 'com.makeramen:roundedimageview:2.1.0'
+    implementation 'com.pnikosis:materialish-progress:1.5'
+    implementation 'org.greenrobot:eventbus:3.0.0'
+    implementation 'pl.tajchert:waitingdots:0.1.0'
+    implementation 'com.melnykov:floatingactionbutton:1.3.0'
+    implementation 'com.google.zxing:android-integration:3.1.0'
+    implementation 'mobi.upod:time-duration-picker:1.1.3'
+    implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
+    implementation 'com.google.zxing:core:3.2.1'
+    implementation ('com.davemorrissey.labs:subsampling-scale-image-view:3.6.0') {
        exclude group: 'com.android.support', module: 'support-annotations'
    }
-    implementation (libs.android.tooltips) {
+    implementation ('cn.carbswang.android:NumberPickerView:1.0.9') {
        exclude group: 'com.android.support', module: 'appcompat-v7'
    }
-    implementation (libs.android.smsmms) {
+    implementation ('com.tomergoldst.android:tooltips:1.0.6') {
+        exclude group: 'com.android.support', module: 'appcompat-v7'
+    }
+    implementation ('com.klinkerapps:android-smsmms:4.0.1') {
        exclude group: 'com.squareup.okhttp', module: 'okhttp'
        exclude group: 'com.squareup.okhttp', module: 'okhttp-urlconnection'
    }
-    implementation libs.stream
+    implementation 'com.annimon:stream:1.1.8'
+    implementation ('com.takisoft.fix:colorpicker:0.9.1') {
+        exclude group: 'com.android.support', module: 'appcompat-v7'
+        exclude group: 'com.android.support', module: 'recyclerview-v7'
+    }

-    implementation libs.lottie
+    implementation 'com.airbnb.android:lottie:3.0.7'

-    implementation libs.signal.android.database.sqlcipher
-    implementation libs.androidx.sqlite
-
-    implementation (libs.google.ez.vcard) {
+    implementation 'com.codewaves.stickyheadergrid:stickyheadergrid:0.9.4'
+    implementation 'com.github.dmytrodanylyk.circular-progress-button:library:1.1.3-S2'
+    implementation 'org.signal:android-database-sqlcipher:3.5.9-S3'
+    implementation ('com.googlecode.ez-vcard:ez-vcard:0.9.11') {
        exclude group: 'com.fasterxml.jackson.core'
        exclude group: 'org.freemarker'
    }
-    implementation libs.dnsjava
+    implementation 'dnsjava:dnsjava:2.1.9'

-    spinnerImplementation project(":spinner")
-    spinnerImplementation libs.square.leakcanary
+    flipperImplementation 'com.facebook.flipper:flipper:0.32.2'
+    flipperImplementation 'com.facebook.soloader:soloader:0.8.2'

-    testImplementation testLibs.junit.junit
-    testImplementation testLibs.assertj.core
-    testImplementation testLibs.mockito.core
-    testImplementation testLibs.mockito.kotlin
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.assertj:assertj-core:3.11.1'
+    testImplementation 'org.mockito:mockito-core:2.8.9'
+    testImplementation 'org.powermock:powermock-api-mockito2:1.7.4'
+    testImplementation 'org.powermock:powermock-module-junit4:1.7.4'
+    testImplementation 'org.powermock:powermock-module-junit4-rule:1.7.4'
+    testImplementation 'org.powermock:powermock-classloading-xstream:1.7.4'

-    testImplementation testLibs.androidx.test.core
-    testImplementation (testLibs.robolectric.robolectric) {
+    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation ('org.robolectric:robolectric:4.4') {
        exclude group: 'com.google.protobuf', module: 'protobuf-java'
    }
-    testImplementation testLibs.robolectric.shadows.multidex
-    testImplementation (testLibs.bouncycastle.bcprov.jdk15on) {
-        force = true
+    testImplementation 'org.robolectric:shadows-multidex:4.4'
+    testImplementation 'org.hamcrest:hamcrest:2.2'
+
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+}
+
+dependencyVerification {
+    configuration = '(play|website)(Prod|Staging)(Debug|Release)RuntimeClasspath'
+}
+
+def assembleWebsiteDescriptor = { variant, file ->
+    if (file.exists()) {
+        MessageDigest md = MessageDigest.getInstance("SHA-256");
+        file.eachByte 4096, {bytes, size ->
+            md.update(bytes, 0, size);
+        }
+
+        String digest  = md.digest().collect {String.format "%02x", it}.join();
+        String url     = variant.productFlavors.get(0).ext.websiteUpdateUrl
+        String apkName = file.getName()
+
+        String descriptor = "{" +
+                "\"versionCode\" : ${canonicalVersionCode * postFixSize + abiPostFix['universal']}," +
+                "\"versionName\" : \"$canonicalVersionName\"," +
+                "\"sha256sum\" : \"$digest\"," +
+                "\"url\" : \"$url/$apkName\"" +
+                "}"
+
+        File descriptorFile = new File(file.getParent(), apkName.replace(".apk", ".json"))
+
+        descriptorFile.write(descriptor)
    }
-    testImplementation testLibs.hamcrest.hamcrest
-    testImplementation testLibs.mockk
+}

-    testImplementation(testFixtures(project(":libsignal-service")))
+def signProductionRelease = { variant ->
+    variant.outputs.collect { output ->
+        String apkName    = output.outputFile.name
+        File   inputFile  = new File(output.outputFile.path)
+        File   outputFile = new File(output.outputFile.parent, apkName.replace('-unsigned', ''))

-    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
+        new ApkSignerUtil('sun.security.pkcs11.SunPKCS11',
+                          'pkcs11.config',
+                          'PKCS11',
+                          'file:pkcs11.password').calculateSignature(inputFile.getAbsolutePath(),
+                                                                     outputFile.getAbsolutePath())

-    instrumentationImplementation (libs.androidx.fragment.testing) {
-        exclude group: 'androidx.test', module: 'core'
+        inputFile.delete()
+        outputFile
    }
+}

-    testImplementation testLibs.espresso.core
+task signProductionPlayRelease {
+    doLast {
+        signProductionRelease(android.applicationVariants.find { (it.name == 'playProdRelease') })
+    }
+}

-    implementation libs.kotlin.stdlib.jdk8
-    implementation libs.kotlin.reflect
-    implementation libs.jackson.module.kotlin
+task signProductionInternalRelease {
+    doLast {
+        signProductionRelease(android.applicationVariants.find { (it.name == 'internalProdRelease') })
+    }
+}

-    implementation libs.rxjava3.rxandroid
-    implementation libs.rxjava3.rxkotlin
-    implementation libs.rxdogtag
-
-    androidTestUtil testLibs.androidx.test.orchestrator
+task signProductionWebsiteRelease {
+    doLast {
+        def  variant       = android.applicationVariants.find { (it.name == 'websiteProdRelease') }
+        File signedRelease = signProductionRelease(variant).find { it.name.contains('universal') }
+        assembleWebsiteDescriptor(variant, signedRelease)
+    }
 }

 def getLastCommitTimestamp() {
-    if (!(new File('.git').exists())) {
-        return System.currentTimeMillis().toString()
-    }
-
    new ByteArrayOutputStream().withStream { os ->
-        exec {
+        def result = exec {
            executable = 'git'
            args = ['log', '-1', '--pretty=format:%ct']
            standardOutput = os
@@ -600,40 +488,6 @@ def getLastCommitTimestamp() {
    }
 }

-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"
@@ -649,22 +503,8 @@ def loadKeystoreProperties(filename) {
    if (keystorePropertiesFile.exists()) {
        def keystoreProperties = new Properties()
        keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-        return keystoreProperties
+        return keystoreProperties;
    } else {
-        return null
+        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"
-}
--- a/app/lint.xml
+++ b/app/lint.xml
@@ -25,15 +25,12 @@
    <issue id="VectorRaster" severity="error" />
    <issue id="ButtonOrder" severity="error" />
    <issue id="ExtraTranslation" severity="warning" />
-    <issue id="UnspecifiedImmutableFlag" severity="error" />

    <!-- Custom lints -->
    <issue id="LogNotSignal" severity="error" />
    <issue id="LogNotAppSignal" severity="error" />
    <issue id="LogTagInlined" severity="error" />

-    <issue id="AlertDialogBuilderUsage" severity="warning" />
-
    <issue id="RestrictedApi" severity="error">
        <ignore path="*/org/thoughtcrime/securesms/mediasend/camerax/VideoCapture.java" />
        <ignore path="*/org/thoughtcrime/securesms/mediasend/camerax/CameraXModule.java" />
@@ -42,5 +39,4 @@
        <ignore path="*/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java" />
    </issue>

-    <issue id="OptionalUsedAsFieldOrParameterType" severity="ignore" />
 </lint>
--- a/app/proguard/proguard-mobilecoin.pro
+++ b/app/proguard/proguard-mobilecoin.pro
@@ -1,2 +0,0 @@
-# MobileCoin
-keep class com.mobilecoin.** { *; }
--- a/app/proguard/proguard-sqlite.pro
+++ b/app/proguard/proguard-sqlite.pro
@@ -2,7 +2,4 @@
 -keep class org.sqlite.database.** { *; }

 -keep class net.sqlcipher.** { *; }
-dontwarn net.sqlcipher.**
-
-keep class net.zetetic.** { *; }
-dontwarn net.zetetic.**
+-dontwarn net.sqlcipher.**
--- a/app/proguard/proguard.cfg
+++ b/app/proguard/proguard.cfg
@@ -2,7 +2,6 @@
 -dontobfuscate
 -keepattributes SourceFile,LineNumberTable
 -keep class org.whispersystems.** { *; }
-keep class org.signal.libsignal.protocol.** { *; }
 -keep class org.thoughtcrime.securesms.** { *; }
 -keepclassmembers class ** {
    public void onEvent*(**);
@@ -10,5 +9,3 @@

 # Protobuf lite
 -keep class * extends com.google.protobuf.GeneratedMessageLite { *; }
-
-keep class androidx.window.** { *; }
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/SignalInstrumentationApplicationContext.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/SignalInstrumentationApplicationContext.kt
@@ -1,15 +0,0 @@
-package org.thoughtcrime.securesms
-
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencyProvider
-import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
-
-/**
- * Application context for running instrumentation tests (aka androidTests).
- */
-class SignalInstrumentationApplicationContext : ApplicationContext() {
-  override fun initializeAppDependencies() {
-    val default = ApplicationDependencyProvider(this)
-    ApplicationDependencies.init(this, InstrumentationApplicationDependencyProvider(this, default))
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModelTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModelTest.kt
@@ -1,380 +0,0 @@
-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()
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/ConversationItemPreviewer.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/ConversationItemPreviewer.kt
@@ -1,154 +0,0 @@
-package org.thoughtcrime.securesms.conversation
-
-import androidx.test.core.app.ActivityScenario
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Ignore
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.core.util.ThreadUtil
-import org.thoughtcrime.securesms.attachments.PointerAttachment
-import org.thoughtcrime.securesms.database.SignalDatabase
-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
-import java.util.Optional
-
-/**
- * Helper test for rendering conversation items for preview.
- */
-@RunWith(AndroidJUnit4::class)
-@Ignore("For testing/previewing manually, no assertions")
-class ConversationItemPreviewer {
-
-  @get:Rule
-  val harness = SignalActivityRule(othersCount = 10)
-
-  @Test
-  fun testShowLongName() {
-    val other: Recipient = Recipient.resolved(harness.others.first())
-
-    SignalDatabase.recipients.setProfileName(other.id, ProfileName.fromParts("Seef", "$$$"))
-
-    insertFailedMediaMessage(other = other, attachmentCount = 1)
-    insertFailedMediaMessage(other = other, attachmentCount = 2)
-    insertFailedMediaMessage(other = other, body = "Test", attachmentCount = 1)
-//    insertFailedOutgoingMediaMessage(other = other, body = "Test", attachmentCount = 1)
-//    insertMediaMessage(other = other)
-//    insertMediaMessage(other = other)
-//    insertMediaMessage(other = other)
-//    insertMediaMessage(other = other)
-//    insertMediaMessage(other = other)
-//    insertMediaMessage(other = other)
-//    insertMediaMessage(other = other)
-//    insertMediaMessage(other = other)
-//    insertMediaMessage(other = other)
-//    insertMediaMessage(other = other)
-
-    val scenario: ActivityScenario<ConversationActivity> = harness.launchActivity { putExtra("recipient_id", other.id.serialize()) }
-    scenario.onActivity {
-    }
-
-    // Uncomment to make dialog stay on screen, otherwise will show/dismiss immediately
-//    ThreadUtil.sleep(45000)
-  }
-
-  private fun insertMediaMessage(other: Recipient, body: String? = null, attachmentCount: Int = 1) {
-    val attachments: List<SignalServiceAttachmentPointer> = (0 until attachmentCount).map {
-      attachment()
-    }
-
-    val message = IncomingMediaMessage(
-      from = other.id,
-      body = body,
-      sentTimeMillis = System.currentTimeMillis(),
-      serverTimeMillis = System.currentTimeMillis(),
-      receivedTimeMillis = System.currentTimeMillis(),
-      attachments = PointerAttachment.forPointers(Optional.of(attachments)),
-    )
-
-    SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get()
-
-    ThreadUtil.sleep(1)
-  }
-
-  private fun insertFailedMediaMessage(other: Recipient, body: String? = null, attachmentCount: Int = 1) {
-    val attachments: List<SignalServiceAttachmentPointer> = (0 until attachmentCount).map {
-      attachment()
-    }
-
-    val message = IncomingMediaMessage(
-      from = other.id,
-      body = body,
-      sentTimeMillis = System.currentTimeMillis(),
-      serverTimeMillis = System.currentTimeMillis(),
-      receivedTimeMillis = System.currentTimeMillis(),
-      attachments = PointerAttachment.forPointers(Optional.of(attachments)),
-    )
-
-    val insert = SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, SignalDatabase.threads.getOrCreateThreadIdFor(other)).get()
-
-    SignalDatabase.attachments.getAttachmentsForMessage(insert.messageId).forEachIndexed { index, attachment ->
-//      if (index != 1) {
-      SignalDatabase.attachments.setTransferProgressPermanentFailure(attachment.attachmentId, insert.messageId)
-//      } else {
-//        SignalDatabase.attachments.setTransferState(insert.messageId, attachment, TRANSFER_PROGRESS_STARTED)
-//      }
-    }
-
-    ThreadUtil.sleep(1)
-  }
-
-  private fun insertFailedOutgoingMediaMessage(other: Recipient, body: String? = null, attachmentCount: Int = 1) {
-    val attachments: List<SignalServiceAttachmentPointer> = (0 until attachmentCount).map {
-      attachment()
-    }
-
-    val message = OutgoingMessage(
-      recipient = other,
-      body = body,
-      attachments = PointerAttachment.forPointers(Optional.of(attachments)),
-      timestamp = System.currentTimeMillis(),
-      isSecure = true
-    )
-
-    val insert = SignalDatabase.messages.insertMessageOutbox(
-      message,
-      SignalDatabase.threads.getOrCreateThreadIdFor(other),
-      false,
-      null
-    )
-
-    SignalDatabase.attachments.getAttachmentsForMessage(insert).forEachIndexed { index, attachment ->
-      SignalDatabase.attachments.setTransferProgressPermanentFailure(attachment.attachmentId, insert)
-    }
-
-    ThreadUtil.sleep(1)
-  }
-
-  private fun attachment(): SignalServiceAttachmentPointer {
-    return SignalServiceAttachmentPointer(
-      ReleaseChannel.CDN_NUMBER,
-      SignalServiceAttachmentRemoteId.from(""),
-      "image/webp",
-      null,
-      Optional.empty(),
-      Optional.empty(),
-      1024,
-      1024,
-      Optional.empty(),
-      Optional.of("/not-there.jpg"),
-      false,
-      false,
-      false,
-      Optional.empty(),
-      Optional.empty(),
-      System.currentTimeMillis()
-    )
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/SafetyNumberChangeDialogPreviewer.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/conversation/SafetyNumberChangeDialogPreviewer.kt
@@ -1,75 +0,0 @@
-package org.thoughtcrime.securesms.conversation
-
-import androidx.test.core.app.ActivityScenario
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Ignore
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey
-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.ApplicationDependencies
-import org.thoughtcrime.securesms.profiles.ProfileName
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.safety.SafetyNumberBottomSheet
-import org.thoughtcrime.securesms.testing.SignalActivityRule
-
-/**
- * Android test to help show SNC dialog quickly with custom data to make sure it displays properly.
- */
-@Ignore("For testing/previewing manually, no assertions")
-@RunWith(AndroidJUnit4::class)
-class SafetyNumberChangeDialogPreviewer {
-
-  @get:Rule val harness = SignalActivityRule(othersCount = 10)
-
-  @Test
-  fun testShowLongName() {
-    val other: Recipient = Recipient.resolved(harness.others.first())
-
-    SignalDatabase.recipients.setProfileName(other.id, ProfileName.fromParts("Super really long name like omg", "But seriously it's long like really really long"))
-
-    harness.setVerified(other, IdentityTable.VerifiedStatus.VERIFIED)
-    harness.changeIdentityKey(other)
-
-    val scenario: ActivityScenario<ConversationActivity> = harness.launchActivity { putExtra("recipient_id", other.id.serialize()) }
-    scenario.onActivity {
-      SafetyNumberBottomSheet.forRecipientId(other.id).show(it.supportFragmentManager)
-    }
-
-    // Uncomment to make dialog stay on screen, otherwise will show/dismiss immediately
-    // ThreadUtil.sleep(15000)
-  }
-
-  @Test
-  fun testShowLargeSheet() {
-    SignalDatabase.distributionLists.setPrivacyMode(DistributionListId.MY_STORY, DistributionListPrivacyMode.ONLY_WITH)
-
-    val othersRecipients = harness.others.map { Recipient.resolved(it) }
-    othersRecipients.forEach { other ->
-      SignalDatabase.recipients.setProfileName(other.id, ProfileName.fromParts("My", "Name"))
-
-      harness.setVerified(other, IdentityTable.VerifiedStatus.DEFAULT)
-      harness.changeIdentityKey(other)
-
-      SignalDatabase.distributionLists.addMemberToList(DistributionListId.MY_STORY, DistributionListPrivacyMode.ONLY_WITH, other.id)
-    }
-
-    val myStoryRecipientId = SignalDatabase.distributionLists.getRecipientId(DistributionListId.MY_STORY)!!
-    val scenario: ActivityScenario<ConversationActivity> = harness.launchActivity { putExtra("recipient_id", harness.others.first().serialize()) }
-    scenario.onActivity { conversationActivity ->
-      SafetyNumberBottomSheet
-        .forIdentityRecordsAndDestinations(
-          identityRecords = ApplicationDependencies.getProtocolStore().aci().identities().getIdentityRecords(othersRecipients).identityRecords,
-          destinations = listOf(ContactSearchKey.RecipientSearchKey(myStoryRecipientId, true))
-        )
-        .show(conversationActivity.supportFragmentManager)
-    }
-
-    // Uncomment to make dialog stay on screen, otherwise will show/dismiss immediately
-    // ThreadUtil.sleep( 30000)
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/AttachmentTableTest.kt
@@ -1,106 +0,0 @@
-package org.thoughtcrime.securesms.database
-
-import android.net.Uri
-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.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.util.MediaUtil
-import java.util.Optional
-
-@RunWith(AndroidJUnit4::class)
-class AttachmentTableTest {
-
-  @Before
-  fun setUp() {
-    SignalDatabase.attachments.deleteAllAttachments()
-  }
-
-  @Test
-  fun givenABlob_whenIInsert2AttachmentsForPreUpload_thenIExpectDistinctIdsButSameFileName() {
-    val blob = BlobProvider.getInstance().forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory()
-    val highQualityProperties = createHighQualityTransformProperties()
-    val highQualityImage = createAttachment(1, blob, highQualityProperties)
-    val attachment = SignalDatabase.attachments.insertAttachmentForPreUpload(highQualityImage)
-    val attachment2 = SignalDatabase.attachments.insertAttachmentForPreUpload(highQualityImage)
-
-    assertNotEquals(attachment2.attachmentId, attachment.attachmentId)
-    assertEquals(attachment2.fileName, attachment.fileName)
-  }
-
-  @Test
-  fun givenABlobAndDifferentTransformQuality_whenIInsert2AttachmentsForPreUpload_thenIExpectDifferentFileInfos() {
-    val blob = BlobProvider.getInstance().forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory()
-    val highQualityProperties = createHighQualityTransformProperties()
-    val highQualityImage = createAttachment(1, blob, highQualityProperties)
-    val lowQualityImage = createAttachment(1, blob, AttachmentTable.TransformProperties.empty())
-    val attachment = SignalDatabase.attachments.insertAttachmentForPreUpload(highQualityImage)
-    val attachment2 = SignalDatabase.attachments.insertAttachmentForPreUpload(lowQualityImage)
-
-    SignalDatabase.attachments.updateAttachmentData(
-      attachment,
-      createMediaStream(byteArrayOf(1, 2, 3, 4, 5)),
-      false
-    )
-
-    SignalDatabase.attachments.updateAttachmentData(
-      attachment2,
-      createMediaStream(byteArrayOf(1, 2, 3)),
-      false
-    )
-
-    val attachment1Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment.attachmentId, AttachmentTable.DATA)
-    val attachment2Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment2.attachmentId, AttachmentTable.DATA)
-
-    assertNotEquals(attachment1Info, attachment2Info)
-  }
-
-  @Test
-  fun givenIdenticalAttachmentsInsertedForPreUpload_whenIUpdateAttachmentDataAndSpecifyOnlyModifyThisAttachment_thenIExpectDifferentFileInfos() {
-    val blob = BlobProvider.getInstance().forData(byteArrayOf(1, 2, 3, 4, 5)).createForSingleSessionInMemory()
-    val highQualityProperties = createHighQualityTransformProperties()
-    val highQualityImage = createAttachment(1, blob, highQualityProperties)
-    val attachment = SignalDatabase.attachments.insertAttachmentForPreUpload(highQualityImage)
-    val attachment2 = SignalDatabase.attachments.insertAttachmentForPreUpload(highQualityImage)
-
-    SignalDatabase.attachments.updateAttachmentData(
-      attachment,
-      createMediaStream(byteArrayOf(1, 2, 3, 4, 5)),
-      true
-    )
-
-    SignalDatabase.attachments.updateAttachmentData(
-      attachment2,
-      createMediaStream(byteArrayOf(1, 2, 3, 4)),
-      true
-    )
-
-    val attachment1Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment.attachmentId, AttachmentTable.DATA)
-    val attachment2Info = SignalDatabase.attachments.getAttachmentDataFileInfo(attachment2.attachmentId, AttachmentTable.DATA)
-
-    assertNotEquals(attachment1Info, attachment2Info)
-  }
-
-  private fun createAttachment(id: Long, uri: Uri, transformProperties: AttachmentTable.TransformProperties): UriAttachment {
-    return UriAttachmentBuilder.build(
-      id,
-      uri = uri,
-      contentType = MediaUtil.IMAGE_JPEG,
-      transformProperties = transformProperties
-    )
-  }
-
-  private fun createHighQualityTransformProperties(): AttachmentTable.TransformProperties {
-    return AttachmentTable.TransformProperties.forSentMediaQuality(Optional.empty(), SentMediaQuality.HIGH)
-  }
-
-  private fun createMediaStream(byteArray: ByteArray): MediaStream {
-    return MediaStream(byteArray.inputStream(), MediaUtil.IMAGE_JPEG, 2, 2)
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/DatabaseObserverTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/DatabaseObserverTest.kt
@@ -1,157 +0,0 @@
-package org.thoughtcrime.securesms.database
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertTrue
-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.ApplicationDependencies
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.atomic.AtomicBoolean
-import java.util.concurrent.atomic.AtomicInteger
-
-/**
- * When writing tests, be very careful to call [DatabaseObserver.flush] before asserting any observer state. Internally, the observer is enqueueing tasks on
- * an executor, and failing to flush the executor will lead to incorrect/flaky tests.
- */
-@RunWith(AndroidJUnit4::class)
-class DatabaseObserverTest {
-
-  private lateinit var db: SQLiteDatabase
-  private lateinit var observer: DatabaseObserver
-
-  @Before
-  fun setup() {
-    db = SignalDatabase.instance!!.signalWritableDatabase
-    observer = ApplicationDependencies.getDatabaseObserver()
-  }
-
-  @Test
-  fun notifyConversationListeners_runsImmediatelyIfNotInTransaction() {
-    val hasRun = AtomicBoolean(false)
-    observer.registerConversationObserver(1) { hasRun.set(true) }
-    observer.notifyConversationListeners(1)
-    observer.flush()
-    assertTrue(hasRun.get())
-  }
-
-  @Test
-  fun notifyConversationListeners_runsAfterSuccessIfInTransaction() {
-    val hasRun = AtomicBoolean(false)
-
-    db.beginTransaction()
-
-    observer.registerConversationObserver(1) { hasRun.set(true) }
-    observer.notifyConversationListeners(1)
-    observer.flush()
-    assertFalse(hasRun.get())
-
-    db.setTransactionSuccessful()
-    db.endTransaction()
-
-    observer.flush()
-
-    assertTrue(hasRun.get())
-  }
-
-  @Test
-  fun notifyConversationListeners_doesNotRunAfterFailedTransaction() {
-    val hasRun = AtomicBoolean(false)
-
-    db.beginTransaction()
-
-    observer.registerConversationObserver(1) { hasRun.set(true) }
-    observer.notifyConversationListeners(1)
-    observer.flush()
-    assertFalse(hasRun.get())
-
-    db.endTransaction()
-    observer.flush()
-    assertFalse(hasRun.get())
-
-    // Verifying we still don't run it even after a subsequent success
-    db.beginTransaction()
-    db.setTransactionSuccessful()
-    db.endTransaction()
-
-    observer.flush()
-
-    assertFalse(hasRun.get())
-  }
-
-  @Test
-  fun notifyConversationListeners_onlyRunAfterAllTransactionsComplete() {
-    val hasRun = AtomicBoolean(false)
-
-    db.beginTransaction()
-
-    observer.registerConversationObserver(1) { hasRun.set(true) }
-    observer.notifyConversationListeners(1)
-    observer.flush()
-    assertFalse(hasRun.get())
-
-    db.beginTransaction()
-    db.setTransactionSuccessful()
-    db.endTransaction()
-    observer.flush()
-    assertFalse(hasRun.get())
-
-    db.setTransactionSuccessful()
-    db.endTransaction()
-
-    observer.flush()
-
-    assertTrue(hasRun.get())
-  }
-
-  @Test
-  fun notifyConversationListeners_runsImmediatelyIfTheTransactionIsOnAnotherThread() {
-    db.beginTransaction()
-
-    val latch = CountDownLatch(1)
-    SignalExecutors.BOUNDED.execute {
-      val hasRun = AtomicBoolean(false)
-
-      observer.registerConversationObserver(1) { hasRun.set(true) }
-      observer.notifyConversationListeners(1)
-      observer.flush()
-      assertTrue(hasRun.get())
-
-      latch.countDown()
-    }
-
-    latch.await()
-
-    db.setTransactionSuccessful()
-    db.endTransaction()
-  }
-
-  @Test
-  fun notifyConversationListeners_runsAfterSuccessIfInTransaction_ignoreDuplicateNotifications() {
-    val thread1Count = AtomicInteger(0)
-    val thread2Count = AtomicInteger(0)
-
-    db.beginTransaction()
-
-    observer.registerConversationObserver(1) { thread1Count.incrementAndGet() }
-    observer.registerConversationObserver(2) { thread2Count.incrementAndGet() }
-
-    observer.notifyConversationListeners(1)
-    observer.notifyConversationListeners(2)
-    observer.notifyConversationListeners(2)
-
-    observer.flush()
-    assertEquals(0, thread1Count.get())
-    assertEquals(0, thread2Count.get())
-
-    db.setTransactionSuccessful()
-    db.endTransaction()
-
-    observer.flush()
-    assertEquals(1, thread1Count.get())
-    assertEquals(1, thread2Count.get())
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/DistributionListTablesTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/DistributionListTablesTest.kt
@@ -1,98 +0,0 @@
-package org.thoughtcrime.securesms.database
-
-import org.junit.Assert
-import org.junit.Before
-import org.junit.Test
-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.ACI
-import java.util.UUID
-
-class DistributionListTablesTest {
-
-  private lateinit var distributionDatabase: DistributionListTables
-
-  @Before
-  fun setup() {
-    distributionDatabase = SignalDatabase.distributionLists
-  }
-
-  @Test
-  fun createList_whenNoConflict_insertSuccessfully() {
-    val id: DistributionListId? = distributionDatabase.createList("test", recipientList(1, 2, 3))
-    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)
-    val members: List<RecipientId> = recipientList(1, 2, 3)
-
-    val id: DistributionListId? = distributionDatabase.createList("test", members)
-    Assert.assertNotNull(id)
-
-    val record: DistributionListRecord? = distributionDatabase.getList(id!!)
-    Assert.assertNotNull(record)
-    Assert.assertEquals(id, record!!.id)
-    Assert.assertEquals("test", record.name)
-    Assert.assertEquals(members, record.members)
-  }
-
-  @Test
-  fun getMembers_returnsCorrectMembers() {
-    createRecipients(3)
-    val members: List<RecipientId> = recipientList(1, 2, 3)
-
-    val id: DistributionListId? = distributionDatabase.createList("test", members)
-    Assert.assertNotNull(id)
-
-    val foundMembers: List<RecipientId> = distributionDatabase.getMembers(id!!)
-    Assert.assertEquals(members, foundMembers)
-  }
-
-  @Test
-  fun givenStoryExists_getStoryType_returnsStoryWithReplies() {
-    val id: DistributionListId? = distributionDatabase.createList("test", recipientList(1, 2, 3))
-    Assert.assertNotNull(id)
-
-    val storyType = distributionDatabase.getStoryType(id!!)
-    Assert.assertEquals(StoryType.STORY_WITH_REPLIES, storyType)
-  }
-
-  @Test
-  fun givenStoryExistsAndMarkedNoReplies_getStoryType_returnsStoryWithoutReplies() {
-    val id: DistributionListId? = distributionDatabase.createList("test", recipientList(1, 2, 3))
-    Assert.assertNotNull(id)
-    distributionDatabase.setAllowsReplies(id!!, false)
-
-    val storyType = distributionDatabase.getStoryType(id)
-    Assert.assertEquals(StoryType.STORY_WITHOUT_REPLIES, storyType)
-  }
-
-  @Test(expected = IllegalStateException::class)
-  fun givenStoryDoesNotExist_getStoryType_throwsIllegalStateException() {
-    distributionDatabase.getStoryType(DistributionListId.from(12))
-    Assert.fail("Expected an assertion error.")
-  }
-
-  private fun createRecipients(count: Int) {
-    for (i in 0 until count) {
-      SignalDatabase.recipients.getOrInsertFromServiceId(ACI.from(UUID.randomUUID()))
-    }
-  }
-
-  private fun recipientList(vararg ids: Long): List<RecipientId> {
-    return ids.map { RecipientId.from(it) }
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/GroupTableTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/GroupTableTest.kt
@@ -1,225 +0,0 @@
-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.delete
-import org.signal.core.util.readToList
-import org.signal.core.util.requireLong
-import org.signal.core.util.withinTransaction
-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.groups.GroupId
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.testing.SignalActivityRule
-import java.security.SecureRandom
-import kotlin.random.Random
-
-class GroupTableTest {
-
-  @get:Rule
-  val harness = SignalActivityRule()
-
-  private lateinit var groupTable: GroupTable
-
-  @Before
-  fun setUp() {
-    groupTable = SignalDatabase.groups
-
-    groupTable.writableDatabase.delete(GroupTable.TABLE_NAME).run()
-    groupTable.writableDatabase.delete(GroupTable.MembershipTable.TABLE_NAME).run()
-  }
-
-  @Test
-  fun whenICreateGroupV2_thenIExpectMemberRowsPopulated() {
-    val groupId = insertPushGroup()
-
-    //language=sql
-    val members: List<RecipientId> = groupTable.writableDatabase.query(
-      """
-      SELECT ${GroupTable.MembershipTable.RECIPIENT_ID} 
-      FROM ${GroupTable.MembershipTable.TABLE_NAME}
-      WHERE ${GroupTable.MembershipTable.GROUP_ID} = "${groupId.serialize()}"
-      """.trimIndent()
-    ).readToList {
-      RecipientId.from(it.requireLong(GroupTable.RECIPIENT_ID))
-    }
-
-    assertEquals(2, members.size)
-  }
-
-  @Test
-  fun givenAGroupV2_whenIGetGroupsContainingMember_thenIExpectGroup() {
-    val groupId = insertPushGroup()
-    insertThread(groupId)
-
-    val groups = groupTable.getGroupsContainingMember(harness.others[0], false)
-
-    assertEquals(1, groups.size)
-    assertEquals(groupId, groups[0].id)
-  }
-
-  @Test
-  fun givenAnMmsGroup_whenIGetMembers_thenIExpectAllMembers() {
-    val groupId = insertMmsGroup()
-
-    val groups = groupTable.getGroupMemberIds(groupId, GroupTable.MemberSet.FULL_MEMBERS_INCLUDING_SELF)
-
-    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()
-    insertMmsGroup(members = listOf(harness.others[1]))
-
-    val groups = groupTable.getGroups()
-
-    assertEquals(2, groups.cursor?.count)
-  }
-
-  @Test
-  fun givenAGroup_whenIGetGroup_thenIExpectGroup() {
-    val v2Group = insertPushGroup()
-    insertThread(v2Group)
-
-    val groupRecord = groupTable.getGroup(v2Group).get()
-    assertEquals(setOf(harness.self.id, harness.others[0]), groupRecord.members.toSet())
-  }
-
-  @Test
-  fun givenAGroupAndARemap_whenIGetGroup_thenIExpectRemap() {
-    val v2Group = insertPushGroup()
-    insertThread(v2Group)
-
-    groupTable.writableDatabase.withinTransaction {
-      RemappedRecords.getInstance().addRecipient(harness.others[0], harness.others[1])
-    }
-
-    val groupRecord = groupTable.getGroup(v2Group).get()
-    assertEquals(groupRecord.members.toSet(), setOf(harness.self.id, harness.others[1]))
-  }
-
-  @Test
-  fun givenAGroupAndMember_whenIIsCurrentMember_thenIExpectTrue() {
-    val v2Group = insertPushGroup()
-
-    val actual = groupTable.isCurrentMember(v2Group.requirePush(), harness.others[0])
-
-    assertTrue(actual)
-  }
-
-  @Test
-  fun givenAGroupAndMember_whenIRemove_thenIExpectNotAMember() {
-    val v2Group = insertPushGroup()
-
-    groupTable.remove(v2Group, harness.others[0])
-    val actual = groupTable.isCurrentMember(v2Group.requirePush(), harness.others[0])
-
-    assertFalse(actual)
-  }
-
-  @Test
-  fun givenAGroupAndNonMember_whenIIsCurrentMember_thenIExpectFalse() {
-    val v2Group = insertPushGroup()
-
-    val actual = groupTable.isCurrentMember(v2Group.requirePush(), harness.others[1])
-
-    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(listOf())
-    val g2 = insertPushGroup(listOf())
-
-    val gr1 = groupTable.getGroup(g1)
-    val gr2 = groupTable.getGroup(g2)
-
-    assertEquals(g1, gr1.get().id)
-    assertEquals(g2, gr2.get().id)
-  }
-
-  private fun insertThread(groupId: GroupId): Long {
-    val groupRecipient = SignalDatabase.recipients.getByGroupId(groupId).get()
-    return SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(groupRecipient))
-  }
-
-  private fun insertMmsGroup(members: List<RecipientId> = listOf(harness.self.id, harness.others[0])): GroupId {
-    val id = GroupId.createMms(SecureRandom())
-    groupTable.create(
-      id,
-      null,
-      members.apply {
-        println("Creating a group with ${members.size} members")
-      }
-    )
-
-    return id
-  }
-
-  private fun insertPushGroup(
-    members: List<DecryptedMember> = listOf(
-      DecryptedMember.newBuilder()
-        .setUuid(harness.self.requireServiceId().toByteString())
-        .setJoinedAtRevision(0)
-        .setRole(Member.Role.DEFAULT)
-        .build(),
-      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.newBuilder()
-      .addAllMembers(members)
-      .setRevision(0)
-      .build()
-
-    return groupTable.create(groupMasterKey, decryptedGroupState)
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/MessageTableTest_gifts.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/MessageTableTest_gifts.kt
@@ -1,188 +0,0 @@
-package org.thoughtcrime.securesms.database
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-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.ACI
-import org.whispersystems.signalservice.api.push.PNI
-import org.whispersystems.signalservice.api.push.ServiceId
-import java.util.UUID
-
-@Suppress("ClassName")
-@RunWith(AndroidJUnit4::class)
-class MessageTableTest_gifts {
-  private lateinit var mms: MessageTable
-
-  private val localAci = ACI.from(UUID.randomUUID())
-  private val localPni = PNI.from(UUID.randomUUID())
-
-  private lateinit var recipients: List<RecipientId>
-
-  @Before
-  fun setUp() {
-    mms = SignalDatabase.messages
-
-    mms.deleteAllThreads()
-
-    SignalStore.account().setAci(localAci)
-    SignalStore.account().setPni(localPni)
-
-    recipients = (0 until 5).map { SignalDatabase.recipients.getOrInsertFromServiceId(ServiceId.from(UUID.randomUUID())) }
-  }
-
-  @Test
-  fun givenNoSentGifts_whenISetOutgoingGiftsRevealed_thenIExpectEmptyList() {
-    val result = mms.setOutgoingGiftsRevealed(listOf(1))
-
-    assertTrue(result.isEmpty())
-  }
-
-  @Test
-  fun givenSentGift_whenISetOutgoingGiftsRevealed_thenIExpectNonEmptyListContainingThatGift() {
-    val messageId = MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = GiftBadge.getDefaultInstance()
-    )
-
-    val result = mms.setOutgoingGiftsRevealed(listOf(messageId))
-
-    assertTrue(result.isNotEmpty())
-    assertEquals(messageId, result.first().messageId.id)
-  }
-
-  @Test
-  fun givenViewedSentGift_whenISetOutgoingGiftsRevealed_thenIExpectEmptyList() {
-    val messageId = MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = GiftBadge.getDefaultInstance()
-    )
-    mms.setOutgoingGiftsRevealed(listOf(messageId))
-
-    val result = mms.setOutgoingGiftsRevealed(listOf(messageId))
-
-    assertTrue(result.isEmpty())
-  }
-
-  @Test
-  fun givenMultipleSentGift_whenISetOutgoingGiftsRevealedForOne_thenIExpectNonEmptyListContainingThatGift() {
-    val messageId = MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = GiftBadge.getDefaultInstance()
-    )
-
-    MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = GiftBadge.getDefaultInstance()
-    )
-
-    val result = mms.setOutgoingGiftsRevealed(listOf(messageId))
-
-    assertEquals(1, result.size)
-    assertEquals(messageId, result.first().messageId.id)
-  }
-
-  @Test
-  fun givenMultipleSentGift_whenISetOutgoingGiftsRevealedForBoth_thenIExpectNonEmptyListContainingThoseGifts() {
-    val messageId = MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = GiftBadge.getDefaultInstance()
-    )
-
-    val messageId2 = MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = GiftBadge.getDefaultInstance()
-    )
-
-    val result = mms.setOutgoingGiftsRevealed(listOf(messageId, messageId2))
-
-    assertEquals(listOf(messageId, messageId2), result.map { it.messageId.id })
-  }
-
-  @Test
-  fun givenMultipleSentGiftAndNonGift_whenISetOutgoingGiftsRevealedForBothGifts_thenIExpectNonEmptyListContainingJustThoseGifts() {
-    val messageId = MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = GiftBadge.getDefaultInstance()
-    )
-
-    val messageId2 = MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = GiftBadge.getDefaultInstance()
-    )
-
-    MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = null
-    )
-
-    val result = mms.setOutgoingGiftsRevealed(listOf(messageId, messageId2))
-
-    assertEquals(listOf(messageId, messageId2), result.map { it.messageId.id })
-  }
-
-  @Test
-  fun givenMultipleSentGiftAndNonGift_whenISetOutgoingGiftsRevealedForAllThree_thenIExpectNonEmptyListContainingJustThoseGifts() {
-    val messageId = MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = GiftBadge.getDefaultInstance()
-    )
-
-    val messageId2 = MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = GiftBadge.getDefaultInstance()
-    )
-
-    val messageId3 = MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = null
-    )
-
-    val result = mms.setOutgoingGiftsRevealed(listOf(messageId, messageId2, messageId3))
-
-    assertEquals(listOf(messageId, messageId2), result.map { it.messageId.id })
-  }
-
-  @Test
-  fun givenMultipleSentGiftAndNonGift_whenISetOutgoingGiftsRevealedForNonGift_thenIExpectEmptyList() {
-    MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = GiftBadge.getDefaultInstance()
-    )
-
-    MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = GiftBadge.getDefaultInstance()
-    )
-
-    val messageId3 = MmsHelper.insert(
-      recipient = Recipient.resolved(recipients[0]),
-      sentTimeMillis = 1,
-      giftBadge = null
-    )
-
-    val result = mms.setOutgoingGiftsRevealed(listOf(messageId3))
-
-    assertTrue(result.isEmpty())
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsHelper.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsHelper.kt
@@ -1,65 +0,0 @@
-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.IncomingMediaMessage
-import org.thoughtcrime.securesms.mms.OutgoingMessage
-import org.thoughtcrime.securesms.recipients.Recipient
-import java.util.Optional
-
-/**
- * Helper methods for inserting an MMS message into the MMS table.
- */
-object MmsHelper {
-
-  fun insert(
-    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,
-    threadId: Long = SignalDatabase.threads.getOrCreateThreadIdFor(recipient, distributionType),
-    storyType: StoryType = StoryType.NONE,
-    parentStoryId: ParentStoryId? = null,
-    isStoryReaction: Boolean = false,
-    giftBadge: GiftBadge? = null,
-    secure: Boolean = true
-  ): Long {
-    val message = OutgoingMessage(
-      recipient = recipient,
-      body = body,
-      timestamp = sentTimeMillis,
-      subscriptionId = subscriptionId,
-      expiresIn = expiresIn,
-      viewOnce = viewOnce,
-      distributionType = distributionType,
-      storyType = storyType,
-      parentStoryId = parentStoryId,
-      isStoryReaction = isStoryReaction,
-      giftBadge = giftBadge,
-      isSecure = secure
-    )
-
-    return insert(
-      message = message,
-      threadId = threadId
-    )
-  }
-
-  fun insert(
-    message: OutgoingMessage,
-    threadId: Long
-  ): Long {
-    return SignalDatabase.messages.insertMessageOutbox(message, threadId, false, GroupReceiptTable.STATUS_UNKNOWN, null)
-  }
-
-  fun insert(
-    message: IncomingMediaMessage,
-    threadId: Long
-  ): Optional<MessageTable.InsertResult> {
-    return SignalDatabase.messages.insertSecureDecryptedMessageInbox(message, threadId)
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsTableTest_stories.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/MmsTableTest_stories.kt
@@ -1,380 +0,0 @@
-package org.thoughtcrime.securesms.database
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertNull
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Ignore
-import org.junit.Test
-import org.junit.runner.RunWith
-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.IncomingMediaMessage
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.recipients.RecipientId
-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
-
-@Suppress("ClassName")
-@RunWith(AndroidJUnit4::class)
-class MmsTableTest_stories {
-
-  private lateinit var mms: MessageTable
-
-  private val localAci = ACI.from(UUID.randomUUID())
-  private val localPni = PNI.from(UUID.randomUUID())
-
-  private lateinit var myStory: Recipient
-  private lateinit var recipients: List<RecipientId>
-  private lateinit var releaseChannelRecipient: Recipient
-
-  @Before
-  fun setUp() {
-    mms = SignalDatabase.messages
-
-    mms.deleteAllThreads()
-
-    SignalStore.account().setAci(localAci)
-    SignalStore.account().setPni(localPni)
-
-    myStory = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromDistributionListId(DistributionListId.MY_STORY))
-    recipients = (0 until 5).map { SignalDatabase.recipients.getOrInsertFromServiceId(ServiceId.from(UUID.randomUUID())) }
-    releaseChannelRecipient = Recipient.resolved(SignalDatabase.recipients.insertReleaseChannelRecipient())
-
-    SignalStore.releaseChannelValues().setReleaseChannelRecipientId(releaseChannelRecipient.id)
-  }
-
-  @Test
-  fun givenNoStories_whenIGetOrderedStoryRecipientsAndIds_thenIExpectAnEmptyList() {
-    // WHEN
-    val result = mms.getOrderedStoryRecipientsAndIds(false)
-
-    // THEN
-    assertEquals(0, result.size)
-  }
-
-  @Test
-  fun givenOneOutgoingAndOneIncomingStory_whenIGetOrderedStoryRecipientsAndIds_thenIExpectIncomingThenOutgoing() {
-    // GIVEN
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(myStory)
-    val sender = recipients[0]
-
-    MmsHelper.insert(
-      recipient = myStory,
-      sentTimeMillis = 1,
-      storyType = StoryType.STORY_WITH_REPLIES,
-      threadId = threadId
-    )
-
-    MmsHelper.insert(
-      IncomingMediaMessage(
-        from = sender,
-        sentTimeMillis = 2,
-        serverTimeMillis = 2,
-        receivedTimeMillis = 2,
-        storyType = StoryType.STORY_WITH_REPLIES
-      ),
-      -1L
-    )
-
-    // WHEN
-    val result = mms.getOrderedStoryRecipientsAndIds(false)
-
-    // THEN
-    assertEquals(listOf(sender.toLong(), myStory.id.toLong()), result.map { it.recipientId.toLong() })
-  }
-
-  @Test
-  fun givenAStory_whenISetIncomingStoryMessageViewed_thenIExpectASetReceiptTimestamp() {
-    // GIVEN
-    val sender = recipients[0]
-    val messageId = MmsHelper.insert(
-      IncomingMediaMessage(
-        from = sender,
-        sentTimeMillis = 2,
-        serverTimeMillis = 2,
-        receivedTimeMillis = 2,
-        storyType = StoryType.STORY_WITH_REPLIES
-      ),
-      -1L
-    ).get().messageId
-
-    val messageBeforeMark = SignalDatabase.messages.getMessageRecord(messageId)
-    assertFalse(messageBeforeMark.incomingStoryViewedAtTimestamp > 0)
-
-    // WHEN
-    SignalDatabase.messages.setIncomingMessageViewed(messageId)
-
-    // THEN
-    val messageAfterMark = SignalDatabase.messages.getMessageRecord(messageId)
-    assertTrue(messageAfterMark.incomingStoryViewedAtTimestamp > 0)
-  }
-
-  @Ignore
-  @Test
-  fun given5ViewedStories_whenIGetOrderedStoryRecipientsAndIds_thenIExpectLatestViewedFirst() {
-    // GIVEN
-    val messageIds = recipients.take(5).map {
-      MmsHelper.insert(
-        IncomingMediaMessage(
-          from = it,
-          sentTimeMillis = 2,
-          serverTimeMillis = 2,
-          receivedTimeMillis = 2,
-          storyType = StoryType.STORY_WITH_REPLIES,
-        ),
-        -1L
-      ).get().messageId
-    }
-
-    val randomizedOrderedIds = messageIds.shuffled()
-    randomizedOrderedIds.forEach {
-      SignalDatabase.messages.setIncomingMessageViewed(it)
-      Thread.sleep(5)
-    }
-
-    // WHEN
-    val result = SignalDatabase.messages.getOrderedStoryRecipientsAndIds(false)
-    val resultOrderedIds = result.map { it.messageId }
-
-    // THEN
-    assertEquals(randomizedOrderedIds.reversed(), resultOrderedIds)
-  }
-
-  @Test
-  fun given15Stories_whenIGetOrderedStoryRecipientsAndIds_thenIExpectUnviewedThenInterspersedViewedAndSelfSendsAllDescending() {
-    val myStoryThread = SignalDatabase.threads.getOrCreateThreadIdFor(myStory)
-
-    val unviewedIds: List<Long> = (0 until 5).map {
-      Thread.sleep(5)
-      MmsHelper.insert(
-        IncomingMediaMessage(
-          from = recipients[it],
-          sentTimeMillis = System.currentTimeMillis(),
-          serverTimeMillis = 2,
-          receivedTimeMillis = 2,
-          storyType = StoryType.STORY_WITH_REPLIES,
-        ),
-        -1L
-      ).get().messageId
-    }
-
-    val viewedIds: List<Long> = (0 until 5).map {
-      Thread.sleep(5)
-      MmsHelper.insert(
-        IncomingMediaMessage(
-          from = recipients[it],
-          sentTimeMillis = System.currentTimeMillis(),
-          serverTimeMillis = 2,
-          receivedTimeMillis = 2,
-          storyType = StoryType.STORY_WITH_REPLIES,
-        ),
-        -1L
-      ).get().messageId
-    }
-
-    val interspersedIds: List<Long> = (0 until 10).map {
-      Thread.sleep(5)
-      if (it % 2 == 0) {
-        SignalDatabase.messages.setIncomingMessageViewed(viewedIds[it / 2])
-        viewedIds[it / 2]
-      } else {
-        MmsHelper.insert(
-          recipient = myStory,
-          sentTimeMillis = System.currentTimeMillis(),
-          storyType = StoryType.STORY_WITH_REPLIES,
-          threadId = myStoryThread
-        )
-      }
-    }
-
-    val result = SignalDatabase.messages.getOrderedStoryRecipientsAndIds(false)
-    val resultOrderedIds = result.map { it.messageId }
-
-    assertEquals(unviewedIds.reversed() + interspersedIds.reversed(), resultOrderedIds)
-  }
-
-  @Test
-  fun givenNoStories_whenICheckIsOutgoingStoryAlreadyInDatabase_thenIExpectFalse() {
-    // WHEN
-    val result = mms.isOutgoingStoryAlreadyInDatabase(recipients[0], 200)
-
-    // THEN
-    assertFalse(result)
-  }
-
-  @Test
-  fun givenNoOutgoingStories_whenICheckIsOutgoingStoryAlreadyInDatabase_thenIExpectFalse() {
-    // GIVEN
-    MmsHelper.insert(
-      IncomingMediaMessage(
-        from = recipients[0],
-        sentTimeMillis = 200,
-        serverTimeMillis = 2,
-        receivedTimeMillis = 2,
-        storyType = StoryType.STORY_WITH_REPLIES,
-      ),
-      -1L
-    )
-
-    // WHEN
-    val result = mms.isOutgoingStoryAlreadyInDatabase(recipients[0], 200)
-
-    // THEN
-    assertFalse(result)
-  }
-
-  @Test
-  fun givenOutgoingStoryExistsForRecipientAndTime_whenICheckIsOutgoingStoryAlreadyInDatabase_thenIExpectTrue() {
-    // GIVEN
-    MmsHelper.insert(
-      recipient = myStory,
-      sentTimeMillis = 200,
-      storyType = StoryType.STORY_WITH_REPLIES
-    )
-
-    // WHEN
-    val result = mms.isOutgoingStoryAlreadyInDatabase(myStory.id, 200)
-
-    // THEN
-    assertTrue(result)
-  }
-
-  @Test
-  fun givenAGroupStoryWithNoReplies_whenICheckHasSelfReplyInGroupStory_thenIExpectFalse() {
-    // GIVEN
-    val groupStoryId = MmsHelper.insert(
-      recipient = myStory,
-      sentTimeMillis = 200,
-      storyType = StoryType.STORY_WITH_REPLIES,
-      threadId = -1L
-    )
-
-    // WHEN
-    val result = mms.hasGroupReplyOrReactionInStory(groupStoryId)
-
-    // THEN
-    assertFalse(result)
-  }
-
-  @Ignore
-  @Test
-  fun givenAGroupStoryWithAReplyFromSelf_whenICheckHasSelfReplyInGroupStory_thenIExpectTrue() {
-    // GIVEN
-    val groupStoryId = MmsHelper.insert(
-      recipient = myStory,
-      sentTimeMillis = 200,
-      storyType = StoryType.STORY_WITH_REPLIES,
-      threadId = -1L
-    )
-
-    MmsHelper.insert(
-      recipient = myStory,
-      sentTimeMillis = 201,
-      storyType = StoryType.NONE,
-      parentStoryId = ParentStoryId.GroupReply(groupStoryId)
-    )
-
-    // WHEN
-    val result = mms.hasGroupReplyOrReactionInStory(groupStoryId)
-
-    // THEN
-    assertTrue(result)
-  }
-
-  @Test
-  fun givenAGroupStoryWithAReactionFromSelf_whenICheckHasSelfReplyInGroupStory_thenIExpectTrue() {
-    // GIVEN
-    val groupStoryId = MmsHelper.insert(
-      recipient = myStory,
-      sentTimeMillis = 200,
-      storyType = StoryType.STORY_WITH_REPLIES
-    )
-
-    MmsHelper.insert(
-      recipient = myStory,
-      sentTimeMillis = 201,
-      storyType = StoryType.NONE,
-      parentStoryId = ParentStoryId.GroupReply(groupStoryId),
-      isStoryReaction = true
-    )
-
-    // WHEN
-    val result = mms.hasGroupReplyOrReactionInStory(groupStoryId)
-
-    // THEN
-    assertTrue(result)
-  }
-
-  @Test
-  fun givenAGroupStoryWithAReplyFromSomeoneElse_whenICheckHasSelfReplyInGroupStory_thenIExpectFalse() {
-    // GIVEN
-    val groupStoryId = MmsHelper.insert(
-      recipient = myStory,
-      sentTimeMillis = 200,
-      storyType = StoryType.STORY_WITH_REPLIES,
-      threadId = -1L
-    )
-
-    MmsHelper.insert(
-      IncomingMediaMessage(
-        from = myStory.id,
-        sentTimeMillis = 201,
-        serverTimeMillis = 201,
-        receivedTimeMillis = 202,
-        parentStoryId = ParentStoryId.GroupReply(groupStoryId)
-      ),
-      -1
-    )
-
-    // WHEN
-    val result = mms.hasGroupReplyOrReactionInStory(groupStoryId)
-
-    // THEN
-    assertFalse(result)
-  }
-
-  @Test
-  fun givenNotViewedOnboardingAndOnlyStoryIsOnboardingAndAdded2DaysAgo_whenIGetOldestStoryTimestamp_thenIExpectNull() {
-    // GIVEN
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(releaseChannelRecipient)
-    MmsHelper.insert(
-      recipient = releaseChannelRecipient,
-      sentTimeMillis = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(2),
-      storyType = StoryType.STORY_WITH_REPLIES,
-      threadId = threadId
-    )
-
-    // WHEN
-    val oldestTimestamp = SignalDatabase.messages.getOldestStorySendTimestamp(false)
-
-    // THEN
-    assertNull(oldestTimestamp)
-  }
-
-  @Test
-  fun givenViewedOnboardingAndOnlyStoryIsOnboardingAndAdded2DaysAgo_whenIGetOldestStoryTimestamp_thenIExpectNotNull() {
-    // GIVEN
-    val expected = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(2)
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(releaseChannelRecipient)
-    MmsHelper.insert(
-      recipient = releaseChannelRecipient,
-      sentTimeMillis = expected,
-      storyType = StoryType.STORY_WITH_REPLIES,
-      threadId = threadId
-    )
-
-    // WHEN
-    val oldestTimestamp = SignalDatabase.messages.getOldestStorySendTimestamp(true)
-
-    // THEN
-    assertEquals(expected, oldestTimestamp)
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest.kt
@@ -1,162 +0,0 @@
-package org.thoughtcrime.securesms.database
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertNotEquals
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.core.util.CursorUtil
-import org.thoughtcrime.securesms.profiles.ProfileName
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.testing.SignalActivityRule
-
-@RunWith(AndroidJUnit4::class)
-class RecipientTableTest {
-
-  @get:Rule
-  val harness = SignalActivityRule()
-
-  @Test
-  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(0, results.count)
-  }
-
-  @Test
-  fun givenAHiddenRecipient_whenIGetSignalContacts_thenIDoNotExpectHiddenToBeReturned() {
-    val hiddenRecipient = harness.others[0]
-    SignalDatabase.recipients.setProfileName(hiddenRecipient, ProfileName.fromParts("Hidden", "Person"))
-    SignalDatabase.recipients.markHidden(hiddenRecipient)
-
-    val results: MutableList<RecipientId> = SignalDatabase.recipients.getSignalContacts(false)?.use {
-      val ids = mutableListOf<RecipientId>()
-      while (it.moveToNext()) {
-        ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientTable.ID)))
-      }
-
-      ids
-    }!!
-
-    assertNotEquals(0, results.size)
-    assertFalse(hiddenRecipient in results)
-  }
-
-  @Test
-  fun givenAHiddenRecipient_whenIQuerySignalContacts_thenIDoNotExpectHiddenToBeReturned() {
-    val hiddenRecipient = harness.others[0]
-    SignalDatabase.recipients.setProfileName(hiddenRecipient, ProfileName.fromParts("Hidden", "Person"))
-    SignalDatabase.recipients.markHidden(hiddenRecipient)
-
-    val results = SignalDatabase.recipients.querySignalContacts("Hidden", false)!!
-
-    assertEquals(0, results.count)
-  }
-
-  @Test
-  fun givenAHiddenRecipient_whenIQueryNonGroupContacts_thenIDoNotExpectHiddenToBeReturned() {
-    val hiddenRecipient = harness.others[0]
-    SignalDatabase.recipients.setProfileName(hiddenRecipient, ProfileName.fromParts("Hidden", "Person"))
-    SignalDatabase.recipients.markHidden(hiddenRecipient)
-
-    val results = SignalDatabase.recipients.queryNonGroupContacts("Hidden", false)!!
-
-    assertEquals(0, results.count)
-  }
-
-  @Test
-  fun givenAHiddenRecipient_whenIGetNonGroupContacts_thenIDoNotExpectHiddenToBeReturned() {
-    val hiddenRecipient = harness.others[0]
-    SignalDatabase.recipients.setProfileName(hiddenRecipient, ProfileName.fromParts("Hidden", "Person"))
-    SignalDatabase.recipients.markHidden(hiddenRecipient)
-
-    val results: MutableList<RecipientId> = SignalDatabase.recipients.getNonGroupContacts(false)?.use {
-      val ids = mutableListOf<RecipientId>()
-      while (it.moveToNext()) {
-        ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientTable.ID)))
-      }
-
-      ids
-    }!!
-
-    assertNotEquals(0, results.size)
-    assertFalse(hiddenRecipient in results)
-  }
-
-  @Test
-  fun givenABlockedRecipient_whenIQueryAllContacts_thenIDoNotExpectBlockedToBeReturned() {
-    val blockedRecipient = harness.others[0]
-    SignalDatabase.recipients.setProfileName(blockedRecipient, ProfileName.fromParts("Blocked", "Person"))
-    SignalDatabase.recipients.setBlocked(blockedRecipient, true)
-
-    val results = SignalDatabase.recipients.queryAllContacts("Blocked")!!
-
-    assertEquals(0, results.count)
-  }
-
-  @Test
-  fun givenABlockedRecipient_whenIGetSignalContacts_thenIDoNotExpectBlockedToBeReturned() {
-    val blockedRecipient = harness.others[0]
-    SignalDatabase.recipients.setProfileName(blockedRecipient, ProfileName.fromParts("Blocked", "Person"))
-    SignalDatabase.recipients.setBlocked(blockedRecipient, true)
-
-    val results: MutableList<RecipientId> = SignalDatabase.recipients.getSignalContacts(false)?.use {
-      val ids = mutableListOf<RecipientId>()
-      while (it.moveToNext()) {
-        ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientTable.ID)))
-      }
-
-      ids
-    }!!
-
-    assertNotEquals(0, results.size)
-    assertFalse(blockedRecipient in results)
-  }
-
-  @Test
-  fun givenABlockedRecipient_whenIQuerySignalContacts_thenIDoNotExpectBlockedToBeReturned() {
-    val blockedRecipient = harness.others[0]
-    SignalDatabase.recipients.setProfileName(blockedRecipient, ProfileName.fromParts("Blocked", "Person"))
-    SignalDatabase.recipients.setBlocked(blockedRecipient, true)
-
-    val results = SignalDatabase.recipients.querySignalContacts("Blocked", false)!!
-
-    assertEquals(0, results.count)
-  }
-
-  @Test
-  fun givenABlockedRecipient_whenIQueryNonGroupContacts_thenIDoNotExpectBlockedToBeReturned() {
-    val blockedRecipient = harness.others[0]
-    SignalDatabase.recipients.setProfileName(blockedRecipient, ProfileName.fromParts("Blocked", "Person"))
-    SignalDatabase.recipients.setBlocked(blockedRecipient, true)
-
-    val results = SignalDatabase.recipients.queryNonGroupContacts("Blocked", false)!!
-
-    assertEquals(0, results.count)
-  }
-
-  @Test
-  fun givenABlockedRecipient_whenIGetNonGroupContacts_thenIDoNotExpectBlockedToBeReturned() {
-    val blockedRecipient = harness.others[0]
-    SignalDatabase.recipients.setProfileName(blockedRecipient, ProfileName.fromParts("Blocked", "Person"))
-    SignalDatabase.recipients.setBlocked(blockedRecipient, true)
-
-    val results: MutableList<RecipientId> = SignalDatabase.recipients.getNonGroupContacts(false)?.use {
-      val ids = mutableListOf<RecipientId>()
-      while (it.moveToNext()) {
-        ids.add(RecipientId.from(CursorUtil.requireLong(it, RecipientTable.ID)))
-      }
-
-      ids
-    }!!
-
-    assertNotEquals(0, results.size)
-    assertFalse(blockedRecipient in results)
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_getAndPossiblyMerge.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_getAndPossiblyMerge.kt
@@ -1,954 +0,0 @@
-package org.thoughtcrime.securesms.database
-
-import android.database.Cursor
-import androidx.core.content.contentValuesOf
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.hamcrest.MatcherAssert
-import org.hamcrest.Matchers
-import org.junit.Assert
-import org.junit.Assert.assertEquals
-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.SqlUtil
-import org.signal.core.util.requireLong
-import org.signal.core.util.requireNonNullString
-import org.signal.core.util.select
-import org.signal.libsignal.protocol.IdentityKey
-import org.signal.libsignal.protocol.SignalProtocolAddress
-import org.signal.libsignal.protocol.state.SessionRecord
-import org.thoughtcrime.securesms.conversation.colors.AvatarColor
-import org.thoughtcrime.securesms.database.model.DistributionListId
-import org.thoughtcrime.securesms.database.model.DistributionListRecord
-import org.thoughtcrime.securesms.database.model.Mention
-import org.thoughtcrime.securesms.database.model.MessageId
-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.ApplicationDependencies
-import org.thoughtcrime.securesms.groups.GroupId
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-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.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
-
-@RunWith(AndroidJUnit4::class)
-class RecipientTableTest_getAndPossiblyMerge {
-
-  @Before
-  fun setup() {
-    SignalStore.account().setE164(E164_SELF)
-    SignalStore.account().setAci(ACI_SELF)
-    SignalStore.account().setPni(PNI_SELF)
-    FeatureFlagsAccessor.forceValue(FeatureFlags.PHONE_NUMBER_PRIVACY, true)
-  }
-
-  @Test
-  fun allSimpleTests() {
-    test("no match, e164-only") {
-      process(E164_A, null, null)
-      expect(E164_A, null, null)
-    }
-
-    test("no match, e164 and pni") {
-      process(E164_A, PNI_A, null)
-      expect(E164_A, PNI_A, null)
-    }
-
-    test("no match, aci-only") {
-      process(null, null, ACI_A)
-      expect(null, null, ACI_A)
-    }
-
-    test("no match, e164 and aci") {
-      process(E164_A, null, ACI_A)
-      expect(E164_A, null, ACI_A)
-    }
-
-    test("no match, no data", exception = java.lang.IllegalArgumentException::class.java) {
-      process(null, null, null)
-    }
-
-    test("no match, all fields") {
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-
-    test("full match") {
-      given(E164_A, PNI_A, ACI_A)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-
-    test("e164 matches, all fields provided") {
-      given(E164_A, null, null)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-
-    test("e164 matches, e164 and aci provided") {
-      given(E164_A, null, null)
-      process(E164_A, null, ACI_A)
-      expect(E164_A, null, ACI_A)
-    }
-
-    test("e164 matches, all provided, different aci") {
-      given(E164_A, null, ACI_B)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expect(null, null, ACI_B)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-
-    test("e164 matches, e164 and aci provided, different aci") {
-      given(E164_A, null, ACI_A)
-
-      process(E164_A, null, ACI_B)
-
-      expect(null, null, ACI_A)
-      expect(E164_A, null, ACI_B)
-    }
-
-    test("e164 and pni matches, all provided, new aci, no pni session") {
-      given(E164_A, PNI_A, null)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-
-    test("e164 and pni matches, all provided, new aci, existing pni session") {
-      given(E164_A, PNI_A, null, pniSession = true)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-
-      expectSessionSwitchoverEvent(E164_A)
-    }
-
-    test("e164 and aci matches, all provided, new pni") {
-      given(E164_A, null, ACI_A)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-
-    test("pni matches, all provided, new e164 and aci, no pni session") {
-      given(null, PNI_A, null)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-
-    test("pni matches, all provided, new e164 and aci, existing pni session") {
-      given(null, PNI_A, null, pniSession = true)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-
-      expectSessionSwitchoverEvent(E164_A)
-    }
-
-    test("pni and aci matches, all provided, new e164") {
-      given(null, PNI_A, ACI_A)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-
-    test("e164 and aci matches, e164 and aci provided, nothing new") {
-      given(E164_A, null, ACI_A)
-      process(E164_A, null, ACI_A)
-      expect(E164_A, null, ACI_A)
-    }
-
-    test("aci matches, all provided, new e164 and pni") {
-      given(null, null, ACI_A)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-
-    test("aci matches, e164 and aci provided") {
-      given(null, null, ACI_A)
-      process(E164_A, null, ACI_A)
-      expect(E164_A, null, ACI_A)
-    }
-
-    test("aci matches, local user, changeSelf=false") {
-      given(E164_SELF, PNI_SELF, ACI_SELF)
-
-      process(E164_SELF, null, ACI_B)
-
-      expect(E164_SELF, PNI_SELF, ACI_SELF)
-      expect(null, null, ACI_B)
-    }
-
-    test("e164 matches, e164 and pni provided, pni changes, no pni session") {
-      given(E164_A, PNI_B, null)
-      process(E164_A, PNI_A, null)
-      expect(E164_A, PNI_A, null)
-    }
-
-    test("e164 matches, e164 and pni provided, pni changes, existing pni session") {
-      given(E164_A, PNI_B, null, pniSession = true)
-      process(E164_A, PNI_A, null)
-      expect(E164_A, PNI_A, null)
-
-      expectSessionSwitchoverEvent(E164_A)
-    }
-
-    test("e164 and pni matches, all provided, no pni session") {
-      given(E164_A, PNI_A, null)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-
-    test("e164 and pni matches, all provided, existing pni session") {
-      given(E164_A, PNI_A, null, pniSession = true)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-
-      expectSessionSwitchoverEvent(E164_A)
-    }
-
-    test("pni matches, all provided, no pni session") {
-      given(null, PNI_A, null)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-
-    test("pni matches, all provided, existing pni session") {
-      given(null, PNI_A, null, pniSession = true)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-
-      expectSessionSwitchoverEvent(E164_A)
-    }
-
-    test("pni matches, no existing pni session, changes number") {
-      given(E164_B, PNI_A, null)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-
-      expectChangeNumberEvent()
-    }
-
-    test("pni matches, existing pni session, changes number") {
-      given(E164_B, PNI_A, null, pniSession = true)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-
-      expectSessionSwitchoverEvent(E164_B)
-      expectChangeNumberEvent()
-    }
-
-    test("pni and aci matches, change number") {
-      given(E164_B, PNI_A, ACI_A)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-
-      expectChangeNumberEvent()
-    }
-
-    test("aci matches, all provided, change number") {
-      given(E164_B, null, ACI_A)
-      process(E164_A, PNI_A, ACI_A)
-      expect(E164_A, PNI_A, ACI_A)
-
-      expectChangeNumberEvent()
-    }
-
-    test("aci matches, e164 and aci provided, change number") {
-      given(E164_B, null, ACI_A)
-      process(E164_A, null, ACI_A)
-      expect(E164_A, null, ACI_A)
-
-      expectChangeNumberEvent()
-    }
-
-    test("steal, e164+pni & e164+pni, no aci provided, no pni session") {
-      given(E164_A, PNI_B, 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 & e164+pni, no aci provided, existing pni session") {
-      given(E164_A, PNI_B, null, pniSession = true)
-      given(E164_B, PNI_A, null) // TODO How to handle if this user had a session? They just end up losing the PNI, meaning it would become unregistered, but it could register again later with a different PNI?
-
-      process(E164_A, PNI_A, null)
-
-      expect(E164_A, PNI_A, null)
-      expect(E164_B, null, null)
-
-      expectSessionSwitchoverEvent(E164_A)
-    }
-
-    test("steal, e164+pni & aci, e164 record has separate e164") {
-      given(E164_B, PNI_A, null)
-      given(null, null, ACI_A)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expect(E164_B, null, null)
-      expect(E164_A, PNI_A, ACI_A)
-    }
-
-    test("steal, e164+aci & e164+aci, change number") {
-      given(E164_B, null, ACI_A)
-      given(E164_A, null, ACI_B)
-
-      process(E164_A, null, ACI_A)
-
-      expect(E164_A, null, ACI_A)
-      expect(null, null, ACI_B)
-
-      expectChangeNumberEvent()
-    }
-
-    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)
-
-      process(E164_A, PNI_A, null)
-
-      expect(E164_A, PNI_A, null)
-      expect(E164_B, null, null)
-
-      expectSessionSwitchoverEvent(id1, E164_A)
-      expectSessionSwitchoverEvent(id2, E164_B)
-    }
-
-    test("merge, e164 & pni & aci, all provided") {
-      given(E164_A, null, null)
-      given(null, PNI_A, null)
-      given(null, null, ACI_A)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expectDeleted()
-      expectDeleted()
-      expect(E164_A, PNI_A, ACI_A)
-
-      expectThreadMergeEvent(E164_A)
-    }
-
-    test("merge, e164 & pni, no aci provided") {
-      given(E164_A, null, null)
-      given(null, PNI_A, null)
-
-      process(E164_A, PNI_A, null)
-
-      expect(E164_A, PNI_A, null)
-      expectDeleted()
-
-      expectThreadMergeEvent("")
-    }
-
-    test("merge, e164 & pni, aci provided, no pni session") {
-      given(E164_A, null, null)
-      given(null, PNI_A, null)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expect(E164_A, PNI_A, ACI_A)
-      expectDeleted()
-
-      expectThreadMergeEvent("")
-    }
-
-    test("merge, e164 & pni, aci provided, no pni session") {
-      given(E164_A, null, null)
-      given(null, PNI_A, null)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expect(E164_A, PNI_A, ACI_A)
-      expectDeleted()
-
-      expectThreadMergeEvent("")
-    }
-
-    test("merge, e164 & pni, aci provided, existing pni session") {
-      given(E164_A, null, null)
-      given(null, PNI_A, null, pniSession = true)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expect(E164_A, PNI_A, ACI_A)
-      expectDeleted()
-
-      expectThreadMergeEvent("")
-      expectSessionSwitchoverEvent(E164_A)
-    }
-
-    test("merge, e164+pni & pni, no aci provided") {
-      given(E164_A, PNI_B, null)
-      given(null, PNI_A, null)
-
-      process(E164_A, PNI_A, null)
-
-      expect(E164_A, PNI_A, null)
-      expectDeleted()
-
-      expectThreadMergeEvent("")
-    }
-
-    test("merge, e164+pni & aci") {
-      given(E164_A, PNI_A, null)
-      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 & e164+pni+aci, change number") {
-      given(E164_A, PNI_A, null)
-      given(E164_B, PNI_B, ACI_A)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expectDeleted()
-      expect(E164_A, PNI_A, ACI_A)
-
-      expectChangeNumberEvent()
-      expectThreadMergeEvent(E164_A)
-    }
-
-    test("merge, e164+pni & e164+aci, change number") {
-      given(E164_A, PNI_A, null)
-      given(E164_B, null, ACI_A)
-
-      process(E164_A, PNI_A, ACI_A)
-
-      expectDeleted()
-      expect(E164_A, PNI_A, ACI_A)
-
-      expectChangeNumberEvent()
-      expectThreadMergeEvent(E164_A)
-    }
-
-    test("merge, e164 & aci") {
-      given(E164_A, null, null)
-      given(null, null, ACI_A)
-
-      process(E164_A, null, ACI_A)
-
-      expectDeleted()
-      expect(E164_A, null, ACI_A)
-
-      expectThreadMergeEvent(E164_A)
-    }
-
-    test("merge, e164 & e164+aci, change number") {
-      given(E164_A, null, null)
-      given(E164_B, null, ACI_A)
-
-      process(E164_A, null, ACI_A)
-
-      expectDeleted()
-      expect(E164_A, null, ACI_A)
-
-      expectChangeNumberEvent()
-
-      expectThreadMergeEvent(E164_A)
-    }
-
-    test("local user, local e164 and aci provided, changeSelf=false, leave e164 alone") {
-      given(E164_SELF, null, ACI_SELF)
-      given(null, null, ACI_A)
-
-      process(E164_SELF, null, ACI_A)
-
-      expect(E164_SELF, null, ACI_SELF)
-      expect(null, null, ACI_A)
-    }
-
-    test("local user, e164 and aci provided, changeSelf=false, leave e164 alone") {
-      given(E164_SELF, null, ACI_SELF)
-      process(E164_A, null, ACI_SELF)
-      expect(E164_SELF, null, ACI_SELF)
-    }
-
-    test("local user, e164 and aci provided, changeSelf=true, change e164") {
-      given(E164_SELF, null, ACI_SELF)
-      process(E164_A, null, ACI_SELF, changeSelf = true)
-      expect(E164_A, null, ACI_SELF)
-    }
-  }
-
-  /**
-   * Somewhat exhaustive test of verifying all the data that gets merged.
-   */
-  @Test
-  fun getAndPossiblyMerge_merge_general() {
-    // Setup
-    val recipientIdAci: RecipientId = SignalDatabase.recipients.getOrInsertFromServiceId(ACI_A)
-    val recipientIdE164: RecipientId = SignalDatabase.recipients.getOrInsertFromE164(E164_A)
-    val recipientIdAciB: RecipientId = SignalDatabase.recipients.getOrInsertFromServiceId(ACI_B)
-
-    val smsId1: Long = SignalDatabase.messages.insertMessageInbox(smsMessage(sender = recipientIdAci, time = 0, body = "0")).get().messageId
-    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.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)!!
-    Assert.assertNotEquals(threadIdAci, threadIdE164)
-
-    SignalDatabase.mentions.insert(threadIdAci, mmsId1, listOf(Mention(recipientIdE164, 0, 1)))
-    SignalDatabase.mentions.insert(threadIdE164, mmsId2, listOf(Mention(recipientIdAci, 0, 1)))
-
-    SignalDatabase.groupReceipts.insert(listOf(recipientIdAci, recipientIdE164), mmsId1, 0, 3)
-
-    val identityKeyAci: IdentityKey = identityKey(1)
-    val identityKeyE164: IdentityKey = identityKey(2)
-
-    SignalDatabase.identities.saveIdentity(ACI_A.toString(), recipientIdAci, identityKeyAci, IdentityTable.VerifiedStatus.VERIFIED, false, 0, false)
-    SignalDatabase.identities.saveIdentity(E164_A, recipientIdE164, identityKeyE164, IdentityTable.VerifiedStatus.VERIFIED, false, 0, false)
-
-    SignalDatabase.sessions.store(ACI_SELF, SignalProtocolAddress(ACI_A.toString(), 1), SessionRecord())
-
-    SignalDatabase.reactions.addReaction(MessageId(smsId1), ReactionRecord("a", recipientIdAci, 1, 1))
-    SignalDatabase.reactions.addReaction(MessageId(mmsId1), ReactionRecord("b", recipientIdE164, 1, 1))
-
-    val profile1: NotificationProfile = notificationProfile(name = "Test")
-    val profile2: NotificationProfile = notificationProfile(name = "Test2")
-
-    SignalDatabase.notificationProfiles.addAllowedRecipient(profileId = profile1.id, recipientId = recipientIdAci)
-    SignalDatabase.notificationProfiles.addAllowedRecipient(profileId = profile1.id, recipientId = recipientIdE164)
-    SignalDatabase.notificationProfiles.addAllowedRecipient(profileId = profile2.id, recipientId = recipientIdE164)
-    SignalDatabase.notificationProfiles.addAllowedRecipient(profileId = profile2.id, recipientId = recipientIdAciB)
-
-    val distributionListId: DistributionListId = SignalDatabase.distributionLists.createList("testlist", listOf(recipientIdE164, recipientIdAciB))!!
-
-    // Merge
-    val retrievedId: RecipientId = SignalDatabase.recipients.getAndPossiblyMerge(ACI_A, E164_A, true)
-    val retrievedThreadId: Long = SignalDatabase.threads.getThreadIdFor(retrievedId)!!
-    assertEquals(recipientIdAci, retrievedId)
-
-    // Recipient validation
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireServiceId())
-    assertEquals(E164_A, retrievedRecipient.requireE164())
-
-    val existingE164Recipient = Recipient.resolved(recipientIdE164)
-    assertEquals(retrievedId, existingE164Recipient.id)
-
-    // Thread validation
-    assertEquals(threadIdAci, retrievedThreadId)
-    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.recipient.id)
-    assertEquals(retrievedId, sms2.recipient.id)
-    assertEquals(retrievedId, sms3.recipient.id)
-
-    assertEquals(retrievedThreadId, sms1.threadId)
-    assertEquals(retrievedThreadId, sms2.threadId)
-    assertEquals(retrievedThreadId, sms3.threadId)
-
-    // MMS validation
-    val mms1: MessageRecord = SignalDatabase.messages.getMessageRecord(mmsId1)!!
-    val mms2: MessageRecord = SignalDatabase.messages.getMessageRecord(mmsId2)!!
-    val mms3: MessageRecord = SignalDatabase.messages.getMessageRecord(mmsId3)!!
-
-    assertEquals(retrievedId, mms1.recipient.id)
-    assertEquals(retrievedId, mms2.recipient.id)
-    assertEquals(retrievedId, mms3.recipient.id)
-
-    assertEquals(retrievedThreadId, mms1.threadId)
-    assertEquals(retrievedThreadId, mms2.threadId)
-    assertEquals(retrievedThreadId, mms3.threadId)
-
-    // Mention validation
-    val mention1: MentionModel = getMention(mmsId1)
-    assertEquals(retrievedId, mention1.recipientId)
-    assertEquals(retrievedThreadId, mention1.threadId)
-
-    val mention2: MentionModel = getMention(mmsId2)
-    assertEquals(retrievedId, mention2.recipientId)
-    assertEquals(retrievedThreadId, mention2.threadId)
-
-    // Group receipt validation
-    val groupReceipts: List<GroupReceiptTable.GroupReceiptInfo> = SignalDatabase.groupReceipts.getGroupReceiptInfo(mmsId1)
-    assertEquals(retrievedId, groupReceipts[0].recipientId)
-    assertEquals(retrievedId, groupReceipts[1].recipientId)
-
-    // Identity validation
-    assertEquals(identityKeyAci, SignalDatabase.identities.getIdentityStoreRecord(ACI_A.toString())!!.identityKey)
-    Assert.assertNull(SignalDatabase.identities.getIdentityStoreRecord(E164_A))
-
-    // Session validation
-    Assert.assertNotNull(SignalDatabase.sessions.load(ACI_SELF, SignalProtocolAddress(ACI_A.toString(), 1)))
-
-    // Reaction validation
-    val reactionsSms: List<ReactionRecord> = SignalDatabase.reactions.getReactions(MessageId(smsId1))
-    val reactionsMms: List<ReactionRecord> = SignalDatabase.reactions.getReactions(MessageId(mmsId1))
-
-    assertEquals(1, reactionsSms.size)
-    assertEquals(ReactionRecord("a", recipientIdAci, 1, 1), reactionsSms[0])
-
-    assertEquals(1, reactionsMms.size)
-    assertEquals(ReactionRecord("b", recipientIdAci, 1, 1), reactionsMms[0])
-
-    // Notification Profile validation
-    val updatedProfile1: NotificationProfile = SignalDatabase.notificationProfiles.getProfile(profile1.id)!!
-    val updatedProfile2: NotificationProfile = SignalDatabase.notificationProfiles.getProfile(profile2.id)!!
-
-    MatcherAssert.assertThat("Notification Profile 1 should now only contain ACI $recipientIdAci", updatedProfile1.allowedMembers, Matchers.containsInAnyOrder(recipientIdAci))
-    MatcherAssert.assertThat("Notification Profile 2 should now contain ACI A ($recipientIdAci) and ACI B ($recipientIdAciB)", updatedProfile2.allowedMembers, Matchers.containsInAnyOrder(recipientIdAci, recipientIdAciB))
-
-    // Distribution List validation
-    val updatedList: DistributionListRecord = SignalDatabase.distributionLists.getList(distributionListId)!!
-
-    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()): 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()): 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 bytes = ByteArray(33)
-    bytes[0] = 0x05
-    bytes[1] = value
-    return IdentityKey(bytes)
-  }
-
-  private fun notificationProfile(name: String): NotificationProfile {
-    return (SignalDatabase.notificationProfiles.createProfile(name = name, emoji = "", color = AvatarColor.A210, System.currentTimeMillis()) as NotificationProfileDatabase.NotificationProfileChangeResult.Success).notificationProfile
-  }
-
-  private fun getMention(messageId: Long): MentionModel {
-    return SignalDatabase.rawDatabase.rawQuery("SELECT * FROM ${MentionTable.TABLE_NAME} WHERE ${MentionTable.MESSAGE_ID} = $messageId").use { cursor ->
-      cursor.moveToFirst()
-      MentionModel(
-        recipientId = RecipientId.from(cursor.requireLong(MentionTable.RECIPIENT_ID)),
-        threadId = cursor.requireLong(MentionTable.THREAD_ID)
-      )
-    }
-  }
-
-  /** The normal mention model doesn't have a threadId, so we need to do it ourselves for the test */
-  data class MentionModel(
-    val recipientId: RecipientId,
-    val threadId: Long
-  )
-
-  /**
-   * Baby DSL for making tests readable.
-   */
-  private fun test(name: String, init: TestCase.() -> Unit): TestCase {
-    // Weird issue with generics wouldn't let me make the exception an arg with default value -- had to do an actual overload
-    return test(name, null as Class<Throwable>?, init)
-  }
-
-  /**
-   * Baby DSL for making tests readable.
-   */
-  private fun <E> test(name: String, exception: Class<E>?, init: TestCase.() -> Unit): TestCase where E : Throwable {
-    val test = TestCase()
-    try {
-      test.init()
-
-      if (exception != null) {
-        throw java.lang.AssertionError("Expected $exception, but none was thrown.")
-      }
-
-      if (!test.changeNumberExpected) {
-        test.expectNoChangeNumberEvent()
-      }
-
-      if (!test.threadMergeExpected) {
-        test.expectNoThreadMergeEvent()
-      }
-
-      if (!test.sessionSwitchoverExpected) {
-        test.expectNoSessionSwitchoverEvent()
-      }
-    } catch (e: Throwable) {
-      if (e.javaClass != exception) {
-        val error = java.lang.AssertionError("[$name] ${e.message}")
-        error.stackTrace = e.stackTrace
-        throw error
-      }
-    }
-
-    return test
-  }
-
-  private inner class TestCase {
-    private val generatedIds: LinkedHashSet<RecipientId> = LinkedHashSet()
-    private var expectCount = 0
-    private lateinit var outputRecipientId: RecipientId
-
-    var changeNumberExpected = false
-    var threadMergeExpected = false
-    var sessionSwitchoverExpected = false
-
-    init {
-      // Need to delete these first to prevent foreign key crash
-      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
-        .sorted()
-        .forEach { table ->
-          SignalDatabase.rawDatabase.execSQL("DELETE FROM $table")
-        }
-
-      ApplicationDependencies.getRecipientCache().clear()
-      RecipientId.clearCache()
-    }
-
-    fun given(
-      e164: String?,
-      pni: PNI?,
-      aci: ACI?,
-      createThread: Boolean = true,
-      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
-        SignalDatabase.threads.getOrCreateThreadIdFor(Recipient.resolved(id))
-        SignalDatabase.messages.insertMessageInbox(IncomingEncryptedMessage(IncomingTextMessage(id, 1, 0, 0, 0, "", Optional.empty(), 0, false, ""), ""))
-      }
-
-      if (pniSession) {
-        if (pni == null) {
-          throw IllegalArgumentException("pniSession = true but pni is null!")
-        }
-
-        SignalDatabase.sessions.store(pni, SignalProtocolAddress(pni.toString(), 1), SessionRecord())
-      }
-
-      return id
-    }
-
-    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
-    }
-
-    fun expect(e164: String?, pni: PNI?, aci: ACI?) {
-      expect(generatedIds.elementAt(expectCount++), e164, pni, aci)
-    }
-
-    fun expect(id: RecipientId, e164: String?, pni: PNI?, aci: ACI?) {
-      val recipient = Recipient.resolved(id)
-      val expected = RecipientTuple(
-        e164 = e164,
-        pni = pni,
-        serviceId = aci ?: pni
-      )
-      val actual = RecipientTuple(
-        e164 = recipient.e164.orElse(null),
-        pni = recipient.pni.orElse(null),
-        serviceId = recipient.serviceId.orElse(null)
-      )
-
-      assertEquals(expected, actual)
-    }
-
-    fun expectDeleted() {
-      expectDeleted(generatedIds.elementAt(expectCount++))
-    }
-
-    fun expectDeleted(id: RecipientId) {
-      SignalDatabase.rawDatabase
-        .select("1")
-        .from(RecipientTable.TABLE_NAME)
-        .where("${RecipientTable.ID} = ?", id)
-        .run()
-        .use { !it.moveToFirst() }
-    }
-
-    fun expectChangeNumberEvent() {
-      assertEquals(1, SignalDatabase.messages.getChangeNumberMessageCount(outputRecipientId))
-      changeNumberExpected = true
-    }
-
-    fun expectNoChangeNumberEvent() {
-      assertEquals(0, SignalDatabase.messages.getChangeNumberMessageCount(outputRecipientId))
-      changeNumberExpected = false
-    }
-
-    fun expectSessionSwitchoverEvent(e164: String) {
-      expectSessionSwitchoverEvent(outputRecipientId, e164)
-    }
-
-    fun expectSessionSwitchoverEvent(recipientId: RecipientId, e164: String) {
-      val event: SessionSwitchoverEvent? = getLatestSessionSwitchoverEvent(recipientId)
-      assertNotNull(event)
-      assertEquals(e164, event!!.e164)
-      sessionSwitchoverExpected = true
-    }
-
-    fun expectNoSessionSwitchoverEvent() {
-      assertNull(getLatestSessionSwitchoverEvent(outputRecipientId))
-    }
-
-    fun expectThreadMergeEvent(previousE164: String) {
-      val event: ThreadMergeEvent? = getLatestThreadMergeEvent(outputRecipientId)
-      assertNotNull(event)
-      assertEquals(previousE164, event!!.previousE164)
-      threadMergeExpected = true
-    }
-
-    fun expectNoThreadMergeEvent() {
-      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.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, ServiceId: $serviceIdString, PNI: $pniString", id > 0)
-
-      return RecipientId.from(id)
-    }
-  }
-
-  data class RecipientTuple(
-    val e164: String?,
-    val pni: PNI?,
-    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()}, ${serviceId.serviceIdString()})"
-    }
-
-    private fun String?.e164String(): String {
-      return this?.let {
-        when (it) {
-          E164_A -> "E164_A"
-          E164_B -> "E164_B"
-          else -> it
-        }
-      } ?: "null"
-    }
-
-    private fun PNI?.pniString(): String {
-      return this?.let {
-        when (it) {
-          PNI_A -> "PNI_A"
-          PNI_B -> "PNI_B"
-          PNI_SELF -> "PNI_SELF"
-          else -> it.toString()
-        }
-      } ?: "null"
-    }
-
-    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"
-          else -> it.toString()
-        }
-      } ?: "null"
-    }
-  }
-
-  private fun getLatestThreadMergeEvent(recipientId: RecipientId): ThreadMergeEvent? {
-    return SignalDatabase.rawDatabase
-      .select(MessageTable.BODY)
-      .from(MessageTable.TABLE_NAME)
-      .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.parseFrom(bytes)
-        } else {
-          null
-        }
-      }
-  }
-
-  private fun getLatestSessionSwitchoverEvent(recipientId: RecipientId): SessionSwitchoverEvent? {
-    return SignalDatabase.rawDatabase
-      .select(MessageTable.BODY)
-      .from(MessageTable.TABLE_NAME)
-      .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.parseFrom(bytes)
-        } else {
-          null
-        }
-      }
-  }
-
-  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"
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_processPnpTupleToChangeSet.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientTableTest_processPnpTupleToChangeSet.kt
@@ -1,842 +0,0 @@
-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"
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/SQLiteDatabaseTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/SQLiteDatabaseTest.kt
@@ -1,183 +0,0 @@
-package org.thoughtcrime.securesms.database
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import junit.framework.Assert.assertFalse
-import junit.framework.Assert.assertTrue
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.core.util.concurrent.SignalExecutors
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.atomic.AtomicBoolean
-
-/**
- * These are tests for the wrapper we wrote around SQLCipherDatabase, not the stock or SQLCipher one.
- */
-@RunWith(AndroidJUnit4::class)
-class SQLiteDatabaseTest {
-
-  private lateinit var db: SQLiteDatabase
-
-  @Before
-  fun setup() {
-    db = SignalDatabase.instance!!.signalWritableDatabase
-  }
-
-  @Test
-  fun runPostSuccessfulTransaction_runsImmediatelyIfNotInTransaction() {
-    val hasRun = AtomicBoolean(false)
-    db.runPostSuccessfulTransaction { hasRun.set(true) }
-    assertTrue(hasRun.get())
-  }
-
-  @Test
-  fun runPostSuccessfulTransaction_runsAfterSuccessIfInTransaction() {
-    val hasRun = AtomicBoolean(false)
-
-    db.beginTransaction()
-
-    db.runPostSuccessfulTransaction { hasRun.set(true) }
-    assertFalse(hasRun.get())
-
-    db.setTransactionSuccessful()
-    db.endTransaction()
-
-    assertTrue(hasRun.get())
-  }
-
-  @Test
-  fun runPostSuccessfulTransaction_doesNotRunAfterFailedTransaction() {
-    val hasRun = AtomicBoolean(false)
-
-    db.beginTransaction()
-
-    db.runPostSuccessfulTransaction { hasRun.set(true) }
-    assertFalse(hasRun.get())
-
-    db.endTransaction()
-
-    assertFalse(hasRun.get())
-
-    // Verifying we still don't run it even after a subsequent success
-    db.beginTransaction()
-    db.setTransactionSuccessful()
-    db.endTransaction()
-
-    assertFalse(hasRun.get())
-  }
-
-  @Test
-  fun runPostSuccessfulTransaction_onlyRunAfterAllTransactionsComplete() {
-    val hasRun = AtomicBoolean(false)
-
-    db.beginTransaction()
-
-    db.runPostSuccessfulTransaction { hasRun.set(true) }
-    assertFalse(hasRun.get())
-
-    db.beginTransaction()
-    db.setTransactionSuccessful()
-    db.endTransaction()
-    assertFalse(hasRun.get())
-
-    db.setTransactionSuccessful()
-    db.endTransaction()
-
-    assertTrue(hasRun.get())
-  }
-
-  @Test
-  fun runPostSuccessfulTransaction_runsImmediatelyIfTheTransactionIsOnAnotherThread() {
-    db.beginTransaction()
-
-    val latch = CountDownLatch(1)
-    SignalExecutors.BOUNDED.execute {
-      val hasRun = AtomicBoolean(false)
-      db.runPostSuccessfulTransaction { hasRun.set(true) }
-      assertTrue(hasRun.get())
-      latch.countDown()
-    }
-
-    latch.await()
-
-    db.setTransactionSuccessful()
-    db.endTransaction()
-  }
-
-  @Test
-  fun runPostSuccessfulTransaction_runsAfterSuccessIfInTransaction_ignoreDuplicates() {
-    val hasRun1 = AtomicBoolean(false)
-    val hasRun2 = AtomicBoolean(false)
-
-    db.beginTransaction()
-
-    db.runPostSuccessfulTransaction("key") { hasRun1.set(true) }
-    db.runPostSuccessfulTransaction("key") { hasRun2.set(true) }
-    assertFalse(hasRun1.get())
-    assertFalse(hasRun2.get())
-
-    db.setTransactionSuccessful()
-    db.endTransaction()
-
-    assertTrue(hasRun1.get())
-    assertFalse(hasRun2.get())
-  }
-
-  @Test
-  fun runPostSuccessfulTransaction_runsAndPerformsAnotherTransaction() {
-    val hasRun = AtomicBoolean(false)
-
-    db.beginTransaction()
-
-    db.runPostSuccessfulTransaction {
-      try {
-        db.beginTransaction()
-        hasRun.set(true)
-        db.setTransactionSuccessful()
-      } finally {
-        db.endTransaction()
-      }
-    }
-
-    assertFalse(hasRun.get())
-
-    db.setTransactionSuccessful()
-    db.endTransaction()
-
-    assertTrue(hasRun.get())
-  }
-
-  @Test
-  fun runPostSuccessfulTransaction_runsAndPerformsAnotherTransactionAndRunPostNested() {
-    val hasRun1 = AtomicBoolean(false)
-    val hasRun2 = AtomicBoolean(false)
-
-    db.beginTransaction()
-
-    db.runPostSuccessfulTransaction {
-      db.beginTransaction()
-
-      db.runPostSuccessfulTransaction {
-        assertTrue(hasRun1.get())
-        assertFalse(hasRun2.get())
-        hasRun2.set(true)
-      }
-
-      assertFalse(hasRun1.get())
-      hasRun1.set(true)
-      assertFalse(hasRun2.get())
-
-      db.setTransactionSuccessful()
-      db.endTransaction()
-    }
-
-    assertFalse(hasRun1.get())
-    assertFalse(hasRun2.get())
-
-    db.setTransactionSuccessful()
-    db.endTransaction()
-
-    assertTrue(hasRun1.get())
-    assertTrue(hasRun2.get())
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/SmsDatabaseTest_collapseJoinRequestEventsIfPossible.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/SmsDatabaseTest_collapseJoinRequestEventsIfPossible.kt
@@ -1,292 +0,0 @@
-package org.thoughtcrime.securesms.database
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.hamcrest.MatcherAssert.assertThat
-import org.hamcrest.Matchers.`is`
-import org.hamcrest.Matchers.notNullValue
-import org.hamcrest.Matchers.nullValue
-import org.junit.Before
-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.databaseprotos.DecryptedGroupV2Context
-import org.thoughtcrime.securesms.database.model.databaseprotos.addMember
-import org.thoughtcrime.securesms.database.model.databaseprotos.addRequestingMember
-import org.thoughtcrime.securesms.database.model.databaseprotos.deleteRequestingMember
-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.recipients.RecipientId
-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")
-@RunWith(AndroidJUnit4::class)
-class SmsDatabaseTest_collapseJoinRequestEventsIfPossible {
-
-  private lateinit var recipients: RecipientTable
-  private lateinit var sms: MessageTable
-
-  private val localAci = ACI.from(UUID.randomUUID())
-  private val localPni = PNI.from(UUID.randomUUID())
-
-  private var wallClock: Long = 1000
-
-  private lateinit var alice: RecipientId
-  private lateinit var bob: RecipientId
-
-  @Before
-  fun setUp() {
-    recipients = SignalDatabase.recipients
-    sms = SignalDatabase.messages
-
-    SignalStore.account().setAci(localAci)
-    SignalStore.account().setPni(localPni)
-
-    alice = recipients.getOrInsertFromServiceId(aliceServiceId)
-    bob = recipients.getOrInsertFromServiceId(bobServiceId)
-  }
-
-  /**
-   * Do nothing if no previous messages.
-   */
-  @Test
-  fun noPreviousMessage() {
-    val result = sms.collapseJoinRequestEventsIfPossible(
-      1,
-      groupUpdateMessage(
-        sender = alice,
-        groupContext = groupContext(masterKey = masterKey) {
-          change = groupChange(editor = aliceServiceId) {
-            deleteRequestingMember(aliceServiceId)
-          }
-        }
-      )
-    )
-
-    assertThat("result is null when not collapsing", result.orElse(null), nullValue())
-  }
-
-  /**
-   * Do nothing if previous message is text.
-   */
-  @Test
-  fun previousTextMesssage() {
-    val threadId = sms.insertMessageInbox(smsMessage(sender = alice, body = "What up")).get().threadId
-
-    val result = sms.collapseJoinRequestEventsIfPossible(
-      threadId,
-      groupUpdateMessage(
-        sender = alice,
-        groupContext = groupContext(masterKey = masterKey) {
-          change = groupChange(editor = aliceServiceId) {
-            deleteRequestingMember(aliceServiceId)
-          }
-        }
-      )
-    )
-
-    assertThat("result is null when not collapsing", result.orElse(null), nullValue())
-  }
-
-  /**
-   * Do nothing if previous is unrelated group change.
-   */
-  @Test
-  fun previousUnrelatedGroupChange() {
-    val threadId = sms.insertMessageInbox(
-      groupUpdateMessage(
-        sender = alice,
-        groupContext = groupContext(masterKey = masterKey) {
-          change = groupChange(editor = aliceServiceId) {
-            addMember(bobServiceId)
-          }
-        }
-      )
-    ).get().threadId
-
-    val result = sms.collapseJoinRequestEventsIfPossible(
-      threadId,
-      groupUpdateMessage(
-        sender = alice,
-        groupContext = groupContext(masterKey = masterKey) {
-          change = groupChange(editor = aliceServiceId) {
-            deleteRequestingMember(aliceServiceId)
-          }
-        }
-      )
-    )
-
-    assertThat("result is null when not collapsing", result.orElse(null), nullValue())
-  }
-
-  /**
-   * Do nothing if previous join request is from a different recipient.
-   */
-  @Test
-  fun previousJoinRequestFromADifferentRecipient() {
-    val threadId = sms.insertMessageInbox(
-      groupUpdateMessage(
-        sender = bob,
-        groupContext = groupContext(masterKey = masterKey) {
-          change = groupChange(editor = bobServiceId) {
-            deleteRequestingMember(bobServiceId)
-          }
-        }
-      )
-    ).get().threadId
-
-    val result = sms.collapseJoinRequestEventsIfPossible(
-      threadId,
-      groupUpdateMessage(
-        sender = alice,
-        groupContext = groupContext(masterKey = masterKey) {
-          change = groupChange(editor = aliceServiceId) {
-            deleteRequestingMember(aliceServiceId)
-          }
-        }
-      )
-    )
-
-    assertThat("result is null when not collapsing", result.orElse(null), nullValue())
-  }
-
-  /**
-   * Collapse if previous is join request from same.
-   */
-  @Test
-  fun previousJoinRequestCollapse() {
-    val latestMessage: MessageTable.InsertResult = sms.insertMessageInbox(
-      groupUpdateMessage(
-        sender = alice,
-        groupContext = groupContext(masterKey = masterKey) {
-          change = groupChange(editor = aliceServiceId) {
-            addRequestingMember(aliceServiceId)
-          }
-        }
-      )
-    ).get()
-
-    val result = sms.collapseJoinRequestEventsIfPossible(
-      latestMessage.threadId,
-      groupUpdateMessage(
-        sender = alice,
-        groupContext = groupContext(masterKey = masterKey) {
-          change = groupChange(editor = aliceServiceId) {
-            deleteRequestingMember(aliceServiceId)
-          }
-        }
-      )
-    )
-
-    assertThat("result is not null when collapsing", result.orElse(null), notNullValue())
-    assertThat("result message id should be same as latest message", result.get().messageId, `is`(latestMessage.messageId))
-  }
-
-  /**
-   * Collapse if previous is join request from same, and leave second previous alone if text.
-   */
-  @Test
-  fun previousJoinThenTextCollapse() {
-    val secondLatestMessage = sms.insertMessageInbox(smsMessage(sender = alice, body = "What up")).get()
-
-    val latestMessage: MessageTable.InsertResult = sms.insertMessageInbox(
-      groupUpdateMessage(
-        sender = alice,
-        groupContext = groupContext(masterKey = masterKey) {
-          change = groupChange(editor = aliceServiceId) {
-            addRequestingMember(aliceServiceId)
-          }
-        }
-      )
-    ).get()
-
-    assert(secondLatestMessage.threadId == latestMessage.threadId)
-
-    val result = sms.collapseJoinRequestEventsIfPossible(
-      latestMessage.threadId,
-      groupUpdateMessage(
-        sender = alice,
-        groupContext = groupContext(masterKey = masterKey) {
-          change = groupChange(editor = aliceServiceId) {
-            deleteRequestingMember(aliceServiceId)
-          }
-        }
-      )
-    )
-
-    assertThat("result is not null when collapsing", result.orElse(null), notNullValue())
-    assertThat("result message id should be same as latest message", result.get().messageId, `is`(latestMessage.messageId))
-  }
-
-  /**
-   * Collapse "twice" is previous is a join request and second previous is already collapsed join/delete from the same recipient.
-   */
-  @Test
-  fun previousCollapseAndJoinRequestDoubleCollapse() {
-    val secondLatestMessage: MessageTable.InsertResult = sms.insertMessageInbox(
-      groupUpdateMessage(
-        sender = alice,
-        groupContext = groupContext(masterKey = masterKey) {
-          change = groupChange(editor = aliceServiceId) {
-            addRequestingMember(aliceServiceId)
-            deleteRequestingMember(aliceServiceId)
-          }
-        }
-      )
-    ).get()
-
-    val latestMessage: MessageTable.InsertResult = sms.insertMessageInbox(
-      groupUpdateMessage(
-        sender = alice,
-        groupContext = groupContext(masterKey = masterKey) {
-          change = groupChange(editor = aliceServiceId) {
-            addRequestingMember(aliceServiceId)
-          }
-        }
-      )
-    ).get()
-
-    assert(secondLatestMessage.threadId == latestMessage.threadId)
-
-    val result = sms.collapseJoinRequestEventsIfPossible(
-      latestMessage.threadId,
-      groupUpdateMessage(
-        sender = alice,
-        groupContext = groupContext(masterKey = masterKey) {
-          change = groupChange(editor = aliceServiceId) {
-            deleteRequestingMember(aliceServiceId)
-          }
-        }
-      )
-    )
-
-    assertThat("result is not null when collapsing", result.orElse(null), notNullValue())
-    assertThat("result message id should be same as second latest message", result.get().messageId, `is`(secondLatestMessage.messageId))
-    assertThat("latest message should be deleted", sms.getMessageRecordOrNull(latestMessage.messageId), nullValue())
-  }
-
-  private fun smsMessage(sender: RecipientId, body: String? = ""): IncomingTextMessage {
-    wallClock++
-    return IncomingTextMessage(sender, 1, wallClock, wallClock, wallClock, body, Optional.of(groupId), 0, true, null)
-  }
-
-  private fun groupUpdateMessage(sender: RecipientId, groupContext: DecryptedGroupV2Context): IncomingGroupUpdateMessage {
-    return IncomingGroupUpdateMessage(smsMessage(sender, null), groupContext)
-  }
-
-  companion object {
-    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)
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/StorySendTableTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/StorySendTableTest.kt
@@ -1,466 +0,0 @@
-package org.thoughtcrime.securesms.database
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import junit.framework.TestCase.assertNull
-import org.hamcrest.MatcherAssert.assertThat
-import org.hamcrest.Matchers.containsInAnyOrder
-import org.hamcrest.Matchers.hasSize
-import org.hamcrest.Matchers.`is`
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertNotNull
-import org.junit.Assert.assertTrue
-import org.junit.Assert.fail
-import org.junit.Before
-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.whispersystems.signalservice.api.push.DistributionId
-import org.whispersystems.signalservice.api.push.ServiceId
-import java.util.UUID
-
-@RunWith(AndroidJUnit4::class)
-class StorySendTableTest {
-
-  private val distributionId1 = DistributionId.from(UUID.randomUUID())
-  private val distributionId2 = DistributionId.from(UUID.randomUUID())
-  private val distributionId3 = DistributionId.from(UUID.randomUUID())
-
-  private lateinit var distributionList1: DistributionListId
-  private lateinit var distributionList2: DistributionListId
-  private lateinit var distributionList3: DistributionListId
-
-  private lateinit var distributionListRecipient1: Recipient
-  private lateinit var distributionListRecipient2: Recipient
-  private lateinit var distributionListRecipient3: Recipient
-
-  private lateinit var recipients1to10: List<RecipientId>
-  private lateinit var recipients11to20: List<RecipientId>
-  private lateinit var recipients6to15: List<RecipientId>
-  private lateinit var recipients6to10: List<RecipientId>
-
-  private var messageId1: Long = 0
-  private var messageId2: Long = 0
-  private var messageId3: Long = 0
-
-  private lateinit var storySends: StorySendTable
-
-  @Before
-  fun setup() {
-    storySends = SignalDatabase.storySends
-
-    recipients1to10 = makeRecipients(10)
-    recipients11to20 = makeRecipients(10)
-
-    distributionList1 = SignalDatabase.distributionLists.createList("1", emptyList(), distributionId = distributionId1)!!
-    distributionList2 = SignalDatabase.distributionLists.createList("2", emptyList(), distributionId = distributionId2)!!
-    distributionList3 = SignalDatabase.distributionLists.createList("3", emptyList(), distributionId = distributionId3)!!
-
-    distributionListRecipient1 = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromDistributionListId(distributionList1))
-    distributionListRecipient2 = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromDistributionListId(distributionList2))
-    distributionListRecipient3 = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromDistributionListId(distributionList3))
-
-    messageId1 = MmsHelper.insert(
-      recipient = distributionListRecipient1,
-      storyType = StoryType.STORY_WITHOUT_REPLIES,
-    )
-
-    messageId2 = MmsHelper.insert(
-      recipient = distributionListRecipient2,
-      storyType = StoryType.STORY_WITH_REPLIES,
-    )
-
-    messageId3 = MmsHelper.insert(
-      recipient = distributionListRecipient3,
-      storyType = StoryType.STORY_WITHOUT_REPLIES,
-    )
-
-    recipients6to15 = recipients1to10.takeLast(5) + recipients11to20.take(5)
-    recipients6to10 = recipients1to10.takeLast(5)
-  }
-
-  @Test
-  fun getRecipientsToSendTo_noOverlap() {
-    storySends.insert(messageId1, recipients1to10, 100, false, distributionId1)
-    storySends.insert(messageId2, recipients11to20, 200, true, distributionId2)
-    storySends.insert(messageId3, recipients1to10, 300, false, distributionId3)
-
-    val recipientIdsForMessage1 = storySends.getRecipientsToSendTo(messageId1, 100, false)
-    val recipientIdsForMessage2 = storySends.getRecipientsToSendTo(messageId2, 200, true)
-
-    assertThat(recipientIdsForMessage1, hasSize(10))
-    assertThat(recipientIdsForMessage1, containsInAnyOrder(*recipients1to10.toTypedArray()))
-
-    assertThat(recipientIdsForMessage2, hasSize(10))
-    assertThat(recipientIdsForMessage2, containsInAnyOrder(*recipients11to20.toTypedArray()))
-  }
-
-  @Test
-  fun getRecipientsToSendTo_overlap() {
-    storySends.insert(messageId1, recipients1to10, 100, false, distributionId1)
-    storySends.insert(messageId2, recipients6to15, 100, true, distributionId2)
-
-    val recipientIdsForMessage1 = storySends.getRecipientsToSendTo(messageId1, 100, false)
-    val recipientIdsForMessage2 = storySends.getRecipientsToSendTo(messageId2, 100, true)
-
-    assertThat(recipientIdsForMessage1, hasSize(5))
-    assertThat(recipientIdsForMessage1, containsInAnyOrder(*recipients1to10.take(5).toTypedArray()))
-
-    assertThat(recipientIdsForMessage2, hasSize(10))
-    assertThat(recipientIdsForMessage2, containsInAnyOrder(*recipients6to15.toTypedArray()))
-  }
-
-  @Test
-  fun getRecipientsToSendTo_overlapAll() {
-    val recipient1 = recipients1to10.first()
-    val recipient2 = recipients11to20.first()
-
-    storySends.insert(messageId1, listOf(recipient1, recipient2), 100, false, distributionId1)
-    storySends.insert(messageId2, listOf(recipient1), 100, true, distributionId2)
-    storySends.insert(messageId3, listOf(recipient2), 100, true, distributionId3)
-
-    val recipientIdsForMessage1 = storySends.getRecipientsToSendTo(messageId1, 100, false)
-    val recipientIdsForMessage2 = storySends.getRecipientsToSendTo(messageId2, 100, true)
-    val recipientIdsForMessage3 = storySends.getRecipientsToSendTo(messageId3, 100, true)
-
-    assertThat(recipientIdsForMessage1, hasSize(0))
-
-    assertThat(recipientIdsForMessage2, hasSize(1))
-    assertThat(recipientIdsForMessage2, containsInAnyOrder(recipient1))
-
-    assertThat(recipientIdsForMessage3, hasSize(1))
-    assertThat(recipientIdsForMessage3, containsInAnyOrder(recipient2))
-  }
-
-  @Test
-  fun getRecipientsToSendTo_overlapWithEarlierMessage() {
-    storySends.insert(messageId1, recipients6to15, 100, true, distributionId1)
-    storySends.insert(messageId2, recipients1to10, 100, false, distributionId2)
-
-    val recipientIdsForMessage1 = storySends.getRecipientsToSendTo(messageId1, 100, true)
-    val recipientIdsForMessage2 = storySends.getRecipientsToSendTo(messageId2, 100, false)
-
-    assertThat(recipientIdsForMessage1, hasSize(10))
-    assertThat(recipientIdsForMessage1, containsInAnyOrder(*recipients6to15.toTypedArray()))
-
-    assertThat(recipientIdsForMessage2, hasSize(5))
-    assertThat(recipientIdsForMessage2, containsInAnyOrder(*recipients1to10.take(5).toTypedArray()))
-  }
-
-  @Test
-  fun getRemoteDeleteRecipients_noOverlap() {
-    storySends.insert(messageId1, recipients1to10, 100, false, distributionId1)
-    storySends.insert(messageId2, recipients11to20, 200, true, distributionId2)
-    storySends.insert(messageId3, recipients1to10, 300, false, distributionId3)
-
-    val recipientIdsForMessage1 = storySends.getRemoteDeleteRecipients(messageId1, 100)
-    val recipientIdsForMessage2 = storySends.getRemoteDeleteRecipients(messageId2, 200)
-
-    assertThat(recipientIdsForMessage1, hasSize(10))
-    assertThat(recipientIdsForMessage1, containsInAnyOrder(*recipients1to10.toTypedArray()))
-
-    assertThat(recipientIdsForMessage2, hasSize(10))
-    assertThat(recipientIdsForMessage2, containsInAnyOrder(*recipients11to20.toTypedArray()))
-  }
-
-  @Test
-  fun getRemoteDeleteRecipients_overlapNoPreviousDeletes() {
-    storySends.insert(messageId1, recipients1to10, 200, false, distributionId1)
-    storySends.insert(messageId2, recipients6to15, 200, true, distributionId2)
-
-    val recipientIdsForMessage1 = storySends.getRemoteDeleteRecipients(messageId1, 200)
-    val recipientIdsForMessage2 = storySends.getRemoteDeleteRecipients(messageId2, 200)
-
-    assertThat(recipientIdsForMessage1, hasSize(5))
-    assertThat(recipientIdsForMessage1, containsInAnyOrder(*recipients1to10.take(5).toTypedArray()))
-
-    assertThat(recipientIdsForMessage2, hasSize(5))
-    assertThat(recipientIdsForMessage2, containsInAnyOrder(*recipients6to15.takeLast(5).toTypedArray()))
-  }
-
-  @Test
-  fun getRemoteDeleteRecipients_overlapWithPreviousDeletes() {
-    storySends.insert(messageId1, recipients1to10, 200, false, distributionId1)
-    SignalDatabase.messages.markAsRemoteDelete(messageId1)
-
-    storySends.insert(messageId2, recipients6to15, 200, true, distributionId2)
-
-    val recipientIdsForMessage2 = storySends.getRemoteDeleteRecipients(messageId2, 200)
-
-    assertThat(recipientIdsForMessage2, hasSize(10))
-    assertThat(recipientIdsForMessage2, containsInAnyOrder(*recipients6to15.toTypedArray()))
-  }
-
-  @Test
-  fun canReply_storyWithReplies() {
-    storySends.insert(messageId2, recipients1to10, 200, true, distributionId2)
-
-    val canReply = storySends.canReply(recipients1to10[0], 200)
-
-    assertThat(canReply, `is`(true))
-  }
-
-  @Test
-  fun canReply_storyWithoutReplies() {
-    storySends.insert(messageId1, recipients1to10, 200, false, distributionId1)
-
-    val canReply = storySends.canReply(recipients1to10[0], 200)
-
-    assertThat(canReply, `is`(false))
-  }
-
-  @Test
-  fun canReply_storyWithAndWithoutRepliesOverlap() {
-    storySends.insert(messageId1, recipients1to10, 200, false, distributionId1)
-    storySends.insert(messageId2, recipients6to10, 200, true, distributionId2)
-
-    val message1OnlyRecipientCanReply = storySends.canReply(recipients1to10[0], 200)
-    val message2RecipientCanReply = storySends.canReply(recipients6to10[0], 200)
-
-    assertThat(message1OnlyRecipientCanReply, `is`(false))
-    assertThat(message2RecipientCanReply, `is`(true))
-  }
-
-  @Test
-  fun givenASingleStory_whenIGetFullSentStorySyncManifest_thenIExpectNotNull() {
-    storySends.insert(messageId1, recipients1to10, 200, false, distributionId1)
-
-    val manifest = storySends.getFullSentStorySyncManifest(messageId1, 200)
-
-    assertNotNull(manifest)
-  }
-
-  @Test
-  fun givenTwoStories_whenIGetFullSentStorySyncManifestForStory2_thenIExpectNull() {
-    storySends.insert(messageId1, recipients1to10, 200, false, distributionId1)
-    storySends.insert(messageId2, recipients1to10, 200, false, distributionId2)
-
-    val manifest = storySends.getFullSentStorySyncManifest(messageId2, 200)
-
-    assertNull(manifest)
-  }
-
-  @Test
-  fun givenTwoStories_whenIGetFullSentStorySyncManifestForStory1_thenIExpectOneManifestPerRecipient() {
-    storySends.insert(messageId1, recipients1to10, 200, false, distributionId1)
-    storySends.insert(messageId2, recipients1to10, 200, true, distributionId2)
-
-    val manifest = storySends.getFullSentStorySyncManifest(messageId1, 200)!!
-
-    assertEquals(recipients1to10, manifest.entries.map { it.recipientId })
-  }
-
-  @Test
-  fun givenTwoStories_whenIGetFullSentStorySyncManifestForStory1_thenIExpectTwoListsPerRecipient() {
-    storySends.insert(messageId1, recipients1to10, 200, false, distributionId1)
-    storySends.insert(messageId2, recipients1to10, 200, true, distributionId2)
-
-    val manifest = storySends.getFullSentStorySyncManifest(messageId1, 200)!!
-
-    manifest.entries.forEach { entry ->
-      assertEquals(listOf(distributionId1, distributionId2), entry.distributionLists)
-    }
-  }
-
-  @Test
-  fun givenTwoStories_whenIGetFullSentStorySyncManifestForStory1_thenIExpectAllRecipientsCanReply() {
-    storySends.insert(messageId1, recipients1to10, 200, false, distributionId1)
-    storySends.insert(messageId2, recipients1to10, 200, true, distributionId2)
-
-    val manifest = storySends.getFullSentStorySyncManifest(messageId1, 200)!!
-
-    manifest.entries.forEach { entry ->
-      assertTrue(entry.allowedToReply)
-    }
-  }
-
-  @Test
-  fun givenTwoStoriesAndOneIsRemoteDeleted_whenIGetFullSentStorySyncManifestForStory2_thenIExpectNonNullResult() {
-    storySends.insert(messageId1, recipients1to10, 200, false, distributionId1)
-    storySends.insert(messageId2, recipients1to10, 200, true, distributionId2)
-    SignalDatabase.messages.markAsRemoteDelete(messageId1)
-
-    val manifest = storySends.getFullSentStorySyncManifest(messageId2, 200)!!
-
-    assertNotNull(manifest)
-  }
-
-  /*
-  @Test
-  fun givenTwoStoriesAndOneIsRemoteDeleted_whenIGetRecipientIdsForManifestUpdate_thenIExpectOnlyRecipientsWithStory2() {
-    storySends.insert(messageId1, recipients1to10, 200, false, distributionId1)
-    storySends.insert(messageId1, recipients11to20, 200, false, distributionId1)
-    storySends.insert(messageId2, recipients1to10, 200, true, distributionId2)
-    SignalDatabase.messages.markAsRemoteDelete(messageId1)
-
-    val recipientIds = storySends.getRecipientIdsForManifestUpdate(200, messageId1)
-
-    assertEquals(recipients1to10.toHashSet(), recipientIds)
-  }
-
-  @Test
-  fun givenTwoStoriesAndOneIsRemoteDeleted_whenIGetPartialSentStorySyncManifest_thenIExpectOnlyRecipientsThatHadStory1() {
-    storySends.insert(messageId1, recipients1to10, 200, false, distributionId1)
-    storySends.insert(messageId2, recipients1to10, 200, true, distributionId2)
-    storySends.insert(messageId2, recipients11to20, 200, true, distributionId2)
-    SignalDatabase.messages.markAsRemoteDelete(messageId1)
-    val recipientIds = storySends.getRecipientIdsForManifestUpdate(200, messageId1)
-
-    val results = storySends.getSentStorySyncManifestForUpdate(200, recipientIds)
-
-    val manifestRecipients = results.entries.map { it.recipientId }
-    assertEquals(recipients1to10, manifestRecipients)
-  }
-
-  @Test
-  fun givenTwoStoriesAndTheOneThatAllowedRepliesIsRemoteDeleted_whenIGetPartialSentStorySyncManifest_thenIExpectAllowRepliesToBeTrue() {
-    storySends.insert(messageId1, recipients1to10, 200, false, distributionId1)
-    storySends.insert(messageId2, recipients1to10, 200, true, distributionId2)
-    SignalDatabase.messages.markAsRemoteDelete(messageId2)
-    val recipientIds = storySends.getRecipientIdsForManifestUpdate(200, messageId1)
-
-    val results = storySends.getSentStorySyncManifestForUpdate(200, recipientIds)
-
-    assertTrue(results.entries.all { it.allowedToReply })
-  }
-   */
-  @Test
-  fun givenEmptyManifest_whenIApplyRemoteManifest_thenNothingChanges() {
-    storySends.insert(messageId1, recipients1to10, 200, false, distributionId1)
-    val expected = storySends.getFullSentStorySyncManifest(messageId1, 200)
-    val emptyManifest = SentStorySyncManifest(emptyList())
-
-    storySends.applySentStoryManifest(emptyManifest, 200)
-    val result = storySends.getFullSentStorySyncManifest(messageId1, 200)
-
-    assertEquals(expected, result)
-  }
-
-  @Test
-  fun givenAnIdenticalManifest_whenIApplyRemoteManifest_thenNothingChanges() {
-    val messageId4 = MmsHelper.insert(
-      recipient = distributionListRecipient1,
-      storyType = StoryType.STORY_WITHOUT_REPLIES,
-      sentTimeMillis = 200
-    )
-
-    storySends.insert(messageId4, recipients1to10, 200, false, distributionId1)
-    val expected = storySends.getFullSentStorySyncManifest(messageId4, 200)
-
-    storySends.applySentStoryManifest(expected!!, 200)
-    val result = storySends.getFullSentStorySyncManifest(messageId4, 200)
-
-    assertEquals(expected, result)
-  }
-
-  @Test(expected = NoSuchMessageException::class)
-  fun givenAManifest_whenIApplyRemoteManifestWithoutOneList_thenIExpectMessageToBeDeleted() {
-    val messageId4 = MmsHelper.insert(
-      recipient = distributionListRecipient1,
-      storyType = StoryType.STORY_WITHOUT_REPLIES,
-      sentTimeMillis = 200
-    )
-
-    val messageId5 = MmsHelper.insert(
-      recipient = distributionListRecipient2,
-      storyType = StoryType.STORY_WITHOUT_REPLIES,
-      sentTimeMillis = 200
-    )
-
-    storySends.insert(messageId4, recipients1to10, 200, false, distributionId1)
-    val remote = storySends.getFullSentStorySyncManifest(messageId4, 200)!!
-
-    storySends.insert(messageId5, recipients1to10, 200, false, distributionId2)
-
-    storySends.applySentStoryManifest(remote, 200)
-
-    SignalDatabase.messages.getMessageRecord(messageId5)
-    fail("Expected messageId5 to no longer exist.")
-  }
-
-  @Test
-  fun givenAManifest_whenIApplyRemoteManifestWithoutOneList_thenIExpectSharedMessageToNotBeMarkedRemoteDeleted() {
-    val messageId4 = MmsHelper.insert(
-      recipient = distributionListRecipient1,
-      storyType = StoryType.STORY_WITHOUT_REPLIES,
-      sentTimeMillis = 200
-    )
-
-    val messageId5 = MmsHelper.insert(
-      recipient = distributionListRecipient2,
-      storyType = StoryType.STORY_WITHOUT_REPLIES,
-      sentTimeMillis = 200
-    )
-
-    storySends.insert(messageId4, recipients1to10, 200, false, distributionId1)
-    val remote = storySends.getFullSentStorySyncManifest(messageId4, 200)!!
-
-    storySends.insert(messageId5, recipients1to10, 200, false, distributionId2)
-
-    storySends.applySentStoryManifest(remote, 200)
-
-    assertFalse(SignalDatabase.messages.getMessageRecord(messageId4).isRemoteDelete)
-  }
-
-  @Test
-  fun givenNoLocalEntries_whenIApplyRemoteManifest_thenIExpectLocalManifestToMatch() {
-    val messageId4 = MmsHelper.insert(
-      recipient = distributionListRecipient1,
-      storyType = StoryType.STORY_WITHOUT_REPLIES,
-      sentTimeMillis = 2000
-    )
-
-    val remote = SentStorySyncManifest(
-      recipients1to10.map {
-        SentStorySyncManifest.Entry(
-          recipientId = it,
-          allowedToReply = true,
-          distributionLists = listOf(distributionId1)
-        )
-      }
-    )
-
-    storySends.applySentStoryManifest(remote, 2000)
-
-    val local = storySends.getFullSentStorySyncManifest(messageId4, 2000)
-    assertEquals(remote, local)
-  }
-
-  @Test
-  fun givenNonStoryMessageAtSentTimestamp_whenIApplyRemoteManifest_thenIExpectLocalManifestToMatchAndNoCrashes() {
-    val messageId4 = MmsHelper.insert(
-      recipient = distributionListRecipient1,
-      storyType = StoryType.STORY_WITHOUT_REPLIES,
-      sentTimeMillis = 2000
-    )
-
-    MmsHelper.insert(
-      recipient = Recipient.resolved(recipients1to10.first()),
-      sentTimeMillis = 2000
-    )
-
-    val remote = SentStorySyncManifest(
-      recipients1to10.map {
-        SentStorySyncManifest.Entry(
-          recipientId = it,
-          allowedToReply = true,
-          distributionLists = listOf(distributionId1)
-        )
-      }
-    )
-
-    storySends.applySentStoryManifest(remote, 2000)
-
-    val local = storySends.getFullSentStorySyncManifest(messageId4, 2000)
-    assertEquals(remote, local)
-  }
-
-  private fun makeRecipients(count: Int): List<RecipientId> {
-    return (1..count).map {
-      SignalDatabase.recipients.getOrInsertFromServiceId(ServiceId.from(UUID.randomUUID()))
-    }
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadTableTest_pinned.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadTableTest_pinned.kt
@@ -1,75 +0,0 @@
-package org.thoughtcrime.securesms.database
-
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-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
-import java.util.UUID
-
-@Suppress("ClassName")
-class ThreadTableTest_pinned {
-
-  @Rule
-  @JvmField
-  val databaseRule = SignalDatabaseRule()
-
-  private lateinit var recipient: Recipient
-
-  @Before
-  fun setUp() {
-    recipient = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromServiceId(ServiceId.from(UUID.randomUUID())))
-  }
-
-  @Test
-  fun givenAPinnedThread_whenIDeleteTheLastMessage_thenIDoNotDeleteOrUnpinTheThread() {
-    // GIVEN
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
-    val messageId = MmsHelper.insert(recipient = recipient, threadId = threadId)
-    SignalDatabase.threads.pinConversations(listOf(threadId))
-
-    // WHEN
-    SignalDatabase.messages.deleteMessage(messageId)
-
-    // THEN
-    val pinned = SignalDatabase.threads.getPinnedThreadIds()
-    assertTrue(threadId in pinned)
-  }
-
-  @Test
-  fun givenAPinnedThread_whenIDeleteTheLastMessage_thenIExpectTheThreadInUnarchivedCount() {
-    // GIVEN
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
-    val messageId = MmsHelper.insert(recipient = recipient, threadId = threadId)
-    SignalDatabase.threads.pinConversations(listOf(threadId))
-
-    // WHEN
-    SignalDatabase.messages.deleteMessage(messageId)
-
-    // THEN
-    val unarchivedCount = SignalDatabase.threads.getUnarchivedConversationListCount(ConversationFilter.OFF)
-    assertEquals(1, unarchivedCount)
-  }
-
-  @Test
-  fun givenAPinnedThread_whenIDeleteTheLastMessage_thenIExpectPinnedThreadInUnarchivedList() {
-    // GIVEN
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
-    val messageId = MmsHelper.insert(recipient = recipient, threadId = threadId)
-    SignalDatabase.threads.pinConversations(listOf(threadId))
-
-    // WHEN
-    SignalDatabase.messages.deleteMessage(messageId)
-
-    // THEN
-    SignalDatabase.threads.getUnarchivedConversationList(ConversationFilter.OFF, true, 0, 1).use {
-      it.moveToFirst()
-      assertEquals(threadId, CursorUtil.requireLong(it, ThreadTable.ID))
-    }
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadTableTest_recents.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadTableTest_recents.kt
@@ -1,52 +0,0 @@
-package org.thoughtcrime.securesms.database
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.Assert.assertFalse
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.core.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
-import java.util.UUID
-
-@Suppress("ClassName")
-@RunWith(AndroidJUnit4::class)
-class ThreadTableTest_recents {
-
-  @Rule
-  @JvmField
-  val databaseRule = SignalDatabaseRule()
-
-  private lateinit var recipient: Recipient
-
-  @Before
-  fun setUp() {
-    recipient = Recipient.resolved(SignalDatabase.recipients.getOrInsertFromServiceId(ServiceId.from(UUID.randomUUID())))
-  }
-
-  @Test
-  fun givenARecentRecipient_whenIBlockAndGetRecents_thenIDoNotExpectToSeeThatRecipient() {
-    // GIVEN
-    val threadId = SignalDatabase.threads.getOrCreateThreadIdFor(recipient)
-    MmsHelper.insert(recipient = recipient, threadId = threadId)
-    SignalDatabase.threads.update(threadId, true)
-
-    // WHEN
-    SignalDatabase.recipients.setBlocked(recipient.id, true)
-    val results: MutableList<RecipientId> = SignalDatabase.threads.getRecentConversationList(10, false, false, false, false, false, false).use { cursor ->
-      val ids = mutableListOf<RecipientId>()
-      while (cursor.moveToNext()) {
-        ids.add(RecipientId.from(CursorUtil.requireLong(cursor, ThreadTable.RECIPIENT_ID)))
-      }
-
-      ids
-    }
-
-    // THEN
-    assertFalse(recipient.id in results)
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/UriAttachmentBuilder.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/UriAttachmentBuilder.kt
@@ -1,44 +0,0 @@
-package org.thoughtcrime.securesms.database
-
-import android.net.Uri
-import org.thoughtcrime.securesms.attachments.UriAttachment
-import org.thoughtcrime.securesms.audio.AudioHash
-import org.thoughtcrime.securesms.blurhash.BlurHash
-import org.thoughtcrime.securesms.stickers.StickerLocator
-
-object UriAttachmentBuilder {
-  fun build(
-    id: Long,
-    uri: Uri = Uri.parse("content://$id"),
-    contentType: String,
-    transferState: Int = AttachmentTable.TRANSFER_PROGRESS_PENDING,
-    size: Long = 0L,
-    fileName: String = "file$id",
-    voiceNote: Boolean = false,
-    borderless: Boolean = false,
-    videoGif: Boolean = false,
-    quote: Boolean = false,
-    caption: String? = null,
-    stickerLocator: StickerLocator? = null,
-    blurHash: BlurHash? = null,
-    audioHash: AudioHash? = null,
-    transformProperties: AttachmentTable.TransformProperties? = null
-  ): UriAttachment {
-    return UriAttachment(
-      uri,
-      contentType,
-      transferState,
-      size,
-      fileName,
-      voiceNote,
-      borderless,
-      videoGif,
-      quote,
-      caption,
-      stickerLocator,
-      blurHash,
-      audioHash,
-      transformProperties
-    )
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/helpers/migration/MyStoryMigrationTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/helpers/migration/MyStoryMigrationTest.kt
@@ -1,119 +0,0 @@
-package org.thoughtcrime.securesms.database.helpers.migration
-
-import android.app.Application
-import androidx.core.content.contentValuesOf
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Assert.assertEquals
-import org.junit.Assert.fail
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.core.util.SqlUtil
-import org.thoughtcrime.securesms.database.DistributionListTables
-import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.database.model.DistributionListId
-import org.thoughtcrime.securesms.testing.SignalDatabaseRule
-import org.whispersystems.signalservice.api.push.DistributionId
-import java.util.UUID
-
-@RunWith(AndroidJUnit4::class)
-class MyStoryMigrationTest {
-
-  @get:Rule val harness = SignalDatabaseRule(deleteAllThreadsOnEachRun = false)
-
-  @Test
-  fun givenAValidMyStory_whenIMigrate_thenIExpectMyStoryToBeValid() {
-    // GIVEN
-    assertValidMyStoryExists()
-
-    // WHEN
-    runMigration()
-
-    // THEN
-    assertValidMyStoryExists()
-  }
-
-  @Test
-  fun givenNoMyStory_whenIMigrate_thenIExpectMyStoryToBeCreated() {
-    // GIVEN
-    deleteMyStory()
-
-    // WHEN
-    runMigration()
-
-    // THEN
-    assertValidMyStoryExists()
-  }
-
-  @Test
-  fun givenA00000000DistributionIdForMyStory_whenIMigrate_thenIExpectMyStoryToBeCreated() {
-    // GIVEN
-    setMyStoryDistributionId("0000-0000")
-
-    // WHEN
-    runMigration()
-
-    // THEN
-    assertValidMyStoryExists()
-  }
-
-  @Test
-  fun givenARandomDistributionIdForMyStory_whenIMigrate_thenIExpectMyStoryToBeCreated() {
-    // GIVEN
-    setMyStoryDistributionId(UUID.randomUUID().toString())
-
-    // WHEN
-    runMigration()
-
-    // THEN
-    assertValidMyStoryExists()
-  }
-
-  private fun setMyStoryDistributionId(serializedId: String) {
-    SignalDatabase.rawDatabase.update(
-      DistributionListTables.LIST_TABLE_NAME,
-      contentValuesOf(
-        DistributionListTables.DISTRIBUTION_ID to serializedId
-      ),
-      "_id = ?",
-      SqlUtil.buildArgs(DistributionListId.MY_STORY)
-    )
-  }
-
-  private fun deleteMyStory() {
-    SignalDatabase.rawDatabase.delete(
-      DistributionListTables.LIST_TABLE_NAME,
-      "_id = ?",
-      SqlUtil.buildArgs(DistributionListId.MY_STORY)
-    )
-  }
-
-  private fun assertValidMyStoryExists() {
-    SignalDatabase.rawDatabase.query(
-      DistributionListTables.LIST_TABLE_NAME,
-      SqlUtil.COUNT,
-      "_id = ? AND ${DistributionListTables.DISTRIBUTION_ID} = ?",
-      SqlUtil.buildArgs(DistributionListId.MY_STORY, DistributionId.MY_STORY.toString()),
-      null,
-      null,
-      null
-    ).use {
-      if (it.moveToNext()) {
-        val count = it.getInt(0)
-        assertEquals("assertValidMyStoryExists: Query produced an unexpected count.", 1, count)
-      } else {
-        fail("assertValidMyStoryExists: Query did not produce a count.")
-      }
-    }
-  }
-
-  private fun runMigration() {
-    V151_MyStoryMigration.migrate(
-      InstrumentationRegistry.getInstrumentation().targetContext.applicationContext as Application,
-      SignalDatabase.rawDatabase,
-      0,
-      1
-    )
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/dependencies/InstrumentationApplicationDependencyProvider.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/dependencies/InstrumentationApplicationDependencyProvider.kt
@@ -1,119 +0,0 @@
-package org.thoughtcrime.securesms.dependencies
-
-import android.app.Application
-import okhttp3.ConnectionSpec
-import okhttp3.mockwebserver.Dispatcher
-import okhttp3.mockwebserver.MockResponse
-import okhttp3.mockwebserver.MockWebServer
-import okhttp3.mockwebserver.RecordedRequest
-import org.mockito.kotlin.any
-import org.mockito.kotlin.doReturn
-import org.mockito.kotlin.mock
-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.Verb
-import org.thoughtcrime.securesms.testing.runSync
-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 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] and
- * [KeyBackupService].
- */
-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
-
-  init {
-    runSync {
-      webServer = MockWebServer()
-      baseUrl = webServer.url("").toString()
-    }
-
-    webServer.setDispatcher(object : Dispatcher() {
-      override fun dispatch(request: RecordedRequest): MockResponse {
-        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(
-      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))
-      ),
-      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 {
-      on { getConfiguration() } doReturn uncensoredConfiguration
-      on { getConfiguration(any()) } doReturn uncensoredConfiguration
-      on { uncensoredConfiguration } doReturn uncensoredConfiguration
-    }
-
-    keyBackupService = mock()
-
-    recipientCache = LiveRecipientCache(application) { r -> r.run() }
-  }
-
-  override fun provideSignalServiceNetworkAccess(): SignalServiceNetworkAccess {
-    return serviceNetworkAccessMock
-  }
-
-  override fun provideKeyBackupService(signalServiceAccountManager: SignalServiceAccountManager, keyStore: KeyStore, enclave: KbsEnclave): KeyBackupService {
-    return keyBackupService
-  }
-
-  override fun provideRecipientCache(): LiveRecipientCache {
-    return recipientCache
-  }
-
-  companion object {
-    lateinit var webServer: MockWebServer
-      private set
-    lateinit var baseUrl: String
-      private set
-
-    private val handlers: MutableList<Verb> = mutableListOf()
-
-    fun addMockWebRequestHandlers(vararg verbs: Verb) {
-      handlers.addAll(verbs)
-    }
-
-    fun clearHandlers() {
-      handlers.clear()
-    }
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/jobs/PreKeysSyncJobTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/jobs/PreKeysSyncJobTest.kt
@@ -1,212 +0,0 @@
-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
-    }
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/lock/PinHashing_hashPin_Test.java
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/lock/PinHashing_hashPin_Test.java
@@ -1,10 +1,7 @@
 package org.thoughtcrime.securesms.lock;

-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.signal.core.util.Hex;
+import org.thoughtcrime.securesms.util.Hex;
 import org.whispersystems.signalservice.api.kbs.HashedPin;
 import org.whispersystems.signalservice.api.kbs.KbsData;
 import org.whispersystems.signalservice.api.kbs.MasterKey;
@@ -15,7 +12,6 @@ import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;

-@RunWith(AndroidJUnit4.class)
 public final class PinHashing_hashPin_Test {

  @Test
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessorTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessorTest.kt
@@ -1,62 +0,0 @@
-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()
-    }
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessor__handleStoryMessageTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessor__handleStoryMessageTest.kt
@@ -1,181 +0,0 @@
-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!!)
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessor__handleTextMessageTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/messages/MessageContentProcessor__handleTextMessageTest.kt
@@ -1,33 +0,0 @@
-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)
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditFragmentTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/profiles/manage/UsernameEditFragmentTest.kt
@@ -1,141 +0,0 @@
-package org.thoughtcrime.securesms.profiles.manage
-
-import androidx.appcompat.widget.Toolbar
-import androidx.fragment.app.testing.FragmentScenario
-import androidx.fragment.app.testing.launchFragmentInContainer
-import androidx.lifecycle.Lifecycle
-import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions.click
-import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
-import androidx.test.espresso.action.ViewActions.typeText
-import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers
-import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
-import androidx.test.espresso.matcher.ViewMatchers.isEnabled
-import androidx.test.espresso.matcher.ViewMatchers.isNotEnabled
-import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
-import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
-import androidx.test.espresso.matcher.ViewMatchers.withId
-import androidx.test.espresso.matcher.ViewMatchers.withText
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import io.reactivex.rxjava3.schedulers.TestScheduler
-import okhttp3.mockwebserver.MockResponse
-import org.junit.After
-import org.junit.Ignore
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
-import org.thoughtcrime.securesms.testing.Put
-import org.thoughtcrime.securesms.testing.RxTestSchedulerRule
-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.internal.push.ReserveUsernameResponse
-import java.util.concurrent.TimeUnit
-
-@RunWith(AndroidJUnit4::class)
-class UsernameEditFragmentTest {
-
-  @get:Rule
-  val harness = SignalActivityRule(othersCount = 10)
-
-  private val ioScheduler = TestScheduler()
-  private val computationScheduler = TestScheduler()
-
-  @get:Rule
-  val testSchedulerRule = RxTestSchedulerRule(
-    ioTestScheduler = ioScheduler,
-    computationTestScheduler = computationScheduler
-  )
-
-  @After
-  fun tearDown() {
-    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()
-
-    scenario.moveToState(Lifecycle.State.RESUMED)
-
-    onView(withId(R.id.toolbar)).check { view, noViewFoundException ->
-      noViewFoundException.assertIsNull()
-      val toolbar = view as Toolbar
-
-      toolbar.navigationIcon.assertIsNotNull()
-    }
-
-    onView(withText(R.string.UsernameEditFragment_username)).check(matches(isDisplayed()))
-    onView(withContentDescription(R.string.load_more_header__loading)).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.GONE)))
-  }
-
-  @Ignore("Flakey espresso test.")
-  @Test
-  fun testNicknameUpdateHappyPath() {
-    val nickname = "Spiderman"
-    val discriminator = "4578"
-    val username = "$nickname${UsernameState.DELIMITER}$discriminator"
-
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(
-      Put("/v1/accounts/username/reserved") {
-        MockResponse().success(ReserveUsernameResponse(username, "reservationToken"))
-      },
-      Put("/v1/accounts/username/confirm") {
-        MockResponse().success()
-      }
-    )
-
-    val scenario = createScenario(isInRegistration = true)
-    scenario.moveToState(Lifecycle.State.RESUMED)
-
-    onView(withId(R.id.username_text)).perform(typeText(nickname))
-
-    computationScheduler.advanceTimeBy(501, TimeUnit.MILLISECONDS)
-    computationScheduler.triggerActions()
-
-    onView(withContentDescription(R.string.load_more_header__loading)).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
-
-    ioScheduler.triggerActions()
-    computationScheduler.triggerActions()
-
-    onView(withId(R.id.username_text)).perform(closeSoftKeyboard())
-    onView(withId(R.id.username_done_button)).check(matches(isDisplayed()))
-    onView(withId(R.id.username_done_button)).check(matches(isEnabled()))
-    onView(withText(username)).check(matches(isDisplayed()))
-
-    onView(withId(R.id.username_done_button)).perform(click())
-
-    computationScheduler.triggerActions()
-    onView(withId(R.id.username_done_button)).check(matches(isNotEnabled()))
-  }
-
-  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
-    )
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/safety/SafetyNumberBottomSheetRepositoryTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/safety/SafetyNumberBottomSheetRepositoryTest.kt
@@ -1,139 +0,0 @@
-package org.thoughtcrime.securesms.safety
-
-import io.reactivex.rxjava3.plugins.RxJavaPlugins
-import io.reactivex.rxjava3.schedulers.TestScheduler
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.thoughtcrime.securesms.contacts.paged.ContactSearchKey
-import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.testing.SignalActivityRule
-
-class SafetyNumberBottomSheetRepositoryTest {
-
-  @get:Rule val harness = SignalActivityRule(othersCount = 10)
-
-  private val testScheduler = TestScheduler()
-  private val subjectUnderTest = SafetyNumberBottomSheetRepository()
-
-  @Before
-  fun setUp() {
-    RxJavaPlugins.setInitIoSchedulerHandler { testScheduler }
-    RxJavaPlugins.setIoSchedulerHandler { testScheduler }
-  }
-
-  @Test
-  fun givenIOnlyHave1to1Destinations_whenIGetBuckets_thenIOnlyHaveContactsBucketContainingAllRecipients() {
-    val recipients = harness.others
-    val destinations = harness.others.map { ContactSearchKey.RecipientSearchKey(it, false) }
-
-    val result = subjectUnderTest.getBuckets(recipients, destinations).test()
-
-    testScheduler.triggerActions()
-
-    result.assertValueAt(0) { map ->
-      assertMatch(map, mapOf(SafetyNumberBucket.ContactsBucket to harness.others))
-    }
-  }
-
-  @Test
-  fun givenIOnlyHaveASingle1to1Destination_whenIGetBuckets_thenIOnlyHaveContactsBucketContainingAllRecipients() {
-    // GIVEN
-    val recipients = harness.others
-    val destination = harness.others.take(1).map { ContactSearchKey.RecipientSearchKey(it, false) }
-
-    // WHEN
-    val result = subjectUnderTest.getBuckets(recipients, destination).test(1)
-    testScheduler.triggerActions()
-
-    // THEN
-    result.assertValue { map ->
-      assertMatch(map, mapOf(SafetyNumberBucket.ContactsBucket to harness.others.take(1)))
-    }
-  }
-
-  @Test
-  fun givenIHaveADistributionListDestination_whenIGetBuckets_thenIOnlyHaveDistributionListDestinationWithCorrespondingMembers() {
-    // GIVEN
-    val distributionListMembers = harness.others.take(5)
-    val distributionList = SignalDatabase.distributionLists.createList("ListA", distributionListMembers)!!
-    val destinationKey = ContactSearchKey.RecipientSearchKey(SignalDatabase.distributionLists.getRecipientId(distributionList)!!, true)
-
-    // WHEN
-    val result = subjectUnderTest.getBuckets(harness.others, listOf(destinationKey)).test(1)
-    testScheduler.triggerActions()
-
-    // THEN
-    result.assertValue { map ->
-      assertMatch(
-        map,
-        mapOf(
-          SafetyNumberBucket.DistributionListBucket(distributionList, "ListA") to harness.others.take(5)
-        )
-      )
-    }
-  }
-
-  @Test
-  fun givenIHaveADistributionListDestinationAndIGetBuckets_whenIRemoveFromStories_thenIOnlyHaveDistributionListDestinationWithCorrespondingMembers() {
-    // GIVEN
-    val distributionListMembers = harness.others.take(5)
-    val toRemove = distributionListMembers.last()
-    val distributionList = SignalDatabase.distributionLists.createList("ListA", distributionListMembers)!!
-    val destinationKey = ContactSearchKey.RecipientSearchKey(SignalDatabase.distributionLists.getRecipientId(distributionList)!!, true)
-    val testSubscriber = subjectUnderTest.getBuckets(distributionListMembers, listOf(destinationKey)).test(2)
-    testScheduler.triggerActions()
-
-    // WHEN
-    subjectUnderTest.removeFromStories(toRemove, listOf(destinationKey)).subscribe()
-    testSubscriber.request(1)
-    testScheduler.triggerActions()
-    testSubscriber.awaitCount(3)
-
-    // THEN
-    testSubscriber.assertValueAt(2) { map ->
-      assertMatch(
-        map,
-        mapOf(
-          SafetyNumberBucket.DistributionListBucket(distributionList, "ListA") to distributionListMembers.dropLast(1)
-        )
-      )
-    }
-  }
-
-  @Test
-  fun givenIHaveADistributionListDestinationAndIGetBuckets_whenIRemoveAllFromStory_thenINoLongerHaveEntryForThatBucket() {
-    // GIVEN
-    val distributionListMembers = harness.others.take(5)
-    val distributionList = SignalDatabase.distributionLists.createList("ListA", distributionListMembers)!!
-    val destinationKey = ContactSearchKey.RecipientSearchKey(SignalDatabase.distributionLists.getRecipientId(distributionList)!!, true)
-    val testSubscriber = subjectUnderTest.getBuckets(distributionListMembers, listOf(destinationKey)).test(2)
-    testScheduler.triggerActions()
-
-    // WHEN
-    subjectUnderTest.removeAllFromStory(distributionListMembers, distributionList).subscribe()
-    testSubscriber.request(1)
-    testScheduler.triggerActions()
-    testSubscriber.awaitCount(3)
-
-    // THEN
-    testSubscriber.assertValueAt(2) { map ->
-      assertMatch(map, mapOf())
-    }
-  }
-
-  private fun assertMatch(
-    resultMap: Map<SafetyNumberBucket, List<SafetyNumberRecipient>>,
-    idMap: Map<SafetyNumberBucket, List<RecipientId>>
-  ): Boolean {
-    assertEquals("Result and ID Maps had different key sets", idMap.keys, resultMap.keys)
-
-    resultMap.forEach { (bucket, members) ->
-      assertEquals("Mismatch in Bucket $bucket", idMap[bucket], members.map { it.recipient.id })
-    }
-
-    return true
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/MockProvider.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/MockProvider.kt
@@ -1,114 +0,0 @@
-package org.thoughtcrime.securesms.testing
-
-import io.reactivex.rxjava3.core.Single
-import org.mockito.kotlin.any
-import org.mockito.kotlin.doReturn
-import org.mockito.kotlin.mock
-import org.mockito.kotlin.stub
-import org.signal.core.util.Hex
-import org.signal.libsignal.protocol.IdentityKeyPair
-import org.signal.libsignal.protocol.ecc.Curve
-import org.signal.libsignal.protocol.state.PreKeyRecord
-import org.signal.libsignal.protocol.util.KeyHelper
-import org.signal.libsignal.protocol.util.Medium
-import org.thoughtcrime.securesms.crypto.PreKeyUtil
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.pin.KbsRepository
-import org.thoughtcrime.securesms.pin.TokenData
-import org.thoughtcrime.securesms.test.BuildConfig
-import org.whispersystems.signalservice.api.KbsPinData
-import org.whispersystems.signalservice.api.KeyBackupService
-import org.whispersystems.signalservice.api.kbs.HashedPin
-import org.whispersystems.signalservice.api.kbs.MasterKey
-import org.whispersystems.signalservice.api.messages.multidevice.DeviceInfo
-import org.whispersystems.signalservice.api.push.ServiceId
-import org.whispersystems.signalservice.api.push.SignedPreKeyEntity
-import org.whispersystems.signalservice.internal.ServiceResponse
-import org.whispersystems.signalservice.internal.contacts.entities.TokenResponse
-import org.whispersystems.signalservice.internal.push.AuthCredentials
-import org.whispersystems.signalservice.internal.push.DeviceInfoList
-import org.whispersystems.signalservice.internal.push.PreKeyEntity
-import org.whispersystems.signalservice.internal.push.PreKeyResponse
-import org.whispersystems.signalservice.internal.push.PreKeyResponseItem
-import org.whispersystems.signalservice.internal.push.PushServiceSocket
-import org.whispersystems.signalservice.internal.push.SenderCertificate
-import org.whispersystems.signalservice.internal.push.VerifyAccountResponse
-import org.whispersystems.signalservice.internal.push.WhoAmIResponse
-import java.security.SecureRandom
-
-/**
- * Warehouse of reusable test data and mock configurations.
- */
-object MockProvider {
-
-  val senderCertificate = SenderCertificate().apply { certificate = ByteArray(0) }
-
-  val lockedFailure = PushServiceSocket.RegistrationLockFailure().apply {
-    backupCredentials = AuthCredentials.create("username", "password")
-  }
-
-  val primaryOnlyDeviceList = DeviceInfoList().apply {
-    devices = listOf(
-      DeviceInfo().apply {
-        id = 1
-      }
-    )
-  }
-
-  fun createVerifyAccountResponse(aci: ServiceId, newPni: ServiceId): VerifyAccountResponse {
-    return VerifyAccountResponse().apply {
-      uuid = aci.toString()
-      pni = newPni.toString()
-      storageCapable = false
-    }
-  }
-
-  fun createWhoAmIResponse(aci: ServiceId, pni: ServiceId, e164: String): WhoAmIResponse {
-    return WhoAmIResponse().apply {
-      this.uuid = aci.toString()
-      this.pni = pni.toString()
-      this.number = e164
-    }
-  }
-
-  fun mockGetRegistrationLockStringFlow(kbsRepository: KbsRepository) {
-    val tokenData: TokenData = mock {
-      on { enclave } doReturn BuildConfig.KBS_ENCLAVE
-      on { basicAuth } doReturn "basicAuth"
-      on { triesRemaining } doReturn 10
-      on { tokenResponse } doReturn TokenResponse()
-    }
-
-    kbsRepository.stub {
-      on { getToken(any() as? String) } doReturn Single.just(ServiceResponse.forResult(tokenData, 200, ""))
-    }
-
-    val session: KeyBackupService.RestoreSession = object : KeyBackupService.RestoreSession {
-      override fun hashSalt(): ByteArray = Hex.fromStringCondensed("cba811749042b303a6a7efa5ccd160aea5e3ea243c8d2692bd13d515732f51a8")
-      override fun restorePin(hashedPin: HashedPin?): KbsPinData = KbsPinData(MasterKey.createNew(SecureRandom()), null)
-    }
-
-    val kbsService = ApplicationDependencies.getKeyBackupService(BuildConfig.KBS_ENCLAVE)
-    kbsService.stub {
-      on { newRegistrationSession(any(), any()) } doReturn session
-    }
-  }
-
-  fun createPreKeyResponse(identity: IdentityKeyPair = SignalStore.account().aciIdentityKey, deviceId: Int): PreKeyResponse {
-    val signedPreKeyRecord = PreKeyUtil.generateSignedPreKey(SecureRandom().nextInt(Medium.MAX_VALUE), identity.privateKey)
-    val oneTimePreKey = PreKeyRecord(SecureRandom().nextInt(Medium.MAX_VALUE), Curve.generateKeyPair())
-
-    val device = PreKeyResponseItem().apply {
-      this.deviceId = deviceId
-      registrationId = KeyHelper.generateRegistrationId(false)
-      signedPreKey = SignedPreKeyEntity(signedPreKeyRecord.id, signedPreKeyRecord.keyPair.publicKey, signedPreKeyRecord.signature)
-      preKey = PreKeyEntity(oneTimePreKey.id, oneTimePreKey.keyPair.publicKey)
-    }
-
-    return PreKeyResponse().apply {
-      identityKey = identity.publicKey
-      devices = listOf(device)
-    }
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/ResponseMocking.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/ResponseMocking.kt
@@ -1,48 +0,0 @@
-package org.thoughtcrime.securesms.testing
-
-import okhttp3.mockwebserver.MockResponse
-import okhttp3.mockwebserver.RecordedRequest
-import okhttp3.mockwebserver.SocketPolicy
-import org.thoughtcrime.securesms.util.JsonUtils
-import java.util.concurrent.TimeUnit
-
-typealias ResponseFactory = (request: RecordedRequest) -> MockResponse
-
-/**
- * Represent an HTTP verb for mocking web requests.
- */
-sealed class Verb(val verb: String, val path: String, val responseFactory: ResponseFactory)
-
-class Get(path: String, responseFactory: ResponseFactory) : Verb("GET", path, responseFactory)
-
-class Put(path: String, responseFactory: ResponseFactory) : Verb("PUT", path, responseFactory)
-
-fun MockResponse.success(response: Any? = null): MockResponse {
-  return setResponseCode(200).apply {
-    if (response != null) {
-      setBody(JsonUtils.toJson(response))
-    }
-  }
-}
-
-fun MockResponse.failure(code: Int, response: Any? = null): MockResponse {
-  return setResponseCode(code).apply {
-    if (response != null) {
-      setBody(JsonUtils.toJson(response))
-    }
-  }
-}
-
-fun MockResponse.connectionFailure(): MockResponse {
-  return setSocketPolicy(SocketPolicy.DISCONNECT_AT_START)
-}
-
-fun MockResponse.timeout(): MockResponse {
-  return setHeadersDelay(1, TimeUnit.DAYS)
-    .setBodyDelay(1, TimeUnit.DAYS)
-}
-
-inline fun <reified T> RecordedRequest.parsedRequestBody(): T {
-  val bodyString = String(body.readByteArray())
-  return JsonUtils.fromJson(bodyString, T::class.java)
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/RxTestSchedulerRule.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/RxTestSchedulerRule.kt
@@ -1,36 +0,0 @@
-package org.thoughtcrime.securesms.testing
-
-import io.reactivex.rxjava3.plugins.RxJavaPlugins
-import io.reactivex.rxjava3.schedulers.TestScheduler
-import org.junit.rules.ExternalResource
-
-/**
- * JUnit Rule which initialises Rx thread schedulers. If a specific
- * scheduler is not specified, it defaults to the `defaultTestScheduler`
- */
-class RxTestSchedulerRule(
-  val defaultTestScheduler: TestScheduler = TestScheduler(),
-  val ioTestScheduler: TestScheduler = defaultTestScheduler,
-  val computationTestScheduler: TestScheduler = defaultTestScheduler,
-  val singleTestScheduler: TestScheduler = defaultTestScheduler,
-  val newThreadTestScheduler: TestScheduler = defaultTestScheduler,
-) : ExternalResource() {
-
-  override fun before() {
-    RxJavaPlugins.setInitIoSchedulerHandler { ioTestScheduler }
-    RxJavaPlugins.setIoSchedulerHandler { ioTestScheduler }
-
-    RxJavaPlugins.setInitComputationSchedulerHandler { computationTestScheduler }
-    RxJavaPlugins.setComputationSchedulerHandler { computationTestScheduler }
-
-    RxJavaPlugins.setInitSingleSchedulerHandler { singleTestScheduler }
-    RxJavaPlugins.setSingleSchedulerHandler { singleTestScheduler }
-
-    RxJavaPlugins.setInitNewThreadSchedulerHandler { newThreadTestScheduler }
-    RxJavaPlugins.setNewThreadSchedulerHandler { newThreadTestScheduler }
-  }
-
-  override fun after() {
-    RxJavaPlugins.reset()
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalActivityRule.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalActivityRule.kt
@@ -1,137 +0,0 @@
-package org.thoughtcrime.securesms.testing
-
-import android.app.Activity
-import android.app.Application
-import android.content.Context
-import android.content.Intent
-import android.content.SharedPreferences
-import android.preference.PreferenceManager
-import androidx.test.core.app.ActivityScenario
-import androidx.test.platform.app.InstrumentationRegistry
-import okhttp3.mockwebserver.MockResponse
-import org.junit.rules.ExternalResource
-import org.signal.libsignal.protocol.IdentityKey
-import org.signal.libsignal.protocol.SignalProtocolAddress
-import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
-import org.thoughtcrime.securesms.crypto.MasterSecretUtil
-import org.thoughtcrime.securesms.crypto.ProfileKeyUtil
-import org.thoughtcrime.securesms.database.IdentityTable
-import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.dependencies.InstrumentationApplicationDependencyProvider
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.net.DeviceTransferBlockingInterceptor
-import org.thoughtcrime.securesms.profiles.ProfileName
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.registration.RegistrationData
-import org.thoughtcrime.securesms.registration.RegistrationRepository
-import org.thoughtcrime.securesms.registration.RegistrationUtil
-import org.thoughtcrime.securesms.registration.VerifyResponse
-import org.thoughtcrime.securesms.util.Util
-import org.whispersystems.signalservice.api.profiles.SignalServiceProfile
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.SignalServiceAddress
-import org.whispersystems.signalservice.internal.ServiceResponse
-import org.whispersystems.signalservice.internal.ServiceResponseProcessor
-import org.whispersystems.signalservice.internal.push.VerifyAccountResponse
-import java.lang.IllegalArgumentException
-import java.util.UUID
-
-/**
- * Test rule to use that sets up the application in a mostly registered state. Enough so that most
- * activities should be launchable directly.
- *
- * To use: `@get:Rule val harness = SignalActivityRule()`
- */
-class SignalActivityRule(private val othersCount: Int = 4) : ExternalResource() {
-
-  val application: Application = ApplicationDependencies.getApplication()
-
-  lateinit var context: Context
-    private set
-  lateinit var self: Recipient
-    private set
-  lateinit var others: List<RecipientId>
-    private set
-
-  override fun before() {
-    context = InstrumentationRegistry.getInstrumentation().targetContext
-    self = setupSelf()
-    others = setupOthers()
-
-    InstrumentationApplicationDependencyProvider.clearHandlers()
-  }
-
-  private fun setupSelf(): Recipient {
-    DeviceTransferBlockingInterceptor.getInstance().blockNetwork()
-
-    PreferenceManager.getDefaultSharedPreferences(application).edit().putBoolean("pref_prompted_push_registration", true).commit()
-    val masterSecret = MasterSecretUtil.generateMasterSecret(application, MasterSecretUtil.UNENCRYPTED_PASSPHRASE)
-    MasterSecretUtil.generateAsymmetricMasterSecret(application, masterSecret)
-    val preferences: SharedPreferences = application.getSharedPreferences(MasterSecretUtil.PREFERENCES_NAME, 0)
-    preferences.edit().putBoolean("passphrase_initialized", true).commit()
-
-    val registrationRepository = RegistrationRepository(application)
-
-    InstrumentationApplicationDependencyProvider.addMockWebRequestHandlers(Put("/v2/keys") { MockResponse().success() })
-    val response: ServiceResponse<VerifyResponse> = registrationRepository.registerAccount(
-      RegistrationData(
-        code = "123123",
-        e164 = "+15555550101",
-        password = Util.getSecret(18),
-        registrationId = registrationRepository.registrationId,
-        profileKey = registrationRepository.getProfileKey("+15555550101"),
-        fcmToken = null,
-        pniRegistrationId = registrationRepository.pniRegistrationId
-      ),
-      VerifyResponse(VerifyAccountResponse(UUID.randomUUID().toString(), UUID.randomUUID().toString(), false), null, null)
-    ).blockingGet()
-
-    ServiceResponseProcessor.DefaultProcessor(response).resultOrThrow
-
-    SignalStore.kbsValues().optOut()
-    RegistrationUtil.maybeMarkRegistrationComplete(application)
-    SignalDatabase.recipients.setProfileName(Recipient.self().id, ProfileName.fromParts("Tester", "McTesterson"))
-
-    return Recipient.self()
-  }
-
-  private fun setupOthers(): List<RecipientId> {
-    val others = mutableListOf<RecipientId>()
-
-    if (othersCount !in 0 until 1000) {
-      throw IllegalArgumentException("$othersCount must be between 0 and 1000")
-    }
-
-    for (i in 0 until othersCount) {
-      val aci = ACI.from(UUID.randomUUID())
-      val recipientId = RecipientId.from(SignalServiceAddress(aci, "+15555551%03d".format(i)))
-      SignalDatabase.recipients.setProfileName(recipientId, ProfileName.fromParts("Buddy", "#$i"))
-      SignalDatabase.recipients.setProfileKeyIfAbsent(recipientId, ProfileKeyUtil.createNew())
-      SignalDatabase.recipients.setCapabilities(recipientId, SignalServiceProfile.Capabilities(true, true, true, true, true, true, true, true, true))
-      SignalDatabase.recipients.setProfileSharing(recipientId, true)
-      SignalDatabase.recipients.markRegistered(recipientId, aci)
-      ApplicationDependencies.getProtocolStore().aci().saveIdentity(SignalProtocolAddress(aci.toString(), 0), IdentityKeyUtil.generateIdentityKeyPair().publicKey)
-      others += recipientId
-    }
-
-    return others
-  }
-
-  inline fun <reified T : Activity> launchActivity(initIntent: Intent.() -> Unit = {}): ActivityScenario<T> {
-    return androidx.test.core.app.launchActivity(Intent(context, T::class.java).apply(initIntent))
-  }
-
-  fun changeIdentityKey(recipient: Recipient, identityKey: IdentityKey = IdentityKeyUtil.generateIdentityKeyPair().publicKey) {
-    ApplicationDependencies.getProtocolStore().aci().saveIdentity(SignalProtocolAddress(recipient.requireServiceId().toString(), 0), identityKey)
-  }
-
-  fun getIdentity(recipient: Recipient): IdentityKey {
-    return ApplicationDependencies.getProtocolStore().aci().identities().getIdentity(SignalProtocolAddress(recipient.requireServiceId().toString(), 0))
-  }
-
-  fun setVerified(recipient: Recipient, status: IdentityTable.VerifiedStatus) {
-    ApplicationDependencies.getProtocolStore().aci().identities().setVerified(recipient.id, getIdentity(recipient), IdentityTable.VerifiedStatus.VERIFIED)
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalDatabaseRule.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalDatabaseRule.kt
@@ -1,40 +0,0 @@
-package org.thoughtcrime.securesms.testing
-
-import org.junit.rules.TestWatcher
-import org.junit.runner.Description
-import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.PNI
-import java.util.UUID
-
-/**
- * Sets up bare-minimum to allow writing unit tests against the database,
- * including setting up the local ACI and PNI pair.
- *
- * @param deleteAllThreadsOnEachRun Run deleteAllThreads between each unit test
- */
-class SignalDatabaseRule(
-  private val deleteAllThreadsOnEachRun: Boolean = true
-) : TestWatcher() {
-
-  val localAci: ACI = ACI.from(UUID.randomUUID())
-  val localPni: PNI = PNI.from(UUID.randomUUID())
-
-  override fun starting(description: Description?) {
-    deleteAllThreads()
-
-    SignalStore.account().setAci(localAci)
-    SignalStore.account().setPni(localPni)
-  }
-
-  override fun finished(description: Description?) {
-    deleteAllThreads()
-  }
-
-  private fun deleteAllThreads() {
-    if (deleteAllThreadsOnEachRun) {
-      SignalDatabase.messages.deleteAllThreads()
-    }
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalTestRunner.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalTestRunner.kt
@@ -1,16 +0,0 @@
-package org.thoughtcrime.securesms.testing
-
-import android.app.Application
-import android.content.Context
-import androidx.test.runner.AndroidJUnitRunner
-import org.thoughtcrime.securesms.SignalInstrumentationApplicationContext
-
-/**
- * Custom runner that replaces application with [SignalInstrumentationApplicationContext].
- */
-@Suppress("unused")
-class SignalTestRunner : AndroidJUnitRunner() {
-  override fun newApplication(cl: ClassLoader?, className: String?, context: Context?): Application {
-    return super.newApplication(cl, SignalInstrumentationApplicationContext::class.java.name, context)
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/TestProtos.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/TestProtos.kt
@@ -1,70 +0,0 @@
-package org.thoughtcrime.securesms.testing
-
-import com.google.protobuf.ByteString
-import org.signal.libsignal.zkgroup.groups.GroupMasterKey
-import org.whispersystems.signalservice.api.push.ServiceId
-import org.whispersystems.signalservice.internal.push.SignalServiceProtos
-import org.whispersystems.signalservice.internal.push.SignalServiceProtos.DataMessage
-import org.whispersystems.signalservice.internal.push.SignalServiceProtos.GroupContextV2
-import org.whispersystems.signalservice.internal.serialize.protos.AddressProto
-import org.whispersystems.signalservice.internal.serialize.protos.MetadataProto
-import org.whispersystems.signalservice.internal.serialize.protos.SignalServiceContentProto
-import java.util.UUID
-import kotlin.random.Random
-
-class TestProtos private constructor() {
-  fun address(
-    uuid: UUID = UUID.randomUUID()
-  ): AddressProto.Builder {
-    return AddressProto.newBuilder()
-      .setUuid(ServiceId.from(uuid).toByteString())
-  }
-
-  fun metadata(
-    address: AddressProto = address().build(),
-  ): MetadataProto.Builder {
-    return MetadataProto.newBuilder()
-      .setAddress(address)
-  }
-
-  fun groupContextV2(
-    revision: Int = 0,
-    masterKeyBytes: ByteArray = Random.Default.nextBytes(GroupMasterKey.SIZE)
-  ): GroupContextV2.Builder {
-    return GroupContextV2.newBuilder()
-      .setRevision(revision)
-      .setMasterKey(ByteString.copyFrom(masterKeyBytes))
-  }
-
-  fun storyContext(
-    sentTimestamp: Long = Random.nextLong(),
-    authorUuid: String = UUID.randomUUID().toString()
-  ): DataMessage.StoryContext.Builder {
-    return DataMessage.StoryContext.newBuilder()
-      .setAuthorUuid(authorUuid)
-      .setSentTimestamp(sentTimestamp)
-  }
-
-  fun dataMessage(): DataMessage.Builder {
-    return DataMessage.newBuilder()
-  }
-
-  fun content(): SignalServiceProtos.Content.Builder {
-    return SignalServiceProtos.Content.newBuilder()
-  }
-
-  fun serviceContent(
-    localAddress: AddressProto = address().build(),
-    metadata: MetadataProto = metadata().build()
-  ): SignalServiceContentProto.Builder {
-    return SignalServiceContentProto.newBuilder()
-      .setLocalAddress(localAddress)
-      .setMetadata(metadata)
-  }
-
-  companion object {
-    fun <T> build(buildFn: TestProtos.() -> T): T {
-      return TestProtos().buildFn()
-    }
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/TestUtils.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/TestUtils.kt
@@ -1,46 +0,0 @@
-package org.thoughtcrime.securesms.testing
-
-import org.hamcrest.MatcherAssert.assertThat
-import org.hamcrest.Matchers.hasSize
-import org.hamcrest.Matchers.`is`
-import org.hamcrest.Matchers.not
-import org.hamcrest.Matchers.notNullValue
-import org.hamcrest.Matchers.nullValue
-import java.util.concurrent.CountDownLatch
-
-/**
- * Run the given [runnable] on a new thread and wait for it to finish.
- */
-fun runSync(runnable: () -> Unit) {
-  val lock = CountDownLatch(1)
-  Thread {
-    try {
-      runnable.invoke()
-    } finally {
-      lock.countDown()
-    }
-  }.start()
-  lock.await()
-}
-
-/* Various kotlin-ifications of hamcrest matchers */
-
-fun <T : Any?> T.assertIsNull() {
-  assertThat(this, nullValue())
-}
-
-fun <T : Any?> T.assertIsNotNull() {
-  assertThat(this, notNullValue())
-}
-
-infix fun <T : Any> T.assertIs(expected: T) {
-  assertThat(this, `is`(expected))
-}
-
-infix fun <T : Any> T.assertIsNot(expected: T) {
-  assertThat(this, not(`is`(expected)))
-}
-
-infix fun <E, T : Collection<E>> T.assertIsSize(expected: Int) {
-  assertThat(this, hasSize(expected))
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/util/FeatureFlagsAccessor.java
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/util/FeatureFlagsAccessor.java
@@ -1,11 +0,0 @@
-package org.thoughtcrime.securesms.util;
-
-/**
- * A class that allows us to inject feature flags during tests.
- */
-public final class FeatureFlagsAccessor {
-
-  public static void forceValue(String key, Object value) {
-    FeatureFlags.FORCED_VALUES.put(FeatureFlags.PHONE_NUMBER_PRIVACY, true);
-  }
-}
--- a/app/src/flipper/AndroidManifest.xml
+++ b/app/src/flipper/AndroidManifest.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
+          package="org.thoughtcrime.securesms">
+
+    <application
+        android:name=".FlipperApplicationContext"
+        tools:replace="android:name">
+
+        <activity
+            android:name="com.facebook.flipper.android.diagnostics.FlipperDiagnosticActivity"
+            android:exported="true" />
+
+    </application>
+
+</manifest>
--- a/app/src/flipper/java/org/thoughtcrime/securesms/FlipperApplicationContext.java
+++ b/app/src/flipper/java/org/thoughtcrime/securesms/FlipperApplicationContext.java
@@ -0,0 +1,27 @@
+package org.thoughtcrime.securesms;
+
+import com.facebook.flipper.android.AndroidFlipperClient;
+import com.facebook.flipper.core.FlipperClient;
+import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin;
+import com.facebook.flipper.plugins.inspector.DescriptorMapping;
+import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
+import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
+import com.facebook.soloader.SoLoader;
+
+import org.thoughtcrime.securesms.database.FlipperSqlCipherAdapter;
+
+public class FlipperApplicationContext extends ApplicationContext {
+
+  @Override
+  public void onCreate() {
+    super.onCreate();
+
+    SoLoader.init(this, false);
+
+    FlipperClient client = AndroidFlipperClient.getInstance(this);
+    client.addPlugin(new InspectorFlipperPlugin(this, DescriptorMapping.withDefaults()));
+    client.addPlugin(new DatabasesFlipperPlugin(new FlipperSqlCipherAdapter(this)));
+    client.addPlugin(new SharedPreferencesFlipperPlugin(this));
+    client.start();
+  }
+}
--- a/app/src/flipper/java/org/thoughtcrime/securesms/database/FlipperSqlCipherAdapter.java
+++ b/app/src/flipper/java/org/thoughtcrime/securesms/database/FlipperSqlCipherAdapter.java
@@ -0,0 +1,257 @@
+package org.thoughtcrime.securesms.database;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.facebook.flipper.plugins.databases.DatabaseDescriptor;
+import com.facebook.flipper.plugins.databases.DatabaseDriver;
+
+import net.sqlcipher.DatabaseUtils;
+import net.sqlcipher.database.SQLiteDatabase;
+import net.sqlcipher.database.SQLiteStatement;
+
+import org.signal.core.util.logging.Log;
+import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * A lot of this code is taken from {@link com.facebook.flipper.plugins.databases.impl.SqliteDatabaseDriver}
+ * and made to work with SqlCipher. Unfortunately I couldn't use it directly, nor subclass it.
+ */
+public class FlipperSqlCipherAdapter extends DatabaseDriver<FlipperSqlCipherAdapter.Descriptor> {
+
+  private static final String TAG = Log.tag(FlipperSqlCipherAdapter.class);
+
+  public FlipperSqlCipherAdapter(Context context) {
+    super(context);
+  }
+
+  @Override
+  public List<Descriptor> getDatabases() {
+    try {
+      Field databaseHelperField = DatabaseFactory.class.getDeclaredField("databaseHelper");
+      databaseHelperField.setAccessible(true);
+      SQLCipherOpenHelper sqlCipherOpenHelper = (SQLCipherOpenHelper) databaseHelperField.get(DatabaseFactory.getInstance(getContext()));
+      return Collections.singletonList(new Descriptor(sqlCipherOpenHelper));
+    } catch (Exception e) {
+      Log.i(TAG, "Unable to use reflection to access raw database.", e);
+    }
+    return Collections.emptyList();
+  }
+
+  @Override
+  public List<String> getTableNames(Descriptor descriptor) {
+    SQLiteDatabase db         = descriptor.getReadable();
+    List<String>   tableNames = new ArrayList<>();
+
+    try (Cursor cursor = db.rawQuery("SELECT name FROM sqlite_master WHERE type IN (?, ?)", new String[] { "table", "view" })) {
+      while (cursor != null && cursor.moveToNext()) {
+        tableNames.add(cursor.getString(0));
+      }
+    }
+
+    return tableNames;
+  }
+
+  @Override
+  public DatabaseGetTableDataResponse getTableData(Descriptor descriptor, String table, String order, boolean reverse, int start, int count) {
+    SQLiteDatabase db = descriptor.getReadable();
+
+    long   total   = DatabaseUtils.queryNumEntries(db, table);
+    String orderBy = order != null ? order + (reverse ? " DESC" : " ASC") : null;
+    String limitBy = start + ", " + count;
+
+    try (Cursor cursor = db.query(table, null, null, null, null, null, orderBy, limitBy)) {
+      String[]           columnNames = cursor.getColumnNames();
+      List<List<Object>> rows        = cursorToList(cursor);
+
+      return new DatabaseGetTableDataResponse(Arrays.asList(columnNames), rows, start, rows.size(), total);
+    }
+  }
+
+  @Override
+  public DatabaseGetTableStructureResponse getTableStructure(Descriptor descriptor, String table) {
+    SQLiteDatabase db = descriptor.getReadable();
+
+    Map<String, String> foreignKeyValues = new HashMap<>();
+
+    try(Cursor cursor = db.rawQuery("PRAGMA foreign_key_list(" + table + ")", null)) {
+      while (cursor != null && cursor.moveToNext()) {
+        String from      = cursor.getString(cursor.getColumnIndex("from"));
+        String to        = cursor.getString(cursor.getColumnIndex("to"));
+        String tableName = cursor.getString(cursor.getColumnIndex("table")) + "(" + to + ")";
+
+        foreignKeyValues.put(from, tableName);
+      }
+    }
+
+
+    List<String>        structureColumns = Arrays.asList("column_name", "data_type", "nullable", "default", "primary_key", "foreign_key");
+    List<List<Object>>  structureValues = new ArrayList<>();
+
+    try (Cursor cursor = db.rawQuery("PRAGMA table_info(" + table + ")", null)) {
+      while (cursor != null && cursor.moveToNext()) {
+        String columnName = cursor.getString(cursor.getColumnIndex("name"));
+        String foreignKey = foreignKeyValues.containsKey(columnName) ? foreignKeyValues.get(columnName) : null;
+
+        structureValues.add(Arrays.asList(columnName,
+                                          cursor.getString(cursor.getColumnIndex("type")),
+                                          cursor.getInt(cursor.getColumnIndex("notnull")) == 0,
+                                          getObjectFromColumnIndex(cursor, cursor.getColumnIndex("dflt_value")),
+                                          cursor.getInt(cursor.getColumnIndex("pk")) == 1,
+                                          foreignKey));
+      }
+    }
+
+
+    List<String>       indexesColumns = Arrays.asList("index_name", "unique", "indexed_column_name");
+    List<List<Object>> indexesValues  = new ArrayList<>();
+
+    try (Cursor indexesCursor = db.rawQuery("PRAGMA index_list(" + table + ")", null)) {
+      List<String> indexedColumnNames = new ArrayList<>();
+      String       indexName          = indexesCursor.getString(indexesCursor.getColumnIndex("name"));
+
+      try(Cursor indexInfoCursor = db.rawQuery("PRAGMA index_info(" + indexName + ")", null)) {
+        while (indexInfoCursor.moveToNext()) {
+          indexedColumnNames.add(indexInfoCursor.getString(indexInfoCursor.getColumnIndex("name")));
+        }
+      }
+
+      indexesValues.add(Arrays.asList(indexName,
+                                      indexesCursor.getInt(indexesCursor.getColumnIndex("unique")) == 1,
+                                      TextUtils.join(",", indexedColumnNames)));
+
+    }
+
+    return new DatabaseGetTableStructureResponse(structureColumns, structureValues, indexesColumns, indexesValues);
+  }
+
+  @Override
+  public DatabaseGetTableInfoResponse getTableInfo(Descriptor databaseDescriptor, String table) {
+    SQLiteDatabase db = databaseDescriptor.getReadable();
+
+    try (Cursor cursor = db.rawQuery("SELECT sql FROM sqlite_master WHERE name = ?", new String[] { table })) {
+      cursor.moveToFirst();
+      return new DatabaseGetTableInfoResponse(cursor.getString(cursor.getColumnIndex("sql")));
+    }
+  }
+
+  @Override
+  public DatabaseExecuteSqlResponse executeSQL(Descriptor descriptor, String query) {
+    SQLiteDatabase db = descriptor.getWritable();
+
+    String firstWordUpperCase = getFirstWord(query).toUpperCase();
+
+    switch (firstWordUpperCase) {
+      case "UPDATE":
+      case "DELETE":
+        return executeUpdateDelete(db, query);
+      case "INSERT":
+        return executeInsert(db, query);
+      case "SELECT":
+      case "PRAGMA":
+      case "EXPLAIN":
+        return executeSelect(db, query);
+      default:
+        return executeRawQuery(db, query);
+    }
+  }
+
+  private static String getFirstWord(String s) {
+    s = s.trim();
+    int firstSpace = s.indexOf(' ');
+    return firstSpace >= 0 ? s.substring(0, firstSpace) : s;
+  }
+
+  private static DatabaseExecuteSqlResponse executeUpdateDelete(SQLiteDatabase database, String query) {
+    SQLiteStatement statement = database.compileStatement(query);
+    int             count     = statement.executeUpdateDelete();
+
+    return DatabaseExecuteSqlResponse.successfulUpdateDelete(count);
+  }
+
+  private static DatabaseExecuteSqlResponse executeInsert(SQLiteDatabase database, String query) {
+    SQLiteStatement statement  = database.compileStatement(query);
+    long            insertedId = statement.executeInsert();
+
+    return DatabaseExecuteSqlResponse.successfulInsert(insertedId);
+  }
+
+  private static DatabaseExecuteSqlResponse executeSelect(SQLiteDatabase database, String query) {
+    try (Cursor cursor = database.rawQuery(query, null)) {
+      String[]           columnNames = cursor.getColumnNames();
+      List<List<Object>> rows        = cursorToList(cursor);
+
+      return DatabaseExecuteSqlResponse.successfulSelect(Arrays.asList(columnNames), rows);
+    }
+  }
+
+  private static DatabaseExecuteSqlResponse executeRawQuery(SQLiteDatabase database, String query) {
+    database.execSQL(query);
+    return DatabaseExecuteSqlResponse.successfulRawQuery();
+  }
+
+  private static @NonNull List<List<Object>> cursorToList(Cursor cursor) {
+    List<List<Object>> rows       = new ArrayList<>();
+    int                numColumns = cursor.getColumnCount();
+
+    while (cursor.moveToNext()) {
+      List<Object> values = new ArrayList<>(numColumns);
+
+      for (int column = 0; column < numColumns; column++) {
+        values.add(getObjectFromColumnIndex(cursor, column));
+      }
+
+      rows.add(values);
+    }
+    return rows;
+  }
+
+  private static @Nullable Object getObjectFromColumnIndex(Cursor cursor, int column) {
+    switch (cursor.getType(column)) {
+      case Cursor.FIELD_TYPE_NULL:
+        return null;
+      case Cursor.FIELD_TYPE_INTEGER:
+        return cursor.getLong(column);
+      case Cursor.FIELD_TYPE_FLOAT:
+        return cursor.getDouble(column);
+      case Cursor.FIELD_TYPE_BLOB:
+        return cursor.getBlob(column);
+      case Cursor.FIELD_TYPE_STRING:
+      default:
+        return cursor.getString(column);
+    }
+  }
+
+  static class Descriptor implements DatabaseDescriptor {
+    private final SQLCipherOpenHelper sqlCipherOpenHelper;
+
+    Descriptor(@NonNull SQLCipherOpenHelper sqlCipherOpenHelper) {
+      this.sqlCipherOpenHelper = sqlCipherOpenHelper;
+    }
+
+    @Override
+    public String name() {
+      return sqlCipherOpenHelper.getDatabaseName();
+    }
+
+    public @NonNull SQLiteDatabase getReadable() {
+      return sqlCipherOpenHelper.getReadableDatabase().getSqlCipherDatabase();
+    }
+
+    public @NonNull SQLiteDatabase getWritable() {
+      return sqlCipherOpenHelper.getWritableDatabase().getSqlCipherDatabase();
+    }
+  }
+}
--- a/app/src/instrumentation/AndroidManifest.xml
+++ b/app/src/instrumentation/AndroidManifest.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          package="org.thoughtcrime.securesms">
-
-    <application
-        android:usesCleartextTraffic="true"
-        tools:replace="android:usesCleartextTraffic"
-        tools:ignore="UnusedAttribute" />
-
-</manifest>
--- a/app/src/instrumentation/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/instrumentation/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/signal_accent_green"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
--- a/app/src/instrumentation/res/values/strings.xml
+++ b/app/src/instrumentation/res/values/strings.xml
@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="app_name">Signal (Instrumentation)</string>
-</resources>
--- a/app/src/internal/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/internal/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/core_red_shade"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,6 +22,7 @@
    <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
    <uses-permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"/>
    <uses-permission android:name="android.permission.READ_PROFILE"/>
+    <uses-permission android:name="android.permission.WRITE_PROFILE"/>
    <uses-permission android:name="android.permission.BROADCAST_WAP_PUSH"
                     tools:ignore="ProtectedPermissions"/>
    <uses-permission android:name="android.permission.READ_CONTACTS"/>
@@ -63,6 +64,7 @@
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>

    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />

    <!-- So we can add a TextSecure 'Account' -->
    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
@@ -90,31 +92,18 @@
    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>

-    <uses-permission android:name="android.permission.MANAGE_OWN_CALLS"/>
-
-    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
-
    <application android:name=".ApplicationContext"
                 android:icon="@mipmap/ic_launcher"
                 android:label="@string/app_name"
                 android:supportsRtl="true"
-                 android:resizeableActivity="true"
-                 android:fullBackupOnly="false"
-                 android:allowBackup="true"
-                 android:backupAgent=".absbackup.SignalBackupAgent"
+                 tools:replace="android:allowBackup"
+                 android:allowBackup="false"
                 android:theme="@style/TextSecure.LightTheme"
                 android:largeHeap="true">

-    <meta-data
-            android:name="com.google.android.gms.wallet.api.enabled"
-            android:value="true" />
-
    <meta-data
            android:name="com.google.android.geo.API_KEY"
-            android:value="${mapsKey}"/>
-
-    <meta-data android:name="android.supports_size_changes"
-               android:value="true" />
+            android:value="AIzaSyCSx9xea86GwDKGznCAULE9Y5a8b-TfN9U"/>

    <meta-data android:name="com.google.android.gms.version"
               android:value="@integer/google_play_services_version" />
@@ -129,15 +118,16 @@
    <activity android:name=".WebRtcCallActivity"
              android:theme="@style/TextSecure.DarkTheme.WebRTCCall"
              android:excludeFromRecents="true"
+              android:screenOrientation="portrait"
              android:supportsPictureInPicture="true"
              android:windowSoftInputMode="stateAlwaysHidden"
              android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
              android:taskAffinity=".calling"
-              android:resizeableActivity="true"
              android:launchMode="singleTask"/>

    <activity android:name=".messagerequests.CalleeMustAcceptMessageRequestActivity"
              android:theme="@style/TextSecure.DarkNoActionBar"
+              android:screenOrientation="portrait"
              android:noHistory="true"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

@@ -157,36 +147,24 @@
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

    <activity android:name=".DeviceProvisioningActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:exported="true">
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
        <intent-filter>
            <action android:name="android.intent.action.VIEW" />
            <category android:name="android.intent.category.DEFAULT" />
            <category android:name="android.intent.category.BROWSABLE" />
            <data android:scheme="tsdevice"/>
        </intent-filter>
-
-        <intent-filter>
-            <action android:name="android.intent.action.VIEW" />
-            <category android:name="android.intent.category.DEFAULT" />
-            <category android:name="android.intent.category.BROWSABLE" />
-            <data android:scheme="sgnl"
-                  android:host="linkdevice"/>
-        </intent-filter>
    </activity>

    <activity android:name=".preferences.MmsPreferencesActivity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

-    <activity android:name=".sharing.interstitial.ShareInterstitialActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:windowSoftInputMode="adjustResize" />
-
-    <activity android:name=".sharing.v2.ShareActivity"
+    <activity android:name=".sharing.ShareActivity"
              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:exported="true"
              android:excludeFromRecents="true"
+              android:launchMode="singleTask"
              android:taskAffinity=""
+              android:noHistory="true"
              android:windowSoftInputMode="stateHidden"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
        <intent-filter>
@@ -210,25 +188,24 @@

      <meta-data
          android:name="android.service.chooser.chooser_target_service"
-                android:value="androidx.sharetarget.ChooserTargetServiceCompat" />
+                android:value=".service.DirectShareService" />

    </activity>

    <activity android:name=".stickers.StickerPackPreviewActivity"
-              android:exported="true"
              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
              android:launchMode="singleTask"
              android:noHistory="true"
              android:windowSoftInputMode="stateHidden"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
        <intent-filter>
-            <action android:name="android.intent.action.VIEW" android:exported="true" />
+            <action android:name="android.intent.action.VIEW" />
            <category android:name="android.intent.category.DEFAULT" />
            <category android:name="android.intent.category.BROWSABLE" />
            <data android:scheme="sgnl"
                  android:host="addstickers" />
        </intent-filter>
-        <intent-filter android:autoVerify="true">
+        <intent-filter>
            <action android:name="android.intent.action.VIEW" />
            <category android:name="android.intent.category.DEFAULT" />
            <category android:name="android.intent.category.BROWSABLE" />
@@ -248,22 +225,7 @@
            <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
        </intent-filter>

-        <meta-data android:name="com.sec.minimode.icon.portrait.normal"
-                   android:resource="@mipmap/ic_launcher" />
-        <meta-data android:name="com.sec.minimode.icon.landscape.normal"
-                   android:resource="@mipmap/ic_launcher" />
-
-        <meta-data android:name="android.app.shortcuts"
-                   android:resource="@xml/shortcuts" />
-
-    </activity-alias>
-
-    <activity android:name=".deeplinks.DeepLinkEntryActivity"
-              android:exported="true"
-              android:noHistory="true"
-              android:theme="@style/Signal.Transparent">
-
-        <intent-filter android:autoVerify="true">
+        <intent-filter>
            <action android:name="android.intent.action.VIEW" />
            <category android:name="android.intent.category.DEFAULT" />
            <category android:name="android.intent.category.BROWSABLE" />
@@ -280,26 +242,12 @@
                  android:host="signal.group"/>
        </intent-filter>

-        <intent-filter android:autoVerify="true">
-            <action android:name="android.intent.action.VIEW" />
-            <category android:name="android.intent.category.DEFAULT" />
-            <category android:name="android.intent.category.BROWSABLE" />
-            <data android:scheme="https"
-                  android:host="signal.tube" />
-            <data android:scheme="sgnl"
-                  android:host="signal.tube" />
-        </intent-filter>
+        <meta-data android:name="com.sec.minimode.icon.portrait.normal"
+                   android:resource="@mipmap/ic_launcher" />
+        <meta-data android:name="com.sec.minimode.icon.landscape.normal"
+                   android:resource="@mipmap/ic_launcher" />

-        <intent-filter android:autoVerify="true">
-            <action android:name="android.intent.action.VIEW" />
-            <category android:name="android.intent.category.DEFAULT" />
-            <category android:name="android.intent.category.BROWSABLE" />
-            <data android:scheme="https"
-                android:host="signal.me" />
-            <data android:scheme="sgnl"
-                android:host="signal.me" />
-        </intent-filter>
-    </activity>
+    </activity-alias>

    <activity android:name=".conversation.ConversationActivity"
              android:windowSoftInputMode="stateUnchanged"
@@ -316,6 +264,8 @@
              android:allowEmbedded="true"
              android:resizeableActivity="true" />

+    <activity android:name=".longmessage.LongMessageActivity" />
+
    <activity android:name=".conversation.ConversationPopupActivity"
              android:windowSoftInputMode="stateVisible"
              android:launchMode="singleTask"
@@ -324,17 +274,30 @@
              android:theme="@style/TextSecure.LightTheme.Popup"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />

+    <activity android:name=".messagedetails.MessageDetailsActivity"
+              android:windowSoftInputMode="stateHidden"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
    <activity android:name=".groups.ui.invitesandrequests.ManagePendingAndRequestingMembersActivity"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />

-    <activity android:name=".recipients.ui.disappearingmessages.RecipientDisappearingMessagesActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:theme="@style/Signal.DayNight.NoActionBar"
-              android:windowSoftInputMode="adjustResize"/>
+    <activity android:name=".groups.ui.managegroup.ManageGroupActivity"
+              android:windowSoftInputMode="stateAlwaysHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".recipients.ui.managerecipient.ManageRecipientActivity"
+              android:windowSoftInputMode="stateAlwaysHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".DatabaseMigrationActivity"
+              android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

    <activity android:name=".migrations.ApplicationMigrationActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
+              android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar"
              android:launchMode="singleTask"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

@@ -365,108 +328,31 @@
              android:windowSoftInputMode="stateHidden"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

-        <activity android:name=".mediasend.v2.MediaSelectionActivity"
-            android:theme="@style/TextSecure.DarkNoActionBar"
-            android:windowSoftInputMode="stateAlwaysHidden|adjustNothing"
-            android:launchMode="singleTop"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-        <activity android:name=".conversation.mutiselect.forward.MultiselectForwardActivity"
-            android:theme="@style/Signal.DayNight.NoActionBar"
-            android:windowSoftInputMode="stateAlwaysHidden|adjustNothing"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
-
-        <activity android:name=".mediasend.v2.stories.StoriesMultiselectForwardActivity"
-            android:theme="@style/Signal.DayNight.NoActionBar"
-            android:windowSoftInputMode="stateAlwaysHidden|adjustNothing"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
+    <activity android:name=".mediasend.MediaSendActivity"
+              android:theme="@style/TextSecure.FullScreenMedia"
+              android:windowSoftInputMode="stateHidden"
+              android:launchMode="singleTop"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

    <activity android:name=".PassphraseChangeActivity"
              android:label="@string/AndroidManifest__change_passphrase"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

-    <activity android:name=".verify.VerifyIdentityActivity"
-              android:exported="false"
-              android:theme="@style/Signal.DayNight.NoActionBar"
+    <activity android:name=".VerifyIdentityActivity"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

-    <activity android:name=".components.settings.app.AppSettingsActivity"
-              android:exported="true"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:theme="@style/Signal.DayNight.NoActionBar"
-              android:windowSoftInputMode="adjustResize">
+    <activity android:name=".ApplicationPreferencesActivity"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
        <intent-filter>
            <action android:name="android.intent.action.MAIN" />
            <category android:name="android.intent.category.NOTIFICATION_PREFERENCES" />
        </intent-filter>
    </activity>

-    <activity
-        android:name=".stories.my.MyStoriesActivity"
-        android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-        android:theme="@style/Signal.DayNight.NoActionBar"
-        android:windowSoftInputMode="stateAlwaysHidden" />
-
-    <activity
-        android:name=".stories.settings.StorySettingsActivity"
-        android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-        android:theme="@style/Signal.DayNight.NoActionBar"
-        android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
-
-    <activity
-        android:name=".stories.viewer.StoryViewerActivity"
-        android:screenOrientation="portrait"
-        android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-        android:theme="@style/TextSecure.DarkNoActionBar.StoryViewer"
-        android:launchMode="singleTask"
-        android:windowSoftInputMode="stateAlwaysHidden|adjustNothing"
-        android:parentActivityName=".MainActivity">
-
-        <meta-data
-            android:name="android.support.PARENT_ACTIVITY"
-            android:value="org.thoughtcrime.securesms.MainActivity" />
-    </activity>
-
-        <activity android:name=".components.settings.app.changenumber.ChangeNumberLockActivity"
-            android:theme="@style/Signal.DayNight.NoActionBar"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-        <activity android:name=".components.settings.conversation.ConversationSettingsActivity"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|screenLayout|screenSize"
-            android:theme="@style/Signal.DayNight.ConversationSettings"
-            android:windowSoftInputMode="stateAlwaysHidden">
-        </activity>
-
-        <activity android:name=".badges.gifts.flow.GiftFlowActivity"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|screenLayout|screenSize"
-            android:theme="@style/Signal.DayNight.NoActionBar"
-            android:windowSoftInputMode="stateAlwaysHidden">
-        </activity>
-
-        <activity android:name=".wallpaper.ChatWallpaperActivity"
-                  android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-                  android:windowSoftInputMode="stateAlwaysHidden">
-        </activity>
-
-        <activity android:name=".wallpaper.ChatWallpaperPreviewActivity"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:windowSoftInputMode="stateAlwaysHidden">
-        </activity>
-
-        <activity android:name=".devicetransfer.olddevice.OldDeviceTransferActivity"
-            android:theme="@style/TextSecure.LightRegistrationTheme"
-            android:launchMode="singleTask"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-        <activity android:name=".devicetransfer.olddevice.OldDeviceExitActivity"
-            android:noHistory="true"
-            android:excludeFromRecents="true"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
    <activity android:name=".registration.RegistrationNavigationActivity"
              android:launchMode="singleTask"
              android:theme="@style/TextSecure.LightRegistrationTheme"
-              android:windowSoftInputMode="stateHidden"
+              android:windowSoftInputMode="stateUnchanged"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

    <activity android:name=".revealable.ViewOnceMessageActivity"
@@ -483,7 +369,6 @@
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

     <activity android:name=".DeviceActivity"
-               android:screenOrientation="portrait"
               android:label="@string/AndroidManifest__linked_devices"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

@@ -491,12 +376,10 @@
              android:windowSoftInputMode="stateHidden"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

-    <activity android:name=".mediapreview.MediaPreviewV2Activity"
+    <activity android:name=".MediaPreviewActivity"
              android:label="@string/AndroidManifest__media_preview"
              android:windowSoftInputMode="stateHidden"
              android:launchMode="singleTask"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:exported="false"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

    <activity android:name=".AvatarPreviewActivity"
@@ -521,11 +404,10 @@
              android:finishOnTaskLaunch="true" />

    <activity android:name=".PlayServicesProblemActivity"
-              android:exported="false"
              android:theme="@style/TextSecure.DialogActivity"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

-    <activity android:name=".SmsSendtoActivity" android:exported="true">
+    <activity android:name=".SmsSendtoActivity">
        <intent-filter>
            <action android:name="android.intent.action.SENDTO" />
            <action android:name="android.intent.action.VIEW" />
@@ -544,9 +426,7 @@
    </activity>

    <activity android:name="org.thoughtcrime.securesms.webrtc.VoiceCallShare"
-              android:exported="true"
              android:excludeFromRecents="true"
-              android:permission="android.permission.CALL_PHONE"
              android:theme="@style/NoAnimation.Theme.BlackScreen"
              android:launchMode="singleTask"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
@@ -560,34 +440,21 @@
    </activity>

    <activity android:name=".mediasend.AvatarSelectionActivity"
-              android:theme="@style/TextSecure.DarkNoActionBar"
+              android:theme="@style/TextSecure.FullScreenMedia"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

    <activity android:name=".blocked.BlockedUsersActivity"
              android:theme="@style/TextSecure.LightTheme"
-              android:windowSoftInputMode="stateHidden"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

    <activity android:name=".scribbles.ImageEditorStickerSelectActivity"
-              android:theme="@style/Signal.DayNight.NoActionBar"
+              android:theme="@style/TextSecure.DarkTheme"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

    <activity android:name=".profiles.edit.EditProfileActivity"
              android:theme="@style/TextSecure.LightRegistrationTheme"
              android:windowSoftInputMode="stateVisible|adjustResize" />

-    <activity android:name=".profiles.username.AddAUsernameActivity"
-              android:theme="@style/Signal.DayNight.NoActionBar"
-              android:windowSoftInputMode="stateVisible|adjustResize" />
-
-    <activity android:name=".profiles.manage.ManageProfileActivity"
-              android:theme="@style/TextSecure.LightTheme"
-              android:windowSoftInputMode="stateVisible|adjustResize" />
-
-    <activity android:name=".payments.preferences.PaymentsActivity"
-            android:theme="@style/TextSecure.LightRegistrationTheme"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
    <activity android:name=".lock.v2.CreateKbsPinActivity"
            android:theme="@style/TextSecure.LightRegistrationTheme"
            android:windowSoftInputMode="adjustResize"
@@ -637,6 +504,7 @@

    <activity android:name=".MainActivity"
              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
+              android:launchMode="singleTask"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />

    <activity android:name=".pin.PinRestoreActivity"
@@ -663,58 +531,18 @@
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
              android:launchMode="singleTask" />

-    <activity android:name=".megaphone.SmsExportMegaphoneActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:screenOrientation="portrait"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
-              android:launchMode="singleTask" />
-
-    <activity android:name=".ratelimit.RecaptchaProofActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode" />
-
-    <activity android:name=".wallpaper.crop.WallpaperImageSelectionActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:theme="@style/TextSecure.DarkNoActionBar" />
-
-    <activity android:name=".wallpaper.crop.WallpaperCropActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:screenOrientation="portrait"
-              android:theme="@style/Theme.Signal.WallpaperCropper" />
-
-    <activity android:name=".reactions.edit.EditReactionsActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".exporter.flow.SmsExportActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:launchMode="singleTask"
-              android:screenOrientation="portrait"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".components.settings.app.subscription.donate.DonateToSignalActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <service android:enabled="true" android:name=".exporter.SignalSmsExportService" android:foregroundServiceType="dataSync" />
-    <service android:enabled="true" android:name=".service.webrtc.WebRtcCallService" android:foregroundServiceType="camera|microphone"/>
+    <service android:enabled="true" android:name=".service.WebRtcCallService"/>
+    <service android:enabled="true" android:name=".service.ApplicationMigrationService"/>
    <service android:enabled="true" android:exported="false" android:name=".service.KeyCachingService"/>
    <service android:enabled="true" android:name=".messages.IncomingMessageObserver$ForegroundService"/>
-    <service android:name=".service.webrtc.AndroidCallConnectionService"
-        android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE"
-        android:exported="true">
-        <intent-filter>
-            <action android:name="android.telecom.ConnectionService" />
-        </intent-filter>
-    </service>

-    <service android:name=".components.voice.VoiceNotePlaybackService" android:exported="true">
+    <service android:name=".components.voice.VoiceNotePlaybackService">
        <intent-filter>
            <action android:name="android.media.browse.MediaBrowserService" />
        </intent-filter>
    </service>

-    <receiver android:name="androidx.media.session.MediaButtonReceiver" android:exported="true">
+    <receiver android:name="androidx.media.session.MediaButtonReceiver" >
        <intent-filter>
            <action android:name="android.intent.action.MEDIA_BUTTON" />
        </intent-filter>
@@ -748,13 +576,18 @@
        <meta-data android:name="android.provider.CONTACTS_STRUCTURE" android:resource="@xml/contactsformat" />
    </service>

+    <service android:name=".service.DirectShareService"
+             android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
+        <intent-filter>
+            <action android:name="android.service.chooser.ChooserTargetService" />
+        </intent-filter>
+    </service>
+
    <service android:name=".service.GenericForegroundService"/>

-    <service android:name=".gcm.FcmFetchBackgroundService" />
+    <service android:name=".gcm.FcmFetchService" />

-    <service android:name=".gcm.FcmFetchForegroundService" />
-
-    <service android:name=".gcm.FcmReceiveService" android:exported="true">
+    <service android:name=".gcm.FcmReceiveService">
        <intent-filter>
            <action android:name="com.google.firebase.MESSAGING_EVENT" />
        </intent-filter>
@@ -809,20 +642,26 @@
        </intent-filter>
    </receiver>

-    <receiver android:name=".service.ExpirationListener" />
+    <receiver android:name=".notifications.AndroidAutoHeardReceiver"
+              android:exported="false">
+        <intent-filter>
+          <action android:name="org.thoughtcrime.securesms.notifications.ANDROID_AUTO_HEARD"/>
+        </intent-filter>
+    </receiver>

-    <receiver android:name=".service.ExpiringStoriesManager$ExpireStoriesAlarm" />
+    <receiver android:name=".notifications.AndroidAutoReplyReceiver"
+              android:exported="false">
+        <intent-filter>
+          <action android:name="org.thoughtcrime.securesms.notifications.ANDROID_AUTO_REPLY"/>
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".service.ExpirationListener" />

    <receiver android:name=".revealable.ViewOnceMessageManager$ViewOnceAlarm" />

-    <receiver android:name=".service.ScheduledMessageManager$ScheduledMessagesAlarm" />
-
-    <receiver android:name=".service.PendingRetryReceiptManager$PendingRetryReceiptAlarm" />
-
    <receiver android:name=".service.TrimThreadsByDateManager$TrimThreadsByDateAlarm" />

-    <receiver android:name=".payments.backup.phrase.ClearClipboardAlarmReceiver" />
-
    <provider android:name=".providers.PartProvider"
              android:grantUriPermissions="true"
              android:exported="false"
@@ -847,53 +686,64 @@

    </provider>

-    <receiver android:name=".service.BootReceiver" android:exported="false">
+    <provider android:name=".database.DatabaseContentProviders$Conversation"
+              android:authorities="${applicationId}.database.conversation"
+              android:exported="false" />
+
+    <provider android:name=".database.DatabaseContentProviders$ConversationList"
+              android:authorities="${applicationId}.database.conversationlist"
+              android:exported="false" />
+
+    <provider android:name=".database.DatabaseContentProviders$Attachment"
+              android:authorities="${applicationId}.database.attachment"
+              android:exported="false" />
+
+    <provider android:name=".database.DatabaseContentProviders$Sticker"
+              android:authorities="${applicationId}.database.sticker"
+              android:exported="false" />
+
+    <provider android:name=".database.DatabaseContentProviders$StickerPack"
+              android:authorities="${applicationId}.database.stickerpack"
+              android:exported="false" />
+
+    <receiver android:name=".service.BootReceiver">
        <intent-filter>
            <action android:name="android.intent.action.BOOT_COMPLETED"/>
            <action android:name="org.thoughtcrime.securesms.RESTART"/>
        </intent-filter>
    </receiver>

-    <receiver android:name=".service.DirectoryRefreshListener" android:exported="false">
+    <receiver android:name=".service.DirectoryRefreshListener">
        <intent-filter>
            <action android:name="android.intent.action.BOOT_COMPLETED" />
        </intent-filter>
    </receiver>

-    <receiver android:name=".service.RotateSignedPreKeyListener" android:exported="false">
+    <receiver android:name=".service.RotateSignedPreKeyListener">
        <intent-filter>
            <action android:name="android.intent.action.BOOT_COMPLETED" />
        </intent-filter>
    </receiver>

-    <receiver android:name=".service.RotateSenderCertificateListener" android:exported="false">
+    <receiver android:name=".service.RotateSenderCertificateListener">
        <intent-filter>
            <action android:name="android.intent.action.BOOT_COMPLETED" />
        </intent-filter>
    </receiver>

-    <receiver android:name=".messageprocessingalarm.MessageProcessReceiver" android:exported="false">
-        <intent-filter>
-            <action android:name="android.intent.action.BOOT_COMPLETED" />
-            <action android:name="org.thoughtcrime.securesms.action.PROCESS_MESSAGES" />
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".service.LocalBackupListener" android:exported="false">
+    <receiver android:name=".service.LocalBackupListener">
        <intent-filter>
            <action android:name="android.intent.action.BOOT_COMPLETED" />
        </intent-filter>
    </receiver>

-    <receiver android:name="org.thoughtcrime.securesms.jobs.ForegroundServiceUtil$Receiver" android:exported="false" />
-
-    <receiver android:name=".service.PersistentConnectionBootListener" android:exported="false">
+    <receiver android:name=".service.PersistentConnectionBootListener">
        <intent-filter>
            <action android:name="android.intent.action.BOOT_COMPLETED"/>
        </intent-filter>
    </receiver>

-    <receiver android:name=".notifications.LocaleChangedReceiver" android:exported="false">
+    <receiver android:name=".notifications.LocaleChangedReceiver">
        <intent-filter>
            <action android:name="android.intent.action.LOCALE_CHANGED"/>
        </intent-filter>
@@ -901,7 +751,7 @@

    <receiver android:name=".notifications.MessageNotifier$ReminderReceiver"/>

-    <receiver android:name=".notifications.DeleteNotificationReceiver" android:exported="false">
+    <receiver android:name=".notifications.DeleteNotificationReceiver">
        <intent-filter>
            <action android:name="org.thoughtcrime.securesms.DELETE_NOTIFICATION"/>
        </intent-filter>
@@ -929,19 +779,16 @@

    <service
        android:name=".jobmanager.KeepAliveService"
-        android:enabled="@bool/enable_alarm_manager"
-        android:exported="false"/>
+        android:enabled="@bool/enable_alarm_manager" />

    <receiver
        android:name=".jobmanager.AlarmManagerScheduler$RetryReceiver"
-        android:enabled="@bool/enable_alarm_manager"
-        android:exported="false"/>
+        android:enabled="@bool/enable_alarm_manager" />

    <!-- Probably don't need this one -->
    <receiver
        android:name=".jobmanager.BootReceiver"
-        android:enabled="true"
-        android:exported="false">
+        android:enabled="true">
        <intent-filter>
            <action android:name="android.intent.action.BOOT_COMPLETED" />
        </intent-filter>
--- a/app/src/main/assets/emoji/Activity.webp
+++ b/app/src/main/assets/emoji/Activity.webp
--- a/app/src/main/assets/emoji/Flags_0.webp
+++ b/app/src/main/assets/emoji/Flags_0.webp
--- a/app/src/main/assets/emoji/Flags_1.webp
+++ b/app/src/main/assets/emoji/Flags_1.webp
--- a/app/src/main/assets/emoji/Foods.webp
+++ b/app/src/main/assets/emoji/Foods.webp
--- a/app/src/main/assets/emoji/Nature.webp
+++ b/app/src/main/assets/emoji/Nature.webp
--- a/app/src/main/assets/emoji/Objects.webp
+++ b/app/src/main/assets/emoji/Objects.webp
--- a/app/src/main/assets/emoji/People_0.webp
+++ b/app/src/main/assets/emoji/People_0.webp
--- a/app/src/main/assets/emoji/People_1.webp
+++ b/app/src/main/assets/emoji/People_1.webp
--- a/app/src/main/assets/emoji/People_2.webp
+++ b/app/src/main/assets/emoji/People_2.webp
--- a/app/src/main/assets/emoji/People_3.webp
+++ b/app/src/main/assets/emoji/People_3.webp
--- a/app/src/main/assets/emoji/People_4.webp
+++ b/app/src/main/assets/emoji/People_4.webp
--- a/app/src/main/assets/emoji/People_5.webp
+++ b/app/src/main/assets/emoji/People_5.webp
--- a/app/src/main/assets/emoji/People_6.webp
+++ b/app/src/main/assets/emoji/People_6.webp
--- a/app/src/main/assets/emoji/People_7.webp
+++ b/app/src/main/assets/emoji/People_7.webp
--- a/app/src/main/assets/emoji/People_8.webp
+++ b/app/src/main/assets/emoji/People_8.webp
--- a/app/src/main/assets/emoji/People_9.webp
+++ b/app/src/main/assets/emoji/People_9.webp
--- a/app/src/main/assets/emoji/Places.webp
+++ b/app/src/main/assets/emoji/Places.webp
--- a/app/src/main/assets/emoji/Symbols.webp
+++ b/app/src/main/assets/emoji/Symbols.webp
--- a/app/src/main/assets/emoji/emoji_data.json
+++ b/app/src/main/assets/emoji/emoji_data.json
--- a/app/src/main/assets/fonts/Inter-Medium.otf
+++ b/app/src/main/assets/fonts/Inter-Medium.otf
--- a/app/src/main/java/androidx/camera/view/SignalCameraView.java
+++ b/app/src/main/java/androidx/camera/view/SignalCameraView.java
@@ -0,0 +1,822 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.view;
+
+import android.Manifest.permission;
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.hardware.display.DisplayManager;
+import android.hardware.display.DisplayManager.DisplayListener;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Parcelable;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.Display;
+import android.view.MotionEvent;
+import android.view.ScaleGestureDetector;
+import android.view.Surface;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.RequiresPermission;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+import androidx.camera.core.Camera;
+import androidx.camera.core.CameraSelector;
+import androidx.camera.core.FocusMeteringAction;
+import androidx.camera.core.FocusMeteringResult;
+import androidx.camera.core.ImageCapture;
+import androidx.camera.core.ImageCapture.OnImageCapturedCallback;
+import androidx.camera.core.ImageCapture.OnImageSavedCallback;
+import androidx.camera.core.ImageProxy;
+import androidx.camera.core.Logger;
+import androidx.camera.core.MeteringPoint;
+import androidx.camera.core.MeteringPointFactory;
+import androidx.camera.core.VideoCapture;
+import androidx.camera.core.VideoCapture.OnVideoSavedCallback;
+import androidx.camera.core.impl.LensFacingConverter;
+import androidx.camera.core.impl.utils.executor.CameraXExecutors;
+import androidx.camera.core.impl.utils.futures.FutureCallback;
+import androidx.camera.core.impl.utils.futures.Futures;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LiveData;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+import java.io.File;
+import java.util.concurrent.Executor;
+
+/**
+ * A {@link View} that displays a preview of the camera with methods {@link
+ * #takePicture(Executor, OnImageCapturedCallback)},
+ * {@link #takePicture(ImageCapture.OutputFileOptions, Executor, OnImageSavedCallback)},
+ * {@link #startRecording(File , Executor , OnVideoSavedCallback callback)}
+ * and {@link #stopRecording()}.
+ *
+ * <p>Because the Camera is a limited resource and consumes a high amount of power, CameraView must
+ * be opened/closed. CameraView will handle opening/closing automatically through use of a {@link
+ * LifecycleOwner}. Use {@link #bindToLifecycle(LifecycleOwner)} to start the camera.
+ */
+@RequiresApi(21)
+@SuppressLint("RestrictedApi")
+public final class SignalCameraView extends FrameLayout {
+  static final String TAG = SignalCameraView.class.getSimpleName();
+
+  static final int INDEFINITE_VIDEO_DURATION = -1;
+  static final int INDEFINITE_VIDEO_SIZE = -1;
+
+  private static final String EXTRA_SUPER = "super";
+  private static final String EXTRA_ZOOM_RATIO = "zoom_ratio";
+  private static final String EXTRA_PINCH_TO_ZOOM_ENABLED = "pinch_to_zoom_enabled";
+  private static final String EXTRA_FLASH = "flash";
+  private static final String EXTRA_MAX_VIDEO_DURATION = "max_video_duration";
+  private static final String EXTRA_MAX_VIDEO_SIZE = "max_video_size";
+  private static final String EXTRA_SCALE_TYPE = "scale_type";
+  private static final String EXTRA_CAMERA_DIRECTION = "camera_direction";
+  private static final String EXTRA_CAPTURE_MODE = "captureMode";
+
+  private static final int LENS_FACING_NONE = 0;
+  private static final int LENS_FACING_FRONT = 1;
+  private static final int LENS_FACING_BACK = 2;
+  private static final int FLASH_MODE_AUTO = 1;
+  private static final int FLASH_MODE_ON = 2;
+  private static final int FLASH_MODE_OFF = 4;
+  // For tap-to-focus
+  private long mDownEventTimestamp;
+  // For pinch-to-zoom
+  private PinchToZoomGestureDetector mPinchToZoomGestureDetector;
+  private boolean mIsPinchToZoomEnabled = true;
+  SignalCameraXModule mCameraModule;
+  private final DisplayManager.DisplayListener mDisplayListener =
+      new DisplayListener() {
+        @Override
+        public void onDisplayAdded(int displayId) {
+        }
+
+        @Override
+        public void onDisplayRemoved(int displayId) {
+        }
+
+        @Override
+        public void onDisplayChanged(int displayId) {
+          mCameraModule.invalidateView();
+        }
+      };
+  private PreviewView mPreviewView;
+  // For accessibility event
+  private MotionEvent mUpEvent;
+
+  public SignalCameraView(@NonNull Context context) {
+    this(context, null);
+  }
+
+  public SignalCameraView(@NonNull Context context, @Nullable AttributeSet attrs) {
+    this(context, attrs, 0);
+  }
+
+  public SignalCameraView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyle) {
+    super(context, attrs, defStyle);
+    init(context, attrs);
+  }
+
+  @RequiresApi(21)
+  public SignalCameraView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr,
+                          int defStyleRes) {
+    super(context, attrs, defStyleAttr, defStyleRes);
+    init(context, attrs);
+  }
+
+  /**
+   * Binds control of the camera used by this view to the given lifecycle.
+   *
+   * <p>This links opening/closing the camera to the given lifecycle. The camera will not operate
+   * unless this method is called with a valid {@link LifecycleOwner} that is not in the {@link
+   * androidx.lifecycle.Lifecycle.State#DESTROYED} state. Call this method only once camera
+   * permissions have been obtained.
+   *
+   * <p>Once the provided lifecycle has transitioned to a {@link
+   * androidx.lifecycle.Lifecycle.State#DESTROYED} state, CameraView must be bound to a new
+   * lifecycle through this method in order to operate the camera.
+   *
+   * @param lifecycleOwner The lifecycle that will control this view's camera
+   * @throws IllegalArgumentException if provided lifecycle is in a {@link
+   *                                  androidx.lifecycle.Lifecycle.State#DESTROYED} state.
+   * @throws IllegalStateException    if camera permissions are not granted.
+   */
+  @RequiresPermission(permission.CAMERA)
+  public void bindToLifecycle(@NonNull LifecycleOwner lifecycleOwner) {
+    mCameraModule.bindToLifecycle(lifecycleOwner);
+  }
+
+  private void init(Context context, @Nullable AttributeSet attrs) {
+    addView(mPreviewView = new PreviewView(getContext()), 0 /* view position */);
+    mCameraModule = new SignalCameraXModule(this);
+
+    if (attrs != null) {
+      TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.CameraView);
+      setScaleType(
+          PreviewView.ScaleType.fromId(
+              a.getInteger(R.styleable.CameraView_scaleType,
+                  getScaleType().getId())));
+      setPinchToZoomEnabled(
+          a.getBoolean(
+              R.styleable.CameraView_pinchToZoomEnabled, isPinchToZoomEnabled()));
+      setCaptureMode(
+          CaptureMode.fromId(
+              a.getInteger(R.styleable.CameraView_captureMode,
+                  getCaptureMode().getId())));
+
+      int lensFacing = a.getInt(R.styleable.CameraView_lensFacing, LENS_FACING_BACK);
+      switch (lensFacing) {
+        case LENS_FACING_NONE:
+          setCameraLensFacing(null);
+          break;
+        case LENS_FACING_FRONT:
+          setCameraLensFacing(CameraSelector.LENS_FACING_FRONT);
+          break;
+        case LENS_FACING_BACK:
+          setCameraLensFacing(CameraSelector.LENS_FACING_BACK);
+          break;
+        default:
+          // Unhandled event.
+      }
+
+      int flashMode = a.getInt(R.styleable.CameraView_flash, 0);
+      switch (flashMode) {
+        case FLASH_MODE_AUTO:
+          setFlash(ImageCapture.FLASH_MODE_AUTO);
+          break;
+        case FLASH_MODE_ON:
+          setFlash(ImageCapture.FLASH_MODE_ON);
+          break;
+        case FLASH_MODE_OFF:
+          setFlash(ImageCapture.FLASH_MODE_OFF);
+          break;
+        default:
+          // Unhandled event.
+      }
+
+      a.recycle();
+    }
+
+    if (getBackground() == null) {
+      setBackgroundColor(0xFF111111);
+    }
+
+    mPinchToZoomGestureDetector = new PinchToZoomGestureDetector(context);
+  }
+
+  @Override
+  @NonNull
+  protected LayoutParams generateDefaultLayoutParams() {
+    return new LayoutParams(
+        ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+  }
+
+  @Override
+  @NonNull
+  protected Parcelable onSaveInstanceState() {
+    // TODO(b/113884082): Decide what belongs here or what should be invalidated on
+    // configuration
+    // change
+    Bundle state = new Bundle();
+    state.putParcelable(EXTRA_SUPER, super.onSaveInstanceState());
+    state.putInt(EXTRA_SCALE_TYPE, getScaleType().getId());
+    state.putFloat(EXTRA_ZOOM_RATIO, getZoomRatio());
+    state.putBoolean(EXTRA_PINCH_TO_ZOOM_ENABLED, isPinchToZoomEnabled());
+    state.putString(EXTRA_FLASH, FlashModeConverter.nameOf(getFlash()));
+    state.putLong(EXTRA_MAX_VIDEO_DURATION, getMaxVideoDuration());
+    state.putLong(EXTRA_MAX_VIDEO_SIZE, getMaxVideoSize());
+    if (getCameraLensFacing() != null) {
+      state.putString(EXTRA_CAMERA_DIRECTION,
+          LensFacingConverter.nameOf(getCameraLensFacing()));
+    }
+    state.putInt(EXTRA_CAPTURE_MODE, getCaptureMode().getId());
+    return state;
+  }
+
+  @Override
+  protected void onRestoreInstanceState(@Nullable Parcelable savedState) {
+    // TODO(b/113884082): Decide what belongs here or what should be invalidated on
+    // configuration
+    // change
+    if (savedState instanceof Bundle) {
+      Bundle state = (Bundle) savedState;
+      super.onRestoreInstanceState(state.getParcelable(EXTRA_SUPER));
+      setScaleType(PreviewView.ScaleType.fromId(state.getInt(EXTRA_SCALE_TYPE)));
+      setZoomRatio(state.getFloat(EXTRA_ZOOM_RATIO));
+      setPinchToZoomEnabled(state.getBoolean(EXTRA_PINCH_TO_ZOOM_ENABLED));
+      setFlash(FlashModeConverter.valueOf(state.getString(EXTRA_FLASH)));
+      setMaxVideoDuration(state.getLong(EXTRA_MAX_VIDEO_DURATION));
+      setMaxVideoSize(state.getLong(EXTRA_MAX_VIDEO_SIZE));
+      String lensFacingString = state.getString(EXTRA_CAMERA_DIRECTION);
+      setCameraLensFacing(
+          TextUtils.isEmpty(lensFacingString)
+              ? null
+              : LensFacingConverter.valueOf(lensFacingString));
+      setCaptureMode(CaptureMode.fromId(state.getInt(EXTRA_CAPTURE_MODE)));
+    } else {
+      super.onRestoreInstanceState(savedState);
+    }
+  }
+
+  @Override
+  protected void onAttachedToWindow() {
+    super.onAttachedToWindow();
+    DisplayManager dpyMgr =
+        (DisplayManager) getContext().getSystemService(Context.DISPLAY_SERVICE);
+    dpyMgr.registerDisplayListener(mDisplayListener, new Handler(Looper.getMainLooper()));
+  }
+
+  @Override
+  protected void onDetachedFromWindow() {
+    super.onDetachedFromWindow();
+    DisplayManager dpyMgr =
+        (DisplayManager) getContext().getSystemService(Context.DISPLAY_SERVICE);
+    dpyMgr.unregisterDisplayListener(mDisplayListener);
+  }
+
+  /**
+   * Gets the {@link LiveData} of the underlying {@link PreviewView}'s
+   * {@link PreviewView.StreamState}.
+   *
+   * @return A {@link LiveData} containing the {@link PreviewView.StreamState}. Apps can either
+   * get current value by {@link LiveData#getValue()} or register a observer by
+   * {@link LiveData#observe}.
+   * @see PreviewView#getPreviewStreamState()
+   */
+  @NonNull
+  public LiveData<PreviewView.StreamState> getPreviewStreamState() {
+    return mPreviewView.getPreviewStreamState();
+  }
+
+  @NonNull
+  PreviewView getPreviewView() {
+    return mPreviewView;
+  }
+
+  // TODO(b/124269166): Rethink how we can handle permissions here.
+  @SuppressLint("MissingPermission")
+  @Override
+  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+    // Since bindToLifecycle will depend on the measured dimension, only call it when measured
+    // dimension is not 0x0
+    if (getMeasuredWidth() > 0 && getMeasuredHeight() > 0) {
+      mCameraModule.bindToLifecycleAfterViewMeasured();
+    }
+
+    super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+  }
+
+  // TODO(b/124269166): Rethink how we can handle permissions here.
+  @SuppressLint("MissingPermission")
+  @Override
+  protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+    // In case that the CameraView size is always set as 0x0, we still need to trigger to force
+    // binding to lifecycle
+    mCameraModule.bindToLifecycleAfterViewMeasured();
+
+    mCameraModule.invalidateView();
+    super.onLayout(changed, left, top, right, bottom);
+  }
+
+  /**
+   * @return One of {@link Surface#ROTATION_0}, {@link Surface#ROTATION_90}, {@link
+   * Surface#ROTATION_180}, {@link Surface#ROTATION_270}.
+   */
+  int getDisplaySurfaceRotation() {
+    Display display = getDisplay();
+
+    // Null when the View is detached. If we were in the middle of a background operation,
+    // better to not NPE. When the background operation finishes, it'll realize that the camera
+    // was closed.
+    if (display == null) {
+      return 0;
+    }
+
+    return display.getRotation();
+  }
+
+  /**
+   * Returns the scale type used to scale the preview.
+   *
+   * @return The current {@link PreviewView.ScaleType}.
+   */
+  @NonNull
+  public PreviewView.ScaleType getScaleType() {
+    return mPreviewView.getScaleType();
+  }
+
+  /**
+   * Sets the view finder scale type.
+   *
+   * <p>This controls how the view finder should be scaled and positioned within the view.
+   *
+   * @param scaleType The desired {@link PreviewView.ScaleType}.
+   */
+  public void setScaleType(@NonNull PreviewView.ScaleType scaleType) {
+    mPreviewView.setScaleType(scaleType);
+  }
+
+  /**
+   * Returns the scale type used to scale the preview.
+   *
+   * @return The current {@link CaptureMode}.
+   */
+  @NonNull
+  public CaptureMode getCaptureMode() {
+    return mCameraModule.getCaptureMode();
+  }
+
+  /**
+   * Sets the CameraView capture mode
+   *
+   * <p>This controls only image or video capture function is enabled or both are enabled.
+   *
+   * @param captureMode The desired {@link CaptureMode}.
+   */
+  public void setCaptureMode(@NonNull CaptureMode captureMode) {
+    mCameraModule.setCaptureMode(captureMode);
+  }
+
+  /**
+   * Returns the maximum duration of videos, or {@link #INDEFINITE_VIDEO_DURATION} if there is no
+   * timeout.
+   *
+   * @hide Not currently implemented.
+   */
+  @RestrictTo(Scope.LIBRARY_GROUP)
+  public long getMaxVideoDuration() {
+    return mCameraModule.getMaxVideoDuration();
+  }
+
+  /**
+   * Sets the maximum video duration before
+   * {@link OnVideoSavedCallback#onVideoSaved(VideoCapture.OutputFileResults)} is called
+   * automatically.
+   * Use {@link #INDEFINITE_VIDEO_DURATION} to disable the timeout.
+   */
+  private void setMaxVideoDuration(long duration) {
+    mCameraModule.setMaxVideoDuration(duration);
+  }
+
+  /**
+   * Returns the maximum size of videos in bytes, or {@link #INDEFINITE_VIDEO_SIZE} if there is no
+   * timeout.
+   */
+  private long getMaxVideoSize() {
+    return mCameraModule.getMaxVideoSize();
+  }
+
+  /**
+   * Sets the maximum video size in bytes before
+   * {@link OnVideoSavedCallback#onVideoSaved(VideoCapture.OutputFileResults)}
+   * is called automatically. Use {@link #INDEFINITE_VIDEO_SIZE} to disable the size restriction.
+   */
+  private void setMaxVideoSize(long size) {
+    mCameraModule.setMaxVideoSize(size);
+  }
+
+  /**
+   * Takes a picture, and calls {@link OnImageCapturedCallback#onCaptureSuccess(ImageProxy)}
+   * once when done.
+   *
+   * @param executor The executor in which the callback methods will be run.
+   * @param callback Callback which will receive success or failure callbacks.
+   */
+  public void takePicture(@NonNull Executor executor, @NonNull OnImageCapturedCallback callback) {
+    mCameraModule.takePicture(executor, callback);
+  }
+
+  /**
+   * Takes a picture and calls
+   * {@link OnImageSavedCallback#onImageSaved(ImageCapture.OutputFileResults)} when done.
+   *
+   * <p> The value of {@link ImageCapture.Metadata#isReversedHorizontal()} in the
+   * {@link ImageCapture.OutputFileOptions} will be overwritten based on camera direction. For
+   * front camera, it will be set to true; for back camera, it will be set to false.
+   *
+   * @param outputFileOptions Options to store the newly captured image.
+   * @param executor          The executor in which the callback methods will be run.
+   * @param callback          Callback which will receive success or failure.
+   */
+  public void takePicture(@NonNull ImageCapture.OutputFileOptions outputFileOptions,
+                          @NonNull Executor executor,
+                          @NonNull OnImageSavedCallback callback) {
+    mCameraModule.takePicture(outputFileOptions, executor, callback);
+  }
+
+  /**
+   * Takes a video and calls the OnVideoSavedCallback when done.
+   *
+   * @param outputFileOptions     Options to store the newly captured video.
+   * @param executor              The executor in which the callback methods will be run.
+   * @param callback              Callback which will receive success or failure.
+   */
+  public void startRecording(@NonNull VideoCapture.OutputFileOptions outputFileOptions,
+                             @NonNull Executor executor,
+                             @NonNull OnVideoSavedCallback callback) {
+    mCameraModule.startRecording(outputFileOptions, executor, callback);
+  }
+
+  /** Stops an in progress video. */
+  public void stopRecording() {
+    mCameraModule.stopRecording();
+  }
+
+  /** @return True if currently recording. */
+  public boolean isRecording() {
+    return mCameraModule.isRecording();
+  }
+
+  /**
+   * Queries whether the current device has a camera with the specified direction.
+   *
+   * @return True if the device supports the direction.
+   * @throws IllegalStateException if the CAMERA permission is not currently granted.
+   */
+  @RequiresPermission(permission.CAMERA)
+  public boolean hasCameraWithLensFacing(@CameraSelector.LensFacing int lensFacing) {
+    return mCameraModule.hasCameraWithLensFacing(lensFacing);
+  }
+
+  /**
+   * Toggles between the primary front facing camera and the primary back facing camera.
+   *
+   * <p>This will have no effect if not already bound to a lifecycle via {@link
+   * #bindToLifecycle(LifecycleOwner)}.
+   */
+  public void toggleCamera() {
+    mCameraModule.toggleCamera();
+  }
+
+  /**
+   * Sets the desired camera by specifying desired lensFacing.
+   *
+   * <p>This will choose the primary camera with the specified camera lensFacing.
+   *
+   * <p>If called before {@link #bindToLifecycle(LifecycleOwner)}, this will set the camera to be
+   * used when first bound to the lifecycle. If the specified lensFacing is not supported by the
+   * device, as determined by {@link #hasCameraWithLensFacing(int)}, the first supported
+   * lensFacing will be chosen when {@link #bindToLifecycle(LifecycleOwner)} is called.
+   *
+   * <p>If called with {@code null} AFTER binding to the lifecycle, the behavior would be
+   * equivalent to unbind the use cases without the lifecycle having to be destroyed.
+   *
+   * @param lensFacing The desired camera lensFacing.
+   */
+  public void setCameraLensFacing(@Nullable Integer lensFacing) {
+    mCameraModule.setCameraLensFacing(lensFacing);
+  }
+
+  /** Returns the currently selected lensFacing. */
+  @Nullable
+  public Integer getCameraLensFacing() {
+    return mCameraModule.getLensFacing();
+  }
+
+  /** Gets the active flash strategy. */
+  @ImageCapture.FlashMode
+  public int getFlash() {
+    return mCameraModule.getFlash();
+  }
+
+  // Begin Signal Custom Code Block
+  public boolean hasFlash() {
+    return mCameraModule.hasFlash();
+  }
+  // End Signal Custom Code Block
+
+  /** Sets the active flash strategy. */
+  public void setFlash(@ImageCapture.FlashMode int flashMode) {
+    mCameraModule.setFlash(flashMode);
+  }
+
+  private long delta() {
+    return System.currentTimeMillis() - mDownEventTimestamp;
+  }
+
+  @Override
+  public boolean onTouchEvent(@NonNull MotionEvent event) {
+    // Disable pinch-to-zoom and tap-to-focus while the camera module is paused.
+    if (mCameraModule.isPaused()) {
+      return false;
+    }
+    // Only forward the event to the pinch-to-zoom gesture detector when pinch-to-zoom is
+    // enabled.
+    if (isPinchToZoomEnabled()) {
+      mPinchToZoomGestureDetector.onTouchEvent(event);
+    }
+    if (event.getPointerCount() == 2 && isPinchToZoomEnabled() && isZoomSupported()) {
+      return true;
+    }
+
+    // Camera focus
+    switch (event.getAction()) {
+      case MotionEvent.ACTION_DOWN:
+        mDownEventTimestamp = System.currentTimeMillis();
+        break;
+      case MotionEvent.ACTION_UP:
+        if (delta() < ViewConfiguration.getLongPressTimeout()
+            && mCameraModule.isBoundToLifecycle()) {
+          mUpEvent = event;
+          performClick();
+        }
+        break;
+      default:
+        // Unhandled event.
+        return false;
+    }
+    return true;
+  }
+
+  /**
+   * Focus the position of the touch event, or focus the center of the preview for
+   * accessibility events
+   */
+  @Override
+  public boolean performClick() {
+    super.performClick();
+
+    final float x = (mUpEvent != null) ? mUpEvent.getX() : getX() + getWidth() / 2f;
+    final float y = (mUpEvent != null) ? mUpEvent.getY() : getY() + getHeight() / 2f;
+    mUpEvent = null;
+
+    Camera camera = mCameraModule.getCamera();
+    if (camera != null) {
+      MeteringPointFactory pointFactory = mPreviewView.getMeteringPointFactory();
+      float afPointWidth = 1.0f / 6.0f;  // 1/6 total area
+      float aePointWidth = afPointWidth * 1.5f;
+      MeteringPoint afPoint = pointFactory.createPoint(x, y, afPointWidth);
+      MeteringPoint aePoint = pointFactory.createPoint(x, y, aePointWidth);
+
+      ListenableFuture<FocusMeteringResult> future =
+          camera.getCameraControl().startFocusAndMetering(
+              new FocusMeteringAction.Builder(afPoint,
+                  FocusMeteringAction.FLAG_AF).addPoint(aePoint,
+                  FocusMeteringAction.FLAG_AE).build());
+      Futures.addCallback(future, new FutureCallback<FocusMeteringResult>() {
+        @Override
+        public void onSuccess(@Nullable FocusMeteringResult result) {
+        }
+
+        @Override
+        public void onFailure(Throwable t) {
+          // Throw the unexpected error.
+          throw new RuntimeException(t);
+        }
+      }, CameraXExecutors.directExecutor());
+
+    } else {
+      Logger.d(TAG, "cannot access camera");
+    }
+
+    return true;
+  }
+
+  float rangeLimit(float val, float max, float min) {
+    return Math.min(Math.max(val, min), max);
+  }
+
+  /**
+   * Returns whether the view allows pinch-to-zoom.
+   *
+   * @return True if pinch to zoom is enabled.
+   */
+  public boolean isPinchToZoomEnabled() {
+    return mIsPinchToZoomEnabled;
+  }
+
+  /**
+   * Sets whether the view should allow pinch-to-zoom.
+   *
+   * <p>When enabled, the user can pinch the camera to zoom in/out. This only has an effect if the
+   * bound camera supports zoom.
+   *
+   * @param enabled True to enable pinch-to-zoom.
+   */
+  public void setPinchToZoomEnabled(boolean enabled) {
+    mIsPinchToZoomEnabled = enabled;
+  }
+
+  /**
+   * Returns the current zoom ratio.
+   *
+   * @return The current zoom ratio.
+   */
+  public float getZoomRatio() {
+    return mCameraModule.getZoomRatio();
+  }
+
+  /**
+   * Sets the current zoom ratio.
+   *
+   * <p>Valid zoom values range from {@link #getMinZoomRatio()} to {@link #getMaxZoomRatio()}.
+   *
+   * @param zoomRatio The requested zoom ratio.
+   */
+  public void setZoomRatio(float zoomRatio) {
+    mCameraModule.setZoomRatio(zoomRatio);
+  }
+
+  /**
+   * Returns the minimum zoom ratio.
+   *
+   * <p>For most cameras this should return a zoom ratio of 1. A zoom ratio of 1 corresponds to a
+   * non-zoomed image.
+   *
+   * @return The minimum zoom ratio.
+   */
+  public float getMinZoomRatio() {
+    return mCameraModule.getMinZoomRatio();
+  }
+
+  /**
+   * Returns the maximum zoom ratio.
+   *
+   * <p>The zoom ratio corresponds to the ratio between both the widths and heights of a
+   * non-zoomed image and a maximally zoomed image for the selected camera.
+   *
+   * @return The maximum zoom ratio.
+   */
+  public float getMaxZoomRatio() {
+    return mCameraModule.getMaxZoomRatio();
+  }
+
+  /**
+   * Returns whether the bound camera supports zooming.
+   *
+   * @return True if the camera supports zooming.
+   */
+  public boolean isZoomSupported() {
+    return mCameraModule.isZoomSupported();
+  }
+
+  /**
+   * Turns on/off torch.
+   *
+   * @param torch True to turn on torch, false to turn off torch.
+   */
+  public void enableTorch(boolean torch) {
+    mCameraModule.enableTorch(torch);
+  }
+
+  /**
+   * Returns current torch status.
+   *
+   * @return true if torch is on , otherwise false
+   */
+  public boolean isTorchOn() {
+    return mCameraModule.isTorchOn();
+  }
+
+  /**
+   * The capture mode used by CameraView.
+   *
+   * <p>This enum can be used to determine which capture mode will be enabled for {@link
+   * SignalCameraView}.
+   */
+  public enum CaptureMode {
+    /** A mode where image capture is enabled. */
+    IMAGE(0),
+    /** A mode where video capture is enabled. */
+    VIDEO(1),
+    /**
+     * A mode where both image capture and video capture are simultaneously enabled. Note that
+     * this mode may not be available on every device.
+     */
+    MIXED(2);
+
+    private final int mId;
+
+    int getId() {
+      return mId;
+    }
+
+    CaptureMode(int id) {
+      mId = id;
+    }
+
+    static CaptureMode fromId(int id) {
+      for (CaptureMode f : values()) {
+        if (f.mId == id) {
+          return f;
+        }
+      }
+      throw new IllegalArgumentException();
+    }
+  }
+
+  static class S extends ScaleGestureDetector.SimpleOnScaleGestureListener {
+    private ScaleGestureDetector.OnScaleGestureListener mListener;
+
+    void setRealGestureDetector(ScaleGestureDetector.OnScaleGestureListener l) {
+      mListener = l;
+    }
+
+    @Override
+    public boolean onScale(ScaleGestureDetector detector) {
+      return mListener.onScale(detector);
+    }
+  }
+
+  private class PinchToZoomGestureDetector extends ScaleGestureDetector
+      implements ScaleGestureDetector.OnScaleGestureListener {
+    PinchToZoomGestureDetector(Context context) {
+      this(context, new S());
+    }
+
+    PinchToZoomGestureDetector(Context context, S s) {
+      super(context, s);
+      s.setRealGestureDetector(this);
+    }
+
+    @Override
+    public boolean onScale(ScaleGestureDetector detector) {
+      float scale = detector.getScaleFactor();
+
+      // Speeding up the zoom by 2X.
+      if (scale > 1f) {
+        scale = 1.0f + (scale - 1.0f) * 2;
+      } else {
+        scale = 1.0f - (1.0f - scale) * 2;
+      }
+
+      float newRatio = getZoomRatio() * scale;
+      newRatio = rangeLimit(newRatio, getMaxZoomRatio(), getMinZoomRatio());
+      setZoomRatio(newRatio);
+      return true;
+    }
+
+    @Override
+    public boolean onScaleBegin(ScaleGestureDetector detector) {
+      return true;
+    }
+
+    @Override
+    public void onScaleEnd(ScaleGestureDetector detector) {
+    }
+  }
+}
--- a/app/src/main/java/androidx/camera/view/SignalCameraXModule.java
+++ b/app/src/main/java/androidx/camera/view/SignalCameraXModule.java
@@ -0,0 +1,696 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.view;
+
+import android.Manifest.permission;
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.res.Resources;
+import android.util.Rational;
+import android.util.Size;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.RequiresPermission;
+import androidx.camera.core.Camera;
+import androidx.camera.core.CameraInfoUnavailableException;
+import androidx.camera.core.CameraSelector;
+import androidx.camera.core.ImageCapture;
+import androidx.camera.core.ImageCapture.OnImageCapturedCallback;
+import androidx.camera.core.ImageCapture.OnImageSavedCallback;
+import androidx.camera.core.Logger;
+import androidx.camera.core.Preview;
+import androidx.camera.core.TorchState;
+import androidx.camera.core.UseCase;
+import androidx.camera.core.VideoCapture;
+import androidx.camera.core.VideoCapture.OnVideoSavedCallback;
+import androidx.camera.core.impl.CameraInternal;
+import androidx.camera.core.impl.LensFacingConverter;
+import androidx.camera.core.impl.utils.CameraOrientationUtil;
+import androidx.camera.core.impl.utils.executor.CameraXExecutors;
+import androidx.camera.core.impl.utils.futures.FutureCallback;
+import androidx.camera.core.impl.utils.futures.Futures;
+import androidx.camera.lifecycle.ProcessCameraProvider;
+import androidx.core.util.Preconditions;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.OnLifecycleEvent;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+import org.thoughtcrime.securesms.mediasend.camerax.CameraXUtil;
+import org.thoughtcrime.securesms.mms.MediaConstraints;
+import org.thoughtcrime.securesms.video.VideoUtil;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.Executor;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static androidx.camera.core.ImageCapture.FLASH_MODE_OFF;
+
+/** CameraX use case operation built on @{link androidx.camera.core}. */
+@RequiresApi(21)
+@SuppressLint("RestrictedApi")
+final class SignalCameraXModule {
+  public static final String TAG = "CameraXModule";
+
+  private static final float UNITY_ZOOM_SCALE = 1f;
+  private static final float ZOOM_NOT_SUPPORTED = UNITY_ZOOM_SCALE;
+  private static final Rational ASPECT_RATIO_16_9 = new Rational(16, 9);
+  private static final Rational ASPECT_RATIO_4_3 = new Rational(4, 3);
+  private static final Rational ASPECT_RATIO_9_16 = new Rational(9, 16);
+  private static final Rational ASPECT_RATIO_3_4 = new Rational(3, 4);
+
+  private final Preview.Builder mPreviewBuilder;
+  private final VideoCapture.Builder mVideoCaptureBuilder;
+  private final ImageCapture.Builder mImageCaptureBuilder;
+  private final SignalCameraView mCameraView;
+  final AtomicBoolean mVideoIsRecording = new AtomicBoolean(false);
+  private SignalCameraView.CaptureMode mCaptureMode = SignalCameraView.CaptureMode.IMAGE;
+  private long mMaxVideoDuration = SignalCameraView.INDEFINITE_VIDEO_DURATION;
+  private long mMaxVideoSize = SignalCameraView.INDEFINITE_VIDEO_SIZE;
+  @ImageCapture.FlashMode
+  private int mFlash = FLASH_MODE_OFF;
+  @Nullable
+  @SuppressWarnings("WeakerAccess") /* synthetic accessor */
+      Camera mCamera;
+  @Nullable
+  private ImageCapture mImageCapture;
+  @Nullable
+  private VideoCapture mVideoCapture;
+  @SuppressWarnings("WeakerAccess") /* synthetic accessor */
+  @Nullable
+  Preview mPreview;
+  @SuppressWarnings("WeakerAccess") /* synthetic accessor */
+  @Nullable
+  LifecycleOwner mCurrentLifecycle;
+  private final LifecycleObserver mCurrentLifecycleObserver =
+      new LifecycleObserver() {
+        @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+        public void onDestroy(LifecycleOwner owner) {
+          if (owner == mCurrentLifecycle) {
+            clearCurrentLifecycle();
+          }
+        }
+      };
+  @Nullable
+  private LifecycleOwner mNewLifecycle;
+  @SuppressWarnings("WeakerAccess") /* synthetic accessor */
+  @Nullable
+  Integer mCameraLensFacing = CameraSelector.LENS_FACING_BACK;
+  @SuppressWarnings("WeakerAccess") /* synthetic accessor */
+  @Nullable
+  ProcessCameraProvider mCameraProvider;
+
+  SignalCameraXModule(SignalCameraView view) {
+    mCameraView = view;
+
+    Futures.addCallback(ProcessCameraProvider.getInstance(view.getContext()),
+        new FutureCallback<ProcessCameraProvider>() {
+          // TODO(b/124269166): Rethink how we can handle permissions here.
+          @SuppressLint("MissingPermission")
+          @Override
+          public void onSuccess(@Nullable ProcessCameraProvider provider) {
+            Preconditions.checkNotNull(provider);
+            mCameraProvider = provider;
+            if (mCurrentLifecycle != null) {
+              bindToLifecycle(mCurrentLifecycle);
+            }
+          }
+
+          @Override
+          public void onFailure(Throwable t) {
+            throw new RuntimeException("CameraX failed to initialize.", t);
+          }
+        }, CameraXExecutors.mainThreadExecutor());
+
+    mPreviewBuilder = new Preview.Builder().setTargetName("Preview");
+
+    mImageCaptureBuilder = new ImageCapture.Builder().setTargetName("ImageCapture");
+
+    mVideoCaptureBuilder = new VideoCapture.Builder().setTargetName("VideoCapture")
+                                                     .setAudioBitRate(VideoUtil.AUDIO_BIT_RATE)
+                                                     .setVideoFrameRate(VideoUtil.VIDEO_FRAME_RATE)
+                                                     .setBitRate(VideoUtil.VIDEO_BIT_RATE);
+  }
+
+  @RequiresPermission(permission.CAMERA)
+  void bindToLifecycle(LifecycleOwner lifecycleOwner) {
+    mNewLifecycle = lifecycleOwner;
+
+    if (getMeasuredWidth() > 0 && getMeasuredHeight() > 0) {
+      bindToLifecycleAfterViewMeasured();
+    }
+  }
+
+  @RequiresPermission(permission.CAMERA)
+  void bindToLifecycleAfterViewMeasured() {
+    if (mNewLifecycle == null) {
+      return;
+    }
+
+    clearCurrentLifecycle();
+    if (mNewLifecycle.getLifecycle().getCurrentState() == Lifecycle.State.DESTROYED) {
+      // Lifecycle is already in a destroyed state. Since it may have been a valid
+      // lifecycle when bound, but became destroyed while waiting for layout, treat this as
+      // a no-op now that we have cleared the previous lifecycle.
+      mNewLifecycle = null;
+      return;
+    }
+    mCurrentLifecycle = mNewLifecycle;
+    mNewLifecycle = null;
+
+    if (mCameraProvider == null) {
+      // try again once the camera provider is no longer null
+      return;
+    }
+
+    Set<Integer> available = getAvailableCameraLensFacing();
+
+    if (available.isEmpty()) {
+      Logger.w(TAG, "Unable to bindToLifeCycle since no cameras available");
+      mCameraLensFacing = null;
+    }
+
+    // Ensure the current camera exists, or default to another camera
+    if (mCameraLensFacing != null && !available.contains(mCameraLensFacing)) {
+      Logger.w(TAG, "Camera does not exist with direction " + mCameraLensFacing);
+
+      // Default to the first available camera direction
+      mCameraLensFacing = available.iterator().next();
+
+      Logger.w(TAG, "Defaulting to primary camera with direction " + mCameraLensFacing);
+    }
+
+    // Do not attempt to create use cases for a null cameraLensFacing. This could occur if
+    // the user explicitly sets the LensFacing to null, or if we determined there
+    // were no available cameras, which should be logged in the logic above.
+    if (mCameraLensFacing == null) {
+      return;
+    }
+
+    // Set the preferred aspect ratio as 4:3 if it is IMAGE only mode. Set the preferred aspect
+    // ratio as 16:9 if it is VIDEO or MIXED mode. Then, it will be WYSIWYG when the view finder
+    // is in CENTER_INSIDE mode.
+
+    boolean isDisplayPortrait = getDisplayRotationDegrees() == 0
+        || getDisplayRotationDegrees() == 180;
+
+    // Begin Signal Custom Code Block
+    int resolution = CameraXUtil.getIdealResolution(Resources.getSystem().getDisplayMetrics().widthPixels, Resources.getSystem().getDisplayMetrics().heightPixels);
+    // End Signal Custom Code Block
+
+    Rational targetAspectRatio;
+    if (getCaptureMode() == SignalCameraView.CaptureMode.IMAGE) {
+      // Begin Signal Custom Code Block
+      mImageCaptureBuilder.setTargetResolution(CameraXUtil.buildResolutionForRatio(resolution, ASPECT_RATIO_4_3, isDisplayPortrait));
+      // End Signal Custom Code Block
+      targetAspectRatio = isDisplayPortrait ? ASPECT_RATIO_3_4 : ASPECT_RATIO_4_3;
+    } else {
+      // Begin Signal Custom Code Block
+      mImageCaptureBuilder.setTargetResolution(CameraXUtil.buildResolutionForRatio(resolution, ASPECT_RATIO_16_9, isDisplayPortrait));
+      // End Signal Custom Code Block
+      targetAspectRatio = isDisplayPortrait ? ASPECT_RATIO_9_16 : ASPECT_RATIO_16_9;
+    }
+
+    // Begin Signal Custom Code Block
+    mImageCaptureBuilder.setCaptureMode(CameraXUtil.getOptimalCaptureMode());
+    // End Signal Custom Code Block
+
+    mImageCaptureBuilder.setTargetRotation(getDisplaySurfaceRotation());
+    mImageCapture = mImageCaptureBuilder.build();
+
+    // Begin Signal Custom Code Block
+    Size size = VideoUtil.getVideoRecordingSize();
+    mVideoCaptureBuilder.setTargetResolution(size);
+    mVideoCaptureBuilder.setMaxResolution(size);
+    // End Signal Custom Code Block
+
+    mVideoCaptureBuilder.setTargetRotation(getDisplaySurfaceRotation());
+    // Begin Signal Custom Code Block
+    if (MediaConstraints.isVideoTranscodeAvailable()) {
+      mVideoCapture = mVideoCaptureBuilder.build();
+    }
+    // End Signal Custom Code Block
+
+    // Adjusts the preview resolution according to the view size and the target aspect ratio.
+    int height = (int) (getMeasuredWidth() / targetAspectRatio.floatValue());
+    mPreviewBuilder.setTargetResolution(new Size(getMeasuredWidth(), height));
+
+    mPreview = mPreviewBuilder.build();
+    mPreview.setSurfaceProvider(mCameraView.getPreviewView().getSurfaceProvider());
+
+    CameraSelector cameraSelector =
+        new CameraSelector.Builder().requireLensFacing(mCameraLensFacing).build();
+    if (getCaptureMode() == SignalCameraView.CaptureMode.IMAGE) {
+      mCamera = mCameraProvider.bindToLifecycle(mCurrentLifecycle, cameraSelector,
+          mImageCapture,
+          mPreview);
+    } else if (getCaptureMode() == SignalCameraView.CaptureMode.VIDEO) {
+      mCamera = mCameraProvider.bindToLifecycle(mCurrentLifecycle, cameraSelector,
+          mVideoCapture,
+          mPreview);
+    } else {
+      mCamera = mCameraProvider.bindToLifecycle(mCurrentLifecycle, cameraSelector,
+          mImageCapture,
+          mVideoCapture, mPreview);
+    }
+
+    setZoomRatio(UNITY_ZOOM_SCALE);
+    mCurrentLifecycle.getLifecycle().addObserver(mCurrentLifecycleObserver);
+    // Enable flash setting in ImageCapture after use cases are created and binded.
+    setFlash(getFlash());
+  }
+
+  public void open() {
+    throw new UnsupportedOperationException(
+        "Explicit open/close of camera not yet supported. Use bindtoLifecycle() instead.");
+  }
+
+  public void close() {
+    throw new UnsupportedOperationException(
+        "Explicit open/close of camera not yet supported. Use bindtoLifecycle() instead.");
+  }
+
+  public void takePicture(Executor executor, OnImageCapturedCallback callback) {
+    if (mImageCapture == null) {
+      return;
+    }
+
+    if (getCaptureMode() == SignalCameraView.CaptureMode.VIDEO) {
+      throw new IllegalStateException("Can not take picture under VIDEO capture mode.");
+    }
+
+    if (callback == null) {
+      throw new IllegalArgumentException("OnImageCapturedCallback should not be empty");
+    }
+
+    mImageCapture.takePicture(executor, callback);
+  }
+
+  public void takePicture(@NonNull ImageCapture.OutputFileOptions outputFileOptions,
+                          @NonNull Executor executor, OnImageSavedCallback callback) {
+    if (mImageCapture == null) {
+      return;
+    }
+
+    if (getCaptureMode() == SignalCameraView.CaptureMode.VIDEO) {
+      throw new IllegalStateException("Can not take picture under VIDEO capture mode.");
+    }
+
+    if (callback == null) {
+      throw new IllegalArgumentException("OnImageSavedCallback should not be empty");
+    }
+
+    outputFileOptions.getMetadata().setReversedHorizontal(mCameraLensFacing != null
+        && mCameraLensFacing == CameraSelector.LENS_FACING_FRONT);
+    mImageCapture.takePicture(outputFileOptions, executor, callback);
+  }
+
+  public void startRecording(VideoCapture.OutputFileOptions outputFileOptions,
+                             Executor executor, final OnVideoSavedCallback callback) {
+    if (mVideoCapture == null) {
+      return;
+    }
+
+    if (getCaptureMode() == SignalCameraView.CaptureMode.IMAGE) {
+      throw new IllegalStateException("Can not record video under IMAGE capture mode.");
+    }
+
+    if (callback == null) {
+      throw new IllegalArgumentException("OnVideoSavedCallback should not be empty");
+    }
+
+    mVideoIsRecording.set(true);
+    mVideoCapture.startRecording(
+        outputFileOptions,
+        executor,
+        new VideoCapture.OnVideoSavedCallback() {
+          @Override
+          public void onVideoSaved(
+              @NonNull VideoCapture.OutputFileResults outputFileResults) {
+            mVideoIsRecording.set(false);
+            callback.onVideoSaved(outputFileResults);
+          }
+
+          @Override
+          public void onError(
+              @VideoCapture.VideoCaptureError int videoCaptureError,
+              @NonNull String message,
+              @Nullable Throwable cause) {
+            mVideoIsRecording.set(false);
+            Logger.e(TAG, message, cause);
+            callback.onError(videoCaptureError, message, cause);
+          }
+        });
+  }
+
+  public void stopRecording() {
+    if (mVideoCapture == null) {
+      return;
+    }
+
+    mVideoCapture.stopRecording();
+  }
+
+  public boolean isRecording() {
+    return mVideoIsRecording.get();
+  }
+
+  // TODO(b/124269166): Rethink how we can handle permissions here.
+  @SuppressLint("MissingPermission")
+  public void setCameraLensFacing(@Nullable Integer lensFacing) {
+    // Setting same lens facing is a no-op, so check for that first
+    if (!Objects.equals(mCameraLensFacing, lensFacing)) {
+      // If we're not bound to a lifecycle, just update the camera that will be opened when we
+      // attach to a lifecycle.
+      mCameraLensFacing = lensFacing;
+
+      if (mCurrentLifecycle != null) {
+        // Re-bind to lifecycle with new camera
+        bindToLifecycle(mCurrentLifecycle);
+      }
+    }
+  }
+
+  @RequiresPermission(permission.CAMERA)
+  public boolean hasCameraWithLensFacing(@CameraSelector.LensFacing int lensFacing) {
+    if (mCameraProvider == null) {
+      return false;
+    }
+    try {
+      return mCameraProvider.hasCamera(
+          new CameraSelector.Builder().requireLensFacing(lensFacing).build());
+    } catch (CameraInfoUnavailableException e) {
+      return false;
+    }
+  }
+
+  @Nullable
+  public Integer getLensFacing() {
+    return mCameraLensFacing;
+  }
+
+  public void toggleCamera() {
+    // TODO(b/124269166): Rethink how we can handle permissions here.
+    @SuppressLint("MissingPermission")
+    Set<Integer> availableCameraLensFacing = getAvailableCameraLensFacing();
+
+    if (availableCameraLensFacing.isEmpty()) {
+      return;
+    }
+
+    if (mCameraLensFacing == null) {
+      setCameraLensFacing(availableCameraLensFacing.iterator().next());
+      return;
+    }
+
+    if (mCameraLensFacing == CameraSelector.LENS_FACING_BACK
+        && availableCameraLensFacing.contains(CameraSelector.LENS_FACING_FRONT)) {
+      setCameraLensFacing(CameraSelector.LENS_FACING_FRONT);
+      return;
+    }
+
+    if (mCameraLensFacing == CameraSelector.LENS_FACING_FRONT
+        && availableCameraLensFacing.contains(CameraSelector.LENS_FACING_BACK)) {
+      setCameraLensFacing(CameraSelector.LENS_FACING_BACK);
+      return;
+    }
+  }
+
+  public float getZoomRatio() {
+    if (mCamera != null) {
+      return mCamera.getCameraInfo().getZoomState().getValue().getZoomRatio();
+    } else {
+      return UNITY_ZOOM_SCALE;
+    }
+  }
+
+  public void setZoomRatio(float zoomRatio) {
+    if (mCamera != null) {
+      ListenableFuture<Void> future = mCamera.getCameraControl().setZoomRatio(
+          zoomRatio);
+      Futures.addCallback(future, new FutureCallback<Void>() {
+        @Override
+        public void onSuccess(@Nullable Void result) {
+        }
+
+        @Override
+        public void onFailure(Throwable t) {
+          // Throw the unexpected error.
+          throw new RuntimeException(t);
+        }
+      }, CameraXExecutors.directExecutor());
+    } else {
+      Logger.e(TAG, "Failed to set zoom ratio");
+    }
+  }
+
+  public float getMinZoomRatio() {
+    if (mCamera != null) {
+      return mCamera.getCameraInfo().getZoomState().getValue().getMinZoomRatio();
+    } else {
+      return UNITY_ZOOM_SCALE;
+    }
+  }
+
+  public float getMaxZoomRatio() {
+    if (mCamera != null) {
+      return mCamera.getCameraInfo().getZoomState().getValue().getMaxZoomRatio();
+    } else {
+      return ZOOM_NOT_SUPPORTED;
+    }
+  }
+
+  public boolean isZoomSupported() {
+    return getMaxZoomRatio() != ZOOM_NOT_SUPPORTED;
+  }
+
+  // TODO(b/124269166): Rethink how we can handle permissions here.
+  @SuppressLint("MissingPermission")
+  private void rebindToLifecycle() {
+    if (mCurrentLifecycle != null) {
+      bindToLifecycle(mCurrentLifecycle);
+    }
+  }
+
+  boolean isBoundToLifecycle() {
+    return mCamera != null;
+  }
+
+  int getRelativeCameraOrientation(boolean compensateForMirroring) {
+    int rotationDegrees = 0;
+    if (mCamera != null) {
+      rotationDegrees =
+          mCamera.getCameraInfo().getSensorRotationDegrees(getDisplaySurfaceRotation());
+      if (compensateForMirroring) {
+        rotationDegrees = (360 - rotationDegrees) % 360;
+      }
+    }
+
+    return rotationDegrees;
+  }
+
+  public void invalidateView() {
+    updateViewInfo();
+  }
+
+  void clearCurrentLifecycle() {
+    if (mCurrentLifecycle != null && mCameraProvider != null) {
+      // Remove previous use cases
+      List<UseCase> toUnbind = new ArrayList<>();
+      if (mImageCapture != null && mCameraProvider.isBound(mImageCapture)) {
+        toUnbind.add(mImageCapture);
+      }
+      if (mVideoCapture != null && mCameraProvider.isBound(mVideoCapture)) {
+        toUnbind.add(mVideoCapture);
+      }
+      if (mPreview != null && mCameraProvider.isBound(mPreview)) {
+        toUnbind.add(mPreview);
+      }
+
+      if (!toUnbind.isEmpty()) {
+        mCameraProvider.unbind(toUnbind.toArray((new UseCase[0])));
+      }
+
+      // Remove surface provider once unbound.
+      if (mPreview != null) {
+        mPreview.setSurfaceProvider(null);
+      }
+    }
+    mCamera = null;
+    mCurrentLifecycle = null;
+  }
+
+  // Update view related information used in use cases
+  private void updateViewInfo() {
+    if (mImageCapture != null) {
+      mImageCapture.setCropAspectRatio(new Rational(getWidth(), getHeight()));
+      mImageCapture.setTargetRotation(getDisplaySurfaceRotation());
+    }
+
+    if (mVideoCapture != null) {
+      mVideoCapture.setTargetRotation(getDisplaySurfaceRotation());
+    }
+  }
+
+  @RequiresPermission(permission.CAMERA)
+  private Set<Integer> getAvailableCameraLensFacing() {
+    // Start with all camera directions
+    Set<Integer> available = new LinkedHashSet<>(Arrays.asList(LensFacingConverter.values()));
+
+    // If we're bound to a lifecycle, remove unavailable cameras
+    if (mCurrentLifecycle != null) {
+      if (!hasCameraWithLensFacing(CameraSelector.LENS_FACING_BACK)) {
+        available.remove(CameraSelector.LENS_FACING_BACK);
+      }
+
+      if (!hasCameraWithLensFacing(CameraSelector.LENS_FACING_FRONT)) {
+        available.remove(CameraSelector.LENS_FACING_FRONT);
+      }
+    }
+
+    return available;
+  }
+
+  @ImageCapture.FlashMode
+  public int getFlash() {
+    return mFlash;
+  }
+
+  // Begin Signal Custom Code Block
+  public boolean hasFlash() {
+    if (mImageCapture == null) {
+      return false;
+    }
+
+    CameraInternal camera = mImageCapture.getCamera();
+
+    if (camera == null) {
+      return false;
+    }
+
+    return camera.getCameraInfoInternal().hasFlashUnit();
+  }
+  // End Signal Custom Code Block
+
+  public void setFlash(@ImageCapture.FlashMode int flash) {
+    this.mFlash = flash;
+
+    if (mImageCapture == null) {
+      // Do nothing if there is no imageCapture
+      return;
+    }
+
+    mImageCapture.setFlashMode(flash);
+  }
+
+  public void enableTorch(boolean torch) {
+    if (mCamera == null) {
+      return;
+    }
+    ListenableFuture<Void> future = mCamera.getCameraControl().enableTorch(torch);
+    Futures.addCallback(future, new FutureCallback<Void>() {
+      @Override
+      public void onSuccess(@Nullable Void result) {
+      }
+
+      @Override
+      public void onFailure(Throwable t) {
+        // Throw the unexpected error.
+        throw new RuntimeException(t);
+      }
+    }, CameraXExecutors.directExecutor());
+  }
+
+  public boolean isTorchOn() {
+    if (mCamera == null) {
+      return false;
+    }
+    return mCamera.getCameraInfo().getTorchState().getValue() == TorchState.ON;
+  }
+
+  public Context getContext() {
+    return mCameraView.getContext();
+  }
+
+  public int getWidth() {
+    return mCameraView.getWidth();
+  }
+
+  public int getHeight() {
+    return mCameraView.getHeight();
+  }
+
+  public int getDisplayRotationDegrees() {
+    return CameraOrientationUtil.surfaceRotationToDegrees(getDisplaySurfaceRotation());
+  }
+
+  protected int getDisplaySurfaceRotation() {
+    return mCameraView.getDisplaySurfaceRotation();
+  }
+
+  private int getMeasuredWidth() {
+    return mCameraView.getMeasuredWidth();
+  }
+
+  private int getMeasuredHeight() {
+    return mCameraView.getMeasuredHeight();
+  }
+
+  @Nullable
+  public Camera getCamera() {
+    return mCamera;
+  }
+
+  @NonNull
+  public SignalCameraView.CaptureMode getCaptureMode() {
+    return mCaptureMode;
+  }
+
+  public void setCaptureMode(@NonNull SignalCameraView.CaptureMode captureMode) {
+    this.mCaptureMode = captureMode;
+    rebindToLifecycle();
+  }
+
+  public long getMaxVideoDuration() {
+    return mMaxVideoDuration;
+  }
+
+  public void setMaxVideoDuration(long duration) {
+    mMaxVideoDuration = duration;
+  }
+
+  public long getMaxVideoSize() {
+    return mMaxVideoSize;
+  }
+
+  public void setMaxVideoSize(long size) {
+    mMaxVideoSize = size;
+  }
+
+  public boolean isPaused() {
+    return false;
+  }
+}
--- a/app/src/main/java/androidx/documentfile/provider/DocumentFileHelper.java
+++ b/app/src/main/java/androidx/documentfile/provider/DocumentFileHelper.java
@@ -1,38 +0,0 @@
-package androidx.documentfile.provider;
-
-import android.content.Context;
-import android.net.Uri;
-import android.provider.DocumentsContract;
-
-import org.signal.core.util.logging.Log;
-
-/**
- * Located in androidx package as {@link TreeDocumentFile} is package protected.
- */
-public class DocumentFileHelper {
-
-  private static final String TAG = Log.tag(DocumentFileHelper.class);
-
-  /**
-   * System implementation swallows the exception and we are having problems with the rename. This inlines the
-   * same call and logs the exception. Note this implementation does not update the passed in document file like
-   * the system implementation. Do not use the provided document file after calling this method.
-   *
-   * @return true if rename successful
-   */
-  public static boolean renameTo(Context context, DocumentFile documentFile, String displayName) {
-    if (documentFile instanceof TreeDocumentFile) {
-      Log.d(TAG, "Renaming document directly");
-      try {
-        final Uri result = DocumentsContract.renameDocument(context.getContentResolver(), documentFile.getUri(), displayName);
-        return result != null;
-      } catch (Exception e) {
-        Log.w(TAG, "Unable to rename document file", e);
-        return false;
-      }
-    } else {
-      Log.d(TAG, "Letting OS rename document: " + documentFile.getClass().getSimpleName());
-      return documentFile.renameTo(displayName);
-    }
-  }
-}
--- a/app/src/main/java/com/google/android/material/bottomsheet/BottomSheetBehaviorHack.kt
+++ b/app/src/main/java/com/google/android/material/bottomsheet/BottomSheetBehaviorHack.kt
@@ -1,14 +0,0 @@
-package com.google.android.material.bottomsheet
-
-import android.view.View
-import android.widget.FrameLayout
-import java.lang.ref.WeakReference
-
-/**
- * Manually adjust the nested scrolling child for a given [BottomSheetBehavior].
- */
-object BottomSheetBehaviorHack {
-  fun setNestedScrollingChild(behavior: BottomSheetBehavior<FrameLayout>, view: View) {
-    behavior.nestedScrollingChildRef = WeakReference(view)
-  }
-}
--- a/app/src/main/java/org/signal/glide/Log.java
+++ b/app/src/main/java/org/signal/glide/Log.java
@@ -24,7 +24,7 @@ public final class Log {
  }

  public static void e(@NonNull String tag, @NonNull String message) {
-    SignalGlideCodecs.getLogProvider().e(tag, message, null);
+    e(tag, message, null);
  }

  public static void e(@NonNull String tag, @NonNull String message, @Nullable Throwable throwable) {
--- a/app/src/main/java/org/signal/glide/apng/decode/APNGDecoder.java
+++ b/app/src/main/java/org/signal/glide/apng/decode/APNGDecoder.java
@@ -12,7 +12,7 @@ import android.graphics.Paint;
 import android.graphics.PorterDuff;
 import android.graphics.Rect;

-import org.signal.core.util.logging.Log;
+import org.signal.glide.Log;
 import org.signal.glide.apng.io.APNGReader;
 import org.signal.glide.apng.io.APNGWriter;
 import org.signal.glide.common.decode.Frame;
@@ -32,7 +32,7 @@ import java.util.List;
 */
 public class APNGDecoder extends FrameSeqDecoder<APNGReader, APNGWriter> {

-    private static final String TAG = Log.tag(APNGDecoder.class);
+    private static final String TAG = APNGDecoder.class.getSimpleName();

    private APNGWriter apngWriter;
    private int mLoopCount;
--- a/app/src/main/java/org/signal/glide/common/FrameAnimationDrawable.java
+++ b/app/src/main/java/org/signal/glide/common/FrameAnimationDrawable.java
@@ -21,7 +21,7 @@ import android.os.Message;
 import androidx.annotation.NonNull;
 import androidx.vectordrawable.graphics.drawable.Animatable2Compat;

-import org.signal.core.util.logging.Log;
+import org.signal.glide.Log;
 import org.signal.glide.common.decode.FrameSeqDecoder;
 import org.signal.glide.common.loader.Loader;

@@ -35,7 +35,7 @@ import java.util.Set;
 * @CreateDate: 2019/3/27
 */
 public abstract class FrameAnimationDrawable<Decoder extends FrameSeqDecoder> extends Drawable implements Animatable2Compat, FrameSeqDecoder.RenderListener {
-    private static final String TAG = Log.tag(FrameAnimationDrawable.class);
+    private static final String TAG = FrameAnimationDrawable.class.getSimpleName();
    private final Paint paint = new Paint();
    private final Decoder frameSeqDecoder;
    private DrawFilter drawFilter = new PaintFlagsDrawFilter(0, Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG);
--- a/app/src/main/java/org/signal/glide/common/decode/FrameSeqDecoder.java
+++ b/app/src/main/java/org/signal/glide/common/decode/FrameSeqDecoder.java
@@ -15,7 +15,7 @@ import android.os.Looper;
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;

-import org.signal.core.util.logging.Log;
+import org.signal.glide.Log;
 import org.signal.glide.common.executor.FrameDecoderExecutor;
 import org.signal.glide.common.io.Reader;
 import org.signal.glide.common.io.Writer;
@@ -39,7 +39,7 @@ import java.util.concurrent.locks.LockSupport;
 * @CreateDate: 2019/3/27
 */
 public abstract class FrameSeqDecoder<R extends Reader, W extends Writer> {
-    private static final String TAG = Log.tag(FrameSeqDecoder.class);
+    private static final String TAG = FrameSeqDecoder.class.getSimpleName();
    private final int taskId;

    private final Loader mLoader;
--- a/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.java
@@ -0,0 +1,22 @@
+package org.thoughtcrime.securesms;
+
+import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.whispersystems.signalservice.api.account.AccountAttributes;
+
+public final class AppCapabilities {
+
+  private AppCapabilities() {
+  }
+
+  private static final boolean UUID_CAPABLE  = false;
+  private static final boolean GV2_CAPABLE   = true;
+  private static final boolean GV1_MIGRATION = true;
+
+  /**
+   * @param storageCapable Whether or not the user can use storage service. This is another way of
+   *                       asking if the user has set a Signal PIN or not.
+   */
+  public static AccountAttributes.Capabilities getCapabilities(boolean storageCapable) {
+    return new AccountAttributes.Capabilities(UUID_CAPABLE, GV2_CAPABLE, storageCapable, GV1_MIGRATION);
+  }
+}
--- a/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.kt
@@ -1,27 +0,0 @@
-package org.thoughtcrime.securesms
-
-import org.thoughtcrime.securesms.util.FeatureFlags
-import org.whispersystems.signalservice.api.account.AccountAttributes
-
-object AppCapabilities {
-  /**
-   * @param storageCapable Whether or not the user can use storage service. This is another way of
-   * asking if the user has set a Signal PIN or not.
-   */
-  @JvmStatic
-  fun getCapabilities(storageCapable: Boolean): AccountAttributes.Capabilities {
-    return AccountAttributes.Capabilities(
-      isUuid = false,
-      isGv2 = true,
-      isStorage = storageCapable,
-      isGv1Migration = true,
-      isSenderKey = true,
-      isAnnouncementGroup = true,
-      isChangeNumber = true,
-      isStories = true,
-      isGiftBadges = true,
-      isPnp = FeatureFlags.phoneNumberPrivacy(),
-      paymentActivation = true
-    )
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/AppInitialization.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/AppInitialization.java
@@ -8,7 +8,6 @@ import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.insights.InsightsOptOut;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
-import org.thoughtcrime.securesms.jobs.EmojiSearchIndexDownloadJob;
 import org.thoughtcrime.securesms.jobs.StickerPackDownloadJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
@@ -33,9 +32,10 @@ public final class AppInitialization {
    InsightsOptOut.userRequestedOptOut(context);
    TextSecurePreferences.setAppMigrationVersion(context, ApplicationMigrations.CURRENT_VERSION);
    TextSecurePreferences.setJobManagerVersion(context, JobManager.CURRENT_VERSION);
-    TextSecurePreferences.setLastVersionCode(context, Util.getCanonicalVersionCode());
+    TextSecurePreferences.setLastExperienceVersionCode(context, Util.getCanonicalVersionCode());
    TextSecurePreferences.setHasSeenStickerIntroTooltip(context, true);
    TextSecurePreferences.setPasswordDisabled(context, true);
+    TextSecurePreferences.setLastExperienceVersionCode(context, Util.getCanonicalVersionCode());
    TextSecurePreferences.setReadReceiptsEnabled(context, true);
    TextSecurePreferences.setTypingIndicatorsEnabled(context, true);
    TextSecurePreferences.setHasSeenWelcomeScreen(context, false);
@@ -43,7 +43,6 @@ public final class AppInitialization {
    SignalStore.onFirstEverAppLaunch();
    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.ZOZO.getPackId(), BlessedPacks.ZOZO.getPackKey(), false));
    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.BANDIT.getPackId(), BlessedPacks.BANDIT.getPackKey(), false));
-    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.DAY_BY_DAY.getPackId(), BlessedPacks.DAY_BY_DAY.getPackKey(), false));
    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forReference(BlessedPacks.SWOON_HANDS.getPackId(), BlessedPacks.SWOON_HANDS.getPackKey()));
    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forReference(BlessedPacks.SWOON_FACES.getPackId(), BlessedPacks.SWOON_FACES.getPackKey()));
  }
@@ -51,37 +50,10 @@ public final class AppInitialization {
  public static void onPostBackupRestore(@NonNull Context context) {
    Log.i(TAG, "onPostBackupRestore()");

-    ApplicationDependencies.getMegaphoneRepository().onFirstEverAppLaunch();
-    SignalStore.onPostBackupRestore();
-    SignalStore.onFirstEverAppLaunch();
-    SignalStore.onboarding().clearAll();
-    TextSecurePreferences.onPostBackupRestore(context);
-    TextSecurePreferences.setPasswordDisabled(context, true);
-    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.ZOZO.getPackId(), BlessedPacks.ZOZO.getPackKey(), false));
-    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.BANDIT.getPackId(), BlessedPacks.BANDIT.getPackKey(), false));
-    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.DAY_BY_DAY.getPackId(), BlessedPacks.DAY_BY_DAY.getPackKey(), false));
-    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forReference(BlessedPacks.SWOON_HANDS.getPackId(), BlessedPacks.SWOON_HANDS.getPackKey()));
-    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forReference(BlessedPacks.SWOON_FACES.getPackId(), BlessedPacks.SWOON_FACES.getPackKey()));
-    EmojiSearchIndexDownloadJob.scheduleImmediately();
-  }
-
-  /**
-   * Temporary migration method that does the safest bits of {@link #onFirstEverAppLaunch(Context)}
-   */
-  public static void onRepairFirstEverAppLaunch(@NonNull Context context) {
-    Log.w(TAG, "onRepairFirstEverAppLaunch()");
-
-    InsightsOptOut.userRequestedOptOut(context);
-    TextSecurePreferences.setAppMigrationVersion(context, ApplicationMigrations.CURRENT_VERSION);
-    TextSecurePreferences.setJobManagerVersion(context, JobManager.CURRENT_VERSION);
-    TextSecurePreferences.setLastVersionCode(context, Util.getCanonicalVersionCode());
-    TextSecurePreferences.setHasSeenStickerIntroTooltip(context, true);
-    TextSecurePreferences.setPasswordDisabled(context, true);
    ApplicationDependencies.getMegaphoneRepository().onFirstEverAppLaunch();
    SignalStore.onFirstEverAppLaunch();
    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.ZOZO.getPackId(), BlessedPacks.ZOZO.getPackKey(), false));
    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.BANDIT.getPackId(), BlessedPacks.BANDIT.getPackKey(), false));
-    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.DAY_BY_DAY.getPackId(), BlessedPacks.DAY_BY_DAY.getPackKey(), false));
    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forReference(BlessedPacks.SWOON_HANDS.getPackId(), BlessedPacks.SWOON_HANDS.getPackKey()));
    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forReference(BlessedPacks.SWOON_FACES.getPackId(), BlessedPacks.SWOON_FACES.getPackKey()));
  }
--- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
@@ -18,103 +18,74 @@ package org.thoughtcrime.securesms;

 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.os.AsyncTask;
 import android.os.Build;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
-import androidx.annotation.WorkerThread;
 import androidx.appcompat.app.AppCompatDelegate;
+import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.ProcessLifecycleOwner;
 import androidx.multidex.MultiDexApplication;

 import com.google.android.gms.security.ProviderInstaller;

 import org.conscrypt.Conscrypt;
-import org.greenrobot.eventbus.EventBus;
 import org.signal.aesgcmprovider.AesGcmProvider;
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.AndroidLogger;
 import org.signal.core.util.logging.Log;
-import org.signal.core.util.tracing.Tracer;
-import org.signal.donations.GooglePayApi;
-import org.signal.donations.StripeApi;
+import org.signal.core.util.logging.PersistentLogger;
 import org.signal.glide.SignalGlideCodecs;
-import org.signal.libsignal.protocol.logging.SignalProtocolLoggerProvider;
 import org.signal.ringrtc.CallManager;
-import org.thoughtcrime.securesms.avatar.AvatarPickerStorage;
-import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider;
-import org.thoughtcrime.securesms.crypto.DatabaseSecretProvider;
-import org.thoughtcrime.securesms.database.LogDatabase;
-import org.thoughtcrime.securesms.database.SignalDatabase;
-import org.thoughtcrime.securesms.database.SqlCipherLibraryLoader;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencyProvider;
-import org.thoughtcrime.securesms.emoji.EmojiSource;
-import org.thoughtcrime.securesms.emoji.JumboEmoji;
 import org.thoughtcrime.securesms.gcm.FcmJobService;
-import org.thoughtcrime.securesms.jobs.CheckServiceReachabilityJob;
-import org.thoughtcrime.securesms.jobs.DownloadLatestEmojiDataJob;
-import org.thoughtcrime.securesms.jobs.EmojiSearchIndexDownloadJob;
+import org.thoughtcrime.securesms.jobs.CreateSignedPreKeyJob;
 import org.thoughtcrime.securesms.jobs.FcmRefreshJob;
-import org.thoughtcrime.securesms.jobs.FontDownloaderJob;
-import org.thoughtcrime.securesms.jobs.GroupV2UpdateSelfProfileKeyJob;
+import org.thoughtcrime.securesms.jobs.GroupV1MigrationJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
-import org.thoughtcrime.securesms.jobs.PnpInitializeDevicesJob;
-import org.thoughtcrime.securesms.jobs.PreKeysSyncJob;
-import org.thoughtcrime.securesms.jobs.ProfileUploadJob;
 import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
+import org.thoughtcrime.securesms.jobs.RefreshPreKeysJob;
 import org.thoughtcrime.securesms.jobs.RetrieveProfileJob;
-import org.thoughtcrime.securesms.jobs.RetrieveRemoteAnnouncementsJob;
-import org.thoughtcrime.securesms.jobs.StoryOnboardingDownloadJob;
-import org.thoughtcrime.securesms.jobs.SubscriptionKeepAliveJob;
-import org.thoughtcrime.securesms.keyvalue.KeepMessagesDuration;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger;
-import org.thoughtcrime.securesms.logging.PersistentLogger;
-import org.thoughtcrime.securesms.messageprocessingalarm.MessageProcessReceiver;
+import org.thoughtcrime.securesms.logging.LogSecretProvider;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
-import org.thoughtcrime.securesms.mms.SignalGlideComponents;
-import org.thoughtcrime.securesms.mms.SignalGlideModule;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.providers.BlobProvider;
-import org.thoughtcrime.securesms.ratelimit.RateLimitUtil;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
 import org.thoughtcrime.securesms.registration.RegistrationUtil;
+import org.thoughtcrime.securesms.revealable.ViewOnceMessageManager;
 import org.thoughtcrime.securesms.ringrtc.RingRtcLogger;
 import org.thoughtcrime.securesms.service.DirectoryRefreshListener;
+import org.thoughtcrime.securesms.service.ExpiringMessageManager;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.service.LocalBackupListener;
 import org.thoughtcrime.securesms.service.RotateSenderCertificateListener;
 import org.thoughtcrime.securesms.service.RotateSignedPreKeyListener;
 import org.thoughtcrime.securesms.service.UpdateApkRefreshListener;
-import org.thoughtcrime.securesms.service.webrtc.AndroidTelecomUtil;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
-import org.thoughtcrime.securesms.util.AppForegroundObserver;
-import org.thoughtcrime.securesms.util.AppStartup;
+import org.thoughtcrime.securesms.tracing.Trace;
+import org.thoughtcrime.securesms.tracing.Tracer;
 import org.thoughtcrime.securesms.util.DynamicTheme;
-import org.thoughtcrime.securesms.util.Environment;
 import org.thoughtcrime.securesms.util.FeatureFlags;
-import org.thoughtcrime.securesms.util.SignalLocalMetrics;
 import org.thoughtcrime.securesms.util.SignalUncaughtExceptionHandler;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
-import org.thoughtcrime.securesms.util.VersionTracker;
 import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
+import org.webrtc.voiceengine.WebRtcAudioManager;
+import org.webrtc.voiceengine.WebRtcAudioUtils;
+import org.whispersystems.libsignal.logging.SignalProtocolLoggerProvider;

-import java.net.SocketException;
-import java.net.SocketTimeoutException;
 import java.security.Security;
-import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;

-import io.reactivex.rxjava3.core.CompletableObserver;
-import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException;
-import io.reactivex.rxjava3.exceptions.UndeliverableException;
-import io.reactivex.rxjava3.plugins.RxJavaPlugins;
-import io.reactivex.rxjava3.schedulers.Schedulers;
-import rxdogtag2.RxDogTag;
-
 /**
 * Will be called once when the TextSecure process is created.
 *
@@ -123,11 +94,16 @@ import rxdogtag2.RxDogTag;
 *
 * @author Moxie Marlinspike
 */
-public class ApplicationContext extends MultiDexApplication implements AppForegroundObserver.Listener {
+@Trace
+public class ApplicationContext extends MultiDexApplication implements DefaultLifecycleObserver {

-  private static final String TAG = Log.tag(ApplicationContext.class);
+  private static final String TAG = ApplicationContext.class.getSimpleName();

-  private PersistentLogger persistentLogger;
+  private ExpiringMessageManager expiringMessageManager;
+  private ViewOnceMessageManager viewOnceMessageManager;
+  private PersistentLogger       persistentLogger;
+
+  private volatile boolean isAppVisible;

  public static ApplicationContext getInstance(Context context) {
    return (ApplicationContext)context.getApplicationContext();
@@ -136,130 +112,83 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
  @Override
  public void onCreate() {
    Tracer.getInstance().start("Application#onCreate()");
-    AppStartup.getInstance().onApplicationCreate();
-    SignalLocalMetrics.ColdStart.start();
-
    long startTime = System.currentTimeMillis();

-    if (FeatureFlags.internalUser()) {
-      Tracer.getInstance().setMaxBufferSize(35_000);
-    }
-
    super.onCreate();

-    AppStartup.getInstance().addBlocking("security-provider", this::initializeSecurityProvider)
-                            .addBlocking("sqlcipher-init", () -> {
-                              SqlCipherLibraryLoader.load();
-                              SignalDatabase.init(this,
-                                                  DatabaseSecretProvider.getOrCreateDatabaseSecret(this),
-                                                  AttachmentSecretProvider.getInstance(this).getOrCreateAttachmentSecret());
-                            })
-                            .addBlocking("logging", () -> {
-                              initializeLogging();
-                              Log.i(TAG, "onCreate()");
-                            })
-                            .addBlocking("crash-handling", this::initializeCrashHandling)
-                            .addBlocking("rx-init", this::initializeRx)
-                            .addBlocking("event-bus", () -> EventBus.builder().logNoSubscriberMessages(false).installDefaultEventBus())
-                            .addBlocking("app-dependencies", this::initializeAppDependencies)
-                            .addBlocking("first-launch", this::initializeFirstEverAppLaunch)
-                            .addBlocking("app-migrations", this::initializeApplicationMigrations)
-                            .addBlocking("ring-rtc", this::initializeRingRtc)
-                            .addBlocking("mark-registration", () -> RegistrationUtil.maybeMarkRegistrationComplete(this))
-                            .addBlocking("lifecycle-observer", () -> ApplicationDependencies.getAppForegroundObserver().addListener(this))
-                            .addBlocking("message-retriever", this::initializeMessageRetrieval)
-                            .addBlocking("dynamic-theme", () -> DynamicTheme.setDefaultDayNightMode(this))
-                            .addBlocking("proxy-init", () -> {
-                              if (SignalStore.proxy().isProxyEnabled()) {
-                                Log.w(TAG, "Proxy detected. Enabling Conscrypt.setUseEngineSocketByDefault()");
-                                Conscrypt.setUseEngineSocketByDefault(true);
-                              }
-                            })
-                            .addBlocking("blob-provider", this::initializeBlobProvider)
-                            .addBlocking("feature-flags", FeatureFlags::init)
-                            .addBlocking("glide", () -> SignalGlideModule.setRegisterGlideComponents(new SignalGlideComponents()))
-                            .addNonBlocking(this::checkIsGooglePayReady)
-                            .addNonBlocking(this::cleanAvatarStorage)
-                            .addNonBlocking(this::initializeRevealableMessageManager)
-                            .addNonBlocking(this::initializePendingRetryReceiptManager)
-                            .addNonBlocking(this::initializeScheduledMessageManager)
-                            .addNonBlocking(this::initializeFcmCheck)
-                            .addNonBlocking(PreKeysSyncJob::enqueueIfNeeded)
-                            .addNonBlocking(this::initializePeriodicTasks)
-                            .addNonBlocking(this::initializeCircumvention)
-                            .addNonBlocking(this::initializePendingMessages)
-                            .addNonBlocking(this::initializeCleanup)
-                            .addNonBlocking(this::initializeGlideCodecs)
-                            .addNonBlocking(StorageSyncHelper::scheduleRoutineSync)
-                            .addNonBlocking(() -> ApplicationDependencies.getJobManager().beginJobLoop())
-                            .addNonBlocking(EmojiSource::refresh)
-                            .addNonBlocking(() -> ApplicationDependencies.getGiphyMp4Cache().onAppStart(this))
-                            .addNonBlocking(this::ensureProfileUploaded)
-                            .addNonBlocking(() -> ApplicationDependencies.getExpireStoriesManager().scheduleIfNecessary())
-                            .addPostRender(() -> RateLimitUtil.retryAllRateLimitedMessages(this))
-                            .addPostRender(this::initializeExpiringMessageManager)
-                            .addPostRender(() -> SignalStore.settings().setDefaultSms(Util.isDefaultSmsProvider(this)))
-                            .addPostRender(this::initializeTrimThreadsByDateManager)
-                            .addPostRender(() -> DownloadLatestEmojiDataJob.scheduleIfNecessary(this))
-                            .addPostRender(EmojiSearchIndexDownloadJob::scheduleIfNecessary)
-                            .addPostRender(() -> SignalDatabase.messageLog().trimOldMessages(System.currentTimeMillis(), FeatureFlags.retryRespondMaxAge()))
-                            .addPostRender(() -> JumboEmoji.updateCurrentVersion(this))
-                            .addPostRender(RetrieveRemoteAnnouncementsJob::enqueue)
-                            .addPostRender(() -> AndroidTelecomUtil.registerPhoneAccount())
-                            .addPostRender(() -> ApplicationDependencies.getJobManager().add(new FontDownloaderJob()))
-                            .addPostRender(CheckServiceReachabilityJob::enqueueIfNecessary)
-                            .addPostRender(GroupV2UpdateSelfProfileKeyJob::enqueueForGroupsIfNecessary)
-                            .addPostRender(StoryOnboardingDownloadJob.Companion::enqueueIfNeeded)
-                            .addPostRender(PnpInitializeDevicesJob::enqueueIfNecessary)
-                            .addPostRender(() -> ApplicationDependencies.getExoPlayerPool().getPoolStats().getMaxUnreserved())
-                            .execute();
+    initializeSecurityProvider();
+    initializeLogging();
+    Log.i(TAG, "onCreate()");
+    initializeCrashHandling();
+    initializeAppDependencies();
+    initializeFirstEverAppLaunch();
+    initializeApplicationMigrations();
+    initializeMessageRetrieval();
+    initializeExpiringMessageManager();
+    initializeRevealableMessageManager();
+    initializeGcmCheck();
+    initializeSignedPreKeyCheck();
+    initializePeriodicTasks();
+    initializeCircumvention();
+    initializeRingRtc();
+    initializePendingMessages();
+    initializeBlobProvider();
+    initializeCleanup();
+    initializeGlideCodecs();
+
+    FeatureFlags.init();
+    NotificationChannels.create(this);
+    RefreshPreKeysJob.scheduleIfNecessary();
+    StorageSyncHelper.scheduleRoutineSync();
+    RegistrationUtil.maybeMarkRegistrationComplete(this);
+    ProcessLifecycleOwner.get().getLifecycle().addObserver(this);
+
+    if (Build.VERSION.SDK_INT < 21) {
+      AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
+    }
+
+    ApplicationDependencies.getJobManager().beginJobLoop();
+
+    DynamicTheme.setDefaultDayNightMode(this);

    Log.d(TAG, "onCreate() took " + (System.currentTimeMillis() - startTime) + " ms");
-    SignalLocalMetrics.ColdStart.onApplicationCreateFinished();
    Tracer.getInstance().end("Application#onCreate()");
  }

  @Override
-  public void onForeground() {
-    long startTime = System.currentTimeMillis();
+  public void onStart(@NonNull LifecycleOwner owner) {
+    isAppVisible = true;
    Log.i(TAG, "App is now visible.");
-
-    ApplicationDependencies.getFrameRateTracker().start();
+    FeatureFlags.refreshIfNecessary();
+    ApplicationDependencies.getRecipientCache().warmUp();
+    RetrieveProfileJob.enqueueRoutineFetchIfNecessary(this);
+    GroupV1MigrationJob.enqueueRoutineMigrationsIfNecessary(this);
+    executePendingContactSync();
+    KeyCachingService.onAppForegrounded(this);
+    ApplicationDependencies.getFrameRateTracker().begin();
    ApplicationDependencies.getMegaphoneRepository().onAppForegrounded();
-    ApplicationDependencies.getDeadlockDetector().start();
-    SubscriptionKeepAliveJob.enqueueAndTrackTimeIfNecessary();
-
-    SignalExecutors.BOUNDED.execute(() -> {
-      FeatureFlags.refreshIfNecessary();
-      ApplicationDependencies.getRecipientCache().warmUp();
-      RetrieveProfileJob.enqueueRoutineFetchIfNecessary(this);
-      executePendingContactSync();
-      KeyCachingService.onAppForegrounded(this);
-      ApplicationDependencies.getShakeToReport().enable();
-      checkBuildExpiration();
-
-      long lastForegroundTime = SignalStore.misc().getLastForegroundTime();
-      long currentTime        = System.currentTimeMillis();
-      long timeDiff           = currentTime - lastForegroundTime;
-
-      if (timeDiff < 0) {
-        Log.w(TAG, "Time travel! The system clock has moved backwards. (currentTime: " + currentTime + " ms, lastForegroundTime: " + lastForegroundTime + " ms, diff: " + timeDiff + " ms)");
-      }
-
-      SignalStore.misc().setLastForegroundTime(currentTime);
-    });
-
-    Log.d(TAG, "onStart() took " + (System.currentTimeMillis() - startTime) + " ms");
+    checkBuildExpiration();
  }

  @Override
-  public void onBackground() {
+  public void onStop(@NonNull LifecycleOwner owner) {
+    isAppVisible = false;
    Log.i(TAG, "App is no longer visible.");
    KeyCachingService.onAppBackgrounded(this);
    ApplicationDependencies.getMessageNotifier().clearVisibleThread();
-    ApplicationDependencies.getFrameRateTracker().stop();
-    ApplicationDependencies.getShakeToReport().disable();
-    ApplicationDependencies.getDeadlockDetector().stop();
+    ApplicationDependencies.getFrameRateTracker().end();
+  }
+
+  public ExpiringMessageManager getExpiringMessageManager() {
+    return expiringMessageManager;
+  }
+
+  public ViewOnceMessageManager getViewOnceMessageManager() {
+    return viewOnceMessageManager;
+  }
+
+  public boolean isAppVisible() {
+    return isAppVisible;
  }

  public PersistentLogger getPersistentLogger() {
@@ -298,15 +227,10 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
  }

  private void initializeLogging() {
-    persistentLogger = new PersistentLogger(this);
-    org.signal.core.util.logging.Log.initialize(FeatureFlags::internalUser, new AndroidLogger(), persistentLogger);
+    persistentLogger = new PersistentLogger(this, LogSecretProvider.getOrCreateAttachmentSecret(this), BuildConfig.VERSION_NAME);
+    org.signal.core.util.logging.Log.initialize(new AndroidLogger(), persistentLogger);

    SignalProtocolLoggerProvider.setProvider(new CustomSignalProtocolLogger());
-
-    SignalExecutors.UNBOUNDED.execute(() -> {
-      Log.blockUntilAllWritesFinished();
-      LogDatabase.getInstance(this).trimToSize();
-    });
  }

  private void initializeCrashHandling() {
@@ -314,30 +238,6 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
    Thread.setDefaultUncaughtExceptionHandler(new SignalUncaughtExceptionHandler(originalHandler));
  }

-  private void initializeRx() {
-    RxDogTag.install();
-    RxJavaPlugins.setInitIoSchedulerHandler(schedulerSupplier -> Schedulers.from(SignalExecutors.BOUNDED_IO, true, false));
-    RxJavaPlugins.setInitComputationSchedulerHandler(schedulerSupplier -> Schedulers.from(SignalExecutors.BOUNDED, true, false));
-    RxJavaPlugins.setErrorHandler(e -> {
-      boolean wasWrapped = false;
-      while ((e instanceof UndeliverableException || e instanceof AssertionError || e instanceof OnErrorNotImplementedException) && e.getCause() != null) {
-        wasWrapped = true;
-        e = e.getCause();
-      }
-
-      if (wasWrapped && (e instanceof SocketException || e instanceof SocketTimeoutException || e instanceof InterruptedException)) {
-        return;
-      }
-
-      Thread.UncaughtExceptionHandler uncaughtExceptionHandler = Thread.currentThread().getUncaughtExceptionHandler();
-      if (uncaughtExceptionHandler == null) {
-        uncaughtExceptionHandler = Thread.getDefaultUncaughtExceptionHandler();
-      }
-
-      uncaughtExceptionHandler.uncaughtException(Thread.currentThread(), e);
-    });
-  }
-
  private void initializeApplicationMigrations() {
    ApplicationMigrations.onApplicationCreate(this, ApplicationDependencies.getJobManager());
  }
@@ -346,60 +246,44 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
    ApplicationDependencies.getIncomingMessageObserver();
  }

-  @VisibleForTesting
-  void initializeAppDependencies() {
-    ApplicationDependencies.init(this, new ApplicationDependencyProvider(this));
+  private void initializeAppDependencies() {
+    ApplicationDependencies.init(this, new ApplicationDependencyProvider(this, new SignalServiceNetworkAccess(this)));
  }

  private void initializeFirstEverAppLaunch() {
    if (TextSecurePreferences.getFirstInstallVersion(this) == -1) {
-      if (!SignalDatabase.databaseFileExists(this) || VersionTracker.getDaysSinceFirstInstalled(this) < 365) {
+      if (!SQLCipherOpenHelper.databaseFileExists(this)) {
        Log.i(TAG, "First ever app launch!");
        AppInitialization.onFirstEverAppLaunch(this);
      }

      Log.i(TAG, "Setting first install version to " + BuildConfig.CANONICAL_VERSION_CODE);
      TextSecurePreferences.setFirstInstallVersion(this, BuildConfig.CANONICAL_VERSION_CODE);
-    } else if (!TextSecurePreferences.isPasswordDisabled(this) && VersionTracker.getDaysSinceFirstInstalled(this) < 90) {
-      Log.i(TAG, "Detected a new install that doesn't have passphrases disabled -- assuming bad initialization.");
-      AppInitialization.onRepairFirstEverAppLaunch(this);
-    } else if (!TextSecurePreferences.isPasswordDisabled(this) && VersionTracker.getDaysSinceFirstInstalled(this) < 912) {
-      Log.i(TAG, "Detected a not-recent install that doesn't have passphrases disabled -- disabling now.");
-      TextSecurePreferences.setPasswordDisabled(this, true);
    }
  }

-  private void initializeFcmCheck() {
-    if (SignalStore.account().isRegistered()) {
-      long nextSetTime = SignalStore.account().getFcmTokenLastSetTime() + TimeUnit.HOURS.toMillis(6);
+  private void initializeGcmCheck() {
+    if (TextSecurePreferences.isPushRegistered(this)) {
+      long nextSetTime = TextSecurePreferences.getFcmTokenLastSetTime(this) + TimeUnit.HOURS.toMillis(6);

-      if (SignalStore.account().getFcmToken() == null || nextSetTime <= System.currentTimeMillis()) {
+      if (TextSecurePreferences.getFcmToken(this) == null || nextSetTime <= System.currentTimeMillis()) {
        ApplicationDependencies.getJobManager().add(new FcmRefreshJob());
      }
    }
  }

+  private void initializeSignedPreKeyCheck() {
+    if (!TextSecurePreferences.isSignedPreKeyRegistered(this)) {
+      ApplicationDependencies.getJobManager().add(new CreateSignedPreKeyJob(this));
+    }
+  }
+
  private void initializeExpiringMessageManager() {
-    ApplicationDependencies.getExpiringMessageManager().checkSchedule();
+    this.expiringMessageManager = new ExpiringMessageManager(this);
  }

  private void initializeRevealableMessageManager() {
-    ApplicationDependencies.getViewOnceMessageManager().scheduleIfNecessary();
-  }
-
-  private void initializePendingRetryReceiptManager() {
-    ApplicationDependencies.getPendingRetryReceiptManager().scheduleIfNecessary();
-  }
-
-  private void initializeScheduledMessageManager() {
-    ApplicationDependencies.getScheduledMessageManager().scheduleIfNecessary();
-  }
-
-  private void initializeTrimThreadsByDateManager() {
-    KeepMessagesDuration keepMessagesDuration = SignalStore.settings().getKeepMessagesDuration();
-    if (keepMessagesDuration != KeepMessagesDuration.FOREVER) {
-      ApplicationDependencies.getTrimThreadsByDateManager().scheduleIfNecessary();
-    }
+    this.viewOnceMessageManager = new ViewOnceMessageManager(this);
  }

  private void initializePeriodicTasks() {
@@ -407,7 +291,6 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
    DirectoryRefreshListener.schedule(this);
    LocalBackupListener.schedule(this);
    RotateSenderCertificateListener.schedule(this);
-    MessageProcessReceiver.startOrUpdateAlarm(this);

    if (BuildConfig.PLAY_STORE_DISABLED) {
      UpdateApkRefreshListener.schedule(this);
@@ -416,28 +299,57 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr

  private void initializeRingRtc() {
    try {
-      CallManager.initialize(this, new RingRtcLogger(), Collections.emptyMap());
+      Set<String> HARDWARE_AEC_BLACKLIST = new HashSet<String>() {{
+        add("Pixel");
+        add("Pixel XL");
+        add("Moto G5");
+        add("Moto G (5S) Plus");
+        add("Moto G4");
+        add("TA-1053");
+        add("Mi A1");
+        add("Mi A2");
+        add("E5823"); // Sony z5 compact
+        add("Redmi Note 5");
+        add("FP2"); // Fairphone FP2
+        add("MI 5");
+      }};
+
+      Set<String> OPEN_SL_ES_WHITELIST = new HashSet<String>() {{
+        add("Pixel");
+        add("Pixel XL");
+      }};
+
+      if (HARDWARE_AEC_BLACKLIST.contains(Build.MODEL)) {
+        WebRtcAudioUtils.setWebRtcBasedAcousticEchoCanceler(true);
+      }
+
+      if (!OPEN_SL_ES_WHITELIST.contains(Build.MODEL)) {
+        WebRtcAudioManager.setBlacklistDeviceForOpenSLESUsage(true);
+      }
+
+      CallManager.initialize(this, new RingRtcLogger());
    } catch (UnsatisfiedLinkError e) {
      throw new AssertionError("Unable to load ringrtc library", e);
    }
  }

-  @WorkerThread
+  @SuppressLint("StaticFieldLeak")
  private void initializeCircumvention() {
-    if (ApplicationDependencies.getSignalServiceNetworkAccess().isCensored()) {
-      try {
-        ProviderInstaller.installIfNeeded(ApplicationContext.this);
-      } catch (Throwable t) {
-        Log.w(TAG, t);
+    AsyncTask<Void, Void, Void> task = new AsyncTask<Void, Void, Void>() {
+      @Override
+      protected Void doInBackground(Void... params) {
+        if (new SignalServiceNetworkAccess(ApplicationContext.this).isCensored(ApplicationContext.this)) {
+          try {
+            ProviderInstaller.installIfNeeded(ApplicationContext.this);
+          } catch (Throwable t) {
+            Log.w(TAG, t);
+          }
+        }
+        return null;
      }
-    }
-  }
+    };

-  private void ensureProfileUploaded() {
-    if (SignalStore.account().isRegistered() && !SignalStore.registrationValues().hasUploadedProfile() && !Recipient.self().getProfileName().isEmpty()) {
-      Log.w(TAG, "User has a profile, but has not uploaded one. Uploading now.");
-      ApplicationDependencies.getJobManager().add(new ProfileUploadJob());
-    }
+    task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
  }

  private void executePendingContactSync() {
@@ -452,38 +364,23 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
      if (Build.VERSION.SDK_INT >= 26) {
        FcmJobService.schedule(this);
      } else {
-        ApplicationDependencies.getJobManager().add(new PushNotificationReceiveJob());
+        ApplicationDependencies.getJobManager().add(new PushNotificationReceiveJob(this));
      }
      TextSecurePreferences.setNeedsMessagePull(this, false);
    }
  }

-  @WorkerThread
  private void initializeBlobProvider() {
-    BlobProvider.getInstance().initialize(this);
+    SignalExecutors.BOUNDED.execute(() -> {
+      BlobProvider.getInstance().onSessionStart(this);
+    });
  }

-  @WorkerThread
-  private void cleanAvatarStorage() {
-    AvatarPickerStorage.cleanOrphans(this);
-  }
-
-  @SuppressLint("CheckResult")
-  private void checkIsGooglePayReady() {
-    GooglePayApi.queryIsReadyToPay(
-        this,
-        new StripeApi.Gateway(Environment.Donations.getStripeConfiguration()),
-        Environment.Donations.getGooglePayConfiguration()
-    ).subscribe(
-        /* onComplete = */ () -> SignalStore.donationsValues().setGooglePayReady(true),
-        /* onError    = */ t -> SignalStore.donationsValues().setGooglePayReady(false)
-    );
-  }
-
-  @WorkerThread
  private void initializeCleanup() {
-    int deleted = SignalDatabase.attachments().deleteAbandonedPreuploadedAttachments();
-    Log.i(TAG, "Deleted " + deleted + " abandoned attachments.");
+    SignalExecutors.BOUNDED.execute(() -> {
+      int deleted = DatabaseFactory.getAttachmentDatabase(this).deleteAbandonedPreuploadedAttachments();
+      Log.i(TAG, "Deleted " + deleted + " abandoned attachments.");
+    });
  }

  private void initializeGlideCodecs() {
--- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
@@ -0,0 +1,359 @@
+/*
+ * Copyright (C) 2011 Whisper Systems
+ * Copyright (C) 2013-2017 Open Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.thoughtcrime.securesms;
+
+import android.app.AlertDialog;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.graphics.PorterDuff;
+import android.os.Build;
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.preference.Preference;
+
+import org.thoughtcrime.securesms.help.HelpFragment;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
+import org.thoughtcrime.securesms.preferences.AdvancedPreferenceFragment;
+import org.thoughtcrime.securesms.preferences.AppProtectionPreferenceFragment;
+import org.thoughtcrime.securesms.preferences.AppearancePreferenceFragment;
+import org.thoughtcrime.securesms.preferences.BackupsPreferenceFragment;
+import org.thoughtcrime.securesms.preferences.ChatsPreferenceFragment;
+import org.thoughtcrime.securesms.preferences.CorrectedPreferenceFragment;
+import org.thoughtcrime.securesms.preferences.NotificationsPreferenceFragment;
+import org.thoughtcrime.securesms.preferences.SmsMmsPreferenceFragment;
+import org.thoughtcrime.securesms.preferences.StoragePreferenceFragment;
+import org.thoughtcrime.securesms.preferences.widgets.ProfilePreference;
+import org.thoughtcrime.securesms.preferences.widgets.UsernamePreference;
+import org.thoughtcrime.securesms.profiles.edit.EditProfileActivity;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.service.KeyCachingService;
+import org.thoughtcrime.securesms.util.CachedInflater;
+import org.thoughtcrime.securesms.util.CommunicationActions;
+import org.thoughtcrime.securesms.util.DynamicLanguage;
+import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+
+/**
+ * The Activity for application preference display and management.
+ *
+ * @author Moxie Marlinspike
+ *
+ */
+
+public class ApplicationPreferencesActivity extends PassphraseRequiredActivity
+    implements SharedPreferences.OnSharedPreferenceChangeListener
+{
+  public static final String LAUNCH_TO_BACKUPS_FRAGMENT = "launch.to.backups.fragment";
+
+  @SuppressWarnings("unused")
+  private static final String TAG = ApplicationPreferencesActivity.class.getSimpleName();
+
+  private static final String PREFERENCE_CATEGORY_PROFILE        = "preference_category_profile";
+  private static final String PREFERENCE_CATEGORY_USERNAME       = "preference_category_username";
+  private static final String PREFERENCE_CATEGORY_SMS_MMS        = "preference_category_sms_mms";
+  private static final String PREFERENCE_CATEGORY_NOTIFICATIONS  = "preference_category_notifications";
+  private static final String PREFERENCE_CATEGORY_APP_PROTECTION = "preference_category_app_protection";
+  private static final String PREFERENCE_CATEGORY_APPEARANCE     = "preference_category_appearance";
+  private static final String PREFERENCE_CATEGORY_CHATS          = "preference_category_chats";
+  private static final String PREFERENCE_CATEGORY_STORAGE        = "preference_category_storage";
+  private static final String PREFERENCE_CATEGORY_DEVICES        = "preference_category_devices";
+  private static final String PREFERENCE_CATEGORY_HELP           = "preference_category_help";
+  private static final String PREFERENCE_CATEGORY_ADVANCED       = "preference_category_advanced";
+  private static final String PREFERENCE_CATEGORY_DONATE         = "preference_category_donate";
+
+  private static final String WAS_CONFIGURATION_UPDATED          = "was_configuration_updated";
+
+  private final DynamicTheme    dynamicTheme    = new DynamicTheme();
+  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
+
+  private boolean wasConfigurationUpdated = false;
+
+  @Override
+  protected void onPreCreate() {
+    dynamicTheme.onCreate(this);
+    dynamicLanguage.onCreate(this);
+  }
+
+  @Override
+  protected void onCreate(Bundle icicle, boolean ready) {
+    //noinspection ConstantConditions
+    this.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+    if (getIntent() != null && getIntent().getCategories() != null && getIntent().getCategories().contains("android.intent.category.NOTIFICATION_PREFERENCES")) {
+      initFragment(android.R.id.content, new NotificationsPreferenceFragment());
+    } else if (getIntent() != null && getIntent().getBooleanExtra(LAUNCH_TO_BACKUPS_FRAGMENT, false)) {
+      initFragment(android.R.id.content, new BackupsPreferenceFragment());
+    } else if (icicle == null) {
+      initFragment(android.R.id.content, new ApplicationPreferenceFragment());
+    } else {
+      wasConfigurationUpdated = icicle.getBoolean(WAS_CONFIGURATION_UPDATED);
+    }
+  }
+
+  @Override
+  protected void onSaveInstanceState(@NonNull Bundle outState) {
+    outState.putBoolean(WAS_CONFIGURATION_UPDATED, wasConfigurationUpdated);
+    super.onSaveInstanceState(outState);
+  }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    dynamicTheme.onResume(this);
+    dynamicLanguage.onResume(this);
+  }
+
+  @Override
+  protected void onActivityResult(int requestCode, int resultCode, Intent data)
+  {
+    super.onActivityResult(requestCode, resultCode, data);
+    Fragment fragment = getSupportFragmentManager().findFragmentById(android.R.id.content);
+    fragment.onActivityResult(requestCode, resultCode, data);
+  }
+
+  @Override
+  public boolean onSupportNavigateUp() {
+    FragmentManager fragmentManager = getSupportFragmentManager();
+    if (fragmentManager.getBackStackEntryCount() > 0) {
+      fragmentManager.popBackStack();
+    } else {
+      if (wasConfigurationUpdated) {
+        setResult(MainActivity.RESULT_CONFIG_CHANGED);
+      } else {
+        setResult(RESULT_OK);
+      }
+      finish();
+    }
+    return true;
+  }
+
+  @Override
+  public void onBackPressed() {
+    onSupportNavigateUp();
+  }
+
+  @Override
+  public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+    if (key.equals(TextSecurePreferences.THEME_PREF)) {
+      DynamicTheme.setDefaultDayNightMode(this);
+      recreate();
+    } else if (key.equals(TextSecurePreferences.LANGUAGE_PREF)) {
+      CachedInflater.from(this).clear();
+      wasConfigurationUpdated = true;
+      recreate();
+
+      Intent intent = new Intent(this, KeyCachingService.class);
+      intent.setAction(KeyCachingService.LOCALE_CHANGE_EVENT);
+      startService(intent);
+    }
+  }
+
+  public void pushFragment(@NonNull Fragment fragment) {
+    getSupportFragmentManager().beginTransaction()
+                               .setCustomAnimations(R.anim.slide_from_end, R.anim.slide_to_start, R.anim.slide_from_start, R.anim.slide_to_end)
+                               .replace(android.R.id.content, fragment)
+                               .addToBackStack(null)
+                               .commit();
+  }
+
+  public static class ApplicationPreferenceFragment extends CorrectedPreferenceFragment {
+
+    @Override
+    public void onCreate(Bundle icicle) {
+      super.onCreate(icicle);
+
+      this.findPreference(PREFERENCE_CATEGORY_PROFILE)
+          .setOnPreferenceClickListener(new ProfileClickListener());
+      this.findPreference(PREFERENCE_CATEGORY_USERNAME)
+          .setOnPreferenceClickListener(new UsernameClickListener());
+      this.findPreference(PREFERENCE_CATEGORY_SMS_MMS)
+        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_SMS_MMS));
+      this.findPreference(PREFERENCE_CATEGORY_NOTIFICATIONS)
+        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_NOTIFICATIONS));
+      this.findPreference(PREFERENCE_CATEGORY_APP_PROTECTION)
+        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_APP_PROTECTION));
+      this.findPreference(PREFERENCE_CATEGORY_APPEARANCE)
+        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_APPEARANCE));
+      this.findPreference(PREFERENCE_CATEGORY_CHATS)
+        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_CHATS));
+      this.findPreference(PREFERENCE_CATEGORY_STORAGE)
+        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_STORAGE));
+      this.findPreference(PREFERENCE_CATEGORY_DEVICES)
+        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_DEVICES));
+      this.findPreference(PREFERENCE_CATEGORY_HELP)
+          .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_HELP));
+      this.findPreference(PREFERENCE_CATEGORY_ADVANCED)
+          .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_ADVANCED));
+      this.findPreference(PREFERENCE_CATEGORY_DONATE)
+          .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_DONATE));
+
+      tintIcons();
+    }
+
+    private void tintIcons() {
+      if (Build.VERSION.SDK_INT >= 21) return;
+
+      Preference preference = this.findPreference(PREFERENCE_CATEGORY_SMS_MMS);
+      preference.getIcon().setColorFilter(ContextCompat.getColor(requireContext(), R.color.signal_icon_tint_primary), PorterDuff.Mode.SRC_IN);
+    }
+
+    @Override
+    public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) {
+      addPreferencesFromResource(R.xml.preferences);
+
+      if (FeatureFlags.usernames()) {
+        UsernamePreference pref = (UsernamePreference) findPreference(PREFERENCE_CATEGORY_USERNAME);
+        pref.setVisible(shouldDisplayUsernameReminder());
+        pref.setOnLongClickListener(v -> {
+          new AlertDialog.Builder(requireContext())
+                         .setMessage(R.string.ApplicationPreferencesActivity_hide_reminder)
+                         .setPositiveButton(R.string.ApplicationPreferencesActivity_hide, (dialog, which) -> {
+                           dialog.dismiss();
+                           SignalStore.misc().hideUsernameReminder();
+                             findPreference(PREFERENCE_CATEGORY_USERNAME).setVisible(false);
+                         })
+                         .setNegativeButton(android.R.string.cancel, ((dialog, which) -> dialog.dismiss()))
+                         .setCancelable(true)
+                         .show();
+          return true;
+        });
+      }
+    }
+
+    @Override
+    public void onResume() {
+      super.onResume();
+      //noinspection ConstantConditions
+      ((ApplicationPreferencesActivity) getActivity()).getSupportActionBar().setTitle(R.string.text_secure_normal__menu_settings);
+      setCategorySummaries();
+      setCategoryVisibility();
+    }
+
+    private void setCategorySummaries() {
+      ((ProfilePreference)this.findPreference(PREFERENCE_CATEGORY_PROFILE)).refresh();
+
+      if (FeatureFlags.usernames()) {
+        this.findPreference(PREFERENCE_CATEGORY_USERNAME)
+            .setVisible(shouldDisplayUsernameReminder());
+      }
+
+      this.findPreference(PREFERENCE_CATEGORY_SMS_MMS)
+          .setSummary(SmsMmsPreferenceFragment.getSummary(getActivity()));
+      this.findPreference(PREFERENCE_CATEGORY_NOTIFICATIONS)
+          .setSummary(NotificationsPreferenceFragment.getSummary(getActivity()));
+      this.findPreference(PREFERENCE_CATEGORY_APP_PROTECTION)
+          .setSummary(AppProtectionPreferenceFragment.getSummary(getActivity()));
+      this.findPreference(PREFERENCE_CATEGORY_APPEARANCE)
+          .setSummary(AppearancePreferenceFragment.getSummary(getActivity()));
+      this.findPreference(PREFERENCE_CATEGORY_CHATS)
+          .setSummary(ChatsPreferenceFragment.getSummary(getActivity()));
+    }
+
+    private void setCategoryVisibility() {
+      Preference devicePreference = this.findPreference(PREFERENCE_CATEGORY_DEVICES);
+      if (devicePreference != null && !TextSecurePreferences.isPushRegistered(getActivity())) {
+        getPreferenceScreen().removePreference(devicePreference);
+      }
+    }
+
+    private static boolean shouldDisplayUsernameReminder() {
+      return FeatureFlags.usernames() && !Recipient.self().getUsername().isPresent() && SignalStore.misc().shouldShowUsernameReminder();
+    }
+
+    private class CategoryClickListener implements Preference.OnPreferenceClickListener {
+      private String category;
+
+      CategoryClickListener(String category) {
+        this.category = category;
+      }
+
+      @Override
+      public boolean onPreferenceClick(Preference preference) {
+        Fragment fragment = null;
+
+        switch (category) {
+        case PREFERENCE_CATEGORY_SMS_MMS:
+          fragment = new SmsMmsPreferenceFragment();
+          break;
+        case PREFERENCE_CATEGORY_NOTIFICATIONS:
+          fragment = new NotificationsPreferenceFragment();
+          break;
+        case PREFERENCE_CATEGORY_APP_PROTECTION:
+          fragment = new AppProtectionPreferenceFragment();
+          break;
+        case PREFERENCE_CATEGORY_APPEARANCE:
+          fragment = new AppearancePreferenceFragment();
+          break;
+        case PREFERENCE_CATEGORY_CHATS:
+          fragment = new ChatsPreferenceFragment();
+          break;
+        case PREFERENCE_CATEGORY_STORAGE:
+          fragment = new StoragePreferenceFragment();
+          break;
+        case PREFERENCE_CATEGORY_DEVICES:
+          Intent intent = new Intent(getActivity(), DeviceActivity.class);
+          startActivity(intent);
+          break;
+        case PREFERENCE_CATEGORY_ADVANCED:
+          fragment = new AdvancedPreferenceFragment();
+          break;
+        case PREFERENCE_CATEGORY_HELP:
+          fragment = new HelpFragment();
+          break;
+        case PREFERENCE_CATEGORY_DONATE:
+          CommunicationActions.openBrowserLink(requireContext(), getString(R.string.donate_url));
+          break;
+        default:
+          throw new AssertionError();
+        }
+
+        if (fragment != null) {
+          Bundle args = new Bundle();
+          fragment.setArguments(args);
+
+          ((ApplicationPreferencesActivity) requireActivity()).pushFragment(fragment);
+        }
+
+        return true;
+      }
+    }
+
+    private class ProfileClickListener implements Preference.OnPreferenceClickListener {
+      @Override
+      public boolean onPreferenceClick(Preference preference) {
+        requireActivity().startActivity(EditProfileActivity.getIntentForUserProfileEdit(preference.getContext()));
+        return true;
+      }
+    }
+
+    private class UsernameClickListener implements Preference.OnPreferenceClickListener {
+      @Override
+      public boolean onPreferenceClick(Preference preference) {
+        requireActivity().startActivity(EditProfileActivity.getIntentForUsernameEdit(preference.getContext()));
+        return true;
+      }
+    }
+  }
+
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Greyson Parrelli	20996c985b	Bump version to 5.0.9	2021-01-08 17:39:13 -05:00
Greyson Parrelli	e5e9a7108e	Add extra conditions for the SMS banner.	2021-01-08 17:31:54 -05:00
Alan Evans	51dfee9cd3	Allow empty group creation.	2021-01-08 12:55:04 -04:00