Bump version to 5.22.8

This reverts commit 6179c087fb.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -50,5 +50,5 @@ Describe here the issue that you are experiencing.
 **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 -->
+<!-- immediately after the bug has happened capture a debug log via Signal's advanced settings and paste the link below -->
 

.github/workflows/android.yml

@@ -16,10 +16,10 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: set up JDK 11
+    - name: set up JDK 1.8
       uses: actions/setup-java@v1
       with:
-        java-version: 11
+        java-version: 1.8
 
     - name: Validate Gradle Wrapper
       uses: gradle/wrapper-validation-action@v1

.idea/codeStyles/Project.xml

@@ -8,48 +8,14 @@
       <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>
+        <value />
       </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="JAVA">
       <option name="BRACE_STYLE" value="5" />
@@ -215,5 +181,13 @@
         </rules>
       </arrangement>
     </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
   </code_scheme>
 </component>

README.md

@@ -63,4 +63,4 @@ Copyright 2013-2021 Signal
 
 Licensed under the GPLv3: http://www.gnu.org/licenses/gpl-3.0.html
 
-Google Play and the Google Play logo are trademarks of Google LLC.
+Google Play and the Google Play logo are trademarks of Google Inc.

app/build.gradle

@@ -1,14 +1,22 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
 apply plugin: 'com.google.protobuf'
 apply plugin: 'androidx.navigation.safeargs'
+apply plugin: 'witness'
 apply plugin: 'org.jlleitschuh.gradle.ktlint'
 apply from: 'translations.gradle'
