Bump version to 3.3.3

// FREEBIE
Don't E164 shortcodes
2026-02-20 17:57:29 +00:00 · 2015-11-13 11:23:06 -08:00 · 2015-11-13 10:49:11 -08:00
9799 changed files with 899880 additions and 693579 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/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/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,23 +0,0 @@
-<!-- You can remove this first section if you have contributed before -->
-### First time contributor checklist
-<!-- replace the empty checkboxes [ ] below with checked ones [x] accordingly -->
- [ ] I have read [how to contribute](https://github.com/signalapp/Signal-Android/blob/master/CONTRIBUTING.md) to this project
- [ ] I have signed the [Contributor License Agreement](https://whispersystems.org/cla/)
-
-### Contributor checklist
-<!-- replace the empty checkboxes [ ] below with checked ones [x] accordingly -->
- [ ] I am following the [Code Style Guidelines](https://github.com/signalapp/Signal-Android/wiki/Code-Style-Guidelines)
- [ ] I have tested my contribution on these devices:
- * Device A, Android X.Y.Z
- * Device B, Android Z.Y
- * Virtual device W, Android Y.Y.Z
- [ ] My contribution is fully baked and ready to be merged as is
- [ ] I ensure that all the open issues my contribution fixes are mentioned in the commit message of my first commit using the `Fixes #1234` [syntax](https://help.github.com/articles/closing-issues-via-commit-messages/)
-
----------
-
-### Description
-<!--
-Describe briefly what your pull request proposes to fix. Especially if you have more than one commit, it is helpful to give a summary of what your contribution as a whole is trying to solve.
-Also, please describe shortly how you tested that your fix actually works.
-->
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -1,38 +0,0 @@
-name: Android CI
-
-on:
-  pull_request:
-  push:
-    branches:
-    - 'master'
-    - '4.**'
-    - '5.**'
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: set up JDK 11
-      uses: actions/setup-java@v1
-      with:
-        java-version: 11
-
-    - name: Validate Gradle Wrapper
-      uses: gradle/wrapper-validation-action@v1
-
-    - name: Remove Android 31 (S)
-      run: $ANDROID_HOME/tools/bin/sdkmanager --uninstall "platforms;android-31"
-
-    - name: Build with Gradle
-      run: ./gradlew qa
-
-    - name: Archive reports for failed build
-      if: ${{ failure() }}
-      uses: actions/upload-artifact@v2
-      with:
-        name: reports
-        path: '*/build/reports'
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,18 +0,0 @@
-name: Reproducible Build Check
-
-on:
-  schedule:
-    - cron: '0 5 * * *'
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - 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 assembleRelease
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,5 @@
 .classpath
-captures/
 project.properties
-keystore.debug.properties
-keystore.staging.properties
 .project
 .settings
 bin/
@@ -11,6 +8,7 @@ gen/
 *.iml
 out
 tests
+lint.xml
 local.properties
 ant.properties
 .DS_Store
@@ -25,5 +23,3 @@ ffpr
 test/androidTestEspresso/res/values/arrays.xml
 obj/
 jni/libspeex/.deps/
-pkcs11.password
-dev.keystore
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,219 +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>
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
-    </JetCodeStyleSettings>
-    <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/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,7 @@
+language: android
+android:
+  components:
+    - platform-tools
+    - build-tools-19.1.0
+    - android-19
+    - extra-android-m2repository
--- a/.tx/config
+++ b/.tx/config
@@ -0,0 +1,11 @@
+[main]
+host = https://www.transifex.com
+lang_map = fr_CA:fr-rCA,pt_BR:pt-rBR,pt_PT:pt,zh_CN:zh-rCN,zh_HK:zh-rHK,zh_TW:zh-rTW,da_DK:da-rDK,de_DE:de,tr_TR:tr,fr_FR:fr,es_ES:es,hu_HU:hu,sv_SE:sv-rSE,bg_BG:bg,el_GR:el,kn_IN:kn-rIN,cs_CZ:cs,sr:sr,he:iw,id:in
+
+
+[textsecure-official.master]
+file_filter = res/values-<lang>/strings.xml
+source_file = res/values/strings.xml
+source_lang = en
+type = ANDROID
+
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -0,0 +1,463 @@
+<?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"
+      android:versionCode="166"
+      android:versionName="3.3.3">
+
+    <uses-sdk tools:overrideLibrary="com.amulyakhare.textdrawable,com.astuetz.pagerslidingtabstrip,pl.tajchert.waitingdots,com.h6ah4i.android.multiselectlistpreferencecompat"/>
+
+    <permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"
+                android:label="Access to TextSecure Secrets"
+                android:protectionLevel="signature" />
+
+    <uses-feature android:name="android.hardware.camera" android:required="false" />
+    <uses-feature android:name="android.hardware.bluetooth" android:required="false" />
+    <uses-feature android:name="android.hardware.location" android:required="false"/>
+    <uses-feature android:name="android.hardware.location.network" android:required="false"/>
+    <uses-feature android:name="android.hardware.location.gps" android:required="false"/>
+    <uses-feature android:name="android.hardware.microphone" android:required="false"/>
+    <uses-feature android:name="android.hardware.wifi" android:required="false"/>
+    <uses-feature android:name="android.hardware.portrait" android:required="false"/>
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
+
+    <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"/>
+    <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.RECEIVE_SMS"/>
+    <uses-permission android:name="android.permission.RECEIVE_MMS"/>
+    <uses-permission android:name="android.permission.READ_SMS"/>
+    <uses-permission android:name="android.permission.SEND_SMS"/>
+    <uses-permission android:name="android.permission.WRITE_SMS"/>
+    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_CALL_LOG" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
+
+    <!-- For sending location tiles in the future -->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+
+    <!-- So we can add a TextSecure 'Account' -->
+    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
+
+    <!-- For conversation 'shortcuts' on the desktop -->
+    <uses-permission android:name="android.permission.INSTALL_SHORTCUT"/>
+
+    <!-- For sending/receiving events -->
+    <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
+    <uses-permission android:name="android.permission.READ_CALENDAR"/>
+
+    <!-- For fixing MMS -->
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+
+    <!-- Set image as wallpaper -->
+    <uses-permission android:name="android.permission.SET_WALLPAPER"/>
+
+    <!-- Permissions from RedPhone -->
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
+    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
+    <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" />
+    <uses-permission android:name="android.permission.CALL_PHONE" />
+    <uses-permission android:name="android.permission.CALL_PRIVILEGED" />
+    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+    <uses-permission android:name="android.permission.RAISED_THREAD_PRIORITY" />
+    <uses-permission android:name="android.permission.READ_CALL_STATE"/>
+    <uses-permission android:name="android.permission.READ_LOGS"/>
+    <uses-permission android:name="android.permission.WRITE_CALL_LOG"/>
+
+    <permission android:name="org.thoughtcrime.securesms.permission.C2D_MESSAGE"
+                android:protectionLevel="signature" />
+    <uses-permission android:name="org.thoughtcrime.securesms.permission.C2D_MESSAGE" />
+
+    <application android:name=".ApplicationContext"
+                 android:icon="@drawable/icon"
+                 android:label="@string/app_name"
+                 tools:replace="android:allowBackup"
+                 android:allowBackup="false"
+                 android:theme="@style/TextSecure.LightTheme">
+
+    <meta-data android:name="com.google.android.gms.version"
+               android:value="@integer/google_play_services_version" />
+
+    <meta-data android:name="org.thoughtcrime.securesms.mms.TextSecureGlideModule"
+               android:value="GlideModule" />
+
+    <activity android:name="org.thoughtcrime.redphone.RedPhone"
+              android:screenOrientation="portrait"
+              android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|screenSize|fontScale"
+              android:launchMode="singleTask">
+    </activity>
+
+    <activity android:name=".CountrySelectionActivity"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".ImportExportActivity"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".InviteActivity"
+              android:theme="@style/TextSecure.HighlightTheme"
+              android:windowSoftInputMode="stateHidden"
+              android:parentActivityName=".ConversationListActivity"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
+        <meta-data
+            android:name="android.support.PARENT_ACTIVITY"
+            android:value="org.thoughtcrime.securesms.ConversationListActivity" />
+    </activity>
+
+    <activity android:name=".PromptMmsActivity"
+              android:label="Configure MMS Settings"
+              android:windowSoftInputMode="stateUnchanged"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".DeviceProvisioningActivity"
+              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>
+    </activity>
+
+    <activity android:name=".preferences.MmsPreferencesActivity"
+               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".ShareActivity"
+              android:excludeFromRecents="true"
+              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.SEND" />
+            <category android:name="android.intent.category.DEFAULT"/>
+            <data android:mimeType="audio/*" />
+            <data android:mimeType="image/*" />
+            <data android:mimeType="text/plain" />
+            <data android:mimeType="video/*" />
+        </intent-filter>
+
+    </activity>
+
+    <activity android:name=".ConversationListActivity"
+          android:label="@string/app_name"
+          android:launchMode="singleTask"
+          android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+          android:exported="true" />
+
+    <activity-alias android:name=".RoutingActivity"
+                    android:targetActivity=".ConversationListActivity"
+                    android:exported="true">
+
+        <intent-filter>
+            <action android:name="android.intent.action.MAIN" />
+            <category android:name="android.intent.category.LAUNCHER" />
+        </intent-filter>
+
+
+
+    </activity-alias>
+
+    <activity android:name=".ConversationActivity"
+              android:windowSoftInputMode="stateUnchanged"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
+
+    <activity android:name=".ConversationPopupActivity"
+              android:windowSoftInputMode="stateVisible"
+              android:launchMode="singleTask"
+              android:taskAffinity=""
+              android:excludeFromRecents="true"
+              android:theme="@style/TextSecure.LightTheme.Popup"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
+
+    <activity android:name=".MessageDetailsActivity"
+              android:label="@string/AndroidManifest__message_details"
+              android:windowSoftInputMode="stateHidden"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".GroupCreateActivity"
+          android:windowSoftInputMode="stateVisible"
+          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=".DatabaseUpgradeActivity"
+              android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".ExperienceUpgradeActivity"
+              android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".PassphraseCreateActivity"
+              android:label="@string/AndroidManifest__create_passphrase"
+              android:windowSoftInputMode="stateUnchanged"
+              android:theme="@style/TextSecure.LightIntroTheme"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".PassphrasePromptActivity"
+              android:label="@string/AndroidManifest__enter_passphrase"
+              android:launchMode="singleTask"
+              android:theme="@style/TextSecure.LightIntroTheme"
+              android:windowSoftInputMode="stateAlwaysVisible"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".NewConversationActivity"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".PushContactSelectionActivity"
+          android:label="@string/AndroidManifest__select_contacts"
+          android:windowSoftInputMode="stateHidden"
+          android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".ViewIdentityActivity"
+              android:label="@string/AndroidManifest__public_identity_key"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".ViewLocalIdentityActivity"
+              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=".VerifyIdentityActivity"
+              android:label="@string/AndroidManifest__verify_identity"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".ApplicationPreferencesActivity"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".RegistrationActivity"
+              android:windowSoftInputMode="stateUnchanged"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".RegistrationProgressActivity"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+     <activity android:name=".DeviceListActivity"
+               android:label="@string/AndroidManifest_manage_linked_devices"
+               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".LogSubmitActivity"
+              android:label="@string/AndroidManifest__log_submit"
+              android:windowSoftInputMode="stateHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".MediaPreviewActivity"
+              android:label="@string/AndroidManifest__media_preview"
+              android:windowSoftInputMode="stateHidden"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".MediaOverviewActivity"
+              android:windowSoftInputMode="stateHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".DummyActivity"
+              android:theme="@android:style/Theme.NoDisplay"
+              android:enabled="true"
+              android:allowTaskReparenting="true"
+              android:noHistory="true"
+              android:excludeFromRecents="true"
+              android:alwaysRetainTaskState="false"
+              android:stateNotNeeded="true"
+              android:clearTaskOnLaunch="true"
+              android:finishOnTaskLaunch="true" />
+
+    <activity android:name=".PlayServicesProblemActivity"
+              android:theme="@android:style/Theme.Translucent.NoTitleBar"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".SmsSendtoActivity">
+        <intent-filter>
+            <action android:name="android.intent.action.SENDTO" />
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="sms" />
+            <data android:scheme="smsto" />
+            <data android:scheme="mms" />
+            <data android:scheme="mmsto" />
+        </intent-filter>
+        <intent-filter>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <data android:mimeType="vnd.android.cursor.item/vnd.org.thoughtcrime.securesms.contact" />
+        </intent-filter>
+    </activity>
+
+    <activity android:name=".RecipientPreferenceActivity"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".BlockedContactsActivity"
+              android:theme="@style/TextSecure.LightTheme"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name="com.soundcloud.android.crop.CropImageActivity" />
+
+    <service android:enabled="true" android:name="org.thoughtcrime.redphone.RedPhoneService"/>
+
+    <service android:enabled="true" android:name=".service.ApplicationMigrationService"/>
+    <service android:enabled="true" android:name=".service.KeyCachingService"/>
+    <service android:enabled="true" android:name=".service.RegistrationService"/>
+    <service android:enabled="true" android:name=".service.MessageRetrievalService"/>
+
+    <service android:name=".service.QuickResponseService"
+             android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
+             android:exported="true" >
+        <intent-filter>
+            <action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <data android:scheme="sms" />
+            <data android:scheme="smsto" />
+            <data android:scheme="mms" />
+            <data android:scheme="mmsto" />
+        </intent-filter>
+    </service>
+
+    <service android:name=".service.AccountAuthenticatorService" android:exported="true">
+        <intent-filter>
+            <action android:name="android.accounts.AccountAuthenticator" />
+        </intent-filter>
+        <meta-data android:name="android.accounts.AccountAuthenticator" android:resource="@xml/authenticator" />
+    </service>
+
+    <service android:name=".service.ContactsSyncAdapterService" android:exported="true">
+        <intent-filter>
+            <action android:name="android.content.SyncAdapter"/>
+        </intent-filter>
+        <meta-data android:name="android.content.SyncAdapter" android:resource="@xml/syncadapter" />
+        <meta-data android:name="android.provider.CONTACTS_STRUCTURE" android:resource="@xml/contactsformat" />
+    </service>
+
+    <receiver android:name=".gcm.GcmBroadcastReceiver" android:permission="com.google.android.c2dm.permission.SEND" >
+        <intent-filter>
+            <action android:name="com.google.android.c2dm.intent.RECEIVE" />
+            <category android:name="org.thoughtcrime.securesms" />
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".service.SmsListener"
+              android:permission="android.permission.BROADCAST_SMS"
+              android:enabled="true"
+              android:exported="true">
+             <intent-filter android:priority="1001">
+                 <action android:name="android.provider.Telephony.SMS_RECEIVED"/>
+             </intent-filter>
+             <intent-filter>
+                 <action android:name="android.provider.Telephony.SMS_DELIVER"/>
+             </intent-filter>
+    </receiver>
+
+    <receiver android:name=".service.SmsDeliveryListener"
+              android:exported="true">
+        <intent-filter>
+            <action android:name="org.thoughtcrime.securesms.services.MESSAGE_SENT"/>
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".service.MmsListener"
+              android:enabled="true"
+              android:exported="true"
+              android:permission="android.permission.BROADCAST_WAP_PUSH">
+             <intent-filter android:priority="1001">
+                 <action android:name="android.provider.Telephony.WAP_PUSH_RECEIVED"/>
+                 <data android:mimeType="application/vnd.wap.mms-message" />
+             </intent-filter>
+             <intent-filter>
+                 <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER"/>
+                 <data android:mimeType="application/vnd.wap.mms-message" />
+             </intent-filter>
+    </receiver>
+
+    <receiver android:name=".notifications.MarkReadReceiver"
+              android:enabled="true"
+              android:exported="true">
+        <intent-filter>
+            <action android:name="org.thoughtcrime.securesms.notifications.CLEAR"/>
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".notifications.WearReplyReceiver"
+              android:enabled="true"
+              android:exported="true">
+        <intent-filter>
+            <action android:name="org.thoughtcrime.securesms.notifications.WEAR_REPLY"/>
+        </intent-filter>
+    </receiver>
+
+    <provider android:name=".providers.PartProvider"
+              android:grantUriPermissions="true"
+              android:authorities="org.thoughtcrime.provider.securesms" />
+
+    <provider android:name=".providers.MmsBodyProvider"
+              android:grantUriPermissions="true"
+              android:authorities="org.thoughtcrime.provider.securesms.mms" />
+
+    <receiver android:name=".service.RegistrationNotifier"
+              android:exported="false">
+        <intent-filter>
+            <action android:name="org.thoughtcrime.securesms.REGISTRATION_EVENT" />
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".service.DirectoryRefreshListener">
+        <intent-filter>
+            <action android:name="org.whispersystems.whisperpush.DIRECTORY_REFRESH"/>
+            <action android:name="android.intent.action.BOOT_COMPLETED" />
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".notifications.MessageNotifier$ReminderReceiver">
+        <intent-filter>
+            <action android:name="org.thoughtcrime.securesms.MessageNotifier.REMINDER_ACTION"/>
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".notifications.MessageNotifier$DeleteReceiver">
+        <intent-filter>
+            <action android:name="org.thoughtcrime.securesms.MessageNotifier.DELETE_REMINDER_ACTION"/>
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".ExperienceUpgradeActivity$AppUpgradeReceiver">
+        <intent-filter>
+            <action android:name="android.intent.action.PACKAGE_REPLACED"/>
+            <data android:scheme="package" />
+        </intent-filter>
+    </receiver>
+
+</application>
+</manifest>
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -0,0 +1,71 @@
+Building Signal
+===============
+
+Basics
+------
+
+Signal uses [Gradle](http://gradle.org) to build the project and to maintain
+dependencies.
+
+Building Signal
+---------------
+
+The following steps should help you (re)build Signal from the command line.
+
+1. Checkout the Signal-Android project source with the command:
+
+        git clone https://github.com/WhisperSystems/Signal-Android.git
+
+2. Make sure you have the [Android SDK](https://developer.android.com/sdk/index.html) installed.
+3. Ensure that the following packages are installed from the Android SDK manager:
+    * Android SDK Build Tools
+    * SDK Platform
+    * Android Support Repository
+    * Google Repository
+4. Create a local.properties file at the root of your source checkout and add an sdk.dir entry to it.
+
+        sdk.dir=\<path to your sdk installation\>
+
+5. Execute Gradle:
+
+        ./gradlew build
+
+Visual assets
+----------------------
+
+Source assets tend to be large binary blobs, which are best stored outside of git repositories. We host ours in a [Pixelapse repository](https://www.pixelapse.com/openwhispersystems/projects/signal-android/). Some source files are SVGs that can be auto-colored and sized using a tool like [android-res-utils](https://github.com/sebkur/android-res-utils).
+
+Sample command for generating our audio placeholder image:
+
+```bash
+pngs_from_svg.py ic_audio.svg /path/to/Signal/res/ 150 --color #000 --opacity 0.54 --suffix _light
+pngs_from_svg.py ic_audio.svg /path/to/Signal/res/ 150 --color #fff --opacity 1.00 --suffix _light
+```
+
+Setting up a development environment
+------------------------------------
+
+[Android Studio](https://developer.android.com/sdk/installing/studio.html) is the recommended development environment.
+
+1. Install Android Studio.
+2. Open Android Studio. On a new installation, the Quickstart panel will appear. If you have open projects, close them using "File > Close Project" to see the Quickstart panel.
+3. From the Quickstart panel, choose "Configure" then "SDK Manager".
+4. In the SDK Tools tab of the SDK Manager, make sure that the "Android Support Repository" is installed, and that the latest "Android SDK build-tools" are installed. Click "OK" to return to the Quickstart panel.
+5. From the Quickstart panel, choose "Checkout from Version Control" then "git".
+6. Paste the URL for the Signal-Android project when prompted (https://github.com/WhisperSystems/Signal-Android.git).
+7. Android studio should detect the presence of a project file and ask you whether to open it. Click "yes".
+9. Default config options should be good enough.
+9. Project initialisation and build should proceed.
+
+Contributing code
+-----------------
+
+Code contributions should be sent via github as pull requests, from feature branches [as explained here](https://help.github.com/articles/using-pull-requests).
+
+Mailing list
+------------
+
+Development discussion happens on the whispersystems mailing list.
+[To join](https://lists.riseup.net/www/info/whispersystems)
+Send emails to whispersystems@lists.riseup.net
+
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,89 +0,0 @@
-# Contributing to Signal Android
-
-Thank you for supporting Signal and looking for ways to help. Please note that some conventions here might be a bit different than what you are used to, even if you have contributed to other open source projects before. Reading this document will help you save time and work effectively with the developers and other contributors.
-
-
-## Development Ideology
-
-Truths which we believe to be self-evident:
-
-1. **The answer is not more options.**  If you feel compelled to add a preference that's exposed to the user, it's very possible you've made a wrong turn somewhere.
-1. **The user doesn't know what a key is.**  We need to minimize the points at which a user is exposed to this sort of terminology as extremely as possible.
-1. **There are no power users.**  The idea that some users "understand" concepts better than others has proven to be, for the most part, false. If anything, "power users" are more dangerous than the rest, and we should avoid exposing dangerous functionality to them.
-1. **If it's "like PGP," it's wrong.**  PGP is our guide for what not to do.
-1. **It's an asynchronous world.**  Be wary of anything that is anti-asynchronous: ACKs, protocol confirmations, or any protocol-level "advisory" message.
-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
-1. Please search both open and closed issues to make sure your bug report is not a duplicate.
-1. Read the [guide to submitting useful bug reports](https://github.com/signalapp/Signal-Android/wiki/Submitting-useful-bug-reports) before posting a bug.
-
-### The issue tracker is for bugs, not feature requests
-The GitHub issue tracker is not used for feature requests, but new ideas can be submitted and discussed on the [community forum](https://community.signalusers.org/c/feature-requests). The purpose of this issue tracker is to track bugs in the Android client. Bug reports should only be submitted for existing functionality that does not work as intended. Comments that are relevant and concise will help the developers solve issues more quickly.
-
-### Send support questions to support
-You can reach support by sending an email to support@signal.org or by visiting the [Signal Support Center](https://support.signal.org/) where you can also search for existing troubleshooting articles and find answers to frequently asked questions. Please do not post support questions on the GitHub issue tracker.
-
-### GitHub is not a generic discussion forum
-Conversations about open bug reports belong here. However, all other discussions should take place on the [community forum](https://community.signalusers.org). You can use the community forum to discuss anything that is related to Signal or to hang out with your fellow users in the "Off Topic" category.
-
-### Don't bump issues
-Every time someone comments on an issue, GitHub sends an email to [hundreds of people](https://github.com/signalapp/Signal-Android/watchers). Bumping issues with a "+1" (or asking for updates) generates a lot of unnecessary email notifications and does not help anyone solve the issue any faster. Please be respectful of everyone's time and only comment when you have new information to add.
-
-### Open issues
-
-#### If it's open, it's tracked
-The developers read every issue, but high-priority bugs or features can take precedence over others. Signal is an open source project, and everyone is encouraged to play an active role in diagnosing and fixing open issues.
-
-### Closed issues
-
-#### "My issue was closed without giving a reason!"
-Although we do our best, writing detailed explanations for every issue can be time consuming, and the topic also might have been covered previously in other related issues.
-
-
-## Pull requests
-
-### Smaller is better
-Big changes are significantly less likely to be accepted. Large features often require protocol modifications and necessitate a staged rollout process that is coordinated across millions of users on multiple platforms (Android, iOS, and Desktop).
-
-Try not to take on too much at once. As a first-time contributor, we recommend starting with small and simple PRs in order to become familiar with the codebase. Most of the work should go into discovering which three lines need to change rather than writing the code.
-
-### Sign the Contributor License Agreement (CLA)
-You will need to [sign our CLA](https://signal.org/cla/) before your pull request can be merged.
-
-### Follow the Code Style Guidelines
-Ensure that your code adheres to the [Code Style Guidelines](https://github.com/signalapp/Signal-Android/wiki/Code-Style-Guidelines) before submitting a pull request.
-
-### Submit finished and well-tested pull requests
-Please do not submit pull requests that are still a work in progress. Pull requests should be thoroughly tested and ready to merge before they are submitted.
-
-### Merging can sometimes take a while
-If your pull request follows all of the advice above but still has not been merged, this usually means that the developers haven't had time to review it yet. We understand that this might feel frustrating, and we apologize. The Signal team is still small, but [we are hiring](https://signal.org/workworkwork/).
-
-
-## How can I contribute?
-There are several other ways to get involved:
-* Help new users learn about Signal.
-  * 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.
-* Test other people's pull requests.
-* [Donate to Signal.](https://signal.org/donate/)
-* Share Signal with your friends and family.
-
-Signal is made for you. Thank you for your feedback and support.
--- a/README.md
+++ b/README.md
@@ -4,14 +4,14 @@ Signal is a messaging app for simple private communication with friends.

 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>
+*[![Play Store Badge](https://developer.android.com/images/brand/en_app_rgb_wo_60.png)](https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms)*

 ## Contributing Bug reports
 We use GitHub for bug tracking. Please search the existing issues for your bug and create a new one if the issue is not yet tracked!

-https://github.com/signalapp/Signal-Android/issues
+https://github.com/WhisperSystems/Signal-Android/issues

 ## Joining the Beta
 Want to live life on the bleeding edge and help out with testing?
@@ -24,28 +24,42 @@ If you're interested in a life of peace and tranquility, stick with the standard
 ## Contributing Translations
 Interested in helping to translate Signal? Contribute here:

-https://www.transifex.com/projects/p/signal-android/
+https://www.transifex.com/projects/p/textsecure-official/

 ## Contributing Code
+Instructions on how to setup your development environment and build Signal can be found in  [BUILDING.md](https://github.com/WhisperSystems/Signal-Android/blob/master/BUILDING.md).

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

-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.
+For larger changes and feature ideas, we ask that you propose it on the mailing list for a high-level discussion before implementation.
+
+This repository is set up with [BitHub](https://whispersystems.org/blog/bithub/), so you can make money for committing to Signal. The current BitHub price for an accepted pull request is:
+
+[![Current BitHub Price](https://bithub.herokuapp.com/v1/status/payment/commit/)](https://whispersystems.org/blog/bithub/)

 ## Contributing Ideas
-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).
+Have something you want to say about Open Whisper Systems projects or want to be part of the conversation? Get involved in the mailing list!
+
+whispersystems@lists.riseup.net
+
+https://lists.riseup.net/www/info/whispersystems
+
+## Contributing Funds
+[![Donate](https://www.coinbase.com/assets/buttons/donation_large-5e1b50d6490970e32b80023f3070b1d77afc621b9e64ac996596a67a4671967b.png)](https://www.coinbase.com/checkouts/51dac699e660a4d773216b5ad94d6a0b)
+
+You can add funds to BitHub to directly help further development efforts.

 Help
 ====
 ## Support
 For troubleshooting and questions, please visit our support center!

-https://support.signal.org/
+http://support.whispersystems.org/

 ## Documentation
 Looking for documentation? Check out the wiki!

-https://github.com/signalapp/Signal-Android/wiki
+https://github.com/WhisperSystems/Signal-Android/wiki

 # Legal things
 ## Cryptography Notice
@@ -59,8 +73,8 @@ The form and manner of this distribution makes it eligible for export under the

 ## License

-Copyright 2013-2021 Signal
+Copyright 2011 Whisper Systems
+
+Copyright 2013-2014 Open Whisper Systems

 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.
--- a/app/.tx/config
+++ b/app/.tx/config
@@ -1,10 +0,0 @@
-[main]
-host = https://www.transifex.com
-lang_map = da_DK:da-rDK,fil:tl,he:iw,id:in,kn_IN:kn-rIN,pa_PK:pa-rPK,pt_BR:pt-rBR,pt_PT:pt,qu_EC:qu-rEC,sv_SE:sv-rSE,zh_CN:zh-rCN,zh_HK:zh-rHK,zh_TW:zh-rTW
-
-[signal-android.master]
-file_filter = src/main/res/values-<lang>/strings.xml
-source_file = src/main/res/values/strings.xml
-source_lang = en
-type = ANDROID
-
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,624 +0,0 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'com.google.protobuf'
-apply plugin: 'androidx.navigation.safeargs'
-apply plugin: 'org.jlleitschuh.gradle.ktlint'
-apply from: 'translations.gradle'
-apply plugin: 'org.jetbrains.kotlin.android'
-apply plugin: 'app.cash.exhaustive'
-apply plugin: 'kotlin-parcelize'
-
-repositories {
-    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.*"
-        }
-    }
-    maven {
-        url "https://www.jitpack.io"
-    }
-
-    google()
-    mavenCentral()
-    mavenLocal()
-    maven {
-        url "https://dl.cloudsmith.io/qxAgwaeEE1vN8aLU/mobilecoin/mobilecoin/maven/"
-    }
-    jcenter {
-        content {
-            includeVersion "mobi.upod", "time-duration-picker", "1.1.3"
-            includeVersion "cn.carbswang.android", "NumberPickerView", "1.0.9"
-            includeVersion "com.takisoft.fix", "colorpicker", "0.9.1"
-            includeVersion "com.codewaves.stickyheadergrid", "stickyheadergrid", "0.9.4"
-            includeVersion "com.google.android", "flexbox", "0.3.0"
-        }
-    }
-}
-
-protobuf {
-    protoc {
-        artifact = 'com.google.protobuf:protoc:3.18.0'
-    }
-    generateProtoTasks {
-        all().each { task ->
-            task.builtins {
-                java {
-                    option "lite"
-                }
-            }
-        }
-    }
-}
-
-ktlint {
-    // Use a newer version to resolve https://github.com/JLLeitschuh/ktlint-gradle/issues/507
-    version = "0.43.2"
-}
-
-def canonicalVersionCode = 992
-def canonicalVersionName = "5.30.1"
-
-def postFixSize = 100
-def abiPostFix = ['universal'   : 0,
-                  'armeabi-v7a' : 1,
-                  'arm64-v8a'   : 2,
-                  'x86'         : 3,
-                  'x86_64'      : 4]
-
-def keystores = [ 'debug'  : loadKeystoreProperties('keystore.debug.properties') ]
-
-def selectableVariants = [
-        'nightlyProdFlipper',
-        'nightlyProdPerf',
-        'nightlyProdRelease',
-        'playProdDebug',
-        'playProdFlipper',
-        'playProdPerf',
-        'playProdRelease',
-        'playStagingDebug',
-        'playStagingFlipper',
-        'playStagingPerf',
-        'playStagingRelease',
-        'websiteProdFlipper',
-        'websiteProdRelease',
-]
-
-android {
-    buildToolsVersion BUILD_TOOL_VERSION
-    compileSdkVersion COMPILE_SDK
-
-    flavorDimensions 'distribution', 'environment'
-    useLibrary 'org.apache.http.legacy'
-
-    kotlinOptions {
-        jvmTarget = "1.8"
-        freeCompilerArgs = ["-Xallow-result-return-type"]
-    }
-
-    dexOptions {
-        javaMaxHeapSize "4g"
-    }
-
-    signingConfigs {
-        if (keystores.debug != null) {
-            debug {
-                storeFile file("${project.rootDir}/${keystores.debug.storeFile}")
-                storePassword keystores.debug.storePassword
-                keyAlias keystores.debug.keyAlias
-                keyPassword keystores.debug.keyPassword
-            }
-        }
-    }
-
-    defaultConfig {
-        versionCode canonicalVersionCode * postFixSize
-        versionName canonicalVersionName
-
-        minSdkVersion MINIMUM_SDK
-        targetSdkVersion TARGET_SDK
-
-        multiDexEnabled true
-
-        vectorDrawables.useSupportLibrary = true
-        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", "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_CDSH_URL", "\"https://cdsh.staging.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_SFU_INTERNAL_NAMES", "new String[]{\"Test\", \"Staging\"}"
-        buildConfigField "String[]", "SIGNAL_SFU_INTERNAL_URLS", "new String[]{\"https://sfu.test.voip.signal.org\", \"https://sfu.staging.voip.signal.org\"}"
-        buildConfigField "String", "CONTENT_PROXY_HOST", "\"contentproxy.signal.org\""
-        buildConfigField "int", "CONTENT_PROXY_PORT", "443"
-        buildConfigField "String", "SIGNAL_AGENT", "\"OWA\""
-        buildConfigField "String", "CDSH_PUBLIC_KEY", "\"2fe57da347cd62431528daac5fbb290730fff684afc4cfc2ed90995f58cb3b74\""
-        buildConfigField "String", "CDSH_CODE_HASH", "\"ec58c0d7561de8d5657f3a4b22a635eaa305204e9359dcc80a99dfd0c5f1cbf2\""
-        buildConfigField "String", "CDS_MRENCLAVE", "\"c98e00a4e3ff977a56afefe7362a27e4961e4f19e211febfbb19b897e6b80b15\""
-        buildConfigField "org.thoughtcrime.securesms.KbsEnclave", "KBS_ENCLAVE", "new org.thoughtcrime.securesms.KbsEnclave(\"0cedba03535b41b67729ce9924185f831d7767928a1d1689acb689bc079c375f\", " +
-                                                                                                                           "\"187d2739d22be65e74b65f0055e74d31310e4267e5fac2b1246cc8beba81af39\", " +
-                                                                                                                           "\"ee19f1965b1eefa3dc4204eb70c04f397755f771b8c1909d080c04dad2a6a9ba\")"
-        buildConfigField "org.thoughtcrime.securesms.KbsEnclave[]", "KBS_FALLBACKS", "new org.thoughtcrime.securesms.KbsEnclave[] {" +
-                "new org.thoughtcrime.securesms.KbsEnclave(\"fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe\", " +
-                                                          "\"fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe\", " +
-                                                          "\"a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87\")" +
-            "}"
-        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+ikU5gBXsRmoF94GXQ==\""
-        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 "int[]", "MOBILE_COIN_BLACKLIST", "new int[]{98,963,53,850,7}"
-        buildConfigField "String", "GIPHY_API_KEY", "\"3o6ZsYH6U6Eri53TXy\""
-        buildConfigField "String", "RECAPTCHA_PROOF_URL", "\"https://signalcaptchas.org/challenge/generate.html\""
-
-        buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"unset\""
-        buildConfigField "String", "BUILD_ENVIRONMENT_TYPE", "\"unset\""
-        buildConfigField "String", "BUILD_VARIANT_TYPE", "\"unset\""
-        buildConfigField "String", "BADGE_STATIC_ROOT", "\"https://updates2.signal.org/static/badges/\""
-        buildConfigField "String", "STRIPE_PUBLISHABLE_KEY", "\"pk_live_6cmGZopuTsV8novGgJJW9JpC00vLIgtQ1D\""
-
-        ndk {
-            abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
-        }
-
-        resConfigs autoResConfig()
-
-        splits {
-            abi {
-                enable true
-                reset()
-                include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
-                universalApk true
-            }
-        }
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        testInstrumentationRunnerArguments clearPackageData: 'true'
-    }
-
-    testOptions {
-        execution 'ANDROIDX_TEST_ORCHESTRATOR'
-    }
-
-    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 '/org/spongycastle/x509/CertPathReviewerMessages.properties'
-        exclude '/org/spongycastle/x509/CertPathReviewerMessages_de.properties'
-    }
-
-    buildTypes {
-        debug {
-            if (keystores['debug'] != null) {
-                signingConfig signingConfigs.debug
-            }
-            isDefault true
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'),
-                    'proguard/proguard-firebase-messaging.pro',
-                    'proguard/proguard-google-play-services.pro',
-                    'proguard/proguard-jackson.pro',
-                    'proguard/proguard-sqlite.pro',
-                    'proguard/proguard-appcompat-v7.pro',
-                    'proguard/proguard-square-okhttp.pro',
-                    'proguard/proguard-square-okio.pro',
-                    'proguard/proguard-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-retrolambda.pro',
-                    'proguard/proguard-okhttp.pro',
-                    'proguard/proguard-ez-vcard.pro',
-                    'proguard/proguard.cfg'
-            testProguardFiles 'proguard/proguard-automation.pro',
-                    'proguard/proguard.cfg'
-
-            buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Debug\""
-        }
-        flipper {
-            initWith debug
-            isDefault false
-            minifyEnabled false
-            matchingFallbacks = ['debug']
-            buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Flipper\""
-        }
-        release {
-            minifyEnabled true
-            proguardFiles = buildTypes.debug.proguardFiles
-            buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Release\""
-        }
-        perf {
-            initWith debug
-            isDefault false
-            debuggable false
-            minifyEnabled true
-            matchingFallbacks = ['debug']
-            buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Perf\""
-        }
-    }
-
-    productFlavors {
-        play {
-            dimension 'distribution'
-            isDefault true
-            ext.websiteUpdateUrl = "null"
-            buildConfigField "boolean", "PLAY_STORE_DISABLED", "false"
-            buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
-            buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"play\""
-        }
-
-        website {
-            dimension 'distribution'
-            ext.websiteUpdateUrl = "https://updates.signal.org/android"
-            buildConfigField "boolean", "PLAY_STORE_DISABLED", "true"
-            buildConfigField "String", "NOPLAY_UPDATE_URL", "\"$ext.websiteUpdateUrl\""
-            buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"website\""
-        }
-
-        nightly {
-            dimension 'distribution'
-            versionNameSuffix "-nightly-untagged-${getDateSuffix()}"
-            ext.websiteUpdateUrl = "null"
-            buildConfigField "boolean", "PLAY_STORE_DISABLED", "false"
-            buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
-            buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"nightly\""
-        }
-
-        prod {
-            dimension 'environment'
-
-            isDefault true
-
-            buildConfigField "String", "MOBILE_COIN_ENVIRONMENT", "\"mainnet\""
-            buildConfigField "String", "BUILD_ENVIRONMENT_TYPE", "\"Prod\""
-        }
-
-        staging {
-            dimension 'environment'
-
-            applicationIdSuffix ".staging"
-
-            buildConfigField "String", "SIGNAL_URL", "\"https://chat.staging.signal.org\""
-            buildConfigField "String", "STORAGE_URL", "\"https://storage-staging.signal.org\""
-            buildConfigField "String", "SIGNAL_CDN_URL", "\"https://cdn-staging.signal.org\""
-            buildConfigField "String", "SIGNAL_CDN2_URL", "\"https://cdn2-staging.signal.org\""
-            buildConfigField "String", "SIGNAL_CONTACT_DISCOVERY_URL", "\"https://api-staging.directory.signal.org\""
-            buildConfigField "String", "SIGNAL_KEY_BACKUP_URL", "\"https://api-staging.backup.signal.org\""
-            buildConfigField "String", "CDS_MRENCLAVE", "\"c98e00a4e3ff977a56afefe7362a27e4961e4f19e211febfbb19b897e6b80b15\""
-            buildConfigField "org.thoughtcrime.securesms.KbsEnclave", "KBS_ENCLAVE", "new org.thoughtcrime.securesms.KbsEnclave(\"dd6f66d397d9e8cf6ec6db238e59a7be078dd50e9715427b9c89b409ffe53f99\", " +
-                                                                                                                               "\"4200003414528c151e2dccafbc87aa6d3d66a5eb8f8c05979a6e97cb33cd493a\", " +
-                                                                                                                               "\"ee19f1965b1eefa3dc4204eb70c04f397755f771b8c1909d080c04dad2a6a9ba\")"
-            buildConfigField "org.thoughtcrime.securesms.KbsEnclave[]", "KBS_FALLBACKS", "new org.thoughtcrime.securesms.KbsEnclave[] {" +
-                    "new org.thoughtcrime.securesms.KbsEnclave(\"823a3b2c037ff0cbe305cc48928cfcc97c9ed4a8ca6d49af6f7d6981fb60a4e9\", " +
-                                                              "\"16b94ac6d2b7f7b9d72928f36d798dbb35ed32e7bb14c42b4301ad0344b46f29\", " +
-                                                              "\"a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87\")" +
-                "}"
-            buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx\""
-            buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXQ==\""
-            buildConfigField "String", "MOBILE_COIN_ENVIRONMENT", "\"testnet\""
-            buildConfigField "String", "RECAPTCHA_PROOF_URL", "\"https://signalcaptchas.org/staging/challenge/generate.html\""
-
-            buildConfigField "String", "BUILD_ENVIRONMENT_TYPE", "\"Staging\""
-            buildConfigField "String", "STRIPE_PUBLISHABLE_KEY", "\"pk_test_sngOd8FnXNkpce9nPXawKrJD00kIDngZkD\""
-        }
-    }
-
-    android.applicationVariants.all { variant ->
-        variant.outputs.each { output ->
-            if (output.baseName.contains('nightly')) {
-                output.versionCodeOverride = canonicalVersionCode * postFixSize + 5
-                def tag = getCurrentGitTag()
-                if (tag != null && tag.length() > 0) {
-                    output.versionNameOverride = tag
-                }
-            } else {
-                output.outputFileName = output.outputFileName.replace(".apk", "-${variant.versionName}.apk")
-                def abiName = output.getFilter("ABI") ?: 'universal'
-                def postFix = abiPostFix.get(abiName, 0)
-
-                if (postFix >= postFixSize) throw new AssertionError("postFix is too large")
-
-                output.versionCodeOverride = canonicalVersionCode * postFixSize + postFix
-            }
-        }
-    }
-
-    android.variantFilter { variant ->
-        def distribution = variant.getFlavors().get(0).name
-        def environment  = variant.getFlavors().get(1).name
-        def buildType    = variant.buildType.name
-        def fullName     = distribution + environment.capitalize() + buildType.capitalize()
-
-        if (!selectableVariants.contains(fullName)) {
-            variant.setIgnore(true)
-        }
-    }
-
-    lintOptions {
-        checkReleaseBuilds false
-        abortOnError true
-        baseline file("lint-baseline.xml")
-        disable "LintError"
-    }
-
-    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.2.0'
-        }
-    }
-    implementation libs.androidx.window
-    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.extensions
-    implementation libs.androidx.lifecycle.viewmodel.savedstate
-    implementation libs.androidx.lifecycle.common.java8
-    implementation libs.androidx.lifecycle.reactivestreams.ktx
-    implementation libs.androidx.camera.core
-    implementation libs.androidx.camera.camera2
-    implementation libs.androidx.camera.lifecycle
-    implementation libs.androidx.camera.view
-    implementation libs.androidx.concurrent.futures
-    implementation libs.androidx.autofill
-    implementation libs.androidx.biometric
-    implementation libs.androidx.sharetarget
-
-    implementation (libs.firebase.messaging) {
-        exclude group: 'com.google.firebase', module: 'firebase-core'
-        exclude group: 'com.google.firebase', module: 'firebase-analytics'
-        exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
-    }
-
-    implementation libs.google.play.services.maps
-    implementation libs.google.play.services.auth
-
-    implementation libs.bundles.exoplayer
-
-    implementation libs.conscrypt.android
-    implementation libs.signal.aesgcmprovider
-
-    implementation project(':libsignal-service')
-    implementation project(':paging')
-    implementation project(':core-util')
-    implementation project(':glide-config')
-    implementation project(':video')
-    implementation project(':device-transfer')
-    implementation project(':image-editor')
-    implementation project(':donations')
-
-    implementation libs.signal.client.android
-    implementation libs.google.protobuf.javalite
-
-    implementation(libs.mobilecoin) {
-        exclude group: 'com.google.protobuf'
-    }
-
-    implementation(libs.signal.argon2) {
-        artifact {
-            type = "aar"
-        }
-    }
-
-    implementation libs.signal.ringrtc
-
-    implementation libs.leolin.shortcutbadger
-    implementation libs.emilsjolander.stickylistheaders
-    implementation libs.jpardogo.materialtabstrip
-    implementation libs.apache.httpclient.android
-    implementation libs.photoview
-    implementation libs.glide.glide
-    implementation libs.roundedimageview
-    implementation libs.materialish.progress
-    implementation libs.greenrobot.eventbus
-    implementation libs.waitingdots
-    implementation libs.floatingactionbutton
-    implementation libs.google.zxing.android.integration
-    implementation libs.time.duration.picker
-    implementation libs.google.zxing.core
-    implementation (libs.subsampling.scale.image.view) {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    }
-    implementation (libs.numberpickerview) {
-        exclude group: 'com.android.support', module: 'appcompat-v7'
-    }
-    implementation (libs.android.tooltips) {
-        exclude group: 'com.android.support', module: 'appcompat-v7'
-    }
-    implementation (libs.android.smsmms) {
-        exclude group: 'com.squareup.okhttp', module: 'okhttp'
-        exclude group: 'com.squareup.okhttp', module: 'okhttp-urlconnection'
-    }
-    implementation libs.stream
-    implementation (libs.colorpicker) {
-        exclude group: 'com.android.support', module: 'appcompat-v7'
-        exclude group: 'com.android.support', module: 'recyclerview-v7'
-    }
-
-    implementation libs.lottie
-
-    implementation libs.stickyheadergrid
-    implementation libs.circular.progress.button
-
-    implementation libs.signal.android.database.sqlcipher
-    implementation libs.androidx.sqlite
-
-    implementation (libs.google.ez.vcard) {
-        exclude group: 'com.fasterxml.jackson.core'
-        exclude group: 'org.freemarker'
-    }
-    implementation libs.dnsjava
-
-    flipperImplementation libs.facebook.flipper
-    flipperImplementation libs.facebook.soloader
-    flipperImplementation libs.square.leakcanary
-
-    testImplementation testLibs.junit.junit
-    testImplementation testLibs.assertj.core
-    testImplementation testLibs.mockito.core
-    testImplementation testLibs.powermock.api.mockito
-    testImplementation testLibs.powermock.module.junit4.core
-    testImplementation testLibs.powermock.module.junit4.rule
-    testImplementation testLibs.powermock.classloading.xstream
-
-    testImplementation testLibs.androidx.test.core
-    testImplementation (testLibs.robolectric.robolectric) {
-        exclude group: 'com.google.protobuf', module: 'protobuf-java'
-    }
-    testImplementation testLibs.robolectric.shadows.multidex
-    testImplementation testLibs.hamcrest.hamcrest
-
-    testImplementation(testFixtures(project(":libsignal-service")))
-
-    androidTestImplementation testLibs.androidx.test.ext.junit
-    androidTestImplementation testLibs.espresso.core
-
-    testImplementation testLibs.espresso.core
-
-    implementation libs.kotlin.stdlib.jdk8
-    implementation libs.kotlin.reflect
-    implementation libs.jackson.module.kotlin
-
-    implementation libs.rxjava3.rxandroid
-    implementation libs.rxjava3.rxkotlin
-    implementation libs.rxdogtag
-
-    androidTestUtil 'androidx.test:orchestrator:1.4.0'
-}
-
-def getLastCommitTimestamp() {
-    if (!(new File('.git').exists())) {
-        return System.currentTimeMillis().toString()
-    }
-
-    new ByteArrayOutputStream().withStream { os ->
-        def result = exec {
-            executable = 'git'
-            args = ['log', '-1', '--pretty=format:%ct']
-            standardOutput = os
-        }
-
-        return os.toString() + "000"
-    }
-}
-
-def getGitHash() {
-    if (!(new File('.git').exists())) {
-        return "abcd1234"
-    }
-
-    def stdout = new ByteArrayOutputStream()
-    exec {
-        commandLine 'git', 'rev-parse', '--short', 'HEAD'
-        standardOutput = stdout
-    }
-    return stdout.toString().trim()
-}
-
-def getCurrentGitTag() {
-    if (!(new File('.git').exists())) {
-        return ''
-    }
-
-    def stdout = new ByteArrayOutputStream()
-    exec {
-        commandLine 'git', 'tag', '--points-at', 'HEAD'
-        standardOutput = stdout
-    }
-
-    def output = stdout.toString().trim()
-
-    if (output != null && output.size() > 0) {
-        def tags = output.split('\n').toList()
-        return tags.stream().filter(t -> t.contains('nightly')).findFirst().orElse(tags.get(0))
-    } else {
-        return null
-    }
-}
-
-tasks.withType(Test) {
-    testLogging {
-        events "failed"
-        exceptionFormat "full"
-        showCauses true
-        showExceptions true
-        showStackTraces true
-    }
-}
-
-def loadKeystoreProperties(filename) {
-    def keystorePropertiesFile = file("${project.rootDir}/${filename}")
-    if (keystorePropertiesFile.exists()) {
-        def keystoreProperties = new Properties()
-        keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-        return keystoreProperties;
-    } else {
-        return null;
-    }
-}
-
-def getDateSuffix() {
-    def date = new Date()
-    def formattedDate = date.format('yyyy-MM-dd-HH:mm')
-    return formattedDate
-}
--- a/app/jni/Android.mk
+++ b/app/jni/Android.mk
@@ -1,11 +0,0 @@
-JNI_DIR := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE     := native-utils
-LOCAL_C_INCLUDES := $(JNI_DIR)/utils/
-LOCAL_CFLAGS     += -Wall
-
-LOCAL_SRC_FILES := $(JNI_DIR)/utils/org_thoughtcrime_securesms_util_FileUtils.cpp
-
-include $(BUILD_SHARED_LIBRARY)
--- a/app/jni/Application.mk
+++ b/app/jni/Application.mk
@@ -1,6 +0,0 @@
-# Built with NDK 19.2.5345600
-APP_ABI      := armeabi-v7a x86 arm64-v8a x86_64
-APP_PLATFORM := android-19
-APP_STL      := c++_static
-APP_CPPFLAGS += -fexceptions
-APP_OPTIM    := debug
--- a/app/jni/utils/org_thoughtcrime_securesms_util_FileUtils.cpp
+++ b/app/jni/utils/org_thoughtcrime_securesms_util_FileUtils.cpp
@@ -1,45 +0,0 @@
-#include "org_thoughtcrime_securesms_util_FileUtils.h"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <linux/memfd.h>
-#include <syscall.h>
-
-jint JNICALL Java_org_thoughtcrime_securesms_util_FileUtils_getFileDescriptorOwner
-  (JNIEnv *env, jclass clazz, jobject fileDescriptor)
-{
-  jclass fdClass = env->GetObjectClass(fileDescriptor);
-
-  if (fdClass == NULL) {
-    return -1;
-  }
-
-  jfieldID fdFieldId = env->GetFieldID(fdClass, "descriptor", "I");
-
-  if (fdFieldId == NULL) {
-    return -1;
-  }
-
-  int fd = env->GetIntField(fileDescriptor, fdFieldId);
-
-  struct stat stat_struct;
-
-  if (fstat(fd, &stat_struct) != 0) {
-    return -1;
-  }
-
-  return stat_struct.st_uid;
-}
-
-JNIEXPORT jint JNICALL Java_org_thoughtcrime_securesms_util_FileUtils_createMemoryFileDescriptor
-  (JNIEnv *env, jclass clazz, jstring jname)
-{
-  const char *name = env->GetStringUTFChars(jname, NULL);
-
-  int fd = syscall(SYS_memfd_create, name, MFD_CLOEXEC);
-
-  env->ReleaseStringUTFChars(jname, name);
-
-  return fd;
-}
--- a/app/jni/utils/org_thoughtcrime_securesms_util_FileUtils.h
+++ b/app/jni/utils/org_thoughtcrime_securesms_util_FileUtils.h
@@ -1,29 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class org_thoughtcrime_securesms_util_FileUtils */
-
-#ifndef _Included_org_thoughtcrime_securesms_util_FileUtils
-#define _Included_org_thoughtcrime_securesms_util_FileUtils
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     org_thoughtcrime_securesms_util_FileUtils
- * Method:    getFileDescriptorOwner
- * Signature: (Ljava/io/FileDescriptor;)I
- */
-JNIEXPORT jint JNICALL Java_org_thoughtcrime_securesms_util_FileUtils_getFileDescriptorOwner
-  (JNIEnv *, jclass, jobject);
-
-/*
- * Class:     org_thoughtcrime_securesms_util_FileUtils
- * Method:    createMemoryFileDescriptor
- * Signature: (Ljava/lang/String;)I
- */
-JNIEXPORT jint JNICALL Java_org_thoughtcrime_securesms_util_FileUtils_createMemoryFileDescriptor
-  (JNIEnv *, jclass, jstring);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<issues format="5" by="lint 3.3.2" client="gradle" variant="playRelease" version="3.3.2">
-
-    <issue
-        id="MissingPermission"
-        message="Call requires permission which may be rejected by user: code should explicitly check to see if permission is available (with `checkPermission`) or explicitly handle a potential `SecurityException`"
-        errorLine1="    List&lt;SubscriptionInfo> list = subscriptionManager.getActiveSubscriptionInfoList();"
-        errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java"
-            line="101"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="ResourceType"
-        message="Expected resource of type styleable"
-        errorLine1="                drawables.getColor(1, 0xff000000);"
-        errorLine2="                                   ~">
-        <location
-            file="src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java"
-            line="187"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="AppLinkUrlError"
-        message="Missing URL"
-        errorLine1="        &lt;intent-filter>"
-        errorLine2="        ^">
-        <location
-            file="AndroidManifest.xml"
-            line="368"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="AppLinkUrlError"
-        message="Missing URL"
-        errorLine1="        &lt;intent-filter>"
-        errorLine2="        ^">
-        <location
-            file="AndroidManifest.xml"
-            line="381"
-            column="9"/>
-    </issue>
-
-</issues>
--- a/app/lint.xml
+++ b/app/lint.xml
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<lint>
-
-    <!-- Wont pass lint or qa with a STOPSHIP in a comment -->
-    <issue id="StopShip" severity="fatal" />
-
-    <!-- L10N errors -->
-    <!-- This is a runtime crash so we don't want to ship with this. -->
-    <issue id="StringFormatMatches" severity="error" />
-
-    <!-- L10N warnings -->
-    <issue id="MissingTranslation" severity="ignore" />
-    <issue id="MissingQuantity" severity="warning" />
-    <issue id="MissingDefaultResource" severity="error">
-        <ignore path="*/res/values-*/strings.xml" /> <!-- Ignore for non-English, excludeNonTranslatables task will remove these -->
-    </issue>
-    <issue id="ExtraTranslation" severity="warning" />
-    <issue id="ImpliedQuantity" severity="warning" />
-    <issue id="TypographyDashes" severity="error" >
-        <ignore path="*/res/values-*/strings.xml" /> <!-- Ignore for non-English -->
-    </issue>
-
-    <issue id="CanvasSize" severity="error" />
-    <issue id="HardcodedText" severity="error" />
-    <issue id="VectorRaster" severity="error" />
-    <issue id="ButtonOrder" severity="error" />
-    <issue id="ExtraTranslation" severity="warning" />
-
-    <!-- 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" />
-        <ignore path="*/org/thoughtcrime/securesms/conversation/*.java" />
-        <ignore path="*/org/thoughtcrime/securesms/lock/v2/CreateKbsPinViewModel.java" />
-        <ignore path="*/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java" />
-    </issue>
-
-</lint>
--- a/app/proguard/proguard-appcompat-v7.pro
+++ b/app/proguard/proguard-appcompat-v7.pro
@@ -1,13 +0,0 @@
-# https://code.google.com/p/android/issues/detail?id=78377
-keepnames class !android.support.v7.internal.view.menu.**, ** { *; }
-
-keep public class android.support.v7.widget.** { *; }
-keep public class android.support.v7.internal.widget.** { *; }
-
-keep public class * extends android.support.v4.view.ActionProvider {
-    public <init>(android.content.Context);
-}
-
-keepattributes *Annotation*
-keep public class * extends android.support.design.widget.CoordinatorLayout.Behavior { *; }
-keep public class * extends android.support.design.widget.ViewOffsetBehavior { *; }
--- a/app/proguard/proguard-ez-vcard.pro
+++ b/app/proguard/proguard-ez-vcard.pro
@@ -1 +0,0 @@
-dontwarn ezvcard.io.html.HCardPage
--- a/app/proguard/proguard-firebase-messaging.pro
+++ b/app/proguard/proguard-firebase-messaging.pro
@@ -1 +0,0 @@
-dontwarn com.google.firebase.analytics.connector.AnalyticsConnector
--- a/app/proguard/proguard-glide.pro
+++ b/app/proguard/proguard-glide.pro
@@ -1,6 +0,0 @@
-keep public class * implements com.bumptech.glide.module.GlideModule
-keep public class * extends com.bumptech.glide.AppGlideModule
-keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** {
-    **[] $VALUES;
-    public *;
-}
--- a/app/proguard/proguard-klinker.pro
+++ b/app/proguard/proguard-klinker.pro
@@ -1,3 +0,0 @@
-dontwarn android.net.ConnectivityManager
-dontwarn android.net.ConnectivityManager$NetworkCallback
-dontwarn org.webrtc.NetworkMonitorAutoDetect$ConnectivityManagerDelegate
--- a/app/proguard/proguard-okhttp.pro
+++ b/app/proguard/proguard-okhttp.pro
@@ -1,3 +0,0 @@
-dontwarn okio.**
-dontwarn javax.annotation.Nullable
-dontwarn javax.annotation.ParametersAreNonnullByDefault
--- a/app/proguard/proguard-retrolambda.pro
+++ b/app/proguard/proguard-retrolambda.pro
@@ -1,2 +0,0 @@
-dontwarn java.lang.invoke.*
-dontwarn **$$Lambda$*
--- a/app/proguard/proguard-sqlite.pro
+++ b/app/proguard/proguard-sqlite.pro
@@ -1,8 +0,0 @@
-keep class org.sqlite.** { *; }
-keep class org.sqlite.database.** { *; }
-
-keep class net.sqlcipher.** { *; }
-dontwarn net.sqlcipher.**
-
-keep class net.zetetic.** { *; }
-dontwarn net.zetetic.**
--- a/app/proguard/proguard.cfg
+++ b/app/proguard/proguard.cfg
@@ -1,13 +0,0 @@
-dontoptimize
-dontobfuscate
-keepattributes SourceFile,LineNumberTable
-keep class org.whispersystems.** { *; }
-keep class org.thoughtcrime.securesms.** { *; }
-keepclassmembers class ** {
-    public void onEvent*(**);
-}
-
-# Protobuf lite
-keep class * extends com.google.protobuf.GeneratedMessageLite { *; }
-
-keep class androidx.window.** { *; }
--- a/app/sampledata/contacts.json
+++ b/app/sampledata/contacts.json
@@ -1,29 +0,0 @@
-{
-  "data": [
-    {
-      "name": "Ottttooooooooo Ocataaaaaaaavius",
-      "number": "+1 (555) 555-5555",
-      "label": "Mobile"
-    },
-    {
-      "name": "Victor Von Doom Phd",
-      "number": "+1 (555) 123-4567",
-      "label": "Home"
-    },
-    {
-      "name": "Flash Thompson",
-      "number": "+1 (555) 435-1261",
-      "label": "Work"
-    },
-    {
-      "name": "Dr. Curtis Connors",
-      "number": "+1 (555) 992-1567",
-      "label": "Mobile"
-    },
-    {
-      "name": "Billy Russo",
-      "number": "+1 (555) 234-1516",
-      "label": "Mobile"
-    }
-  ]
-}
--- 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/RecipientDatabaseTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest.kt
@@ -1,557 +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.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.ThreadUtil
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.jobs.RecipientChangedNumberJob
-import org.thoughtcrime.securesms.keyvalue.AccountValues
-import org.thoughtcrime.securesms.keyvalue.KeyValueDataSet
-import org.thoughtcrime.securesms.keyvalue.KeyValueStore
-import org.thoughtcrime.securesms.keyvalue.MockKeyValuePersistentStorage
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.whispersystems.libsignal.util.guava.Optional
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.push.PNI
-import java.lang.IllegalArgumentException
-import java.util.UUID
-
-@RunWith(AndroidJUnit4::class)
-class RecipientDatabaseTest {
-
-  private lateinit var recipientDatabase: RecipientDatabase
-
-  @Before
-  fun setup() {
-    recipientDatabase = SignalDatabase.recipients
-    ensureDbEmpty()
-  }
-
-  // ==============================================================
-  // If both the ACI and E164 map to no one
-  // ==============================================================
-
-  /** If all you have is an ACI, you can just store that, regardless of trust level. */
-  @Test
-  fun getAndPossiblyMerge_aciAndE164MapToNoOne_aciOnly_highTrust() {
-    val recipientId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, null, true)
-
-    val recipient = Recipient.resolved(recipientId)
-    assertEquals(ACI_A, recipient.requireAci())
-    assertFalse(recipient.hasE164())
-  }
-
-  /** If all you have is an ACI, you can just store that, regardless of trust level. */
-  @Test
-  fun getAndPossiblyMerge_aciAndE164MapToNoOne_aciOnly_lowTrust() {
-    val recipientId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, null, false)
-
-    val recipient = Recipient.resolved(recipientId)
-    assertEquals(ACI_A, recipient.requireAci())
-    assertFalse(recipient.hasE164())
-  }
-
-  /** If all you have is an E164, you can just store that, regardless of trust level. */
-  @Test
-  fun getAndPossiblyMerge_aciAndE164MapToNoOne_e164Only_highTrust() {
-    val recipientId: RecipientId = recipientDatabase.getAndPossiblyMerge(null, E164_A, true)
-
-    val recipient = Recipient.resolved(recipientId)
-    assertEquals(E164_A, recipient.requireE164())
-    assertFalse(recipient.hasAci())
-  }
-
-  /** If all you have is an E164, you can just store that, regardless of trust level. */
-  @Test
-  fun getAndPossiblyMerge_aciAndE164MapToNoOne_e164Only_lowTrust() {
-    val recipientId: RecipientId = recipientDatabase.getAndPossiblyMerge(null, E164_A, false)
-
-    val recipient = Recipient.resolved(recipientId)
-    assertEquals(E164_A, recipient.requireE164())
-    assertFalse(recipient.hasAci())
-  }
-
-  /** With high trust, you can associate an ACI-e164 pair. */
-  @Test
-  fun getAndPossiblyMerge_aciAndE164MapToNoOne_aciAndE164_highTrust() {
-    val recipientId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
-
-    val recipient = Recipient.resolved(recipientId)
-    assertEquals(ACI_A, recipient.requireAci())
-    assertEquals(E164_A, recipient.requireE164())
-  }
-
-  /** With low trust, you cannot associate an ACI-e164 pair, and therefore can only store the ACI. */
-  @Test
-  fun getAndPossiblyMerge_aciAndE164MapToNoOne_aciAndE164_lowTrust() {
-    val recipientId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, false)
-
-    val recipient = Recipient.resolved(recipientId)
-    assertEquals(ACI_A, recipient.requireAci())
-    assertFalse(recipient.hasE164())
-  }
-
-  // ==============================================================
-  // If the ACI maps to an existing user, but the E164 doesn't
-  // ==============================================================
-
-  /** With high trust, you can associate an e164 with an existing ACI. */
-  @Test
-  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciAndE164_highTrust() {
-    val existingId: RecipientId = recipientDatabase.getOrInsertFromAci(ACI_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
-    assertEquals(existingId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
-    assertEquals(E164_A, retrievedRecipient.requireE164())
-  }
-
-  /** With low trust, you cannot associate an ACI-e164 pair, and therefore cannot store the e164. */
-  @Test
-  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciAndE164_lowTrust() {
-    val existingId: RecipientId = recipientDatabase.getOrInsertFromAci(ACI_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, false)
-    assertEquals(existingId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
-    assertFalse(retrievedRecipient.hasE164())
-  }
-
-  /** Basically the ‘change number’ case. High trust lets you update the existing user. */
-  @Test
-  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciAndE164_2_highTrust() {
-    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, true)
-    assertEquals(existingId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
-    assertEquals(E164_B, retrievedRecipient.requireE164())
-  }
-
-  /** Low trust means you can’t update the underlying data, but you also don’t need to create any new rows. */
-  @Test
-  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciAndE164_2_lowTrust() {
-    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, false)
-    assertEquals(existingId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
-    assertEquals(E164_A, retrievedRecipient.requireE164())
-  }
-
-  // ==============================================================
-  // If the E164 maps to an existing user, but the ACI doesn't
-  // ==============================================================
-
-  /** With high trust, you can associate an e164 with an existing ACI. */
-  @Test
-  fun getAndPossiblyMerge_e164MapsToExistingUserButAciDoesNot_aciAndE164_highTrust() {
-    val existingId: RecipientId = recipientDatabase.getOrInsertFromE164(E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
-    assertEquals(existingId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
-    assertEquals(E164_A, retrievedRecipient.requireE164())
-  }
-
-  /** With low trust, you cannot associate an ACI-e164 pair, and therefore need to create a new person with just the ACI. */
-  @Test
-  fun getAndPossiblyMerge_e164MapsToExistingUserButAciDoesNot_aciAndE164_lowTrust() {
-    val existingId: RecipientId = recipientDatabase.getOrInsertFromE164(E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, false)
-    assertNotEquals(existingId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
-    assertFalse(retrievedRecipient.hasE164())
-
-    val existingRecipient = Recipient.resolved(existingId)
-    assertEquals(E164_A, existingRecipient.requireE164())
-    assertFalse(existingRecipient.hasAci())
-  }
-
-  /** We never change the ACI of an existing row. New ACI = new person, regardless of trust. But high trust lets us take the e164 from the current holder. */
-  @Test
-  fun getAndPossiblyMerge_e164MapsToExistingUserButAciDoesNot_aciAndE164_2_highTrust() {
-    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
-    recipientDatabase.setPni(existingId, PNI_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_B, E164_A, true)
-    recipientDatabase.setPni(retrievedId, PNI_A)
-    assertNotEquals(existingId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_B, retrievedRecipient.requireAci())
-    assertEquals(E164_A, retrievedRecipient.requireE164())
-    assertEquals(PNI_A, retrievedRecipient.pni.get())
-
-    val existingRecipient = Recipient.resolved(existingId)
-    assertEquals(ACI_A, existingRecipient.requireAci())
-    assertFalse(existingRecipient.hasE164())
-    assertNull(existingRecipient.pni.orNull())
-  }
-
-  /** We never change the ACI of an existing row. New ACI = new person, regardless of trust. And low trust means we can’t take the e164. */
-  @Test
-  fun getAndPossiblyMerge_e164MapsToExistingUserButAciDoesNot_aciAndE164_2_lowTrust() {
-    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_B, E164_A, false)
-    assertNotEquals(existingId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_B, retrievedRecipient.requireAci())
-    assertFalse(retrievedRecipient.hasE164())
-
-    val existingRecipient = Recipient.resolved(existingId)
-    assertEquals(ACI_A, existingRecipient.requireAci())
-    assertEquals(E164_A, existingRecipient.requireE164())
-  }
-
-  /** We never want to remove the e164 of our own contact entry. So basically treat this as a low-trust case, and leave the e164 alone. */
-  @Test
-  fun getAndPossiblyMerge_e164MapsToExistingUserButAciDoesNot_e164BelongsToLocalUser_highTrust() {
-    val dataSet = KeyValueDataSet().apply {
-      putString(AccountValues.KEY_E164, E164_A)
-      putString(AccountValues.KEY_ACI, ACI_A.toString())
-    }
-    SignalStore.inject(KeyValueStore(MockKeyValuePersistentStorage.withDataSet(dataSet)))
-
-    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_B, E164_A, true)
-    assertNotEquals(existingId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_B, retrievedRecipient.requireAci())
-    assertFalse(retrievedRecipient.hasE164())
-
-    val existingRecipient = Recipient.resolved(existingId)
-    assertEquals(ACI_A, existingRecipient.requireAci())
-    assertEquals(E164_A, existingRecipient.requireE164())
-  }
-
-  // ==============================================================
-  // If both the ACI and E164 map to an existing user
-  // ==============================================================
-
-  /** Regardless of trust, if your ACI and e164 match, you’re good. */
-  @Test
-  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_highTrust() {
-    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
-    assertEquals(existingId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
-    assertEquals(E164_A, retrievedRecipient.requireE164())
-  }
-
-  /** High trust lets you merge two different users into one. You should prefer the ACI user. Not shown: merging threads, dropping e164 sessions, etc. */
-  @Test
-  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_merge_highTrust() {
-    val changeNumberListener = ChangeNumberListener()
-    changeNumberListener.enqueue()
-
-    val existingAciId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, null, true)
-    val existingE164Id: RecipientId = recipientDatabase.getAndPossiblyMerge(null, E164_A, true)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
-    assertEquals(existingAciId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
-    assertEquals(E164_A, retrievedRecipient.requireE164())
-
-    val existingE164Recipient = Recipient.resolved(existingE164Id)
-    assertEquals(retrievedId, existingE164Recipient.id)
-
-    changeNumberListener.waitForJobManager()
-    assertFalse(changeNumberListener.numberChangeWasEnqueued)
-  }
-
-  /** Same as [getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_merge_highTrust], but with a number change. */
-  @Test
-  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_merge_highTrust_changedNumber() {
-    val changeNumberListener = ChangeNumberListener()
-    changeNumberListener.enqueue()
-
-    val existingAciId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, true)
-    val existingE164Id: RecipientId = recipientDatabase.getAndPossiblyMerge(null, E164_A, true)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
-    assertEquals(existingAciId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
-    assertEquals(E164_A, retrievedRecipient.requireE164())
-
-    val existingE164Recipient = Recipient.resolved(existingE164Id)
-    assertEquals(retrievedId, existingE164Recipient.id)
-
-    changeNumberListener.waitForJobManager()
-    assert(changeNumberListener.numberChangeWasEnqueued)
-  }
-
-  /** Low trust means you can’t merge. If you’re retrieving a user from the table with this data, prefer the ACI one. */
-  @Test
-  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_lowTrust() {
-    val existingAciId: RecipientId = recipientDatabase.getOrInsertFromAci(ACI_A)
-    val existingE164Id: RecipientId = recipientDatabase.getOrInsertFromE164(E164_A)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, false)
-    assertEquals(existingAciId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
-    assertFalse(retrievedRecipient.hasE164())
-
-    val existingE164Recipient = Recipient.resolved(existingE164Id)
-    assertEquals(E164_A, existingE164Recipient.requireE164())
-    assertFalse(existingE164Recipient.hasAci())
-  }
-
-  /** Another high trust case. No new rules here, just a more complex scenario to show how different rules interact. */
-  @Test
-  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_complex_highTrust() {
-    val changeNumberListener = ChangeNumberListener()
-    changeNumberListener.enqueue()
-
-    val existingId1: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, true)
-    val existingId2: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_B, E164_A, true)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
-    assertEquals(existingId1, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
-    assertEquals(E164_A, retrievedRecipient.requireE164())
-
-    val existingRecipient2 = Recipient.resolved(existingId2)
-    assertEquals(ACI_B, existingRecipient2.requireAci())
-    assertFalse(existingRecipient2.hasE164())
-
-    assert(changeNumberListener.numberChangeWasEnqueued)
-  }
-
-  /** Another low trust case. No new rules here, just a more complex scenario to show how different rules interact. */
-  @Test
-  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_complex_lowTrust() {
-    val existingId1: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, true)
-    val existingId2: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_B, E164_A, true)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, false)
-    assertEquals(existingId1, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
-    assertEquals(E164_B, retrievedRecipient.requireE164())
-
-    val existingRecipient2 = Recipient.resolved(existingId2)
-    assertEquals(ACI_B, existingRecipient2.requireAci())
-    assertEquals(E164_A, existingRecipient2.requireE164())
-  }
-
-  /**
-   * Another high trust case that results in a merge. Nothing strictly new here, but this case is called out because it’s a merge but *also* an E164 change,
-   * which clients may need to know for UX purposes.
-   */
-  @Test
-  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_aciAndE164_mergeAndPhoneNumberChange_highTrust() {
-    val existingId1: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, true)
-    val existingId2: RecipientId = recipientDatabase.getAndPossiblyMerge(null, E164_A, true)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
-    assertEquals(existingId1, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
-    assertEquals(E164_A, retrievedRecipient.requireE164())
-
-    assertFalse(recipientDatabase.getByE164(E164_B).isPresent)
-
-    val recipientWithId2 = Recipient.resolved(existingId2)
-    assertEquals(retrievedId, recipientWithId2.id)
-  }
-
-  /** We never want to remove the e164 of our own contact entry. So basically treat this as a low-trust case, and leave the e164 alone. */
-  @Test
-  fun getAndPossiblyMerge_bothAciAndE164MapToExistingUser_e164BelongsToLocalUser() {
-    val dataSet = KeyValueDataSet().apply {
-      putString(AccountValues.KEY_E164, E164_A)
-      putString(AccountValues.KEY_ACI, ACI_B.toString())
-    }
-    SignalStore.inject(KeyValueStore(MockKeyValuePersistentStorage.withDataSet(dataSet)))
-
-    val existingId1: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_B, E164_A, true)
-    val existingId2: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, null, true)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
-    assertEquals(existingId2, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
-    assertFalse(retrievedRecipient.hasE164())
-
-    val recipientWithId1 = Recipient.resolved(existingId1)
-    assertEquals(ACI_B, recipientWithId1.requireAci())
-    assertEquals(E164_A, recipientWithId1.requireE164())
-  }
-
-  /** This is a case where normally we'd update the E164 of a user, but here the changeSelf flag is disabled, so we shouldn't. */
-  @Test
-  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciBelongsToLocalUser_highTrust_changeSelfFalse() {
-    val dataSet = KeyValueDataSet().apply {
-      putString(AccountValues.KEY_E164, E164_A)
-      putString(AccountValues.KEY_ACI, ACI_A.toString())
-    }
-    SignalStore.inject(KeyValueStore(MockKeyValuePersistentStorage.withDataSet(dataSet)))
-
-    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, highTrust = true, changeSelf = false)
-    assertEquals(existingId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
-    assertEquals(E164_A, retrievedRecipient.requireE164())
-  }
-
-  /** This is a case where we're changing our own number, and it's allowed because changeSelf = true. */
-  @Test
-  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_aciBelongsToLocalUser_highTrust_changeSelfTrue() {
-    val dataSet = KeyValueDataSet().apply {
-      putString(AccountValues.KEY_E164, E164_A)
-      putString(AccountValues.KEY_ACI, ACI_A.toString())
-    }
-    SignalStore.inject(KeyValueStore(MockKeyValuePersistentStorage.withDataSet(dataSet)))
-
-    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, highTrust = true, changeSelf = true)
-    assertEquals(existingId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
-    assertEquals(E164_B, retrievedRecipient.requireE164())
-  }
-
-  /** Verifying a case where a change number job is expected to be enqueued. */
-  @Test
-  fun getAndPossiblyMerge_aciMapsToExistingUserButE164DoesNot_highTrust_changedNumber() {
-    val changeNumberListener = ChangeNumberListener()
-    changeNumberListener.enqueue()
-
-    val existingId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_B, true)
-    assertEquals(existingId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
-    assertEquals(E164_B, retrievedRecipient.requireE164())
-
-    changeNumberListener.waitForJobManager()
-    assert(changeNumberListener.numberChangeWasEnqueued)
-  }
-
-  // ==============================================================
-  // Misc
-  // ==============================================================
-
-  @Test
-  fun createByE164SanityCheck() {
-    // GIVEN one recipient
-    val recipientId: RecipientId = recipientDatabase.getOrInsertFromE164(E164_A)
-
-    // WHEN I retrieve one by E164
-    val possible: Optional<RecipientId> = recipientDatabase.getByE164(E164_A)
-
-    // THEN I get it back, and it has the properties I expect
-    assertTrue(possible.isPresent)
-    assertEquals(recipientId, possible.get())
-
-    val recipient = Recipient.resolved(recipientId)
-    assertTrue(recipient.e164.isPresent)
-    assertEquals(E164_A, recipient.e164.get())
-  }
-
-  @Test
-  fun createByUuidSanityCheck() {
-    // GIVEN one recipient
-    val recipientId: RecipientId = recipientDatabase.getOrInsertFromAci(ACI_A)
-
-    // WHEN I retrieve one by UUID
-    val possible: Optional<RecipientId> = recipientDatabase.getByAci(ACI_A)
-
-    // THEN I get it back, and it has the properties I expect
-    assertTrue(possible.isPresent)
-    assertEquals(recipientId, possible.get())
-
-    val recipient = Recipient.resolved(recipientId)
-    assertTrue(recipient.aci.isPresent)
-    assertEquals(ACI_A, recipient.aci.get())
-  }
-
-  @Test(expected = IllegalArgumentException::class)
-  fun getAndPossiblyMerge_noArgs_invalid() {
-    recipientDatabase.getAndPossiblyMerge(null, null, true)
-  }
-
-  private fun ensureDbEmpty() {
-    SignalDatabase.rawDatabase.rawQuery("SELECT COUNT(*) FROM ${RecipientDatabase.TABLE_NAME}", null).use { cursor ->
-      assertTrue(cursor.moveToFirst())
-      assertEquals(0, cursor.getLong(0))
-    }
-  }
-
-  private class ChangeNumberListener {
-
-    var numberChangeWasEnqueued = false
-      private set
-
-    fun waitForJobManager() {
-      ApplicationDependencies.getJobManager().flush()
-      ThreadUtil.sleep(500)
-    }
-
-    fun enqueue() {
-      ApplicationDependencies.getJobManager().addListener(
-        { job -> job.factoryKey == RecipientChangedNumberJob.KEY },
-        { _, _ -> numberChangeWasEnqueued = true }
-      )
-    }
-  }
-
-  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"
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest_merges.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/RecipientDatabaseTest_merges.kt
@@ -1,262 +0,0 @@
-package org.thoughtcrime.securesms.database
-
-import android.app.Application
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import org.hamcrest.MatcherAssert.assertThat
-import org.hamcrest.Matchers
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNotEquals
-import org.junit.Assert.assertNotNull
-import org.junit.Assert.assertNull
-import org.junit.Assert.assertTrue
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.signal.storageservice.protos.groups.local.DecryptedGroup
-import org.signal.storageservice.protos.groups.local.DecryptedMember
-import org.signal.zkgroup.groups.GroupMasterKey
-import org.thoughtcrime.securesms.conversation.colors.AvatarColor
-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.groups.GroupId
-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.IncomingTextMessage
-import org.thoughtcrime.securesms.util.CursorUtil
-import org.whispersystems.libsignal.IdentityKey
-import org.whispersystems.libsignal.SignalProtocolAddress
-import org.whispersystems.libsignal.state.SessionRecord
-import org.whispersystems.libsignal.util.guava.Optional
-import org.whispersystems.signalservice.api.push.ACI
-import org.whispersystems.signalservice.api.util.UuidUtil
-import java.util.UUID
-
-@RunWith(AndroidJUnit4::class)
-class RecipientDatabaseTest_merges {
-
-  private lateinit var recipientDatabase: RecipientDatabase
-  private lateinit var identityDatabase: IdentityDatabase
-  private lateinit var groupReceiptDatabase: GroupReceiptDatabase
-  private lateinit var groupDatabase: GroupDatabase
-  private lateinit var threadDatabase: ThreadDatabase
-  private lateinit var smsDatabase: MessageDatabase
-  private lateinit var mmsDatabase: MessageDatabase
-  private lateinit var sessionDatabase: SessionDatabase
-  private lateinit var mentionDatabase: MentionDatabase
-  private lateinit var reactionDatabase: ReactionDatabase
-  private lateinit var notificationProfileDatabase: NotificationProfileDatabase
-
-  @Before
-  fun setup() {
-    recipientDatabase = SignalDatabase.recipients
-    identityDatabase = SignalDatabase.identities
-    groupReceiptDatabase = SignalDatabase.groupReceipts
-    groupDatabase = SignalDatabase.groups
-    threadDatabase = SignalDatabase.threads
-    smsDatabase = SignalDatabase.sms
-    mmsDatabase = SignalDatabase.mms
-    sessionDatabase = SignalDatabase.sessions
-    mentionDatabase = SignalDatabase.mentions
-    reactionDatabase = SignalDatabase.reactions
-    notificationProfileDatabase = SignalDatabase.notificationProfiles
-
-    ensureDbEmpty()
-  }
-
-  /** High trust lets you merge two different users into one. You should prefer the ACI user. Not shown: merging threads, dropping e164 sessions, etc. */
-  @Test
-  fun getAndPossiblyMerge_general() {
-    // Setup
-    val recipientIdAci: RecipientId = recipientDatabase.getOrInsertFromAci(ACI_A)
-    val recipientIdE164: RecipientId = recipientDatabase.getOrInsertFromE164(E164_A)
-    val recipientIdAciB: RecipientId = recipientDatabase.getOrInsertFromAci(ACI_B)
-
-    val smsId1: Long = smsDatabase.insertMessageInbox(smsMessage(sender = recipientIdAci, time = 0, body = "0")).get().messageId
-    val smsId2: Long = smsDatabase.insertMessageInbox(smsMessage(sender = recipientIdE164, time = 1, body = "1")).get().messageId
-    val smsId3: Long = smsDatabase.insertMessageInbox(smsMessage(sender = recipientIdAci, time = 2, body = "2")).get().messageId
-
-    val mmsId1: Long = mmsDatabase.insertSecureDecryptedMessageInbox(mmsMessage(sender = recipientIdAci, time = 3, body = "3"), -1).get().messageId
-    val mmsId2: Long = mmsDatabase.insertSecureDecryptedMessageInbox(mmsMessage(sender = recipientIdE164, time = 4, body = "4"), -1).get().messageId
-    val mmsId3: Long = mmsDatabase.insertSecureDecryptedMessageInbox(mmsMessage(sender = recipientIdAci, time = 5, body = "5"), -1).get().messageId
-
-    val threadIdAci: Long = threadDatabase.getThreadIdFor(recipientIdAci)!!
-    val threadIdE164: Long = threadDatabase.getThreadIdFor(recipientIdE164)!!
-    assertNotEquals(threadIdAci, threadIdE164)
-
-    mentionDatabase.insert(threadIdAci, mmsId1, listOf(Mention(recipientIdE164, 0, 1)))
-    mentionDatabase.insert(threadIdE164, mmsId2, listOf(Mention(recipientIdAci, 0, 1)))
-
-    groupReceiptDatabase.insert(listOf(recipientIdAci, recipientIdE164), mmsId1, 0, 3)
-
-    val identityKeyAci: IdentityKey = identityKey(1)
-    val identityKeyE164: IdentityKey = identityKey(2)
-
-    identityDatabase.saveIdentity(ACI_A.toString(), recipientIdAci, identityKeyAci, IdentityDatabase.VerifiedStatus.VERIFIED, false, 0, false)
-    identityDatabase.saveIdentity(E164_A, recipientIdE164, identityKeyE164, IdentityDatabase.VerifiedStatus.VERIFIED, false, 0, false)
-
-    sessionDatabase.store(SignalProtocolAddress(ACI_A.toString(), 1), SessionRecord())
-
-    reactionDatabase.addReaction(MessageId(smsId1, false), ReactionRecord("a", recipientIdAci, 1, 1))
-    reactionDatabase.addReaction(MessageId(mmsId1, true), ReactionRecord("b", recipientIdE164, 1, 1))
-
-    val profile1: NotificationProfile = notificationProfile(name = "Test")
-    val profile2: NotificationProfile = notificationProfile(name = "Test2")
-
-    notificationProfileDatabase.addAllowedRecipient(profileId = profile1.id, recipientId = recipientIdAci)
-    notificationProfileDatabase.addAllowedRecipient(profileId = profile1.id, recipientId = recipientIdE164)
-    notificationProfileDatabase.addAllowedRecipient(profileId = profile2.id, recipientId = recipientIdE164)
-    notificationProfileDatabase.addAllowedRecipient(profileId = profile2.id, recipientId = recipientIdAciB)
-
-    // Merge
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_A, E164_A, true)
-    val retrievedThreadId: Long = threadDatabase.getThreadIdFor(retrievedId)!!
-    assertEquals(recipientIdAci, retrievedId)
-
-    // Recipient validation
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_A, retrievedRecipient.requireAci())
-    assertEquals(E164_A, retrievedRecipient.requireE164())
-
-    val existingE164Recipient = Recipient.resolved(recipientIdE164)
-    assertEquals(retrievedId, existingE164Recipient.id)
-
-    // Thread validation
-    assertEquals(threadIdAci, retrievedThreadId)
-    assertNull(threadDatabase.getThreadIdFor(recipientIdE164))
-    assertNull(threadDatabase.getThreadRecord(threadIdE164))
-
-    // SMS validation
-    val sms1: MessageRecord = smsDatabase.getMessageRecord(smsId1)!!
-    val sms2: MessageRecord = smsDatabase.getMessageRecord(smsId2)!!
-    val sms3: MessageRecord = smsDatabase.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 = mmsDatabase.getMessageRecord(mmsId1)!!
-    val mms2: MessageRecord = mmsDatabase.getMessageRecord(mmsId2)!!
-    val mms3: MessageRecord = mmsDatabase.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<GroupReceiptDatabase.GroupReceiptInfo> = groupReceiptDatabase.getGroupReceiptInfo(mmsId1)
-    assertEquals(retrievedId, groupReceipts[0].recipientId)
-    assertEquals(retrievedId, groupReceipts[1].recipientId)
-
-    // Identity validation
-    assertEquals(identityKeyAci, identityDatabase.getIdentityStoreRecord(ACI_A.toString())!!.identityKey)
-    assertNull(identityDatabase.getIdentityStoreRecord(E164_A))
-
-    // Session validation
-    assertNotNull(sessionDatabase.load(SignalProtocolAddress(ACI_A.toString(), 1)))
-
-    // Reaction validation
-    val reactionsSms: List<ReactionRecord> = reactionDatabase.getReactions(MessageId(smsId1, false))
-    val reactionsMms: List<ReactionRecord> = reactionDatabase.getReactions(MessageId(mmsId1, true))
-
-    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 = notificationProfileDatabase.getProfile(profile1.id)!!
-    val updatedProfile2: NotificationProfile = notificationProfileDatabase.getProfile(profile2.id)!!
-
-    assertThat("Notification Profile 1 should now only contain ACI $recipientIdAci", updatedProfile1.allowedMembers, Matchers.containsInAnyOrder(recipientIdAci))
-    assertThat("Notification Profile 2 should now contain ACI A ($recipientIdAci) and ACI B ($recipientIdAciB)", updatedProfile2.allowedMembers, Matchers.containsInAnyOrder(recipientIdAci, recipientIdAciB))
-  }
-
-  private val context: Application
-    get() = InstrumentationRegistry.getInstrumentation().targetContext.applicationContext as Application
-
-  private fun ensureDbEmpty() {
-    SignalDatabase.rawDatabase.rawQuery("SELECT COUNT(*) FROM ${RecipientDatabase.TABLE_NAME}", null).use { cursor ->
-      assertTrue(cursor.moveToFirst())
-      assertEquals(0, cursor.getLong(0))
-    }
-  }
-
-  private fun smsMessage(sender: RecipientId, time: Long = 0, body: String = "", groupId: Optional<GroupId> = Optional.absent()): 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.absent()): IncomingMediaMessage {
-    return IncomingMediaMessage(sender, groupId, body, time, time, time, emptyList(), 0, 0, false, false, true, Optional.absent())
-  }
-
-  private fun identityKey(value: Byte): IdentityKey {
-    val bytes = ByteArray(33)
-    bytes[0] = 0x05
-    bytes[1] = value
-    return IdentityKey(bytes)
-  }
-
-  private fun groupMasterKey(value: Byte): GroupMasterKey {
-    val bytes = ByteArray(32)
-    bytes[0] = value
-    return GroupMasterKey(bytes)
-  }
-
-  private fun decryptedGroup(members: Collection<UUID>): DecryptedGroup {
-    return DecryptedGroup.newBuilder()
-      .addAllMembers(members.map { DecryptedMember.newBuilder().setUuid(UuidUtil.toByteString(it)).build() })
-      .build()
-  }
-
-  private fun getMention(messageId: Long): MentionModel {
-    SignalDatabase.rawDatabase.rawQuery("SELECT * FROM ${MentionDatabase.TABLE_NAME} WHERE ${MentionDatabase.MESSAGE_ID} = $messageId").use { cursor ->
-      cursor.moveToFirst()
-      return MentionModel(
-        recipientId = RecipientId.from(CursorUtil.requireLong(cursor, MentionDatabase.RECIPIENT_ID)),
-        threadId = CursorUtil.requireLong(cursor, MentionDatabase.THREAD_ID)
-      )
-    }
-  }
-
-  private fun notificationProfile(name: String): NotificationProfile {
-    return (notificationProfileDatabase.createProfile(name = name, emoji = "", color = AvatarColor.A210, System.currentTimeMillis()) as NotificationProfileDatabase.NotificationProfileChangeResult.Success).notificationProfile
-  }
-
-  /** 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
-  )
-
-  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 E164_A = "+12221234567"
-    val E164_B = "+13331234567"
-  }
-}
--- a/app/src/androidTest/java/org/thoughtcrime/securesms/database/SQLiteDatabaseTest.kt
+++ b/app/src/androidTest/java/org/thoughtcrime/securesms/database/SQLiteDatabaseTest.kt
@@ -1,125 +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())
-  }
-}
--- 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,97 +0,0 @@
-package org.thoughtcrime.securesms.lock;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-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;
-
-import java.io.IOException;
-
-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
-  public void argon2_hashed_pin_password() throws IOException {
-    String    pin       = "password";
-    byte[]    backupId  = Hex.fromStringCondensed("000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f");
-    MasterKey masterKey = new MasterKey(Hex.fromStringCondensed("202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f"));
-
-    HashedPin hashedPin = PinHashing.hashPin(pin, () -> backupId);
-    KbsData   kbsData   = hashedPin.createNewKbsData(masterKey);
-
-    assertArrayEquals(hashedPin.getKbsAccessKey(), kbsData.getKbsAccessKey());
-    assertArrayEquals(Hex.fromStringCondensed("ab7e8499d21f80a6600b3b9ee349ac6d72c07e3359fe885a934ba7aa844429f8"), kbsData.getKbsAccessKey());
-    assertArrayEquals(Hex.fromStringCondensed("3f33ce58eb25b40436592a30eae2a8fabab1899095f4e2fba6e2d0dc43b4a2d9cac5a3931748522393951e0e54dec769"), kbsData.getCipherText());
-    assertEquals(masterKey, kbsData.getMasterKey());
-
-    String localPinHash = PinHashing.localPinHash(pin);
-    assertTrue(PinHashing.verifyLocalPinHash(localPinHash, pin));
-  }
-
-  @Test
-  public void argon2_hashed_pin_another_password() throws IOException {
-    String    pin       = "anotherpassword";
-    byte[]    backupId  = Hex.fromStringCondensed("202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f");
-    MasterKey masterKey = new MasterKey(Hex.fromStringCondensed("88a787415a2ecd79da0d1016a82a27c5c695c9a19b88b0aa1d35683280aa9a67"));
-
-    HashedPin hashedPin = PinHashing.hashPin(pin, () -> backupId);
-    KbsData   kbsData   = hashedPin.createNewKbsData(masterKey);
-
-    assertArrayEquals(hashedPin.getKbsAccessKey(), kbsData.getKbsAccessKey());
-    assertArrayEquals(Hex.fromStringCondensed("301d9dd1e96f20ce51083f67d3298fd37b97525de8324d5e12ed2d407d3d927b"), kbsData.getKbsAccessKey());
-    assertArrayEquals(Hex.fromStringCondensed("9d9b05402ea39c17ff1c9298c8a0e86784a352aa02a74943bf8bcf07ec0f4b574a5b786ad0182c8d308d9eb06538b8c9"), kbsData.getCipherText());
-    assertEquals(masterKey, kbsData.getMasterKey());
-
-    String localPinHash = PinHashing.localPinHash(pin);
-    assertTrue(PinHashing.verifyLocalPinHash(localPinHash, pin));
-  }
-
-  @Test
-  public void argon2_hashed_pin_password_with_spaces_diacritics_and_non_arabic_numerals() throws IOException {
-    String    pin       = " Pass६örd ";
-    byte[]    backupId  = Hex.fromStringCondensed("cba811749042b303a6a7efa5ccd160aea5e3ea243c8d2692bd13d515732f51a8");
-    MasterKey masterKey = new MasterKey(Hex.fromStringCondensed("9571f3fde1e58588ba49bcf82be1b301ca3859a6f59076f79a8f47181ef952bf"));
-
-    HashedPin hashedPin = PinHashing.hashPin(pin, () -> backupId);
-    KbsData   kbsData   = hashedPin.createNewKbsData(masterKey);
-
-    assertArrayEquals(hashedPin.getKbsAccessKey(), kbsData.getKbsAccessKey());
-    assertArrayEquals(Hex.fromStringCondensed("ab645acdccc1652a48a34b2ac6926340ff35c03034013f68760f20013f028dd8"), kbsData.getKbsAccessKey());
-    assertArrayEquals(Hex.fromStringCondensed("11c0ba1834db15e47c172f6c987c64bd4cfc69c6047dd67a022afeec0165a10943f204d5b8f37b3cb7bab21c6dfc39c8"), kbsData.getCipherText());
-    assertEquals(masterKey, kbsData.getMasterKey());
-
-    assertEquals("577939bccb2b6638c39222d5a97998a867c5e154e30b82cc120f2dd07a3de987", kbsData.getMasterKey().deriveRegistrationLock());
-
-    String localPinHash = PinHashing.localPinHash(pin);
-    assertTrue(PinHashing.verifyLocalPinHash(localPinHash, pin));
-  }
-
-  @Test
-  public void argon2_hashed_pin_password_with_just_non_arabic_numerals() throws IOException {
-    String    pin       = " ६१८ ";
-    byte[]    backupId  = Hex.fromStringCondensed("717dc111a98423a57196512606822fca646c653facd037c10728f14ba0be2ab3");
-    MasterKey masterKey = new MasterKey(Hex.fromStringCondensed("0432d735b32f66d0e3a70d4f9cc821a8529521a4937d26b987715d8eff4e4c54"));
-
-    HashedPin hashedPin = PinHashing.hashPin(pin, () -> backupId);
-    KbsData   kbsData   = hashedPin.createNewKbsData(masterKey);
-
-
-    assertArrayEquals(hashedPin.getKbsAccessKey(), kbsData.getKbsAccessKey());
-    assertArrayEquals(Hex.fromStringCondensed("d2fedabd0d4c17a371491c9722578843a26be3b4923e28d452ab2fc5491e794b"), kbsData.getKbsAccessKey());
-    assertArrayEquals(Hex.fromStringCondensed("877ef871ef1fc668401c717ef21aa12e8523579fb1ff4474b76f28c2293537c80cc7569996c9e0229bea7f378e3a824e"), kbsData.getCipherText());
-    assertEquals(masterKey, kbsData.getMasterKey());
-
-    assertEquals("23a75cb1df1a87df45cc2ed167c2bdc85ab1220b847c88761b0005cac907fce5", kbsData.getMasterKey().deriveRegistrationLock());
-
-    String localPinHash = PinHashing.localPinHash(pin);
-    assertTrue(PinHashing.verifyLocalPinHash(localPinHash, pin));
-  }
-}
--- a/app/src/flipper/AndroidManifest.xml
+++ b/app/src/flipper/AndroidManifest.xml
@@ -1,16 +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: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.kt
+++ b/app/src/flipper/java/org/thoughtcrime/securesms/FlipperApplicationContext.kt
@@ -1,60 +0,0 @@
-package org.thoughtcrime.securesms
-
-import com.facebook.flipper.android.AndroidFlipperClient
-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 leakcanary.LeakCanary
-import org.thoughtcrime.securesms.database.FlipperSqlCipherAdapter
-import shark.AndroidReferenceMatchers
-
-class FlipperApplicationContext : ApplicationContext() {
-  override fun onCreate() {
-    super.onCreate()
-    SoLoader.init(this, false)
-
-    val client = AndroidFlipperClient.getInstance(this)
-    client.addPlugin(InspectorFlipperPlugin(this, DescriptorMapping.withDefaults()))
-    client.addPlugin(DatabasesFlipperPlugin(FlipperSqlCipherAdapter(this)))
-    client.addPlugin(SharedPreferencesFlipperPlugin(this))
-    client.start()
-
-    LeakCanary.config = LeakCanary.config.copy(
-      referenceMatchers = AndroidReferenceMatchers.appDefaults +
-        AndroidReferenceMatchers.ignoredInstanceField(
-          className = "android.service.media.MediaBrowserService\$ServiceBinder",
-          fieldName = "this\$0"
-        ) +
-        AndroidReferenceMatchers.ignoredInstanceField(
-          className = "androidx.media.MediaBrowserServiceCompat\$MediaBrowserServiceImplApi26\$MediaBrowserServiceApi26",
-          fieldName = "mBase"
-        ) +
-        AndroidReferenceMatchers.ignoredInstanceField(
-          className = "android.support.v4.media.MediaBrowserCompat",
-          fieldName = "mImpl"
-        ) +
-        AndroidReferenceMatchers.ignoredInstanceField(
-          className = "android.support.v4.media.session.MediaControllerCompat",
-          fieldName = "mToken"
-        ) +
-        AndroidReferenceMatchers.ignoredInstanceField(
-          className = "android.support.v4.media.session.MediaControllerCompat",
-          fieldName = "mImpl"
-        ) +
-        AndroidReferenceMatchers.ignoredInstanceField(
-          className = "org.thoughtcrime.securesms.components.voice.VoiceNotePlaybackService",
-          fieldName = "mApplication"
-        ) +
-        AndroidReferenceMatchers.ignoredInstanceField(
-          className = "org.thoughtcrime.securesms.service.GenericForegroundService\$LocalBinder",
-          fieldName = "this\$0"
-        ) +
-        AndroidReferenceMatchers.ignoredInstanceField(
-          className = "org.thoughtcrime.securesms.contacts.ContactsSyncAdapter",
-          fieldName = "mContext"
-        )
-    )
-  }
-}
--- a/app/src/flipper/java/org/thoughtcrime/securesms/database/FlipperSqlCipherAdapter.java
+++ b/app/src/flipper/java/org/thoughtcrime/securesms/database/FlipperSqlCipherAdapter.java
@@ -1,271 +0,0 @@
-package org.thoughtcrime.securesms.database;
-
-import android.app.Application;
-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.zetetic.database.DatabaseUtils;
-import net.zetetic.database.sqlcipher.SQLiteDatabase;
-import net.zetetic.database.sqlcipher.SQLiteStatement;
-
-import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.util.Hex;
-
-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;
-import java.util.Objects;
-
-/**
- * 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 {
-      SignalDatabaseOpenHelper mainOpenHelper       = Objects.requireNonNull(SignalDatabase.getInstance());
-      SignalDatabaseOpenHelper keyValueOpenHelper   = KeyValueDatabase.getInstance((Application) getContext());
-      SignalDatabaseOpenHelper megaphoneOpenHelper  = MegaphoneDatabase.getInstance((Application) getContext());
-      SignalDatabaseOpenHelper jobManagerOpenHelper = JobDatabase.getInstance((Application) getContext());
-      SignalDatabaseOpenHelper metricsOpenHelper    = LocalMetricsDatabase.getInstance((Application) getContext());
-
-      return Arrays.asList(new Descriptor(mainOpenHelper),
-                           new Descriptor(keyValueOpenHelper),
-                           new Descriptor(megaphoneOpenHelper),
-                           new Descriptor(jobManagerOpenHelper),
-                           new Descriptor(metricsOpenHelper));
-    } 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:
-        byte[] blob = cursor.getBlob(column);
-        String bytes = blob != null ? "(blob) " + Hex.toStringCondensed(Arrays.copyOf(blob, Math.min(blob.length, 32))) : null;
-        if (bytes != null && bytes.length() == 32 && blob.length > 32) {
-          bytes += "...";
-        }
-        return bytes;
-      case Cursor.FIELD_TYPE_STRING:
-      default:
-        return cursor.getString(column);
-    }
-  }
-
-  static class Descriptor implements DatabaseDescriptor {
-    private final SignalDatabaseOpenHelper sqlCipherOpenHelper;
-
-    Descriptor(@NonNull SignalDatabaseOpenHelper sqlCipherOpenHelper) {
-      this.sqlCipherOpenHelper = sqlCipherOpenHelper;
-    }
-
-    @Override
-    public String name() {
-      return sqlCipherOpenHelper.getDatabaseName();
-    }
-
-    public @NonNull SQLiteDatabase getReadable() {
-      return sqlCipherOpenHelper.getSqlCipherDatabase();
-    }
-
-    public @NonNull SQLiteDatabase getWritable() {
-      return sqlCipherOpenHelper.getSqlCipherDatabase();
-    }
-  }
-}
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,871 +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">
-
-    <uses-sdk tools:overrideLibrary="androidx.camera.core,androidx.camera.camera2,androidx.camera.lifecycle,androidx.camera.view" />
-
-    <permission android:name="${applicationId}.ACCESS_SECRETS"
-                android:label="Access to TextSecure Secrets"
-                android:protectionLevel="signature" />
-
-    <uses-feature android:name="android.hardware.camera" android:required="false" />
-    <uses-feature android:name="android.hardware.bluetooth" android:required="false" />
-    <uses-feature android:name="android.hardware.location" android:required="false"/>
-    <uses-feature android:name="android.hardware.location.network" android:required="false"/>
-    <uses-feature android:name="android.hardware.location.gps" android:required="false"/>
-    <uses-feature android:name="android.hardware.microphone" android:required="false"/>
-    <uses-feature android:name="android.hardware.wifi" android:required="false"/>
-    <uses-feature android:name="android.hardware.portrait" android:required="false"/>
-    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
-
-    <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"/>
-    <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
-    <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
-
-    <uses-permission android:name="android.permission.RECEIVE_SMS"/>
-    <uses-permission android:name="android.permission.RECEIVE_MMS"/>
-    <uses-permission android:name="android.permission.READ_SMS"/>
-    <uses-permission android:name="android.permission.SEND_SMS"/>
-    <uses-permission android:name="android.permission.WRITE_SMS"/>
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.READ_PHONE_NUMBERS" />
-
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-                     android:maxSdkVersion="28" />
-
-    <uses-permission android:name="android.permission.CAMERA" />
-
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.READ_CALL_STATE"/>
-
-    <!-- For sending/receiving events -->
-    <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
-    <uses-permission android:name="android.permission.READ_CALENDAR"/>
-
-
-    <!-- Normal -->
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.VIBRATE"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
-
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-
-    <!-- So we can add a TextSecure 'Account' -->
-    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
-    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
-
-    <!-- For conversation 'shortcuts' on the desktop -->
-    <uses-permission android:name="android.permission.INSTALL_SHORTCUT"/>
-    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-
-    <!-- For fixing MMS -->
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
-
-    <!-- Set image as wallpaper -->
-    <uses-permission android:name="android.permission.SET_WALLPAPER"/>
-
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
-
-    <uses-permission android:name="android.permission.CALL_PHONE" />
-    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
-    <uses-permission android:name="android.permission.RAISED_THREAD_PRIORITY" />
-    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
-    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
-
-    <application android:name=".ApplicationContext"
-                 android:icon="@mipmap/ic_launcher"
-                 android:label="@string/app_name"
-                 android:supportsRtl="true"
-                 tools:replace="android:allowBackup"
-                 android:resizeableActivity="true"
-                 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="AIzaSyCSx9xea86GwDKGznCAULE9Y5a8b-TfN9U"/>
-
-    <meta-data android:name="android.supports_size_changes"
-               android:value="true" />
-
-    <meta-data android:name="com.google.android.gms.version"
-               android:value="@integer/google_play_services_version" />
-
-    <meta-data android:name="com.google.android.gms.car.application"
-               android:resource="@xml/automotive_app_desc" />
-
-    <meta-data android:name="firebase_analytics_collection_deactivated" android:value="true" />
-    <meta-data android:name="google_analytics_adid_collection_enabled" android:value="false" />
-    <meta-data android:name="firebase_messaging_auto_init_enabled" android:value="false" />
-
-    <activity android:name=".WebRtcCallActivity"
-              android:theme="@style/TextSecure.DarkTheme.WebRTCCall"
-              android:excludeFromRecents="true"
-              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:noHistory="true"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".InviteActivity"
-              android:theme="@style/Signal.Light.NoActionBar.Invite"
-              android:windowSoftInputMode="stateHidden"
-              android:parentActivityName=".MainActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
-        <meta-data
-            android:name="android.support.PARENT_ACTIVITY"
-            android:value=".MainActivity" />
-    </activity>
-
-    <activity android:name=".PromptMmsActivity"
-              android:label="Configure MMS Settings"
-              android:windowSoftInputMode="stateUnchanged"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".DeviceProvisioningActivity"
-              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.ShareActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:excludeFromRecents="true"
-              android:taskAffinity=""
-              android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
-        <intent-filter>
-            <action android:name="android.intent.action.SEND" />
-            <category android:name="android.intent.category.DEFAULT"/>
-            <data android:mimeType="audio/*" />
-            <data android:mimeType="image/*" />
-            <data android:mimeType="text/plain" />
-            <data android:mimeType="video/*" />
-            <data android:mimeType="application/*"/>
-            <data android:mimeType="text/*"/>
-            <data android:mimeType="*/*"/>
-        </intent-filter>
-
-        <intent-filter>
-            <action android:name="android.intent.action.SEND_MULTIPLE" />
-            <category android:name="android.intent.category.DEFAULT"/>
-            <data android:mimeType="image/*" />
-            <data android:mimeType="video/*" />
-        </intent-filter>
-
-      <meta-data
-          android:name="android.service.chooser.chooser_target_service"
-                android:value="androidx.sharetarget.ChooserTargetServiceCompat" />
-
-    </activity>
-
-    <activity android:name=".stickers.StickerPackPreviewActivity"
-              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" />
-            <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>
-            <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.art"
-                  android:pathPrefix="/addstickers"/>
-        </intent-filter>
-    </activity>
-
-    <activity-alias android:name=".RoutingActivity"
-                    android:targetActivity=".MainActivity"
-                    android:exported="true">
-
-        <intent-filter>
-            <action android:name="android.intent.action.MAIN" />
-            <category android:name="android.intent.category.LAUNCHER" />
-            <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:noHistory="true"
-              android:theme="@style/Signal.Transparent">
-
-        <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="signal.group" />
-        </intent-filter>
-
-        <intent-filter android:autoVerify="true"
-                       tools:targetApi="23">
-            <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.group"/>
-        </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="https"
-                  android:host="signal.tube" />
-            <data android:scheme="sgnl"
-                  android:host="signal.tube" />
-        </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="https"
-                android:host="signal.me" />
-            <data android:scheme="sgnl"
-                android:host="signal.me" />
-        </intent-filter>
-    </activity>
-
-    <activity android:name=".conversation.ConversationActivity"
-              android:windowSoftInputMode="stateUnchanged"
-              android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:parentActivityName=".MainActivity">
-        <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.thoughtcrime.securesms.MainActivity" />
-    </activity>
-
-    <activity android:name=".conversation.BubbleConversationActivity"
-              android:theme="@style/Signal.DayNight"
-              android:allowEmbedded="true"
-              android:resizeableActivity="true" />
-
-    <activity android:name=".longmessage.LongMessageActivity" />
-
-    <activity android:name=".conversation.ConversationPopupActivity"
-              android:windowSoftInputMode="stateVisible"
-              android:launchMode="singleTask"
-              android:taskAffinity=""
-              android:excludeFromRecents="true"
-              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"
-              android:theme="@style/Signal.DayNight.NoActionBar" />
-
-    <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=".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:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-      <activity android:name=".PassphraseCreateActivity"
-              android:label="@string/AndroidManifest__create_passphrase"
-              android:windowSoftInputMode="stateUnchanged"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".PassphrasePromptActivity"
-              android:launchMode="singleTask"
-              android:theme="@style/TextSecure.LightIntroTheme"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".NewConversationActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:windowSoftInputMode="stateAlwaysVisible"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".PushContactSelectionActivity"
-          android:label="@string/AndroidManifest__select_contacts"
-          android:windowSoftInputMode="stateHidden"
-          android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".giph.ui.GiphyActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-        <activity android:name=".mediasend.v2.MediaSelectionActivity"
-            android:theme="@style/TextSecure.FullScreenMedia"
-            android:windowSoftInputMode="stateAlwaysHidden|adjustNothing"
-            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:theme="@style/Signal.DayNight.NoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".components.settings.app.AppSettingsActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:theme="@style/Signal.DayNight.NoActionBar"
-              android:windowSoftInputMode="adjustResize">
-        <intent-filter>
-            <action android:name="android.intent.action.MAIN" />
-            <category android:name="android.intent.category.NOTIFICATION_PREFERENCES" />
-        </intent-filter>
-    </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=".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="stateUnchanged"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".revealable.ViewOnceMessageActivity"
-              android:launchMode="singleTask"
-              android:theme="@style/TextSecure.FullScreenMedia"
-              android:windowSoftInputMode="stateHidden"
-              android:excludeFromRecents="true"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".stickers.StickerManagementActivity"
-              android:launchMode="singleTask"
-              android:theme="@style/TextSecure.LightTheme"
-              android:windowSoftInputMode="stateUnchanged"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-     <activity android:name=".DeviceActivity"
-               android:label="@string/AndroidManifest__linked_devices"
-               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".logsubmit.SubmitDebugLogActivity"
-              android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".MediaPreviewActivity"
-              android:label="@string/AndroidManifest__media_preview"
-              android:windowSoftInputMode="stateHidden"
-              android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".AvatarPreviewActivity"
-              android:label="@string/AndroidManifest__media_preview"
-              android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".mediaoverview.MediaOverviewActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".DummyActivity"
-              android:theme="@android:style/Theme.NoDisplay"
-              android:enabled="true"
-              android:allowTaskReparenting="true"
-              android:noHistory="true"
-              android:excludeFromRecents="true"
-              android:alwaysRetainTaskState="false"
-              android:stateNotNeeded="true"
-              android:clearTaskOnLaunch="true"
-              android:finishOnTaskLaunch="true" />
-
-    <activity android:name=".PlayServicesProblemActivity"
-              android:theme="@style/TextSecure.DialogActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".SmsSendtoActivity">
-        <intent-filter>
-            <action android:name="android.intent.action.SENDTO" />
-            <action android:name="android.intent.action.VIEW" />
-            <category android:name="android.intent.category.DEFAULT" />
-            <category android:name="android.intent.category.BROWSABLE" />
-            <data android:scheme="sms" />
-            <data android:scheme="smsto" />
-            <data android:scheme="mms" />
-            <data android:scheme="mmsto" />
-        </intent-filter>
-        <intent-filter>
-            <action android:name="android.intent.action.VIEW" />
-            <category android:name="android.intent.category.DEFAULT" />
-            <data android:mimeType="vnd.android.cursor.item/vnd.org.thoughtcrime.securesms.contact" />
-        </intent-filter>
-    </activity>
-
-    <activity android:name="org.thoughtcrime.securesms.webrtc.VoiceCallShare"
-              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">
-
-        <intent-filter>
-            <action android:name="android.intent.action.VIEW" />
-            <category android:name="android.intent.category.DEFAULT" />
-            <data android:mimeType="vnd.android.cursor.item/vnd.org.thoughtcrime.securesms.call" />
-        </intent-filter>
-
-    </activity>
-
-    <activity android:name=".mediasend.AvatarSelectionActivity"
-              android:theme="@style/TextSecure.FullScreenMedia"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".blocked.BlockedUsersActivity"
-              android:theme="@style/TextSecure.LightTheme"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".scribbles.ImageEditorStickerSelectActivity"
-              android:theme="@style/Signal.DayNight.NoActionBar"
-              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.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"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".lock.v2.KbsMigrationActivity"
-            android:theme="@style/TextSecure.LightRegistrationTheme"
-            android:windowSoftInputMode="adjustResize"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".ClearAvatarPromptActivity"
-              android:theme="@style/Theme.AppCompat.Dialog.Alert"
-              android:icon="@drawable/clear_profile_avatar"
-              android:label="@string/AndroidManifest_remove_photo"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".contacts.TurnOffContactJoinedNotificationsActivity"
-              android:theme="@style/Theme.AppCompat.Dialog.Alert" />
-
-    <activity android:name=".messagerequests.MessageRequestMegaphoneActivity"
-              android:theme="@style/TextSecure.LightRegistrationTheme"
-              android:windowSoftInputMode="adjustResize"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".contactshare.ContactShareEditActivity"
-              android:theme="@style/TextSecure.LightTheme"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".contactshare.ContactNameEditActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".contactshare.SharedContactDetailsActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".ShortcutLauncherActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:exported="true"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity
-            android:name=".maps.PlacePickerActivity"
-            android:label="@string/PlacePickerActivity_title"
-            android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".MainActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
-
-    <activity android:name=".pin.PinRestoreActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
-
-    <activity android:name=".groups.ui.creategroup.CreateGroupActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
-
-    <activity android:name=".groups.ui.addtogroup.AddToGroupsActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
-
-    <activity android:name=".groups.ui.addmembers.AddMembersActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
-
-    <activity android:name=".groups.ui.creategroup.details.AddGroupDetailsActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
-
-    <activity android:name=".groups.ui.chooseadmin.ChooseNewAdminActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
-
-    <activity android:name=".megaphone.ClientDeprecatedActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              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.FullScreenMedia" />
-
-    <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"/>
-
-    <service android:enabled="true" android:name=".service.webrtc.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=".components.voice.VoiceNotePlaybackService">
-        <intent-filter>
-            <action android:name="android.media.browse.MediaBrowserService" />
-        </intent-filter>
-    </service>
-
-    <receiver android:name="androidx.media.session.MediaButtonReceiver" >
-        <intent-filter>
-            <action android:name="android.intent.action.MEDIA_BUTTON" />
-        </intent-filter>
-    </receiver>
-
-    <service android:name=".service.QuickResponseService"
-             android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
-             android:exported="true" >
-        <intent-filter>
-            <action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
-            <category android:name="android.intent.category.DEFAULT" />
-            <data android:scheme="sms" />
-            <data android:scheme="smsto" />
-            <data android:scheme="mms" />
-            <data android:scheme="mmsto" />
-        </intent-filter>
-    </service>
-
-    <service android:name=".service.AccountAuthenticatorService" android:exported="true">
-        <intent-filter>
-            <action android:name="android.accounts.AccountAuthenticator" />
-        </intent-filter>
-        <meta-data android:name="android.accounts.AccountAuthenticator" android:resource="@xml/authenticator" />
-    </service>
-
-    <service android:name=".service.ContactsSyncAdapterService" android:exported="true">
-        <intent-filter>
-            <action android:name="android.content.SyncAdapter"/>
-        </intent-filter>
-        <meta-data android:name="android.content.SyncAdapter" android:resource="@xml/syncadapter" />
-        <meta-data android:name="android.provider.CONTACTS_STRUCTURE" android:resource="@xml/contactsformat" />
-    </service>
-
-    <service android:name=".service.GenericForegroundService"/>
-
-    <service android:name=".gcm.FcmFetchService" />
-
-    <service android:name=".gcm.FcmReceiveService">
-        <intent-filter>
-            <action android:name="com.google.firebase.MESSAGING_EVENT" />
-        </intent-filter>
-    </service>
-
-    <receiver android:name=".service.SmsListener"
-              android:permission="android.permission.BROADCAST_SMS"
-              android:enabled="true"
-              android:exported="true">
-             <intent-filter android:priority="1001">
-                 <action android:name="android.provider.Telephony.SMS_RECEIVED"/>
-             </intent-filter>
-             <intent-filter>
-                 <action android:name="android.provider.Telephony.SMS_DELIVER"/>
-             </intent-filter>
-    </receiver>
-
-    <receiver android:name=".service.SmsDeliveryListener"
-              android:exported="true">
-        <intent-filter>
-            <action android:name="org.thoughtcrime.securesms.services.MESSAGE_SENT"/>
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".service.MmsListener"
-              android:enabled="true"
-              android:exported="true"
-              android:permission="android.permission.BROADCAST_WAP_PUSH">
-             <intent-filter android:priority="1001">
-                 <action android:name="android.provider.Telephony.WAP_PUSH_RECEIVED"/>
-                 <data android:mimeType="application/vnd.wap.mms-message" />
-             </intent-filter>
-             <intent-filter>
-                 <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER"/>
-                 <data android:mimeType="application/vnd.wap.mms-message" />
-             </intent-filter>
-    </receiver>
-
-    <receiver android:name=".notifications.MarkReadReceiver"
-              android:enabled="true"
-              android:exported="false">
-        <intent-filter>
-            <action android:name="org.thoughtcrime.securesms.notifications.CLEAR"/>
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".notifications.RemoteReplyReceiver"
-              android:enabled="true"
-              android:exported="false">
-        <intent-filter>
-            <action android:name="org.thoughtcrime.securesms.notifications.WEAR_REPLY"/>
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".service.ExpirationListener" />
-
-    <receiver android:name=".revealable.ViewOnceMessageManager$ViewOnceAlarm" />
-
-    <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"
-              android:authorities="${applicationId}.part" />
-
-    <provider android:name=".providers.BlobContentProvider"
-              android:authorities="${applicationId}.blob"
-              android:exported="false"
-              android:grantUriPermissions="true" />
-
-    <provider android:name=".providers.MmsBodyProvider"
-              android:grantUriPermissions="true"
-              android:exported="false"
-              android:authorities="${applicationId}.mms" />
-
-    <provider android:name="androidx.core.content.FileProvider"
-              android:authorities="${applicationId}.fileprovider"
-              android:exported="false"
-              android:grantUriPermissions="true">
-
-        <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_provider_paths" />
-
-    </provider>
-
-    <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">
-        <intent-filter>
-            <action android:name="android.intent.action.BOOT_COMPLETED" />
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".service.RotateSignedPreKeyListener">
-        <intent-filter>
-            <action android:name="android.intent.action.BOOT_COMPLETED" />
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".service.RotateSenderCertificateListener">
-        <intent-filter>
-            <action android:name="android.intent.action.BOOT_COMPLETED" />
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".messageprocessingalarm.MessageProcessReceiver">
-        <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">
-        <intent-filter>
-            <action android:name="android.intent.action.BOOT_COMPLETED" />
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".service.PersistentConnectionBootListener">
-        <intent-filter>
-            <action android:name="android.intent.action.BOOT_COMPLETED"/>
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".notifications.LocaleChangedReceiver">
-        <intent-filter>
-            <action android:name="android.intent.action.LOCALE_CHANGED"/>
-        </intent-filter>
-    </receiver>
-
-    <receiver android:name=".notifications.MessageNotifier$ReminderReceiver"/>
-
-    <receiver android:name=".notifications.DeleteNotificationReceiver">
-        <intent-filter>
-            <action android:name="org.thoughtcrime.securesms.DELETE_NOTIFICATION"/>
-        </intent-filter>
-    </receiver>
-
-    <receiver
-        android:name=".service.PanicResponderListener"
-        android:exported="true">
-        <intent-filter>
-            <action android:name="info.guardianproject.panic.action.TRIGGER" />
-        </intent-filter>
-    </receiver>
-
-    <service
-        android:name=".gcm.FcmJobService"
-        android:permission="android.permission.BIND_JOB_SERVICE"
-        android:enabled="@bool/enable_job_service"
-        tools:targetApi="26" />
-
-    <service
-        android:name=".jobmanager.JobSchedulerScheduler$SystemService"
-        android:permission="android.permission.BIND_JOB_SERVICE"
-        android:enabled="@bool/enable_job_service"
-        tools:targetApi="26" />
-
-    <service
-        android:name=".jobmanager.KeepAliveService"
-        android:enabled="@bool/enable_alarm_manager" />
-
-    <receiver
-        android:name=".jobmanager.AlarmManagerScheduler$RetryReceiver"
-        android:enabled="@bool/enable_alarm_manager" />
-
-    <!-- Probably don't need this one -->
-    <receiver
-        android:name=".jobmanager.BootReceiver"
-        android:enabled="true">
-        <intent-filter>
-            <action android:name="android.intent.action.BOOT_COMPLETED" />
-        </intent-filter>
-    </receiver>
-
-    <uses-library android:name="org.apache.http.legacy" android:required="false"/>
-
-</application>
-</manifest>
--- a/app/src/main/assets/databases/apns.db
+++ b/app/src/main/assets/databases/apns.db
--- 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/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/assets/sounds/state-change_confirm-down.ogg
+++ b/app/src/main/assets/sounds/state-change_confirm-down.ogg
--- a/app/src/main/assets/sounds/state-change_confirm-up.ogg
+++ b/app/src/main/assets/sounds/state-change_confirm-up.ogg
--- a/app/src/main/java/androidx/camera/view/SignalCameraView.java
+++ b/app/src/main/java/androidx/camera/view/SignalCameraView.java
@@ -1,848 +0,0 @@
-/*
- * 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.core.util.Consumer;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.lifecycle.LiveData;
-
-import com.google.common.util.concurrent.ListenableFuture;
-
-import org.signal.core.util.logging.Log;
-
-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 = Log.tag(SignalCameraView.class);
-
-  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;
-
-  // BEGIN Custom Signal Code Block
-  private Consumer<Throwable> errorConsumer;
-  private Throwable           pendingError;
-  // END Custom Signal Code Block
-
-  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.
-   */
-  // BEGIN Custom Signal Code Block
-
-  @RequiresPermission(permission.CAMERA)
-  public void bindToLifecycle(@NonNull LifecycleOwner lifecycleOwner, Consumer<Throwable> errorConsumer) {
-    mCameraModule.bindToLifecycle(lifecycleOwner);
-    this.errorConsumer = errorConsumer;
-    if (pendingError != null) {
-      errorConsumer.accept(pendingError);
-    }
-  }
-  // END Custom Signal Code Block
-
-
-  private void init(Context context, @Nullable AttributeSet attrs) {
-    addView(mPreviewView = new PreviewView(getContext()), 0 /* view position */);
-
-    // Begin custom signal code block
-    mPreviewView.setImplementationMode(PreviewView.ImplementationMode.COMPATIBLE);
-    mCameraModule = new SignalCameraXModule(this, error -> {
-      if (errorConsumer != null) {
-        errorConsumer.accept(error);
-      } else {
-        pendingError = error;
-      }
-    });
-    // End custom signal code block
-
-    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
@@ -1,699 +0,0 @@
-/*
- * 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.Consumer;
-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;
-
-  // BEGIN Custom Signal Code Block
-  SignalCameraXModule(SignalCameraView view, Consumer<Throwable> errorConsumer) {
-    // END Custom Signal Code Block
-    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) {
-            // BEGIN Custom Signal Code Block
-            errorConsumer.accept(t);
-            // END Custom Signal Code Block
-          }
-        }, 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;
-    // Begin Signal Custom Code Block
-    mImageCaptureBuilder.setTargetResolution(CameraXUtil.buildResolutionForRatio(resolution, ASPECT_RATIO_16_9, isDisplayPortrait));
-    targetAspectRatio = isDisplayPortrait ? ASPECT_RATIO_9_16 : ASPECT_RATIO_16_9;
-    // End Signal Custom Code Block
-
-    // 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;
-  }
-
-  @SuppressLint("UnsafeExperimentalUsageError")
-  public void invalidateView() {
-    if (mPreview != null) {
-      mPreview.setTargetRotation(getDisplaySurfaceRotation()); // Fixes issue #10940 (rotation not updated on phones using "Legacy API")
-    }
-
-    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/org/signal/glide/Log.java
+++ b/app/src/main/java/org/signal/glide/Log.java
@@ -1,58 +0,0 @@
-package org.signal.glide;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-public final class Log {
-
-  private Log() {}
-
-  public static void v(@NonNull String tag, @NonNull String message) {
-    SignalGlideCodecs.getLogProvider().v(tag, message);
-  }
-
-  public static void d(@NonNull String tag, @NonNull String message) {
-    SignalGlideCodecs.getLogProvider().d(tag, message);
-  }
-
-  public static void i(@NonNull String tag, @NonNull String message) {
-    SignalGlideCodecs.getLogProvider().i(tag, message);
-  }
-
-  public static void w(@NonNull String tag, @NonNull String message) {
-    SignalGlideCodecs.getLogProvider().w(tag, message);
-  }
-
-  public static void e(@NonNull String tag, @NonNull String message) {
-    SignalGlideCodecs.getLogProvider().e(tag, message, null);
-  }
-
-  public static void e(@NonNull String tag, @NonNull String message, @Nullable Throwable throwable) {
-    SignalGlideCodecs.getLogProvider().e(tag, message, throwable);
-  }
-
-  public interface Provider {
-    void v(@NonNull String tag, @NonNull String message);
-    void d(@NonNull String tag, @NonNull String message);
-    void i(@NonNull String tag, @NonNull String message);
-    void w(@NonNull String tag, @NonNull String message);
-    void e(@NonNull String tag, @NonNull String message, @Nullable Throwable throwable);
-
-    Provider EMPTY = new Provider() {
-      @Override
-      public void v(@NonNull String tag, @NonNull String message) { }
-
-      @Override
-      public void d(@NonNull String tag, @NonNull String message) { }
-
-      @Override
-      public void i(@NonNull String tag, @NonNull String message) { }
-
-      @Override
-      public void w(@NonNull String tag, @NonNull String message) { }
-
-      @Override
-      public void e(@NonNull String tag, @NonNull String message, @NonNull Throwable throwable) { }
-    };
-  }
-}
--- a/app/src/main/java/org/signal/glide/SignalGlideCodecs.java
+++ b/app/src/main/java/org/signal/glide/SignalGlideCodecs.java
@@ -1,18 +0,0 @@
-package org.signal.glide;
-
-import androidx.annotation.NonNull;
-
-public final class SignalGlideCodecs {
-
-  private static Log.Provider logProvider = Log.Provider.EMPTY;
-
-  private SignalGlideCodecs() {}
-
-  public static void setLogProvider(@NonNull Log.Provider provider) {
-    logProvider = provider;
-  }
-
-  public static @NonNull Log.Provider getLogProvider() {
-    return logProvider;
-  }
-}
--- a/app/src/main/java/org/signal/glide/apng/APNGDrawable.java
+++ b/app/src/main/java/org/signal/glide/apng/APNGDrawable.java
@@ -1,52 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.apng;
-
-import android.content.Context;
-
-import org.signal.glide.apng.decode.APNGDecoder;
-import org.signal.glide.common.FrameAnimationDrawable;
-import org.signal.glide.common.decode.FrameSeqDecoder;
-import org.signal.glide.common.loader.AssetStreamLoader;
-import org.signal.glide.common.loader.FileLoader;
-import org.signal.glide.common.loader.Loader;
-import org.signal.glide.common.loader.ResourceStreamLoader;
-
-/**
- * @Description: APNGDrawable
- * @Author: pengfei.zhou
- * @CreateDate: 2019/3/27
- */
-public class APNGDrawable extends FrameAnimationDrawable<APNGDecoder> {
-    public APNGDrawable(Loader provider) {
-        super(provider);
-    }
-
-    public APNGDrawable(APNGDecoder decoder) {
-        super(decoder);
-    }
-
-    @Override
-    protected APNGDecoder createFrameSeqDecoder(Loader streamLoader, FrameSeqDecoder.RenderListener listener) {
-        return new APNGDecoder(streamLoader, listener);
-    }
-
-
-    public static APNGDrawable fromAsset(Context context, String assetPath) {
-        AssetStreamLoader assetStreamLoader = new AssetStreamLoader(context, assetPath);
-        return new APNGDrawable(assetStreamLoader);
-    }
-
-    public static APNGDrawable fromFile(String filePath) {
-        FileLoader fileLoader = new FileLoader(filePath);
-        return new APNGDrawable(fileLoader);
-    }
-
-    public static APNGDrawable fromResource(Context context, int resId) {
-        ResourceStreamLoader resourceStreamLoader = new ResourceStreamLoader(context, resId);
-        return new APNGDrawable(resourceStreamLoader);
-    }
-}
--- a/app/src/main/java/org/signal/glide/apng/decode/ACTLChunk.java
+++ b/app/src/main/java/org/signal/glide/apng/decode/ACTLChunk.java
@@ -1,27 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.apng.decode;
-
-import org.signal.glide.apng.io.APNGReader;
-
-import java.io.IOException;
-
-/**
- * @Description: https://developer.mozilla.org/en-US/docs/Mozilla/Tech/APNG#.27acTL.27:_The_Animation_Control_Chunk
- * @Author: pengfei.zhou
- * @CreateDate: 2019/3/27
- */
-class ACTLChunk extends Chunk {
-    static final int ID = fourCCToInt("acTL");
-    int num_frames;
-    int num_plays;
-
-    @Override
-    void innerParse(APNGReader apngReader) throws IOException {
-        num_frames = apngReader.readInt();
-        num_plays = apngReader.readInt();
-    }
-}
--- a/app/src/main/java/org/signal/glide/apng/decode/APNGDecoder.java
+++ b/app/src/main/java/org/signal/glide/apng/decode/APNGDecoder.java
@@ -1,211 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.apng.decode;
-
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.Rect;
-
-import org.signal.core.util.logging.Log;
-import org.signal.glide.apng.io.APNGReader;
-import org.signal.glide.apng.io.APNGWriter;
-import org.signal.glide.common.decode.Frame;
-import org.signal.glide.common.decode.FrameSeqDecoder;
-import org.signal.glide.common.io.Reader;
-import org.signal.glide.common.loader.Loader;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Description: APNG4Android
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-13
- */
-public class APNGDecoder extends FrameSeqDecoder<APNGReader, APNGWriter> {
-
-    private static final String TAG = Log.tag(APNGDecoder.class);
-
-    private APNGWriter apngWriter;
-    private int mLoopCount;
-    private final Paint paint = new Paint();
-
-
-    private class SnapShot {
-        byte dispose_op;
-        Rect dstRect = new Rect();
-        ByteBuffer byteBuffer;
-    }
-
-    private SnapShot snapShot = new SnapShot();
-
-    /**
-     * @param loader         webp的reader
-     * @param renderListener 渲染的回调
-     */
-    public APNGDecoder(Loader loader, FrameSeqDecoder.RenderListener renderListener) {
-        super(loader, renderListener);
-        paint.setAntiAlias(true);
-    }
-
-    @Override
-    protected APNGWriter getWriter() {
-        if (apngWriter == null) {
-            apngWriter = new APNGWriter();
-        }
-        return apngWriter;
-    }
-
-    @Override
-    protected APNGReader getReader(Reader reader) {
-        return new APNGReader(reader);
-    }
-
-    @Override
-    protected int getLoopCount() {
-        return mLoopCount;
-    }
-
-    @Override
-    protected void release() {
-        snapShot.byteBuffer = null;
-        apngWriter = null;
-    }
-
-
-    @Override
-    protected Rect read(APNGReader reader) throws IOException {
-        List<Chunk> chunks = APNGParser.parse(reader);
-        List<Chunk> otherChunks = new ArrayList<>();
-
-        boolean actl = false;
-        APNGFrame lastFrame = null;
-        byte[] ihdrData = new byte[0];
-        int canvasWidth = 0, canvasHeight = 0;
-        for (Chunk chunk : chunks) {
-            if (chunk instanceof ACTLChunk) {
-                mLoopCount = ((ACTLChunk) chunk).num_plays;
-                actl = true;
-            } else if (chunk instanceof FCTLChunk) {
-                APNGFrame frame = new APNGFrame(reader, (FCTLChunk) chunk);
-                frame.prefixChunks = otherChunks;
-                frame.ihdrData = ihdrData;
-                frames.add(frame);
-                lastFrame = frame;
-            } else if (chunk instanceof FDATChunk) {
-                if (lastFrame != null) {
-                    lastFrame.imageChunks.add(chunk);
-                }
-            } else if (chunk instanceof IDATChunk) {
-                if (!actl) {
-                    //如果为非APNG图片，则只解码PNG
-                    Frame frame = new StillFrame(reader);
-                    frame.frameWidth = canvasWidth;
-                    frame.frameHeight = canvasHeight;
-                    frames.add(frame);
-                    mLoopCount = 1;
-                    break;
-                }
-                if (lastFrame != null) {
-                    lastFrame.imageChunks.add(chunk);
-                }
-
-            } else if (chunk instanceof IHDRChunk) {
-                canvasWidth = ((IHDRChunk) chunk).width;
-                canvasHeight = ((IHDRChunk) chunk).height;
-                ihdrData = ((IHDRChunk) chunk).data;
-            } else if (!(chunk instanceof IENDChunk)) {
-                otherChunks.add(chunk);
-            }
-        }
-        frameBuffer = ByteBuffer.allocate((canvasWidth * canvasHeight / (sampleSize * sampleSize) + 1) * 4);
-        snapShot.byteBuffer = ByteBuffer.allocate((canvasWidth * canvasHeight / (sampleSize * sampleSize) + 1) * 4);
-        return new Rect(0, 0, canvasWidth, canvasHeight);
-    }
-
-    @Override
-    protected void renderFrame(Frame frame) {
-        if (frame == null || fullRect == null) {
-            return;
-        }
-        try {
-            Bitmap bitmap = obtainBitmap(fullRect.width() / sampleSize, fullRect.height() / sampleSize);
-            Canvas canvas = cachedCanvas.get(bitmap);
-            if (canvas == null) {
-                canvas = new Canvas(bitmap);
-                cachedCanvas.put(bitmap, canvas);
-            }
-            if (frame instanceof APNGFrame) {
-                // 从缓存中恢复当前帧
-                frameBuffer.rewind();
-                bitmap.copyPixelsFromBuffer(frameBuffer);
-                // 开始绘制前，处理快照中的设定
-                if (this.frameIndex == 0) {
-                    canvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR);
-                } else {
-                    canvas.save();
-                    canvas.clipRect(snapShot.dstRect);
-                    switch (snapShot.dispose_op) {
-                        // 从快照中恢复上一帧之前的显示内容
-                        case FCTLChunk.APNG_DISPOSE_OP_PREVIOUS:
-                            snapShot.byteBuffer.rewind();
-                            bitmap.copyPixelsFromBuffer(snapShot.byteBuffer);
-                            break;
-                        // 清空上一帧所画区域
-                        case FCTLChunk.APNG_DISPOSE_OP_BACKGROUND:
-                            canvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR);
-                            break;
-                        // 什么都不做
-                        case FCTLChunk.APNG_DISPOSE_OP_NON:
-                        default:
-                            break;
-                    }
-                    canvas.restore();
-                }
-
-                // 然后根据dispose设定传递到快照信息中
-                if (((APNGFrame) frame).dispose_op == FCTLChunk.APNG_DISPOSE_OP_PREVIOUS) {
-                    if (snapShot.dispose_op != FCTLChunk.APNG_DISPOSE_OP_PREVIOUS) {
-                        snapShot.byteBuffer.rewind();
-                        bitmap.copyPixelsToBuffer(snapShot.byteBuffer);
-                    }
-                }
-
-                snapShot.dispose_op = ((APNGFrame) frame).dispose_op;
-                canvas.save();
-                if (((APNGFrame) frame).blend_op == FCTLChunk.APNG_BLEND_OP_SOURCE) {
-                    canvas.clipRect(
-                            frame.frameX / sampleSize,
-                            frame.frameY / sampleSize,
-                            (frame.frameX + frame.frameWidth) / sampleSize,
-                            (frame.frameY + frame.frameHeight) / sampleSize);
-                    canvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR);
-                }
-
-
-                snapShot.dstRect.set(frame.frameX / sampleSize,
-                        frame.frameY / sampleSize,
-                        (frame.frameX + frame.frameWidth) / sampleSize,
-                        (frame.frameY + frame.frameHeight) / sampleSize);
-                canvas.restore();
-            }
-            //开始真正绘制当前帧的内容
-            Bitmap inBitmap = obtainBitmap(frame.frameWidth, frame.frameHeight);
-            recycleBitmap(frame.draw(canvas, paint, sampleSize, inBitmap, getWriter()));
-            recycleBitmap(inBitmap);
-            frameBuffer.rewind();
-            bitmap.copyPixelsToBuffer(frameBuffer);
-            recycleBitmap(bitmap);
-        } catch (Throwable t) {
-            Log.e(TAG, "Failed to render!", t);
-        }
-    }
-}
--- a/app/src/main/java/org/signal/glide/apng/decode/APNGFrame.java
+++ b/app/src/main/java/org/signal/glide/apng/decode/APNGFrame.java
@@ -1,147 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.apng.decode;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-
-import org.signal.glide.apng.io.APNGReader;
-import org.signal.glide.apng.io.APNGWriter;
-import org.signal.glide.common.decode.Frame;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.zip.CRC32;
-
-/**
- * @Description: APNG4Android
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-13
- */
-public class APNGFrame extends Frame<APNGReader, APNGWriter> {
-    public final byte blend_op;
-    public final byte dispose_op;
-    byte[] ihdrData;
-    List<Chunk> imageChunks = new ArrayList<>();
-    List<Chunk> prefixChunks = new ArrayList<>();
-    private static final byte[] sPNGSignatures = {(byte) 137, 80, 78, 71, 13, 10, 26, 10};
-    private static final byte[] sPNGEndChunk = {0, 0, 0, 0, 0x49, 0x45, 0x4E, 0x44, (byte) 0xAE, 0x42, 0x60, (byte) 0x82};
-
-    private static ThreadLocal<CRC32> sCRC32 = new ThreadLocal<>();
-
-    private CRC32 getCRC32() {
-        CRC32 crc32 = sCRC32.get();
-        if (crc32 == null) {
-            crc32 = new CRC32();
-            sCRC32.set(crc32);
-        }
-        return crc32;
-    }
-
-    public APNGFrame(APNGReader reader, FCTLChunk fctlChunk) {
-        super(reader);
-        blend_op = fctlChunk.blend_op;
-        dispose_op = fctlChunk.dispose_op;
-        frameDuration = fctlChunk.delay_num * 1000 / (fctlChunk.delay_den == 0 ? 100 : fctlChunk.delay_den);
-        frameWidth = fctlChunk.width;
-        frameHeight = fctlChunk.height;
-        frameX = fctlChunk.x_offset;
-        frameY = fctlChunk.y_offset;
-    }
-
-    private int encode(APNGWriter apngWriter) throws IOException {
-        int fileSize = 8 + 13 + 12;
-
-        //prefixChunks
-        for (Chunk chunk : prefixChunks) {
-            fileSize += chunk.length + 12;
-        }
-
-        //imageChunks
-        for (Chunk chunk : imageChunks) {
-            if (chunk instanceof IDATChunk) {
-                fileSize += chunk.length + 12;
-            } else if (chunk instanceof FDATChunk) {
-                fileSize += chunk.length + 8;
-            }
-        }
-        fileSize += sPNGEndChunk.length;
-        apngWriter.reset(fileSize);
-        apngWriter.putBytes(sPNGSignatures);
-        //IHDR Chunk
-        apngWriter.writeInt(13);
-        int start = apngWriter.position();
-        apngWriter.writeFourCC(IHDRChunk.ID);
-        apngWriter.writeInt(frameWidth);
-        apngWriter.writeInt(frameHeight);
-        apngWriter.putBytes(ihdrData);
-        CRC32 crc32 = getCRC32();
-        crc32.reset();
-        crc32.update(apngWriter.toByteArray(), start, 17);
-        apngWriter.writeInt((int) crc32.getValue());
-
-        //prefixChunks
-        for (Chunk chunk : prefixChunks) {
-            if (chunk instanceof IENDChunk) {
-                continue;
-            }
-            reader.reset();
-            reader.skip(chunk.offset);
-            reader.read(apngWriter.toByteArray(), apngWriter.position(), chunk.length + 12);
-            apngWriter.skip(chunk.length + 12);
-        }
-        //imageChunks
-        for (Chunk chunk : imageChunks) {
-            if (chunk instanceof IDATChunk) {
-                reader.reset();
-                reader.skip(chunk.offset);
-                reader.read(apngWriter.toByteArray(), apngWriter.position(), chunk.length + 12);
-                apngWriter.skip(chunk.length + 12);
-            } else if (chunk instanceof FDATChunk) {
-                apngWriter.writeInt(chunk.length - 4);
-                start = apngWriter.position();
-                apngWriter.writeFourCC(IDATChunk.ID);
-
-                reader.reset();
-                // skip to fdat data position
-                reader.skip(chunk.offset + 4 + 4 + 4);
-                reader.read(apngWriter.toByteArray(), apngWriter.position(), chunk.length - 4);
-
-                apngWriter.skip(chunk.length - 4);
-                crc32.reset();
-                crc32.update(apngWriter.toByteArray(), start, chunk.length);
-                apngWriter.writeInt((int) crc32.getValue());
-            }
-        }
-        //endChunk
-        apngWriter.putBytes(sPNGEndChunk);
-        return fileSize;
-    }
-
-
-    @Override
-    public Bitmap draw(Canvas canvas, Paint paint, int sampleSize, Bitmap reusedBitmap, APNGWriter writer) {
-        try {
-            int length = encode(writer);
-            BitmapFactory.Options options = new BitmapFactory.Options();
-            options.inJustDecodeBounds = false;
-            options.inSampleSize = sampleSize;
-            options.inMutable = true;
-            options.inBitmap = reusedBitmap;
-            byte[] bytes = writer.toByteArray();
-            Bitmap bitmap = BitmapFactory.decodeByteArray(bytes, 0, length, options);
-            assert bitmap != null;
-            canvas.drawBitmap(bitmap, (float) frameX / sampleSize, (float) frameY / sampleSize, paint);
-            return bitmap;
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-}
--- a/app/src/main/java/org/signal/glide/apng/decode/APNGParser.java
+++ b/app/src/main/java/org/signal/glide/apng/decode/APNGParser.java
@@ -1,143 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.apng.decode;
-
-import android.content.Context;
-
-import org.signal.glide.apng.io.APNGReader;
-import org.signal.glide.common.io.Reader;
-import org.signal.glide.common.io.StreamReader;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @link {https://www.w3.org/TR/PNG/#5PNG-file-signature}
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-13
- */
-public class APNGParser {
-    static class FormatException extends IOException {
-        FormatException() {
-            super("APNG Format error");
-        }
-    }
-
-    public static boolean isAPNG(String filePath) {
-        InputStream inputStream = null;
-        try {
-            inputStream = new FileInputStream(filePath);
-            return isAPNG(new StreamReader(inputStream));
-        } catch (Exception e) {
-            return false;
-        } finally {
-            if (inputStream != null) {
-                try {
-                    inputStream.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    public static boolean isAPNG(Context context, String assetPath) {
-        InputStream inputStream = null;
-        try {
-            inputStream = context.getAssets().open(assetPath);
-            return isAPNG(new StreamReader(inputStream));
-        } catch (Exception e) {
-            return false;
-        } finally {
-            if (inputStream != null) {
-                try {
-                    inputStream.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    public static boolean isAPNG(Context context, int resId) {
-        InputStream inputStream = null;
-        try {
-            inputStream = context.getResources().openRawResource(resId);
-            return isAPNG(new StreamReader(inputStream));
-        } catch (Exception e) {
-            return false;
-        } finally {
-            if (inputStream != null) {
-                try {
-                    inputStream.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    public static boolean isAPNG(Reader in) {
-        APNGReader reader = (in instanceof APNGReader) ? (APNGReader) in : new APNGReader(in);
-        try {
-            if (!reader.matchFourCC("\u0089PNG") || !reader.matchFourCC("\r\n\u001a\n")) {
-                throw new FormatException();
-            }
-            while (reader.available() > 0) {
-                Chunk chunk = parseChunk(reader);
-                if (chunk instanceof ACTLChunk) {
-                    return true;
-                }
-            }
-        } catch (IOException e) {
-            return false;
-        }
-        return false;
-    }
-
-    public static List<Chunk> parse(APNGReader reader) throws IOException {
-        if (!reader.matchFourCC("\u0089PNG") || !reader.matchFourCC("\r\n\u001a\n")) {
-            throw new FormatException();
-        }
-
-        List<Chunk> chunks = new ArrayList<>();
-        while (reader.available() > 0) {
-            chunks.add(parseChunk(reader));
-        }
-        return chunks;
-    }
-
-    private static Chunk parseChunk(APNGReader reader) throws IOException {
-        int offset = reader.position();
-        int size = reader.readInt();
-        int fourCC = reader.readFourCC();
-        Chunk chunk;
-        if (fourCC == ACTLChunk.ID) {
-            chunk = new ACTLChunk();
-        } else if (fourCC == FCTLChunk.ID) {
-            chunk = new FCTLChunk();
-        } else if (fourCC == FDATChunk.ID) {
-            chunk = new FDATChunk();
-        } else if (fourCC == IDATChunk.ID) {
-            chunk = new IDATChunk();
-        } else if (fourCC == IENDChunk.ID) {
-            chunk = new IENDChunk();
-        } else if (fourCC == IHDRChunk.ID) {
-            chunk = new IHDRChunk();
-        } else {
-            chunk = new Chunk();
-        }
-        chunk.offset = offset;
-        chunk.fourcc = fourCC;
-        chunk.length = size;
-        chunk.parse(reader);
-        chunk.crc = reader.readInt();
-        return chunk;
-    }
-}
--- a/app/src/main/java/org/signal/glide/apng/decode/Chunk.java
+++ b/app/src/main/java/org/signal/glide/apng/decode/Chunk.java
@@ -1,53 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.apng.decode;
-
-import android.text.TextUtils;
-
-import org.signal.glide.apng.io.APNGReader;
-
-import java.io.IOException;
-
-/**
- * @Description: Length (长度)	4字节	指定数据块中数据域的长度，其长度不超过(231－1)字节
- * Chunk Type Code (数据块类型码)	4字节	数据块类型码由ASCII字母(A-Z和a-z)组成
- * Chunk Data (数据块数据)	可变长度	存储按照Chunk Type Code指定的数据
- * CRC (循环冗余检测)	4字节	存储用来检测是否有错误的循环冗余码
- * @Link https://www.w3.org/TR/PNG
- * @Author: pengfei.zhou
- * @CreateDate: 2019/3/27
- */
-class Chunk {
-    int length;
-    int fourcc;
-    int crc;
-    int offset;
-
-    static int fourCCToInt(String fourCC) {
-        if (TextUtils.isEmpty(fourCC) || fourCC.length() != 4) {
-            return 0xbadeffff;
-        }
-        return (fourCC.charAt(0) & 0xff)
-                | (fourCC.charAt(1) & 0xff) << 8
-                | (fourCC.charAt(2) & 0xff) << 16
-                | (fourCC.charAt(3) & 0xff) << 24
-                ;
-    }
-
-    void parse(APNGReader reader) throws IOException {
-        int available = reader.available();
-        innerParse(reader);
-        int offset = available - reader.available();
-        if (offset > length) {
-            throw new IOException("Out of chunk area");
-        } else if (offset < length) {
-            reader.skip(length - offset);
-        }
-    }
-
-    void innerParse(APNGReader reader) throws IOException {
-    }
-}
--- a/app/src/main/java/org/signal/glide/apng/decode/FCTLChunk.java
+++ b/app/src/main/java/org/signal/glide/apng/decode/FCTLChunk.java
@@ -1,121 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.apng.decode;
-
-import org.signal.glide.apng.io.APNGReader;
-
-import java.io.IOException;
-
-/**
- * @Author: pengfei.zhou
- * @CreateDate: 2019/3/27
- * @see {link=https://developer.mozilla.org/en-US/docs/Mozilla/Tech/APNG#.27fcTL.27:_The_Frame_Control_Chunk}
- */
-class FCTLChunk extends Chunk {
-    static final int ID = fourCCToInt("fcTL");
-    int sequence_number;
-    /**
-     * x_offset >= 0
-     * y_offset >= 0
-     * width > 0
-     * height > 0
-     * x_offset + width <= 'IHDR' width
-     * y_offset + height <= 'IHDR' height
-     */
-    /**
-     * Width of the following frame.
-     */
-    int width;
-    /**
-     * Height of the following frame.
-     */
-    int height;
-    /**
-     * X position at which to render the following frame.
-     */
-    int x_offset;
-    /**
-     * Y position at which to render the following frame.
-     */
-    int y_offset;
-
-    /**
-     * The delay_num and delay_den parameters together specify a fraction indicating the time to
-     * display the current frame, in seconds. If the denominator is 0, it is to be treated as if it
-     * were 100 (that is, delay_num then specifies 1/100ths of a second).
-     * If the the value of the numerator is 0 the decoder should render the next frame as quickly as
-     * possible, though viewers may impose a reasonable lower bound.
-     * <p>
-     * Frame timings should be independent of the time required for decoding and display of each frame,
-     * so that animations will run at the same rate regardless of the performance of the decoder implementation.
-     */
-
-    /**
-     * Frame delay fraction numerator.
-     */
-    short delay_num;
-
-    /**
-     * Frame delay fraction denominator.
-     */
-    short delay_den;
-
-    /**
-     * Type of frame area disposal to be done after rendering this frame.
-     * dispose_op specifies how the output buffer should be changed at the end of the delay (before rendering the next frame).
-     * If the first 'fcTL' chunk uses a dispose_op of APNG_DISPOSE_OP_PREVIOUS it should be treated as APNG_DISPOSE_OP_BACKGROUND.
-     */
-    byte dispose_op;
-
-    /**
-     * Type of frame area rendering for this frame.
-     */
-    byte blend_op;
-
-    /**
-     * No disposal is done on this frame before rendering the next; the contents of the output buffer are left as is.
-     */
-    static final int APNG_DISPOSE_OP_NON = 0;
-
-    /**
-     * The frame's region of the output buffer is to be cleared to fully transparent black before rendering the next frame.
-     */
-    static final int APNG_DISPOSE_OP_BACKGROUND = 1;
-
-    /**
-     * The frame's region of the output buffer is to be reverted to the previous contents before rendering the next frame.
-     */
-    static final int APNG_DISPOSE_OP_PREVIOUS = 2;
-
-    /**
-     * blend_op<code> specifies whether the frame is to be alpha blended into the current output buffer content,
-     * or whether it should completely replace its region in the output buffer.
-     */
-    /**
-     * All color components of the frame, including alpha, overwrite the current contents of the frame's output buffer region.
-     */
-    static final int APNG_BLEND_OP_SOURCE = 0;
-
-    /**
-     * The frame should be composited onto the output buffer based on its alpha,
-     * using a simple OVER operation as described in the Alpha Channel Processing section of the Extensions
-     * to the PNG Specification, Version 1.2.0. Note that the second variation of the sample code is applicable.
-     */
-    static final int APNG_BLEND_OP_OVER = 1;
-
-    @Override
-    void innerParse(APNGReader reader) throws IOException {
-        sequence_number = reader.readInt();
-        width = reader.readInt();
-        height = reader.readInt();
-        x_offset = reader.readInt();
-        y_offset = reader.readInt();
-        delay_num = reader.readShort();
-        delay_den = reader.readShort();
-        dispose_op = reader.peek();
-        blend_op = reader.peek();
-    }
-}
--- a/app/src/main/java/org/signal/glide/apng/decode/FDATChunk.java
+++ b/app/src/main/java/org/signal/glide/apng/decode/FDATChunk.java
@@ -1,25 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.apng.decode;
-
-import org.signal.glide.apng.io.APNGReader;
-
-import java.io.IOException;
-
-/**
- * @Description: https://developer.mozilla.org/en-US/docs/Mozilla/Tech/APNG#.27fdAT.27:_The_Frame_Data_Chunk
- * @Author: pengfei.zhou
- * @CreateDate: 2019/3/27
- */
-class FDATChunk extends Chunk {
-    static final int ID = fourCCToInt("fdAT");
-    int sequence_number;
-
-    @Override
-    void innerParse(APNGReader reader) throws IOException {
-        sequence_number = reader.readInt();
-    }
-}
--- a/app/src/main/java/org/signal/glide/apng/decode/IDATChunk.java
+++ b/app/src/main/java/org/signal/glide/apng/decode/IDATChunk.java
@@ -1,15 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.apng.decode;
-
-/**
- * @Description: 作用描述
- * @Author: pengfei.zhou
- * @CreateDate: 2019/3/27
- */
-class IDATChunk extends Chunk {
-    static final int ID = fourCCToInt("IDAT");
-}
--- a/app/src/main/java/org/signal/glide/apng/decode/IENDChunk.java
+++ b/app/src/main/java/org/signal/glide/apng/decode/IENDChunk.java
@@ -1,15 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.apng.decode;
-
-/**
- * @Description: 作用描述
- * @Author: pengfei.zhou
- * @CreateDate: 2019/3/27
- */
-class IENDChunk extends Chunk {
-    static final int ID = Chunk.fourCCToInt("IEND");
-}
--- a/app/src/main/java/org/signal/glide/apng/decode/IHDRChunk.java
+++ b/app/src/main/java/org/signal/glide/apng/decode/IHDRChunk.java
@@ -1,45 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.apng.decode;
-
-import org.signal.glide.apng.io.APNGReader;
-
-import java.io.IOException;
-
-/**
- * The IHDR chunk shall be the first chunk in the PNG datastream. It contains:
- * <p>
- * Width	4 bytes
- * Height	4 bytes
- * Bit depth	1 byte
- * Colour type	1 byte
- * Compression method	1 byte
- * Filter method	1 byte
- * Interlace method	1 byte
- *
- * @Author: pengfei.zhou
- * @CreateDate: 2019/3/27
- */
-class IHDRChunk extends Chunk {
-    static final int ID = fourCCToInt("IHDR");
-    /**
-     * 图像宽度，以像素为单位
-     */
-    int width;
-    /**
-     * 图像高度，以像素为单位
-     */
-    int height;
-
-    byte[] data = new byte[5];
-
-    @Override
-    void innerParse(APNGReader reader) throws IOException {
-        width = reader.readInt();
-        height = reader.readInt();
-        reader.read(data, 0, data.length);
-    }
-}
--- a/app/src/main/java/org/signal/glide/apng/decode/StillFrame.java
+++ b/app/src/main/java/org/signal/glide/apng/decode/StillFrame.java
@@ -1,49 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.apng.decode;
-
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-
-import org.signal.glide.apng.io.APNGReader;
-import org.signal.glide.apng.io.APNGWriter;
-import org.signal.glide.common.decode.Frame;
-
-import java.io.IOException;
-
-/**
- * @Description: APNG4Android
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-13
- */
-public class StillFrame extends Frame<APNGReader, APNGWriter> {
-
-    public StillFrame(APNGReader reader) {
-        super(reader);
-    }
-
-    @Override
-    public Bitmap draw(Canvas canvas, Paint paint, int sampleSize, Bitmap reusedBitmap, APNGWriter writer) {
-        BitmapFactory.Options options = new BitmapFactory.Options();
-        options.inJustDecodeBounds = false;
-        options.inSampleSize = sampleSize;
-        options.inMutable = true;
-        options.inBitmap = reusedBitmap;
-        Bitmap bitmap = null;
-        try {
-            reader.reset();
-            bitmap = BitmapFactory.decodeStream(reader.toInputStream(), null, options);
-            assert bitmap != null;
-            paint.setXfermode(null);
-            canvas.drawBitmap(bitmap, 0, 0, paint);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return bitmap;
-    }
-}
--- a/app/src/main/java/org/signal/glide/apng/io/APNGReader.java
+++ b/app/src/main/java/org/signal/glide/apng/io/APNGReader.java
@@ -1,74 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.apng.io;
-
-import android.text.TextUtils;
-
-import org.signal.glide.common.io.FilterReader;
-import org.signal.glide.common.io.Reader;
-
-import java.io.IOException;
-
-/**
- * @Description: APNGReader
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-13
- */
-public class APNGReader extends FilterReader {
-    private static ThreadLocal<byte[]> __intBytes = new ThreadLocal<>();
-
-
-    protected static byte[] ensureBytes() {
-        byte[] bytes = __intBytes.get();
-        if (bytes == null) {
-            bytes = new byte[4];
-            __intBytes.set(bytes);
-        }
-        return bytes;
-    }
-
-    public APNGReader(Reader in) {
-        super(in);
-    }
-
-    public int readInt() throws IOException {
-        byte[] buf = ensureBytes();
-        read(buf, 0, 4);
-        return buf[3] & 0xFF |
-                (buf[2] & 0xFF) << 8 |
-                (buf[1] & 0xFF) << 16 |
-                (buf[0] & 0xFF) << 24;
-    }
-
-    public short readShort() throws IOException {
-        byte[] buf = ensureBytes();
-        read(buf, 0, 2);
-        return (short) (buf[1] & 0xFF |
-                (buf[0] & 0xFF) << 8);
-    }
-
-    /**
-     * @return read FourCC and match chars
-     */
-    public boolean matchFourCC(String chars) throws IOException {
-        if (TextUtils.isEmpty(chars) || chars.length() != 4) {
-            return false;
-        }
-        int fourCC = readFourCC();
-        for (int i = 0; i < 4; i++) {
-            if (((fourCC >> (i * 8)) & 0xff) != chars.charAt(i)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    public int readFourCC() throws IOException {
-        byte[] buf = ensureBytes();
-        read(buf, 0, 4);
-        return buf[0] & 0xff | (buf[1] & 0xff) << 8 | (buf[2] & 0xff) << 16 | (buf[3] & 0xff) << 24;
-    }
-}
--- a/app/src/main/java/org/signal/glide/apng/io/APNGWriter.java
+++ b/app/src/main/java/org/signal/glide/apng/io/APNGWriter.java
@@ -1,41 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.apng.io;
-
-import org.signal.glide.common.io.ByteBufferWriter;
-
-import java.nio.ByteOrder;
-
-/**
- * @Description: APNGWriter
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-13
- */
-public class APNGWriter extends ByteBufferWriter {
-    public APNGWriter() {
-        super();
-    }
-
-    public void writeFourCC(int val) {
-        putByte((byte) (val & 0xff));
-        putByte((byte) ((val >> 8) & 0xff));
-        putByte((byte) ((val >> 16) & 0xff));
-        putByte((byte) ((val >> 24) & 0xff));
-    }
-
-    public void writeInt(int val) {
-        putByte((byte) ((val >> 24) & 0xff));
-        putByte((byte) ((val >> 16) & 0xff));
-        putByte((byte) ((val >> 8) & 0xff));
-        putByte((byte) (val & 0xff));
-    }
-
-    @Override
-    public void reset(int size) {
-        super.reset(size);
-        this.byteBuffer.order(ByteOrder.BIG_ENDIAN);
-    }
-}
--- a/app/src/main/java/org/signal/glide/common/FrameAnimationDrawable.java
+++ b/app/src/main/java/org/signal/glide/common/FrameAnimationDrawable.java
@@ -1,253 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common;
-
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.DrawFilter;
-import android.graphics.Matrix;
-import android.graphics.Paint;
-import android.graphics.PaintFlagsDrawFilter;
-import android.graphics.PixelFormat;
-import android.graphics.drawable.Drawable;
-import android.os.Handler;
-import android.os.Looper;
-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.common.decode.FrameSeqDecoder;
-import org.signal.glide.common.loader.Loader;
-
-import java.nio.ByteBuffer;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @Description: Frame animation drawable
- * @Author: pengfei.zhou
- * @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 final Paint paint = new Paint();
-    private final Decoder frameSeqDecoder;
-    private DrawFilter drawFilter = new PaintFlagsDrawFilter(0, Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG);
-    private Matrix matrix = new Matrix();
-    private Set<AnimationCallback> animationCallbacks = new HashSet<>();
-    private Bitmap bitmap;
-    private static final int MSG_ANIMATION_START = 1;
-    private static final int MSG_ANIMATION_END = 2;
-    private Handler uiHandler = new Handler(Looper.getMainLooper()) {
-        @Override
-        public void handleMessage(Message msg) {
-            switch (msg.what) {
-                case MSG_ANIMATION_START:
-                    for (AnimationCallback animationCallback : animationCallbacks) {
-                        animationCallback.onAnimationStart(FrameAnimationDrawable.this);
-                    }
-                    break;
-                case MSG_ANIMATION_END:
-                    for (AnimationCallback animationCallback : animationCallbacks) {
-                        animationCallback.onAnimationEnd(FrameAnimationDrawable.this);
-                    }
-                    break;
-            }
-        }
-    };
-    private Runnable invalidateRunnable = new Runnable() {
-        @Override
-        public void run() {
-            invalidateSelf();
-        }
-    };
-    private boolean autoPlay = true;
-
-    public FrameAnimationDrawable(Decoder frameSeqDecoder) {
-        paint.setAntiAlias(true);
-        this.frameSeqDecoder = frameSeqDecoder;
-    }
-
-    public FrameAnimationDrawable(Loader provider) {
-        paint.setAntiAlias(true);
-        this.frameSeqDecoder = createFrameSeqDecoder(provider, this);
-    }
-
-    public void setAutoPlay(boolean autoPlay) {
-        this.autoPlay = autoPlay;
-    }
-
-    protected abstract Decoder createFrameSeqDecoder(Loader streamLoader, FrameSeqDecoder.RenderListener listener);
-
-    /**
-     * @param loopLimit <=0为无限播放,>0为实际播放次数
-     */
-    public void setLoopLimit(int loopLimit) {
-        frameSeqDecoder.setLoopLimit(loopLimit);
-    }
-
-    public void reset() {
-        frameSeqDecoder.reset();
-    }
-
-    public void pause() {
-        frameSeqDecoder.pause();
-    }
-
-    public void resume() {
-        frameSeqDecoder.resume();
-    }
-
-    public boolean isPaused() {
-        return frameSeqDecoder.isPaused();
-    }
-
-    @Override
-    public void start() {
-        if (autoPlay) {
-            frameSeqDecoder.start();
-        } else {
-            this.frameSeqDecoder.addRenderListener(this);
-            if (!this.frameSeqDecoder.isRunning()) {
-                this.frameSeqDecoder.start();
-            }
-        }
-    }
-
-    @Override
-    public void stop() {
-        if (autoPlay) {
-            frameSeqDecoder.stop();
-        } else {
-            this.frameSeqDecoder.removeRenderListener(this);
-            this.frameSeqDecoder.stopIfNeeded();
-        }
-    }
-
-    @Override
-    public boolean isRunning() {
-        return frameSeqDecoder.isRunning();
-    }
-
-    @Override
-    public void draw(Canvas canvas) {
-        if (bitmap == null || bitmap.isRecycled()) {
-            return;
-        }
-        canvas.setDrawFilter(drawFilter);
-        canvas.drawBitmap(bitmap, matrix, paint);
-    }
-
-    @Override
-    public void setBounds(int left, int top, int right, int bottom) {
-        super.setBounds(left, top, right, bottom);
-        boolean sampleSizeChanged = frameSeqDecoder.setDesiredSize(getBounds().width(), getBounds().height());
-        matrix.setScale(
-                1.0f * getBounds().width() * frameSeqDecoder.getSampleSize() / frameSeqDecoder.getBounds().width(),
-                1.0f * getBounds().height() * frameSeqDecoder.getSampleSize() / frameSeqDecoder.getBounds().height());
-
-        if (sampleSizeChanged)
-            this.bitmap = Bitmap.createBitmap(
-                    frameSeqDecoder.getBounds().width() / frameSeqDecoder.getSampleSize(),
-                    frameSeqDecoder.getBounds().height() / frameSeqDecoder.getSampleSize(),
-                    Bitmap.Config.ARGB_8888);
-    }
-
-    @Override
-    public void setAlpha(int alpha) {
-        paint.setAlpha(alpha);
-    }
-
-    @Override
-    public void setColorFilter(ColorFilter colorFilter) {
-        paint.setColorFilter(colorFilter);
-    }
-
-    @Override
-    public int getOpacity() {
-        return PixelFormat.TRANSLUCENT;
-    }
-
-    @Override
-    public void onStart() {
-        Message.obtain(uiHandler, MSG_ANIMATION_START).sendToTarget();
-    }
-
-    @Override
-    public void onRender(ByteBuffer byteBuffer) {
-        if (!isRunning()) {
-            return;
-        }
-        if (this.bitmap == null || this.bitmap.isRecycled()) {
-            this.bitmap = Bitmap.createBitmap(
-                    frameSeqDecoder.getBounds().width() / frameSeqDecoder.getSampleSize(),
-                    frameSeqDecoder.getBounds().height() / frameSeqDecoder.getSampleSize(),
-                    Bitmap.Config.ARGB_8888);
-        }
-        byteBuffer.rewind();
-        if (byteBuffer.remaining() < this.bitmap.getByteCount()) {
-            Log.e(TAG, "onRender:Buffer not large enough for pixels");
-            return;
-        }
-        this.bitmap.copyPixelsFromBuffer(byteBuffer);
-        uiHandler.post(invalidateRunnable);
-    }
-
-    @Override
-    public void onEnd() {
-        Message.obtain(uiHandler, MSG_ANIMATION_END).sendToTarget();
-    }
-
-    @Override
-    public boolean setVisible(boolean visible, boolean restart) {
-        if (this.autoPlay) {
-            if (visible) {
-                if (!isRunning()) {
-                    start();
-                }
-            } else if (isRunning()) {
-                stop();
-            }
-        }
-        return super.setVisible(visible, restart);
-    }
-
-    @Override
-    public int getIntrinsicWidth() {
-        try {
-            return frameSeqDecoder.getBounds().width();
-        } catch (Exception exception) {
-            return 0;
-        }
-    }
-
-    @Override
-    public int getIntrinsicHeight() {
-        try {
-            return frameSeqDecoder.getBounds().height();
-        } catch (Exception exception) {
-            return 0;
-        }
-    }
-
-    @Override
-    public void registerAnimationCallback(@NonNull AnimationCallback animationCallback) {
-        this.animationCallbacks.add(animationCallback);
-    }
-
-    @Override
-    public boolean unregisterAnimationCallback(@NonNull AnimationCallback animationCallback) {
-        return this.animationCallbacks.remove(animationCallback);
-    }
-
-    @Override
-    public void clearAnimationCallbacks() {
-        this.animationCallbacks.clear();
-    }
-}
--- a/app/src/main/java/org/signal/glide/common/decode/Frame.java
+++ b/app/src/main/java/org/signal/glide/common/decode/Frame.java
@@ -1,33 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.decode;
-
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-
-import org.signal.glide.common.io.Reader;
-import org.signal.glide.common.io.Writer;
-
-/**
- * @Description: One frame in an animation
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-13
- */
-public abstract class Frame<R extends Reader, W extends Writer> {
-    protected final R reader;
-    public int frameWidth;
-    public int frameHeight;
-    public int frameX;
-    public int frameY;
-    public int frameDuration;
-
-    public Frame(R reader) {
-        this.reader = reader;
-    }
-
-    public abstract Bitmap draw(Canvas canvas, Paint paint, int sampleSize, Bitmap reusedBitmap, W writer);
-}
--- a/app/src/main/java/org/signal/glide/common/decode/FrameSeqDecoder.java
+++ b/app/src/main/java/org/signal/glide/common/decode/FrameSeqDecoder.java
@@ -1,539 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.decode;
-
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Rect;
-import android.os.Build;
-import android.os.Handler;
-import android.os.Looper;
-
-import androidx.annotation.Nullable;
-import androidx.annotation.WorkerThread;
-
-import org.signal.core.util.logging.Log;
-import org.signal.glide.common.executor.FrameDecoderExecutor;
-import org.signal.glide.common.io.Reader;
-import org.signal.glide.common.io.Writer;
-import org.signal.glide.common.loader.Loader;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.WeakHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.locks.LockSupport;
-
-/**
- * @Description: Abstract Frame Animation Decoder
- * @Author: pengfei.zhou
- * @CreateDate: 2019/3/27
- */
-public abstract class FrameSeqDecoder<R extends Reader, W extends Writer> {
-    private static final String TAG = Log.tag(FrameSeqDecoder.class);
-    private final int taskId;
-
-    private final Loader mLoader;
-    private final Handler workerHandler;
-    protected List<Frame> frames = new ArrayList<>();
-    protected int frameIndex = -1;
-    private int playCount;
-    private Integer loopLimit = null;
-    private Set<RenderListener> renderListeners = new HashSet<>();
-    private AtomicBoolean paused = new AtomicBoolean(true);
-    private static final Rect RECT_EMPTY = new Rect();
-    private Runnable renderTask = new Runnable() {
-        @Override
-        public void run() {
-            if (paused.get()) {
-                return;
-            }
-            if (canStep()) {
-                long start = System.currentTimeMillis();
-                long delay = step();
-                long cost = System.currentTimeMillis() - start;
-                workerHandler.postDelayed(this, Math.max(0, delay - cost));
-                for (RenderListener renderListener : renderListeners) {
-                    renderListener.onRender(frameBuffer);
-                }
-            } else {
-                stop();
-            }
-        }
-    };
-    protected int sampleSize = 1;
-
-    private Set<Bitmap> cacheBitmaps = new HashSet<>();
-    protected Map<Bitmap, Canvas> cachedCanvas = new WeakHashMap<>();
-    protected ByteBuffer frameBuffer;
-    protected volatile Rect fullRect;
-    private W mWriter = getWriter();
-    private R mReader = null;
-
-    /**
-     * If played all the needed
-     */
-    private boolean finished = false;
-
-    private enum State {
-        IDLE,
-        RUNNING,
-        INITIALIZING,
-        FINISHING,
-    }
-
-    private volatile State mState = State.IDLE;
-
-    public Loader getLoader() {
-        return mLoader;
-    }
-
-    protected abstract W getWriter();
-
-    protected abstract R getReader(Reader reader);
-
-    protected Bitmap obtainBitmap(int width, int height) {
-        Bitmap ret = null;
-        Iterator<Bitmap> iterator = cacheBitmaps.iterator();
-        while (iterator.hasNext()) {
-            int reuseSize = width * height * 4;
-            ret = iterator.next();
-
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                if (ret != null && ret.getAllocationByteCount() >= reuseSize) {
-                    iterator.remove();
-                    if (ret.getWidth() != width || ret.getHeight() != height) {
-                        ret.reconfigure(width, height, Bitmap.Config.ARGB_8888);
-                    }
-                    ret.eraseColor(0);
-                    return ret;
-                }
-            } else {
-                if (ret != null && ret.getByteCount() >= reuseSize) {
-                    if (ret.getWidth() == width && ret.getHeight() == height) {
-                        iterator.remove();
-                        ret.eraseColor(0);
-                    }
-                    return ret;
-                }
-            }
-        }
-
-        try {
-            Bitmap.Config config = Bitmap.Config.ARGB_8888;
-            ret = Bitmap.createBitmap(width, height, config);
-        } catch (OutOfMemoryError e) {
-            e.printStackTrace();
-        }
-        return ret;
-    }
-
-    protected void recycleBitmap(Bitmap bitmap) {
-        if (bitmap != null && !cacheBitmaps.contains(bitmap)) {
-            cacheBitmaps.add(bitmap);
-        }
-    }
-
-    /**
-     * 解码器的渲染回调
-     */
-    public interface RenderListener {
-        /**
-         * 播放开始
-         */
-        void onStart();
-
-        /**
-         * 帧播放
-         */
-        void onRender(ByteBuffer byteBuffer);
-
-        /**
-         * 播放结束
-         */
-        void onEnd();
-    }
-
-
-    /**
-     * @param loader         webp的reader
-     * @param renderListener 渲染的回调
-     */
-    public FrameSeqDecoder(Loader loader, @Nullable RenderListener renderListener) {
-        this.mLoader = loader;
-        if (renderListener != null) {
-            this.renderListeners.add(renderListener);
-        }
-        this.taskId = FrameDecoderExecutor.getInstance().generateTaskId();
-        this.workerHandler = new Handler(FrameDecoderExecutor.getInstance().getLooper(taskId));
-    }
-
-
-    public void addRenderListener(final RenderListener renderListener) {
-        this.workerHandler.post(new Runnable() {
-            @Override
-            public void run() {
-                renderListeners.add(renderListener);
-            }
-        });
-    }
-
-    public void removeRenderListener(final RenderListener renderListener) {
-        this.workerHandler.post(new Runnable() {
-            @Override
-            public void run() {
-                renderListeners.remove(renderListener);
-            }
-        });
-    }
-
-    public void stopIfNeeded() {
-        this.workerHandler.post(new Runnable() {
-            @Override
-            public void run() {
-                if (renderListeners.size() == 0) {
-                    stop();
-                }
-            }
-        });
-    }
-
-    public Rect getBounds() {
-        if (fullRect == null) {
-            if (mState == State.FINISHING) {
-                Log.e(TAG, "In finishing,do not interrupt");
-            }
-            final Thread thread = Thread.currentThread();
-            workerHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        if (fullRect == null) {
-                            if (mReader == null) {
-                                mReader = getReader(mLoader.obtain());
-                            } else {
-                                mReader.reset();
-                            }
-                            initCanvasBounds(read(mReader));
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                        fullRect = RECT_EMPTY;
-                    } finally {
-                        LockSupport.unpark(thread);
-                    }
-                }
-            });
-            LockSupport.park(thread);
-        }
-        return fullRect;
-    }
-
-    private void initCanvasBounds(Rect rect) {
-        fullRect = rect;
-        frameBuffer = ByteBuffer.allocate((rect.width() * rect.height() / (sampleSize * sampleSize) + 1) * 4);
-        if (mWriter == null) {
-            mWriter = getWriter();
-        }
-    }
-
-
-    private int getFrameCount() {
-        return this.frames.size();
-    }
-
-    /**
-     * @return Loop Count defined in file
-     */
-    protected abstract int getLoopCount();
-
-    public void start() {
-        if (fullRect == RECT_EMPTY) {
-            return;
-        }
-        if (mState == State.RUNNING || mState == State.INITIALIZING) {
-            Log.i(TAG, debugInfo() + " Already started");
-            return;
-        }
-        if (mState == State.FINISHING) {
-            Log.e(TAG, debugInfo() + " Processing,wait for finish at " + mState);
-        }
-        mState = State.INITIALIZING;
-        if (Looper.myLooper() == workerHandler.getLooper()) {
-            innerStart();
-        } else {
-            workerHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    innerStart();
-                }
-            });
-        }
-    }
-
-    @WorkerThread
-    private void innerStart() {
-        paused.compareAndSet(true, false);
-
-        final long start = System.currentTimeMillis();
-        try {
-            if (frames.size() == 0) {
-                try {
-                    if (mReader == null) {
-                        mReader = getReader(mLoader.obtain());
-                    } else {
-                        mReader.reset();
-                    }
-                    initCanvasBounds(read(mReader));
-                } catch (Throwable e) {
-                    e.printStackTrace();
-                }
-            }
-        } finally {
-            Log.i(TAG, debugInfo() + " Set state to RUNNING,cost " + (System.currentTimeMillis() - start));
-            mState = State.RUNNING;
-        }
-        if (getNumPlays() == 0 || !finished) {
-            this.frameIndex = -1;
-            renderTask.run();
-            for (RenderListener renderListener : renderListeners) {
-                renderListener.onStart();
-            }
-        } else {
-            Log.i(TAG, debugInfo() + " No need to started");
-        }
-    }
-
-    @WorkerThread
-    private void innerStop() {
-        workerHandler.removeCallbacks(renderTask);
-        frames.clear();
-        for (Bitmap bitmap : cacheBitmaps) {
-            if (bitmap != null && !bitmap.isRecycled()) {
-                bitmap.recycle();
-            }
-        }
-        cacheBitmaps.clear();
-        if (frameBuffer != null) {
-            frameBuffer = null;
-        }
-        cachedCanvas.clear();
-        try {
-            if (mReader != null) {
-                mReader.close();
-                mReader = null;
-            }
-            if (mWriter != null) {
-                mWriter.close();
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        release();
-        mState = State.IDLE;
-        for (RenderListener renderListener : renderListeners) {
-            renderListener.onEnd();
-        }
-    }
-
-    public void stop() {
-        if (fullRect == RECT_EMPTY) {
-            return;
-        }
-        if (mState == State.FINISHING || mState == State.IDLE) {
-            Log.i(TAG, debugInfo() + "No need to stop");
-            return;
-        }
-        if (mState == State.INITIALIZING) {
-            Log.e(TAG, debugInfo() + "Processing,wait for finish at " + mState);
-        }
-        mState = State.FINISHING;
-        if (Looper.myLooper() == workerHandler.getLooper()) {
-            innerStop();
-        } else {
-            workerHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    innerStop();
-                }
-            });
-        }
-    }
-
-    private String debugInfo() {
-        return "";
-    }
-
-    protected abstract void release();
-
-    public boolean isRunning() {
-        return mState == State.RUNNING || mState == State.INITIALIZING;
-    }
-
-    public boolean isPaused() {
-        return paused.get();
-    }
-
-    public void setLoopLimit(int limit) {
-        this.loopLimit = limit;
-    }
-
-    public void reset() {
-        this.playCount = 0;
-        this.frameIndex = -1;
-        this.finished = false;
-    }
-
-    public void pause() {
-        workerHandler.removeCallbacks(renderTask);
-        paused.compareAndSet(false, true);
-    }
-
-    public void resume() {
-        paused.compareAndSet(true, false);
-        workerHandler.removeCallbacks(renderTask);
-        workerHandler.post(renderTask);
-    }
-
-
-    public int getSampleSize() {
-        return sampleSize;
-    }
-
-    public boolean setDesiredSize(int width, int height) {
-        boolean sampleSizeChanged = false;
-        int sample = getDesiredSample(width, height);
-        if (sample != this.sampleSize) {
-            this.sampleSize = sample;
-            sampleSizeChanged = true;
-            final boolean tempRunning = isRunning();
-            workerHandler.removeCallbacks(renderTask);
-            workerHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    innerStop();
-                    try {
-                        initCanvasBounds(read(getReader(mLoader.obtain())));
-                        if (tempRunning) {
-                            innerStart();
-                        }
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                }
-            });
-        }
-        return sampleSizeChanged;
-    }
-
-    protected int getDesiredSample(int desiredWidth, int desiredHeight) {
-        if (desiredWidth == 0 || desiredHeight == 0) {
-            return 1;
-        }
-        int radio = Math.min(getBounds().width() / desiredWidth, getBounds().height() / desiredHeight);
-        int sample = 1;
-        while ((sample * 2) <= radio) {
-            sample *= 2;
-        }
-        return sample;
-    }
-
-    protected abstract Rect read(R reader) throws IOException;
-
-    private int getNumPlays() {
-        return this.loopLimit != null ? this.loopLimit : this.getLoopCount();
-    }
-
-    private boolean canStep() {
-        if (!isRunning()) {
-            return false;
-        }
-        if (frames.size() == 0) {
-            return false;
-        }
-        if (getNumPlays() <= 0) {
-            return true;
-        }
-        if (this.playCount < getNumPlays() - 1) {
-            return true;
-        } else if (this.playCount == getNumPlays() - 1 && this.frameIndex < this.getFrameCount() - 1) {
-            return true;
-        }
-        finished = true;
-        return false;
-    }
-
-    @WorkerThread
-    private long step() {
-        this.frameIndex++;
-        if (this.frameIndex >= this.getFrameCount()) {
-            this.frameIndex = 0;
-            this.playCount++;
-        }
-        Frame frame = getFrame(this.frameIndex);
-        if (frame == null) {
-            return 0;
-        }
-        renderFrame(frame);
-        return frame.frameDuration;
-    }
-
-    protected abstract void renderFrame(Frame frame);
-
-    private Frame getFrame(int index) {
-        if (index < 0 || index >= frames.size()) {
-            return null;
-        }
-        return frames.get(index);
-    }
-
-    /**
-     * Get Indexed frame
-     *
-     * @param index <0 means reverse from last index
-     */
-    public Bitmap getFrameBitmap(int index) throws IOException {
-        if (mState != State.IDLE) {
-            Log.e(TAG, debugInfo() + ",stop first");
-            return null;
-        }
-        mState = State.RUNNING;
-        paused.compareAndSet(true, false);
-        if (frames.size() == 0) {
-            if (mReader == null) {
-                mReader = getReader(mLoader.obtain());
-            } else {
-                mReader.reset();
-            }
-            initCanvasBounds(read(mReader));
-        }
-        if (index < 0) {
-            index += this.frames.size();
-        }
-        if (index < 0) {
-            index = 0;
-        }
-        frameIndex = -1;
-        while (frameIndex < index) {
-            if (canStep()) {
-                step();
-            } else {
-                break;
-            }
-        }
-        frameBuffer.rewind();
-        Bitmap bitmap = Bitmap.createBitmap(getBounds().width() / getSampleSize(), getBounds().height() / getSampleSize(), Bitmap.Config.ARGB_8888);
-        bitmap.copyPixelsFromBuffer(frameBuffer);
-        innerStop();
-        return bitmap;
-    }
-}
--- a/app/src/main/java/org/signal/glide/common/executor/FrameDecoderExecutor.java
+++ b/app/src/main/java/org/signal/glide/common/executor/FrameDecoderExecutor.java
@@ -1,70 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.executor;
-
-import android.os.HandlerThread;
-import android.os.Looper;
-
-import java.util.ArrayList;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * @Description: com.github.penfeizhou.animation.executor
- * @Author: pengfei.zhou
- * @CreateDate: 2019-11-21
- */
-public class FrameDecoderExecutor {
-    private static int sPoolNumber = 4;
-    private ArrayList<HandlerThread> mHandlerThreadGroup = new ArrayList<>();
-    private AtomicInteger counter = new AtomicInteger(0);
-
-    private FrameDecoderExecutor() {
-    }
-
-    static class Inner {
-        static final FrameDecoderExecutor sInstance = new FrameDecoderExecutor();
-    }
-
-    public void setPoolSize(int size) {
-        sPoolNumber = size;
-    }
-
-    public static FrameDecoderExecutor getInstance() {
-        return Inner.sInstance;
-    }
-
-    public Looper getLooper(int taskId) {
-        int idx = taskId % sPoolNumber;
-        if (idx >= mHandlerThreadGroup.size()) {
-            HandlerThread handlerThread = new HandlerThread("FrameDecoderExecutor-" + idx);
-            handlerThread.start();
-
-            mHandlerThreadGroup.add(handlerThread);
-            Looper looper = handlerThread.getLooper();
-            if (looper != null) {
-                return looper;
-            } else {
-                return Looper.getMainLooper();
-            }
-        } else {
-            if (mHandlerThreadGroup.get(idx) != null) {
-                Looper looper = mHandlerThreadGroup.get(idx).getLooper();
-                if (looper != null) {
-                    return looper;
-                } else {
-                    return Looper.getMainLooper();
-                }
-            } else {
-                return Looper.getMainLooper();
-            }
-        }
-    }
-
-    public int generateTaskId() {
-        return counter.getAndIncrement();
-    }
-}
-
--- a/app/src/main/java/org/signal/glide/common/io/ByteBufferReader.java
+++ b/app/src/main/java/org/signal/glide/common/io/ByteBufferReader.java
@@ -1,67 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.io;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-
-/**
- * @Description: APNG4Android
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-14
- */
-public class ByteBufferReader implements Reader {
-
-    private final ByteBuffer byteBuffer;
-
-    public ByteBufferReader(ByteBuffer byteBuffer) {
-        this.byteBuffer = byteBuffer;
-        byteBuffer.position(0);
-    }
-
-    @Override
-    public long skip(long total) throws IOException {
-        byteBuffer.position((int) (byteBuffer.position() + total));
-        return total;
-    }
-
-    @Override
-    public byte peek() throws IOException {
-        return byteBuffer.get();
-    }
-
-    @Override
-    public void reset() throws IOException {
-        byteBuffer.position(0);
-    }
-
-    @Override
-    public int position() {
-        return byteBuffer.position();
-    }
-
-    @Override
-    public int read(byte[] buffer, int start, int byteCount) throws IOException {
-        byteBuffer.get(buffer, start, byteCount);
-        return byteCount;
-    }
-
-    @Override
-    public int available() throws IOException {
-        return byteBuffer.limit() - byteBuffer.position();
-    }
-
-    @Override
-    public void close() throws IOException {
-    }
-
-    @Override
-    public InputStream toInputStream() throws IOException {
-        return new ByteArrayInputStream(byteBuffer.array());
-    }
-}
--- a/app/src/main/java/org/signal/glide/common/io/ByteBufferWriter.java
+++ b/app/src/main/java/org/signal/glide/common/io/ByteBufferWriter.java
@@ -1,61 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.io;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-
-/**
- * @Description: ByteBufferWriter
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-12
- */
-public class ByteBufferWriter implements Writer {
-
-    protected ByteBuffer byteBuffer;
-
-    public ByteBufferWriter() {
-        reset(10 * 1024);
-    }
-
-    @Override
-    public void putByte(byte b) {
-        byteBuffer.put(b);
-    }
-
-    @Override
-    public void putBytes(byte[] b) {
-        byteBuffer.put(b);
-    }
-
-    @Override
-    public int position() {
-        return byteBuffer.position();
-    }
-
-    @Override
-    public void skip(int length) {
-        byteBuffer.position(length + position());
-    }
-
-    @Override
-    public byte[] toByteArray() {
-        return byteBuffer.array();
-    }
-
-    @Override
-    public void close() {
-    }
-
-    @Override
-    public void reset(int size) {
-        if (byteBuffer == null || size > byteBuffer.capacity()) {
-            byteBuffer = ByteBuffer.allocate(size);
-            this.byteBuffer.order(ByteOrder.LITTLE_ENDIAN);
-        }
-        byteBuffer.clear();
-    }
-}
--- a/app/src/main/java/org/signal/glide/common/io/FileReader.java
+++ b/app/src/main/java/org/signal/glide/common/io/FileReader.java
@@ -1,30 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.io;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-
-/**
- * @Description: FileReader
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-23
- */
-public class FileReader extends FilterReader {
-    private final File mFile;
-
-    public FileReader(File file) throws IOException {
-        super(new StreamReader(new FileInputStream(file)));
-        mFile = file;
-    }
-
-    @Override
-    public void reset() throws IOException {
-        reader.close();
-        reader = new StreamReader(new FileInputStream(mFile));
-    }
-}
--- a/app/src/main/java/org/signal/glide/common/io/FilterReader.java
+++ b/app/src/main/java/org/signal/glide/common/io/FilterReader.java
@@ -1,63 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.io;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @Description: FilterReader
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-23
- */
-public class FilterReader implements Reader {
-    protected Reader reader;
-
-    public FilterReader(Reader in) {
-        this.reader = in;
-    }
-
-    @Override
-    public long skip(long total) throws IOException {
-        return reader.skip(total);
-    }
-
-    @Override
-    public byte peek() throws IOException {
-        return reader.peek();
-    }
-
-    @Override
-    public void reset() throws IOException {
-        reader.reset();
-    }
-
-    @Override
-    public int position() {
-        return reader.position();
-    }
-
-    @Override
-    public int read(byte[] buffer, int start, int byteCount) throws IOException {
-        return reader.read(buffer, start, byteCount);
-    }
-
-    @Override
-    public int available() throws IOException {
-        return reader.available();
-    }
-
-    @Override
-    public void close() throws IOException {
-        reader.close();
-    }
-
-    @Override
-    public InputStream toInputStream() throws IOException {
-        reset();
-        return reader.toInputStream();
-    }
-}
--- a/app/src/main/java/org/signal/glide/common/io/Reader.java
+++ b/app/src/main/java/org/signal/glide/common/io/Reader.java
@@ -1,35 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.io;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @link {https://developers.google.com/speed/webp/docs/riff_container#terminology_basics}
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-11
- */
-public interface Reader {
-    long skip(long total) throws IOException;
-
-    byte peek() throws IOException;
-
-    void reset() throws IOException;
-
-    int position();
-
-    int read(byte[] buffer, int start, int byteCount) throws IOException;
-
-    int available() throws IOException;
-
-    /**
-     * close io
-     */
-    void close() throws IOException;
-
-    InputStream toInputStream() throws IOException;
-}
--- a/app/src/main/java/org/signal/glide/common/io/StreamReader.java
+++ b/app/src/main/java/org/signal/glide/common/io/StreamReader.java
@@ -1,64 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.io;
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-11
- */
-public class StreamReader extends FilterInputStream implements Reader {
-    private int position;
-
-    public StreamReader(InputStream in) {
-        super(in);
-        try {
-            in.reset();
-        } catch (IOException e) {
-            // e.printStackTrace();
-        }
-    }
-
-    @Override
-    public byte peek() throws IOException {
-        byte ret = (byte) read();
-        position++;
-        return ret;
-    }
-
-    @Override
-    public int read(byte[] b, int off, int len) throws IOException {
-        int ret = super.read(b, off, len);
-        position += Math.max(0, ret);
-        return ret;
-    }
-
-    @Override
-    public synchronized void reset() throws IOException {
-        super.reset();
-        position = 0;
-    }
-
-    @Override
-    public long skip(long n) throws IOException {
-        long ret = super.skip(n);
-        position += ret;
-        return ret;
-    }
-
-    @Override
-    public int position() {
-        return position;
-    }
-
-    @Override
-    public InputStream toInputStream() throws IOException {
-        return this;
-    }
-}
--- a/app/src/main/java/org/signal/glide/common/io/Writer.java
+++ b/app/src/main/java/org/signal/glide/common/io/Writer.java
@@ -1,29 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.io;
-
-import java.io.IOException;
-
-/**
- * @Description: APNG4Android
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-12
- */
-public interface Writer {
-    void reset(int size);
-
-    void putByte(byte b);
-
-    void putBytes(byte[] b);
-
-    int position();
-
-    void skip(int length);
-
-    byte[] toByteArray();
-
-    void close() throws IOException;
-}
--- a/app/src/main/java/org/signal/glide/common/loader/AssetStreamLoader.java
+++ b/app/src/main/java/org/signal/glide/common/loader/AssetStreamLoader.java
@@ -1,32 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.loader;
-
-import android.content.Context;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @Description: 从Asset中读取流
- * @Author: pengfei.zhou
- * @CreateDate: 2019/3/28
- */
-public class AssetStreamLoader extends StreamLoader {
-
-    private final Context mContext;
-    private final String mAssetName;
-
-    public AssetStreamLoader(Context context, String assetName) {
-        mContext = context.getApplicationContext();
-        mAssetName = assetName;
-    }
-
-    @Override
-    protected InputStream getInputStream() throws IOException {
-        return mContext.getAssets().open(mAssetName);
-    }
-}
--- a/app/src/main/java/org/signal/glide/common/loader/ByteBufferLoader.java
+++ b/app/src/main/java/org/signal/glide/common/loader/ByteBufferLoader.java
@@ -1,26 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.loader;
-
-import org.signal.glide.common.io.ByteBufferReader;
-import org.signal.glide.common.io.Reader;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-/**
- * @Description: ByteBufferLoader
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-15
- */
-public abstract class ByteBufferLoader implements Loader {
-    public abstract ByteBuffer getByteBuffer();
-
-    @Override
-    public Reader obtain() throws IOException {
-        return new ByteBufferReader(getByteBuffer());
-    }
-}
--- a/app/src/main/java/org/signal/glide/common/loader/FileLoader.java
+++ b/app/src/main/java/org/signal/glide/common/loader/FileLoader.java
@@ -1,32 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.loader;
-
-import org.signal.glide.common.io.FileReader;
-import org.signal.glide.common.io.Reader;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * @Description: 从文件加载流
- * @Author: pengfei.zhou
- * @CreateDate: 2019/3/28
- */
-public class FileLoader implements Loader {
-
-    private final File mFile;
-    private Reader mReader;
-
-    public FileLoader(String path) {
-        mFile = new File(path);
-    }
-
-    @Override
-    public synchronized Reader obtain() throws IOException {
-        return new FileReader(mFile);
-    }
-}
--- a/app/src/main/java/org/signal/glide/common/loader/Loader.java
+++ b/app/src/main/java/org/signal/glide/common/loader/Loader.java
@@ -1,19 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.loader;
-
-import org.signal.glide.common.io.Reader;
-
-import java.io.IOException;
-
-/**
- * @Description: Loader
- * @Author: pengfei.zhou
- * @CreateDate: 2019-05-14
- */
-public interface Loader {
-    Reader obtain() throws IOException;
-}
--- a/app/src/main/java/org/signal/glide/common/loader/ResourceStreamLoader.java
+++ b/app/src/main/java/org/signal/glide/common/loader/ResourceStreamLoader.java
@@ -1,32 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.loader;
-
-import android.content.Context;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @Description: 从资源加载流
- * @Author: pengfei.zhou
- * @CreateDate: 2019/3/28
- */
-public class ResourceStreamLoader extends StreamLoader {
-    private final Context mContext;
-    private final int mResId;
-
-
-    public ResourceStreamLoader(Context context, int resId) {
-        mContext = context.getApplicationContext();
-        mResId = resId;
-    }
-
-    @Override
-    protected InputStream getInputStream() throws IOException {
-        return mContext.getResources().openRawResource(mResId);
-    }
-}
--- a/app/src/main/java/org/signal/glide/common/loader/StreamLoader.java
+++ b/app/src/main/java/org/signal/glide/common/loader/StreamLoader.java
@@ -1,25 +0,0 @@
-/*
- * Copyright 2019 Zhou Pengfei
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.signal.glide.common.loader;
-
-import org.signal.glide.common.io.Reader;
-import org.signal.glide.common.io.StreamReader;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * @Author: pengfei.zhou
- * @CreateDate: 2019/3/28
- */
-public abstract class StreamLoader implements Loader {
-    protected abstract InputStream getInputStream() throws IOException;
-
-
-    public final synchronized Reader obtain() throws IOException {
-        return new StreamReader(getInputStream());
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Moxie Marlinspike	8796dda8df	Bump version to 3.3.3 // FREEBIE	2015-11-13 11:23:06 -08:00
Moxie Marlinspike	fbc1ec5c2e	Don't E164 shortcodes Fixes #4478 // FREEBIE	2015-11-13 10:49:11 -08:00
				`@@ -1 +0,0 @@`
				`-dontwarn com.google.firebase.analytics.connector.AnalyticsConnector`