+apply from: 'witness-verifications.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/photoview/releases/"
+        content {
+            includeGroupByRegex "com\\.github\\.chrisbanes.*"
+        }
+    }
     maven {
         url "https://raw.github.com/signalapp/maven/master/circular-progress-button/releases/"
         content {
@@ -21,10 +29,12 @@ repositories {
             includeGroupByRegex "org\\.signal.*"
         }
     }
-    maven {
-        url "https://www.jitpack.io"
+    maven { // textdrawable
+        url 'https://dl.bintray.com/amulyakhare/maven'
+        content {
+            includeGroupByRegex "com\\.amulyakhare.*"
+        }
     }
-
     google()
     mavenCentral()
     mavenLocal()
@@ -33,10 +43,14 @@ repositories {
     }
     jcenter {
         content {
+            includeVersion "com.google.android.exoplayer", "exoplayer-core", "2.9.1"
+            includeVersion "com.google.android.exoplayer", "exoplayer-ui", "2.9.1"
+            includeVersion "com.google.android.exoplayer", "extension-mediasession", "2.9.1"
             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.amulyakhare", "com.amulyakhare.textdrawable", "1.0.1"
             includeVersion "com.google.android", "flexbox", "0.3.0"
         }
     }
@@ -44,7 +58,7 @@ repositories {
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.18.0'
+        artifact = 'com.google.protobuf:protoc:3.10.0'
     }
     generateProtoTasks {
         all().each { task ->
@@ -57,27 +71,29 @@ protobuf {
     }
 }
 
-ktlint {
-    // Use a newer version to resolve https://github.com/JLLeitschuh/ktlint-gradle/issues/507
-    version = "0.43.2"
-}
-
-def canonicalVersionCode = 989
-def canonicalVersionName = "5.29.5"
+def canonicalVersionCode = 911
+def canonicalVersionName = "5.22.8"
 
 def postFixSize = 100
-def abiPostFix = ['universal'   : 0,
-                  'armeabi-v7a' : 1,
-                  'arm64-v8a'   : 2,
-                  'x86'         : 3,
-                  'x86_64'      : 4]
+def abiPostFix = ['universal'   : 5,
+                  'armeabi-v7a' : 6,
+                  'arm64-v8a'   : 7,
+                  'x86'         : 8,
+                  'x86_64'      : 9]
 
 def keystores = [ 'debug'  : loadKeystoreProperties('keystore.debug.properties') ]
 
 def selectableVariants = [
+        'internalProdFlipper',
+        'internalProdPerf',
+        'internalProdRelease',
+        'internalStagingFlipper',
+        'internalStagingPerf',
+        'internalStagingRelease',
         'nightlyProdFlipper',
         'nightlyProdPerf',
         'nightlyProdRelease',
+        'nightlyStagingPerf',
         'playProdDebug',
         'playProdFlipper',
         'playProdPerf',
@@ -133,12 +149,11 @@ android {
 
         buildConfigField "long", "BUILD_TIMESTAMP", getLastCommitTimestamp() + "L"
         buildConfigField "String", "GIT_HASH", "\"${getGitHash()}\""
-        buildConfigField "String", "SIGNAL_URL", "\"https://chat.signal.org\""
+        buildConfigField "String", "SIGNAL_URL", "\"https://textsecure-service.whispersystems.org\""
         buildConfigField "String", "STORAGE_URL", "\"https://storage.signal.org\""
         buildConfigField "String", "SIGNAL_CDN_URL", "\"https://cdn.signal.org\""
         buildConfigField "String", "SIGNAL_CDN2_URL", "\"https://cdn2.signal.org\""
         buildConfigField "String", "SIGNAL_CONTACT_DISCOVERY_URL", "\"https://api.directory.signal.org\""
-        buildConfigField "String", "SIGNAL_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\""
@@ -147,27 +162,23 @@ android {
         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(\"fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe\"," +
-                                                                                                "\"fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe\", " +
-                                                                                                "\"a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87\")";
-        buildConfigField "org.thoughtcrime.securesms.KbsEnclave[]", "KBS_FALLBACKS", "new org.thoughtcrime.securesms.KbsEnclave[0]"
+        buildConfigField "KbsEnclave", "KBS_ENCLAVE", "new KbsEnclave(\"fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe\"," +
+                                                                     "\"fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe\", " +
+                                                                     "\"a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87\")";
+        buildConfigField "KbsEnclave[]", "KBS_FALLBACKS", "new KbsEnclave[0]"
         buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF\""
-        buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X36nOoGPs54XsEGzPdEV+itQNGUFEjY6X9Uv+Acuks7NpyGvCoKxGwgKgE5XyJ+nNKlyHHOLb6N1NuHyBrZrgtY/JYJHRooo5CEqYKBqdFnmbTVGEkCvJKxLnjwKWf+fEPoWeQFj5ObDjcKMZf2Jm2Ae69x+ikU5gBXsRmoF94GXQ==\""
+        buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X0=\""
         buildConfigField "String[]", "LANGUAGES", "new String[]{\"" + autoResConfig().collect { s -> s.replace('-r', '_') }.join('", "') + '"}'
         buildConfigField "int", "CANONICAL_VERSION_CODE", "$canonicalVersionCode"
         buildConfigField "String", "DEFAULT_CURRENCIES", "\"EUR,AUD,GBP,CAD,CNY\""
-        buildConfigField "int[]", "MOBILE_COIN_BLACKLIST", "new int[]{98,963,53,850,7}"
+        buildConfigField "int[]", "MOBILE_COIN_REGIONS", "new int[]{44}"
         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'
@@ -185,21 +196,6 @@ android {
         }
 
         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 {
@@ -297,6 +293,14 @@ android {
             buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"website\""
         }
 
+        internal {
+            dimension 'distribution'
+            ext.websiteUpdateUrl = "null"
+            buildConfigField "boolean", "PLAY_STORE_DISABLED", "false"
+            buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
+            buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"internal\""
+        }
+
         nightly {
             dimension 'distribution'
             versionNameSuffix "-nightly-untagged-${getDateSuffix()}"
@@ -330,24 +334,23 @@ android {
 
             applicationIdSuffix ".staging"
 
-            buildConfigField "String", "SIGNAL_URL", "\"https://chat.staging.signal.org\""
+            buildConfigField "String", "SIGNAL_URL", "\"https://textsecure-service-staging.whispersystems.org\""
             buildConfigField "String", "STORAGE_URL", "\"https://storage-staging.signal.org\""
             buildConfigField "String", "SIGNAL_CDN_URL", "\"https://cdn-staging.signal.org\""
             buildConfigField "String", "SIGNAL_CDN2_URL", "\"https://cdn2-staging.signal.org\""
             buildConfigField "String", "SIGNAL_CONTACT_DISCOVERY_URL", "\"https://api-staging.directory.signal.org\""
             buildConfigField "String", "SIGNAL_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(\"823a3b2c037ff0cbe305cc48928cfcc97c9ed4a8ca6d49af6f7d6981fb60a4e9\", " +
-                                                                                                    "\"16b94ac6d2b7f7b9d72928f36d798dbb35ed32e7bb14c42b4301ad0344b46f29\", " +
-                                                                                                    "\"a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87\")"
-            buildConfigField "org.thoughtcrime.securesms.KbsEnclave[]", "KBS_FALLBACKS", "new org.thoughtcrime.securesms.KbsEnclave[0]"
+            buildConfigField "KbsEnclave", "KBS_ENCLAVE", "new KbsEnclave(\"823a3b2c037ff0cbe305cc48928cfcc97c9ed4a8ca6d49af6f7d6981fb60a4e9\", " +
+                                                                         "\"51a56084c0b21c6b8f62b1bc792ec9bedac4c7c3964bb08ddcab868158c09982\", " +
+                                                                         "\"a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87\")"
+            buildConfigField "KbsEnclave[]", "KBS_FALLBACKS", "new KbsEnclave[0]"
             buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx\""
-            buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdlukrpzzsCIvEwjwQlJYVPOQPj4V0F4UXXBdHSLK05uoPBCQG8G9rYIGedYsClJXnbrgGYG3eMTG5hnx4X4ntARBgELuMWWUEEfSK0mjXg+/2lPmWcTZWR9nkqgQQP0tbzuiPm74H2wMO4u1Wafe+UwyIlIT9L7KLS19Aw8r4sPrXQ==\""
+            buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdls=\""
             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\""
         }
     }
 
@@ -383,7 +386,6 @@ android {
     }
 
     lintOptions {
-        checkReleaseBuilds false
         abortOnError true
         baseline file("lint-baseline.xml")
         disable "LintError"
@@ -397,163 +399,157 @@ android {
 }
 
 dependencies {
-    implementation libs.androidx.core.ktx
-    implementation libs.androidx.fragment.ktx
+    implementation 'androidx.core:core-ktx:1.5.0'
+    implementation 'androidx.fragment:fragment-ktx:1.3.5'
     lintChecks project(':lintchecks')
 
-    coreLibraryDesugaring libs.android.tools.desugar
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
-    implementation (libs.androidx.appcompat) {
-        version {
-            strictly '1.2.0'
-        }
+    implementation ('androidx.appcompat:appcompat:1.2.0') {
+        force = true
     }
-    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 "androidx.window:window:1.0.0-alpha09"
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.preference:preference:1.0.0'
+    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
+    implementation 'androidx.gridlayout:gridlayout:1.0.0'
+    implementation 'androidx.exifinterface:exifinterface:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.multidex:multidex:2.0.1'
+    implementation 'androidx.navigation:navigation-fragment:2.1.0'
+    implementation 'androidx.navigation:navigation-ui:2.1.0'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:1.0.0-alpha05'
+    implementation 'androidx.lifecycle:lifecycle-common-java8:2.1.0'
+    implementation 'androidx.lifecycle:lifecycle-reactivestreams-ktx:2.1.0'
+    implementation "androidx.camera:camera-core:1.0.0-beta11"
+    implementation "androidx.camera:camera-camera2:1.0.0-beta11"
+    implementation "androidx.camera:camera-lifecycle:1.0.0-beta11"
+    implementation "androidx.camera:camera-view:1.0.0-alpha18"
+    implementation "androidx.concurrent:concurrent-futures:1.0.0"
+    implementation "androidx.autofill:autofill:1.0.0"
+    implementation "androidx.biometric:biometric:1.1.0"
+    implementation "androidx.sharetarget:sharetarget:1.1.0"
 
-    implementation (libs.firebase.messaging) {
+    implementation ('com.google.firebase:firebase-messaging:22.0.0') {
         exclude group: 'com.google.firebase', module: 'firebase-core'
         exclude group: 'com.google.firebase', module: 'firebase-analytics'
         exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
     }
 
-    implementation libs.google.play.services.maps
-    implementation libs.google.play.services.auth
+    implementation 'com.google.android.gms:play-services-maps:16.1.0'
+    implementation 'com.google.android.gms:play-services-auth:16.0.1'
 
-    implementation libs.bundles.exoplayer
+    implementation 'com.google.android.exoplayer:exoplayer-core:2.9.1'
+    implementation 'com.google.android.exoplayer:exoplayer-ui:2.9.1'
+    implementation 'com.google.android.exoplayer:extension-mediasession:2.9.1'
 
-    implementation libs.conscrypt.android
-    implementation libs.signal.aesgcmprovider
+    implementation 'org.conscrypt:conscrypt-android:2.0.0'
+    implementation 'org.signal:aesgcmprovider:0.0.3'
 
     implementation project(':libsignal-service')
     implementation project(':paging')
     implementation project(':core-util')
-    implementation project(':glide-config')
     implementation project(':video')
     implementation project(':device-transfer')
-    implementation project(':image-editor')
-    implementation project(':donations')
 
-    implementation libs.signal.client.android
-    implementation libs.google.protobuf.javalite
+    implementation 'org.signal:zkgroup-android:0.7.0'
+    implementation "org.whispersystems:signal-client-android:${LIBSIGNAL_CLIENT_VERSION}"
+    implementation 'com.google.protobuf:protobuf-javalite:3.10.0'
 
-    implementation(libs.mobilecoin) {
+    implementation('com.mobilecoin:android-sdk:1.1.0') {
         exclude group: 'com.google.protobuf'
     }
 
-    implementation(libs.signal.argon2) {
-        artifact {
-            type = "aar"
-        }
-    }
+    implementation 'org.signal:argon2:13.1@aar'
 
-    implementation libs.signal.ringrtc
+    implementation 'org.signal:ringrtc-android:2.11.1'
 
-    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) {
+    implementation "me.leolin:ShortcutBadger:1.1.22"
+    implementation 'se.emilsjolander:stickylistheaders:2.7.0'
+    implementation 'com.jpardogo.materialtabstrip:library:1.0.9'
+    implementation 'org.apache.httpcomponents:httpclient-android:4.3.5'
+    implementation 'com.github.chrisbanes:PhotoView:2.1.3'
+    implementation 'com.github.bumptech.glide:glide:4.11.0'
+    kapt 'com.github.bumptech.glide:compiler:4.11.0'
+    kapt 'androidx.annotation:annotation:1.1.0'
+    implementation 'com.makeramen:roundedimageview:2.1.0'
+    implementation 'com.pnikosis:materialish-progress:1.5'
+    implementation 'org.greenrobot:eventbus:3.0.0'
+    implementation 'pl.tajchert:waitingdots:0.1.0'
+    implementation 'com.melnykov:floatingactionbutton:1.3.0'
+    implementation 'com.google.zxing:android-integration:3.1.0'
+    implementation 'mobi.upod:time-duration-picker:1.1.3'
+    implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
+    implementation 'com.google.zxing:core:3.2.1'
+    implementation ('com.davemorrissey.labs:subsampling-scale-image-view:3.6.0') {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
-    implementation (libs.numberpickerview) {
+    implementation ('cn.carbswang.android:NumberPickerView:1.0.9') {
         exclude group: 'com.android.support', module: 'appcompat-v7'
     }
-    implementation (libs.android.tooltips) {
+    implementation ('com.tomergoldst.android:tooltips:1.0.6') {
         exclude group: 'com.android.support', module: 'appcompat-v7'
     }
-    implementation (libs.android.smsmms) {
+    implementation ('com.klinkerapps:android-smsmms:4.0.1') {
         exclude group: 'com.squareup.okhttp', module: 'okhttp'
         exclude group: 'com.squareup.okhttp', module: 'okhttp-urlconnection'
     }
-    implementation libs.stream
-    implementation (libs.colorpicker) {
+    implementation 'com.annimon:stream:1.1.8'
+    implementation ('com.takisoft.fix:colorpicker:0.9.1') {
         exclude group: 'com.android.support', module: 'appcompat-v7'
         exclude group: 'com.android.support', module: 'recyclerview-v7'
     }
 
-    implementation libs.lottie
+    implementation 'com.airbnb.android:lottie:3.6.0'
 
-    implementation libs.stickyheadergrid
-    implementation libs.circular.progress.button
+    implementation 'com.codewaves.stickyheadergrid:stickyheadergrid:0.9.4'
+    implementation 'com.github.dmytrodanylyk.circular-progress-button:library:1.1.3-S2'
 
-    implementation libs.signal.android.database.sqlcipher
-    implementation libs.androidx.sqlite
+    implementation "net.zetetic:android-database-sqlcipher:4.4.3"
+    implementation "androidx.sqlite:sqlite:2.1.0"
 
-    implementation (libs.google.ez.vcard) {
+    implementation ('com.googlecode.ez-vcard:ez-vcard:0.9.11') {
         exclude group: 'com.fasterxml.jackson.core'
         exclude group: 'org.freemarker'
     }
-    implementation libs.dnsjava
+    implementation 'dnsjava:dnsjava:2.1.9'
 
-    flipperImplementation libs.facebook.flipper
-    flipperImplementation libs.facebook.soloader
-    flipperImplementation libs.square.leakcanary
+    flipperImplementation 'com.facebook.flipper:flipper:0.91.0'
+    flipperImplementation 'com.facebook.soloader:soloader:0.10.1'
 
-    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 'junit:junit:4.12'
+    testImplementation 'org.assertj:assertj-core:3.11.1'
+    testImplementation 'org.mockito:mockito-core:2.8.9'
+    testImplementation 'org.powermock:powermock-api-mockito2:1.7.4'
+    testImplementation 'org.powermock:powermock-module-junit4:1.7.4'
+    testImplementation 'org.powermock:powermock-module-junit4-rule:1.7.4'
+    testImplementation 'org.powermock:powermock-classloading-xstream:1.7.4'
 
-    testImplementation testLibs.androidx.test.core
-    testImplementation (testLibs.robolectric.robolectric) {
+    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation ('org.robolectric:robolectric:4.4') {
         exclude group: 'com.google.protobuf', module: 'protobuf-java'
     }
-    testImplementation testLibs.robolectric.shadows.multidex
-    testImplementation testLibs.hamcrest.hamcrest
+    testImplementation 'org.robolectric:shadows-multidex:4.4'
+    testImplementation 'org.hamcrest:hamcrest:2.2'
 
     testImplementation(testFixtures(project(":libsignal-service")))
 
-    androidTestImplementation testLibs.androidx.test.ext.junit
-    androidTestImplementation testLibs.espresso.core
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
-    testImplementation testLibs.espresso.core
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.12.0"
 
-    implementation libs.kotlin.stdlib.jdk8
-    implementation libs.kotlin.reflect
-    implementation libs.jackson.module.kotlin
+    implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
+    implementation 'io.reactivex.rxjava3:rxkotlin:3.0.1'
+}
 
-    implementation libs.rxjava3.rxandroid
-    implementation libs.rxjava3.rxkotlin
-    implementation libs.rxdogtag
-
-    androidTestUtil 'androidx.test:orchestrator:1.4.0'
+dependencyVerification {
+    configuration = '(play|website)(Prod|Staging)(Debug|Release)RuntimeClasspath'
 }
 
 def getLastCommitTimestamp() {
@@ -599,8 +595,7 @@ def getCurrentGitTag() {
     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))
+        return output.split('\n')[0];
     } else {
         return null
     }

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

@@ -1,436 +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.assertTrue
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-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 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)
-
-    val retrievedId: RecipientId = recipientDatabase.getAndPossiblyMerge(ACI_B, E164_A, true)
-    assertNotEquals(existingId, retrievedId)
-
-    val retrievedRecipient = Recipient.resolved(retrievedId)
-    assertEquals(ACI_B, retrievedRecipient.requireAci())
-    assertEquals(E164_A, retrievedRecipient.requireE164())
-
-    val existingRecipient = Recipient.resolved(existingId)
-    assertEquals(ACI_A, existingRecipient.requireAci())
-    assertFalse(existingRecipient.hasE164())
-  }
-
-  /** 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 existingAciId: RecipientId = recipientDatabase.getOrInsertFromAci(ACI_A)
-    val existingE164Id: RecipientId = recipientDatabase.getOrInsertFromE164(E164_A)
-
-    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)
-  }
-
-  /** 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 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())
-  }
-
-  /** 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())
-  }
-
-  // ==============================================================
-  // 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))
-    }
-  }
-
-  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"))
-
-    const val E164_A = "+12221234567"
-    const val E164_B = "+13331234567"
-  }
-}

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

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

@@ -1,9 +1,6 @@
 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;
@@ -15,7 +12,6 @@ import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-@RunWith(AndroidJUnit4.class)
 public final class PinHashing_hashPin_Test {
 
   @Test

app/src/flipper/java/org/thoughtcrime/securesms/FlipperApplicationContext.java

@@ -0,0 +1,27 @@
+package org.thoughtcrime.securesms;
+
+import com.facebook.flipper.android.AndroidFlipperClient;
+import com.facebook.flipper.core.FlipperClient;
+import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin;
+import com.facebook.flipper.plugins.inspector.DescriptorMapping;
+import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
+import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
+import com.facebook.soloader.SoLoader;
+
+import org.thoughtcrime.securesms.database.FlipperSqlCipherAdapter;
+
+public class FlipperApplicationContext extends ApplicationContext {
+
+  @Override
+  public void onCreate() {
+    super.onCreate();
+
+    SoLoader.init(this, false);
+
+    FlipperClient client = AndroidFlipperClient.getInstance(this);
+    client.addPlugin(new InspectorFlipperPlugin(this, DescriptorMapping.withDefaults()));
+    client.addPlugin(new DatabasesFlipperPlugin(new FlipperSqlCipherAdapter(this)));
+    client.addPlugin(new SharedPreferencesFlipperPlugin(this));
+    client.start();
+  }
+}

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"
-        )
-    )
-  }
-}

app/src/flipper/java/org/thoughtcrime/securesms/database/FlipperSqlCipherAdapter.java

@@ -11,11 +11,12 @@ 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 net.sqlcipher.DatabaseUtils;
+import net.sqlcipher.database.SQLiteDatabase;
+import net.sqlcipher.database.SQLiteStatement;
 
 import org.signal.core.util.logging.Log;
+import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.util.Hex;
 
 import java.lang.reflect.Field;
@@ -42,11 +43,14 @@ public class FlipperSqlCipherAdapter extends DatabaseDriver<FlipperSqlCipherAdap
   @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());
+      Field databaseHelperField = DatabaseFactory.class.getDeclaredField("databaseHelper");
+      databaseHelperField.setAccessible(true);
+
+      SignalDatabase mainOpenHelper       = Objects.requireNonNull((SQLCipherOpenHelper) databaseHelperField.get(DatabaseFactory.getInstance(getContext())));
+      SignalDatabase keyValueOpenHelper   = KeyValueDatabase.getInstance((Application) getContext());
+      SignalDatabase megaphoneOpenHelper  = MegaphoneDatabase.getInstance((Application) getContext());
+      SignalDatabase jobManagerOpenHelper = JobDatabase.getInstance((Application) getContext());
+      SignalDatabase metricsOpenHelper    = LocalMetricsDatabase.getInstance((Application) getContext());
 
       return Arrays.asList(new Descriptor(mainOpenHelper),
                            new Descriptor(keyValueOpenHelper),
@@ -249,9 +253,9 @@ public class FlipperSqlCipherAdapter extends DatabaseDriver<FlipperSqlCipherAdap
   }
 
   static class Descriptor implements DatabaseDescriptor {
-    private final SignalDatabaseOpenHelper sqlCipherOpenHelper;
+    private final SignalDatabase sqlCipherOpenHelper;
 
-    Descriptor(@NonNull SignalDatabaseOpenHelper sqlCipherOpenHelper) {
+    Descriptor(@NonNull SignalDatabase sqlCipherOpenHelper) {
       this.sqlCipherOpenHelper = sqlCipherOpenHelper;
     }
 

app/src/internal/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/core_red_shade"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/main/AndroidManifest.xml

@@ -101,10 +101,6 @@
                  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"/>
@@ -180,6 +176,7 @@
     <activity android:name=".sharing.ShareActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:excludeFromRecents="true"
+              android:launchMode="singleTask"
               android:taskAffinity=""
               android:windowSoftInputMode="stateHidden"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
@@ -321,8 +318,7 @@
     <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" />
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".groups.ui.invitesandrequests.ManagePendingAndRequestingMembersActivity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
@@ -370,18 +366,17 @@
               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=".mediasend.MediaSendActivity"
+              android:theme="@style/TextSecure.FullScreenMedia"
+              android:windowSoftInputMode="stateHidden"
+              android:launchMode="singleTop"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".PassphraseChangeActivity"
               android:label="@string/AndroidManifest__change_passphrase"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".verify.VerifyIdentityActivity"
-              android:theme="@style/Signal.DayNight.NoActionBar"
+    <activity android:name=".VerifyIdentityActivity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".components.settings.app.AppSettingsActivity"
@@ -394,12 +389,8 @@
         </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:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
             android:theme="@style/Signal.DayNight.ConversationSettings"
             android:windowSoftInputMode="stateAlwaysHidden">
         </activity>
@@ -770,6 +761,22 @@
 
     </provider>
 
+    <provider android:name=".database.DatabaseContentProviders$Conversation"
+              android:authorities="${applicationId}.database.conversation"
+              android:exported="false" />
+
+    <provider android:name=".database.DatabaseContentProviders$Attachment"
+              android:authorities="${applicationId}.database.attachment"
+              android:exported="false" />
+
+    <provider android:name=".database.DatabaseContentProviders$Sticker"
+              android:authorities="${applicationId}.database.sticker"
+              android:exported="false" />
+
+    <provider android:name=".database.DatabaseContentProviders$StickerPack"
+              android:authorities="${applicationId}.database.stickerpack"
+              android:exported="false" />
+
     <receiver android:name=".service.BootReceiver">
         <intent-filter>
             <action android:name="android.intent.action.BOOT_COMPLETED"/>

app/src/main/java/androidx/camera/view/SignalCameraView.java

@@ -60,7 +60,6 @@ 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;
 
@@ -131,11 +130,6 @@ public final class SignalCameraView extends FrameLayout {
   // 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);
   }
@@ -173,32 +167,14 @@ public final class SignalCameraView extends FrameLayout {
    *                                  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) {
+  public void bindToLifecycle(@NonNull LifecycleOwner lifecycleOwner) {
     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
+    mCameraModule = new SignalCameraXModule(this);
 
     if (attrs != null) {
       TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.CameraView);

app/src/main/java/androidx/camera/view/SignalCameraXModule.java

@@ -46,7 +46,6 @@ 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;
@@ -124,9 +123,7 @@ final class SignalCameraXModule {
   @Nullable
   ProcessCameraProvider mCameraProvider;
 
-  // BEGIN Custom Signal Code Block
-  SignalCameraXModule(SignalCameraView view, Consumer<Throwable> errorConsumer) {
-    // END Custom Signal Code Block
+  SignalCameraXModule(SignalCameraView view) {
     mCameraView = view;
 
     Futures.addCallback(ProcessCameraProvider.getInstance(view.getContext()),
@@ -144,9 +141,7 @@ final class SignalCameraXModule {
 
           @Override
           public void onFailure(Throwable t) {
-            // BEGIN Custom Signal Code Block
-            errorConsumer.accept(t);
-            // END Custom Signal Code Block
+            throw new RuntimeException("CameraX failed to initialize.", t);
           }
         }, CameraXExecutors.mainThreadExecutor());
 
@@ -227,10 +222,17 @@ final class SignalCameraXModule {
     // 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
+    if (getCaptureMode() == SignalCameraView.CaptureMode.IMAGE) {
+      // Begin Signal Custom Code Block
+      mImageCaptureBuilder.setTargetResolution(CameraXUtil.buildResolutionForRatio(resolution, ASPECT_RATIO_4_3, isDisplayPortrait));
+      // End Signal Custom Code Block
+      targetAspectRatio = isDisplayPortrait ? ASPECT_RATIO_3_4 : ASPECT_RATIO_4_3;
+    } else {
+      // Begin Signal Custom Code Block
+      mImageCaptureBuilder.setTargetResolution(CameraXUtil.buildResolutionForRatio(resolution, ASPECT_RATIO_16_9, isDisplayPortrait));
+      // End Signal Custom Code Block
+      targetAspectRatio = isDisplayPortrait ? ASPECT_RATIO_9_16 : ASPECT_RATIO_16_9;
+    }
 
     // Begin Signal Custom Code Block
     mImageCaptureBuilder.setCaptureMode(CameraXUtil.getOptimalCaptureMode());

app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.java

@@ -19,6 +19,6 @@ public final class AppCapabilities {
    *                       asking if the user has set a Signal PIN or not.
    */
   public static AccountAttributes.Capabilities getCapabilities(boolean storageCapable) {
-    return new AccountAttributes.Capabilities(UUID_CAPABLE, GV2_CAPABLE, storageCapable, GV1_MIGRATION, SENDER_KEY, ANNOUNCEMENT_GROUPS, FeatureFlags.changeNumber());
+    return new AccountAttributes.Capabilities(UUID_CAPABLE, GV2_CAPABLE, storageCapable, GV1_MIGRATION, SENDER_KEY, ANNOUNCEMENT_GROUPS);
   }
 }

app/src/main/java/org/thoughtcrime/securesms/AppInitialization.java

@@ -33,9 +33,10 @@ public final class AppInitialization {
     InsightsOptOut.userRequestedOptOut(context);
     TextSecurePreferences.setAppMigrationVersion(context, ApplicationMigrations.CURRENT_VERSION);
     TextSecurePreferences.setJobManagerVersion(context, JobManager.CURRENT_VERSION);
-    TextSecurePreferences.setLastVersionCode(context, Util.getCanonicalVersionCode());
+    TextSecurePreferences.setLastExperienceVersionCode(context, Util.getCanonicalVersionCode());
     TextSecurePreferences.setHasSeenStickerIntroTooltip(context, true);
     TextSecurePreferences.setPasswordDisabled(context, true);
+    TextSecurePreferences.setLastExperienceVersionCode(context, Util.getCanonicalVersionCode());
     TextSecurePreferences.setReadReceiptsEnabled(context, true);
     TextSecurePreferences.setTypingIndicatorsEnabled(context, true);
     TextSecurePreferences.setHasSeenWelcomeScreen(context, false);
@@ -72,9 +73,10 @@ public final class AppInitialization {
     InsightsOptOut.userRequestedOptOut(context);
     TextSecurePreferences.setAppMigrationVersion(context, ApplicationMigrations.CURRENT_VERSION);
     TextSecurePreferences.setJobManagerVersion(context, JobManager.CURRENT_VERSION);
-    TextSecurePreferences.setLastVersionCode(context, Util.getCanonicalVersionCode());
+    TextSecurePreferences.setLastExperienceVersionCode(context, Util.getCanonicalVersionCode());
     TextSecurePreferences.setHasSeenStickerIntroTooltip(context, true);
     TextSecurePreferences.setPasswordDisabled(context, true);
+    TextSecurePreferences.setLastExperienceVersionCode(context, Util.getCanonicalVersionCode());
     ApplicationDependencies.getMegaphoneRepository().onFirstEverAppLaunch();
     SignalStore.onFirstEverAppLaunch();
     ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.ZOZO.getPackId(), BlessedPacks.ZOZO.getPackKey(), false));

app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java

@@ -18,6 +18,7 @@ package org.thoughtcrime.securesms;
 
 import android.content.Context;
 import android.os.Build;
+import android.os.SystemClock;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -28,22 +29,18 @@ import androidx.multidex.MultiDexApplication;
 import com.google.android.gms.security.ProviderInstaller;
 
 import org.conscrypt.Conscrypt;
-import org.greenrobot.eventbus.EventBus;
 import org.signal.aesgcmprovider.AesGcmProvider;
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.AndroidLogger;
 import org.signal.core.util.logging.Log;
 import org.signal.core.util.tracing.Tracer;
 import org.signal.glide.SignalGlideCodecs;
-import org.thoughtcrime.securesms.emoji.JumboEmoji;
-import org.thoughtcrime.securesms.mms.SignalGlideModule;
 import org.signal.ringrtc.CallManager;
 import org.thoughtcrime.securesms.avatar.AvatarPickerStorage;
-import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider;
-import org.thoughtcrime.securesms.crypto.DatabaseSecretProvider;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.LogDatabase;
 import org.thoughtcrime.securesms.database.SqlCipherLibraryLoader;
-import org.thoughtcrime.securesms.database.SignalDatabase;
+import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencyProvider;
 import org.thoughtcrime.securesms.emoji.EmojiSource;
@@ -54,21 +51,18 @@ import org.thoughtcrime.securesms.jobs.EmojiSearchIndexDownloadJob;
 import org.thoughtcrime.securesms.jobs.FcmRefreshJob;
 import org.thoughtcrime.securesms.jobs.GroupV1MigrationJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
-import org.thoughtcrime.securesms.jobs.ProfileUploadJob;
 import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
 import org.thoughtcrime.securesms.jobs.RefreshPreKeysJob;
 import org.thoughtcrime.securesms.jobs.RetrieveProfileJob;
-import org.thoughtcrime.securesms.jobs.SubscriptionKeepAliveJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger;
 import org.thoughtcrime.securesms.logging.PersistentLogger;
 import org.thoughtcrime.securesms.messageprocessingalarm.MessageProcessReceiver;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
-import org.thoughtcrime.securesms.mms.SignalGlideComponents;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.providers.BlobProvider;
+import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
 import org.thoughtcrime.securesms.ratelimit.RateLimitUtil;
-import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.registration.RegistrationUtil;
 import org.thoughtcrime.securesms.ringrtc.RingRtcLogger;
 import org.thoughtcrime.securesms.service.DirectoryRefreshListener;
@@ -88,19 +82,15 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.VersionTracker;
 import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
+import org.webrtc.voiceengine.WebRtcAudioManager;
+import org.webrtc.voiceengine.WebRtcAudioUtils;
 import org.whispersystems.libsignal.logging.SignalProtocolLoggerProvider;
 
-import java.io.IOException;
-import java.net.SocketException;
-import java.net.SocketTimeoutException;
 import java.security.Security;
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException;
-import io.reactivex.rxjava3.exceptions.UndeliverableException;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.Schedulers;
-import rxdogtag2.RxDogTag;
 
 /**
  * Will be called once when the TextSecure process is created.
@@ -135,19 +125,16 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
     super.onCreate();
 
     AppStartup.getInstance().addBlocking("security-provider", this::initializeSecurityProvider)
-                            .addBlocking("sqlcipher-init", () -> {
-                              SqlCipherLibraryLoader.load();
-                              SignalDatabase.init(this,
-                                                  DatabaseSecretProvider.getOrCreateDatabaseSecret(this),
-                                                  AttachmentSecretProvider.getInstance(this).getOrCreateAttachmentSecret());
-                            })
+                            .addBlocking("sqlcipher-init", () -> SqlCipherLibraryLoader.load(this))
                             .addBlocking("logging", () -> {
                               initializeLogging();
                               Log.i(TAG, "onCreate()");
                             })
                             .addBlocking("crash-handling", this::initializeCrashHandling)
-                            .addBlocking("rx-init", this::initializeRx)
-                            .addBlocking("event-bus", () -> EventBus.builder().logNoSubscriberMessages(false).installDefaultEventBus())
+                            .addBlocking("rx-init", () -> {
+                              RxJavaPlugins.setInitIoSchedulerHandler(schedulerSupplier -> Schedulers.from(SignalExecutors.BOUNDED_IO, true, false));
+                              RxJavaPlugins.setInitComputationSchedulerHandler(schedulerSupplier -> Schedulers.from(SignalExecutors.BOUNDED, true, false));
+                            })
                             .addBlocking("app-dependencies", this::initializeAppDependencies)
                             .addBlocking("notification-channels", () -> NotificationChannels.create(this))
                             .addBlocking("first-launch", this::initializeFirstEverAppLaunch)
@@ -170,11 +157,10 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                             })
                             .addBlocking("blob-provider", this::initializeBlobProvider)
                             .addBlocking("feature-flags", FeatureFlags::init)
-                            .addBlocking("glide", () -> SignalGlideModule.setRegisterGlideComponents(new SignalGlideComponents()))
                             .addNonBlocking(this::cleanAvatarStorage)
                             .addNonBlocking(this::initializeRevealableMessageManager)
                             .addNonBlocking(this::initializePendingRetryReceiptManager)
-                            .addNonBlocking(this::initializeFcmCheck)
+                            .addNonBlocking(this::initializeGcmCheck)
                             .addNonBlocking(this::initializeSignedPreKeyCheck)
                             .addNonBlocking(this::initializePeriodicTasks)
                             .addNonBlocking(this::initializeCircumvention)
@@ -185,15 +171,12 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
                             .addNonBlocking(StorageSyncHelper::scheduleRoutineSync)
                             .addNonBlocking(() -> ApplicationDependencies.getJobManager().beginJobLoop())
                             .addNonBlocking(EmojiSource::refresh)
-                            .addNonBlocking(() -> ApplicationDependencies.getGiphyMp4Cache().onAppStart(this))
-                            .addNonBlocking(this::ensureProfileUploaded)
                             .addPostRender(() -> RateLimitUtil.retryAllRateLimitedMessages(this))
                             .addPostRender(this::initializeExpiringMessageManager)
                             .addPostRender(() -> SignalStore.settings().setDefaultSms(Util.isDefaultSmsProvider(this)))
                             .addPostRender(() -> DownloadLatestEmojiDataJob.scheduleIfNecessary(this))
                             .addPostRender(EmojiSearchIndexDownloadJob::scheduleIfNecessary)
-                            .addPostRender(() -> SignalDatabase.messageLog().trimOldMessages(System.currentTimeMillis(), FeatureFlags.retryRespondMaxAge()))
-                            .addPostRender(() -> JumboEmoji.updateCurrentVersion(this))
+                            .addPostRender(() -> DatabaseFactory.getMessageLogDatabase(this).trimOldMessages(System.currentTimeMillis(), FeatureFlags.retryRespondMaxAge()))
                             .execute();
 
     Log.d(TAG, "onCreate() took " + (System.currentTimeMillis() - startTime) + " ms");
@@ -206,15 +189,14 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
     long startTime = System.currentTimeMillis();
     Log.i(TAG, "App is now visible.");
 
-    ApplicationDependencies.getFrameRateTracker().start();
+    ApplicationDependencies.getFrameRateTracker().begin();
     ApplicationDependencies.getMegaphoneRepository().onAppForegrounded();
-    ApplicationDependencies.getDeadlockDetector().start();
-    SubscriptionKeepAliveJob.launchSubscriberIdKeepAliveJobIfNecessary();
 
     SignalExecutors.BOUNDED.execute(() -> {
       FeatureFlags.refreshIfNecessary();
       ApplicationDependencies.getRecipientCache().warmUp();
       RetrieveProfileJob.enqueueRoutineFetchIfNecessary(this);
+      GroupV1MigrationJob.enqueueRoutineMigrationsIfNecessary(this);
       executePendingContactSync();
       KeyCachingService.onAppForegrounded(this);
       ApplicationDependencies.getShakeToReport().enable();
@@ -229,9 +211,8 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
     Log.i(TAG, "App is no longer visible.");
     KeyCachingService.onAppBackgrounded(this);
     ApplicationDependencies.getMessageNotifier().clearVisibleThread();
-    ApplicationDependencies.getFrameRateTracker().stop();
+    ApplicationDependencies.getFrameRateTracker().end();
     ApplicationDependencies.getShakeToReport().disable();
-    ApplicationDependencies.getDeadlockDetector().stop();
   }
 
   public PersistentLogger getPersistentLogger() {
@@ -275,10 +256,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
 
     SignalProtocolLoggerProvider.setProvider(new CustomSignalProtocolLogger());
 
-    SignalExecutors.UNBOUNDED.execute(() -> {
-      Log.blockUntilAllWritesFinished();
-      LogDatabase.getInstance(this).trimToSize();
-    });
+    SignalExecutors.UNBOUNDED.execute(() -> LogDatabase.getInstance(this).trimToSize());
   }
 
   private void initializeCrashHandling() {
@@ -286,30 +264,6 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
     Thread.setDefaultUncaughtExceptionHandler(new SignalUncaughtExceptionHandler(originalHandler));
   }
 
-  private void initializeRx() {
-    RxDogTag.install();
-    RxJavaPlugins.setInitIoSchedulerHandler(schedulerSupplier -> Schedulers.from(SignalExecutors.BOUNDED_IO, true, false));
-    RxJavaPlugins.setInitComputationSchedulerHandler(schedulerSupplier -> Schedulers.from(SignalExecutors.BOUNDED, true, false));
-    RxJavaPlugins.setErrorHandler(e -> {
-      boolean wasWrapped = false;
-      while ((e instanceof UndeliverableException || e instanceof AssertionError || e instanceof OnErrorNotImplementedException) && e.getCause() != null) {
-        wasWrapped = true;
-        e = e.getCause();
-      }
-
-      if (wasWrapped && (e instanceof SocketException || e instanceof SocketTimeoutException || e instanceof InterruptedException)) {
-        return;
-      }
-
-      Thread.UncaughtExceptionHandler uncaughtExceptionHandler = Thread.currentThread().getUncaughtExceptionHandler();
-      if (uncaughtExceptionHandler == null) {
-        uncaughtExceptionHandler = Thread.getDefaultUncaughtExceptionHandler();
-      }
-
-      uncaughtExceptionHandler.uncaughtException(Thread.currentThread(), e);
-    });
-  }
-
   private void initializeApplicationMigrations() {
     ApplicationMigrations.onApplicationCreate(this, ApplicationDependencies.getJobManager());
   }
@@ -324,7 +278,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
 
   private void initializeFirstEverAppLaunch() {
     if (TextSecurePreferences.getFirstInstallVersion(this) == -1) {
-      if (!SignalDatabase.databaseFileExists(this) || VersionTracker.getDaysSinceFirstInstalled(this) < 365) {
+      if (!SQLCipherOpenHelper.databaseFileExists(this) || VersionTracker.getDaysSinceFirstInstalled(this) < 365) {
         Log.i(TAG, "First ever app launch!");
         AppInitialization.onFirstEverAppLaunch(this);
       }
@@ -340,11 +294,11 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
     }
   }
 
-  private void initializeFcmCheck() {
-    if (SignalStore.account().isRegistered()) {
-      long nextSetTime = SignalStore.account().getFcmTokenLastSetTime() + TimeUnit.HOURS.toMillis(6);
+  private void initializeGcmCheck() {
+    if (TextSecurePreferences.isPushRegistered(this)) {
+      long nextSetTime = TextSecurePreferences.getFcmTokenLastSetTime(this) + TimeUnit.HOURS.toMillis(6);
 
-      if (SignalStore.account().getFcmToken() == null || nextSetTime <= System.currentTimeMillis()) {
+      if (TextSecurePreferences.getFcmToken(this) == null || nextSetTime <= System.currentTimeMillis()) {
         ApplicationDependencies.getJobManager().add(new FcmRefreshJob());
       }
     }
@@ -382,6 +336,14 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
 
   private void initializeRingRtc() {
     try {
+      if (RtcDeviceLists.hardwareAECBlocked()) {
+        WebRtcAudioUtils.setWebRtcBasedAcousticEchoCanceler(true);
+      }
+
+      if (!RtcDeviceLists.openSLESAllowed()) {
+        WebRtcAudioManager.setBlacklistDeviceForOpenSLESUsage(true);
+      }
+
       CallManager.initialize(this, new RingRtcLogger());
     } catch (UnsatisfiedLinkError e) {
       throw new AssertionError("Unable to load ringrtc library", e);
@@ -390,7 +352,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
 
   @WorkerThread
   private void initializeCircumvention() {
-    if (ApplicationDependencies.getSignalServiceNetworkAccess().isCensored()) {
+    if (new SignalServiceNetworkAccess(ApplicationContext.this).isCensored(ApplicationContext.this)) {
       try {
         ProviderInstaller.installIfNeeded(ApplicationContext.this);
       } catch (Throwable t) {
@@ -399,13 +361,6 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
     }
   }
 
-  private void ensureProfileUploaded() {
-    if (SignalStore.account().isRegistered() && !SignalStore.registrationValues().hasUploadedProfile() && !Recipient.self().getProfileName().isEmpty()) {
-      Log.w(TAG, "User has a profile, but has not uploaded one. Uploading now.");
-      ApplicationDependencies.getJobManager().add(new ProfileUploadJob());
-    }
-  }
-
   private void executePendingContactSync() {
     if (TextSecurePreferences.needsFullContactSync(this)) {
       ApplicationDependencies.getJobManager().add(new MultiDeviceContactUpdateJob(true));
@@ -436,7 +391,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
 
   @WorkerThread
   private void initializeCleanup() {
-    int deleted = SignalDatabase.attachments().deleteAbandonedPreuploadedAttachments();
+    int deleted = DatabaseFactory.getAttachmentDatabase(this).deleteAbandonedPreuploadedAttachments();
     Log.i(TAG, "Deleted " + deleted + " abandoned attachments.");
   }
 

app/src/main/java/org/thoughtcrime/securesms/BaseActivity.java

@@ -86,8 +86,7 @@ public abstract class BaseActivity extends AppCompatActivity {
     int           appCompatNightMode = getDelegate().getLocalNightMode() != AppCompatDelegate.MODE_NIGHT_UNSPECIFIED ? getDelegate().getLocalNightMode()
                                                                                                                      : AppCompatDelegate.getDefaultNightMode();
 
-    configuration.uiMode      = (configuration.uiMode & ~Configuration.UI_MODE_NIGHT_MASK) | mapNightModeToConfigurationUiMode(newBase, appCompatNightMode);
-    configuration.orientation = Configuration.ORIENTATION_UNDEFINED;
+    configuration.uiMode = (configuration.uiMode & ~Configuration.UI_MODE_NIGHT_MASK) | mapNightModeToConfigurationUiMode(newBase, appCompatNightMode);
 
     applyOverrideConfiguration(configuration);
   }

app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java

@@ -1,6 +1,8 @@
 package org.thoughtcrime.securesms;
 
+import android.graphics.Point;
 import android.net.Uri;
+import android.view.MotionEvent;
 import android.view.View;
 
 import androidx.annotation.NonNull;
@@ -10,6 +12,7 @@ import androidx.lifecycle.Observer;
 
 import org.thoughtcrime.securesms.components.voice.VoiceNotePlaybackState;
 import org.thoughtcrime.securesms.contactshare.Contact;
+import org.thoughtcrime.securesms.conversation.ConversationItem;
 import org.thoughtcrime.securesms.conversation.ConversationMessage;
 import org.thoughtcrime.securesms.conversation.colors.Colorizable;
 import org.thoughtcrime.securesms.conversation.colors.Colorizer;
@@ -26,6 +29,7 @@ import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.stickers.StickerLocator;
+import org.thoughtcrime.securesms.video.exo.AttachmentMediaSourceFactory;
 import org.whispersystems.libsignal.util.guava.Optional;
 
 import java.util.List;
@@ -45,10 +49,11 @@ public interface BindableConversationItem extends Unbindable, GiphyMp4Playable,
             boolean pulseMention,
             boolean hasWallpaper,
             boolean isMessageRequestAccepted,
+            @NonNull AttachmentMediaSourceFactory attachmentMediaSourceFactory,
             boolean canPlayInline,
             @NonNull Colorizer colorizer);
 
-  @NonNull ConversationMessage getConversationMessage();
+  ConversationMessage getConversationMessage();
 
   void setEventListener(@Nullable EventListener listener);
 
@@ -56,10 +61,6 @@ public interface BindableConversationItem extends Unbindable, GiphyMp4Playable,
     // Intentionally Blank.
   }
 
-  default void updateContactNameColor() {
-    // Intentionally Blank.
-  }
-
   interface EventListener {
     void onQuoteClicked(MmsMessageRecord messageRecord);
     void onLinkPreviewClicked(@NonNull LinkPreview linkPreview);
@@ -70,7 +71,7 @@ public interface BindableConversationItem extends Unbindable, GiphyMp4Playable,
     void onAddToContactsClicked(@NonNull Contact contact);
     void onMessageSharedContactClicked(@NonNull List<Recipient> choices);
     void onInviteSharedContactClicked(@NonNull List<Recipient> choices);
-    void onReactionClicked(@NonNull MultiselectPart multiselectPart, long messageId, boolean isMms);
+    void onReactionClicked(@NonNull View reactionTarget, long messageId, boolean isMms);
     void onGroupMemberClicked(@NonNull RecipientId recipientId, @NonNull GroupId groupId);
     void onMessageWithErrorClicked(@NonNull MessageRecord messageRecord);
     void onMessageWithRecaptchaNeededClicked(@NonNull MessageRecord messageRecord);
@@ -91,7 +92,6 @@ public interface BindableConversationItem extends Unbindable, GiphyMp4Playable,
     void onPlayInlineContent(ConversationMessage conversationMessage);
     void onInMemoryMessageClicked(@NonNull InMemoryMessageRecord messageRecord);
     void onViewGroupDescriptionChange(@Nullable GroupId groupId, @NonNull String description, boolean isMessageRequestAccepted);
-    void onChangeNumberUpdateContact(@NonNull Recipient recipient);
 
     /** @return true if handled, false if you want to let the normal url handling continue */
     boolean onUrlClicked(@NonNull String url);

app/src/main/java/org/thoughtcrime/securesms/BindableConversationListItem.java

@@ -2,8 +2,6 @@ package org.thoughtcrime.securesms;
 
 import androidx.annotation.NonNull;
 
-import org.thoughtcrime.securesms.conversationlist.model.Conversation;
-import org.thoughtcrime.securesms.conversationlist.model.ConversationSet;
 import org.thoughtcrime.securesms.database.model.ThreadRecord;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 
@@ -15,8 +13,8 @@ public interface BindableConversationListItem extends Unbindable {
   void bind(@NonNull ThreadRecord thread,
             @NonNull GlideRequests glideRequests, @NonNull Locale locale,
             @NonNull Set<Long> typingThreads,
-            @NonNull ConversationSet selectedConversations);
+            @NonNull Set<Long> selectedThreads, boolean batchMode);
 
-  void setSelectedConversations(@NonNull ConversationSet conversations);
+  void setBatchMode(boolean batchMode);
   void updateTypingIndicator(@NonNull Set<Long> typingThreads);
 }

app/src/main/java/org/thoughtcrime/securesms/BlockUnblockDialog.java

@@ -11,7 +11,7 @@ import androidx.lifecycle.Lifecycle;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
-import org.thoughtcrime.securesms.database.SignalDatabase;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
 
@@ -65,7 +65,7 @@ public final class BlockUnblockDialog {
     Resources           resources = context.getResources();
 
     if (recipient.isGroup()) {
-      if (SignalDatabase.groups().isActive(recipient.requireGroupId())) {
+      if (DatabaseFactory.getGroupDatabase(context).isActive(recipient.requireGroupId())) {
         builder.setTitle(resources.getString(R.string.BlockUnblockDialog_block_and_leave_s, recipient.getDisplayName(context)));
         builder.setMessage(R.string.BlockUnblockDialog_you_will_no_longer_receive_messages_or_updates);
         builder.setPositiveButton(R.string.BlockUnblockDialog_block_and_leave, ((dialog, which) -> onBlock.run()));
@@ -104,7 +104,7 @@ public final class BlockUnblockDialog {
     Resources           resources = context.getResources();
 
     if (recipient.isGroup()) {
-      if (SignalDatabase.groups().isActive(recipient.requireGroupId())) {
+      if (DatabaseFactory.getGroupDatabase(context).isActive(recipient.requireGroupId())) {
         builder.setTitle(resources.getString(R.string.BlockUnblockDialog_unblock_s, recipient.getDisplayName(context)));
         builder.setMessage(R.string.BlockUnblockDialog_group_members_will_be_able_to_add_you);
         builder.setPositiveButton(R.string.RecipientPreferenceActivity_unblock, ((dialog, which) -> onUnblock.run()));

app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java

@@ -26,6 +26,7 @@ import android.database.Cursor;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -571,7 +572,7 @@ public final class ContactSelectionListFragment extends LoggingFragment
           AlertDialog loadingDialog = SimpleProgressDialog.show(requireContext());
 
           SimpleTask.run(getViewLifecycleOwner().getLifecycle(), () -> {
-            return UsernameUtil.fetchAciForUsername(requireContext(), contact.getNumber());
+            return UsernameUtil.fetchUuidForUsername(requireContext(), contact.getNumber());
           }, uuid -> {
             loadingDialog.dismiss();
             if (uuid.isPresent()) {
@@ -765,8 +766,8 @@ public final class ContactSelectionListFragment extends LoggingFragment
 
   public interface OnContactSelectedListener {
     /** Provides an opportunity to disallow selecting an item. Call the callback with false to disallow, or true to allow it. */
-    void onBeforeContactSelected(Optional<RecipientId> recipientId, @Nullable String number, Consumer<Boolean> callback);
-    void onContactDeselected(Optional<RecipientId> recipientId, @Nullable String number);
+    void onBeforeContactSelected(Optional<RecipientId> recipientId, String number, Consumer<Boolean> callback);
+    void onContactDeselected(Optional<RecipientId> recipientId, String number);
     void onSelectionChanged();
   }
 

app/src/main/java/org/thoughtcrime/securesms/DeviceActivity.java

@@ -120,7 +120,7 @@ public class DeviceActivity extends PassphraseRequiredActivity
   }
 
   @Override
-  public void onQrDataFound(@NonNull final String data) {
+  public void onQrDataFound(final String data) {
     ThreadUtil.runOnMain(() -> {
       ((Vibrator)getSystemService(Context.VIBRATOR_SERVICE)).vibrate(50);
       Uri uri = Uri.parse(data);
@@ -191,6 +191,7 @@ public class DeviceActivity extends PassphraseRequiredActivity
           Optional<byte[]> profileKey        = Optional.of(ProfileKeyUtil.getProfileKey(getContext()));
 
           TextSecurePreferences.setMultiDevice(DeviceActivity.this, true);
+          TextSecurePreferences.setIsUnidentifiedDeliveryEnabled(context, false);
           accountManager.addDevice(ephemeralId, publicKey, identityKeyPair, profileKey, verificationCode);
 
           return SUCCESS;

app/src/main/java/org/thoughtcrime/securesms/GroupMembersDialog.java

@@ -35,7 +35,6 @@ public final class GroupMembersDialog {
                                         .show();
 
     GroupMemberListView memberListView = dialog.findViewById(R.id.list_members);
-    memberListView.initializeAdapter(fragmentActivity);
 
     LiveGroup                                   liveGroup   = new LiveGroup(groupRecipient.requireGroupId());
     LiveData<List<GroupMemberEntry.FullMember>> fullMembers = liveGroup.getFullMembers();

app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java

@@ -24,7 +24,7 @@ import org.thoughtcrime.securesms.components.ContactFilterView;
 import org.thoughtcrime.securesms.components.ContactFilterView.OnFilterChangedListener;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
 import org.thoughtcrime.securesms.contacts.SelectedContact;
-import org.thoughtcrime.securesms.database.SignalDatabase;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.groups.SelectionLimits;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
@@ -255,7 +255,7 @@ public class InviteActivity extends PassphraseRequiredActivity implements Contac
         MessageSender.send(context, new OutgoingTextMessage(recipient, message, subscriptionId), -1L, true, null, null);
 
         if (recipient.getContactUri() != null) {
-          SignalDatabase.recipients().setHasSentInvite(recipient.getId());
+          DatabaseFactory.getRecipientDatabase(context).setHasSentInvite(recipient.getId());
         }
       }
 

app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java

@@ -73,7 +73,6 @@ import org.thoughtcrime.securesms.sharing.ShareActivity;
 import org.thoughtcrime.securesms.util.AttachmentUtil;
 import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.FullscreenHelper;
-import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.SaveAttachmentTask;
 import org.thoughtcrime.securesms.util.SaveAttachmentTask.Attachment;
 import org.thoughtcrime.securesms.util.StorageUtil;
@@ -535,7 +534,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
   }
 
   public static boolean isContentTypeSupported(final String contentType) {
-    return MediaUtil.isImageType(contentType) || MediaUtil.isVideoType(contentType);
+    return contentType != null && (contentType.startsWith("image/") || contentType.startsWith("video/"));
   }
 
   @Override
@@ -569,11 +568,26 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
       if (item == 0) {
         viewPagerListener.onPageSelected(0);
       }
+
+      cursor.registerContentObserver(new ContentObserver(new Handler(getMainLooper())) {
+        @Override
+        public void onChange(boolean selfChange) {
+          onMediaChange();
+        }
+      });
     } else {
       mediaNotAvailable();
     }
   }
 
+  private void onMediaChange() {
+    MediaItemAdapter adapter = (MediaItemAdapter) mediaPager.getAdapter();
+
+    if (adapter != null) {
+      adapter.checkMedia(mediaPager.getCurrentItem());
+    }
+  }
+
   @Override
   public void onLoaderReset(@NonNull Loader<Pair<Cursor, Integer>> loader) {
 
@@ -601,10 +615,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
 
       if (adapter != null) {
         MediaItem item = adapter.getMediaItemFor(position);
-        if (item != null && item.recipient != null) {
-          item.recipient.live().observe(MediaPreviewActivity.this, r -> initializeActionBar());
-        }
-
+        if (item.recipient != null) item.recipient.live().observe(MediaPreviewActivity.this, r -> initializeActionBar());
         viewModel.setActiveAlbumRailItem(MediaPreviewActivity.this, position);
         initializeActionBar();
       }
@@ -617,9 +628,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
 
       if (adapter != null) {
         MediaItem item = adapter.getMediaItemFor(position);
-        if (item != null && item.recipient != null) {
-          item.recipient.live().removeObservers(MediaPreviewActivity.this);
-        }
+        if (item.recipient != null) item.recipient.live().removeObservers(MediaPreviewActivity.this);
 
         adapter.pause(position);
       }
@@ -669,7 +678,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
     }
 
     @Override
-    public @Nullable MediaItem getMediaItemFor(int position) {
+    public MediaItem getMediaItemFor(int position) {
       return new MediaItem(null, null, null, uri, mediaType, -1, true);
     }
 
@@ -692,6 +701,11 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
     public boolean hasFragmentFor(int position) {
       return mediaPreviewFragment != null;
     }
+
+    @Override
+    public void checkMedia(int currentItem) {
+
+    }
   }
 
   private static void anchorMarginsToBottomInsets(@NonNull View viewToAnchor) {
@@ -775,15 +789,8 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
       super.destroyItem(container, position, object);
     }
 
-    public @Nullable MediaItem getMediaItemFor(int position) {
-      int cursorPosition = getCursorPosition(position);
-
-      if (cursor.isClosed() || cursorPosition < 0) {
-        Log.w(TAG, "Invalid cursor state! Closed: " + cursor.isClosed() + " Position: " + cursorPosition);
-        return null;
-      }
-
-      cursor.moveToPosition(cursorPosition);
+    public MediaItem getMediaItemFor(int position) {
+      cursor.moveToPosition(getCursorPosition(position));
 
       MediaRecord        mediaRecord       = MediaRecord.from(context, cursor);
       DatabaseAttachment attachment        = Objects.requireNonNull(mediaRecord.getAttachment());
@@ -817,6 +824,14 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
       return mediaFragments.containsKey(position);
     }
 
+    @Override
+    public void checkMedia(int position) {
+      MediaPreviewFragment fragment = mediaFragments.get(position);
+      if (fragment != null) {
+        fragment.checkMediaStillAvailable();
+      }
+    }
+
     private int getCursorPosition(int position) {
       if (leftIsRecent) return position;
       else              return cursor.getCount() - 1 - position;
@@ -851,9 +866,10 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
   }
 
   interface MediaItemAdapter {
-    @Nullable MediaItem getMediaItemFor(int position);
+    MediaItem getMediaItemFor(int position);
     void pause(int position);
     @Nullable View getPlaybackControls(int position);
     boolean hasFragmentFor(int position);
+    void checkMedia(int currentItem);
   }
 }

app/src/main/java/org/thoughtcrime/securesms/MuteDialog.java

@@ -33,19 +33,22 @@ public class MuteDialog extends AlertDialog {
   public static void show(final Context context, final @NonNull MuteSelectionListener listener, @Nullable Runnable cancelListener) {
     AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context);
     builder.setTitle(R.string.MuteDialog_mute_notifications);
-    builder.setItems(R.array.mute_durations, (dialog, which) -> {
-      final long muteUntil;
+    builder.setItems(R.array.mute_durations, new DialogInterface.OnClickListener() {
+      @Override
+      public void onClick(DialogInterface dialog, final int which) {
+        final long muteUntil;
 
-      switch (which) {
-        case 0:  muteUntil = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(1);  break;
-        case 1:  muteUntil = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(8);  break;
-        case 2:  muteUntil = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(1);   break;
-        case 3:  muteUntil = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(7);   break;
-        case 4:  muteUntil = Long.MAX_VALUE;                                           break;
-        default: muteUntil = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(1);  break;
+        switch (which) {
+          case 0:  muteUntil = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(1);  break;
+          case 1:  muteUntil = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(8);  break;
+          case 2:  muteUntil = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(1);   break;
+          case 3:  muteUntil = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(7);   break;
+          case 4:  muteUntil = Long.MAX_VALUE;                                           break;
+          default: muteUntil = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(1);  break;
+        }
+
+        listener.onMuted(muteUntil);
       }
-
-      listener.onMuted(muteUntil);
     });
 
     if (cancelListener != null) {

app/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java

@@ -26,12 +26,12 @@ import androidx.appcompat.app.AlertDialog;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper;
 import org.thoughtcrime.securesms.conversation.ConversationIntents;
-import org.thoughtcrime.securesms.database.SignalDatabase;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.groups.ui.creategroup.CreateGroupActivity;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
 import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
 import org.whispersystems.libsignal.util.guava.Optional;
@@ -67,7 +67,7 @@ public class NewConversationActivity extends ContactSelectionActivity
     } else {
       Log.i(TAG, "[onContactSelected] Maybe creating a new recipient.");
 
-      if (SignalStore.account().isRegistered() && NetworkConstraint.isMet(this)) {
+      if (TextSecurePreferences.isPushRegistered(this) && NetworkConstraint.isMet(this)) {
         Log.i(TAG, "[onContactSelected] Doing contact refresh.");
 
         AlertDialog progress = SimpleProgressDialog.show(this);
@@ -75,7 +75,7 @@ public class NewConversationActivity extends ContactSelectionActivity
         SimpleTask.run(getLifecycle(), () -> {
           Recipient resolved = Recipient.external(this, number);
 
-          if (!resolved.isRegistered() || !resolved.hasAci()) {
+          if (!resolved.isRegistered() || !resolved.hasUuid()) {
             Log.i(TAG, "[onContactSelected] Not registered or no UUID. Doing a directory refresh.");
             try {
               DirectoryHelper.refreshDirectoryFor(this, resolved, false);
@@ -103,7 +103,7 @@ public class NewConversationActivity extends ContactSelectionActivity
   }
 
   private void launch(Recipient recipient) {
-    long   existingThread = SignalDatabase.threads().getThreadIdIfExistsFor(recipient.getId());
+    long   existingThread = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(recipient.getId());
     Intent intent         = ConversationIntents.createBuilder(this, recipient.getId(), existingThread)
                                                .withDraftText(getIntent().getStringExtra(Intent.EXTRA_TEXT))
                                                .withDataUri(getIntent().getData())

app/src/main/java/org/thoughtcrime/securesms/OverlayTransformation.kt

@@ -1,40 +0,0 @@
-package org.thoughtcrime.securesms
-
-import android.graphics.Bitmap
-import android.graphics.Canvas
-import androidx.annotation.ColorInt
-import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool
-import com.bumptech.glide.load.resource.bitmap.BitmapTransformation
-import java.security.MessageDigest
-
-/**
- * BitmapTransformation which overlays the given bitmap with the given color.
- */
-class OverlayTransformation(
-  @ColorInt private val color: Int
-) : BitmapTransformation() {
-
-  private val id = "${OverlayTransformation::class.java.name}$color"
-
-  override fun updateDiskCacheKey(messageDigest: MessageDigest) {
-    messageDigest.update(id.toByteArray(CHARSET))
-  }
-
-  override fun transform(pool: BitmapPool, toTransform: Bitmap, outWidth: Int, outHeight: Int): Bitmap {
-    val outBitmap = pool.get(outWidth, outHeight, Bitmap.Config.ARGB_8888)
-    val canvas = Canvas(outBitmap)
-
-    canvas.drawBitmap(toTransform, 0f, 0f, null)
-    canvas.drawColor(color)
-
-    return outBitmap
-  }
-
-  override fun equals(other: Any?): Boolean {
-    return (other as? OverlayTransformation)?.color == color
-  }
-
-  override fun hashCode(): Int {
-    return id.hashCode()
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java

@@ -15,7 +15,6 @@ import org.greenrobot.eventbus.EventBus;
 import org.signal.core.util.logging.Log;
 import org.signal.core.util.tracing.Tracer;
 import org.signal.devicetransfer.TransferStatus;
-import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberLockActivity;
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.devicetransfer.olddevice.OldDeviceTransferActivity;
@@ -51,7 +50,6 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
   private static final int STATE_CREATE_SIGNAL_PIN   = 7;
   private static final int STATE_TRANSFER_ONGOING    = 8;
   private static final int STATE_TRANSFER_LOCKED     = 9;
-  private static final int STATE_CHANGE_NUMBER_LOCK  = 10;
 
   private SignalServiceNetworkAccess networkAccess;
   private BroadcastReceiver          clearKeyReceiver;
@@ -60,7 +58,7 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
   protected final void onCreate(Bundle savedInstanceState) {
     Tracer.getInstance().start(Log.tag(getClass()) + "#onCreate()");
     AppStartup.getInstance().onCriticalRenderEventStart();
-    this.networkAccess = ApplicationDependencies.getSignalServiceNetworkAccess();
+    this.networkAccess = new SignalServiceNetworkAccess(this);
     onPreCreate();
 
     final boolean locked = KeyCachingService.isLocked(this);
@@ -84,7 +82,7 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
   protected void onResume() {
     super.onResume();
 
-    if (networkAccess.isCensored()) {
+    if (networkAccess.isCensored(this)) {
       ApplicationDependencies.getJobManager().add(new PushNotificationReceiveJob());
     }
   }
@@ -155,7 +153,6 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
       case STATE_CREATE_PROFILE_NAME: return getCreateProfileNameIntent();
       case STATE_TRANSFER_ONGOING:    return getOldDeviceTransferIntent();
       case STATE_TRANSFER_LOCKED:     return getOldDeviceTransferLockedIntent();
-      case STATE_CHANGE_NUMBER_LOCK:  return getChangeNumberLockIntent();
       default:                        return null;
     }
   }
@@ -179,8 +176,6 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
       return STATE_TRANSFER_ONGOING;
     } else if (SignalStore.misc().isOldDeviceTransferLocked()) {
       return STATE_TRANSFER_LOCKED;
-    } else if (SignalStore.misc().isChangeNumberLocked() && getClass() != ChangeNumberLockActivity.class) {
-      return STATE_CHANGE_NUMBER_LOCK;
     } else {
       return STATE_NORMAL;
     }
@@ -248,10 +243,6 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
     return MainActivity.clearTop(this);
   }
 
-  private Intent getChangeNumberLockIntent() {
-    return ChangeNumberLockActivity.createIntent(this);
-  }
-
   private Intent getRoutedIntent(Class<?> destination, @Nullable Intent nextIntent) {
     final Intent intent = new Intent(this, destination);
     if (nextIntent != null)   intent.putExtra("next_intent", nextIntent);

app/src/main/java/org/thoughtcrime/securesms/RtcDeviceLists.java

@@ -0,0 +1,48 @@
+package org.thoughtcrime.securesms;
+
+import android.os.Build;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Device hardware capability lists.
+ * <p>
+ * Moved outside of ApplicationContext as the indirection was important for API19 support with desugaring: https://issuetracker.google.com/issues/183419297
+ */
+final class RtcDeviceLists {
+
+  private RtcDeviceLists() {}
+
+  static Set<String> hardwareAECBlockList() {
+    return new HashSet<String>() {{
+      add("Pixel");
+      add("Pixel XL");
+      add("Moto G5");
+      add("Moto G (5S) Plus");
+      add("Moto G4");
+      add("TA-1053");
+      add("Mi A1");
+      add("Mi A2");
+      add("E5823"); // Sony z5 compact
+      add("Redmi Note 5");
+      add("FP2"); // Fairphone FP2
+      add("MI 5");
+    }};
+  }
+
+  static Set<String> openSlEsAllowList() {
+    return new HashSet<String>() {{
+      add("Pixel");
+      add("Pixel XL");
+    }};
+  }
+
+  static boolean hardwareAECBlocked() {
+    return hardwareAECBlockList().contains(Build.MODEL);
+  }
+
+  static boolean openSLESAllowed() {
+    return openSlEsAllowList().contains(Build.MODEL);
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/SmsSendtoActivity.java

@@ -12,7 +12,7 @@ import androidx.annotation.NonNull;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.conversation.ConversationIntents;
-import org.thoughtcrime.securesms.database.SignalDatabase;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.Rfc5724Uri;
 
@@ -48,7 +48,7 @@ public class SmsSendtoActivity extends Activity {
       Toast.makeText(this, R.string.ConversationActivity_specify_recipient, Toast.LENGTH_LONG).show();
     } else {
       Recipient recipient = Recipient.external(this, destination.getDestination());
-      long      threadId  = SignalDatabase.threads().getThreadIdIfExistsFor(recipient.getId());
+      long      threadId  = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(recipient.getId());
 
       nextIntent = ConversationIntents.createBuilder(this, recipient.getId(), threadId)
                                       .withDraftText(destination.getBody())

app/src/main/java/org/thoughtcrime/securesms/VerifyIdentityActivity.java

@@ -0,0 +1,689 @@
+/*
+ * Copyright (C) 2016-2017 Open Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.thoughtcrime.securesms;
+
+import android.Manifest;
+import android.animation.TypeEvaluator;
+import android.animation.ValueAnimator;
+import android.annotation.SuppressLint;
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.BitmapDrawable;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.Vibrator;
+import android.text.Html;
+import android.text.TextUtils;
+import android.text.method.LinkMovementMethod;
+import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.view.animation.AnticipateInterpolator;
+import android.view.animation.OvershootInterpolator;
+import android.view.animation.ScaleAnimation;
+import android.widget.CompoundButton;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.SwitchCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+
+import org.signal.core.util.ThreadUtil;
+import org.signal.core.util.concurrent.SignalExecutors;
+import org.signal.core.util.logging.Log;
+import org.thoughtcrime.securesms.components.camera.CameraView;
+import org.thoughtcrime.securesms.crypto.ReentrantSessionLock;
+import org.thoughtcrime.securesms.crypto.IdentityKeyParcelable;
+import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.IdentityDatabase;
+import org.thoughtcrime.securesms.database.IdentityDatabase.VerifiedStatus;
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.jobs.MultiDeviceVerifiedUpdateJob;
+import org.thoughtcrime.securesms.permissions.Permissions;
+import org.thoughtcrime.securesms.qr.QrCode;
+import org.thoughtcrime.securesms.qr.ScanListener;
+import org.thoughtcrime.securesms.qr.ScanningThread;
+import org.thoughtcrime.securesms.recipients.LiveRecipient;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.storage.StorageSyncHelper;
+import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.IdentityUtil;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.util.ViewUtil;
+import org.whispersystems.libsignal.IdentityKey;
+import org.whispersystems.libsignal.fingerprint.Fingerprint;
+import org.whispersystems.libsignal.fingerprint.FingerprintVersionMismatchException;
+import org.whispersystems.libsignal.fingerprint.NumericFingerprintGenerator;
+import org.whispersystems.signalservice.api.SignalSessionLock;
+import org.whispersystems.signalservice.api.util.UuidUtil;
+
+import java.nio.charset.Charset;
+import java.util.Locale;
+
+/**
+ * Activity for verifying identity keys.
+ *
+ * @author Moxie Marlinspike
+ */
+@SuppressLint("StaticFieldLeak")
+public class VerifyIdentityActivity extends PassphraseRequiredActivity implements ScanListener, View.OnClickListener {
+
+  private static final String TAG = Log.tag(VerifyIdentityActivity.class);
+
+  private static final String RECIPIENT_EXTRA = "recipient_id";
+  private static final String IDENTITY_EXTRA  = "recipient_identity";
+  private static final String VERIFIED_EXTRA  = "verified_state";
+
+  private final DynamicTheme dynamicTheme = new DynamicTheme();
+
+  private final VerifyDisplayFragment displayFragment = new VerifyDisplayFragment();
+  private final VerifyScanFragment    scanFragment    = new VerifyScanFragment();
+
+  public static Intent newIntent(@NonNull Context context,
+                                 @NonNull IdentityDatabase.IdentityRecord identityRecord)
+  {
+    return newIntent(context,
+                     identityRecord.getRecipientId(),
+                     identityRecord.getIdentityKey(),
+                     identityRecord.getVerifiedStatus() == IdentityDatabase.VerifiedStatus.VERIFIED);
+  }
+
+  public static Intent newIntent(@NonNull Context context,
+                                 @NonNull IdentityDatabase.IdentityRecord identityRecord,
+                                 boolean verified)
+  {
+    return newIntent(context,
+                     identityRecord.getRecipientId(),
+                     identityRecord.getIdentityKey(),
+                     verified);
+  }
+
+  public static Intent newIntent(@NonNull Context context,
+                                 @NonNull RecipientId recipientId,
+                                 @NonNull IdentityKey identityKey,
+                                 boolean verified)
+  {
+    Intent intent = new Intent(context, VerifyIdentityActivity.class);
+
+    intent.putExtra(RECIPIENT_EXTRA, recipientId);
+    intent.putExtra(IDENTITY_EXTRA, new IdentityKeyParcelable(identityKey));
+    intent.putExtra(VERIFIED_EXTRA, verified);
+
+    return intent;
+  }
+
+  @Override
+  public void onPreCreate() {
+    dynamicTheme.onCreate(this);
+  }
+
+  @Override
+  protected void onCreate(Bundle state, boolean ready) {
+    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+    getSupportActionBar().setTitle(R.string.AndroidManifest__verify_safety_number);
+
+    Bundle extras = new Bundle();
+    extras.putParcelable(VerifyDisplayFragment.RECIPIENT_ID, getIntent().getParcelableExtra(RECIPIENT_EXTRA));
+    extras.putParcelable(VerifyDisplayFragment.REMOTE_IDENTITY, getIntent().getParcelableExtra(IDENTITY_EXTRA));
+    extras.putParcelable(VerifyDisplayFragment.LOCAL_IDENTITY, new IdentityKeyParcelable(IdentityKeyUtil.getIdentityKey(this)));
+    extras.putString(VerifyDisplayFragment.LOCAL_NUMBER, TextSecurePreferences.getLocalNumber(this));
+    extras.putBoolean(VerifyDisplayFragment.VERIFIED_STATE, getIntent().getBooleanExtra(VERIFIED_EXTRA, false));
+
+    scanFragment.setScanListener(this);
+    displayFragment.setClickListener(this);
+
+    initFragment(android.R.id.content, displayFragment, Locale.getDefault(), extras);
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    switch (item.getItemId()) {
+      case android.R.id.home: finish(); return true;
+    }
+
+    return false;
+  }
+
+  @Override
+  public void onQrDataFound(final String data) {
+    ThreadUtil.runOnMain(() -> {
+      ((Vibrator)getSystemService(Context.VIBRATOR_SERVICE)).vibrate(50);
+
+      getSupportFragmentManager().popBackStack();
+      displayFragment.setScannedFingerprint(data);
+    });
+  }
+
+  @Override
+  public void onClick(View v) {
+    Permissions.with(this)
+               .request(Manifest.permission.CAMERA)
+               .ifNecessary()
+               .withPermanentDenialDialog(getString(R.string.VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied))
+               .onAllGranted(() -> {
+                 FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+                 transaction.setCustomAnimations(R.anim.slide_from_top, R.anim.slide_to_bottom,
+                                                 R.anim.slide_from_bottom, R.anim.slide_to_top);
+
+                 transaction.replace(android.R.id.content, scanFragment)
+                            .addToBackStack(null)
+                            .commitAllowingStateLoss();
+               })
+               .onAnyDenied(() -> Toast.makeText(this, R.string.VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission, Toast.LENGTH_LONG).show())
+               .execute();
+  }
+
+  @SuppressLint("MissingSuperCall")
+  @Override
+  public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+    Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
+  }
+
+  public static class VerifyDisplayFragment extends Fragment implements CompoundButton.OnCheckedChangeListener {
+
+    public static final String RECIPIENT_ID    = "recipient_id";
+    public static final String REMOTE_NUMBER   = "remote_number";
+    public static final String REMOTE_IDENTITY = "remote_identity";
+    public static final String LOCAL_IDENTITY  = "local_identity";
+    public static final String LOCAL_NUMBER    = "local_number";
+    public static final String VERIFIED_STATE  = "verified_state";
+
+    private LiveRecipient recipient;
+    private IdentityKey   localIdentity;
+    private IdentityKey   remoteIdentity;
+    private Fingerprint   fingerprint;
+
+    private View                 container;
+    private View                 numbersContainer;
+    private ImageView            qrCode;
+    private ImageView            qrVerified;
+    private TextView             tapLabel;
+    private TextView             description;
+    private View.OnClickListener clickListener;
+    private SwitchCompat         verified;
+
+    private TextView[] codes                = new TextView[12];
+    private boolean    animateSuccessOnDraw = false;
+    private boolean    animateFailureOnDraw = false;
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup viewGroup, Bundle bundle) {
+      this.container        = ViewUtil.inflate(inflater, viewGroup, R.layout.verify_display_fragment);
+      this.numbersContainer = container.findViewById(R.id.number_table);
+      this.qrCode           = container.findViewById(R.id.qr_code);
+      this.verified         = container.findViewById(R.id.verified_switch);
+      this.qrVerified       = container.findViewById(R.id.qr_verified);
+      this.description      = container.findViewById(R.id.description);
+      this.tapLabel         = container.findViewById(R.id.tap_label);
+      this.codes[0]         = container.findViewById(R.id.code_first);
+      this.codes[1]         = container.findViewById(R.id.code_second);
+      this.codes[2]         = container.findViewById(R.id.code_third);
+      this.codes[3]         = container.findViewById(R.id.code_fourth);
+      this.codes[4]         = container.findViewById(R.id.code_fifth);
+      this.codes[5]         = container.findViewById(R.id.code_sixth);
+      this.codes[6]         = container.findViewById(R.id.code_seventh);
+      this.codes[7]         = container.findViewById(R.id.code_eighth);
+      this.codes[8]         = container.findViewById(R.id.code_ninth);
+      this.codes[9]         = container.findViewById(R.id.code_tenth);
+      this.codes[10]        = container.findViewById(R.id.code_eleventh);
+      this.codes[11]        = container.findViewById(R.id.code_twelth);
+
+      this.qrCode.setOnClickListener(clickListener);
+      this.registerForContextMenu(numbersContainer);
+
+      this.verified.setChecked(getArguments().getBoolean(VERIFIED_STATE, false));
+      this.verified.setOnCheckedChangeListener(this);
+
+      return container;
+    }
+
+    @Override
+    public void onCreate(Bundle bundle) {
+      super.onCreate(bundle);
+
+      RecipientId           recipientId              = getArguments().getParcelable(RECIPIENT_ID);
+      IdentityKeyParcelable localIdentityParcelable  = getArguments().getParcelable(LOCAL_IDENTITY);
+      IdentityKeyParcelable remoteIdentityParcelable = getArguments().getParcelable(REMOTE_IDENTITY);
+
+      if (recipientId == null)              throw new AssertionError("RecipientId required");
+      if (localIdentityParcelable == null)  throw new AssertionError("local identity required");
+      if (remoteIdentityParcelable == null) throw new AssertionError("remote identity required");
+
+      this.localIdentity  = localIdentityParcelable.get();
+      this.recipient      = Recipient.live(recipientId);
+      this.remoteIdentity = remoteIdentityParcelable.get();
+
+      int    version;
+      byte[] localId;
+      byte[] remoteId;
+
+      //noinspection WrongThread
+      Recipient resolved = recipient.resolve();
+
+      if (FeatureFlags.verifyV2() && resolved.getUuid().isPresent()) {
+        Log.i(TAG, "Using UUID (version 2).");
+        version  = 2;
+        localId  = UuidUtil.toByteArray(TextSecurePreferences.getLocalUuid(requireContext()));
+        remoteId = UuidUtil.toByteArray(resolved.getUuid().get());
+      } else if (!FeatureFlags.verifyV2() && resolved.getE164().isPresent()) {
+        Log.i(TAG, "Using E164 (version 1).");
+        version  = 1;
+        localId  = TextSecurePreferences.getLocalNumber(requireContext()).getBytes();
+        remoteId = resolved.requireE164().getBytes();
+      } else {
+        Log.w(TAG, String.format(Locale.ENGLISH, "Could not show proper verification! verifyV2: %s, hasUuid: %s, hasE164: %s", FeatureFlags.verifyV2(), resolved.getUuid().isPresent(), resolved.getE164().isPresent()));
+        new AlertDialog.Builder(requireContext())
+                       .setMessage(getString(R.string.VerifyIdentityActivity_you_must_first_exchange_messages_in_order_to_view, resolved.getDisplayName(requireContext())))
+                       .setPositiveButton(android.R.string.ok, (dialog, which) -> requireActivity().finish())
+                       .setOnDismissListener(dialog -> requireActivity().finish())
+                       .show();
+        return;
+      }
+
+      this.recipient.observe(this, this::setRecipientText);
+
+      new AsyncTask<Void, Void, Fingerprint>() {
+        @Override
+        protected Fingerprint doInBackground(Void... params) {
+          return new NumericFingerprintGenerator(5200).createFor(version,
+                                                                 localId, localIdentity,
+                                                                 remoteId, remoteIdentity);
+        }
+
+        @Override
+        protected void onPostExecute(Fingerprint fingerprint) {
+          VerifyDisplayFragment.this.fingerprint = fingerprint;
+          setFingerprintViews(fingerprint, true);
+          getActivity().supportInvalidateOptionsMenu();
+        }
+      }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+
+      setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onResume() {
+      super.onResume();
+
+      setRecipientText(recipient.get());
+
+      if (fingerprint != null) {
+        setFingerprintViews(fingerprint, false);
+      }
+
+      if (animateSuccessOnDraw) {
+        animateSuccessOnDraw = false;
+        animateVerifiedSuccess();
+      } else if (animateFailureOnDraw) {
+        animateFailureOnDraw = false;
+        animateVerifiedFailure();
+      }
+    }
+
+    @Override
+    public void onCreateContextMenu(ContextMenu menu, View view,
+                                    ContextMenuInfo menuInfo)
+    {
+      super.onCreateContextMenu(menu, view, menuInfo);
+
+      if (fingerprint != null) {
+        MenuInflater inflater = getActivity().getMenuInflater();
+        inflater.inflate(R.menu.verify_display_fragment_context_menu, menu);
+      }
+    }
+
+    @Override
+    public boolean onContextItemSelected(MenuItem item) {
+      if (fingerprint == null) return super.onContextItemSelected(item);
+
+      switch (item.getItemId()) {
+        case R.id.menu_copy:    handleCopyToClipboard(fingerprint, codes.length); return true;
+        case R.id.menu_compare: handleCompareWithClipboard(fingerprint);          return true;
+        default:                return super.onContextItemSelected(item);
+      }
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+      super.onCreateOptionsMenu(menu, inflater);
+
+      if (fingerprint != null) {
+        inflater.inflate(R.menu.verify_identity, menu);
+      }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+      switch (item.getItemId()) {
+        case R.id.verify_identity__share: handleShare(fingerprint, codes.length);  return true;
+      }
+
+      return false;
+    }
+
+    public void setScannedFingerprint(String scanned) {
+      try {
+        if (fingerprint.getScannableFingerprint().compareTo(scanned.getBytes("ISO-8859-1"))) {
+          this.animateSuccessOnDraw = true;
+        } else {
+          this.animateFailureOnDraw = true;
+        }
+      } catch (FingerprintVersionMismatchException e) {
+        Log.w(TAG, e);
+        if (e.getOurVersion() < e.getTheirVersion()) {
+          Toast.makeText(getActivity(), R.string.VerifyIdentityActivity_your_contact_is_running_a_newer_version_of_Signal, Toast.LENGTH_LONG).show();
+        } else {
+          Toast.makeText(getActivity(), R.string.VerifyIdentityActivity_your_contact_is_running_an_old_version_of_signal, Toast.LENGTH_LONG).show();
+        }
+      } catch (Exception e) {
+        Log.w(TAG, e);
+        Toast.makeText(getActivity(), R.string.VerifyIdentityActivity_the_scanned_qr_code_is_not_a_correctly_formatted_safety_number, Toast.LENGTH_LONG).show();
+      }
+    }
+
+    public void setClickListener(View.OnClickListener listener) {
+      this.clickListener = listener;
+    }
+
+    private @NonNull String getFormattedSafetyNumbers(@NonNull Fingerprint fingerprint, int segmentCount) {
+      String[]      segments = getSegments(fingerprint, segmentCount);
+      StringBuilder result   = new StringBuilder();
+
+      for (int i = 0; i < segments.length; i++) {
+        result.append(segments[i]);
+
+        if (i != segments.length - 1) {
+          if (((i+1) % 4) == 0) result.append('\n');
+          else                  result.append(' ');
+        }
+      }
+
+      return result.toString();
+    }
+
+    private void handleCopyToClipboard(Fingerprint fingerprint, int segmentCount) {
+      Util.writeTextToClipboard(getActivity(), getFormattedSafetyNumbers(fingerprint, segmentCount));
+    }
+
+    private void handleCompareWithClipboard(Fingerprint fingerprint) {
+      String clipboardData = Util.readTextFromClipboard(getActivity());
+
+      if (clipboardData == null) {
+        Toast.makeText(getActivity(), R.string.VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard, Toast.LENGTH_LONG).show();
+        return;
+      }
+
+      String numericClipboardData = clipboardData.replaceAll("\\D", "");
+
+      if (TextUtils.isEmpty(numericClipboardData) || numericClipboardData.length() != 60) {
+        Toast.makeText(getActivity(), R.string.VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard, Toast.LENGTH_LONG).show();
+        return;
+      }
+
+      if (fingerprint.getDisplayableFingerprint().getDisplayText().equals(numericClipboardData)) {
+        animateVerifiedSuccess();
+      } else {
+        animateVerifiedFailure();
+      }
+    }
+
+    private void handleShare(@NonNull Fingerprint fingerprint, int segmentCount) {
+      String shareString =
+          getString(R.string.VerifyIdentityActivity_our_signal_safety_number) + "\n" +
+              getFormattedSafetyNumbers(fingerprint, segmentCount) + "\n";
+
+      Intent intent = new Intent();
+      intent.setAction(Intent.ACTION_SEND);
+      intent.putExtra(Intent.EXTRA_TEXT, shareString);
+      intent.setType("text/plain");
+
+      try {
+        startActivity(Intent.createChooser(intent, getString(R.string.VerifyIdentityActivity_share_safety_number_via)));
+      } catch (ActivityNotFoundException e) {
+        Toast.makeText(getActivity(), R.string.VerifyIdentityActivity_no_app_to_share_to, Toast.LENGTH_LONG).show();
+      }
+    }
+
+    private void setRecipientText(Recipient recipient) {
+      description.setText(Html.fromHtml(String.format(getActivity().getString(R.string.verify_display_fragment__if_you_wish_to_verify_the_security_of_your_end_to_end_encryption_with_s), recipient.getDisplayName(getContext()))));
+      description.setMovementMethod(LinkMovementMethod.getInstance());
+    }
+
+    private void setFingerprintViews(Fingerprint fingerprint, boolean animate) {
+      String[] segments = getSegments(fingerprint, codes.length);
+
+      for (int i=0;i<codes.length;i++) {
+        if (animate) setCodeSegment(codes[i], segments[i]);
+        else         codes[i].setText(segments[i]);
+      }
+
+      byte[] qrCodeData   = fingerprint.getScannableFingerprint().getSerialized();
+      String qrCodeString = new String(qrCodeData, Charset.forName("ISO-8859-1"));
+      Bitmap qrCodeBitmap = QrCode.create(qrCodeString);
+
+      qrCode.setImageBitmap(qrCodeBitmap);
+
+      if (animate) {
+        ViewUtil.fadeIn(qrCode, 1000);
+        ViewUtil.fadeIn(tapLabel, 1000);
+      } else {
+        qrCode.setVisibility(View.VISIBLE);
+        tapLabel.setVisibility(View.VISIBLE);
+      }
+    }
+
+    private void setCodeSegment(final TextView codeView, String segment) {
+      ValueAnimator valueAnimator = new ValueAnimator();
+      valueAnimator.setObjectValues(0, Integer.parseInt(segment));
+
+      valueAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+        @Override
+        public void onAnimationUpdate(ValueAnimator animation) {
+          int value = (int) animation.getAnimatedValue();
+          codeView.setText(String.format(Locale.getDefault(), "%05d", value));
+        }
+      });
+
+      valueAnimator.setEvaluator(new TypeEvaluator<Integer>() {
+        public Integer evaluate(float fraction, Integer startValue, Integer endValue) {
+          return Math.round(startValue + (endValue - startValue) * fraction);
+        }
+      });
+
+      valueAnimator.setDuration(1000);
+      valueAnimator.start();
+    }
+
+    private String[] getSegments(Fingerprint fingerprint, int segmentCount) {
+      String[] segments = new String[segmentCount];
+      String   digits   = fingerprint.getDisplayableFingerprint().getDisplayText();
+      int      partSize = digits.length() / segmentCount;
+
+      for (int i=0;i<segmentCount;i++) {
+        segments[i] = digits.substring(i * partSize, (i * partSize) + partSize);
+      }
+
+      return segments;
+    }
+
+    private Bitmap createVerifiedBitmap(int width, int height, @DrawableRes int id) {
+      Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+      Canvas canvas = new Canvas(bitmap);
+      Bitmap check  = BitmapFactory.decodeResource(getResources(), id);
+      float  offset = (width - check.getWidth()) / 2;
+
+      canvas.drawBitmap(check, offset, offset, null);
+
+      return bitmap;
+    }
+
+    private void animateVerifiedSuccess() {
+      Bitmap qrBitmap  = ((BitmapDrawable)qrCode.getDrawable()).getBitmap();
+      Bitmap qrSuccess = createVerifiedBitmap(qrBitmap.getWidth(), qrBitmap.getHeight(), R.drawable.ic_check_white_48dp);
+
+      qrVerified.setImageBitmap(qrSuccess);
+      qrVerified.getBackground().setColorFilter(getResources().getColor(R.color.green_500), PorterDuff.Mode.MULTIPLY);
+
+      animateVerified();
+    }
+
+    private void animateVerifiedFailure() {
+      Bitmap qrBitmap  = ((BitmapDrawable)qrCode.getDrawable()).getBitmap();
+      Bitmap qrSuccess = createVerifiedBitmap(qrBitmap.getWidth(), qrBitmap.getHeight(), R.drawable.ic_close_white_48dp);
+
+      qrVerified.setImageBitmap(qrSuccess);
+      qrVerified.getBackground().setColorFilter(getResources().getColor(R.color.red_500), PorterDuff.Mode.MULTIPLY);
+
+      animateVerified();
+    }
+
+    private void animateVerified() {
+      ScaleAnimation scaleAnimation = new ScaleAnimation(0, 1, 0, 1,
+                                                         ScaleAnimation.RELATIVE_TO_SELF, 0.5f,
+                                                         ScaleAnimation.RELATIVE_TO_SELF, 0.5f);
+      scaleAnimation.setInterpolator(new OvershootInterpolator());
+      scaleAnimation.setDuration(800);
+      scaleAnimation.setAnimationListener(new Animation.AnimationListener() {
+        @Override
+        public void onAnimationStart(Animation animation) {}
+
+        @Override
+        public void onAnimationEnd(Animation animation) {
+          qrVerified.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+              ScaleAnimation scaleAnimation = new ScaleAnimation(1, 0, 1, 0,
+                                                                 ScaleAnimation.RELATIVE_TO_SELF, 0.5f,
+                                                                 ScaleAnimation.RELATIVE_TO_SELF, 0.5f);
+
+              scaleAnimation.setInterpolator(new AnticipateInterpolator());
+              scaleAnimation.setDuration(500);
+              ViewUtil.animateOut(qrVerified, scaleAnimation, View.GONE);
+            }
+          }, 2000);
+        }
+
+        @Override
+        public void onAnimationRepeat(Animation animation) {}
+      });
+
+      ViewUtil.animateIn(qrVerified, scaleAnimation);
+    }
+
+    @Override
+    public void onCheckedChanged(CompoundButton buttonView, final boolean isChecked) {
+      final Recipient   recipient   = this.recipient.get();
+      final RecipientId recipientId = recipient.getId();
+
+      SignalExecutors.BOUNDED.execute(() -> {
+        try (SignalSessionLock.Lock unused = ReentrantSessionLock.INSTANCE.acquire()) {
+          if (isChecked) {
+            Log.i(TAG, "Saving identity: " + recipientId);
+            DatabaseFactory.getIdentityDatabase(getActivity())
+                           .saveIdentity(recipientId,
+                                         remoteIdentity,
+                                         VerifiedStatus.VERIFIED, false,
+                                         System.currentTimeMillis(), true);
+          } else {
+            DatabaseFactory.getIdentityDatabase(getActivity())
+                           .setVerified(recipientId,
+                                        remoteIdentity,
+                                        VerifiedStatus.DEFAULT);
+          }
+
+          ApplicationDependencies.getJobManager()
+                                 .add(new MultiDeviceVerifiedUpdateJob(recipientId,
+                                                                       remoteIdentity,
+                                                                       isChecked ? VerifiedStatus.VERIFIED
+                                                                                 : VerifiedStatus.DEFAULT));
+          StorageSyncHelper.scheduleSyncForDataChange();
+
+          IdentityUtil.markIdentityVerified(getActivity(), recipient, isChecked, false);
+        }
+      });
+    }
+  }
+
+  public static class VerifyScanFragment extends Fragment {
+
+    private View           container;
+    private CameraView     cameraView;
+    private ScanningThread scanningThread;
+    private ScanListener   scanListener;
+
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup viewGroup, Bundle bundle) {
+      this.container  = ViewUtil.inflate(inflater, viewGroup, R.layout.verify_scan_fragment);
+      this.cameraView = container.findViewById(R.id.scanner);
+
+      return container;
+    }
+
+    @Override
+    public void onResume() {
+      super.onResume();
+      this.scanningThread = new ScanningThread();
+      this.scanningThread.setScanListener(scanListener);
+      this.scanningThread.setCharacterSet("ISO-8859-1");
+      this.cameraView.onResume();
+      this.cameraView.setPreviewCallback(scanningThread);
+      this.scanningThread.start();
+    }
+
+    @Override
+    public void onPause() {
+      super.onPause();
+      this.cameraView.onPause();
+      this.scanningThread.stopScanning();
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfiguration) {
+      super.onConfigurationChanged(newConfiguration);
+      this.cameraView.onPause();
+      this.cameraView.onResume();
+      this.cameraView.setPreviewCallback(scanningThread);
+    }
+
+    public void setScanListener(ScanListener listener) {
+      if (this.scanningThread != null) scanningThread.setScanListener(listener);
+      this.scanListener = listener;
+    }
+
+  }
+
+}

app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java

@@ -17,6 +17,8 @@
 
 package org.thoughtcrime.securesms;
 
+import static org.thoughtcrime.securesms.components.sensors.Orientation.PORTRAIT_BOTTOM_EDGE;
+
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.PictureInPictureParams;
@@ -77,7 +79,6 @@ import org.thoughtcrime.securesms.util.ThrottledDebouncer;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.livedata.LiveDataUtil;
 import org.thoughtcrime.securesms.webrtc.CallParticipantsViewState;
-import org.thoughtcrime.securesms.webrtc.audio.SignalAudioManager;
 import org.whispersystems.libsignal.IdentityKey;
 import org.whispersystems.signalservice.api.messages.calls.HangupMessage;
 
@@ -85,8 +86,6 @@ import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
-import static org.thoughtcrime.securesms.components.sensors.Orientation.PORTRAIT_BOTTOM_EDGE;
-
 public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChangeDialog.Callback {
 
   private static final String TAG = Log.tag(WebRtcCallActivity.class);
@@ -256,6 +255,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
 
   private void processIntent(@NonNull Intent intent) {
     if (ANSWER_ACTION.equals(intent.getAction())) {
+      viewModel.setRecipient(EventBus.getDefault().getStickyEvent(WebRtcViewModel.class).getRecipient());
       handleAnswerWithAudio();
     } else if (DENY_ACTION.equals(intent.getAction())) {
       handleDenyCall();
@@ -366,15 +366,15 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
   }
 
   private void handleSetAudioHandset() {
-    ApplicationDependencies.getSignalCallManager().selectAudioDevice(SignalAudioManager.AudioDevice.EARPIECE);
+    ApplicationDependencies.getSignalCallManager().setAudioSpeaker(false);
   }
 
   private void handleSetAudioSpeaker() {
-    ApplicationDependencies.getSignalCallManager().selectAudioDevice(SignalAudioManager.AudioDevice.SPEAKER_PHONE);
+    ApplicationDependencies.getSignalCallManager().setAudioSpeaker(true);
   }
 
   private void handleSetAudioBluetooth() {
-    ApplicationDependencies.getSignalCallManager().selectAudioDevice(SignalAudioManager.AudioDevice.BLUETOOTH);
+    ApplicationDependencies.getSignalCallManager().setAudioBluetooth(true);
   }
 
   private void handleSetMuteAudio(boolean enabled) {
@@ -402,19 +402,24 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
   }
 
   private void handleAnswerWithAudio() {
-    Permissions.with(this)
-               .request(Manifest.permission.RECORD_AUDIO)
-               .ifNecessary()
-               .withRationaleDialog(getString(R.string.WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone),
-                                    R.drawable.ic_mic_solid_24)
-               .withPermanentDenialDialog(getString(R.string.WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls))
-               .onAllGranted(() -> {
-                 callScreen.setStatus(getString(R.string.RedPhone_answering));
+    Recipient recipient = viewModel.getRecipient().get();
 
-                 ApplicationDependencies.getSignalCallManager().acceptCall(false);
-               })
-               .onAnyDenied(this::handleDenyCall)
-               .execute();
+    if (!recipient.equals(Recipient.UNKNOWN)) {
+      Permissions.with(this)
+                 .request(Manifest.permission.RECORD_AUDIO)
+                 .ifNecessary()
+                 .withRationaleDialog(getString(R.string.WebRtcCallActivity_to_answer_the_call_from_s_give_signal_access_to_your_microphone, recipient.getDisplayName(this)),
+                                      R.drawable.ic_mic_solid_24)
+                 .withPermanentDenialDialog(getString(R.string.WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls))
+                 .onAllGranted(() -> {
+                   callScreen.setRecipient(recipient);
+                   callScreen.setStatus(getString(R.string.RedPhone_answering));
+
+                   ApplicationDependencies.getSignalCallManager().acceptCall(false);
+                 })
+                 .onAnyDenied(this::handleDenyCall)
+                 .execute();
+    }
   }
 
   private void handleAnswerWithVideo() {
@@ -478,12 +483,6 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
     delayedFinish();
   }
 
-  private void handleGlare(@NonNull Recipient recipient) {
-    Log.i(TAG, "handleGlare: " + recipient.getId());
-
-    callScreen.setStatus("");
-  }
-
   private void handleCallRinging() {
     callScreen.setStatus(getString(R.string.RedPhone_ringing));
   }
@@ -629,8 +628,6 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
         handleCallRinging(); break;
       case CALL_DISCONNECTED:
         handleTerminate(event.getRecipient(), HangupMessage.Type.NORMAL); break;
-      case CALL_DISCONNECTED_GLARE:
-        handleGlare(event.getRecipient()); break;
       case CALL_ACCEPTED_ELSEWHERE:
         handleTerminate(event.getRecipient(), HangupMessage.Type.ACCEPTED); break;
       case CALL_DECLINED_ELSEWHERE:

app/src/main/java/org/thoughtcrime/securesms/animation/transitions/CircleAvatarTransition.kt

@@ -14,6 +14,7 @@ import android.view.animation.AccelerateInterpolator
 import android.view.animation.DecelerateInterpolator
 import android.view.animation.Interpolator
 import androidx.annotation.RequiresApi
+import org.thoughtcrime.securesms.components.AvatarImageView
 
 private const val POSITION_ON_SCREEN = "signal.circleavatartransition.positiononscreen"
 private const val WIDTH = "signal.circleavatartransition.width"
@@ -35,7 +36,7 @@ class CircleAvatarTransition(context: Context, attrs: AttributeSet?) : Transitio
   private fun captureValues(transitionValues: TransitionValues) {
     val view: View = transitionValues.view
 
-    if (view.transitionName == "avatar") {
+    if (view is AvatarImageView) {
       val topLeft = intArrayOf(0, 0)
       view.getLocationOnScreen(topLeft)
       transitionValues.values[POSITION_ON_SCREEN] = topLeft
@@ -50,7 +51,7 @@ class CircleAvatarTransition(context: Context, attrs: AttributeSet?) : Transitio
     }
 
     val view: View = endValues.view
-    if (view.transitionName != "avatar") {
+    if (view !is AvatarImageView || view.transitionName != "avatar") {
       return null
     }
 

app/src/main/java/org/thoughtcrime/securesms/audio/AudioCodec.java

@@ -1,12 +1,13 @@
 package org.thoughtcrime.securesms.audio;
 
+import android.annotation.TargetApi;
 import android.media.AudioFormat;
 import android.media.AudioRecord;
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
 import android.media.MediaFormat;
 import android.media.MediaRecorder;
-import android.os.ParcelFileDescriptor;
+import android.os.Build;
 
 import org.signal.core.util.StreamUtil;
 import org.signal.core.util.logging.Log;
@@ -16,7 +17,8 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
 
-public class AudioCodec implements Recorder {
+@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
+public class AudioCodec {
 
   private static final String TAG = Log.tag(AudioCodec.class);
 
@@ -49,19 +51,12 @@ public class AudioCodec implements Recorder {
     }
   }
 
-  @Override
-  public void start(ParcelFileDescriptor fileDescriptor) {
-    Log.i(TAG, "Recording voice note using AudioCodec.");
-    start(new ParcelFileDescriptor.AutoCloseOutputStream(fileDescriptor));
-  }
-
-  @Override
   public synchronized void stop() {
     running = false;
     while (!finished) Util.wait(this, 0);
   }
 
-  private void start(final OutputStream outputStream) {
+  public void start(final OutputStream outputStream) {
     new Thread(new Runnable() {
       @Override
       public void run() {

app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java

@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.audio;
 
+import android.annotation.TargetApi;
 import android.content.Context;
 import android.net.Uri;
 import android.os.Build;
@@ -12,7 +13,6 @@ import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.components.voice.VoiceNoteDraft;
 import org.thoughtcrime.securesms.providers.BlobProvider;
-import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
 import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
@@ -20,6 +20,7 @@ import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
 import java.io.IOException;
 import java.util.concurrent.ExecutorService;
 
+@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
 public class AudioRecorder {
 
   private static final String TAG = Log.tag(AudioRecorder.class);
@@ -28,8 +29,8 @@ public class AudioRecorder {
 
   private final Context context;
 
-  private Recorder recorder;
-  private Uri      captureUri;
+  private AudioCodec audioCodec;
+  private Uri        captureUri;
 
   public AudioRecorder(@NonNull Context context) {
     this.context = context;
@@ -41,7 +42,7 @@ public class AudioRecorder {
     executor.execute(() -> {
       Log.i(TAG, "Running startRecording() + " + Thread.currentThread().getId());
       try {
-        if (recorder != null) {
+        if (audioCodec != null) {
           throw new AssertionError("We can only record once at a time.");
         }
 
@@ -51,9 +52,9 @@ public class AudioRecorder {
                                  .forData(new ParcelFileDescriptor.AutoCloseInputStream(fds[0]), 0)
                                  .withMimeType(MediaUtil.AUDIO_AAC)
                                  .createForDraftAttachmentAsync(context, () -> Log.i(TAG, "Write successful."), e -> Log.w(TAG, "Error during recording", e));
+        audioCodec = new AudioCodec();
 
-        recorder = Build.VERSION.SDK_INT >= 26 && FeatureFlags.voiceNoteRecordingV2() ? new MediaRecorderWrapper() : new AudioCodec();
-        recorder.start(fds[1]);
+        audioCodec.start(new ParcelFileDescriptor.AutoCloseOutputStream(fds[1]));
       } catch (IOException e) {
         Log.w(TAG, e);
       }
@@ -66,12 +67,12 @@ public class AudioRecorder {
     final SettableFuture<VoiceNoteDraft> future = new SettableFuture<>();
 
     executor.execute(() -> {
-      if (recorder == null) {
+      if (audioCodec == null) {
         sendToFuture(future, new IOException("MediaRecorder was never initialized successfully!"));
         return;
       }
 
-      recorder.stop();
+      audioCodec.stop();
 
       try {
         long size = MediaUtil.getMediaSize(context, captureUri);
@@ -81,7 +82,7 @@ public class AudioRecorder {
         sendToFuture(future, ioe);
       }
 
-      recorder   = null;
+      audioCodec = null;
       captureUri = null;
     });
 

app/src/main/java/org/thoughtcrime/securesms/audio/AudioWaveForm.java

@@ -22,7 +22,7 @@ import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
-import org.thoughtcrime.securesms.database.SignalDatabase;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.model.databaseprotos.AudioWaveFormData;
 import org.thoughtcrime.securesms.media.DecryptableUriMediaInput;
 import org.thoughtcrime.securesms.media.MediaInput;
@@ -100,7 +100,7 @@ public final class AudioWaveForm {
 
       if (attachment instanceof DatabaseAttachment) {
         try {
-          AttachmentDatabase attachmentDatabase = SignalDatabase.attachments();
+          AttachmentDatabase attachmentDatabase = DatabaseFactory.getAttachmentDatabase(context);
           DatabaseAttachment dbAttachment       = (DatabaseAttachment) attachment;
           long               startTime          = System.currentTimeMillis();
 

app/src/main/java/org/thoughtcrime/securesms/audio/MediaRecorderWrapper.java

@@ -1,65 +0,0 @@
-package org.thoughtcrime.securesms.audio;
-
-import android.media.MediaRecorder;
-import android.os.ParcelFileDescriptor;
-
-import org.signal.core.util.logging.Log;
-
-import java.io.IOException;
-
-/**
- * Wrap Android's {@link MediaRecorder} for use with voice notes.
- */
-public class MediaRecorderWrapper implements Recorder {
-
-  private static final String TAG = Log.tag(MediaRecorderWrapper.class);
-
-  private static final int    SAMPLE_RATE       = 44100;
-  private static final int    CHANNELS          = 1;
-  private static final int    BIT_RATE          = 32000;
-
-  private MediaRecorder recorder = null;
-
-  @Override
-  public void start(ParcelFileDescriptor fileDescriptor) throws IOException {
-    Log.i(TAG, "Recording voice note using MediaRecorderWrapper.");
-    recorder = new MediaRecorder();
-
-    try {
-      recorder.setAudioSource(MediaRecorder.AudioSource.MIC);
-      recorder.setOutputFormat(MediaRecorder.OutputFormat.AAC_ADTS);
-      recorder.setOutputFile(fileDescriptor.getFileDescriptor());
-      recorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC);
-      recorder.setAudioSamplingRate(SAMPLE_RATE);
-      recorder.setAudioEncodingBitRate(BIT_RATE);
-      recorder.setAudioChannels(CHANNELS);
-      recorder.prepare();
-      recorder.start();
-    } catch (IllegalStateException e) {
-      Log.w(TAG, "Unable to start recording", e);
-      recorder.release();
-      recorder = null;
-      throw new IOException(e);
-    }
-  }
-
-  @Override
-  public void stop() {
-    if (recorder == null) {
-      return;
-    }
-
-    try {
-      recorder.stop();
-    } catch (RuntimeException e) {
-      if (e.getClass() != RuntimeException.class) {
-        throw e;
-      } else {
-        Log.d(TAG, "Recording stopped with no data captured.");
-      }
-    } finally {
-      recorder.release();
-      recorder = null;
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/audio/Recorder.java

@@ -1,13 +0,0 @@
-package org.thoughtcrime.securesms.audio;
-
-import android.os.ParcelFileDescriptor;
-
-import java.io.IOException;
-
-/**
- * Simple abstraction of the interface for the original voice note recording and the new.
- */
-public interface Recorder {
-  void start(ParcelFileDescriptor fileDescriptor) throws IOException;
-  void stop();
-}

app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarBundler.kt

@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.avatar
 
 import android.os.Bundle
+import java.lang.IllegalStateException
 
 /**
  * Utility class which encapsulates reading and writing Avatar objects to and from Bundles.

app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarColorItem.kt

@@ -4,10 +4,9 @@ import android.view.View
 import android.widget.ImageView
 import com.airbnb.lottie.SimpleColorFilter
 import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
-import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
-import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel
-import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
+import org.thoughtcrime.securesms.util.MappingAdapter
+import org.thoughtcrime.securesms.util.MappingModel
+import org.thoughtcrime.securesms.util.MappingViewHolder
 
 typealias OnAvatarColorClickListener = (Avatars.ColorPair) -> Unit
 
@@ -21,7 +20,7 @@ data class AvatarColorItem(
 
   companion object {
     fun registerViewHolder(adapter: MappingAdapter, onAvatarColorClickListener: OnAvatarColorClickListener) {
-      adapter.registerFactory(Model::class.java, LayoutFactory({ ViewHolder(it, onAvatarColorClickListener) }, R.layout.avatar_color_item))
+      adapter.registerFactory(Model::class.java, MappingAdapter.LayoutFactory({ ViewHolder(it, onAvatarColorClickListener) }, R.layout.avatar_color_item))
     }
   }
 

app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarPickerStorage.kt

@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.avatar
 import android.content.Context
 import android.net.Uri
 import android.webkit.MimeTypeMap
-import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.mediasend.Media
 import org.thoughtcrime.securesms.mms.PartAuthority
 import org.thoughtcrime.securesms.util.MediaUtil
@@ -33,7 +33,7 @@ object AvatarPickerStorage {
   @JvmStatic
   fun cleanOrphans(context: Context) {
     val avatarFiles = FileStorage.getAllFiles(context, DIRECTORY, FILENAME_BASE)
-    val database = SignalDatabase.avatarPicker
+    val database = DatabaseFactory.getAvatarPickerDatabase(context)
     val photoAvatars = database
       .getAllAvatars()
       .filterIsInstance<Avatar.Photo>()

app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarRenderer.kt

@@ -48,9 +48,8 @@ object AvatarRenderer {
     avatar: Avatar.Text,
     inverted: Boolean = false,
     size: Int = DIMENSIONS,
-    synchronous: Boolean = false
   ): Drawable {
-    return TextAvatarDrawable(context, avatar, inverted, size, synchronous)
+    return TextAvatarDrawable(context, avatar, inverted, size)
   }
 
   private fun renderVector(context: Context, avatar: Avatar.Vector, onAvatarRendered: (Media) -> Unit, onRenderFailed: (Throwable?) -> Unit) {
@@ -67,7 +66,7 @@ object AvatarRenderer {
 
   private fun renderText(context: Context, avatar: Avatar.Text, onAvatarRendered: (Media) -> Unit, onRenderFailed: (Throwable?) -> Unit) {
     renderInBackground(context, onAvatarRendered, onRenderFailed) { canvas ->
-      val textDrawable = createTextDrawable(context, avatar, synchronous = true)
+      val textDrawable = createTextDrawable(context, avatar)
 
       canvas.drawColor(avatar.color.backgroundColor)
       textDrawable.draw(canvas)

app/src/main/java/org/thoughtcrime/securesms/avatar/TextAvatarDrawable.kt

@@ -3,58 +3,52 @@ package org.thoughtcrime.securesms.avatar
 import android.content.Context
 import android.graphics.Canvas
 import android.graphics.ColorFilter
-import android.graphics.Paint
 import android.graphics.PixelFormat
 import android.graphics.drawable.Drawable
-import android.text.Layout
-import android.text.SpannableString
-import android.text.StaticLayout
-import android.text.TextPaint
-import androidx.core.graphics.withTranslation
-import org.thoughtcrime.securesms.components.emoji.EmojiProvider
+import android.util.TypedValue
+import android.view.Gravity
+import android.widget.FrameLayout
+import androidx.core.view.updateLayoutParams
+import org.thoughtcrime.securesms.components.emoji.EmojiTextView
 
+/**
+ * Uses EmojiTextView to properly render a Text Avatar with emoji in it.
+ */
 class TextAvatarDrawable(
-  private val context: Context,
-  private val avatar: Avatar.Text,
+  context: Context,
+  avatar: Avatar.Text,
   inverted: Boolean = false,
   private val size: Int = AvatarRenderer.DIMENSIONS,
-  private val synchronous: Boolean = false
 ) : Drawable() {
 
-  private val textPaint = TextPaint(Paint.ANTI_ALIAS_FLAG)
+  private val layout: FrameLayout = FrameLayout(context)
+  private val textView: EmojiTextView = EmojiTextView(context)
+
   init {
-    textPaint.typeface = AvatarRenderer.getTypeface(context)
-    textPaint.color = if (inverted) avatar.color.backgroundColor else avatar.color.foregroundColor
-    textPaint.density = context.resources.displayMetrics.density
+    textView.typeface = AvatarRenderer.getTypeface(context)
+    textView.setTextSize(TypedValue.COMPLEX_UNIT_PX, Avatars.getTextSizeForLength(context, avatar.text, size * 0.8f, size * 0.45f))
+    textView.text = avatar.text
+    textView.gravity = Gravity.CENTER
+    textView.setTextColor(if (inverted) avatar.color.backgroundColor else avatar.color.foregroundColor)
+    textView.setForceCustomEmoji(true)
 
-    setBounds(0, 0, size, size)
-  }
+    layout.addView(textView)
 
-  override fun draw(canvas: Canvas) {
-    val textSize = Avatars.getTextSizeForLength(context, avatar.text, size * 0.8f, size * 0.45f)
-    val width = bounds.width()
-    val candidates = EmojiProvider.getCandidates(avatar.text)
-
-    textPaint.textSize = textSize
-
-    val newText = if (candidates == null || candidates.size() == 0) {
-      SpannableString(avatar.text)
-    } else {
-      EmojiProvider.emojify(context, candidates, avatar.text, textPaint, synchronous, true)
+    textView.updateLayoutParams {
+      width = size
+      height = size
     }
 
-    if (newText == null) return
-
-    val layout = StaticLayout(SpannableString(newText), textPaint, width, Layout.Alignment.ALIGN_NORMAL, 0f, 0f, true)
-    layout.draw(canvas, getStartX(layout), ((bounds.height() / 2) - ((layout.height / 2))).toFloat())
+    layout.measure(size, size)
+    layout.layout(0, 0, size, size)
   }
 
-  private fun getStartX(layout: StaticLayout): Float {
-    val direction = layout.getParagraphDirection(0)
-    val lineWidth = layout.getLineWidth(0)
-    val width = bounds.width()
-    val xPos = (width - lineWidth) / 2
-    return if (direction == Layout.DIR_LEFT_TO_RIGHT) xPos else -xPos
+  override fun getIntrinsicHeight(): Int = size
+
+  override fun getIntrinsicWidth(): Int = size
+
+  override fun draw(canvas: Canvas) {
+    layout.draw(canvas)
   }
 
   override fun setAlpha(alpha: Int) = Unit
@@ -62,10 +56,4 @@ class TextAvatarDrawable(
   override fun setColorFilter(colorFilter: ColorFilter?) = Unit
 
   override fun getOpacity(): Int = PixelFormat.OPAQUE
-
-  private fun Layout.draw(canvas: Canvas, x: Float, y: Float) {
-    canvas.withTranslation(x, y) {
-      draw(canvas)
-    }
-  }
 }

app/src/main/java/org/thoughtcrime/securesms/avatar/photo/PhotoEditorFragment.kt

@@ -11,7 +11,7 @@ import org.signal.core.util.concurrent.SignalExecutors
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.avatar.AvatarBundler
 import org.thoughtcrime.securesms.avatar.AvatarPickerStorage
-import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.providers.BlobProvider
 import org.thoughtcrime.securesms.scribbles.ImageEditorFragment
 
@@ -44,7 +44,7 @@ class PhotoEditorFragment : Fragment(R.layout.avatar_photo_editor_fragment), Ima
       val inputStream = BlobProvider.getInstance().getStream(applicationContext, editedImageUri)
       val onDiskUri = AvatarPickerStorage.save(applicationContext, inputStream)
       val photo = AvatarBundler.extractPhoto(args.photoAvatar)
-      val database = SignalDatabase.avatarPicker
+      val database = DatabaseFactory.getAvatarPickerDatabase(applicationContext)
       val newPhoto = photo.copy(uri = onDiskUri, size = size)
 
       database.update(newPhoto)
@@ -57,16 +57,6 @@ class PhotoEditorFragment : Fragment(R.layout.avatar_photo_editor_fragment), Ima
     }
   }
 
-  override fun onCancelEditing() {
-    Navigation.findNavController(requireView()).popBackStack()
-  }
-
-  override fun onMainImageLoaded() {
-  }
-
-  override fun onMainImageFailedToLoad() {
-  }
-
   companion object {
     const val REQUEST_KEY_EDIT = "org.thoughtcrime.securesms.avatar.photo.EDIT"
 

app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerFragment.kt

@@ -15,7 +15,6 @@ import androidx.fragment.app.setFragmentResultListener
 import androidx.fragment.app.viewModels
 import androidx.navigation.Navigation
 import androidx.recyclerview.widget.RecyclerView
-import org.signal.core.util.ThreadUtil
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.avatar.Avatar
 import org.thoughtcrime.securesms.avatar.AvatarBundler
@@ -28,10 +27,10 @@ import org.thoughtcrime.securesms.groups.ParcelableGroupId
 import org.thoughtcrime.securesms.mediasend.AvatarSelectionActivity
 import org.thoughtcrime.securesms.mediasend.Media
 import org.thoughtcrime.securesms.permissions.Permissions
+import org.thoughtcrime.securesms.util.MappingAdapter
 import org.thoughtcrime.securesms.util.ViewUtil
-import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
-import org.thoughtcrime.securesms.util.navigation.safeNavigate
 import org.thoughtcrime.securesms.util.visible
+import java.util.Objects
 
 /**
  * Primary Avatar picker fragment, displays current user avatar and a list of recently used avatars and defaults.
@@ -112,7 +111,7 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) {
               putParcelable(SELECT_AVATAR_MEDIA, it)
             }
           )
-          ThreadUtil.runOnMain { Navigation.findNavController(v).popBackStack() }
+          Navigation.findNavController(v).popBackStack()
         },
         {
           setFragmentResult(
@@ -121,7 +120,7 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) {
               putBoolean(SELECT_AVATAR_CLEAR, true)
             }
           )
-          ThreadUtil.runOnMain { Navigation.findNavController(v).popBackStack() }
+          Navigation.findNavController(v).popBackStack()
         }
       )
     }
@@ -148,10 +147,9 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) {
     ViewUtil.hideKeyboard(requireContext(), requireView())
   }
 
-  @Suppress("DEPRECATION")
   override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
     if (requestCode == REQUEST_CODE_SELECT_IMAGE && resultCode == Activity.RESULT_OK && data != null) {
-      val media: Media = requireNotNull(data.getParcelableExtra(AvatarSelectionActivity.EXTRA_MEDIA))
+      val media: Media = Objects.requireNonNull(data.getParcelableExtra(AvatarSelectionActivity.EXTRA_MEDIA))
       viewModel.onAvatarPhotoSelectionCompleted(media)
     } else {
       super.onActivityResult(requestCode, resultCode, data)
@@ -197,24 +195,23 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) {
     }
   }
 
-  private fun openPhotoEditor(photo: Avatar.Photo) {
+  fun openPhotoEditor(photo: Avatar.Photo) {
     Navigation.findNavController(requireView())
-      .safeNavigate(AvatarPickerFragmentDirections.actionAvatarPickerFragmentToAvatarPhotoEditorFragment(AvatarBundler.bundlePhoto(photo)))
+      .navigate(AvatarPickerFragmentDirections.actionAvatarPickerFragmentToAvatarPhotoEditorFragment(AvatarBundler.bundlePhoto(photo)))
   }
 
-  private fun openVectorEditor(vector: Avatar.Vector) {
+  fun openVectorEditor(vector: Avatar.Vector) {
     Navigation.findNavController(requireView())
-      .safeNavigate(AvatarPickerFragmentDirections.actionAvatarPickerFragmentToVectorAvatarCreationFragment(AvatarBundler.bundleVector(vector)))
+      .navigate(AvatarPickerFragmentDirections.actionAvatarPickerFragmentToVectorAvatarCreationFragment(AvatarBundler.bundleVector(vector)))
   }
 
-  private fun openTextEditor(text: Avatar.Text?) {
+  fun openTextEditor(text: Avatar.Text?) {
     val bundle = if (text != null) AvatarBundler.bundleText(text) else null
     Navigation.findNavController(requireView())
-      .safeNavigate(AvatarPickerFragmentDirections.actionAvatarPickerFragmentToTextAvatarCreationFragment(bundle))
+      .navigate(AvatarPickerFragmentDirections.actionAvatarPickerFragmentToTextAvatarCreationFragment(bundle))
   }
 
-  @Suppress("DEPRECATION")
-  private fun openCameraCapture() {
+  fun openCameraCapture() {
     Permissions.with(this)
       .request(Manifest.permission.CAMERA)
       .ifNecessary()
@@ -229,8 +226,7 @@ class AvatarPickerFragment : Fragment(R.layout.avatar_picker_fragment) {
       .execute()
   }
 
-  @Suppress("DEPRECATION")
-  private fun openGallery() {
+  fun openGallery() {
     Permissions.with(this)
       .request(Manifest.permission.READ_EXTERNAL_STORAGE)
       .ifNecessary()

app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerItem.kt

@@ -14,10 +14,9 @@ import org.thoughtcrime.securesms.avatar.AvatarRenderer
 import org.thoughtcrime.securesms.avatar.Avatars
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader
 import org.thoughtcrime.securesms.mms.GlideApp
-import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
-import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
-import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel
-import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
+import org.thoughtcrime.securesms.util.MappingAdapter
+import org.thoughtcrime.securesms.util.MappingModel
+import org.thoughtcrime.securesms.util.MappingViewHolder
 import org.thoughtcrime.securesms.util.visible
 
 typealias OnAvatarClickListener = (Avatar, Boolean) -> Unit
@@ -28,7 +27,7 @@ object AvatarPickerItem {
   private val SELECTION_CHANGED = Any()
 
   fun register(adapter: MappingAdapter, onAvatarClickListener: OnAvatarClickListener, onAvatarLongClickListener: OnAvatarLongClickListener) {
-    adapter.registerFactory(Model::class.java, LayoutFactory({ ViewHolder(it, onAvatarClickListener, onAvatarLongClickListener) }, R.layout.avatar_picker_item))
+    adapter.registerFactory(Model::class.java, MappingAdapter.LayoutFactory({ ViewHolder(it, onAvatarClickListener, onAvatarLongClickListener) }, R.layout.avatar_picker_item))
   }
 
   class Model(val avatar: Avatar, val isSelected: Boolean) : MappingModel<Model> {

app/src/main/java/org/thoughtcrime/securesms/avatar/picker/AvatarPickerRepository.kt

@@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.avatar.AvatarPickerStorage
 import org.thoughtcrime.securesms.avatar.AvatarRenderer
 import org.thoughtcrime.securesms.avatar.Avatars
 import org.thoughtcrime.securesms.conversation.colors.AvatarColor
-import org.thoughtcrime.securesms.database.SignalDatabase
+import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.mediasend.Media
 import org.thoughtcrime.securesms.profiles.AvatarHelper
@@ -70,11 +70,11 @@ class AvatarPickerRepository(context: Context) {
   }
 
   fun getPersistedAvatarsForSelf(): Single<List<Avatar>> = Single.fromCallable {
-    SignalDatabase.avatarPicker.getAvatarsForSelf()
+    DatabaseFactory.getAvatarPickerDatabase(applicationContext).getAvatarsForSelf()
   }
 
   fun getPersistedAvatarsForGroup(groupId: GroupId): Single<List<Avatar>> = Single.fromCallable {
-    SignalDatabase.avatarPicker.getAvatarsForGroup(groupId)
+    DatabaseFactory.getAvatarPickerDatabase(applicationContext).getAvatarsForGroup(groupId)
   }
 
   fun getDefaultAvatarsForSelf(): Single<List<Avatar>> = Single.fromCallable {
@@ -97,7 +97,7 @@ class AvatarPickerRepository(context: Context) {
 
   fun persistAvatarForSelf(avatar: Avatar, onPersisted: (Avatar) -> Unit) {
     SignalExecutors.BOUNDED.execute {
-      val avatarDatabase = SignalDatabase.avatarPicker
+      val avatarDatabase = DatabaseFactory.getAvatarPickerDatabase(applicationContext)
       val savedAvatar = avatarDatabase.saveAvatarForSelf(avatar)
       avatarDatabase.markUsage(savedAvatar)
       onPersisted(savedAvatar)
@@ -106,7 +106,7 @@ class AvatarPickerRepository(context: Context) {
 
   fun persistAvatarForGroup(avatar: Avatar, groupId: GroupId, onPersisted: (Avatar) -> Unit) {
     SignalExecutors.BOUNDED.execute {
-      val avatarDatabase = SignalDatabase.avatarPicker
+      val avatarDatabase = DatabaseFactory.getAvatarPickerDatabase(applicationContext)
       val savedAvatar = avatarDatabase.saveAvatarForGroup(avatar, groupId)
       avatarDatabase.markUsage(savedAvatar)
       onPersisted(savedAvatar)
@@ -180,7 +180,7 @@ class AvatarPickerRepository(context: Context) {
   fun delete(avatar: Avatar, onDelete: () -> Unit) {
     SignalExecutors.BOUNDED.execute {
       if (avatar.databaseId is Avatar.DatabaseId.Saved) {
-        val avatarDatabase = SignalDatabase.avatarPicker
+        val avatarDatabase = DatabaseFactory.getAvatarPickerDatabase(applicationContext)
         avatarDatabase.deleteAvatar(avatar)
       }
       onDelete()

app/src/main/java/org/thoughtcrime/securesms/avatar/text/TextAvatarCreationFragment.kt

@@ -27,8 +27,8 @@ import org.thoughtcrime.securesms.components.BoldSelectionTabItem
 import org.thoughtcrime.securesms.components.ControllableTabLayout
 import org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout
 import org.thoughtcrime.securesms.components.recyclerview.GridDividerDecoration
+import org.thoughtcrime.securesms.util.MappingAdapter
 import org.thoughtcrime.securesms.util.ViewUtil
-import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 
 /**
  * Fragment to create an avatar based off of a Vector or Text (via a pager)
@@ -106,7 +106,7 @@ class TextAvatarCreationFragment : Fragment(R.layout.text_avatar_creation_fragme
       Navigation.findNavController(v).popBackStack()
     }
 
-    textInput.setOnEditorActionListener { _, actionId, _ ->
+    textInput.setOnEditorActionListener { v, actionId, event ->
       if (actionId == EditorInfo.IME_ACTION_NEXT) {
         tabLayout.getTabAt(1)?.select()
         true

app/src/main/java/org/thoughtcrime/securesms/avatar/vector/VectorAvatarCreationFragment.kt

@@ -15,8 +15,8 @@ import org.thoughtcrime.securesms.avatar.AvatarBundler
 import org.thoughtcrime.securesms.avatar.AvatarColorItem
 import org.thoughtcrime.securesms.avatar.Avatars
 import org.thoughtcrime.securesms.components.recyclerview.GridDividerDecoration
+import org.thoughtcrime.securesms.util.MappingAdapter
 import org.thoughtcrime.securesms.util.ViewUtil
-import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
 
 /**
  * Fragment to create an avatar based off a default vector.

app/src/main/java/org/thoughtcrime/securesms/backup/BackupCountQueries.kt

@@ -1,30 +0,0 @@
-package org.thoughtcrime.securesms.backup
-
-import org.thoughtcrime.securesms.database.AttachmentDatabase
-import org.thoughtcrime.securesms.database.GroupReceiptDatabase
-import org.thoughtcrime.securesms.database.MmsDatabase
-import org.thoughtcrime.securesms.database.SmsDatabase
-
-/**
- * Queries used by backup exporter to estimate total counts for various complicated tables.
- */
-object BackupCountQueries {
-
-  const val mmsCount: String = "SELECT COUNT(*) FROM ${MmsDatabase.TABLE_NAME} WHERE ${MmsDatabase.EXPIRES_IN} <= 0 AND ${MmsDatabase.VIEW_ONCE} <= 0"
-
-  const val smsCount: String = "SELECT COUNT(*) FROM ${SmsDatabase.TABLE_NAME} WHERE ${SmsDatabase.EXPIRES_IN} <= 0"
-
-  @get:JvmStatic
-  val groupReceiptCount: String = """
-      SELECT COUNT(*) FROM ${GroupReceiptDatabase.TABLE_NAME} 
-      INNER JOIN ${MmsDatabase.TABLE_NAME} ON ${GroupReceiptDatabase.TABLE_NAME}.${GroupReceiptDatabase.MMS_ID} = ${MmsDatabase.TABLE_NAME}.${MmsDatabase.ID} 
-      WHERE ${MmsDatabase.TABLE_NAME}.${MmsDatabase.EXPIRES_IN} <= 0 AND ${MmsDatabase.TABLE_NAME}.${MmsDatabase.VIEW_ONCE} <= 0
-  """.trimIndent()
-
-  @get:JvmStatic
-  val attachmentCount: String = """
-      SELECT COUNT(*) FROM ${AttachmentDatabase.TABLE_NAME} 
-      INNER JOIN ${MmsDatabase.TABLE_NAME} ON ${AttachmentDatabase.TABLE_NAME}.${AttachmentDatabase.MMS_ID} = ${MmsDatabase.TABLE_NAME}.${MmsDatabase.ID} 
-      WHERE ${MmsDatabase.TABLE_NAME}.${MmsDatabase.EXPIRES_IN} <= 0 AND ${MmsDatabase.TABLE_NAME}.${MmsDatabase.VIEW_ONCE} <= 0
-  """.trimIndent()
-}

app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupBase.java

@@ -13,12 +13,13 @@ import java.security.NoSuchAlgorithmException;
 
 public abstract class FullBackupBase {
 
-  private static final int DIGEST_ROUNDS = 250_000;
+  @SuppressWarnings("unused")
+  private static final String TAG = Log.tag(FullBackupBase.class);
 
   static class BackupStream {
     static @NonNull byte[] getBackupKey(@NonNull String passphrase, @Nullable byte[] salt) {
       try {
-        EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, 0, 0));
+        EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, 0));
 
         MessageDigest digest = MessageDigest.getInstance("SHA-512");
         byte[]        input  = passphrase.replace(" ", "").getBytes();
@@ -26,8 +27,8 @@ public abstract class FullBackupBase {
 
         if (salt != null) digest.update(salt);
 
-        for (int i = 0; i < DIGEST_ROUNDS; i++) {
-          if (i % 1000 == 0) EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, 0, 0));
+        for (int i=0;i<250000;i++) {
+          if (i % 1000 == 0) EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, 0));
           digest.update(hash);
           hash = digest.digest(input);
         }
@@ -46,34 +47,20 @@ public abstract class FullBackupBase {
     }
 
     private final Type type;
-    private final long count;
-    private final long estimatedTotalCount;
+    private final int count;
 
-    BackupEvent(Type type, long count, long estimatedTotalCount) {
-      this.type                = type;
-      this.count               = count;
-      this.estimatedTotalCount = estimatedTotalCount;
+    BackupEvent(Type type, int count) {
+      this.type  = type;
+      this.count = count;
     }
 
     public Type getType() {
       return type;
     }
 
-    public long getCount() {
+    public int getCount() {
       return count;
     }
-
-    public long getEstimatedTotalCount() {
-      return estimatedTotalCount;
-    }
-
-    public double getCompletionPercentage() {
-      if (estimatedTotalCount == 0) {
-        return 0;
-      }
-
-      return Math.min(99.9f, (double) count * 100L / (double) estimatedTotalCount);
-    }
   }
 
 }

app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java

@@ -13,7 +13,7 @@ import androidx.documentfile.provider.DocumentFile;
 import com.annimon.stream.function.Predicate;
 import com.google.protobuf.ByteString;
 
-import net.zetetic.database.sqlcipher.SQLiteDatabase;
+import net.sqlcipher.database.SQLiteDatabase;
 
 import org.greenrobot.eventbus.EventBus;
 import org.signal.core.util.Conversions;
@@ -27,12 +27,10 @@ import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.database.EmojiSearchDatabase;
 import org.thoughtcrime.securesms.database.GroupReceiptDatabase;
 import org.thoughtcrime.securesms.database.KeyValueDatabase;
-import org.thoughtcrime.securesms.database.MentionDatabase;
 import org.thoughtcrime.securesms.database.MmsDatabase;
 import org.thoughtcrime.securesms.database.MmsSmsColumns;
 import org.thoughtcrime.securesms.database.OneTimePreKeyDatabase;
 import org.thoughtcrime.securesms.database.PendingRetryReceiptDatabase;
-import org.thoughtcrime.securesms.database.ReactionDatabase;
 import org.thoughtcrime.securesms.database.SearchDatabase;
 import org.thoughtcrime.securesms.database.SenderKeyDatabase;
 import org.thoughtcrime.securesms.database.SenderKeySharedDatabase;
@@ -41,12 +39,11 @@ import org.thoughtcrime.securesms.database.SignedPreKeyDatabase;
 import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.thoughtcrime.securesms.database.StickerDatabase;
 import org.thoughtcrime.securesms.database.model.AvatarPickerDatabase;
-import org.thoughtcrime.securesms.database.model.MessageId;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.keyvalue.KeyValueDataSet;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
-import org.thoughtcrime.securesms.util.CursorUtil;
+import org.thoughtcrime.securesms.service.PendingRetryReceiptManager;
 import org.thoughtcrime.securesms.util.SetUtil;
 import org.thoughtcrime.securesms.util.Stopwatch;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
@@ -79,11 +76,6 @@ public class FullBackupExporter extends FullBackupBase {
 
   private static final String TAG = Log.tag(FullBackupExporter.class);
 
-  private static final long DATABASE_VERSION_RECORD_COUNT = 1L;
-  private static final long TABLE_RECORD_COUNT_MULTIPLIER = 3L;
-  private static final long IDENTITY_KEY_BACKUP_RECORD_COUNT = 2L;
-  private static final long FINAL_MESSAGE_COUNT = 1L;
-
   private static final Set<String> BLACKLISTED_TABLES = SetUtil.newHashSet(
     SignedPreKeyDatabase.TABLE_NAME,
     OneTimePreKeyDatabase.TABLE_NAME,
@@ -143,66 +135,58 @@ public class FullBackupExporter extends FullBackupBase {
                                      @NonNull BackupCancellationSignal cancellationSignal)
       throws IOException
   {
-    BackupFrameOutputStream outputStream          = new BackupFrameOutputStream(fileOutputStream, passphrase);
-    int                     count                 = 0;
-    long                    estimatedCountOutside = 0L;
+    BackupFrameOutputStream outputStream = new BackupFrameOutputStream(fileOutputStream, passphrase);
+    int                     count        = 0;
 
     try {
       outputStream.writeDatabaseVersion(input.getVersion());
       count++;
 
       List<String> tables = exportSchema(input, outputStream);
-      count += tables.size() * TABLE_RECORD_COUNT_MULTIPLIER;
-
-      final long estimatedCount = calculateCount(context, input, tables);
-      estimatedCountOutside = estimatedCount;
+      count += tables.size() * 3;
 
       Stopwatch stopwatch = new Stopwatch("Backup");
 
       for (String table : tables) {
         throwIfCanceled(cancellationSignal);
         if (table.equals(MmsDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, FullBackupExporter::isNonExpiringMmsMessage, null, count, estimatedCount, cancellationSignal);
+          count = exportTable(table, input, outputStream, FullBackupExporter::isNonExpiringMmsMessage, null, count, cancellationSignal);
         } else if (table.equals(SmsDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, FullBackupExporter::isNonExpiringSmsMessage, null, count, estimatedCount, cancellationSignal);
-        } else if (table.equals(ReactionDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, new MessageId(CursorUtil.requireLong(cursor, ReactionDatabase.MESSAGE_ID), CursorUtil.requireBoolean(cursor, ReactionDatabase.IS_MMS))), null, count, estimatedCount, cancellationSignal);
-        } else if (table.equals(MentionDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMmsMessage(input, CursorUtil.requireLong(cursor, MentionDatabase.MESSAGE_ID)), null, count, estimatedCount, cancellationSignal);
+          count = exportTable(table, input, outputStream, FullBackupExporter::isNonExpiringSmsMessage, null, count, cancellationSignal);
         } else if (table.equals(GroupReceiptDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMmsMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(GroupReceiptDatabase.MMS_ID))), null, count, estimatedCount, cancellationSignal);
+          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(GroupReceiptDatabase.MMS_ID))), null, count, cancellationSignal);
         } else if (table.equals(AttachmentDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMmsMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.MMS_ID))), (cursor, innerCount) -> exportAttachment(attachmentSecret, cursor, outputStream, innerCount, estimatedCount), count, estimatedCount, cancellationSignal);
+          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.MMS_ID))), (cursor, innerCount) -> exportAttachment(attachmentSecret, cursor, outputStream, innerCount), count, cancellationSignal);
         } else if (table.equals(StickerDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> true, (cursor, innerCount) -> exportSticker(attachmentSecret, cursor, outputStream, innerCount, estimatedCount), count, estimatedCount, cancellationSignal);
+          count = exportTable(table, input, outputStream, cursor -> true, (cursor, innerCount) -> exportSticker(attachmentSecret, cursor, outputStream, innerCount), count, cancellationSignal);
         } else if (!BLACKLISTED_TABLES.contains(table) && !table.startsWith("sqlite_")) {
-          count = exportTable(table, input, outputStream, null, null, count, estimatedCount, cancellationSignal);
+          count = exportTable(table, input, outputStream, null, null, count, cancellationSignal);
         }
         stopwatch.split("table::" + table);
       }
 
       for (BackupProtos.SharedPreference preference : IdentityKeyUtil.getBackupRecord(context)) {
         throwIfCanceled(cancellationSignal);
-        EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count, estimatedCount));
+        EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count));
         outputStream.write(preference);
       }
-
+      
       for (BackupProtos.SharedPreference preference : TextSecurePreferences.getPreferencesToSaveToBackup(context)) {
         throwIfCanceled(cancellationSignal);
-        EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count, estimatedCount));
+        EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count));
         outputStream.write(preference);
       }
 
       stopwatch.split("prefs");
 
-      count = exportKeyValues(outputStream, SignalStore.getKeysToIncludeInBackup(), count, estimatedCount, cancellationSignal);
+      count = exportKeyValues(outputStream, SignalStore.getKeysToIncludeInBackup(), count, cancellationSignal);
 
       stopwatch.split("key_values");
 
       for (AvatarHelper.Avatar avatar : AvatarHelper.getAvatars(context)) {
         throwIfCanceled(cancellationSignal);
         if (avatar != null) {
-          EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count, estimatedCount));
+          EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count));
           outputStream.write(avatar.getFilename(), avatar.getInputStream(), avatar.getLength());
         }
       }
@@ -215,49 +199,7 @@ public class FullBackupExporter extends FullBackupBase {
       if (closeOutputStream) {
         outputStream.close();
       }
-      EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.FINISHED, ++count, estimatedCountOutside));
-    }
-  }
-
-  private static long calculateCount(@NonNull Context context, @NonNull SQLiteDatabase input, List<String> tables) {
-    long count = DATABASE_VERSION_RECORD_COUNT + TABLE_RECORD_COUNT_MULTIPLIER * tables.size();
-
-    for (String table : tables) {
-      if (table.equals(MmsDatabase.TABLE_NAME)) {
-        count += getCount(input, BackupCountQueries.mmsCount);
-      } else if (table.equals(SmsDatabase.TABLE_NAME)) {
-        count += getCount(input, BackupCountQueries.smsCount);
-      } else if (table.equals(GroupReceiptDatabase.TABLE_NAME)) {
-        count += getCount(input, BackupCountQueries.getGroupReceiptCount());
-      } else if (table.equals(AttachmentDatabase.TABLE_NAME)) {
-        count += getCount(input, BackupCountQueries.getAttachmentCount());
-      } else if (table.equals(StickerDatabase.TABLE_NAME)) {
-        count += getCount(input, "SELECT COUNT(*) FROM " + table);
-      } else if (!BLACKLISTED_TABLES.contains(table) && !table.startsWith("sqlite_")) {
-        count += getCount(input, "SELECT COUNT(*) FROM " + table);
-      }
-    }
-
-    count += IDENTITY_KEY_BACKUP_RECORD_COUNT;
-
-    count += TextSecurePreferences.getPreferencesToSaveToBackupCount(context);
-
-    KeyValueDataSet dataSet = KeyValueDatabase.getInstance(ApplicationDependencies.getApplication())
-                                              .getDataSet();
-    for (String key : SignalStore.getKeysToIncludeInBackup()) {
-      if (dataSet.containsKey(key)) {
-        count++;
-      }
-    }
-
-    count += AvatarHelper.getAvatarCount(context);
-
-    return count + FINAL_MESSAGE_COUNT;
-  }
-
-  private static long getCount(@NonNull SQLiteDatabase input, @NonNull String query) {
-    try (Cursor cursor = input.rawQuery(query)) {
-      return cursor.moveToFirst() ? cursor.getLong(0) : 0;
+      EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.FINISHED, ++count));
     }
   }
 
@@ -303,7 +245,6 @@ public class FullBackupExporter extends FullBackupBase {
                                  @Nullable Predicate<Cursor> predicate,
                                  @Nullable PostProcessor postProcess,
                                  int count,
-                                 long estimatedCount,
                                  @NonNull BackupCancellationSignal cancellationSignal)
       throws IOException
   {
@@ -343,7 +284,7 @@ public class FullBackupExporter extends FullBackupBase {
 
           statement.append(')');
 
-          EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count, estimatedCount));
+          EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count));
           outputStream.write(statementBuilder.setStatement(statement.toString()).build());
 
           if (postProcess != null) {
@@ -356,7 +297,7 @@ public class FullBackupExporter extends FullBackupBase {
     return count;
   }
 
-  private static int exportAttachment(@NonNull AttachmentSecret attachmentSecret, @NonNull Cursor cursor, @NonNull BackupFrameOutputStream outputStream, int count, long estimatedCount) {
+  private static int exportAttachment(@NonNull AttachmentSecret attachmentSecret, @NonNull Cursor cursor, @NonNull BackupFrameOutputStream outputStream, int count) {
     try {
       long rowId    = cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.ROW_ID));
       long uniqueId = cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.UNIQUE_ID));
@@ -381,7 +322,7 @@ public class FullBackupExporter extends FullBackupBase {
         if (random != null && random.length == 32) inputStream = ModernDecryptingPartInputStream.createFor(attachmentSecret, random, new File(data), 0);
         else                                       inputStream = ClassicDecryptingPartInputStream.createFor(attachmentSecret, new File(data));
 
-        EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count, estimatedCount));
+        EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count));
         outputStream.write(new AttachmentId(rowId, uniqueId), inputStream, size);
       }
     } catch (IOException e) {
@@ -391,7 +332,7 @@ public class FullBackupExporter extends FullBackupBase {
     return count;
   }
 
-  private static int exportSticker(@NonNull AttachmentSecret attachmentSecret, @NonNull Cursor cursor, @NonNull BackupFrameOutputStream outputStream, int count, long estimatedCount) {
+  private static int exportSticker(@NonNull AttachmentSecret attachmentSecret, @NonNull Cursor cursor, @NonNull BackupFrameOutputStream outputStream, int count) {
     try {
       long rowId    = cursor.getLong(cursor.getColumnIndexOrThrow(StickerDatabase._ID));
       long size     = cursor.getLong(cursor.getColumnIndexOrThrow(StickerDatabase.FILE_LENGTH));
@@ -400,7 +341,7 @@ public class FullBackupExporter extends FullBackupBase {
       byte[] random = cursor.getBlob(cursor.getColumnIndexOrThrow(StickerDatabase.FILE_RANDOM));
 
       if (!TextUtils.isEmpty(data) && size > 0) {
-        EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count, estimatedCount));
+        EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count));
         InputStream inputStream = ModernDecryptingPartInputStream.createFor(attachmentSecret, random, new File(data), 0);
         outputStream.writeSticker(rowId, inputStream, size);
       }
@@ -431,7 +372,6 @@ public class FullBackupExporter extends FullBackupBase {
   private static int exportKeyValues(@NonNull BackupFrameOutputStream outputStream,
                                      @NonNull List<String> keysToIncludeInBackup,
                                      int count,
-                                     long estimatedCount,
                                      BackupCancellationSignal cancellationSignal) throws IOException
   {
     KeyValueDataSet dataSet = KeyValueDatabase.getInstance(ApplicationDependencies.getApplication())
@@ -462,7 +402,7 @@ public class FullBackupExporter extends FullBackupBase {
         throw new AssertionError("Unknown type: " + type);
       }
 
-      EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count, estimatedCount));
+      EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count));
       outputStream.write(builder.build());
     }
 
@@ -470,44 +410,23 @@ public class FullBackupExporter extends FullBackupBase {
   }
 
   private static boolean isNonExpiringMmsMessage(@NonNull Cursor cursor) {
-    return cursor.getLong(cursor.getColumnIndexOrThrow(MmsSmsColumns.EXPIRES_IN)) <= 0 &&
-           cursor.getLong(cursor.getColumnIndexOrThrow(MmsDatabase.VIEW_ONCE))    <= 0;
+    return cursor.getInt(cursor.getColumnIndexOrThrow(MmsSmsColumns.EXPIRES_IN)) <= 0 &&
+           cursor.getInt(cursor.getColumnIndexOrThrow(MmsDatabase.VIEW_ONCE))    <= 0;
   }
 
   private static boolean isNonExpiringSmsMessage(@NonNull Cursor cursor) {
-    return cursor.getLong(cursor.getColumnIndexOrThrow(MmsSmsColumns.EXPIRES_IN)) <= 0;
+    return cursor.getInt(cursor.getColumnIndexOrThrow(MmsSmsColumns.EXPIRES_IN)) <= 0;
   }
 
-  private static boolean isForNonExpiringMessage(@NonNull SQLiteDatabase db, @NonNull MessageId messageId) {
-    if (messageId.isMms()) {
-      return isForNonExpiringMmsMessage(db, messageId.getId());
-    } else {
-      return isForNonExpiringSmsMessage(db, messageId.getId());
-    }
-  }
-
-  private static boolean isForNonExpiringSmsMessage(@NonNull SQLiteDatabase db, long smsId) {
-    String[] columns = new String[] { SmsDatabase.EXPIRES_IN };
-    String   where   = SmsDatabase.ID + " = ?";
-    String[] args    = new String[] { String.valueOf(smsId) };
-
-    try (Cursor cursor = db.query(SmsDatabase.TABLE_NAME, columns, where, args, null, null, null)) {
-      if (cursor != null && cursor.moveToFirst()) {
-        return isNonExpiringSmsMessage(cursor);
-      }
-    }
-
-    return false;
-  }
-
-  private static boolean isForNonExpiringMmsMessage(@NonNull SQLiteDatabase db, long mmsId) {
+  private static boolean isForNonExpiringMessage(@NonNull SQLiteDatabase db, long mmsId) {
     String[] columns = new String[] { MmsDatabase.EXPIRES_IN, MmsDatabase.VIEW_ONCE};
     String   where   = MmsDatabase.ID + " = ?";
     String[] args    = new String[] { String.valueOf(mmsId) };
 
     try (Cursor mmsCursor = db.query(MmsDatabase.TABLE_NAME, columns, where, args, null, null, null)) {
       if (mmsCursor != null && mmsCursor.moveToFirst()) {
-        return isNonExpiringMmsMessage(mmsCursor);
+        return mmsCursor.getLong(mmsCursor.getColumnIndexOrThrow(MmsDatabase.EXPIRES_IN)) == 0 &&
+               mmsCursor.getLong(mmsCursor.getColumnIndexOrThrow(MmsDatabase.VIEW_ONCE))  == 0;
       }
     }
 

app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java

@@ -11,7 +11,7 @@ import android.util.Pair;
 
 import androidx.annotation.NonNull;
 
-import net.zetetic.database.sqlcipher.SQLiteDatabase;
+import net.sqlcipher.database.SQLiteDatabase;
 
 import org.greenrobot.eventbus.EventBus;
 import org.signal.core.util.Conversions;
@@ -95,7 +95,7 @@ public class FullBackupImporter extends FullBackupBase {
       BackupFrame frame;
 
       while (!(frame = inputStream.readFrame()).getEnd()) {
-        if (count % 100 == 0) EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, count, 0));
+        if (count % 100 == 0) EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, count));
         count++;
 
         if      (frame.hasVersion())    processVersion(db, frame.getVersion());
@@ -115,7 +115,7 @@ public class FullBackupImporter extends FullBackupBase {
       keyValueDatabase.endTransaction();
     }
 
-    EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.FINISHED, count, 0));
+    EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.FINISHED, count));
   }
 
   private static @NonNull InputStream getInputStream(@NonNull Context context, @NonNull Uri uri) throws IOException{
@@ -162,8 +162,9 @@ public class FullBackupImporter extends FullBackupBase {
   private static void processAttachment(@NonNull Context context, @NonNull AttachmentSecret attachmentSecret, @NonNull SQLiteDatabase db, @NonNull Attachment attachment, BackupRecordInputStream inputStream)
       throws IOException
   {
-    File                       dataFile = AttachmentDatabase.newFile(context);
-    Pair<byte[], OutputStream> output   = ModernEncryptingPartOutputStream.createFor(attachmentSecret, dataFile, false);
+    File                       partsDirectory = context.getDir(AttachmentDatabase.DIRECTORY, Context.MODE_PRIVATE);
+    File                       dataFile       = File.createTempFile("part", ".mms", partsDirectory);
+    Pair<byte[], OutputStream> output         = ModernEncryptingPartOutputStream.createFor(attachmentSecret, dataFile, false);
 
     ContentValues contentValues = new ContentValues();
 

app/src/main/java/org/thoughtcrime/securesms/badges/BadgeImageView.kt

@@ -1,94 +0,0 @@
-package org.thoughtcrime.securesms.badges
-
-import android.content.Context
-import android.util.AttributeSet
-import androidx.appcompat.widget.AppCompatImageView
-import androidx.core.content.res.use
-import com.bumptech.glide.load.resource.bitmap.DownsampleStrategy
-import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.badges.glide.BadgeSpriteTransformation
-import org.thoughtcrime.securesms.badges.models.Badge
-import org.thoughtcrime.securesms.mms.GlideApp
-import org.thoughtcrime.securesms.mms.GlideRequests
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.util.ThemeUtil
-import java.lang.IllegalArgumentException
-
-class BadgeImageView @JvmOverloads constructor(
-  context: Context,
-  attrs: AttributeSet? = null
-) : AppCompatImageView(context, attrs) {
-
-  private var badgeSize: Int = 0
-
-  init {
-    context.obtainStyledAttributes(attrs, R.styleable.BadgeImageView).use {
-      badgeSize = it.getInt(R.styleable.BadgeImageView_badge_size, 0)
-    }
-
-    isClickable = false
-  }
-
-  override fun setOnClickListener(l: OnClickListener?) {
-    val wasClickable = isClickable
-    super.setOnClickListener(l)
-    this.isClickable = wasClickable
-  }
-
-  fun setBadgeFromRecipient(recipient: Recipient?) {
-    getGlideRequests()?.let {
-      setBadgeFromRecipient(recipient, it)
-    } ?: clearDrawable()
-  }
-
-  fun setBadgeFromRecipient(recipient: Recipient?, glideRequests: GlideRequests) {
-    if (recipient == null || recipient.badges.isEmpty()) {
-      setBadge(null, glideRequests)
-    } else if (recipient.isSelf) {
-      val badge = recipient.featuredBadge
-      if (badge == null || !badge.visible || badge.isExpired()) {
-        setBadge(null, glideRequests)
-      } else {
-        setBadge(badge, glideRequests)
-      }
-    } else {
-      setBadge(recipient.featuredBadge, glideRequests)
-    }
-  }
-
-  fun setBadge(badge: Badge?) {
-    getGlideRequests()?.let {
-      setBadge(badge, it)
-    } ?: clearDrawable()
-  }
-
-  fun setBadge(badge: Badge?, glideRequests: GlideRequests) {
-    if (badge != null) {
-      glideRequests
-        .load(badge)
-        .downsample(DownsampleStrategy.NONE)
-        .transform(BadgeSpriteTransformation(BadgeSpriteTransformation.Size.fromInteger(badgeSize), badge.imageDensity, ThemeUtil.isDarkTheme(context)))
-        .into(this)
-
-      isClickable = true
-    } else {
-      glideRequests
-        .clear(this)
-      clearDrawable()
-    }
-  }
-
-  private fun clearDrawable() {
-    setImageDrawable(null)
-    isClickable = false
-  }
-
-  private fun getGlideRequests(): GlideRequests? {
-    return try {
-      GlideApp.with(this)
-    } catch (e: IllegalArgumentException) {
-      // View not attached to an activity or activity destroyed
-      null
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/badges/BadgeRepository.kt

@@ -1,41 +0,0 @@
-package org.thoughtcrime.securesms.badges
-
-import android.content.Context
-import io.reactivex.rxjava3.core.Completable
-import io.reactivex.rxjava3.schedulers.Schedulers
-import org.thoughtcrime.securesms.badges.models.Badge
-import org.thoughtcrime.securesms.database.RecipientDatabase
-import org.thoughtcrime.securesms.database.SignalDatabase
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.storage.StorageSyncHelper
-import org.thoughtcrime.securesms.util.ProfileUtil
-
-class BadgeRepository(context: Context) {
-
-  private val context = context.applicationContext
-
-  fun setVisibilityForAllBadges(
-    displayBadgesOnProfile: Boolean,
-    selfBadges: List<Badge> = Recipient.self().badges
-  ): Completable = Completable.fromAction {
-    val recipientDatabase: RecipientDatabase = SignalDatabase.recipients
-    val badges = selfBadges.map { it.copy(visible = displayBadgesOnProfile) }
-
-    ProfileUtil.uploadProfileWithBadges(context, badges)
-    SignalStore.donationsValues().setDisplayBadgesOnProfile(displayBadgesOnProfile)
-    recipientDatabase.markNeedsSync(Recipient.self().id)
-    StorageSyncHelper.scheduleSyncForDataChange()
-
-    recipientDatabase.setBadges(Recipient.self().id, badges)
-  }.subscribeOn(Schedulers.io())
-
-  fun setFeaturedBadge(featuredBadge: Badge): Completable = Completable.fromAction {
-    val badges = Recipient.self().badges
-    val reOrderedBadges = listOf(featuredBadge.copy(visible = true)) + (badges.filterNot { it.id == featuredBadge.id })
-    ProfileUtil.uploadProfileWithBadges(context, reOrderedBadges)
-
-    val recipientDatabase: RecipientDatabase = SignalDatabase.recipients
-    recipientDatabase.setBadges(Recipient.self().id, reOrderedBadges)
-  }.subscribeOn(Schedulers.io())
-}

app/src/main/java/org/thoughtcrime/securesms/badges/Badges.kt

@@ -1,128 +0,0 @@
-package org.thoughtcrime.securesms.badges
-
-import android.content.Context
-import android.net.Uri
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.flexbox.AlignItems
-import com.google.android.flexbox.FlexDirection
-import com.google.android.flexbox.FlexboxLayoutManager
-import com.google.android.flexbox.JustifyContent
-import org.signal.core.util.DimensionUnit
-import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.BuildConfig
-import org.thoughtcrime.securesms.badges.models.Badge
-import org.thoughtcrime.securesms.badges.models.Badge.Category.Companion.fromCode
-import org.thoughtcrime.securesms.components.settings.DSLConfiguration
-import org.thoughtcrime.securesms.database.model.databaseprotos.BadgeList
-import org.thoughtcrime.securesms.util.ScreenDensity
-import org.whispersystems.libsignal.util.Pair
-import org.whispersystems.signalservice.api.profiles.SignalServiceProfile
-import java.math.BigDecimal
-import java.sql.Timestamp
-
-object Badges {
-
-  private val TAG: String = Log.tag(Badges::class.java)
-
-  fun DSLConfiguration.displayBadges(
-    context: Context,
-    badges: List<Badge>,
-    selectedBadge: Badge? = null,
-    fadedBadgeId: String? = null
-  ) {
-    badges
-      .map {
-        Badge.Model(
-          badge = it,
-          isSelected = it == selectedBadge,
-          isFaded = it.id == fadedBadgeId
-        )
-      }
-      .forEach { customPref(it) }
-
-    val badgeSize = DimensionUnit.DP.toPixels(88f)
-    val windowWidth = context.resources.displayMetrics.widthPixels
-    val perRow = (windowWidth / badgeSize).toInt()
-
-    val empties = ((perRow - (badges.size % perRow)) % perRow)
-    repeat(empties) {
-      customPref(Badge.EmptyModel())
-    }
-  }
-
-  fun createLayoutManagerForGridWithBadges(context: Context): RecyclerView.LayoutManager {
-    val layoutManager = FlexboxLayoutManager(context)
-
-    layoutManager.flexDirection = FlexDirection.ROW
-    layoutManager.alignItems = AlignItems.CENTER
-    layoutManager.justifyContent = JustifyContent.CENTER
-
-    return layoutManager
-  }
-
-  private fun getBadgeImageUri(densityPath: String): Uri {
-    return Uri.parse(BuildConfig.BADGE_STATIC_ROOT).buildUpon()
-      .appendPath(densityPath)
-      .build()
-  }
-
-  private fun getBestBadgeImageUriForDevice(serviceBadge: SignalServiceProfile.Badge): Pair<Uri, String> {
-    return when (ScreenDensity.getBestDensityBucketForDevice()) {
-      "ldpi" -> Pair(getBadgeImageUri(serviceBadge.sprites6[0]), "ldpi")
-      "mdpi" -> Pair(getBadgeImageUri(serviceBadge.sprites6[1]), "mdpi")
-      "hdpi" -> Pair(getBadgeImageUri(serviceBadge.sprites6[2]), "hdpi")
-      "xxhdpi" -> Pair(getBadgeImageUri(serviceBadge.sprites6[4]), "xxhdpi")
-      "xxxhdpi" -> Pair(getBadgeImageUri(serviceBadge.sprites6[5]), "xxxhdpi")
-      else -> Pair(getBadgeImageUri(serviceBadge.sprites6[3]), "xhdpi")
-    }.also {
-      Log.d(TAG, "Selected badge density ${it.second()}")
-    }
-  }
-
-  private fun getTimestamp(bigDecimal: BigDecimal): Long {
-    return Timestamp(bigDecimal.toLong() * 1000).time
-  }
-
-  @JvmStatic
-  fun fromDatabaseBadge(badge: BadgeList.Badge): Badge {
-    return Badge(
-      badge.id,
-      fromCode(badge.category),
-      badge.name,
-      badge.description,
-      Uri.parse(badge.imageUrl),
-      badge.imageDensity,
-      badge.expiration,
-      badge.visible
-    )
-  }
-
-  @JvmStatic
-  fun toDatabaseBadge(badge: Badge): BadgeList.Badge {
-    return BadgeList.Badge.newBuilder()
-      .setId(badge.id)
-      .setCategory(badge.category.code)
-      .setDescription(badge.description)
-      .setExpiration(badge.expirationTimestamp)
-      .setVisible(badge.visible)
-      .setName(badge.name)
-      .setImageUrl(badge.imageUrl.toString())
-      .setImageDensity(badge.imageDensity)
-      .build()
-  }
-
-  @JvmStatic
-  fun fromServiceBadge(serviceBadge: SignalServiceProfile.Badge): Badge {
-    val uriAndDensity: Pair<Uri, String> = getBestBadgeImageUriForDevice(serviceBadge)
-    return Badge(
-      serviceBadge.id,
-      fromCode(serviceBadge.category),
-      serviceBadge.name,
-      serviceBadge.description,
-      uriAndDensity.first(),
-      uriAndDensity.second(),
-      serviceBadge.expiration?.let { getTimestamp(it) } ?: 0,
-      serviceBadge.isVisible
-    )
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/badges/glide/BadgeSpriteTransformation.kt

@@ -1,165 +0,0 @@
-package org.thoughtcrime.securesms.badges.glide
-
-import android.graphics.Bitmap
-import android.graphics.Canvas
-import android.graphics.Rect
-import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool
-import com.bumptech.glide.load.resource.bitmap.BitmapTransformation
-import java.security.MessageDigest
-
-/**
- * Cuts out the badge of the requested size from the sprite sheet.
- */
-class BadgeSpriteTransformation(
-  private val size: Size,
-  private val density: String,
-  private val isDarkTheme: Boolean
-) : BitmapTransformation() {
-
-  private val id = "BadgeSpriteTransformation(${size.code},$density,$isDarkTheme).$VERSION"
-
-  override fun updateDiskCacheKey(messageDigest: MessageDigest) {
-    messageDigest.update(id.toByteArray(CHARSET))
-  }
-
-  override fun equals(other: Any?): Boolean {
-    return (other as? BadgeSpriteTransformation)?.id == id
-  }
-
-  override fun hashCode(): Int {
-    return id.hashCode()
-  }
-
-  override fun transform(pool: BitmapPool, toTransform: Bitmap, outWidth: Int, outHeight: Int): Bitmap {
-    val outBitmap = pool.get(outWidth, outHeight, Bitmap.Config.ARGB_8888)
-    val canvas = Canvas(outBitmap)
-    val inBounds = getInBounds(density, size, isDarkTheme)
-    val outBounds = Rect(0, 0, outWidth, outHeight)
-
-    canvas.drawBitmap(toTransform, inBounds, outBounds, null)
-
-    return outBitmap
-  }
-
-  enum class Size(val code: String, val frameMap: Map<Density, FrameSet>) {
-    SMALL(
-      "small",
-      mapOf(
-        Density.LDPI to FrameSet(Frame(124, 1, 12, 12), Frame(145, 31, 12, 12)),
-        Density.MDPI to FrameSet(Frame(163, 1, 16, 16), Frame(189, 39, 16, 16)),
-        Density.HDPI to FrameSet(Frame(244, 1, 24, 24), Frame(283, 58, 24, 24)),
-        Density.XHDPI to FrameSet(Frame(323, 1, 32, 32), Frame(373, 75, 32, 32)),
-        Density.XXHDPI to FrameSet(Frame(483, 1, 48, 48), Frame(557, 111, 48, 48)),
-        Density.XXXHDPI to FrameSet(Frame(643, 1, 64, 64), Frame(741, 147, 64, 64))
-      )
-    ),
-    MEDIUM(
-      "medium",
-      mapOf(
-        Density.LDPI to FrameSet(Frame(124, 16, 18, 18), Frame(160, 31, 18, 18)),
-        Density.MDPI to FrameSet(Frame(163, 19, 24, 24), Frame(207, 39, 24, 24)),
-        Density.HDPI to FrameSet(Frame(244, 28, 36, 36), Frame(310, 58, 36, 36)),
-        Density.XHDPI to FrameSet(Frame(323, 35, 48, 48), Frame(407, 75, 48, 48)),
-        Density.XXHDPI to FrameSet(Frame(483, 51, 72, 72), Frame(607, 111, 72, 72)),
-        Density.XXXHDPI to FrameSet(Frame(643, 67, 96, 96), Frame(807, 147, 96, 96))
-      )
-    ),
-    LARGE(
-      "large",
-      mapOf(
-        Density.LDPI to FrameSet(Frame(145, 1, 27, 27), Frame(124, 46, 27, 27)),
-        Density.MDPI to FrameSet(Frame(189, 1, 36, 36), Frame(163, 57, 36, 36)),
-        Density.HDPI to FrameSet(Frame(283, 1, 54, 54), Frame(244, 85, 54, 54)),
-        Density.XHDPI to FrameSet(Frame(373, 1, 72, 72), Frame(323, 109, 72, 72)),
-        Density.XXHDPI to FrameSet(Frame(557, 1, 108, 108), Frame(483, 161, 108, 108)),
-        Density.XXXHDPI to FrameSet(Frame(741, 1, 144, 144), Frame(643, 213, 144, 144))
-      )
-    ),
-    BADGE_64(
-      "badge_64",
-      mapOf(
-        Density.LDPI to FrameSet(Frame(124, 73, 48, 48), Frame(124, 73, 48, 48)),
-        Density.MDPI to FrameSet(Frame(163, 97, 64, 64), Frame(163, 97, 64, 64)),
-        Density.HDPI to FrameSet(Frame(244, 145, 96, 96), Frame(244, 145, 96, 96)),
-        Density.XHDPI to FrameSet(Frame(323, 193, 128, 128), Frame(323, 193, 128, 128)),
-        Density.XXHDPI to FrameSet(Frame(483, 289, 192, 192), Frame(483, 289, 192, 192)),
-        Density.XXXHDPI to FrameSet(Frame(643, 385, 256, 256), Frame(643, 385, 256, 256))
-      )
-    ),
-    BADGE_112(
-      "badge_112",
-      mapOf(
-        Density.LDPI to FrameSet(Frame(181, 1, 84, 84), Frame(181, 1, 84, 84)),
-        Density.MDPI to FrameSet(Frame(233, 1, 112, 112), Frame(233, 1, 112, 112)),
-        Density.HDPI to FrameSet(Frame(349, 1, 168, 168), Frame(349, 1, 168, 168)),
-        Density.XHDPI to FrameSet(Frame(457, 1, 224, 224), Frame(457, 1, 224, 224)),
-        Density.XXHDPI to FrameSet(Frame(681, 1, 336, 336), Frame(681, 1, 336, 336)),
-        Density.XXXHDPI to FrameSet(Frame(905, 1, 448, 448), Frame(905, 1, 448, 448))
-      )
-    ),
-    XLARGE(
-      "xlarge",
-      mapOf(
-        Density.LDPI to FrameSet(Frame(1, 1, 120, 120), Frame(1, 1, 120, 120)),
-        Density.MDPI to FrameSet(Frame(1, 1, 160, 160), Frame(1, 1, 160, 160)),
-        Density.HDPI to FrameSet(Frame(1, 1, 240, 240), Frame(1, 1, 240, 240)),
-        Density.XHDPI to FrameSet(Frame(1, 1, 320, 320), Frame(1, 1, 320, 320)),
-        Density.XXHDPI to FrameSet(Frame(1, 1, 480, 480), Frame(1, 1, 480, 480)),
-        Density.XXXHDPI to FrameSet(Frame(1, 1, 640, 640), Frame(1, 1, 640, 640))
-      )
-    );
-
-    companion object {
-      fun fromInteger(integer: Int): Size {
-        return when (integer) {
-          0 -> SMALL
-          1 -> MEDIUM
-          2 -> LARGE
-          3 -> XLARGE
-          4 -> BADGE_64
-          5 -> BADGE_112
-          else -> LARGE
-        }
-      }
-    }
-  }
-
-  enum class Density(val density: String) {
-    LDPI("ldpi"),
-    MDPI("mdpi"),
-    HDPI("hdpi"),
-    XHDPI("xhdpi"),
-    XXHDPI("xxhdpi"),
-    XXXHDPI("xxxhdpi")
-  }
-
-  data class FrameSet(val light: Frame, val dark: Frame)
-
-  data class Frame(
-    val x: Int,
-    val y: Int,
-    val width: Int,
-    val height: Int
-  ) {
-    fun toBounds(): Rect {
-      return Rect(x, y, x + width, y + height)
-    }
-  }
-
-  companion object {
-    private const val VERSION = 3
-
-    private fun getDensity(density: String): Density {
-      return Density.values().first { it.density == density }
-    }
-
-    private fun getFrame(size: Size, density: Density, isDarkTheme: Boolean): Frame {
-      val frameSet: FrameSet = size.frameMap[density]!!
-      return if (isDarkTheme) frameSet.dark else frameSet.light
-    }
-
-    private fun getInBounds(density: String, size: Size, isDarkTheme: Boolean): Rect {
-      return getFrame(size, getDensity(density), isDarkTheme).toBounds()
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/badges/models/Badge.kt

@@ -1,173 +0,0 @@
-package org.thoughtcrime.securesms.badges.models
-
-import android.animation.ObjectAnimator
-import android.net.Uri
-import android.os.Parcelable
-import android.view.View
-import android.widget.ImageView
-import android.widget.TextView
-import com.bumptech.glide.load.Key
-import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.bumptech.glide.load.resource.bitmap.DownsampleStrategy
-import kotlinx.parcelize.Parcelize
-import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.badges.glide.BadgeSpriteTransformation
-import org.thoughtcrime.securesms.components.settings.PreferenceModel
-import org.thoughtcrime.securesms.mms.GlideApp
-import org.thoughtcrime.securesms.util.ThemeUtil
-import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
-import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
-import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
-import java.security.MessageDigest
-
-typealias OnBadgeClicked = (Badge, Boolean, Boolean) -> Unit
-
-/**
- * A Badge that can be collected and displayed by a user.
- */
-@Parcelize
-data class Badge(
-  val id: String,
-  val category: Category,
-  val name: String,
-  val description: String,
-  val imageUrl: Uri,
-  val imageDensity: String,
-  val expirationTimestamp: Long,
-  val visible: Boolean,
-) : Parcelable, Key {
-
-  fun isExpired(): Boolean = expirationTimestamp < System.currentTimeMillis() && expirationTimestamp > 0
-  fun isBoost(): Boolean = id == BOOST_BADGE_ID
-
-  override fun updateDiskCacheKey(messageDigest: MessageDigest) {
-    messageDigest.update(id.toByteArray(Key.CHARSET))
-    messageDigest.update(imageUrl.toString().toByteArray(Key.CHARSET))
-    messageDigest.update(imageDensity.toByteArray(Key.CHARSET))
-  }
-
-  fun resolveDescription(shortName: String): String {
-    return description.replace("{short_name}", shortName)
-  }
-
-  class EmptyModel : PreferenceModel<EmptyModel>() {
-    override fun areItemsTheSame(newItem: EmptyModel): Boolean = true
-  }
-
-  class EmptyViewHolder(itemView: View) : MappingViewHolder<EmptyModel>(itemView) {
-
-    private val name: TextView = itemView.findViewById(R.id.name)
-
-    init {
-      itemView.isEnabled = false
-      itemView.isFocusable = false
-      itemView.isClickable = false
-      itemView.visibility = View.INVISIBLE
-
-      name.text = " "
-    }
-
-    override fun bind(model: EmptyModel) = Unit
-  }
-
-  class Model(
-    val badge: Badge,
-    val isSelected: Boolean = false,
-    val isFaded: Boolean = false
-  ) : PreferenceModel<Model>() {
-    override fun areItemsTheSame(newItem: Model): Boolean {
-      return newItem.badge.id == badge.id
-    }
-
-    override fun areContentsTheSame(newItem: Model): Boolean {
-      return super.areContentsTheSame(newItem) &&
-        badge == newItem.badge &&
-        isSelected == newItem.isSelected &&
-        isFaded == newItem.isFaded
-    }
-
-    override fun getChangePayload(newItem: Model): Any? {
-      return if (badge == newItem.badge && isSelected != newItem.isSelected) {
-        SELECTION_CHANGED
-      } else {
-        null
-      }
-    }
-  }
-
-  class ViewHolder(itemView: View, private val onBadgeClicked: OnBadgeClicked) : MappingViewHolder<Model>(itemView) {
-
-    private val check: ImageView = itemView.findViewById(R.id.checkmark)
-    private val badge: ImageView = itemView.findViewById(R.id.badge)
-    private val name: TextView = itemView.findViewById(R.id.name)
-
-    private var checkAnimator: ObjectAnimator? = null
-
-    init {
-      check.isSelected = true
-    }
-
-    override fun bind(model: Model) {
-      itemView.setOnClickListener {
-        onBadgeClicked(model.badge, model.isSelected, model.isFaded)
-      }
-
-      checkAnimator?.cancel()
-      if (payload.isNotEmpty()) {
-        checkAnimator = if (model.isSelected) {
-          ObjectAnimator.ofFloat(check, "alpha", 1f)
-        } else {
-          ObjectAnimator.ofFloat(check, "alpha", 0f)
-        }
-        checkAnimator?.start()
-        return
-      }
-
-      badge.alpha = if (model.badge.isExpired() || model.isFaded) 0.5f else 1f
-
-      GlideApp.with(badge)
-        .load(model.badge)
-        .downsample(DownsampleStrategy.NONE)
-        .diskCacheStrategy(DiskCacheStrategy.NONE)
-        .transform(
-          BadgeSpriteTransformation(BadgeSpriteTransformation.Size.BADGE_64, model.badge.imageDensity, ThemeUtil.isDarkTheme(context)),
-        )
-        .into(badge)
-
-      if (model.isSelected) {
-        check.alpha = 1f
-      } else {
-        check.alpha = 0f
-      }
-
-      name.text = model.badge.name
-    }
-  }
-
-  enum class Category(val code: String) {
-    Donor("donor"),
-    Other("other"),
-    Testing("testing"); // Will be removed before final release
-
-    companion object {
-      fun fromCode(code: String): Category {
-        return when (code) {
-          "donor" -> Donor
-          "testing" -> Testing
-          else -> Other
-        }
-      }
-    }
-  }
-
-  companion object {
-    const val BOOST_BADGE_ID = "BOOST"
-
-    private val SELECTION_CHANGED = Any()
-
-    fun register(mappingAdapter: MappingAdapter, onBadgeClicked: OnBadgeClicked) {
-      mappingAdapter.registerFactory(Model::class.java, LayoutFactory({ ViewHolder(it, onBadgeClicked) }, R.layout.badge_preference_view))
-      mappingAdapter.registerFactory(EmptyModel::class.java, LayoutFactory({ EmptyViewHolder(it) }, R.layout.badge_preference_view))
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/badges/models/BadgePreview.kt

@@ -1,66 +0,0 @@
-package org.thoughtcrime.securesms.badges.models
-
-import android.view.View
-import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.badges.BadgeImageView
-import org.thoughtcrime.securesms.components.AvatarImageView
-import org.thoughtcrime.securesms.components.settings.PreferenceModel
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
-import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
-import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
-
-object BadgePreview {
-
-  fun register(mappingAdapter: MappingAdapter) {
-    mappingAdapter.registerFactory(Model::class.java, LayoutFactory({ ViewHolder(it) }, R.layout.featured_badge_preview_preference))
-    mappingAdapter.registerFactory(SubscriptionModel::class.java, LayoutFactory({ ViewHolder(it) }, R.layout.subscription_flow_badge_preview_preference))
-  }
-
-  abstract class BadgeModel<T : BadgeModel<T>> : PreferenceModel<T>() {
-    abstract val badge: Badge?
-  }
-
-  data class Model(override val badge: Badge?) : BadgeModel<Model>() {
-    override fun areItemsTheSame(newItem: Model): Boolean {
-      return true
-    }
-
-    override fun areContentsTheSame(newItem: Model): Boolean {
-      return super.areContentsTheSame(newItem) && badge == newItem.badge
-    }
-
-    override fun getChangePayload(newItem: Model): Any? {
-      return Unit
-    }
-  }
-
-  data class SubscriptionModel(override val badge: Badge?) : BadgeModel<SubscriptionModel>() {
-    override fun areItemsTheSame(newItem: SubscriptionModel): Boolean {
-      return true
-    }
-
-    override fun areContentsTheSame(newItem: SubscriptionModel): Boolean {
-      return super.areContentsTheSame(newItem) && badge == newItem.badge
-    }
-
-    override fun getChangePayload(newItem: SubscriptionModel): Any? {
-      return Unit
-    }
-  }
-
-  class ViewHolder<T : BadgeModel<T>>(itemView: View) : MappingViewHolder<T>(itemView) {
-
-    private val avatar: AvatarImageView = itemView.findViewById(R.id.avatar)
-    private val badge: BadgeImageView = itemView.findViewById(R.id.badge)
-
-    override fun bind(model: T) {
-      if (payload.isEmpty()) {
-        avatar.setRecipient(Recipient.self())
-        avatar.disableQuickContact()
-      }
-
-      badge.setBadge(model.badge)
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/badges/models/ExpiredBadge.kt

@@ -1,35 +0,0 @@
-package org.thoughtcrime.securesms.badges.models
-
-import android.view.View
-import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.badges.BadgeImageView
-import org.thoughtcrime.securesms.components.settings.PreferenceModel
-import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
-import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
-import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
-
-object ExpiredBadge {
-
-  class Model(val badge: Badge) : PreferenceModel<Model>() {
-    override fun areItemsTheSame(newItem: Model): Boolean {
-      return newItem.badge.id == badge.id
-    }
-
-    override fun areContentsTheSame(newItem: Model): Boolean {
-      return super.areContentsTheSame(newItem) && newItem.badge == badge
-    }
-  }
-
-  class ViewHolder(itemView: View) : MappingViewHolder<Model>(itemView) {
-
-    private val badge: BadgeImageView = itemView.findViewById(R.id.expired_badge)
-
-    override fun bind(model: Model) {
-      badge.setBadge(model.badge)
-    }
-  }
-
-  fun register(adapter: MappingAdapter) {
-    adapter.registerFactory(Model::class.java, LayoutFactory({ ViewHolder(it) }, R.layout.expired_badge_preference))
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/badges/models/LargeBadge.kt

@@ -1,59 +0,0 @@
-package org.thoughtcrime.securesms.badges.models
-
-import android.view.View
-import android.widget.TextView
-import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.badges.BadgeImageView
-import org.thoughtcrime.securesms.util.adapter.mapping.LayoutFactory
-import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
-import org.thoughtcrime.securesms.util.adapter.mapping.MappingModel
-import org.thoughtcrime.securesms.util.adapter.mapping.MappingViewHolder
-
-data class LargeBadge(
-  val badge: Badge
-) {
-
-  class Model(val largeBadge: LargeBadge, val shortName: String, val maxLines: Int) : MappingModel<Model> {
-    override fun areItemsTheSame(newItem: Model): Boolean {
-      return newItem.largeBadge.badge.id == largeBadge.badge.id
-    }
-
-    override fun areContentsTheSame(newItem: Model): Boolean {
-      return newItem.largeBadge == largeBadge && newItem.shortName == shortName && newItem.maxLines == maxLines
-    }
-  }
-
-  class EmptyModel : MappingModel<EmptyModel> {
-    override fun areItemsTheSame(newItem: EmptyModel): Boolean = true
-    override fun areContentsTheSame(newItem: EmptyModel): Boolean = true
-  }
-
-  class EmptyViewHolder(itemView: View) : MappingViewHolder<EmptyModel>(itemView) {
-    override fun bind(model: EmptyModel) {
-    }
-  }
-
-  class ViewHolder(itemView: View) : MappingViewHolder<Model>(itemView) {
-
-    private val badge: BadgeImageView = itemView.findViewById(R.id.badge)
-    private val name: TextView = itemView.findViewById(R.id.name)
-    private val description: TextView = itemView.findViewById(R.id.description)
-
-    override fun bind(model: Model) {
-      badge.setBadge(model.largeBadge.badge)
-
-      name.text = model.largeBadge.badge.name
-      description.text = model.largeBadge.badge.resolveDescription(model.shortName)
-      description.setLines(model.maxLines)
-      description.maxLines = model.maxLines
-      description.minLines = model.maxLines
-    }
-  }
-
-  companion object {
-    fun register(mappingAdapter: MappingAdapter) {
-      mappingAdapter.registerFactory(Model::class.java, LayoutFactory({ ViewHolder(it) }, R.layout.view_badge_bottom_sheet_dialog_fragment_page))
-      mappingAdapter.registerFactory(EmptyModel::class.java, LayoutFactory({ EmptyViewHolder(it) }, R.layout.view_badge_bottom_sheet_dialog_fragment_page))
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/badges/self/expired/ExpiredBadgeBottomSheetDialogFragment.kt

@@ -1,120 +0,0 @@
-package org.thoughtcrime.securesms.badges.self.expired
-
-import androidx.fragment.app.FragmentManager
-import org.signal.core.util.DimensionUnit
-import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.badges.models.Badge
-import org.thoughtcrime.securesms.badges.models.ExpiredBadge
-import org.thoughtcrime.securesms.components.settings.DSLConfiguration
-import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter
-import org.thoughtcrime.securesms.components.settings.DSLSettingsBottomSheetFragment
-import org.thoughtcrime.securesms.components.settings.DSLSettingsText
-import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
-import org.thoughtcrime.securesms.components.settings.configure
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.util.BottomSheetUtil
-
-/**
- * Bottom sheet displaying a fading badge with a notice and action for becoming a subscriber again.
- */
-class ExpiredBadgeBottomSheetDialogFragment : DSLSettingsBottomSheetFragment(
-  peekHeightPercentage = 1f
-) {
-  override fun bindAdapter(adapter: DSLSettingsAdapter) {
-    ExpiredBadge.register(adapter)
-
-    adapter.submitList(getConfiguration().toMappingModelList())
-  }
-
-  private fun getConfiguration(): DSLConfiguration {
-    val badge: Badge = ExpiredBadgeBottomSheetDialogFragmentArgs.fromBundle(requireArguments()).badge
-    val isLikelyASustainer = SignalStore.donationsValues().isLikelyASustainer()
-
-    return configure {
-      customPref(ExpiredBadge.Model(badge))
-
-      sectionHeaderPref(
-        DSLSettingsText.from(
-          if (badge.isBoost()) {
-            R.string.ExpiredBadgeBottomSheetDialogFragment__your_badge_has_expired
-          } else {
-            R.string.ExpiredBadgeBottomSheetDialogFragment__subscription_cancelled
-          },
-          DSLSettingsText.CenterModifier
-        )
-      )
-
-      space(DimensionUnit.DP.toPixels(4f).toInt())
-
-      noPadTextPref(
-        DSLSettingsText.from(
-          if (badge.isBoost()) {
-            getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_boost_badge_has_expired)
-          } else {
-            getString(R.string.ExpiredBadgeBottomSheetDialogFragment__your_sustainer, badge.name)
-          },
-          DSLSettingsText.CenterModifier
-        )
-      )
-
-      space(DimensionUnit.DP.toPixels(16f).toInt())
-
-      noPadTextPref(
-        DSLSettingsText.from(
-          if (badge.isBoost()) {
-            if (isLikelyASustainer) {
-              R.string.ExpiredBadgeBottomSheetDialogFragment__you_can_reactivate
-            } else {
-              R.string.ExpiredBadgeBottomSheetDialogFragment__to_continue_supporting_technology
-            }
-          } else {
-            R.string.ExpiredBadgeBottomSheetDialogFragment__you_can
-          },
-          DSLSettingsText.CenterModifier
-        )
-      )
-
-      space(DimensionUnit.DP.toPixels(92f).toInt())
-
-      primaryButton(
-        text = DSLSettingsText.from(
-          if (badge.isBoost()) {
-            if (isLikelyASustainer) {
-              R.string.ExpiredBadgeBottomSheetDialogFragment__add_a_boost
-            } else {
-              R.string.ExpiredBadgeBottomSheetDialogFragment__become_a_sustainer
-            }
-          } else {
-            R.string.ExpiredBadgeBottomSheetDialogFragment__renew_subscription
-          }
-        ),
-        onClick = {
-          dismiss()
-          if (isLikelyASustainer) {
-            requireActivity().startActivity(AppSettingsActivity.boost(requireContext()))
-          } else {
-            requireActivity().startActivity(AppSettingsActivity.subscriptions(requireContext()))
-          }
-        }
-      )
-
-      secondaryButtonNoOutline(
-        text = DSLSettingsText.from(R.string.ExpiredBadgeBottomSheetDialogFragment__not_now),
-        onClick = {
-          dismiss()
-        }
-      )
-    }
-  }
-
-  companion object {
-    @JvmStatic
-    fun show(badge: Badge, fragmentManager: FragmentManager) {
-      val args = ExpiredBadgeBottomSheetDialogFragmentArgs.Builder(badge).build()
-      val fragment = ExpiredBadgeBottomSheetDialogFragment()
-      fragment.arguments = args.toBundle()
-
-      fragment.show(fragmentManager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG)
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/badges/self/featured/SelectFeaturedBadgeEvent.kt

@@ -1,7 +0,0 @@
-package org.thoughtcrime.securesms.badges.self.featured
-
-enum class SelectFeaturedBadgeEvent {
-  NO_BADGE_SELECTED,
-  FAILED_TO_UPDATE_PROFILE,
-  SAVE_SUCCESSFUL
-}

app/src/main/java/org/thoughtcrime/securesms/badges/self/featured/SelectFeaturedBadgeFragment.kt

@@ -1,93 +0,0 @@
-package org.thoughtcrime.securesms.badges.self.featured
-
-import android.os.Bundle
-import android.view.View
-import android.widget.Toast
-import androidx.fragment.app.viewModels
-import androidx.navigation.fragment.findNavController
-import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.badges.BadgeRepository
-import org.thoughtcrime.securesms.badges.Badges
-import org.thoughtcrime.securesms.badges.Badges.displayBadges
-import org.thoughtcrime.securesms.badges.models.Badge
-import org.thoughtcrime.securesms.badges.models.BadgePreview
-import org.thoughtcrime.securesms.components.recyclerview.OnScrollAnimationHelper
-import org.thoughtcrime.securesms.components.recyclerview.ToolbarShadowAnimationHelper
-import org.thoughtcrime.securesms.components.settings.DSLConfiguration
-import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter
-import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
-import org.thoughtcrime.securesms.components.settings.configure
-import org.thoughtcrime.securesms.util.LifecycleDisposable
-
-/**
- * Fragment which allows user to select one of their badges to be their "Featured" badge.
- */
-class SelectFeaturedBadgeFragment : DSLSettingsFragment(
-  titleId = R.string.BadgesOverviewFragment__featured_badge,
-  layoutId = R.layout.select_featured_badge_fragment,
-  layoutManagerProducer = Badges::createLayoutManagerForGridWithBadges
-) {
-
-  private val viewModel: SelectFeaturedBadgeViewModel by viewModels(factoryProducer = { SelectFeaturedBadgeViewModel.Factory(BadgeRepository(requireContext())) })
-
-  private val lifecycleDisposable = LifecycleDisposable()
-
-  private lateinit var scrollShadow: View
-  private lateinit var save: View
-
-  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-    scrollShadow = view.findViewById(R.id.scroll_shadow)
-
-    super.onViewCreated(view, savedInstanceState)
-
-    save = view.findViewById(R.id.save)
-    save.setOnClickListener {
-      viewModel.save()
-    }
-  }
-
-  override fun getOnScrollAnimationHelper(toolbarShadow: View): OnScrollAnimationHelper {
-    return ToolbarShadowAnimationHelper(scrollShadow)
-  }
-
-  override fun bindAdapter(adapter: DSLSettingsAdapter) {
-    Badge.register(adapter) { badge, isSelected, _ ->
-      if (!isSelected) {
-        viewModel.setSelectedBadge(badge)
-      }
-    }
-
-    val previewView: View = requireView().findViewById(R.id.preview)
-    val previewViewHolder = BadgePreview.ViewHolder<BadgePreview.Model>(previewView)
-
-    lifecycleDisposable.bindTo(viewLifecycleOwner.lifecycle)
-    lifecycleDisposable += viewModel.events.subscribe { event: SelectFeaturedBadgeEvent ->
-      when (event) {
-        SelectFeaturedBadgeEvent.NO_BADGE_SELECTED -> Toast.makeText(requireContext(), R.string.SelectFeaturedBadgeFragment__you_must_select_a_badge, Toast.LENGTH_LONG).show()
-        SelectFeaturedBadgeEvent.FAILED_TO_UPDATE_PROFILE -> Toast.makeText(requireContext(), R.string.SelectFeaturedBadgeFragment__failed_to_update_profile, Toast.LENGTH_LONG).show()
-        SelectFeaturedBadgeEvent.SAVE_SUCCESSFUL -> findNavController().popBackStack()
-      }
-    }
-
-    var hasBoundPreview = false
-    viewModel.state.observe(viewLifecycleOwner) { state ->
-      save.isEnabled = state.stage == SelectFeaturedBadgeState.Stage.READY
-
-      if (hasBoundPreview) {
-        previewViewHolder.setPayload(listOf(Unit))
-      } else {
-        hasBoundPreview = true
-      }
-
-      previewViewHolder.bind(BadgePreview.Model(state.selectedBadge))
-      adapter.submitList(getConfiguration(state).toMappingModelList())
-    }
-  }
-
-  private fun getConfiguration(state: SelectFeaturedBadgeState): DSLConfiguration {
-    return configure {
-      sectionHeaderPref(R.string.SelectFeaturedBadgeFragment__select_a_badge)
-      displayBadges(requireContext(), state.allUnlockedBadges, state.selectedBadge)
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/badges/self/featured/SelectFeaturedBadgeState.kt

@@ -1,15 +0,0 @@
-package org.thoughtcrime.securesms.badges.self.featured
-
-import org.thoughtcrime.securesms.badges.models.Badge
-
-data class SelectFeaturedBadgeState(
-  val stage: Stage = Stage.INIT,
-  val selectedBadge: Badge? = null,
-  val allUnlockedBadges: List<Badge> = listOf()
-) {
-  enum class Stage {
-    INIT,
-    READY,
-    SAVING
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/badges/self/featured/SelectFeaturedBadgeViewModel.kt

@@ -1,73 +0,0 @@
-package org.thoughtcrime.securesms.badges.self.featured
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.Observable
-import io.reactivex.rxjava3.disposables.CompositeDisposable
-import io.reactivex.rxjava3.kotlin.plusAssign
-import io.reactivex.rxjava3.kotlin.subscribeBy
-import io.reactivex.rxjava3.subjects.PublishSubject
-import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.badges.BadgeRepository
-import org.thoughtcrime.securesms.badges.models.Badge
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.util.livedata.Store
-
-private val TAG = Log.tag(SelectFeaturedBadgeViewModel::class.java)
-
-class SelectFeaturedBadgeViewModel(private val repository: BadgeRepository) : ViewModel() {
-
-  private val store = Store(SelectFeaturedBadgeState())
-  private val eventSubject = PublishSubject.create<SelectFeaturedBadgeEvent>()
-
-  val state: LiveData<SelectFeaturedBadgeState> = store.stateLiveData
-  val events: Observable<SelectFeaturedBadgeEvent> = eventSubject.observeOn(AndroidSchedulers.mainThread())
-
-  private val disposables = CompositeDisposable()
-
-  init {
-    store.update(Recipient.live(Recipient.self().id).liveDataResolved) { recipient, state ->
-      val unexpiredBadges = recipient.badges.filterNot { it.isExpired() }
-      state.copy(
-        stage = if (state.stage == SelectFeaturedBadgeState.Stage.INIT) SelectFeaturedBadgeState.Stage.READY else state.stage,
-        selectedBadge = unexpiredBadges.firstOrNull(),
-        allUnlockedBadges = unexpiredBadges
-      )
-    }
-  }
-
-  fun setSelectedBadge(badge: Badge) {
-    store.update { it.copy(selectedBadge = badge) }
-  }
-
-  fun save() {
-    val snapshot = store.state
-    if (snapshot.selectedBadge == null) {
-      eventSubject.onNext(SelectFeaturedBadgeEvent.NO_BADGE_SELECTED)
-      return
-    }
-
-    store.update { it.copy(stage = SelectFeaturedBadgeState.Stage.SAVING) }
-    disposables += repository.setFeaturedBadge(snapshot.selectedBadge).subscribeBy(
-      onComplete = {
-        eventSubject.onNext(SelectFeaturedBadgeEvent.SAVE_SUCCESSFUL)
-      },
-      onError = { error ->
-        Log.e(TAG, "Failed to update profile.", error)
-        eventSubject.onNext(SelectFeaturedBadgeEvent.FAILED_TO_UPDATE_PROFILE)
-      }
-    )
-  }
-
-  override fun onCleared() {
-    disposables.clear()
-  }
-
-  class Factory(private val badgeRepository: BadgeRepository) : ViewModelProvider.Factory {
-    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
-      return requireNotNull(modelClass.cast(SelectFeaturedBadgeViewModel(badgeRepository)))
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/badges/self/none/BecomeASustainerFragment.kt

@@ -1,78 +0,0 @@
-package org.thoughtcrime.securesms.badges.self.none
-
-import android.content.Intent
-import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.viewModels
-import org.signal.core.util.DimensionUnit
-import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.badges.models.BadgePreview
-import org.thoughtcrime.securesms.components.settings.DSLConfiguration
-import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter
-import org.thoughtcrime.securesms.components.settings.DSLSettingsBottomSheetFragment
-import org.thoughtcrime.securesms.components.settings.DSLSettingsText
-import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
-import org.thoughtcrime.securesms.components.settings.app.subscription.SubscriptionsRepository
-import org.thoughtcrime.securesms.components.settings.configure
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.util.BottomSheetUtil
-
-class BecomeASustainerFragment : DSLSettingsBottomSheetFragment() {
-
-  private val viewModel: BecomeASustainerViewModel by viewModels(
-    factoryProducer = {
-      BecomeASustainerViewModel.Factory(SubscriptionsRepository(ApplicationDependencies.getDonationsService()))
-    }
-  )
-
-  override fun bindAdapter(adapter: DSLSettingsAdapter) {
-    BadgePreview.register(adapter)
-
-    viewModel.state.observe(viewLifecycleOwner) {
-      adapter.submitList(getConfiguration(it).toMappingModelList())
-    }
-  }
-
-  private fun getConfiguration(state: BecomeASustainerState): DSLConfiguration {
-    return configure {
-      customPref(BadgePreview.Model(badge = state.badge))
-
-      sectionHeaderPref(
-        title = DSLSettingsText.from(
-          R.string.BecomeASustainerFragment__get_badges,
-          DSLSettingsText.CenterModifier,
-          DSLSettingsText.Title2BoldModifier
-        )
-      )
-
-      space(DimensionUnit.DP.toPixels(8f).toInt())
-
-      noPadTextPref(
-        title = DSLSettingsText.from(
-          R.string.BecomeASustainerFragment__signal_is_a_non_profit,
-          DSLSettingsText.CenterModifier
-        )
-      )
-
-      space(DimensionUnit.DP.toPixels(77f).toInt())
-
-      primaryButton(
-        text = DSLSettingsText.from(
-          R.string.BecomeASustainerMegaphone__become_a_sustainer
-        ),
-        onClick = {
-          requireActivity().finish()
-          requireActivity().startActivity(AppSettingsActivity.subscriptions(requireContext()).setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP))
-        }
-      )
-
-      space(DimensionUnit.DP.toPixels(8f).toInt())
-    }
-  }
-
-  companion object {
-    @JvmStatic
-    fun show(fragmentManager: FragmentManager) {
-      BecomeASustainerFragment().show(fragmentManager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG)
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/badges/self/none/BecomeASustainerState.kt

@@ -1,7 +0,0 @@
-package org.thoughtcrime.securesms.badges.self.none
-
-import org.thoughtcrime.securesms.badges.models.Badge
-
-data class BecomeASustainerState(
-  val badge: Badge? = null
-)

app/src/main/java/org/thoughtcrime/securesms/badges/self/none/BecomeASustainerViewModel.kt

@@ -1,45 +0,0 @@
-package org.thoughtcrime.securesms.badges.self.none
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import io.reactivex.rxjava3.disposables.CompositeDisposable
-import io.reactivex.rxjava3.kotlin.plusAssign
-import io.reactivex.rxjava3.kotlin.subscribeBy
-import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.components.settings.app.subscription.SubscriptionsRepository
-import org.thoughtcrime.securesms.util.livedata.Store
-
-class BecomeASustainerViewModel(subscriptionsRepository: SubscriptionsRepository) : ViewModel() {
-
-  private val store = Store(BecomeASustainerState())
-
-  val state: LiveData<BecomeASustainerState> = store.stateLiveData
-
-  private val disposables = CompositeDisposable()
-
-  init {
-    disposables += subscriptionsRepository.getSubscriptions().subscribeBy(
-      onError = { Log.w(TAG, "Could not load subscriptions.") },
-      onSuccess = { subscriptions ->
-        store.update {
-          it.copy(badge = subscriptions.firstOrNull()?.badge)
-        }
-      }
-    )
-  }
-
-  override fun onCleared() {
-    disposables.clear()
-  }
-
-  companion object {
-    private val TAG = Log.tag(BecomeASustainerViewModel::class.java)
-  }
-
-  class Factory(private val subscriptionsRepository: SubscriptionsRepository) : ViewModelProvider.Factory {
-    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
-      return modelClass.cast(BecomeASustainerViewModel(subscriptionsRepository))!!
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/badges/self/overview/BadgesOverviewEvent.kt

@@ -1,5 +0,0 @@
-package org.thoughtcrime.securesms.badges.self.overview
-
-enum class BadgesOverviewEvent {
-  FAILED_TO_UPDATE_PROFILE
-}

app/src/main/java/org/thoughtcrime/securesms/badges/self/overview/BadgesOverviewFragment.kt

@@ -1,92 +0,0 @@
-package org.thoughtcrime.securesms.badges.self.overview
-
-import android.widget.Toast
-import androidx.fragment.app.viewModels
-import androidx.navigation.fragment.findNavController
-import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.badges.BadgeRepository
-import org.thoughtcrime.securesms.badges.Badges
-import org.thoughtcrime.securesms.badges.Badges.displayBadges
-import org.thoughtcrime.securesms.badges.models.Badge
-import org.thoughtcrime.securesms.badges.view.ViewBadgeBottomSheetDialogFragment
-import org.thoughtcrime.securesms.components.settings.DSLConfiguration
-import org.thoughtcrime.securesms.components.settings.DSLSettingsAdapter
-import org.thoughtcrime.securesms.components.settings.DSLSettingsFragment
-import org.thoughtcrime.securesms.components.settings.DSLSettingsText
-import org.thoughtcrime.securesms.components.settings.app.subscription.SubscriptionsRepository
-import org.thoughtcrime.securesms.components.settings.configure
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.util.LifecycleDisposable
-import org.thoughtcrime.securesms.util.navigation.safeNavigate
-
-/**
- * Fragment to allow user to manage options related to the badges they've unlocked.
- */
-class BadgesOverviewFragment : DSLSettingsFragment(
-  titleId = R.string.ManageProfileFragment_badges,
-  layoutManagerProducer = Badges::createLayoutManagerForGridWithBadges
-) {
-
-  private val lifecycleDisposable = LifecycleDisposable()
-  private val viewModel: BadgesOverviewViewModel by viewModels(
-    factoryProducer = {
-      BadgesOverviewViewModel.Factory(BadgeRepository(requireContext()), SubscriptionsRepository(ApplicationDependencies.getDonationsService()))
-    }
-  )
-
-  override fun bindAdapter(adapter: DSLSettingsAdapter) {
-    Badge.register(adapter) { badge, _, isFaded ->
-      if (badge.isExpired() || isFaded) {
-        findNavController().safeNavigate(BadgesOverviewFragmentDirections.actionBadgeManageFragmentToExpiredBadgeDialog(badge))
-      } else {
-        ViewBadgeBottomSheetDialogFragment.show(parentFragmentManager, Recipient.self().id, badge)
-      }
-    }
-
-    lifecycleDisposable.bindTo(viewLifecycleOwner.lifecycle)
-
-    viewModel.state.observe(viewLifecycleOwner) { state ->
-      adapter.submitList(getConfiguration(state).toMappingModelList())
-    }
-
-    lifecycleDisposable.add(
-      viewModel.events.subscribe { event: BadgesOverviewEvent ->
-        when (event) {
-          BadgesOverviewEvent.FAILED_TO_UPDATE_PROFILE -> Toast.makeText(requireContext(), R.string.BadgesOverviewFragment__failed_to_update_profile, Toast.LENGTH_LONG).show()
-        }
-      }
-    )
-  }
-
-  private fun getConfiguration(state: BadgesOverviewState): DSLConfiguration {
-    return configure {
-      sectionHeaderPref(R.string.BadgesOverviewFragment__my_badges)
-
-      displayBadges(
-        context = requireContext(),
-        badges = state.allUnlockedBadges,
-        fadedBadgeId = state.fadedBadgeId
-      )
-
-      asyncSwitchPref(
-        title = DSLSettingsText.from(R.string.BadgesOverviewFragment__display_badges_on_profile),
-        isChecked = state.displayBadgesOnProfile,
-        isEnabled = state.stage == BadgesOverviewState.Stage.READY && state.hasUnexpiredBadges && state.hasInternet,
-        isProcessing = state.stage == BadgesOverviewState.Stage.UPDATING_BADGE_DISPLAY_STATE,
-        onClick = {
-          viewModel.setDisplayBadgesOnProfile(!state.displayBadgesOnProfile)
-        }
-      )
-
-      clickPref(
-        title = DSLSettingsText.from(R.string.BadgesOverviewFragment__featured_badge),
-        summary = state.featuredBadge?.name?.let { DSLSettingsText.from(it) },
-        isEnabled = state.stage == BadgesOverviewState.Stage.READY && state.hasUnexpiredBadges && state.hasInternet,
-        onClick = {
-          findNavController().safeNavigate(BadgesOverviewFragmentDirections.actionBadgeManageFragmentToFeaturedBadgeFragment())
-        }
-      )
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/badges/self/overview/BadgesOverviewState.kt

@@ -1,21 +0,0 @@
-package org.thoughtcrime.securesms.badges.self.overview
-
-import org.thoughtcrime.securesms.badges.models.Badge
-
-data class BadgesOverviewState(
-  val stage: Stage = Stage.INIT,
-  val allUnlockedBadges: List<Badge> = listOf(),
-  val featuredBadge: Badge? = null,
-  val displayBadgesOnProfile: Boolean = false,
-  val fadedBadgeId: String? = null,
-  val hasInternet: Boolean = false
-) {
-
-  val hasUnexpiredBadges = allUnlockedBadges.any { it.expirationTimestamp > System.currentTimeMillis() }
-
-  enum class Stage {
-    INIT,
-    READY,
-    UPDATING_BADGE_DISPLAY_STATE
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/badges/self/overview/BadgesOverviewViewModel.kt

@@ -1,102 +0,0 @@
-package org.thoughtcrime.securesms.badges.self.overview
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
-import io.reactivex.rxjava3.core.Observable
-import io.reactivex.rxjava3.core.Single
-import io.reactivex.rxjava3.disposables.CompositeDisposable
-import io.reactivex.rxjava3.kotlin.plusAssign
-import io.reactivex.rxjava3.kotlin.subscribeBy
-import io.reactivex.rxjava3.subjects.PublishSubject
-import org.signal.core.util.logging.Log
-import org.thoughtcrime.securesms.badges.BadgeRepository
-import org.thoughtcrime.securesms.components.settings.app.subscription.SubscriptionsRepository
-import org.thoughtcrime.securesms.keyvalue.SignalStore
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.util.InternetConnectionObserver
-import org.thoughtcrime.securesms.util.livedata.Store
-import org.whispersystems.libsignal.util.guava.Optional
-
-private val TAG = Log.tag(BadgesOverviewViewModel::class.java)
-
-class BadgesOverviewViewModel(
-  private val badgeRepository: BadgeRepository,
-  private val subscriptionsRepository: SubscriptionsRepository
-) : ViewModel() {
-  private val store = Store(BadgesOverviewState())
-  private val eventSubject = PublishSubject.create<BadgesOverviewEvent>()
-
-  val state: LiveData<BadgesOverviewState> = store.stateLiveData
-  val events: Observable<BadgesOverviewEvent> = eventSubject.observeOn(AndroidSchedulers.mainThread())
-
-  val disposables = CompositeDisposable()
-
-  init {
-    store.update(Recipient.live(Recipient.self().id).liveDataResolved) { recipient, state ->
-      state.copy(
-        stage = if (state.stage == BadgesOverviewState.Stage.INIT) BadgesOverviewState.Stage.READY else state.stage,
-        allUnlockedBadges = recipient.badges,
-        displayBadgesOnProfile = SignalStore.donationsValues().getDisplayBadgesOnProfile(),
-        featuredBadge = recipient.featuredBadge
-      )
-    }
-
-    disposables += InternetConnectionObserver.observe()
-      .distinctUntilChanged()
-      .subscribeBy { isConnected ->
-        store.update { it.copy(hasInternet = isConnected) }
-      }
-
-    disposables += Single.zip(
-      subscriptionsRepository.getActiveSubscription(),
-      subscriptionsRepository.getSubscriptions()
-    ) { active, all ->
-      if (!active.isActive && active.activeSubscription?.willCancelAtPeriodEnd() == true) {
-        Optional.fromNullable<String>(all.firstOrNull { it.level == active.activeSubscription?.level }?.badge?.id)
-      } else {
-        Optional.absent()
-      }
-    }.subscribeBy(
-      onSuccess = { badgeId ->
-        store.update { it.copy(fadedBadgeId = badgeId.orNull()) }
-      },
-      onError = { throwable ->
-        Log.w(TAG, "Could not retrieve data from server", throwable)
-      }
-    )
-  }
-
-  fun setDisplayBadgesOnProfile(displayBadgesOnProfile: Boolean) {
-    store.update { it.copy(stage = BadgesOverviewState.Stage.UPDATING_BADGE_DISPLAY_STATE) }
-    disposables += badgeRepository.setVisibilityForAllBadges(displayBadgesOnProfile)
-      .subscribe(
-        {
-          store.update { it.copy(stage = BadgesOverviewState.Stage.READY) }
-        },
-        { error ->
-          Log.e(TAG, "Failed to update visibility.", error)
-          store.update { it.copy(stage = BadgesOverviewState.Stage.READY) }
-          eventSubject.onNext(BadgesOverviewEvent.FAILED_TO_UPDATE_PROFILE)
-        }
-      )
-  }
-
-  override fun onCleared() {
-    disposables.clear()
-  }
-
-  class Factory(
-    private val badgeRepository: BadgeRepository,
-    private val subscriptionsRepository: SubscriptionsRepository
-  ) : ViewModelProvider.Factory {
-    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
-      return requireNotNull(modelClass.cast(BadgesOverviewViewModel(badgeRepository, subscriptionsRepository)))
-    }
-  }
-
-  companion object {
-    private val TAG = Log.tag(BadgesOverviewViewModel::class.java)
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/badges/view/ViewBadgeBottomSheetDialogFragment.kt

@@ -1,160 +0,0 @@
-package org.thoughtcrime.securesms.badges.view
-
-import android.graphics.Paint
-import android.graphics.Rect
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.content.ContextCompat
-import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.viewModels
-import androidx.viewpager2.widget.ViewPager2
-import com.google.android.material.button.MaterialButton
-import com.google.android.material.tabs.TabLayout
-import com.google.android.material.tabs.TabLayoutMediator
-import org.thoughtcrime.securesms.R
-import org.thoughtcrime.securesms.badges.BadgeRepository
-import org.thoughtcrime.securesms.badges.models.Badge
-import org.thoughtcrime.securesms.badges.models.LargeBadge
-import org.thoughtcrime.securesms.components.FixedRoundedCornerBottomSheetDialogFragment
-import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.util.BottomSheetUtil
-import org.thoughtcrime.securesms.util.CommunicationActions
-import org.thoughtcrime.securesms.util.FeatureFlags
-import org.thoughtcrime.securesms.util.PlayServicesUtil
-import org.thoughtcrime.securesms.util.ViewUtil
-import org.thoughtcrime.securesms.util.adapter.mapping.MappingAdapter
-import org.thoughtcrime.securesms.util.visible
-import kotlin.math.ceil
-import kotlin.math.max
-
-class ViewBadgeBottomSheetDialogFragment : FixedRoundedCornerBottomSheetDialogFragment() {
-
-  private val viewModel: ViewBadgeViewModel by viewModels(factoryProducer = { ViewBadgeViewModel.Factory(getStartBadge(), getRecipientId(), BadgeRepository(requireContext())) })
-
-  override val peekHeightPercentage: Float = 1f
-
-  private val textWidth: Float
-    get() = (resources.displayMetrics.widthPixels - ViewUtil.dpToPx(64)).toFloat()
-  private val textBounds: Rect = Rect()
-  private val textPaint: Paint = Paint().apply {
-    textSize = ViewUtil.spToPx(16f).toFloat()
-  }
-
-  override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-    return inflater.inflate(R.layout.view_badge_bottom_sheet_dialog_fragment, container, false)
-  }
-
-  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-    postponeEnterTransition()
-
-    val pager: ViewPager2 = view.findViewById(R.id.pager)
-    val tabs: TabLayout = view.findViewById(R.id.tab_layout)
-    val action: MaterialButton = view.findViewById(R.id.action)
-    val noSupport: View = view.findViewById(R.id.no_support)
-
-    if (getRecipientId() == Recipient.self().id) {
-      action.visible = false
-    }
-
-    @Suppress("CascadeIf")
-    if (PlayServicesUtil.getPlayServicesStatus(requireContext()) != PlayServicesUtil.PlayServicesStatus.SUCCESS) {
-      noSupport.visible = true
-      action.icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_open_20)
-      action.setText(R.string.preferences__donate_to_signal)
-      action.setOnClickListener {
-        CommunicationActions.openBrowserLink(requireContext(), getString(R.string.donate_url))
-      }
-    } else if (
-      FeatureFlags.donorBadges() &&
-      Recipient.self().badges.none { it.category == Badge.Category.Donor && !it.isBoost() && !it.isExpired() }
-    ) {
-      action.setOnClickListener {
-        startActivity(AppSettingsActivity.subscriptions(requireContext()))
-      }
-    } else {
-      action.visible = false
-    }
-
-    val adapter = MappingAdapter()
-
-    LargeBadge.register(adapter)
-    pager.adapter = adapter
-    adapter.submitList(listOf(LargeBadge.EmptyModel()))
-
-    TabLayoutMediator(tabs, pager) { _, _ ->
-    }.attach()
-
-    pager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
-      override fun onPageSelected(position: Int) {
-        if (adapter.getModel(position).map { it is LargeBadge.Model }.orElse(false)) {
-          viewModel.onPageSelected(position)
-        }
-      }
-    })
-
-    viewModel.state.observe(viewLifecycleOwner) { state ->
-      if (state.recipient == null || state.badgeLoadState == ViewBadgeState.LoadState.INIT) {
-        return@observe
-      }
-
-      if (state.allBadgesVisibleOnProfile.isEmpty()) {
-        dismissAllowingStateLoss()
-      }
-
-      tabs.visible = state.allBadgesVisibleOnProfile.size > 1
-
-      var maxLines = 3
-      state.allBadgesVisibleOnProfile.forEach { badge ->
-        val text = badge.resolveDescription(state.recipient.getShortDisplayName(requireContext()))
-        textPaint.getTextBounds(text, 0, text.length, textBounds)
-        val estimatedLines = ceil(textBounds.width().toFloat() / textWidth).toInt()
-        maxLines = max(maxLines, estimatedLines)
-      }
-
-      adapter.submitList(
-        state.allBadgesVisibleOnProfile.map {
-          LargeBadge.Model(LargeBadge(it), state.recipient.getShortDisplayName(requireContext()), maxLines + 1)
-        }
-      ) {
-        val stateSelectedIndex = state.allBadgesVisibleOnProfile.indexOf(state.selectedBadge)
-        if (state.selectedBadge != null && pager.currentItem != stateSelectedIndex) {
-          pager.currentItem = stateSelectedIndex
-        }
-      }
-    }
-  }
-
-  private fun getStartBadge(): Badge? = requireArguments().getParcelable(ARG_START_BADGE)
-
-  private fun getRecipientId(): RecipientId = requireNotNull(requireArguments().getParcelable(ARG_RECIPIENT_ID))
-
-  companion object {
-
-    private const val ARG_START_BADGE = "start_badge"
-    private const val ARG_RECIPIENT_ID = "recipient_id"
-
-    @JvmStatic
-    fun show(
-      fragmentManager: FragmentManager,
-      recipientId: RecipientId,
-      startBadge: Badge? = null
-    ) {
-      if (!FeatureFlags.displayDonorBadges() && recipientId != Recipient.self().id) {
-        return
-      }
-
-      ViewBadgeBottomSheetDialogFragment().apply {
-        arguments = Bundle().apply {
-          putParcelable(ARG_START_BADGE, startBadge)
-          putParcelable(ARG_RECIPIENT_ID, recipientId)
-        }
-
-        show(fragmentManager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG)
-      }
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/badges/view/ViewBadgeState.kt

@@ -1,16 +0,0 @@
-package org.thoughtcrime.securesms.badges.view
-
-import org.thoughtcrime.securesms.badges.models.Badge
-import org.thoughtcrime.securesms.recipients.Recipient
-
-data class ViewBadgeState(
-  val allBadgesVisibleOnProfile: List<Badge> = listOf(),
-  val badgeLoadState: LoadState = LoadState.INIT,
-  val selectedBadge: Badge? = null,
-  val recipient: Recipient? = null
-) {
-  enum class LoadState {
-    INIT,
-    LOADED
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/badges/view/ViewBadgeViewModel.kt

@@ -1,60 +0,0 @@
-package org.thoughtcrime.securesms.badges.view
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import io.reactivex.rxjava3.disposables.CompositeDisposable
-import io.reactivex.rxjava3.kotlin.plusAssign
-import org.thoughtcrime.securesms.badges.BadgeRepository
-import org.thoughtcrime.securesms.badges.models.Badge
-import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.recipients.RecipientId
-import org.thoughtcrime.securesms.util.livedata.Store
-
-class ViewBadgeViewModel(
-  private val startBadge: Badge?,
-  private val recipientId: RecipientId,
-  private val repository: BadgeRepository
-) : ViewModel() {
-
-  private val disposables = CompositeDisposable()
-
-  private val store = Store(ViewBadgeState())
-
-  val state: LiveData<ViewBadgeState> = store.stateLiveData
-
-  init {
-    store.update(Recipient.live(recipientId).liveData) { recipient, state ->
-      state.copy(
-        recipient = recipient,
-        allBadgesVisibleOnProfile = recipient.badges,
-        selectedBadge = startBadge ?: recipient.badges.firstOrNull(),
-        badgeLoadState = ViewBadgeState.LoadState.LOADED
-      )
-    }
-  }
-
-  override fun onCleared() {
-    disposables.clear()
-  }
-
-  fun onPageSelected(position: Int) {
-    if (position > store.state.allBadgesVisibleOnProfile.size - 1 || position < 0) {
-      return
-    }
-
-    store.update {
-      it.copy(selectedBadge = it.allBadgesVisibleOnProfile[position])
-    }
-  }
-
-  class Factory(
-    private val startBadge: Badge?,
-    private val recipientId: RecipientId,
-    private val repository: BadgeRepository
-  ) : ViewModelProvider.Factory {
-    override fun <T : ViewModel?> create(modelClass: Class<T>): T {
-      return requireNotNull(modelClass.cast(ViewBadgeViewModel(startBadge, recipientId, repository)))
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/blocked/BlockedUsersRepository.java

@@ -7,8 +7,8 @@ import androidx.core.util.Consumer;
 
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.RecipientDatabase;
-import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.groups.GroupChangeBusyException;
 import org.thoughtcrime.securesms.groups.GroupChangeFailedException;
 import org.thoughtcrime.securesms.recipients.Recipient;
@@ -32,7 +32,7 @@ class BlockedUsersRepository {
 
   void getBlocked(@NonNull Consumer<List<Recipient>> blockedUsers) {
     SignalExecutors.BOUNDED.execute(() -> {
-      RecipientDatabase db = SignalDatabase.recipients();
+      RecipientDatabase db = DatabaseFactory.getRecipientDatabase(context);
       try (RecipientDatabase.RecipientReader reader = db.readerForBlocked(db.getBlocked())) {
         int count = reader.getCount();
         if (count == 0) {

app/src/main/java/org/thoughtcrime/securesms/components/AudioView.java

@@ -119,7 +119,6 @@ public final class AudioView extends FrameLayout {
 
       lottieDirection = REVERSE;
       this.playPauseButton.setOnClickListener(new PlayPauseClickedListener());
-      this.playPauseButton.setOnLongClickListener(v -> performLongClick());
       this.seekBar.setOnSeekBarChangeListener(new SeekBarModifiedListener());
 
       setTint(typedArray.getColor(R.styleable.AudioView_foregroundTintColor, Color.WHITE));

app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java

@@ -44,7 +44,6 @@ import org.thoughtcrime.securesms.util.AvatarUtil;
 import org.thoughtcrime.securesms.util.BlurTransformation;
 import org.thoughtcrime.securesms.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.Util;
-import org.thoughtcrime.securesms.util.ViewUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -208,8 +207,8 @@ public final class AvatarImageView extends AppCompatImageView {
         this.chatColors       = chatColors;
         recipientContactPhoto = photo;
 
-        Drawable fallbackContactPhotoDrawable = size == SIZE_SMALL ? photo.recipient.getSmallFallbackContactPhotoDrawable(getContext(), inverted, fallbackPhotoProvider, ViewUtil.getWidth(this))
-                                                                   : photo.recipient.getFallbackContactPhotoDrawable(getContext(), inverted, fallbackPhotoProvider, ViewUtil.getWidth(this));
+        Drawable fallbackContactPhotoDrawable = size == SIZE_SMALL ? photo.recipient.getSmallFallbackContactPhotoDrawable(getContext(), inverted, fallbackPhotoProvider)
+                                                                   : photo.recipient.getFallbackContactPhotoDrawable(getContext(), inverted, fallbackPhotoProvider);
 
         if (fixedSizeTarget != null) {
           requestManager.clear(fixedSizeTarget);
@@ -225,7 +224,6 @@ public final class AvatarImageView extends AppCompatImageView {
           blurred = shouldBlur;
 
           GlideRequest<Drawable> request = requestManager.load(photo.contactPhoto)
-                                                         .dontAnimate()
                                                          .fallback(fallbackContactPhotoDrawable)
                                                          .error(fallbackContactPhotoDrawable)
                                                          .diskCacheStrategy(DiskCacheStrategy.ALL)
@@ -291,7 +289,6 @@ public final class AvatarImageView extends AppCompatImageView {
 
     GlideApp.with(this)
             .load(avatarBytes)
-            .dontAnimate()
             .fallback(fallback)
             .error(fallback)
             .diskCacheStrategy(DiskCacheStrategy.ALL)