Bump version to 5.0.10

Updated language translations.
Perfom a migration to notify users of new contacts.
2026-04-12 04:53:19 +01:00 · 2021-01-12 01:45:13 -05:00 · 2021-01-12 01:41:49 -05:00 · 2021-01-11 23:18:13 -05:00 · 2021-01-11 20:35:53 -05:00 · 2021-01-08 17:39:13 -05:00
2234 changed files with 44465 additions and 154324 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,4 +0,0 @@
-root = true
-
-[*.kt]
-indent_size = 2
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +0,0 @@
-custom: https://signal.org/donate/
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,12 +1,3 @@
---
-name: 🛠️ Bug report
-about: Let us know that something isn't working as intended
-title: ''
-labels: ''
-assignees: ''
-
---
-
 <!-- This is a bug report template. By following the instructions below and filling out the sections with your information, you will help the developers get all the necessary data to fix your issue.
 You can also preview your report before submitting it. You may remove sections that aren't relevant to your particular case.

--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,20 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: 📃Support Center
-    url: https://support.signal.org/
-    about: Find answers to many common questions.
-  - name: ✨ Feature request
-    url: https://community.signalusers.org/c/feature-requests/
-    about: Missing something in Signal? Let us know.
-  - name: 💬 Community support
-    url: https://community.signalusers.org/c/support/
-    about: Feel free to ask anything.
-  - name: 📖 Developer documentation
-    url: https://signal.org/docs/
-    about: Official Signal developer documentation.
-  - name: 📚 Translation feedback.
-    url: https://community.signalusers.org/c/translation-feedback/
-    about: Share feedback on translations.
-  - name: ❓ Other issue?
-    url: https://community.signalusers.org/
-    about: Search on the community forums.
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -14,22 +14,18 @@ jobs:
    runs-on: ubuntu-latest

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

    - name: set up JDK 1.8
      uses: actions/setup-java@v1
      with:
        java-version: 1.8

+    - name: Install NDK
+      run: echo "y" | sudo /usr/local/lib/android/sdk/tools/bin/sdkmanager --install "ndk;21.0.6113669" --sdk_root=${ANDROID_SDK_ROOT}
+
    - name: Validate Gradle Wrapper
      uses: gradle/wrapper-validation-action@v1

    - name: Build with Gradle
      run: ./gradlew qa
-
-    - name: Archive reports for failed build
-      if: ${{ failure() }}
-      uses: actions/upload-artifact@v2
-      with:
-        name: reports
-        path: '*/build/reports'
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,190 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <option name="RIGHT_MARGIN" value="240" />
-    <option name="FORMATTER_TAGS_ENABLED" value="true" />
-    <option name="SOFT_MARGINS" value="160" />
-    <JavaCodeStyleSettings>
-      <option name="GENERATE_FINAL_LOCALS" value="true" />
-      <option name="DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION" value="true" />
-      <option name="ALIGN_MULTILINE_ANNOTATION_PARAMETERS" value="true" />
-      <option name="ALIGN_MULTILINE_TEXT_BLOCKS" value="true" />
-    </JavaCodeStyleSettings>
-    <JetCodeStyleSettings>
-      <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" />
-      <option name="CLASS_BRACE_STYLE" value="5" />
-      <option name="METHOD_BRACE_STYLE" value="5" />
-      <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
-      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
-      <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
-      <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
-      <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
-      <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
-      <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
-      <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
-      <option name="ALIGN_GROUP_FIELD_DECLARATIONS" value="true" />
-      <option name="ALIGN_CONSECUTIVE_VARIABLE_DECLARATIONS" value="true" />
-      <option name="ALIGN_CONSECUTIVE_ASSIGNMENTS" value="true" />
-      <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
-      <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
-      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
-      <option name="WRAP_FIRST_METHOD_IN_CALL_CHAIN" value="true" />
-      <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
-      <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
-      <option name="KEEP_SIMPLE_BLOCKS_IN_ONE_LINE" value="true" />
-      <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
-      <option name="KEEP_SIMPLE_LAMBDAS_IN_ONE_LINE" value="true" />
-      <option name="KEEP_MULTIPLE_EXPRESSIONS_IN_ONE_LINE" value="true" />
-      <option name="METHOD_ANNOTATION_WRAP" value="0" />
-      <option name="CLASS_ANNOTATION_WRAP" value="0" />
-      <option name="FIELD_ANNOTATION_WRAP" value="0" />
-      <option name="ENUM_CONSTANTS_WRAP" value="5" />
-      <option name="WRAP_ON_TYPING" value="0" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-      <arrangement>
-        <groups>
-          <group>
-            <type>GETTERS_AND_SETTERS</type>
-            <order>KEEP</order>
-          </group>
-          <group>
-            <type>OVERRIDDEN_METHODS</type>
-            <order>KEEP</order>
-          </group>
-          <group>
-            <type>DEPENDENT_METHODS</type>
-            <order>BREADTH_FIRST</order>
-          </group>
-        </groups>
-      </arrangement>
-    </codeStyleSettings>
-    <codeStyleSettings language="XML">
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-    <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>
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,12 +3,9 @@ import org.signal.signing.ApkSignerUtil
 import java.security.MessageDigest

 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'

@@ -19,12 +16,24 @@ repositories {
            includeGroupByRegex "com\\.github\\.chrisbanes.*"
        }
    }
+    maven {
+        url "https://raw.github.com/signalapp/maven/master/shortcutbadger/releases/"
+        content {
+            includeGroupByRegex "me\\.leolin.*"
+        }
+    }
    maven {
        url "https://raw.github.com/signalapp/maven/master/circular-progress-button/releases/"
        content {
            includeGroupByRegex "com\\.github\\.dmytrodanylyk\\.circular-progress-button\\.*"
        }
    }
+    maven {
+        url "https://raw.github.com/signalapp/maven/master/sqlcipher/release/"
+        content {
+            includeGroupByRegex "org\\.signal.*"
+        }
+    }
    maven { // textdrawable
        url 'https://dl.bintray.com/amulyakhare/maven'
        content {
@@ -35,9 +44,6 @@ repositories {
    mavenCentral()
    jcenter()
    mavenLocal()
-    maven {
-        url "https://dl.cloudsmith.io/qxAgwaeEE1vN8aLU/mobilecoin/mobilecoin/maven/"
-    }
 }

 protobuf {
@@ -55,15 +61,15 @@ protobuf {
    }
 }

-def canonicalVersionCode = 857
-def canonicalVersionName = "5.13.5"
+def canonicalVersionCode = 759
+def canonicalVersionName = "5.0.10"

-def postFixSize = 100
+def postFixSize = 10
 def abiPostFix = ['universal'   : 0,
-                  'armeabi-v7a' : 1,
-                  'arm64-v8a'   : 2,
-                  'x86'         : 3,
-                  'x86_64'      : 4]
+                  'armeabi-v7a' : 8,
+                  'arm64-v8a'   : 9,
+                  'x86'         : 1,
+                  'x86_64'      : 2]

 def keystores = [ 'debug'  : loadKeystoreProperties('keystore.debug.properties') ]

@@ -74,10 +80,6 @@ android {
    flavorDimensions 'distribution', 'environment'
    useLibrary 'org.apache.http.legacy'

-    kotlinOptions {
-        freeCompilerArgs = ["-Xallow-result-return-type"]
-    }
-
    dexOptions {
        javaMaxHeapSize "4g"
    }
@@ -106,7 +108,6 @@ android {
        project.ext.set("archivesBaseName", "Signal");

        buildConfigField "long", "BUILD_TIMESTAMP", getLastCommitTimestamp() + "L"
-        buildConfigField "String", "GIT_HASH", "\"${getGitHash()}\""
        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\""
@@ -127,10 +128,7 @@ android {
        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_REGIONS", "new int[]{44}"
-        buildConfigField "String", "GIPHY_API_KEY", "\"3o6ZsYH6U6Eri53TXy\""
-        buildConfigField "String", "RECAPTCHA_PROOF_URL", "\"https://signalcaptchas.org/challenge/generate.html\""
+        buildConfigField "int", "TRACE_EVENT_MAX", "3500"

        ndk {
            abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
@@ -151,7 +149,6 @@ android {
    }

    compileOptions {
-        coreLibraryDesugaringEnabled true
        sourceCompatibility JAVA_VERSION
        targetCompatibility JAVA_VERSION
    }
@@ -164,8 +161,10 @@ android {
        exclude 'META-INF/LICENSE'
        exclude 'META-INF/NOTICE'
        exclude 'META-INF/proguard/androidx-annotations.pro'
-        exclude '/org/spongycastle/x509/CertPathReviewerMessages.properties'
-        exclude '/org/spongycastle/x509/CertPathReviewerMessages_de.properties'
+    }
+
+    aaptOptions {
+        ignoreAssetsPattern '!contours.tfl:!LMprec_600.emd:!blazeface.tfl'
    }

    buildTypes {
@@ -207,18 +206,6 @@ android {
            minifyEnabled true
            proguardFiles = buildTypes.debug.proguardFiles
        }
-        perf {
-            initWith debug
-            isDefault false
-            debuggable false
-            matchingFallbacks = ['debug']
-        }
-        mock {
-            initWith debug
-            isDefault false
-            minifyEnabled false
-            matchingFallbacks = ['debug']
-        }
    }

    productFlavors {
@@ -242,23 +229,13 @@ android {
            ext.websiteUpdateUrl = "null"
            buildConfigField "boolean", "PLAY_STORE_DISABLED", "false"
            buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
-        }
-
-        study {
-            dimension 'distribution'
-
-            applicationIdSuffix ".study"
-            ext.websiteUpdateUrl = "null"
-            buildConfigField "boolean", "PLAY_STORE_DISABLED", "false"
-            buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
+            buildConfigField "int", "TRACE_EVENT_MAX", "30_000"
        }

        prod {
            dimension 'environment'

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

        staging {
@@ -274,13 +251,11 @@ android {
            buildConfigField "String", "SIGNAL_KEY_BACKUP_URL", "\"https://api-staging.backup.signal.org\""
            buildConfigField "String", "CDS_MRENCLAVE", "\"c98e00a4e3ff977a56afefe7362a27e4961e4f19e211febfbb19b897e6b80b15\""
            buildConfigField "KbsEnclave", "KBS_ENCLAVE", "new KbsEnclave(\"823a3b2c037ff0cbe305cc48928cfcc97c9ed4a8ca6d49af6f7d6981fb60a4e9\", " +
-                                                                         "\"51a56084c0b21c6b8f62b1bc792ec9bedac4c7c3964bb08ddcab868158c09982\", " +
+                                                                         "\"038c40bbbacdc873caa81ac793bb75afde6dfe436a99ab1f15e3f0cbb7434ced\", " +
                                                                         "\"a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87\")"
            buildConfigField "KbsEnclave[]", "KBS_FALLBACKS", "new KbsEnclave[0]"
            buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx\""
            buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdls=\""
-            buildConfigField "String", "MOBILE_COIN_ENVIRONMENT", "\"testnet\""
-            buildConfigField "String", "RECAPTCHA_PROOF_URL", "\"https://signalcaptchas.org/staging/challenge/generate.html\""
        }
    }

@@ -296,18 +271,6 @@ android {
        }
    }

-    android.variantFilter { variant ->
-        def distribution = variant.getFlavors().get(0).name
-        def environment  = variant.getFlavors().get(1).name
-        def buildType    = variant.buildType.name
-
-        if (distribution == 'study' && buildType != 'perf' && buildType != 'mock') {
-            variant.setIgnore(true)
-        } else if (distribution != 'study' && buildType == 'mock') {
-            variant.setIgnore(true)
-        }
-    }
-
    lintOptions {
        abortOnError true
        baseline file("lint-baseline.xml")
@@ -322,16 +285,13 @@ android {
 }

 dependencies {
-    implementation 'androidx.fragment:fragment-ktx:1.2.5'
    lintChecks project(':lintchecks')

-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
-
    implementation ('androidx.appcompat:appcompat:1.2.0') {
        force = true
    }
    implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'com.google.android.material:material:1.2.1'
    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
    implementation 'androidx.cardview:cardview:1.0.0'
    implementation 'androidx.preference:preference:1.0.0'
@@ -351,7 +311,10 @@ dependencies {
    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.paging:paging-common:2.1.2"
+    implementation "androidx.paging:paging-runtime:2.1.2"
+    implementation 'com.google.firebase:firebase-ml-vision:24.0.3'
+    implementation 'com.google.firebase:firebase-ml-vision-face-model:20.0.1'

    implementation ('com.google.firebase:firebase-messaging:20.2.0') {
        exclude group: 'com.google.firebase', module: 'firebase-core'
@@ -372,29 +335,21 @@ dependencies {
    implementation project(':libsignal-service')
    implementation project(':paging')
    implementation project(':core-util')
-    implementation project(':video')
-    implementation project(':device-transfer')
-
    implementation 'org.signal:zkgroup-android:0.7.0'
-    implementation 'org.whispersystems:signal-client-android:0.5.1'
+    implementation 'org.whispersystems:signal-client-android:0.1.5'
    implementation 'com.google.protobuf:protobuf-javalite:3.10.0'
-
-    implementation('com.mobilecoin:android-sdk:1.0.0') {
-        exclude group: 'com.google.protobuf'
-    }
-
    implementation 'org.signal:argon2:13.1@aar'

-    implementation 'org.signal:ringrtc-android:2.10.1.1'
+    implementation 'org.signal:ringrtc-android:2.8.7'

-    implementation "me.leolin:ShortcutBadger:1.1.22"
+    implementation "me.leolin:ShortcutBadger:1.1.16"
    implementation 'se.emilsjolander:stickylistheaders:2.7.0'
    implementation 'com.jpardogo.materialtabstrip:library:1.0.9'
    implementation 'org.apache.httpcomponents:httpclient-android:4.3.5'
    implementation 'com.github.chrisbanes:PhotoView:2.1.3'
    implementation 'com.github.bumptech.glide:glide:4.11.0'
-    kapt 'com.github.bumptech.glide:compiler:4.11.0'
-    kapt 'androidx.annotation:annotation:1.1.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
+    annotationProcessor 'androidx.annotation:annotation:1.1.0'
    implementation 'com.makeramen:roundedimageview:2.1.0'
    implementation 'com.pnikosis:materialish-progress:1.5'
    implementation 'org.greenrobot:eventbus:3.0.0'
@@ -423,22 +378,19 @@ dependencies {
        exclude group: 'com.android.support', module: 'recyclerview-v7'
    }

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

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

-    flipperImplementation 'com.facebook.flipper:flipper:0.91.0'
-    flipperImplementation 'com.facebook.soloader:soloader:0.10.1'
+    flipperImplementation 'com.facebook.flipper:flipper:0.32.2'
+    flipperImplementation 'com.facebook.soloader:soloader:0.8.2'

    testImplementation 'junit:junit:4.12'
    testImplementation 'org.assertj:assertj-core:3.11.1'
@@ -457,9 +409,6 @@ dependencies {

    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.12.0"
 }

 dependencyVerification {
@@ -528,10 +477,6 @@ task signProductionWebsiteRelease {
 }

 def getLastCommitTimestamp() {
-    if (!(new File('.git').exists())) {
-        return System.currentTimeMillis().toString()
-    }
-
    new ByteArrayOutputStream().withStream { os ->
        def result = exec {
            executable = 'git'
@@ -543,19 +488,6 @@ def getLastCommitTimestamp() {
    }
 }

-def getGitHash() {
-    if (!(new File('.git').exists())) {
-        return "abcd1234"
-    }
-
-    def stdout = new ByteArrayOutputStream()
-    exec {
-        commandLine 'git', 'rev-parse', '--short', 'HEAD'
-        standardOutput = stdout
-    }
-    return stdout.toString().trim()
-}
-
 tasks.withType(Test) {
    testLogging {
        events "failed"
--- a/app/lint.xml
+++ b/app/lint.xml
@@ -31,8 +31,6 @@
    <issue id="LogNotAppSignal" severity="error" />
    <issue id="LogTagInlined" severity="error" />

-    <issue id="AlertDialogBuilderUsage" severity="warning" />
-
    <issue id="RestrictedApi" severity="error">
        <ignore path="*/org/thoughtcrime/securesms/mediasend/camerax/VideoCapture.java" />
        <ignore path="*/org/thoughtcrime/securesms/mediasend/camerax/CameraXModule.java" />
--- a/app/src/flipper/java/org/thoughtcrime/securesms/database/FlipperSqlCipherAdapter.java
+++ b/app/src/flipper/java/org/thoughtcrime/securesms/database/FlipperSqlCipherAdapter.java
@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms.database;

-import android.app.Application;
 import android.content.Context;
 import android.database.Cursor;
 import android.text.TextUtils;
@@ -17,7 +16,6 @@ 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;
 import java.util.ArrayList;
@@ -26,7 +24,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;

 /**
 * A lot of this code is taken from {@link com.facebook.flipper.plugins.databases.impl.SqliteDatabaseDriver}
@@ -45,16 +42,8 @@ public class FlipperSqlCipherAdapter extends DatabaseDriver<FlipperSqlCipherAdap
    try {
      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());
-
-      return Arrays.asList(new Descriptor(mainOpenHelper),
-                           new Descriptor(keyValueOpenHelper),
-                           new Descriptor(megaphoneOpenHelper),
-                           new Descriptor(jobManagerOpenHelper));
+      SQLCipherOpenHelper sqlCipherOpenHelper = (SQLCipherOpenHelper) databaseHelperField.get(DatabaseFactory.getInstance(getContext()));
+      return Collections.singletonList(new Descriptor(sqlCipherOpenHelper));
    } catch (Exception e) {
      Log.i(TAG, "Unable to use reflection to access raw database.", e);
    }
@@ -238,12 +227,7 @@ public class FlipperSqlCipherAdapter extends DatabaseDriver<FlipperSqlCipherAdap
      case Cursor.FIELD_TYPE_FLOAT:
        return cursor.getDouble(column);
      case Cursor.FIELD_TYPE_BLOB:
-        byte[] blob = cursor.getBlob(column);
-        String bytes = blob != null ? "(blob) " + Hex.toStringCondensed(Arrays.copyOf(blob, Math.min(blob.length, 32))) : null;
-        if (bytes != null && bytes.length() == 32 && blob.length > 32) {
-          bytes += "...";
-        }
-        return bytes;
+        return cursor.getBlob(column);
      case Cursor.FIELD_TYPE_STRING:
      default:
        return cursor.getString(column);
@@ -251,9 +235,9 @@ public class FlipperSqlCipherAdapter extends DatabaseDriver<FlipperSqlCipherAdap
  }

  static class Descriptor implements DatabaseDescriptor {
-    private final SignalDatabase sqlCipherOpenHelper;
+    private final SQLCipherOpenHelper sqlCipherOpenHelper;

-    Descriptor(@NonNull SignalDatabase sqlCipherOpenHelper) {
+    Descriptor(@NonNull SQLCipherOpenHelper sqlCipherOpenHelper) {
      this.sqlCipherOpenHelper = sqlCipherOpenHelper;
    }

@@ -263,11 +247,11 @@ public class FlipperSqlCipherAdapter extends DatabaseDriver<FlipperSqlCipherAdap
    }

    public @NonNull SQLiteDatabase getReadable() {
-      return sqlCipherOpenHelper.getSqlCipherDatabase();
+      return sqlCipherOpenHelper.getReadableDatabase().getSqlCipherDatabase();
    }

    public @NonNull SQLiteDatabase getWritable() {
-      return sqlCipherOpenHelper.getSqlCipherDatabase();
+      return sqlCipherOpenHelper.getWritableDatabase().getSqlCipherDatabase();
    }
  }
 }
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -64,6 +64,7 @@
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>

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

    <!-- So we can add a TextSecure 'Account' -->
    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
@@ -158,15 +159,12 @@
    <activity android:name=".preferences.MmsPreferencesActivity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

-    <activity android:name=".sharing.interstitial.ShareInterstitialActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:windowSoftInputMode="adjustResize" />
-
    <activity android:name=".sharing.ShareActivity"
              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
              android:excludeFromRecents="true"
              android:launchMode="singleTask"
              android:taskAffinity=""
+              android:noHistory="true"
              android:windowSoftInputMode="stateHidden"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
        <intent-filter>
@@ -227,17 +225,6 @@
            <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
        </intent-filter>

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

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

    <activity android:name=".conversation.ConversationActivity"
              android:windowSoftInputMode="stateUnchanged"
@@ -308,11 +291,6 @@
              android:windowSoftInputMode="stateAlwaysHidden"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

-    <activity android:name=".recipients.ui.disappearingmessages.RecipientDisappearingMessagesActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:theme="@style/Signal.DayNight.NoActionBar"
-              android:windowSoftInputMode="adjustResize"/>
-
    <activity android:name=".DatabaseMigrationActivity"
              android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar"
              android:launchMode="singleTask"
@@ -363,36 +341,14 @@
    <activity android:name=".VerifyIdentityActivity"
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

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

-        <activity android:name=".wallpaper.ChatWallpaperActivity"
-                  android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-                  android:windowSoftInputMode="stateAlwaysHidden">
-        </activity>
-
-        <activity android:name=".wallpaper.ChatWallpaperPreviewActivity"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:windowSoftInputMode="stateAlwaysHidden">
-        </activity>
-
-        <activity android:name=".devicetransfer.olddevice.OldDeviceTransferActivity"
-            android:theme="@style/TextSecure.LightRegistrationTheme"
-            android:launchMode="singleTask"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-        <activity android:name=".devicetransfer.olddevice.OldDeviceExitActivity"
-            android:noHistory="true"
-            android:excludeFromRecents="true"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
    <activity android:name=".registration.RegistrationNavigationActivity"
              android:launchMode="singleTask"
              android:theme="@style/TextSecure.LightRegistrationTheme"
@@ -492,21 +448,13 @@
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

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

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

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

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

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

-    <activity android:name=".ratelimit.RecaptchaProofActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode" />
-
-    <activity android:name=".wallpaper.crop.WallpaperImageSelectionActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:theme="@style/TextSecure.FullScreenMedia" />
-
-    <activity android:name=".wallpaper.crop.WallpaperCropActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:screenOrientation="portrait"
-              android:theme="@style/Theme.Signal.WallpaperCropper" />
-
-    <activity android:name=".reactions.edit.EditReactionsActivity"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <service android:enabled="true" android:name=".service.webrtc.WebRtcCallService"/>
+    <service android:enabled="true" android:name=".service.WebRtcCallService"/>
    <service android:enabled="true" android:name=".service.ApplicationMigrationService"/>
    <service android:enabled="true" android:exported="false" android:name=".service.KeyCachingService"/>
    <service android:enabled="true" android:name=".messages.IncomingMessageObserver$ForegroundService"/>
@@ -730,8 +662,6 @@

    <receiver android:name=".service.TrimThreadsByDateManager$TrimThreadsByDateAlarm" />

-    <receiver android:name=".payments.backup.phrase.ClearClipboardAlarmReceiver" />
-
    <provider android:name=".providers.PartProvider"
              android:grantUriPermissions="true"
              android:exported="false"
@@ -760,6 +690,10 @@
              android:authorities="${applicationId}.database.conversation"
              android:exported="false" />

+    <provider android:name=".database.DatabaseContentProviders$ConversationList"
+              android:authorities="${applicationId}.database.conversationlist"
+              android:exported="false" />
+
    <provider android:name=".database.DatabaseContentProviders$Attachment"
              android:authorities="${applicationId}.database.attachment"
              android:exported="false" />
@@ -797,13 +731,6 @@
        </intent-filter>
    </receiver>

-    <receiver android:name=".messageprocessingalarm.MessageProcessReceiver">
-        <intent-filter>
-            <action android:name="android.intent.action.BOOT_COMPLETED" />
-            <action android:name="org.thoughtcrime.securesms.action.PROCESS_MESSAGES" />
-        </intent-filter>
-    </receiver>
-
    <receiver android:name=".service.LocalBackupListener">
        <intent-filter>
            <action android:name="android.intent.action.BOOT_COMPLETED" />
--- a/app/src/main/assets/emoji/Activity.webp
+++ b/app/src/main/assets/emoji/Activity.webp
--- a/app/src/main/assets/emoji/Flags_0.webp
+++ b/app/src/main/assets/emoji/Flags_0.webp
--- a/app/src/main/assets/emoji/Flags_1.webp
+++ b/app/src/main/assets/emoji/Flags_1.webp
--- a/app/src/main/assets/emoji/Foods.webp
+++ b/app/src/main/assets/emoji/Foods.webp
--- a/app/src/main/assets/emoji/Nature.webp
+++ b/app/src/main/assets/emoji/Nature.webp
--- a/app/src/main/assets/emoji/Objects.webp
+++ b/app/src/main/assets/emoji/Objects.webp
--- a/app/src/main/assets/emoji/People_0.webp
+++ b/app/src/main/assets/emoji/People_0.webp
--- a/app/src/main/assets/emoji/People_1.webp
+++ b/app/src/main/assets/emoji/People_1.webp
--- a/app/src/main/assets/emoji/People_2.webp
+++ b/app/src/main/assets/emoji/People_2.webp
--- a/app/src/main/assets/emoji/People_3.webp
+++ b/app/src/main/assets/emoji/People_3.webp
--- a/app/src/main/assets/emoji/People_4.webp
+++ b/app/src/main/assets/emoji/People_4.webp
--- a/app/src/main/assets/emoji/People_5.webp
+++ b/app/src/main/assets/emoji/People_5.webp
--- a/app/src/main/assets/emoji/People_6.webp
+++ b/app/src/main/assets/emoji/People_6.webp
--- a/app/src/main/assets/emoji/People_7.webp
+++ b/app/src/main/assets/emoji/People_7.webp
--- a/app/src/main/assets/emoji/Places.webp
+++ b/app/src/main/assets/emoji/Places.webp
--- a/app/src/main/assets/emoji/Symbols.webp
+++ b/app/src/main/assets/emoji/Symbols.webp
--- a/app/src/main/assets/emoji/emoji_data.json
+++ b/app/src/main/assets/emoji/emoji_data.json
--- a/app/src/main/java/androidx/camera/view/SignalCameraView.java
+++ b/app/src/main/java/androidx/camera/view/SignalCameraView.java
@@ -65,8 +65,6 @@ import androidx.lifecycle.LiveData;

 import com.google.common.util.concurrent.ListenableFuture;

-import org.signal.core.util.logging.Log;
-
 import java.io.File;
 import java.util.concurrent.Executor;

@@ -84,7 +82,7 @@ import java.util.concurrent.Executor;
@RequiresApi(21)
@SuppressLint("RestrictedApi")
 public final class SignalCameraView extends FrameLayout {
-  static final String TAG = Log.tag(SignalCameraView.class);
+  static final String TAG = SignalCameraView.class.getSimpleName();

  static final int INDEFINITE_VIDEO_DURATION = -1;
  static final int INDEFINITE_VIDEO_SIZE = -1;
--- a/app/src/main/java/org/signal/glide/Log.java
+++ b/app/src/main/java/org/signal/glide/Log.java
@@ -24,7 +24,7 @@ public final class Log {
  }

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

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

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

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

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

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

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

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

    private final Loader mLoader;
--- a/app/src/main/java/org/thoughtcrime/securesms/AppInitialization.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/AppInitialization.java
@@ -43,7 +43,6 @@ public final class AppInitialization {
    SignalStore.onFirstEverAppLaunch();
    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.ZOZO.getPackId(), BlessedPacks.ZOZO.getPackKey(), false));
    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.BANDIT.getPackId(), BlessedPacks.BANDIT.getPackKey(), false));
-    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.DAY_BY_DAY.getPackId(), BlessedPacks.DAY_BY_DAY.getPackKey(), false));
    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forReference(BlessedPacks.SWOON_HANDS.getPackId(), BlessedPacks.SWOON_HANDS.getPackKey()));
    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forReference(BlessedPacks.SWOON_FACES.getPackId(), BlessedPacks.SWOON_FACES.getPackKey()));
  }
@@ -53,33 +52,8 @@ public final class AppInitialization {

    ApplicationDependencies.getMegaphoneRepository().onFirstEverAppLaunch();
    SignalStore.onFirstEverAppLaunch();
-    SignalStore.onboarding().clearAll();
-    TextSecurePreferences.onPostBackupRestore(context);
    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.ZOZO.getPackId(), BlessedPacks.ZOZO.getPackKey(), false));
    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.BANDIT.getPackId(), BlessedPacks.BANDIT.getPackKey(), false));
-    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.DAY_BY_DAY.getPackId(), BlessedPacks.DAY_BY_DAY.getPackKey(), false));
-    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forReference(BlessedPacks.SWOON_HANDS.getPackId(), BlessedPacks.SWOON_HANDS.getPackKey()));
-    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forReference(BlessedPacks.SWOON_FACES.getPackId(), BlessedPacks.SWOON_FACES.getPackKey()));
-  }
-
-  /**
-   * Temporary migration method that does the safest bits of {@link #onFirstEverAppLaunch(Context)}
-   */
-  public static void onRepairFirstEverAppLaunch(@NonNull Context context) {
-    Log.w(TAG, "onRepairFirstEverAppLaunch()");
-
-    InsightsOptOut.userRequestedOptOut(context);
-    TextSecurePreferences.setAppMigrationVersion(context, ApplicationMigrations.CURRENT_VERSION);
-    TextSecurePreferences.setJobManagerVersion(context, JobManager.CURRENT_VERSION);
-    TextSecurePreferences.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));
-    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.BANDIT.getPackId(), BlessedPacks.BANDIT.getPackKey(), false));
-    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.DAY_BY_DAY.getPackId(), BlessedPacks.DAY_BY_DAY.getPackKey(), false));
    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forReference(BlessedPacks.SWOON_HANDS.getPackId(), BlessedPacks.SWOON_HANDS.getPackKey()));
    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forReference(BlessedPacks.SWOON_FACES.getPackId(), BlessedPacks.SWOON_FACES.getPackKey()));
  }
--- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
@@ -16,13 +16,17 @@
 */
 package org.thoughtcrime.securesms;

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

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

 import com.google.android.gms.security.ProviderInstaller;
@@ -33,18 +37,14 @@ 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.logging.PersistentLogger;
-import org.signal.core.util.tracing.Tracer;
 import org.signal.glide.SignalGlideCodecs;
 import org.signal.ringrtc.CallManager;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencyProvider;
-import org.thoughtcrime.securesms.emoji.EmojiSource;
 import org.thoughtcrime.securesms.gcm.FcmJobService;
 import org.thoughtcrime.securesms.jobs.CreateSignedPreKeyJob;
-import org.thoughtcrime.securesms.jobs.DownloadLatestEmojiDataJob;
-import org.thoughtcrime.securesms.jobs.EmojiSearchIndexDownloadJob;
 import org.thoughtcrime.securesms.jobs.FcmRefreshJob;
 import org.thoughtcrime.securesms.jobs.GroupV1MigrationJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
@@ -54,35 +54,36 @@ import org.thoughtcrime.securesms.jobs.RetrieveProfileJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger;
 import org.thoughtcrime.securesms.logging.LogSecretProvider;
-import org.thoughtcrime.securesms.messageprocessingalarm.MessageProcessReceiver;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
 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.registration.RegistrationUtil;
+import org.thoughtcrime.securesms.revealable.ViewOnceMessageManager;
 import org.thoughtcrime.securesms.ringrtc.RingRtcLogger;
 import org.thoughtcrime.securesms.service.DirectoryRefreshListener;
+import org.thoughtcrime.securesms.service.ExpiringMessageManager;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.service.LocalBackupListener;
 import org.thoughtcrime.securesms.service.RotateSenderCertificateListener;
 import org.thoughtcrime.securesms.service.RotateSignedPreKeyListener;
 import org.thoughtcrime.securesms.service.UpdateApkRefreshListener;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
-import org.thoughtcrime.securesms.util.AppForegroundObserver;
-import org.thoughtcrime.securesms.util.AppStartup;
+import org.thoughtcrime.securesms.tracing.Trace;
+import org.thoughtcrime.securesms.tracing.Tracer;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.SignalUncaughtExceptionHandler;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
-import org.thoughtcrime.securesms.util.VersionTracker;
 import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
 import org.webrtc.voiceengine.WebRtcAudioManager;
 import org.webrtc.voiceengine.WebRtcAudioUtils;
 import org.whispersystems.libsignal.logging.SignalProtocolLoggerProvider;

 import java.security.Security;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;

 /**
@@ -93,11 +94,16 @@ import java.util.concurrent.TimeUnit;
 *
 * @author Moxie Marlinspike
 */
-public class ApplicationContext extends MultiDexApplication implements AppForegroundObserver.Listener {
+@Trace
+public class ApplicationContext extends MultiDexApplication implements DefaultLifecycleObserver {

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

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

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

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

-    AppStartup.getInstance().addBlocking("security-provider", this::initializeSecurityProvider)
-                            .addBlocking("logging", () -> {
-                                initializeLogging();
-                                Log.i(TAG, "onCreate()");
-                            })
-                            .addBlocking("crash-handling", this::initializeCrashHandling)
-                            .addBlocking("eat-db", () -> DatabaseFactory.getInstance(this))
-                            .addBlocking("app-dependencies", this::initializeAppDependencies)
-                            .addBlocking("notification-channels", () -> NotificationChannels.create(this))
-                            .addBlocking("first-launch", this::initializeFirstEverAppLaunch)
-                            .addBlocking("app-migrations", this::initializeApplicationMigrations)
-                            .addBlocking("ring-rtc", this::initializeRingRtc)
-                            .addBlocking("mark-registration", () -> RegistrationUtil.maybeMarkRegistrationComplete(this))
-                            .addBlocking("lifecycle-observer", () -> ApplicationDependencies.getAppForegroundObserver().addListener(this))
-                            .addBlocking("message-retriever", this::initializeMessageRetrieval)
-                            .addBlocking("dynamic-theme", () -> DynamicTheme.setDefaultDayNightMode(this))
-                            .addBlocking("vector-compat", () -> {
-                              if (Build.VERSION.SDK_INT < 21) {
-                                AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
-                              }
-                            })
-                            .addBlocking("proxy-init", () -> {
-                              if (SignalStore.proxy().isProxyEnabled()) {
-                                Log.w(TAG, "Proxy detected. Enabling Conscrypt.setUseEngineSocketByDefault()");
-                                Conscrypt.setUseEngineSocketByDefault(true);
-                              }
-                            })
-                            .addBlocking("blob-provider", this::initializeBlobProvider)
-                            .addBlocking("feature-flags", FeatureFlags::init)
-                            .addNonBlocking(this::initializeRevealableMessageManager)
-                            .addNonBlocking(this::initializeGcmCheck)
-                            .addNonBlocking(this::initializeSignedPreKeyCheck)
-                            .addNonBlocking(this::initializePeriodicTasks)
-                            .addNonBlocking(this::initializeCircumvention)
-                            .addNonBlocking(this::initializePendingMessages)
-                            .addNonBlocking(this::initializeCleanup)
-                            .addNonBlocking(this::initializeGlideCodecs)
-                            .addNonBlocking(RefreshPreKeysJob::scheduleIfNecessary)
-                            .addNonBlocking(StorageSyncHelper::scheduleRoutineSync)
-                            .addNonBlocking(() -> ApplicationDependencies.getJobManager().beginJobLoop())
-                            .addNonBlocking(EmojiSource::refresh)
-                            .addPostRender(() -> RateLimitUtil.retryAllRateLimitedMessages(this))
-                            .addPostRender(this::initializeExpiringMessageManager)
-                            .addPostRender(() -> SignalStore.settings().setDefaultSms(Util.isDefaultSmsProvider(this)))
-                            .addPostRender(() -> DownloadLatestEmojiDataJob.scheduleIfNecessary(this))
-                            .addPostRender(EmojiSearchIndexDownloadJob::scheduleIfNecessary)
-                            .execute();
+    initializeSecurityProvider();
+    initializeLogging();
+    Log.i(TAG, "onCreate()");
+    initializeCrashHandling();
+    initializeAppDependencies();
+    initializeFirstEverAppLaunch();
+    initializeApplicationMigrations();
+    initializeMessageRetrieval();
+    initializeExpiringMessageManager();
+    initializeRevealableMessageManager();
+    initializeGcmCheck();
+    initializeSignedPreKeyCheck();
+    initializePeriodicTasks();
+    initializeCircumvention();
+    initializeRingRtc();
+    initializePendingMessages();
+    initializeBlobProvider();
+    initializeCleanup();
+    initializeGlideCodecs();
+
+    FeatureFlags.init();
+    NotificationChannels.create(this);
+    RefreshPreKeysJob.scheduleIfNecessary();
+    StorageSyncHelper.scheduleRoutineSync();
+    RegistrationUtil.maybeMarkRegistrationComplete(this);
+    ProcessLifecycleOwner.get().getLifecycle().addObserver(this);
+
+    if (Build.VERSION.SDK_INT < 21) {
+      AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
+    }
+
+    ApplicationDependencies.getJobManager().beginJobLoop();
+
+    DynamicTheme.setDefaultDayNightMode(this);

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

  @Override
-  public void onForeground() {
-    long startTime = System.currentTimeMillis();
+  public void onStart(@NonNull LifecycleOwner owner) {
+    isAppVisible = true;
    Log.i(TAG, "App is now visible.");
-
+    FeatureFlags.refreshIfNecessary();
+    ApplicationDependencies.getRecipientCache().warmUp();
+    RetrieveProfileJob.enqueueRoutineFetchIfNecessary(this);
+    GroupV1MigrationJob.enqueueRoutineMigrationsIfNecessary(this);
+    executePendingContactSync();
+    KeyCachingService.onAppForegrounded(this);
    ApplicationDependencies.getFrameRateTracker().begin();
    ApplicationDependencies.getMegaphoneRepository().onAppForegrounded();
-
-    SignalExecutors.BOUNDED.execute(() -> {
-      FeatureFlags.refreshIfNecessary();
-      ApplicationDependencies.getRecipientCache().warmUp();
-      RetrieveProfileJob.enqueueRoutineFetchIfNecessary(this);
-      GroupV1MigrationJob.enqueueRoutineMigrationsIfNecessary(this);
-      executePendingContactSync();
-      KeyCachingService.onAppForegrounded(this);
-      ApplicationDependencies.getShakeToReport().enable();
-      checkBuildExpiration();
-    });
-
-    Log.d(TAG, "onStart() took " + (System.currentTimeMillis() - startTime) + " ms");
+    checkBuildExpiration();
  }

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

  public PersistentLogger getPersistentLogger() {
@@ -236,7 +228,7 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr

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

    SignalProtocolLoggerProvider.setProvider(new CustomSignalProtocolLogger());
  }
@@ -255,24 +247,18 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
  }

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

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

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

@@ -293,11 +279,11 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
  }

  private void initializeExpiringMessageManager() {
-    ApplicationDependencies.getExpiringMessageManager().checkSchedule();
+    this.expiringMessageManager = new ExpiringMessageManager(this);
  }

  private void initializeRevealableMessageManager() {
-    ApplicationDependencies.getViewOnceMessageManager().scheduleIfNecessary();
+    this.viewOnceMessageManager = new ViewOnceMessageManager(this);
  }

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

    if (BuildConfig.PLAY_STORE_DISABLED) {
      UpdateApkRefreshListener.schedule(this);
@@ -314,11 +299,31 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr

  private void initializeRingRtc() {
    try {
-      if (RtcDeviceLists.hardwareAECBlocked()) {
+      Set<String> HARDWARE_AEC_BLACKLIST = new HashSet<String>() {{
+        add("Pixel");
+        add("Pixel XL");
+        add("Moto G5");
+        add("Moto G (5S) Plus");
+        add("Moto G4");
+        add("TA-1053");
+        add("Mi A1");
+        add("Mi A2");
+        add("E5823"); // Sony z5 compact
+        add("Redmi Note 5");
+        add("FP2"); // Fairphone FP2
+        add("MI 5");
+      }};
+
+      Set<String> OPEN_SL_ES_WHITELIST = new HashSet<String>() {{
+        add("Pixel");
+        add("Pixel XL");
+      }};
+
+      if (HARDWARE_AEC_BLACKLIST.contains(Build.MODEL)) {
        WebRtcAudioUtils.setWebRtcBasedAcousticEchoCanceler(true);
      }

-      if (!RtcDeviceLists.openSLESAllowed()) {
+      if (!OPEN_SL_ES_WHITELIST.contains(Build.MODEL)) {
        WebRtcAudioManager.setBlacklistDeviceForOpenSLESUsage(true);
      }

@@ -328,15 +333,23 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
    }
  }

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

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

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

-  @WorkerThread
  private void initializeCleanup() {
-    int deleted = DatabaseFactory.getAttachmentDatabase(this).deleteAbandonedPreuploadedAttachments();
-    Log.i(TAG, "Deleted " + deleted + " abandoned attachments.");
+    SignalExecutors.BOUNDED.execute(() -> {
+      int deleted = DatabaseFactory.getAttachmentDatabase(this).deleteAbandonedPreuploadedAttachments();
+      Log.i(TAG, "Deleted " + deleted + " abandoned attachments.");
+    });
  }

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

 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.util.AppStartup;
 import org.thoughtcrime.securesms.util.ConfigurationUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
@@ -33,10 +31,8 @@ public abstract class BaseActivity extends AppCompatActivity {

  @Override
  protected void onCreate(Bundle savedInstanceState) {
-    AppStartup.getInstance().onCriticalRenderEventStart();
    logEvent("onCreate()");
    super.onCreate(savedInstanceState);
-    AppStartup.getInstance().onCriticalRenderEventEnd();
  }

  @Override
@@ -48,7 +44,6 @@ public abstract class BaseActivity extends AppCompatActivity {
  @Override
  protected void onStart() {
    logEvent("onStart()");
-    ApplicationDependencies.getShakeToReport().registerActivity(this);
    super.onStart();
  }

--- a/app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/BindableConversationItem.java
@@ -11,12 +11,8 @@ import androidx.lifecycle.Observer;
 import org.thoughtcrime.securesms.components.voice.VoiceNotePlaybackState;
 import org.thoughtcrime.securesms.contactshare.Contact;
 import org.thoughtcrime.securesms.conversation.ConversationMessage;
-import org.thoughtcrime.securesms.conversation.colors.Colorizable;
-import org.thoughtcrime.securesms.conversation.colors.Colorizer;
-import org.thoughtcrime.securesms.database.model.InMemoryMessageRecord;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
-import org.thoughtcrime.securesms.giph.mp4.GiphyMp4Playable;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.groups.GroupMigrationMembershipChange;
 import org.thoughtcrime.securesms.linkpreview.LinkPreview;
@@ -24,14 +20,13 @@ 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;
 import java.util.Locale;
 import java.util.Set;

-public interface BindableConversationItem extends Unbindable, GiphyMp4Playable, Colorizable {
+public interface BindableConversationItem extends Unbindable {
  void bind(@NonNull LifecycleOwner lifecycleOwner,
            @NonNull ConversationMessage messageRecord,
            @NonNull Optional<MessageRecord> previousMessageRecord,
@@ -41,12 +36,7 @@ public interface BindableConversationItem extends Unbindable, GiphyMp4Playable,
            @NonNull Set<ConversationMessage> batchSelected,
            @NonNull Recipient recipients,
            @Nullable String searchQuery,
-            boolean pulseMention,
-            boolean hasWallpaper,
-            boolean isMessageRequestAccepted,
-            @NonNull AttachmentMediaSourceFactory attachmentMediaSourceFactory,
-            boolean canPlayInline,
-            @NonNull Colorizer colorizer);
+            boolean pulseMention);

  ConversationMessage getConversationMessage();

@@ -65,21 +55,13 @@ public interface BindableConversationItem extends Unbindable, GiphyMp4Playable,
    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);
    void onRegisterVoiceNoteCallbacks(@NonNull Observer<VoiceNotePlaybackState> onPlaybackStartObserver);
    void onUnregisterVoiceNoteCallbacks(@NonNull Observer<VoiceNotePlaybackState> onPlaybackStartObserver);
    void onVoiceNotePause(@NonNull Uri uri);
    void onVoiceNotePlay(@NonNull Uri uri, long messageId, double position);
    void onVoiceNoteSeekTo(@NonNull Uri uri, double position);
    void onGroupMigrationLearnMoreClicked(@NonNull GroupMigrationMembershipChange membershipChange);
-    void onDecryptionFailedLearnMoreClicked();
-    void onSafetyNumberLearnMoreClicked(@NonNull Recipient recipient);
    void onJoinGroupCallClicked();
-    void onInviteFriendsToGroupClicked(@NonNull GroupId.V2 groupId);
-    void onEnableCallNotificationsClicked();
-    void onPlayInlineContent(ConversationMessage conversationMessage);
-    void onInMemoryMessageClicked(@NonNull InMemoryMessageRecord messageRecord);
-    void onViewGroupDescriptionChange(@Nullable GroupId groupId, @NonNull String description, boolean isMessageRequestAccepted);

    /** @return true if handled, false if you want to let the normal url handling continue */
    boolean onUrlClicked(@NonNull String url);
--- a/app/src/main/java/org/thoughtcrime/securesms/BlockUnblockDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/BlockUnblockDialog.java
@@ -9,8 +9,6 @@ import androidx.annotation.WorkerThread;
 import androidx.appcompat.app.AlertDialog;
 import androidx.lifecycle.Lifecycle;

-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
@@ -32,15 +30,15 @@ public final class BlockUnblockDialog {
                   AlertDialog.Builder::show);
  }

-  public static void showBlockAndReportSpamFor(@NonNull Context context,
-                                               @NonNull Lifecycle lifecycle,
-                                               @NonNull Recipient recipient,
-                                               @NonNull Runnable onBlock,
-                                               @NonNull Runnable onBlockAndReportSpam)
+  public static void showBlockAndDeleteFor(@NonNull Context context,
+                                           @NonNull Lifecycle lifecycle,
+                                           @NonNull Recipient recipient,
+                                           @NonNull Runnable onBlock,
+                                           @NonNull Runnable onBlockAndDelete)
  {
    SimpleTask.run(lifecycle,
-                   () -> buildBlockFor(context, recipient, onBlock, onBlockAndReportSpam),
-                   AlertDialog.Builder::show);
+        () -> buildBlockFor(context, recipient, onBlock, onBlockAndDelete),
+        AlertDialog.Builder::show);
  }

  public static void showUnblockFor(@NonNull Context context,
@@ -57,11 +55,11 @@ public final class BlockUnblockDialog {
  private static AlertDialog.Builder buildBlockFor(@NonNull Context context,
                                                   @NonNull Recipient recipient,
                                                   @NonNull Runnable onBlock,
-                                                   @Nullable Runnable onBlockAndReportSpam)
+                                                   @Nullable Runnable onBlockAndDelete)
  {
    recipient = recipient.resolve();

-    AlertDialog.Builder builder   = new MaterialAlertDialogBuilder(context);
+    AlertDialog.Builder builder   = new AlertDialog.Builder(context);
    Resources           resources = context.getResources();

    if (recipient.isGroup()) {
@@ -80,10 +78,10 @@ public final class BlockUnblockDialog {
      builder.setTitle(resources.getString(R.string.BlockUnblockDialog_block_s, recipient.getDisplayName(context)));
      builder.setMessage(R.string.BlockUnblockDialog_blocked_people_wont_be_able_to_call_you_or_send_you_messages);

-      if (onBlockAndReportSpam != null) {
+      if (onBlockAndDelete != null) {
        builder.setNeutralButton(android.R.string.cancel, null);
-        builder.setNegativeButton(R.string.BlockUnblockDialog_report_spam_and_block, (d, w) -> onBlockAndReportSpam.run());
-        builder.setPositiveButton(R.string.BlockUnblockDialog_block, (d, w) -> onBlock.run());
+        builder.setPositiveButton(R.string.BlockUnblockDialog_block_and_delete, (d, w) -> onBlockAndDelete.run());
+        builder.setNegativeButton(R.string.BlockUnblockDialog_block, (d, w) -> onBlock.run());
      } else {
        builder.setPositiveButton(R.string.BlockUnblockDialog_block, ((dialog, which) -> onBlock.run()));
        builder.setNegativeButton(android.R.string.cancel, null);
@@ -100,7 +98,7 @@ public final class BlockUnblockDialog {
  {
    recipient = recipient.resolve();

-    AlertDialog.Builder builder   = new MaterialAlertDialogBuilder(context);
+    AlertDialog.Builder builder   = new AlertDialog.Builder(context);
    Resources           resources = context.getResources();

    if (recipient.isGroup()) {
--- a/app/src/main/java/org/thoughtcrime/securesms/ConfirmIdentityDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ConfirmIdentityDialog.java
@@ -11,8 +11,6 @@ import android.widget.TextView;

 import androidx.appcompat.app.AlertDialog;

-import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.crypto.DatabaseSessionLock;
 import org.thoughtcrime.securesms.crypto.storage.TextSecureIdentityKeyStore;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MessageDatabase;
@@ -29,16 +27,17 @@ import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.VerifySpan;
 import org.whispersystems.libsignal.SignalProtocolAddress;
 import org.whispersystems.libsignal.util.guava.Optional;
-import org.whispersystems.signalservice.api.SignalSessionLock;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 import org.whispersystems.signalservice.internal.push.SignalServiceProtos;

 import java.io.IOException;

+import static org.whispersystems.libsignal.SessionCipher.SESSION_LOCK;
+
 public class ConfirmIdentityDialog extends AlertDialog {

  @SuppressWarnings("unused")
-  private static final String TAG = Log.tag(ConfirmIdentityDialog.class);
+  private static final String TAG = ConfirmIdentityDialog.class.getSimpleName();

  private OnClickListener callback;

@@ -95,7 +94,7 @@ public class ConfirmIdentityDialog extends AlertDialog {
      {
        @Override
        protected Void doInBackground(Void... params) {
-          try (SignalSessionLock.Lock unused = DatabaseSessionLock.INSTANCE.acquire()) {
+          synchronized (SESSION_LOCK) {
            SignalProtocolAddress      mismatchAddress  = new SignalProtocolAddress(Recipient.resolved(recipientId).requireServiceId(), 1);
            TextSecureIdentityKeyStore identityKeyStore = new TextSecureIdentityKeyStore(getContext());

@@ -137,6 +136,7 @@ public class ConfirmIdentityDialog extends AlertDialog {

        private void processIncomingMessageRecord(MessageRecord messageRecord) {
          try {
+            PushDatabase    pushDatabase = DatabaseFactory.getPushDatabase(getContext());
            MessageDatabase smsDatabase  = DatabaseFactory.getSmsDatabase(getContext());

            smsDatabase.removeMismatchedIdentity(messageRecord.getId(),
@@ -155,7 +155,9 @@ public class ConfirmIdentityDialog extends AlertDialog {
                                                                       0,
                                                                       null);

-            ApplicationDependencies.getJobManager().add(new PushDecryptMessageJob(getContext(), envelope, messageRecord.getId()));
+            long pushId = pushDatabase.insert(envelope);
+
+            ApplicationDependencies.getJobManager().add(new PushDecryptMessageJob(getContext(), pushId, messageRecord.getId()));
          } catch (IOException e) {
            throw new AssertionError(e);
          }
--- a/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionActivity.java
@@ -26,12 +26,11 @@ import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.components.ContactFilterToolbar;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
 import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.ServiceUtil;
-import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.whispersystems.libsignal.util.guava.Optional;

 import java.io.IOException;
@@ -48,7 +47,7 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActivit
                                                          ContactSelectionListFragment.OnContactSelectedListener,
                                                          ContactSelectionListFragment.ScrollCallback
 {
-  private static final String TAG = Log.tag(ContactSelectionActivity.class);
+  private static final String TAG = ContactSelectionActivity.class.getSimpleName();

  public static final String EXTRA_LAYOUT_RES_ID = "layout_res_id";

@@ -66,8 +65,8 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActivit
  @Override
  protected void onCreate(Bundle icicle, boolean ready) {
    if (!getIntent().hasExtra(ContactSelectionListFragment.DISPLAY_MODE)) {
-      int displayMode = Util.isDefaultSmsProvider(this) ? DisplayMode.FLAG_ALL
-                                                        : DisplayMode.FLAG_PUSH | DisplayMode.FLAG_ACTIVE_GROUPS | DisplayMode.FLAG_INACTIVE_GROUPS | DisplayMode.FLAG_SELF;
+      int displayMode = TextSecurePreferences.isSmsEnabled(this) ? DisplayMode.FLAG_ALL
+                                                                 : DisplayMode.FLAG_PUSH | DisplayMode.FLAG_ACTIVE_GROUPS | DisplayMode.FLAG_INACTIVE_GROUPS | DisplayMode.FLAG_SELF;
      getIntent().putExtra(ContactSelectionListFragment.DISPLAY_MODE, displayMode);
    }

@@ -100,6 +99,7 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActivit

  private void initializeResources() {
    contactsFragment = (ContactSelectionListFragment) getSupportFragmentManager().findFragmentById(R.id.contact_selection_list_fragment);
+    contactsFragment.setOnContactSelectedListener(this);
    contactsFragment.setOnRefreshListener(this);
  }

--- a/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
@@ -58,7 +58,6 @@ import com.pnikosis.materialishprogress.ProgressWheel;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.components.RecyclerViewFastScroller;
 import org.thoughtcrime.securesms.components.emoji.WarningTextView;
-import org.thoughtcrime.securesms.contacts.AbstractContactsCursorLoader;
 import org.thoughtcrime.securesms.contacts.ContactChip;
 import org.thoughtcrime.securesms.contacts.ContactSelectionListAdapter;
 import org.thoughtcrime.securesms.contacts.ContactSelectionListItem;
@@ -77,7 +76,6 @@ import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.StickyHeaderDecoration;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.UsernameUtil;
-import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.adapter.FixedViewsAdapter;
 import org.thoughtcrime.securesms.util.adapter.RecyclerViewConcatenateAdapterStickyHeader;
 import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
@@ -112,27 +110,22 @@ public final class ContactSelectionListFragment extends LoggingFragment
  public static final String SELECTION_LIMITS  = "selection_limits";
  public static final String CURRENT_SELECTION = "current_selection";
  public static final String HIDE_COUNT        = "hide_count";
-  public static final String CAN_SELECT_SELF   = "can_select_self";
-  public static final String DISPLAY_CHIPS     = "display_chips";
-
-  private ConstraintLayout                            constraintLayout;
-  private TextView                                    emptyText;
-  private OnContactSelectedListener                   onContactSelectedListener;
-  private SwipeRefreshLayout                          swipeRefresh;
-  private View                                        showContactsLayout;
-  private Button                                      showContactsButton;
-  private TextView                                    showContactsDescription;
-  private ProgressWheel                               showContactsProgress;
-  private String                                      cursorFilter;
-  private RecyclerView                                recyclerView;
-  private RecyclerViewFastScroller                    fastScroller;
-  private ContactSelectionListAdapter                 cursorRecyclerViewAdapter;
-  private ChipGroup                                   chipGroup;
-  private HorizontalScrollView                        chipGroupScrollContainer;
-  private WarningTextView                             groupLimit;
-  private OnSelectionLimitReachedListener             onSelectionLimitReachedListener;
-  private AbstractContactsCursorLoaderFactoryProvider cursorFactoryProvider;

+  private ConstraintLayout            constraintLayout;
+  private TextView                    emptyText;
+  private OnContactSelectedListener   onContactSelectedListener;
+  private SwipeRefreshLayout          swipeRefresh;
+  private View                        showContactsLayout;
+  private Button                      showContactsButton;
+  private TextView                    showContactsDescription;
+  private ProgressWheel               showContactsProgress;
+  private String                      cursorFilter;
+  private RecyclerView                recyclerView;
+  private RecyclerViewFastScroller    fastScroller;
+  private ContactSelectionListAdapter cursorRecyclerViewAdapter;
+  private ChipGroup                   chipGroup;
+  private HorizontalScrollView        chipGroupScrollContainer;
+  private WarningTextView             groupLimit;

  @Nullable private FixedViewsAdapter headerAdapter;
  @Nullable private FixedViewsAdapter footerAdapter;
@@ -143,7 +136,6 @@ public final class ContactSelectionListFragment extends LoggingFragment
            private Set<RecipientId>  currentSelection;
            private boolean           isMulti;
            private boolean           hideCount;
-            private boolean           canSelectSelf;

  @Override
  public void onAttach(@NonNull Context context) {
@@ -153,33 +145,9 @@ public final class ContactSelectionListFragment extends LoggingFragment
      listCallback = (ListCallback) context;
    }

-    if (getParentFragment() instanceof ScrollCallback) {
-      scrollCallback = (ScrollCallback) getParentFragment();
-    }
-
    if (context instanceof ScrollCallback) {
      scrollCallback = (ScrollCallback) context;
    }
-
-    if (getParentFragment() instanceof OnContactSelectedListener) {
-      onContactSelectedListener = (OnContactSelectedListener) getParentFragment();
-    }
-
-    if (context instanceof OnContactSelectedListener) {
-      onContactSelectedListener = (OnContactSelectedListener) context;
-    }
-
-    if (context instanceof OnSelectionLimitReachedListener) {
-      onSelectionLimitReachedListener = (OnSelectionLimitReachedListener) context;
-    }
-
-    if (context instanceof AbstractContactsCursorLoaderFactoryProvider) {
-      cursorFactoryProvider = (AbstractContactsCursorLoaderFactoryProvider) context;
-    }
-
-    if (getParentFragment() instanceof AbstractContactsCursorLoaderFactoryProvider) {
-      cursorFactoryProvider = (AbstractContactsCursorLoaderFactoryProvider) context;
-    }
  }

  @Override
@@ -208,7 +176,7 @@ public final class ContactSelectionListFragment extends LoggingFragment

                 activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);

-                 if (safeArguments().getBoolean(RECENTS, activity.getIntent().getBooleanExtra(RECENTS, false))) {
+                 if (activity.getIntent().getBooleanExtra(RECENTS, false)) {
                   LoaderManager.getInstance(this).initLoader(0, null, ContactSelectionListFragment.this);
                 } else {
                   initializeNoContactsPermission();
@@ -242,18 +210,13 @@ public final class ContactSelectionListFragment extends LoggingFragment
      }
    });

-    Intent intent    = requireActivity().getIntent();
-    Bundle arguments = safeArguments();
+    Intent intent = requireActivity().getIntent();

-    swipeRefresh.setEnabled(arguments.getBoolean(REFRESHABLE, intent.getBooleanExtra(REFRESHABLE, true)));
+    swipeRefresh.setEnabled(intent.getBooleanExtra(REFRESHABLE, true));

-    hideCount      = arguments.getBoolean(HIDE_COUNT, intent.getBooleanExtra(HIDE_COUNT, false));
-    selectionLimit = arguments.getParcelable(SELECTION_LIMITS);
-    if (selectionLimit == null) {
-      selectionLimit = intent.getParcelableExtra(SELECTION_LIMITS);
-    }
-    isMulti       = selectionLimit != null;
-    canSelectSelf = arguments.getBoolean(CAN_SELECT_SELF, intent.getBooleanExtra(CAN_SELECT_SELF, !isMulti));
+    hideCount      = intent.getBooleanExtra(HIDE_COUNT, false);
+    selectionLimit = intent.getParcelableExtra(SELECTION_LIMITS);
+    isMulti        = selectionLimit != null;

    if (!isMulti) {
      selectionLimit = SelectionLimits.NO_LIMITS;
@@ -266,10 +229,6 @@ public final class ContactSelectionListFragment extends LoggingFragment
    return view;
  }

-  private @NonNull Bundle safeArguments() {
-    return getArguments() != null ? getArguments() : new Bundle();
-  }
-
  private void updateGroupLimit(int chipCount) {
    int members = currentSelection.size() + chipCount;
    groupLimit.setText(getResources().getQuantityString(R.plurals.ContactSelectionListFragment_d_members, members, members));
@@ -299,10 +258,7 @@ public final class ContactSelectionListFragment extends LoggingFragment
  }

  private Set<RecipientId> getCurrentSelection() {
-    List<RecipientId> currentSelection = safeArguments().getParcelableArrayList(CURRENT_SELECTION);
-    if (currentSelection == null) {
-      currentSelection = requireActivity().getIntent().getParcelableArrayListExtra(CURRENT_SELECTION);
-    }
+    List<RecipientId> currentSelection = requireActivity().getIntent().getParcelableArrayListExtra(CURRENT_SELECTION);

    return currentSelection == null ? Collections.emptySet()
                                    : Collections.unmodifiableSet(Stream.of(currentSelection).collect(Collectors.toSet()));
@@ -339,7 +295,7 @@ public final class ContactSelectionListFragment extends LoggingFragment
    }

    recyclerView.setAdapter(concatenateAdapter);
-    recyclerView.addItemDecoration(new StickyHeaderDecoration(concatenateAdapter, true, true, 0));
+    recyclerView.addItemDecoration(new StickyHeaderDecoration(concatenateAdapter, true, true));
    recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
      @Override
      public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
@@ -416,15 +372,10 @@ public final class ContactSelectionListFragment extends LoggingFragment

  @Override
  public @NonNull Loader<Cursor> onCreateLoader(int id, Bundle args) {
-    FragmentActivity activity       = requireActivity();
-    int              displayMode    = safeArguments().getInt(DISPLAY_MODE, activity.getIntent().getIntExtra(DISPLAY_MODE, DisplayMode.FLAG_ALL));
-    boolean          displayRecents = safeArguments().getBoolean(RECENTS, activity.getIntent().getBooleanExtra(RECENTS, false));
-
-    if (cursorFactoryProvider != null) {
-      return cursorFactoryProvider.get().create();
-    } else {
-      return new ContactsCursorLoader.Factory(activity, displayMode, cursorFilter, displayRecents).create();
-    }
+    FragmentActivity activity = requireActivity();
+    return new ContactsCursorLoader(activity,
+                                    activity.getIntent().getIntExtra(DISPLAY_MODE, DisplayMode.FLAG_ALL),
+                                    cursorFilter, activity.getIntent().getBooleanExtra(RECENTS, false));
  }

  @Override
@@ -497,11 +448,8 @@ public final class ContactSelectionListFragment extends LoggingFragment
          swipeRefresh.setVisibility(View.VISIBLE);
          reset();
        } else {
-          Context context = getContext();
-          if (context != null) {
-            Toast.makeText(getContext(), R.string.ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection, Toast.LENGTH_LONG).show();
-            initializeNoContactsPermission();
-          }
+          Toast.makeText(getContext(), R.string.ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection, Toast.LENGTH_LONG).show();
+          initializeNoContactsPermission();
        }
      }
    }.execute();
@@ -513,18 +461,14 @@ public final class ContactSelectionListFragment extends LoggingFragment
      SelectedContact selectedContact = contact.isUsernameType() ? SelectedContact.forUsername(contact.getRecipientId().orNull(), contact.getNumber())
                                                                 : SelectedContact.forPhone(contact.getRecipientId().orNull(), contact.getNumber());

-      if (!canSelectSelf && Recipient.self().getId().equals(selectedContact.getOrCreateRecipientId(requireContext()))) {
+      if (isMulti && Recipient.self().getId().equals(selectedContact.getOrCreateRecipientId(requireContext()))) {
        Toast.makeText(requireContext(), R.string.ContactSelectionListFragment_you_do_not_need_to_add_yourself_to_the_group, Toast.LENGTH_SHORT).show();
        return;
      }

      if (!isMulti || !cursorRecyclerViewAdapter.isSelectedContact(selectedContact)) {
        if (selectionHardLimitReached()) {
-          if (onSelectionLimitReachedListener != null) {
-            onSelectionLimitReachedListener.onHardLimitReached(selectionLimit.getHardLimit());
-          } else {
-            GroupLimitDialog.showHardLimitMessage(requireContext());
-          }
+          GroupLimitDialog.showHardLimitMessage(requireContext());
          return;
        }

@@ -542,11 +486,11 @@ public final class ContactSelectionListFragment extends LoggingFragment
              if (onContactSelectedListener != null) {
                if (onContactSelectedListener.onBeforeContactSelected(Optional.of(recipient.getId()), null)) {
                  markContactSelected(selected);
-                  cursorRecyclerViewAdapter.notifyItemRangeChanged(0, cursorRecyclerViewAdapter.getItemCount(), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
+                  cursorRecyclerViewAdapter.notifyItemChanged(recyclerView.getChildAdapterPosition(contact), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
                }
              } else {
                markContactSelected(selected);
-                cursorRecyclerViewAdapter.notifyItemRangeChanged(0, cursorRecyclerViewAdapter.getItemCount(), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
+                cursorRecyclerViewAdapter.notifyItemChanged(recyclerView.getChildAdapterPosition(contact), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
              }
            } else {
              new AlertDialog.Builder(requireContext())
@@ -560,16 +504,16 @@ public final class ContactSelectionListFragment extends LoggingFragment
          if (onContactSelectedListener != null) {
            if (onContactSelectedListener.onBeforeContactSelected(contact.getRecipientId(), contact.getNumber())) {
              markContactSelected(selectedContact);
-              cursorRecyclerViewAdapter.notifyItemRangeChanged(0, cursorRecyclerViewAdapter.getItemCount(), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
+              cursorRecyclerViewAdapter.notifyItemChanged(recyclerView.getChildAdapterPosition(contact), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
            }
          } else {
            markContactSelected(selectedContact);
-            cursorRecyclerViewAdapter.notifyItemRangeChanged(0, cursorRecyclerViewAdapter.getItemCount(), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
+            cursorRecyclerViewAdapter.notifyItemChanged(recyclerView.getChildAdapterPosition(contact), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
          }
        }
      } else {
        markContactUnselected(selectedContact);
-        cursorRecyclerViewAdapter.notifyItemRangeChanged(0, cursorRecyclerViewAdapter.getItemCount(), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
+        cursorRecyclerViewAdapter.notifyItemChanged(recyclerView.getChildAdapterPosition(contact), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);

        if (onContactSelectedListener != null) {
          onContactSelectedListener.onContactDeselected(contact.getRecipientId(), contact.getNumber());
@@ -664,11 +608,7 @@ public final class ContactSelectionListFragment extends LoggingFragment
    chipGroup.addView(chip);
    updateGroupLimit(getChipCount());
    if (selectionWarningLimitReachedExactly()) {
-      if (onSelectionLimitReachedListener != null) {
-        onSelectionLimitReachedListener.onSuggestedLimitReached(selectionLimit.getRecommendedLimit());
-      } else {
-        GroupLimitDialog.showRecommendedLimitMessage(requireContext());
-      }
+      GroupLimitDialog.showRecommendedLimitMessage(requireContext());
    }
  }

@@ -690,10 +630,6 @@ public final class ContactSelectionListFragment extends LoggingFragment
  }

  private void setChipGroupVisibility(int visibility) {
-    if (!safeArguments().getBoolean(DISPLAY_CHIPS, requireActivity().getIntent().getBooleanExtra(DISPLAY_CHIPS, true))) {
-      return;
-    }
-
    TransitionManager.beginDelayedTransition(constraintLayout, new AutoTransition().setDuration(CHIP_GROUP_REVEAL_DURATION_MS));

    ConstraintSet constraintSet = new ConstraintSet();
@@ -702,12 +638,16 @@ public final class ContactSelectionListFragment extends LoggingFragment
    constraintSet.applyTo(constraintLayout);
  }

+  public void setOnContactSelectedListener(OnContactSelectedListener onContactSelectedListener) {
+    this.onContactSelectedListener = onContactSelectedListener;
+  }
+
  public void setOnRefreshListener(SwipeRefreshLayout.OnRefreshListener onRefreshListener) {
    this.swipeRefresh.setOnRefreshListener(onRefreshListener);
  }

  private void smoothScrollChipsToEnd() {
-    int x = ViewUtil.isLtr(chipGroupScrollContainer) ? chipGroup.getWidth() : 0;
+    int x = chipGroupScrollContainer.getLayoutDirection() == View.LAYOUT_DIRECTION_LTR ? chipGroup.getWidth() : 0;
    chipGroupScrollContainer.smoothScrollTo(x, 0);
  }

@@ -717,11 +657,6 @@ public final class ContactSelectionListFragment extends LoggingFragment
    void onContactDeselected(Optional<RecipientId> recipientId, String number);
  }

-  public interface OnSelectionLimitReachedListener {
-    void onSuggestedLimitReached(int limit);
-    void onHardLimitReached(int limit);
-  }
-
  public interface ListCallback {
    void onInvite();
    void onNewGroup(boolean forceV1);
@@ -730,8 +665,4 @@ public final class ContactSelectionListFragment extends LoggingFragment
  public interface ScrollCallback {
    void onBeginScroll();
  }
-
-  public interface AbstractContactsCursorLoaderFactoryProvider {
-    @NonNull AbstractContactsCursorLoader.Factory get();
-  }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/DatabaseMigrationActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/DatabaseMigrationActivity.java
@@ -9,7 +9,6 @@ import android.content.ServiceConnection;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
-import android.os.Looper;
 import android.os.Message;
 import android.os.Parcelable;
 import android.view.View;
@@ -151,7 +150,7 @@ public class DatabaseMigrationActivity extends PassphraseRequiredActivity {
        startActivity((Intent)getIntent().getParcelableExtra("next_intent"));
      } else {
        // TODO [greyson] Navigation
-        startActivity(MainActivity.clearTop(this));
+        startActivity(new Intent(this, MainActivity.class));
      }
    }

@@ -159,11 +158,6 @@ public class DatabaseMigrationActivity extends PassphraseRequiredActivity {
  }

  private class ImportStateHandler extends Handler {
-
-    public ImportStateHandler() {
-      super(Looper.getMainLooper());
-    }
-
    @Override
    public void handleMessage(Message message) {
      switch (message.what) {
--- a/app/src/main/java/org/thoughtcrime/securesms/DeviceActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/DeviceActivity.java
@@ -16,10 +16,8 @@ import android.widget.Button;
 import android.widget.Toast;

 import androidx.annotation.NonNull;
-import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;

-import org.signal.core.util.ThreadUtil;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
@@ -28,9 +26,9 @@ import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.qr.ScanListener;
 import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
-import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
 import org.whispersystems.libsignal.IdentityKeyPair;
 import org.whispersystems.libsignal.InvalidKeyException;
@@ -47,9 +45,9 @@ public class DeviceActivity extends PassphraseRequiredActivity
    implements Button.OnClickListener, ScanListener, DeviceLinkFragment.LinkClickedListener
 {

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

-  private final DynamicTheme    dynamicTheme    = new DynamicNoActionBarTheme();
+  private final DynamicTheme    dynamicTheme    = new DynamicTheme();
  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();

  private DeviceAddFragment  deviceAddFragment;
@@ -64,14 +62,9 @@ public class DeviceActivity extends PassphraseRequiredActivity

  @Override
  public void onCreate(Bundle bundle, boolean ready) {
-    setContentView(R.layout.device_activity);
-
-    Toolbar toolbar = findViewById(R.id.toolbar);
-
-    setSupportActionBar(toolbar);
-    requireSupportActionBar().setDisplayHomeAsUpEnabled(true);
-    requireSupportActionBar().setTitle(R.string.AndroidManifest__linked_devices);
-
+    getSupportActionBar().setHomeAsUpIndicator(ContextCompat.getDrawable(this, R.drawable.ic_arrow_left_24));
+    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+    getSupportActionBar().setTitle(R.string.AndroidManifest__linked_devices);
    this.deviceAddFragment  = new DeviceAddFragment();
    this.deviceListFragment = new DeviceListFragment();
    this.deviceLinkFragment = new DeviceLinkFragment();
@@ -80,10 +73,20 @@ public class DeviceActivity extends PassphraseRequiredActivity
    this.deviceAddFragment.setScanListener(this);

    if (getIntent().getBooleanExtra("add", false)) {
-      initFragment(R.id.fragment_container, deviceAddFragment, dynamicLanguage.getCurrentLocale());
+      initFragment(android.R.id.content, deviceAddFragment, dynamicLanguage.getCurrentLocale());
    } else {
-      initFragment(R.id.fragment_container, deviceListFragment, dynamicLanguage.getCurrentLocale());
+      initFragment(android.R.id.content, deviceListFragment, dynamicLanguage.getCurrentLocale());
    }
+
+    overridePendingTransition(R.anim.slide_from_end, R.anim.slide_to_start);
+  }
+
+  @Override
+  protected void onPause() {
+    if (isFinishing()) {
+      overridePendingTransition(R.anim.slide_from_start, R.anim.slide_to_end);
+    }
+    super.onPause();
  }

  @Override
@@ -95,9 +98,8 @@ public class DeviceActivity extends PassphraseRequiredActivity

  @Override
  public boolean onOptionsItemSelected(MenuItem item) {
-    if (item.getItemId() == android.R.id.home) {
-      finish();
-      return true;
+    switch (item.getItemId()) {
+      case android.R.id.home: finish(); return true;
    }

    return false;
@@ -111,7 +113,7 @@ public class DeviceActivity extends PassphraseRequiredActivity
               .withPermanentDenialDialog(getString(R.string.DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code))
               .onAllGranted(() -> {
                 getSupportFragmentManager().beginTransaction()
-                                            .replace(R.id.fragment_container, deviceAddFragment)
+                                            .replace(android.R.id.content, deviceAddFragment)
                                            .addToBackStack(null)
                                            .commitAllowingStateLoss();
               })
@@ -121,12 +123,12 @@ public class DeviceActivity extends PassphraseRequiredActivity

  @Override
  public void onQrDataFound(final String data) {
-    ThreadUtil.runOnMain(() -> {
+    Util.runOnMain(() -> {
      ((Vibrator)getSystemService(Context.VIBRATOR_SERVICE)).vibrate(50);
      Uri uri = Uri.parse(data);
      deviceLinkFragment.setLinkClickedListener(uri, DeviceActivity.this);

-      if (Build.VERSION.SDK_INT >= 21) {
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
        deviceAddFragment.setSharedElementReturnTransition(TransitionInflater.from(DeviceActivity.this).inflateTransition(R.transition.fragment_shared));
        deviceAddFragment.setExitTransition(TransitionInflater.from(DeviceActivity.this).inflateTransition(android.R.transition.fade));

@@ -136,14 +138,14 @@ public class DeviceActivity extends PassphraseRequiredActivity
        getSupportFragmentManager().beginTransaction()
                                   .addToBackStack(null)
                                   .addSharedElement(deviceAddFragment.getDevicesImage(), "devices")
-                                   .replace(R.id.fragment_container, deviceLinkFragment)
+                                   .replace(android.R.id.content, deviceLinkFragment)
                                   .commit();

      } else {
        getSupportFragmentManager().beginTransaction()
                                   .setCustomAnimations(R.anim.slide_from_bottom, R.anim.slide_to_bottom,
                                                        R.anim.slide_from_bottom, R.anim.slide_to_bottom)
-                                   .replace(R.id.fragment_container, deviceLinkFragment)
+                                   .replace(android.R.id.content, deviceLinkFragment)
                                   .addToBackStack(null)
                                   .commit();
      }
--- a/app/src/main/java/org/thoughtcrime/securesms/DeviceAddFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/DeviceAddFragment.java
@@ -32,9 +32,9 @@ public class DeviceAddFragment extends LoggingFragment {
  @Override
  public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup viewGroup, Bundle bundle) {
    this.container    = ViewUtil.inflate(inflater, viewGroup, R.layout.device_add_fragment);
-    this.overlay      = this.container.findViewById(R.id.overlay);
-    this.scannerView  = this.container.findViewById(R.id.scanner);
-    this.devicesImage = this.container.findViewById(R.id.devices);
+    this.overlay      = ViewUtil.findById(this.container, R.id.overlay);
+    this.scannerView  = ViewUtil.findById(this.container, R.id.scanner);
+    this.devicesImage = ViewUtil.findById(this.container, R.id.devices);

    if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
      this.overlay.setOrientation(LinearLayout.HORIZONTAL);
@@ -42,9 +42,9 @@ public class DeviceAddFragment extends LoggingFragment {
      this.overlay.setOrientation(LinearLayout.VERTICAL);
    }

-    if (Build.VERSION.SDK_INT >= 21) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
      this.container.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
-        @TargetApi(21)
+        @TargetApi(Build.VERSION_CODES.LOLLIPOP)
        @Override
        public void onLayoutChange(View v, int left, int top, int right, int bottom,
                                   int oldLeft, int oldTop, int oldRight, int oldBottom)
@@ -80,7 +80,7 @@ public class DeviceAddFragment extends LoggingFragment {
  }

  @Override
-  public void onConfigurationChanged(@NonNull Configuration newConfiguration) {
+  public void onConfigurationChanged(Configuration newConfiguration) {
    super.onConfigurationChanged(newConfiguration);

    this.scannerView.onPause();
@@ -107,4 +107,6 @@ public class DeviceAddFragment extends LoggingFragment {
      this.scanningThread.setScanListener(scanListener);
    }
  }
+
+
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/DeviceLinkFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/DeviceLinkFragment.java
@@ -32,7 +32,7 @@ public class DeviceLinkFragment extends Fragment implements View.OnClickListener
  }

  @Override
-  public void onConfigurationChanged(@NonNull Configuration newConfiguration) {
+  public void onConfigurationChanged(Configuration newConfiguration) {
    super.onConfigurationChanged(newConfiguration);
    if (newConfiguration.orientation == Configuration.ORIENTATION_LANDSCAPE) {
      container.setOrientation(LinearLayout.HORIZONTAL);
--- a/app/src/main/java/org/thoughtcrime/securesms/DeviceListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/DeviceListFragment.java
@@ -21,7 +21,6 @@ import androidx.fragment.app.ListFragment;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;

-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.melnykov.fab.FloatingActionButton;

 import org.signal.core.util.logging.Log;
@@ -29,6 +28,7 @@ import org.thoughtcrime.securesms.database.loaders.DeviceListLoader;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.devicelist.Device;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
 import org.whispersystems.signalservice.api.SignalServiceAccountManager;

@@ -41,7 +41,7 @@ public class DeviceListFragment extends ListFragment
               ListView.OnItemClickListener, Button.OnClickListener
 {

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

  private SignalServiceAccountManager accountManager;
  private Locale                      locale;
@@ -53,12 +53,12 @@ public class DeviceListFragment extends ListFragment
  @Override
  public void onCreate(Bundle savedInstanceState) {
    super.onCreate(savedInstanceState);
-    this.locale = (Locale) requireArguments().getSerializable(PassphraseRequiredActivity.LOCALE_EXTRA);
+    this.locale = (Locale) getArguments().getSerializable(PassphraseRequiredActivity.LOCALE_EXTRA);
  }

  @Override
-  public void onAttach(@NonNull Context context) {
-    super.onAttach(context);
+  public void onAttach(Activity activity) {
+    super.onAttach(activity);
    this.accountManager = ApplicationDependencies.getSignalServiceAccountManager();
  }

@@ -68,7 +68,7 @@ public class DeviceListFragment extends ListFragment

    this.empty             = view.findViewById(R.id.empty);
    this.progressContainer = view.findViewById(R.id.progress_container);
-    this.addDeviceButton   = view.findViewById(R.id.add_device);
+    this.addDeviceButton   = ViewUtil.findById(view, R.id.add_device);
    this.addDeviceButton.setOnClickListener(this);

    return view;
@@ -122,22 +122,42 @@ public class DeviceListFragment extends ListFragment
    final String deviceName = ((DeviceListItem)view).getDeviceName();
    final long   deviceId   = ((DeviceListItem)view).getDeviceId();

-    AlertDialog.Builder builder = new MaterialAlertDialogBuilder(requireActivity());
-    builder.setTitle(getString(R.string.DeviceListActivity_unlink_s, deviceName));
+    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+    builder.setTitle(getActivity().getString(R.string.DeviceListActivity_unlink_s, deviceName));
    builder.setMessage(R.string.DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive);
    builder.setNegativeButton(android.R.string.cancel, null);
-    builder.setPositiveButton(android.R.string.ok, (dialog, which) -> handleDisconnectDevice(deviceId));
+    builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+      @Override
+      public void onClick(DialogInterface dialog, int which) {
+        handleDisconnectDevice(deviceId);
+      }
+    });
    builder.show();
  }

  private void handleLoaderFailed() {
-    AlertDialog.Builder builder = new MaterialAlertDialogBuilder(requireActivity());
+    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
    builder.setMessage(R.string.DeviceListActivity_network_connection_failed);
    builder.setPositiveButton(R.string.DeviceListActivity_try_again,
-        (dialog, which) -> getLoaderManager().restartLoader(0, null, DeviceListFragment.this));
+                              new DialogInterface.OnClickListener() {
+      @Override
+      public void onClick(DialogInterface dialog, int which) {
+        getLoaderManager().restartLoader(0, null, DeviceListFragment.this);
+      }
+    });

-    builder.setNegativeButton(android.R.string.cancel, (dialog, which) -> requireActivity().onBackPressed());
-    builder.setOnCancelListener(dialog -> requireActivity().onBackPressed());
+    builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
+      @Override
+      public void onClick(DialogInterface dialog, int which) {
+        DeviceListFragment.this.getActivity().onBackPressed();
+      }
+    });
+    builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
+      @Override
+      public void onCancel(DialogInterface dialog) {
+        DeviceListFragment.this.getActivity().onBackPressed();
+      }
+    });

    builder.show();
  }
--- a/app/src/main/java/org/thoughtcrime/securesms/DeviceProvisioningActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/DeviceProvisioningActivity.java
@@ -6,12 +6,10 @@ import android.view.Window;

 import androidx.appcompat.app.AlertDialog;

-import org.signal.core.util.logging.Log;
-
 public class DeviceProvisioningActivity extends PassphraseRequiredActivity {

  @SuppressWarnings("unused")
-  private static final String TAG = Log.tag(DeviceProvisioningActivity.class);
+  private static final String TAG = DeviceProvisioningActivity.class.getSimpleName();

  @Override
  protected void onPreCreate() {
--- a/app/src/main/java/org/thoughtcrime/securesms/ExpirationDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ExpirationDialog.java
@@ -0,0 +1,103 @@
+package org.thoughtcrime.securesms;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+
+import org.thoughtcrime.securesms.util.ExpirationUtil;
+
+import java.util.Arrays;
+
+import cn.carbswang.android.numberpickerview.library.NumberPickerView;
+
+public class ExpirationDialog extends AlertDialog {
+
+  protected ExpirationDialog(Context context) {
+    super(context);
+  }
+
+  protected ExpirationDialog(Context context, int theme) {
+    super(context, theme);
+  }
+
+  protected ExpirationDialog(Context context, boolean cancelable, OnCancelListener cancelListener) {
+    super(context, cancelable, cancelListener);
+  }
+
+  public static void show(final Context context,
+                          final int currentExpiration,
+                          final @NonNull OnClickListener listener)
+  {
+    final View view = createNumberPickerView(context, currentExpiration);
+
+    AlertDialog.Builder builder = new AlertDialog.Builder(context);
+    builder.setTitle(context.getString(R.string.ExpirationDialog_disappearing_messages));
+    builder.setView(view);
+    builder.setPositiveButton(android.R.string.ok, (dialog, which) -> {
+      int selected = ((NumberPickerView)view.findViewById(R.id.expiration_number_picker)).getValue();
+      listener.onClick(getExpirationTimes(context, currentExpiration)[selected]);
+    });
+    builder.setNegativeButton(android.R.string.cancel, null);
+    builder.show();
+  }
+
+  private static View createNumberPickerView(final Context context, final int currentExpiration) {
+    final LayoutInflater   inflater                = LayoutInflater.from(context);
+    final View             view                    = inflater.inflate(R.layout.expiration_dialog, null);
+    final NumberPickerView numberPickerView        = view.findViewById(R.id.expiration_number_picker);
+    final TextView         textView                = view.findViewById(R.id.expiration_details);
+    final int[]            expirationTimes         = getExpirationTimes(context, currentExpiration);
+    final String[]         expirationDisplayValues = new String[expirationTimes.length];
+
+    int selectedIndex = expirationTimes.length - 1;
+
+    for (int i=0;i<expirationTimes.length;i++) {
+      expirationDisplayValues[i] = ExpirationUtil.getExpirationDisplayValue(context, expirationTimes[i]);
+
+      if ((currentExpiration >= expirationTimes[i]) &&
+          (i == expirationTimes.length -1 || currentExpiration < expirationTimes[i+1])) {
+        selectedIndex = i;
+      }
+    }
+
+    numberPickerView.setDisplayedValues(expirationDisplayValues);
+    numberPickerView.setMinValue(0);
+    numberPickerView.setMaxValue(expirationTimes.length-1);
+
+    NumberPickerView.OnValueChangeListener listener = (picker, oldVal, newVal) -> {
+      if (newVal == 0) {
+        textView.setText(R.string.ExpirationDialog_your_messages_will_not_expire);
+      } else {
+        textView.setText(context.getString(R.string.ExpirationDialog_your_messages_will_disappear_s_after_they_have_been_seen, picker.getDisplayedValues()[newVal]));
+      }
+    };
+
+    numberPickerView.setOnValueChangedListener(listener);
+    numberPickerView.setValue(selectedIndex);
+    listener.onValueChange(numberPickerView, selectedIndex, selectedIndex);
+
+    return view;
+  }
+
+  private static int[] getExpirationTimes(Context context, int currentExpiration) {
+    int[] expirationTimes = context.getResources().getIntArray(R.array.expiration_times);
+    int   location        = Arrays.binarySearch(expirationTimes, currentExpiration);
+    if (location < 0) {
+      int[] temp = Arrays.copyOf(expirationTimes, expirationTimes.length + 1);
+      temp[temp.length - 1] = currentExpiration;
+      Arrays.sort(temp);
+      expirationTimes = temp;
+    }
+
+    return expirationTimes;
+  }
+
+  public interface OnClickListener {
+    public void onClick(int expirationTime);
+  }
+
+}
--- a/app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/InviteActivity.java
@@ -7,8 +7,6 @@ import android.graphics.PorterDuff;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
@@ -37,12 +35,10 @@ import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarInviteTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.ThemeUtil;
-import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.WindowUtil;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture.Listener;
 import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
-import org.thoughtcrime.securesms.util.text.AfterTextChanged;
 import org.whispersystems.libsignal.util.guava.Optional;

 import java.util.concurrent.ExecutionException;
@@ -97,40 +93,26 @@ public class InviteActivity extends PassphraseRequiredActivity implements Contac
    slideInAnimation  = loadAnimation(R.anim.slide_from_bottom);
    slideOutAnimation = loadAnimation(R.anim.slide_to_bottom);

-    View                 shareButton     = findViewById(R.id.share_button);
-    Button               smsButton       = findViewById(R.id.sms_button);
-    Button               smsCancelButton = findViewById(R.id.cancel_sms_button);
-    ContactFilterToolbar contactFilter   = findViewById(R.id.contact_filter);
+    View                 shareButton     = ViewUtil.findById(this, R.id.share_button);
+    View                 smsButton       = ViewUtil.findById(this, R.id.sms_button);
+    Button               smsCancelButton = ViewUtil.findById(this, R.id.cancel_sms_button);
+    ContactFilterToolbar contactFilter   = ViewUtil.findById(this, R.id.contact_filter);

-    inviteText        = findViewById(R.id.invite_text);
-    smsSendFrame      = findViewById(R.id.sms_send_frame);
-    smsSendButton     = findViewById(R.id.send_sms_button);
+    inviteText        = ViewUtil.findById(this, R.id.invite_text);
+    smsSendFrame      = ViewUtil.findById(this, R.id.sms_send_frame);
+    smsSendButton     = ViewUtil.findById(this, R.id.send_sms_button);
    contactsFragment  = (ContactSelectionListFragment)getSupportFragmentManager().findFragmentById(R.id.contact_selection_list_fragment);

    inviteText.setText(getString(R.string.InviteActivity_lets_switch_to_signal, getString(R.string.install_url)));
-    inviteText.addTextChangedListener(new AfterTextChanged(editable -> {
-      boolean isEnabled = editable.length() > 0;
-      smsButton.setEnabled(isEnabled);
-      shareButton.setEnabled(isEnabled);
-      smsButton.animate().alpha(isEnabled ? 1f : 0.5f);
-      shareButton.animate().alpha(isEnabled ? 1f : 0.5f);
-    }));
-
    updateSmsButtonText(contactsFragment.getSelectedContacts().size());

+    contactsFragment.setOnContactSelectedListener(this);
+    shareButton.setOnClickListener(new ShareClickListener());
+    smsButton.setOnClickListener(new SmsClickListener());
    smsCancelButton.setOnClickListener(new SmsCancelClickListener());
    smsSendButton.setOnClickListener(new SmsSendClickListener());
    contactFilter.setOnFilterChangedListener(new ContactFilterChangedListener());
    contactFilter.setNavigationIcon(R.drawable.ic_search_conversation_24);
-
-    if (Util.isDefaultSmsProvider(this)) {
-      shareButton.setOnClickListener(new ShareClickListener());
-      smsButton.setOnClickListener(new SmsClickListener());
-    } else {
-      shareButton.setVisibility(View.GONE);
-      smsButton.setOnClickListener(new ShareClickListener());
-      smsButton.setText(R.string.InviteActivity_share);
-    }
  }

  private Animation loadAnimation(@AnimRes int animResId) {
--- a/app/src/main/java/org/thoughtcrime/securesms/LoggingFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/LoggingFragment.java
@@ -2,7 +2,6 @@ package org.thoughtcrime.securesms;

 import android.os.Bundle;

-import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
@@ -16,12 +15,6 @@ public abstract class LoggingFragment extends Fragment {

  private static final String TAG = Log.tag(LoggingFragment.class);

-  public LoggingFragment() { }
-
-  public LoggingFragment(@LayoutRes int contentLayoutId) {
-    super(contentLayoutId);
-  }
-
  @Override
  public void onCreate(@Nullable Bundle savedInstanceState) {
    logEvent("onCreate()");
--- a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.java
@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms;

 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -9,14 +8,13 @@ import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

-import org.thoughtcrime.securesms.devicetransfer.olddevice.OldDeviceTransferLockedDialog;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.util.AppStartup;
+import org.thoughtcrime.securesms.tracing.Trace;
 import org.thoughtcrime.securesms.util.CachedInflater;
 import org.thoughtcrime.securesms.util.CommunicationActions;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;

+@Trace
 public class MainActivity extends PassphraseRequiredActivity {

  public static final int RESULT_CONFIG_CHANGED = Activity.RESULT_FIRST_USER + 901;
@@ -24,42 +22,22 @@ public class MainActivity extends PassphraseRequiredActivity {
  private final DynamicTheme  dynamicTheme = new DynamicNoActionBarTheme();
  private final MainNavigator navigator    = new MainNavigator(this);

-  public static @NonNull Intent clearTop(@NonNull Context context) {
-    Intent intent = new Intent(context, MainActivity.class);
-
-    intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP |
-                    Intent.FLAG_ACTIVITY_NEW_TASK  |
-                    Intent.FLAG_ACTIVITY_SINGLE_TOP);
-
-    return intent;
-  }
-
  @Override
  protected void onCreate(Bundle savedInstanceState, boolean ready) {
-    AppStartup.getInstance().onCriticalRenderEventStart();
    super.onCreate(savedInstanceState, ready);
    setContentView(R.layout.main_activity);

    navigator.onCreate(savedInstanceState);

    handleGroupLinkInIntent(getIntent());
-    handleProxyInIntent(getIntent());

    CachedInflater.from(this).clear();
  }

-  @Override
-  public Intent getIntent() {
-    return super.getIntent().setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP |
-                                      Intent.FLAG_ACTIVITY_NEW_TASK  |
-                                      Intent.FLAG_ACTIVITY_SINGLE_TOP);
-  }
-
  @Override
  protected void onNewIntent(Intent intent) {
    super.onNewIntent(intent);
    handleGroupLinkInIntent(intent);
-    handleProxyInIntent(intent);
  }

  @Override
@@ -72,9 +50,6 @@ public class MainActivity extends PassphraseRequiredActivity {
  protected void onResume() {
    super.onResume();
    dynamicTheme.onResume(this);
-    if (SignalStore.misc().isOldDeviceTransferLocked()) {
-      OldDeviceTransferLockedDialog.show(getSupportFragmentManager());
-    }
  }

  @Override
@@ -102,11 +77,4 @@ public class MainActivity extends PassphraseRequiredActivity {
      CommunicationActions.handlePotentialGroupLinkUrl(this, data.toString());
    }
  }
-
-  private void handleProxyInIntent(Intent intent) {
-    Uri data = intent.getData();
-    if (data != null) {
-      CommunicationActions.handlePotentialProxyLinkUrl(this, data.toString());
-    }
-  }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/MainNavigator.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/MainNavigator.java
@@ -9,8 +9,6 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;

-import org.thoughtcrime.securesms.components.settings.DSLSettingsActivity;
-import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity;
 import org.thoughtcrime.securesms.conversation.ConversationIntents;
 import org.thoughtcrime.securesms.conversationlist.ConversationListArchiveFragment;
 import org.thoughtcrime.securesms.conversationlist.ConversationListFragment;
@@ -71,7 +69,8 @@ public class MainNavigator {
  }

  public void goToAppSettings() {
-    activity.startActivityForResult(AppSettingsActivity.home(activity), REQUEST_CONFIG_CHANGES);
+    Intent intent = new Intent(activity, ApplicationPreferencesActivity.class);
+    activity.startActivityForResult(intent, REQUEST_CONFIG_CHANGES);
  }

  public void goToArchiveList() {
--- a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
@@ -91,7 +91,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
             MediaPreviewFragment.Events
 {

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

  private static final int NOT_IN_A_THREAD = -2;

--- a/app/src/main/java/org/thoughtcrime/securesms/MuteDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/MuteDialog.java
@@ -38,10 +38,10 @@ public class MuteDialog extends AlertDialog {

        switch (which) {
          case 0:  muteUntil = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(1);  break;
-          case 1:  muteUntil = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(8);  break;
+          case 1:  muteUntil = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(2);  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;
+          case 4:  muteUntil = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(365); break;
          default: muteUntil = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(1);  break;
        }

--- a/app/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java
@@ -49,7 +49,7 @@ public class NewConversationActivity extends ContactSelectionActivity
 {

  @SuppressWarnings("unused")
-  private static final String TAG = Log.tag(NewConversationActivity.class);
+  private static final String TAG = NewConversationActivity.class.getSimpleName();

  @Override
  public void onCreate(Bundle bundle, boolean ready) {
--- a/app/src/main/java/org/thoughtcrime/securesms/PassphraseActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/PassphraseActivity.java
@@ -34,7 +34,7 @@ import org.thoughtcrime.securesms.service.KeyCachingService;
 */
 public abstract class PassphraseActivity extends BaseActivity {

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

  private KeyCachingService keyCachingService;
  private MasterSecret masterSecret;
--- a/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java
@@ -17,6 +17,7 @@
 package org.thoughtcrime.securesms;

 import android.animation.Animator;
+import android.annotation.SuppressLint;
 import android.app.KeyguardManager;
 import android.content.Context;
 import android.content.Intent;
@@ -45,11 +46,9 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;

-import androidx.annotation.NonNull;
 import androidx.appcompat.widget.Toolbar;
-import androidx.biometric.BiometricManager;
-import androidx.biometric.BiometricManager.Authenticators;
-import androidx.biometric.BiometricPrompt;
+import androidx.core.hardware.fingerprint.FingerprintManagerCompat;
+import androidx.core.os.CancellationSignal;

 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
@@ -58,10 +57,8 @@ import org.thoughtcrime.securesms.crypto.InvalidPassphraseException;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
 import org.thoughtcrime.securesms.logsubmit.SubmitDebugLogActivity;
-import org.thoughtcrime.securesms.util.CommunicationActions;
 import org.thoughtcrime.securesms.util.DynamicIntroTheme;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
-import org.thoughtcrime.securesms.util.SupportEmailUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;

 /**
@@ -71,12 +68,7 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences;
 */
 public class PassphrasePromptActivity extends PassphraseActivity {

-  private static final String TAG                       = Log.tag(PassphrasePromptActivity.class);
-  private static final int    BIOMETRIC_AUTHENTICATORS  = Authenticators.BIOMETRIC_STRONG | Authenticators.BIOMETRIC_WEAK;
-  private static final int    ALLOWED_AUTHENTICATORS    = BIOMETRIC_AUTHENTICATORS | Authenticators.DEVICE_CREDENTIAL;
-  private static final short  AUTHENTICATE_REQUEST_CODE = 1007;
-  private static final String BUNDLE_ALREADY_SHOWN      = "bundle_already_shown";
-  public static final  String FROM_FOREGROUND           = "from_foreground";
+  private static final String TAG = PassphrasePromptActivity.class.getSimpleName();

  private DynamicIntroTheme dynamicTheme    = new DynamicIntroTheme();
  private DynamicLanguage   dynamicLanguage = new DynamicLanguage();
@@ -90,13 +82,12 @@ public class PassphrasePromptActivity extends PassphraseActivity {
  private ImageButton     hideButton;
  private AnimatingToggle visibilityToggle;

-  private BiometricManager           biometricManager;
-  private BiometricPrompt            biometricPrompt;
-  private BiometricPrompt.PromptInfo biometricPromptInfo;
+  private FingerprintManagerCompat fingerprintManager;
+  private CancellationSignal       fingerprintCancellationSignal;
+  private FingerprintListener      fingerprintListener;

  private boolean authenticated;
-  private boolean hadFailure;
-  private boolean alreadyShown;
+  private boolean failure;

  @Override
  public void onCreate(Bundle savedInstanceState) {
@@ -109,15 +100,6 @@ public class PassphrasePromptActivity extends PassphraseActivity {

    setContentView(R.layout.prompt_passphrase_activity);
    initializeResources();
-
-    alreadyShown = (savedInstanceState != null && savedInstanceState.getBoolean(BUNDLE_ALREADY_SHOWN)) ||
-                   getIntent().getBooleanExtra(FROM_FOREGROUND, false);
-  }
-
-  @Override
-  protected void onSaveInstanceState(@NonNull Bundle outState) {
-    super.onSaveInstanceState(outState);
-    outState.putBoolean(BUNDLE_ALREADY_SHOWN, alreadyShown);
  }

  @Override
@@ -128,12 +110,20 @@ public class PassphrasePromptActivity extends PassphraseActivity {

    setLockTypeVisibility();

-    if (TextSecurePreferences.isScreenLockEnabled(this) && !authenticated && !hadFailure) {
-      resumeScreenLock(!alreadyShown);
-      alreadyShown = true;
+    if (TextSecurePreferences.isScreenLockEnabled(this) && !authenticated && !failure) {
+      resumeScreenLock();
    }

-    hadFailure = false;
+    failure = false;
+  }
+
+  @Override
+  public void onPause() {
+    super.onPause();
+
+    if (TextSecurePreferences.isScreenLockEnabled(this)) {
+      pauseScreenLock();
+    }
  }

  @Override
@@ -147,7 +137,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
    MenuInflater inflater = this.getMenuInflater();
    menu.clear();

-    inflater.inflate(R.menu.passphrase_prompt, menu);
+    inflater.inflate(R.menu.log_submit, menu);

    super.onCreateOptionsMenu(menu);
    return true;
@@ -156,28 +146,23 @@ public class PassphrasePromptActivity extends PassphraseActivity {
  @Override
  public boolean onOptionsItemSelected(MenuItem item) {
    super.onOptionsItemSelected(item);
-    if (item.getItemId() == R.id.menu_submit_debug_logs) {
-      handleLogSubmit();
-      return true;
-    } else if (item.getItemId() == R.id.menu_contact_support) {
-      sendEmailToSupport();
-      return true;
+    switch (item.getItemId()) {
+    case R.id.menu_submit_debug_logs: handleLogSubmit(); return true;
    }

    return false;
  }

  @Override
-  public void onActivityResult(int requestCode, int resultCode, Intent data) {
-    super.onActivityResult(requestCode, resultCode, data);
+  @SuppressLint("MissingSuperCall") // no fragments to dispatch to
+  public void onActivityResult(int requestCode, int resultcode, Intent data) {
+    if (requestCode != 1) return;

-    if (requestCode != AUTHENTICATE_REQUEST_CODE) return;
-
-    if (resultCode == RESULT_OK) {
+    if (resultcode == RESULT_OK) {
      handleAuthenticated();
    } else {
      Log.w(TAG, "Authentication failed");
-      hadFailure = true;
+      failure = true;
    }
  }

@@ -228,20 +213,16 @@ public class PassphrasePromptActivity extends PassphraseActivity {
    ImageButton okButton = findViewById(R.id.ok_button);
    Toolbar     toolbar  = findViewById(R.id.toolbar);

-    showButton              = findViewById(R.id.passphrase_visibility);
-    hideButton              = findViewById(R.id.passphrase_visibility_off);
-    visibilityToggle        = findViewById(R.id.button_toggle);
-    passphraseText          = findViewById(R.id.passphrase_edit);
-    passphraseAuthContainer = findViewById(R.id.password_auth_container);
-    fingerprintPrompt       = findViewById(R.id.fingerprint_auth_container);
-    lockScreenButton        = findViewById(R.id.lock_screen_auth_container);
-    biometricManager        = BiometricManager.from(this);
-    biometricPrompt         = new BiometricPrompt(this, new BiometricAuthenticationListener());
-    biometricPromptInfo     = new BiometricPrompt.PromptInfo
-                                                 .Builder()
-                                                 .setAllowedAuthenticators(ALLOWED_AUTHENTICATORS)
-                                                 .setTitle(getString(R.string.PassphrasePromptActivity_unlock_signal))
-                                                 .build();
+    showButton                    = findViewById(R.id.passphrase_visibility);
+    hideButton                    = findViewById(R.id.passphrase_visibility_off);
+    visibilityToggle              = findViewById(R.id.button_toggle);
+    passphraseText                = findViewById(R.id.passphrase_edit);
+    passphraseAuthContainer       = findViewById(R.id.password_auth_container);
+    fingerprintPrompt             = findViewById(R.id.fingerprint_auth_container);
+    lockScreenButton              = findViewById(R.id.lock_screen_auth_container);
+    fingerprintManager            = FingerprintManagerCompat.from(this);
+    fingerprintCancellationSignal = new CancellationSignal();
+    fingerprintListener           = new FingerprintListener();

    setSupportActionBar(toolbar);
    getSupportActionBar().setTitle("");
@@ -261,15 +242,20 @@ public class PassphrasePromptActivity extends PassphraseActivity {
    fingerprintPrompt.setImageResource(R.drawable.ic_fingerprint_white_48dp);
    fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.core_ultramarine), PorterDuff.Mode.SRC_IN);

-    lockScreenButton.setOnClickListener(v -> resumeScreenLock(true));
+    lockScreenButton.setOnClickListener(v -> resumeScreenLock());
  }

  private void setLockTypeVisibility() {
    if (TextSecurePreferences.isScreenLockEnabled(this)) {
      passphraseAuthContainer.setVisibility(View.GONE);
-      fingerprintPrompt.setVisibility(biometricManager.canAuthenticate(BIOMETRIC_AUTHENTICATORS) == BiometricManager.BIOMETRIC_SUCCESS ? View.VISIBLE
-                                                                                                                                       : View.GONE);
-      lockScreenButton.setVisibility(View.VISIBLE);
+
+      if (fingerprintManager.isHardwareDetected() && fingerprintManager.hasEnrolledFingerprints()) {
+        fingerprintPrompt.setVisibility(View.VISIBLE);
+        lockScreenButton.setVisibility(View.GONE);
+      } else {
+        fingerprintPrompt.setVisibility(View.GONE);
+        lockScreenButton.setVisibility(View.VISIBLE);
+      }
    } else {
      passphraseAuthContainer.setVisibility(View.VISIBLE);
      fingerprintPrompt.setVisibility(View.GONE);
@@ -277,7 +263,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
    }
  }

-  private void resumeScreenLock(boolean force) {
+  private void resumeScreenLock() {
    KeyguardManager keyguardManager = (KeyguardManager) getSystemService(Context.KEYGUARD_SERVICE);

    assert keyguardManager != null;
@@ -288,36 +274,24 @@ public class PassphrasePromptActivity extends PassphraseActivity {
      return;
    }

-    if (Build.VERSION.SDK_INT != 29 && biometricManager.canAuthenticate(ALLOWED_AUTHENTICATORS) == BiometricManager.BIOMETRIC_SUCCESS) {
-      if (force) {
-        Log.i(TAG, "Listening for biometric authentication...");
-        biometricPrompt.authenticate(biometricPromptInfo);
-      } else {
-        Log.i(TAG, "Skipping show system biometric dialog unless forced");
-      }
-    } else if (Build.VERSION.SDK_INT >= 21) {
-      if (force) {
-        Log.i(TAG, "firing intent...");
-        Intent intent = keyguardManager.createConfirmDeviceCredentialIntent(getString(R.string.PassphrasePromptActivity_unlock_signal), "");
-        startActivityForResult(intent, AUTHENTICATE_REQUEST_CODE);
-      } else {
-        Log.i(TAG, "Skipping firing intent unless forced");
-      }
+    if (fingerprintManager.isHardwareDetected() && fingerprintManager.hasEnrolledFingerprints()) {
+      Log.i(TAG, "Listening for fingerprints...");
+      fingerprintCancellationSignal = new CancellationSignal();
+      fingerprintManager.authenticate(null, 0, fingerprintCancellationSignal, fingerprintListener, null);
+    } else if (Build.VERSION.SDK_INT >= 21){
+      Log.i(TAG, "firing intent...");
+      Intent intent = keyguardManager.createConfirmDeviceCredentialIntent(getString(R.string.PassphrasePromptActivity_unlock_signal), "");
+      startActivityForResult(intent, 1);
    } else {
      Log.w(TAG, "Not compatible...");
      handleAuthenticated();
    }
  }

-  private void sendEmailToSupport() {
-    String body = SupportEmailUtil.generateSupportEmailBody(this,
-                                                            R.string.PassphrasePromptActivity_signal_android_lock_screen,
-                                                            null,
-                                                            null);
-    CommunicationActions.openEmail(this,
-                                   SupportEmailUtil.getSupportEmailAddress(this),
-                                   getString(R.string.PassphrasePromptActivity_signal_android_lock_screen),
-                                   body);
+  private void pauseScreenLock() {
+    if (fingerprintCancellationSignal != null) {
+      fingerprintCancellationSignal.cancel();
+    }
  }

  private class PassphraseActionListener implements TextView.OnEditorActionListener {
@@ -368,19 +342,15 @@ public class PassphrasePromptActivity extends PassphraseActivity {
    System.gc();
  }

-  private class BiometricAuthenticationListener extends BiometricPrompt.AuthenticationCallback {
+  private class FingerprintListener extends FingerprintManagerCompat.AuthenticationCallback {
    @Override
-    public void onAuthenticationError(int errorCode, @NonNull CharSequence errorString) {
-      Log.w(TAG, "Authentication error: " + errorCode);
-      hadFailure = true;
-
-      if (errorCode != BiometricPrompt.ERROR_CANCELED && errorCode != BiometricPrompt.ERROR_USER_CANCELED) {
-        onAuthenticationFailed();
-      }
+    public void onAuthenticationError(int errMsgId, CharSequence errString) {
+      Log.w(TAG, "Authentication error: " + errMsgId + " " + errString);
+      onAuthenticationFailed();
    }

    @Override
-    public void onAuthenticationSucceeded(@NonNull BiometricPrompt.AuthenticationResult result) {
+    public void onAuthenticationSucceeded(FingerprintManagerCompat.AuthenticationResult result) {
      Log.i(TAG, "onAuthenticationSucceeded");
      fingerprintPrompt.setImageResource(R.drawable.ic_check_white_48dp);
      fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.green_500), PorterDuff.Mode.SRC_IN);
@@ -397,7 +367,8 @@ public class PassphrasePromptActivity extends PassphraseActivity {

    @Override
    public void onAuthenticationFailed() {
-      Log.w(TAG, "onAuthenticationFailed()");
+      Log.w(TAG, "onAuthenticatoinFailed()");
+      FingerprintManagerCompat.AuthenticationCallback callback = this;

      fingerprintPrompt.setImageResource(R.drawable.ic_close_white_48dp);
      fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.red_500), PorterDuff.Mode.SRC_IN);
@@ -421,5 +392,6 @@ public class PassphrasePromptActivity extends PassphraseActivity {

      fingerprintPrompt.startAnimation(shake);
    }
+
  }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
@@ -11,13 +11,9 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;

-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.crypto.MasterSecretUtil;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.devicetransfer.olddevice.OldDeviceTransferActivity;
 import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.lock.v2.CreateKbsPinActivity;
@@ -29,13 +25,13 @@ import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity;
 import org.thoughtcrime.securesms.service.KeyCachingService;
-import org.thoughtcrime.securesms.util.AppStartup;
+import org.thoughtcrime.securesms.tracing.Tracer;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;

 import java.util.Locale;

 public abstract class PassphraseRequiredActivity extends BaseActivity implements MasterSecretListener {
-  private static final String TAG = Log.tag(PassphraseRequiredActivity.class);
+  private static final String TAG = PassphraseRequiredActivity.class.getSimpleName();

  public static final String LOCALE_EXTRA      = "locale_extra";
  public static final String NEXT_INTENT_EXTRA = "next_intent";
@@ -48,8 +44,6 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
  private static final int STATE_ENTER_SIGNAL_PIN    = 5;
  private static final int STATE_CREATE_PROFILE_NAME = 6;
  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 SignalServiceNetworkAccess networkAccess;
  private BroadcastReceiver          clearKeyReceiver;
@@ -57,7 +51,6 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
  @Override
  protected final void onCreate(Bundle savedInstanceState) {
    Tracer.getInstance().start(Log.tag(getClass()) + "#onCreate()");
-    AppStartup.getInstance().onCriticalRenderEventStart();
    this.networkAccess = new SignalServiceNetworkAccess(this);
    onPreCreate();

@@ -70,8 +63,6 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
      initializeClearKeyReceiver();
      onCreate(savedInstanceState, true);
    }
-
-    AppStartup.getInstance().onCriticalRenderEventEnd();
    Tracer.getInstance().end(Log.tag(getClass()) + "#onCreate()");
  }

@@ -83,7 +74,7 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
    super.onResume();

    if (networkAccess.isCensored(this)) {
-      ApplicationDependencies.getJobManager().add(new PushNotificationReceiveJob());
+      ApplicationDependencies.getJobManager().add(new PushNotificationReceiveJob(this));
    }
  }

@@ -96,8 +87,8 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
  @Override
  public void onMasterSecretCleared() {
    Log.d(TAG, "onMasterSecretCleared()");
-    if (ApplicationDependencies.getAppForegroundObserver().isForegrounded()) routeApplicationState(true);
-    else                                                                     finish();
+    if (ApplicationContext.getInstance(this).isAppVisible()) routeApplicationState(true);
+    else                                                     finish();
  }

  protected <T extends Fragment> T initFragment(@IdRes int target,
@@ -151,8 +142,6 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
      case STATE_ENTER_SIGNAL_PIN:    return getEnterSignalPinIntent();
      case STATE_CREATE_SIGNAL_PIN:   return getCreateSignalPinIntent();
      case STATE_CREATE_PROFILE_NAME: return getCreateProfileNameIntent();
-      case STATE_TRANSFER_ONGOING:    return getOldDeviceTransferIntent();
-      case STATE_TRANSFER_LOCKED:     return getOldDeviceTransferLockedIntent();
      default:                        return null;
    }
  }
@@ -166,16 +155,12 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
      return STATE_UI_BLOCKING_UPGRADE;
    } else if (!TextSecurePreferences.hasPromptedPushRegistration(this)) {
      return STATE_WELCOME_PUSH_SCREEN;
-    } else if (SignalStore.storageService().needsAccountRestore()) {
+    } else if (SignalStore.storageServiceValues().needsAccountRestore()) {
      return STATE_ENTER_SIGNAL_PIN;
    } else if (userMustSetProfileName()) {
      return STATE_CREATE_PROFILE_NAME;
    } else if (userMustCreateSignalPin()) {
      return STATE_CREATE_SIGNAL_PIN;
-    } else if (EventBus.getDefault().getStickyEvent(TransferStatus.class) != null && getClass() != OldDeviceTransferActivity.class) {
-      return STATE_TRANSFER_ONGOING;
-    } else if (SignalStore.misc().isOldDeviceTransferLocked()) {
-      return STATE_TRANSFER_LOCKED;
    } else {
      return STATE_NORMAL;
    }
@@ -194,9 +179,7 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
  }

  private Intent getPromptPassphraseIntent() {
-    Intent intent = getRoutedIntent(PassphrasePromptActivity.class, getIntent());
-    intent.putExtra(PassphrasePromptActivity.FROM_FOREGROUND, ApplicationDependencies.getAppForegroundObserver().isForegrounded());
-    return intent;
+    return getRoutedIntent(PassphrasePromptActivity.class, getIntent());
  }

  private Intent getUiBlockingUpgradeIntent() {
@@ -207,7 +190,7 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
  }

  private Intent getPushRegistrationIntent() {
-    return RegistrationNavigationActivity.newIntentForNewRegistration(this, getIntent());
+    return RegistrationNavigationActivity.newIntentForNewRegistration(this);
  }

  private Intent getEnterSignalPinIntent() {
@@ -230,19 +213,6 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
    return getRoutedIntent(EditProfileActivity.class, getIntent());
  }

-  private Intent getOldDeviceTransferIntent() {
-    Intent intent = new Intent(this, OldDeviceTransferActivity.class);
-    intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
-    return intent;
-  }
-
-  private @Nullable Intent getOldDeviceTransferLockedIntent() {
-    if (getClass() == MainActivity.class) {
-      return null;
-    }
-    return MainActivity.clearTop(this);
-  }
-
  private Intent getRoutedIntent(Class<?> destination, @Nullable Intent nextIntent) {
    final Intent intent = new Intent(this, destination);
    if (nextIntent != null)   intent.putExtra("next_intent", nextIntent);
@@ -251,17 +221,15 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements

  private Intent getConversationListIntent() {
    // TODO [greyson] Navigation
-    return MainActivity.clearTop(this);
+    return new Intent(this, MainActivity.class);
  }

  private void initializeClearKeyReceiver() {
    this.clearKeyReceiver = new BroadcastReceiver() {
      @Override
      public void onReceive(Context context, Intent intent) {
-        Log.i(TAG, "onReceive() for clear key event. PasswordDisabled: " + TextSecurePreferences.isPasswordDisabled(context) + ", ScreenLock: " + TextSecurePreferences.isScreenLockEnabled(context));
-        if (TextSecurePreferences.isScreenLockEnabled(context) || !TextSecurePreferences.isPasswordDisabled(context)) {
-          onMasterSecretCleared();
-        }
+        Log.i(TAG, "onReceive() for clear key event");
+        onMasterSecretCleared();
      }
    };

--- a/app/src/main/java/org/thoughtcrime/securesms/PushContactSelectionActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/PushContactSelectionActivity.java
@@ -21,7 +21,6 @@ import android.os.Bundle;

 import com.annimon.stream.Stream;

-import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.contacts.SelectedContact;
 import org.thoughtcrime.securesms.recipients.RecipientId;

@@ -39,7 +38,7 @@ public class PushContactSelectionActivity extends ContactSelectionActivity {
  public static final String KEY_SELECTED_RECIPIENTS = "recipients";

  @SuppressWarnings("unused")
-  private final static String TAG = Log.tag(PushContactSelectionActivity.class);
+  private final static String TAG = PushContactSelectionActivity.class.getSimpleName();

  @Override
  protected void onCreate(Bundle icicle, boolean ready) {
--- a/app/src/main/java/org/thoughtcrime/securesms/RtcDeviceLists.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/RtcDeviceLists.java
@@ -1,48 +0,0 @@
-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);
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/ShortcutLauncherActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ShortcutLauncherActivity.java
@@ -35,7 +35,7 @@ public class ShortcutLauncherActivity extends AppCompatActivity {
    if (rawId == null) {
      Toast.makeText(this, R.string.ShortcutLauncherActivity_invalid_shortcut, Toast.LENGTH_SHORT).show();
      // TODO [greyson] Navigation
-      startActivity(MainActivity.clearTop(this));
+      startActivity(new Intent(this, MainActivity.class));
      finish();
      return;
    }
@@ -43,7 +43,7 @@ public class ShortcutLauncherActivity extends AppCompatActivity {
    Recipient        recipient = Recipient.live(RecipientId.from(rawId)).get();
    // TODO [greyson] Navigation
    TaskStackBuilder backStack = TaskStackBuilder.create(this)
-                                                 .addNextIntent(MainActivity.clearTop(this));
+                                                 .addNextIntent(new Intent(this, MainActivity.class));

    CommunicationActions.startConversation(this, recipient, null, backStack);
    finish();
--- a/app/src/main/java/org/thoughtcrime/securesms/SmsSendtoActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/SmsSendtoActivity.java
@@ -20,7 +20,7 @@ import java.net.URISyntaxException;

 public class SmsSendtoActivity extends Activity {

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

  @Override
  protected void onCreate(Bundle savedInstanceState) {
--- a/app/src/main/java/org/thoughtcrime/securesms/TransportOptions.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/TransportOptions.java
@@ -6,7 +6,6 @@ import android.content.Context;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

-import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.util.CharacterCalculator;
 import org.thoughtcrime.securesms.util.MmsCharacterCalculator;
@@ -26,7 +25,7 @@ import static org.thoughtcrime.securesms.TransportOption.Type;

 public class TransportOptions {

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

  private final List<OnTransportChangedListener> listeners = new LinkedList<>();
  private final Context                          context;
--- a/app/src/main/java/org/thoughtcrime/securesms/TransportOptionsAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/TransportOptionsAdapter.java
@@ -11,6 +11,8 @@ import android.widget.TextView;

 import androidx.annotation.NonNull;

+import org.thoughtcrime.securesms.util.ViewUtil;
+
 import java.util.List;

 public class TransportOptionsAdapter extends BaseAdapter {
@@ -53,9 +55,9 @@ public class TransportOptionsAdapter extends BaseAdapter {
    }

    TransportOption transport   = (TransportOption) getItem(position);
-    ImageView       imageView   = convertView.findViewById(R.id.icon);
-    TextView        textView    = convertView.findViewById(R.id.text);
-    TextView        subtextView = convertView.findViewById(R.id.subtext);
+    ImageView       imageView   = ViewUtil.findById(convertView, R.id.icon);
+    TextView        textView    = ViewUtil.findById(convertView, R.id.text);
+    TextView        subtextView = ViewUtil.findById(convertView, R.id.subtext);

    imageView.getBackground().setColorFilter(transport.getBackgroundColor(), Mode.MULTIPLY);
    imageView.setImageResource(transport.getDrawable());
--- a/app/src/main/java/org/thoughtcrime/securesms/VerifyIdentityActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/VerifyIdentityActivity.java
@@ -60,12 +60,9 @@ 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.color.MaterialColor;
 import org.thoughtcrime.securesms.components.camera.CameraView;
-import org.thoughtcrime.securesms.crypto.DatabaseSessionLock;
 import org.thoughtcrime.securesms.crypto.IdentityKeyParcelable;
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
@@ -81,6 +78,7 @@ 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.DynamicDarkActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.IdentityUtil;
@@ -93,13 +91,14 @@ import org.whispersystems.libsignal.fingerprint.Fingerprint;
 import org.whispersystems.libsignal.fingerprint.FingerprintParsingException;
 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.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
 import java.util.Locale;

+import static org.whispersystems.libsignal.SessionCipher.SESSION_LOCK;
+
 /**
 * Activity for verifying identity keys.
 *
@@ -114,7 +113,7 @@ public class VerifyIdentityActivity extends PassphraseRequiredActivity implement
  private static final String IDENTITY_EXTRA  = "recipient_identity";
  private static final String VERIFIED_EXTRA  = "verified_state";

-  private final DynamicTheme dynamicTheme = new DynamicTheme();
+  private final DynamicTheme dynamicTheme = new DynamicDarkActionBarTheme();

  private final VerifyDisplayFragment displayFragment = new VerifyDisplayFragment();
  private final VerifyScanFragment    scanFragment    = new VerifyScanFragment();
@@ -162,6 +161,11 @@ public class VerifyIdentityActivity extends PassphraseRequiredActivity implement
    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
    getSupportActionBar().setTitle(R.string.AndroidManifest__verify_safety_number);

+    LiveRecipient recipient = Recipient.live(getIntent().getParcelableExtra(RECIPIENT_EXTRA));
+    recipient.observe(this, r -> setActionBarNotificationBarColor(r.getColor()));
+
+    setActionBarNotificationBarColor(recipient.get().getColor());
+
    Bundle extras = new Bundle();
    extras.putParcelable(VerifyDisplayFragment.RECIPIENT_ID, getIntent().getParcelableExtra(RECIPIENT_EXTRA));
    extras.putParcelable(VerifyDisplayFragment.REMOTE_IDENTITY, getIntent().getParcelableExtra(IDENTITY_EXTRA));
@@ -186,7 +190,7 @@ public class VerifyIdentityActivity extends PassphraseRequiredActivity implement

  @Override
  public void onQrDataFound(final String data) {
-    ThreadUtil.runOnMain(() -> {
+    Util.runOnMain(() -> {
      ((Vibrator)getSystemService(Context.VIBRATOR_SERVICE)).vibrate(50);

      getSupportFragmentManager().popBackStack();
@@ -218,6 +222,12 @@ public class VerifyIdentityActivity extends PassphraseRequiredActivity implement
    Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
  }

+  private void setActionBarNotificationBarColor(MaterialColor color) {
+    getSupportActionBar().setBackgroundDrawable(new ColorDrawable(color.toActionBarColor(this)));
+
+    WindowUtil.setStatusBarColor(getWindow(), color.toStatusBarColor(this));
+  }
+
  public static class VerifyDisplayFragment extends Fragment implements CompoundButton.OnCheckedChangeListener {

    public static final String RECIPIENT_ID    = "recipient_id";
@@ -248,24 +258,24 @@ public class VerifyIdentityActivity extends PassphraseRequiredActivity implement
    @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.numbersContainer = ViewUtil.findById(container, R.id.number_table);
+      this.qrCode           = ViewUtil.findById(container, R.id.qr_code);
+      this.verified         = ViewUtil.findById(container, R.id.verified_switch);
+      this.qrVerified       = ViewUtil.findById(container, R.id.qr_verified);
+      this.description      = ViewUtil.findById(container, R.id.description);
+      this.tapLabel         = ViewUtil.findById(container, R.id.tap_label);
+      this.codes[0]         = ViewUtil.findById(container, R.id.code_first);
+      this.codes[1]         = ViewUtil.findById(container, R.id.code_second);
+      this.codes[2]         = ViewUtil.findById(container, R.id.code_third);
+      this.codes[3]         = ViewUtil.findById(container, R.id.code_fourth);
+      this.codes[4]         = ViewUtil.findById(container, R.id.code_fifth);
+      this.codes[5]         = ViewUtil.findById(container, R.id.code_sixth);
+      this.codes[6]         = ViewUtil.findById(container, R.id.code_seventh);
+      this.codes[7]         = ViewUtil.findById(container, R.id.code_eighth);
+      this.codes[8]         = ViewUtil.findById(container, R.id.code_ninth);
+      this.codes[9]         = ViewUtil.findById(container, R.id.code_tenth);
+      this.codes[10]        = ViewUtil.findById(container, R.id.code_eleventh);
+      this.codes[11]        = ViewUtil.findById(container, R.id.code_twelth);

      this.qrCode.setOnClickListener(clickListener);
      this.registerForContextMenu(numbersContainer);
@@ -296,7 +306,6 @@ public class VerifyIdentityActivity extends PassphraseRequiredActivity implement
      byte[] localId;
      byte[] remoteId;

-      //noinspection WrongThread
      Recipient resolved = recipient.resolve();

      if (FeatureFlags.verifyV2() && resolved.getUuid().isPresent()) {
@@ -414,9 +423,11 @@ public class VerifyIdentityActivity extends PassphraseRequiredActivity implement
        } else {
          Toast.makeText(getActivity(), R.string.VerifyIdentityActivity_your_contact_is_running_an_old_version_of_signal, Toast.LENGTH_LONG).show();
        }
-      } catch (Exception e) {
+      } catch (FingerprintParsingException 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();
+      } catch (UnsupportedEncodingException e) {
+        throw new AssertionError(e);
      }
    }

@@ -611,35 +622,36 @@ public class VerifyIdentityActivity extends PassphraseRequiredActivity implement

    @Override
    public void onCheckedChanged(CompoundButton buttonView, final boolean isChecked) {
-      final Recipient   recipient   = this.recipient.get();
-      final RecipientId recipientId = recipient.getId();
+      new AsyncTask<Recipient, Void, Void>() {
+        @Override
+        protected Void doInBackground(Recipient... params) {
+          synchronized (SESSION_LOCK) {
+            if (isChecked) {
+              Log.i(TAG, "Saving identity: " + params[0].getId());
+              DatabaseFactory.getIdentityDatabase(getActivity())
+                             .saveIdentity(params[0].getId(),
+                                           remoteIdentity,
+                                           VerifiedStatus.VERIFIED, false,
+                                           System.currentTimeMillis(), true);
+            } else {
+              DatabaseFactory.getIdentityDatabase(getActivity())
+                             .setVerified(params[0].getId(),
+                                          remoteIdentity,
+                                          VerifiedStatus.DEFAULT);
+            }

-      SignalExecutors.BOUNDED.execute(() -> {
-        try (SignalSessionLock.Lock unused = DatabaseSessionLock.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(recipient.getId(),
+                                                                         remoteIdentity,
+                                                                         isChecked ? VerifiedStatus.VERIFIED :
+                                                                                     VerifiedStatus.DEFAULT));
+            StorageSyncHelper.scheduleSyncForDataChange();
+
+            IdentityUtil.markIdentityVerified(getActivity(), recipient.get(), isChecked, false);
          }
-
-          ApplicationDependencies.getJobManager()
-                                 .add(new MultiDeviceVerifiedUpdateJob(recipientId,
-                                                                       remoteIdentity,
-                                                                       isChecked ? VerifiedStatus.VERIFIED
-                                                                                 : VerifiedStatus.DEFAULT));
-          StorageSyncHelper.scheduleSyncForDataChange();
-
-          IdentityUtil.markIdentityVerified(getActivity(), recipient, isChecked, false);
+          return null;
        }
-      });
+      }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, recipient.get());
    }
  }

@@ -652,7 +664,7 @@ public class VerifyIdentityActivity extends PassphraseRequiredActivity implement

    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);
+      this.cameraView = ViewUtil.findById(container, R.id.scanner);

      return container;
    }
--- a/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
@@ -41,37 +41,31 @@ import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.components.TooltipPopup;
-import org.thoughtcrime.securesms.components.sensors.DeviceOrientationMonitor;
 import org.thoughtcrime.securesms.components.webrtc.CallParticipantsListUpdatePopupWindow;
 import org.thoughtcrime.securesms.components.webrtc.CallParticipantsState;
-import org.thoughtcrime.securesms.components.webrtc.CallToastPopupWindow;
 import org.thoughtcrime.securesms.components.webrtc.GroupCallSafetyNumberChangeNotificationUtil;
 import org.thoughtcrime.securesms.components.webrtc.WebRtcAudioOutput;
 import org.thoughtcrime.securesms.components.webrtc.WebRtcCallView;
 import org.thoughtcrime.securesms.components.webrtc.WebRtcCallViewModel;
 import org.thoughtcrime.securesms.components.webrtc.participantslist.CallParticipantsListDialog;
 import org.thoughtcrime.securesms.conversation.ui.error.SafetyNumberChangeDialog;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.events.WebRtcViewModel;
 import org.thoughtcrime.securesms.messagerequests.CalleeMustAcceptMessageRequestActivity;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.service.webrtc.SignalCallManager;
+import org.thoughtcrime.securesms.ringrtc.RemotePeer;
+import org.thoughtcrime.securesms.service.WebRtcCallService;
 import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.util.EllapsedTimeFormatter;
-import org.thoughtcrime.securesms.util.FullscreenHelper;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
-import org.thoughtcrime.securesms.util.livedata.LiveDataUtil;
 import org.whispersystems.libsignal.IdentityKey;
-import org.whispersystems.libsignal.util.Pair;
 import org.whispersystems.signalservice.api.messages.calls.HangupMessage;
+import org.whispersystems.signalservice.api.messages.calls.OfferMessage;

 import java.util.List;

-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);
@@ -85,9 +79,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
  public static final String EXTRA_ENABLE_VIDEO_IF_AVAILABLE = WebRtcCallActivity.class.getCanonicalName() + ".ENABLE_VIDEO_IF_AVAILABLE";

  private CallParticipantsListUpdatePopupWindow participantUpdateWindow;
-  private DeviceOrientationMonitor              deviceOrientationMonitor;

-  private FullscreenHelper    fullscreenHelper;
  private WebRtcCallView      callScreen;
  private TooltipPopup        videoTooltip;
  private WebRtcCallViewModel viewModel;
@@ -108,8 +100,8 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan

    requestWindowFeature(Window.FEATURE_NO_TITLE);
    setContentView(R.layout.webrtc_call_activity);
-
-    fullscreenHelper = new FullscreenHelper(this);
+    //noinspection ConstantConditions
+    getSupportActionBar().hide();

    setVolumeControlStream(AudioManager.STREAM_VOICE_CALL);

@@ -145,13 +137,13 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
    Log.i(TAG, "onPause");
    super.onPause();

-    if (!isInPipMode() || isFinishing()) {
+    if (!isInPipMode()) {
      EventBus.getDefault().unregister(this);
    }

-    if (!viewModel.isCallStarting()) {
+    if (!viewModel.isCallingStarted()) {
      CallParticipantsState state = viewModel.getCallParticipantsState().getValue();
-      if (state != null && state.getCallState().isPreJoinOrNetworkUnavailable()) {
+      if (state != null && state.getCallState() == WebRtcViewModel.State.CALL_PRE_JOIN) {
        finish();
      }
    }
@@ -162,24 +154,18 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
    Log.i(TAG, "onStop");
    super.onStop();

-    if (!isInPipMode() || isFinishing()) {
-      EventBus.getDefault().unregister(this);
-    }
+    EventBus.getDefault().unregister(this);

-    if (!viewModel.isCallStarting()) {
+    if (!viewModel.isCallingStarted()) {
      CallParticipantsState state = viewModel.getCallParticipantsState().getValue();
-      if (state != null && state.getCallState().isPreJoinOrNetworkUnavailable()) {
-        ApplicationDependencies.getSignalCallManager().cancelPreJoin();
+      if (state != null && state.getCallState() == WebRtcViewModel.State.CALL_PRE_JOIN) {
+        Intent intent = new Intent(this, WebRtcCallService.class);
+        intent.setAction(WebRtcCallService.ACTION_CANCEL_PRE_JOIN_CALL);
+        startService(intent);
      }
    }
  }

-  @Override
-  protected void onDestroy() {
-    super.onDestroy();
-    EventBus.getDefault().unregister(this);
-  }
-
  @Override
  public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
    Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
@@ -247,19 +233,13 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
  }

  private void initializeViewModel() {
-    deviceOrientationMonitor = new DeviceOrientationMonitor(this);
-    getLifecycle().addObserver(deviceOrientationMonitor);
-
-    WebRtcCallViewModel.Factory factory = new WebRtcCallViewModel.Factory(deviceOrientationMonitor);
-
-    viewModel = ViewModelProviders.of(this, factory).get(WebRtcCallViewModel.class);
+    viewModel = ViewModelProviders.of(this).get(WebRtcCallViewModel.class);
    viewModel.setIsInPipMode(isInPipMode());
    viewModel.getMicrophoneEnabled().observe(this, callScreen::setMicEnabled);
    viewModel.getWebRtcControls().observe(this, callScreen::setWebRtcControls);
    viewModel.getEvents().observe(this, this::handleViewModelEvent);
    viewModel.getCallTime().observe(this, this::handleCallTime);
-    LiveDataUtil.combineLatest(viewModel.getCallParticipantsState(), viewModel.getOrientation(), (s, o) -> new Pair<>(s, o == PORTRAIT_BOTTOM_EDGE))
-                .observe(this, p -> callScreen.updateCallParticipants(p.first(), p.second()));
+    viewModel.getCallParticipantsState().observe(this, callScreen::updateCallParticipants);
    viewModel.getCallParticipantListUpdate().observe(this, participantUpdateWindow::addCallParticipantListUpdate);
    viewModel.getSafetyNumberChangeEvent().observe(this, this::handleSafetyNumberChangeEvent);
    viewModel.getGroupMembers().observe(this, unused -> updateGroupMembersForGroupCall());
@@ -269,25 +249,12 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
      CallParticipantsState state = viewModel.getCallParticipantsState().getValue();
      if (state != null) {
        if (state.needsNewRequestSizes()) {
-          ApplicationDependencies.getSignalCallManager().updateRenderedResolutions();
+          Intent intent = new Intent(WebRtcCallActivity.this, WebRtcCallService.class);
+          intent.setAction(WebRtcCallService.ACTION_GROUP_UPDATE_RENDERED_RESOLUTIONS);
+          startService(intent);
        }
      }
    });
-
-    viewModel.getOrientation().observe(this, orientation -> {
-      ApplicationDependencies.getSignalCallManager().orientationChanged(orientation.getDegrees());
-
-      switch (orientation) {
-        case LANDSCAPE_LEFT_EDGE:
-          callScreen.rotateControls(90);
-          break;
-        case LANDSCAPE_RIGHT_EDGE:
-          callScreen.rotateControls(-90);
-          break;
-        case PORTRAIT_BOTTOM_EDGE:
-          callScreen.rotateControls(0);
-      }
-    });
  }

  private void handleViewModelEvent(@NonNull WebRtcCallViewModel.Event event) {
@@ -297,12 +264,6 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
    } else if (event instanceof WebRtcCallViewModel.Event.ShowGroupCallSafetyNumberChange) {
      SafetyNumberChangeDialog.showForGroupCall(getSupportFragmentManager(), ((WebRtcCallViewModel.Event.ShowGroupCallSafetyNumberChange) event).getIdentityRecords());
      return;
-    } else if (event instanceof WebRtcCallViewModel.Event.SwitchToSpeaker) {
-      callScreen.switchToSpeakerView();
-      return;
-    } else if (event instanceof WebRtcCallViewModel.Event.ShowSwipeToSpeakerHint) {
-      CallToastPopupWindow.show(callScreen);
-      return;
    }

    if (isInPipMode()) {
@@ -340,19 +301,30 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
  }

  private void handleSetAudioHandset() {
-    ApplicationDependencies.getSignalCallManager().setAudioSpeaker(false);
+    Intent intent = new Intent(this, WebRtcCallService.class);
+    intent.setAction(WebRtcCallService.ACTION_SET_AUDIO_SPEAKER);
+    startService(intent);
  }

  private void handleSetAudioSpeaker() {
-    ApplicationDependencies.getSignalCallManager().setAudioSpeaker(true);
+    Intent intent = new Intent(this, WebRtcCallService.class);
+    intent.setAction(WebRtcCallService.ACTION_SET_AUDIO_SPEAKER);
+    intent.putExtra(WebRtcCallService.EXTRA_SPEAKER, true);
+    startService(intent);
  }

  private void handleSetAudioBluetooth() {
-    ApplicationDependencies.getSignalCallManager().setAudioBluetooth(true);
+    Intent intent = new Intent(this, WebRtcCallService.class);
+    intent.setAction(WebRtcCallService.ACTION_SET_AUDIO_BLUETOOTH);
+    intent.putExtra(WebRtcCallService.EXTRA_BLUETOOTH, true);
+    startService(intent);
  }

  private void handleSetMuteAudio(boolean enabled) {
-    ApplicationDependencies.getSignalCallManager().setMuteAudio(enabled);
+    Intent intent = new Intent(this, WebRtcCallService.class);
+    intent.setAction(WebRtcCallService.ACTION_SET_MUTE_AUDIO);
+    intent.putExtra(WebRtcCallService.EXTRA_MUTE, enabled);
+    startService(intent);
  }

  private void handleSetMuteVideo(boolean muted) {
@@ -366,13 +338,20 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
                 .ifNecessary()
                 .withRationaleDialog(getString(R.string.WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera, recipientDisplayName), R.drawable.ic_video_solid_24_tinted)
                 .withPermanentDenialDialog(getString(R.string.WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera, recipientDisplayName))
-                 .onAllGranted(() -> ApplicationDependencies.getSignalCallManager().setMuteVideo(!muted))
+                 .onAllGranted(() -> {
+                   Intent intent = new Intent(this, WebRtcCallService.class);
+                   intent.setAction(WebRtcCallService.ACTION_SET_ENABLE_VIDEO);
+                   intent.putExtra(WebRtcCallService.EXTRA_ENABLE, !muted);
+                   startService(intent);
+                 })
                 .execute();
    }
  }

  private void handleFlipCamera() {
-    ApplicationDependencies.getSignalCallManager().flipCamera();
+    Intent intent = new Intent(this, WebRtcCallService.class);
+    intent.setAction(WebRtcCallService.ACTION_FLIP_CAMERA);
+    startService(intent);
  }

  private void handleAnswerWithAudio() {
@@ -389,7 +368,9 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
                   callScreen.setRecipient(recipient);
                   callScreen.setStatus(getString(R.string.RedPhone_answering));

-                   ApplicationDependencies.getSignalCallManager().acceptCall(false);
+                   Intent intent = new Intent(this, WebRtcCallService.class);
+                   intent.setAction(WebRtcCallService.ACTION_ACCEPT_CALL);
+                   startService(intent);
                 })
                 .onAnyDenied(this::handleDenyCall)
                 .execute();
@@ -410,7 +391,10 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
                   callScreen.setRecipient(recipient);
                   callScreen.setStatus(getString(R.string.RedPhone_answering));

-                   ApplicationDependencies.getSignalCallManager().acceptCall(true);
+                   Intent intent = new Intent(this, WebRtcCallService.class);
+                   intent.setAction(WebRtcCallService.ACTION_ACCEPT_CALL);
+                   intent.putExtra(WebRtcCallService.EXTRA_ANSWER_WITH_VIDEO, true);
+                   startService(intent);

                   handleSetMuteVideo(false);
                 })
@@ -423,7 +407,9 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
    Recipient recipient = viewModel.getRecipient().get();

    if (!recipient.equals(Recipient.UNKNOWN)) {
-      ApplicationDependencies.getSignalCallManager().denyCall();
+      Intent intent = new Intent(this, WebRtcCallService.class);
+      intent.setAction(WebRtcCallService.ACTION_DENY_CALL);
+      startService(intent);

      callScreen.setRecipient(recipient);
      callScreen.setStatus(getString(R.string.RedPhone_ending_call));
@@ -433,7 +419,9 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan

  private void handleEndCall() {
    Log.i(TAG, "Hangup pressed, handling termination now...");
-    ApplicationDependencies.getSignalCallManager().localHangup();
+    Intent intent = new Intent(WebRtcCallActivity.this, WebRtcCallService.class);
+    intent.setAction(WebRtcCallService.ACTION_LOCAL_HANGUP);
+    startService(intent);
  }

  private void handleOutgoingCall(@NonNull WebRtcViewModel event) {
@@ -464,7 +452,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
  private void handleCallBusy() {
    EventBus.getDefault().removeStickyEvent(WebRtcViewModel.class);
    callScreen.setStatus(getString(R.string.RedPhone_busy));
-    delayedFinish(SignalCallManager.BUSY_TONE_LENGTH);
+    delayedFinish(WebRtcCallService.BUSY_TONE_LENGTH);
  }

  private void handleCallConnected(@NonNull WebRtcViewModel event) {
@@ -483,6 +471,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
  private void handleServerFailure() {
    EventBus.getDefault().removeStickyEvent(WebRtcViewModel.class);
    callScreen.setStatus(getString(R.string.RedPhone_network_failed));
+    delayedFinish();
  }

  private void handleNoSuchUser(final @NonNull WebRtcViewModel event) {
@@ -502,7 +491,6 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
    final Recipient   recipient = event.getRemoteParticipants().get(0).getRecipient();

    if (theirKey == null) {
-      Log.w(TAG, "Untrusted identity without an identity key, terminating call.");
      handleTerminate(recipient, HangupMessage.Type.NORMAL);
    }

@@ -521,7 +509,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
  }

  private void updateGroupMembersForGroupCall() {
-    ApplicationDependencies.getSignalCallManager().requestUpdateGroupMembers();
+    startService(new Intent(this, WebRtcCallService.class).setAction(WebRtcCallService.ACTION_GROUP_REQUEST_UPDATE_MEMBERS));
  }

  private void updateSpeakerHint(boolean showSpeakerHint) {
@@ -535,15 +523,13 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
  @Override
  public void onSendAnywayAfterSafetyNumberChange(@NonNull List<RecipientId> changedRecipients) {
    CallParticipantsState state = viewModel.getCallParticipantsState().getValue();
-
-    if (state == null) {
-      return;
-    }
-
    if (state.getGroupCallState().isConnected()) {
-      ApplicationDependencies.getSignalCallManager().groupApproveSafetyChange(changedRecipients);
+      Intent intent = new Intent(this, WebRtcCallService.class);
+      intent.setAction(WebRtcCallService.ACTION_GROUP_APPROVE_SAFETY_CHANGE)
+            .putExtra(WebRtcCallService.EXTRA_RECIPIENT_IDS, RecipientId.toSerializedList(changedRecipients));
+      startService(intent);
    } else {
-      viewModel.startCall(state.getLocalParticipant().isVideoEnabled());
+      startCall(state.getLocalParticipant().isVideoEnabled());
    }
  }

@@ -554,8 +540,10 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
  public void onCanceled() {
    CallParticipantsState state = viewModel.getCallParticipantsState().getValue();
    if (state != null && state.getGroupCallState().isNotIdle()) {
-      if (state.getCallState().isPreJoinOrNetworkUnavailable()) {
-        ApplicationDependencies.getSignalCallManager().cancelPreJoin();
+      if (state.getCallState() == WebRtcViewModel.State.CALL_PRE_JOIN) {
+        Intent intent = new Intent(this, WebRtcCallService.class);
+        intent.setAction(WebRtcCallService.ACTION_CANCEL_PRE_JOIN_CALL);
+        startService(intent);
        finish();
      } else {
        handleEndCall();
@@ -621,11 +609,11 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
  private void startCall(boolean isVideoCall) {
    enableVideoIfAvailable = isVideoCall;

-    if (isVideoCall) {
-      ApplicationDependencies.getSignalCallManager().startOutgoingVideoCall(viewModel.getRecipient().get());
-    } else {
-      ApplicationDependencies.getSignalCallManager().startOutgoingAudioCall(viewModel.getRecipient().get());
-    }
+    Intent intent = new Intent(WebRtcCallActivity.this, WebRtcCallService.class);
+    intent.setAction(WebRtcCallService.ACTION_OUTGOING_CALL)
+          .putExtra(WebRtcCallService.EXTRA_REMOTE_PEER, new RemotePeer(viewModel.getRecipient().getId()))
+          .putExtra(WebRtcCallService.EXTRA_OFFER_TYPE, (isVideoCall ? OfferMessage.Type.VIDEO_CALL : OfferMessage.Type.AUDIO_CALL).getCode());
+    startService(intent);

    MessageSender.onMessageSent();
  }
@@ -649,16 +637,6 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
      }
    }

-    @Override
-    public void showSystemUI() {
-      fullscreenHelper.showSystemUI();
-    }
-
-    @Override
-    public void hideSystemUI() {
-      fullscreenHelper.hideSystemUI();
-    }
-
    @Override
    public void onAudioOutputChanged(@NonNull WebRtcAudioOutput audioOutput) {
      switch (audioOutput) {
@@ -724,10 +702,5 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
    public void onPageChanged(@NonNull CallParticipantsState.SelectedPage page) {
      viewModel.setIsViewingFocusedParticipant(page);
    }
-
-    @Override
-    public void onLocalPictureInPictureClicked() {
-      viewModel.onLocalPictureInPictureClicked();
-    }
  }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/animation/transitions/AlphaTransition.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/animation/transitions/AlphaTransition.kt
@@ -1,44 +0,0 @@
-package org.thoughtcrime.securesms.animation.transitions
-
-import android.animation.Animator
-import android.animation.ObjectAnimator
-import android.view.View
-import android.view.ViewGroup
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.transition.Transition
-import androidx.transition.TransitionValues
-
-private const val ALPHA = "signal.alpha_transition.alpha"
-
-/**
- * Alpha transition that can be used with [ConstraintLayout]
- */
-class AlphaTransition : Transition() {
-
-  override fun captureStartValues(transitionValues: TransitionValues) {
-    captureValues(transitionValues)
-  }
-
-  override fun captureEndValues(transitionValues: TransitionValues) {
-    captureValues(transitionValues)
-  }
-
-  private fun captureValues(transitionValues: TransitionValues) {
-    val view: View = transitionValues.view
-    if (view !is ConstraintLayout) {
-      transitionValues.values[ALPHA] = view.alpha
-    }
-  }
-
-  override fun createAnimator(sceneRoot: ViewGroup, startValues: TransitionValues?, endValues: TransitionValues?): Animator? {
-    if (startValues == null || endValues == null) {
-      return null
-    }
-
-    val view: View = endValues.view
-    val startAlpha: Float = startValues.values[ALPHA] as? Float ?: view.alpha
-    val endAlpha: Float = endValues.values[ALPHA] as? Float ?: view.alpha
-
-    return ObjectAnimator.ofFloat(view, "alpha", startAlpha, endAlpha)
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/Attachment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/Attachment.java
@@ -40,7 +40,6 @@ public abstract class Attachment {

  private final boolean voiceNote;
  private final boolean borderless;
-  private final boolean videoGif;
  private final int     width;
  private final int     height;
  private final boolean quote;
@@ -73,7 +72,6 @@ public abstract class Attachment {
                    @Nullable String fastPreflightId,
                    boolean voiceNote,
                    boolean borderless,
-                    boolean videoGif,
                    int width,
                    int height,
                    boolean quote,
@@ -96,7 +94,6 @@ public abstract class Attachment {
    this.fastPreflightId     = fastPreflightId;
    this.voiceNote           = voiceNote;
    this.borderless          = borderless;
-    this.videoGif            = videoGif;
    this.width               = width;
    this.height              = height;
    this.quote               = quote;
@@ -111,8 +108,6 @@ public abstract class Attachment {
  @Nullable
  public abstract Uri getUri();

-  public abstract @Nullable Uri getPublicUri();
-
  public int getTransferState() {
    return transferState;
  }
@@ -173,10 +168,6 @@ public abstract class Attachment {
    return borderless;
  }

-  public boolean isVideoGif() {
-    return videoGif;
-  }
-
  public int getWidth() {
    return width;
  }
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachment.java
@@ -36,7 +36,6 @@ public class DatabaseAttachment extends Attachment {
                            String fastPreflightId,
                            boolean voiceNote,
                            boolean borderless,
-                            boolean videoGif,
                            int width,
                            int height,
                            boolean quote,
@@ -48,7 +47,7 @@ public class DatabaseAttachment extends Attachment {
                            int displayOrder,
                            long uploadTimestamp)
  {
-    super(contentType, transferProgress, size, fileName, cdnNumber, location, key, relay, digest, fastPreflightId, voiceNote, borderless, videoGif, width, height, quote, uploadTimestamp, caption, stickerLocator, blurHash, audioHash, transformProperties);
+    super(contentType, transferProgress, size, fileName, cdnNumber, location, key, relay, digest, fastPreflightId, voiceNote, borderless, width, height, quote, uploadTimestamp, caption, stickerLocator, blurHash, audioHash, transformProperties);
    this.attachmentId = attachmentId;
    this.hasData      = hasData;
    this.hasThumbnail = hasThumbnail;
@@ -66,15 +65,6 @@ public class DatabaseAttachment extends Attachment {
    }
  }

-  @Override
-  public @Nullable Uri getPublicUri() {
-    if (hasData) {
-      return PartAuthority.getAttachmentPublicUri(getUri());
-    } else {
-      return null;
-    }
-  }
-
  public AttachmentId getAttachmentId() {
    return attachmentId;
  }
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/MmsNotificationAttachment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/MmsNotificationAttachment.java
@@ -11,7 +11,7 @@ import org.thoughtcrime.securesms.database.MmsDatabase;
 public class MmsNotificationAttachment extends Attachment {

  public MmsNotificationAttachment(int status, long size) {
-    super("application/mms", getTransferStateFromStatus(status), size, null, 0, null, null, null, null, null, false, false, false, 0, 0, false, 0, null, null, null, null, null);
+    super("application/mms", getTransferStateFromStatus(status), size, null, 0, null, null, null, null, null, false, false, 0, 0, false, 0, null, null, null, null, null);
  }

  @Nullable
@@ -20,11 +20,6 @@ public class MmsNotificationAttachment extends Attachment {
    return null;
  }

-  @Override
-  public @Nullable Uri getPublicUri() {
-    return null;
-  }
-
  private static int getTransferStateFromStatus(int status) {
    if (status == MmsDatabase.Status.DOWNLOAD_INITIALIZED ||
        status == MmsDatabase.Status.DOWNLOAD_NO_CONNECTIVITY)
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/PointerAttachment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/PointerAttachment.java
@@ -30,7 +30,6 @@ public class PointerAttachment extends Attachment {
                            @Nullable String fastPreflightId,
                            boolean voiceNote,
                            boolean borderless,
-                            boolean videoGif,
                            int width,
                            int height,
                            long uploadTimestamp,
@@ -38,7 +37,7 @@ public class PointerAttachment extends Attachment {
                            @Nullable StickerLocator stickerLocator,
                            @Nullable BlurHash blurHash)
  {
-    super(contentType, transferState, size, fileName, cdnNumber, location, key, relay, digest, fastPreflightId, voiceNote, borderless, videoGif, width, height, false, uploadTimestamp, caption, stickerLocator, blurHash, null, null);
+    super(contentType, transferState, size, fileName, cdnNumber, location, key, relay, digest, fastPreflightId, voiceNote, borderless, width, height, false, uploadTimestamp, caption, stickerLocator, blurHash, null, null);
  }

  @Nullable
@@ -47,11 +46,6 @@ public class PointerAttachment extends Attachment {
    return null;
  }

-  @Override
-  public @Nullable Uri getPublicUri() {
-    return null;
-  }
-
  public static List<Attachment> forPointers(Optional<List<SignalServiceAttachment>> pointers) {
    List<Attachment> results = new LinkedList<>();

@@ -112,7 +106,6 @@ public class PointerAttachment extends Attachment {
                                             fastPreflightId,
                                             pointer.get().asPointer().getVoiceNote(),
                                             pointer.get().asPointer().isBorderless(),
-                                             pointer.get().asPointer().isGif(),
                                             pointer.get().asPointer().getWidth(),
                                             pointer.get().asPointer().getHeight(),
                                             pointer.get().asPointer().getUploadTimestamp(),
@@ -137,7 +130,6 @@ public class PointerAttachment extends Attachment {
                                             null,
                                             false,
                                             false,
-                                             false,
                                             thumbnail != null ? thumbnail.asPointer().getWidth() : 0,
                                             thumbnail != null ? thumbnail.asPointer().getHeight() : 0,
                                             thumbnail != null ? thumbnail.asPointer().getUploadTimestamp() : 0,
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/TombstoneAttachment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/TombstoneAttachment.java
@@ -16,16 +16,11 @@ import org.thoughtcrime.securesms.database.AttachmentDatabase;
 public class TombstoneAttachment extends Attachment {

  public TombstoneAttachment(@NonNull String contentType, boolean quote) {
-    super(contentType, AttachmentDatabase.TRANSFER_PROGRESS_DONE, 0, null, 0, null, null, null, null, null, false, false, false, 0, 0, quote, 0, null, null, null, null, null);
+    super(contentType, AttachmentDatabase.TRANSFER_PROGRESS_DONE, 0, null, 0, null, null, null, null, null, false, false, 0, 0, quote, 0, null, null, null, null, null);
  }

  @Override
  public @Nullable Uri getUri() {
    return null;
  }
-
-  @Override
-  public @Nullable Uri getPublicUri() {
-    return null;
-  }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/UriAttachment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/UriAttachment.java
@@ -21,7 +21,6 @@ public class UriAttachment extends Attachment {
                       @Nullable String fileName,
                       boolean voiceNote,
                       boolean borderless,
-                       boolean videoGif,
                       boolean quote,
                       @Nullable String caption,
                       @Nullable StickerLocator stickerLocator,
@@ -29,7 +28,7 @@ public class UriAttachment extends Attachment {
                       @Nullable AudioHash audioHash,
                       @Nullable TransformProperties transformProperties)
  {
-    this(uri, contentType, transferState, size, 0, 0, fileName, null, voiceNote, borderless, videoGif, quote, caption, stickerLocator, blurHash, audioHash, transformProperties);
+    this(uri, contentType, transferState, size, 0, 0, fileName, null, voiceNote, borderless, quote, caption, stickerLocator, blurHash, audioHash, transformProperties);
  }

  public UriAttachment(@NonNull Uri dataUri,
@@ -42,7 +41,6 @@ public class UriAttachment extends Attachment {
                       @Nullable String fastPreflightId,
                       boolean voiceNote,
                       boolean borderless,
-                       boolean videoGif,
                       boolean quote,
                       @Nullable String caption,
                       @Nullable StickerLocator stickerLocator,
@@ -50,7 +48,7 @@ public class UriAttachment extends Attachment {
                       @Nullable AudioHash audioHash,
                       @Nullable TransformProperties transformProperties)
  {
-    super(contentType, transferState, size, fileName, 0, null, null, null, null, fastPreflightId, voiceNote, borderless, videoGif, width, height, quote, 0, caption, stickerLocator, blurHash, audioHash, transformProperties);
+    super(contentType, transferState, size, fileName, 0, null, null, null, null, fastPreflightId, voiceNote, borderless, width, height, quote, 0, caption, stickerLocator, blurHash, audioHash, transformProperties);
    this.dataUri = dataUri;
  }

@@ -60,11 +58,6 @@ public class UriAttachment extends Attachment {
    return dataUri;
  }

-  @Override
-  public @Nullable Uri getPublicUri() {
-    return null;
-  }
-
  @Override
  public boolean equals(Object other) {
    return other != null && other instanceof UriAttachment && ((UriAttachment) other).dataUri.equals(this.dataUri);
--- a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioCodec.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioCodec.java
@@ -20,7 +20,7 @@ import java.nio.ByteBuffer;
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
 public class AudioCodec {

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

  private static final int    SAMPLE_RATE       = 44100;
  private static final int    SAMPLE_RATE_INDEX = 4;
--- a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java
@@ -8,11 +8,11 @@ import android.os.ParcelFileDescriptor;

 import androidx.annotation.NonNull;

-import org.signal.core.util.ThreadUtil;
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.util.MediaUtil;
+import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
 import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
 import org.whispersystems.libsignal.util.Pair;
@@ -23,7 +23,7 @@ import java.util.concurrent.ExecutorService;
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
 public class AudioRecorder {

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

  private static final ExecutorService executor = SignalExecutors.newCachedSingleThreadExecutor("signal-AudioRecorder");

@@ -90,10 +90,10 @@ public class AudioRecorder {
  }

  private <T> void sendToFuture(final SettableFuture<T> future, final Exception exception) {
-    ThreadUtil.runOnMain(() -> future.setException(exception));
+    Util.runOnMain(() -> future.setException(exception));
  }

  private <T> void sendToFuture(final SettableFuture<T> future, final T result) {
-    ThreadUtil.runOnMain(() -> future.set(result));
+    Util.runOnMain(() -> future.set(result));
  }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioWaveForm.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioWaveForm.java
@@ -16,7 +16,6 @@ import androidx.core.util.Consumer;

 import com.google.protobuf.ByteString;

-import org.signal.core.util.ThreadUtil;
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.attachments.Attachment;
@@ -27,6 +26,7 @@ import org.thoughtcrime.securesms.database.model.databaseprotos.AudioWaveFormDat
 import org.thoughtcrime.securesms.media.DecryptableUriMediaInput;
 import org.thoughtcrime.securesms.media.MediaInput;
 import org.thoughtcrime.securesms.mms.AudioSlide;
+import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.concurrent.SerialExecutor;

 import java.io.IOException;
@@ -61,13 +61,13 @@ public final class AudioWaveForm {

    if (uri == null) {
      Log.w(TAG, "No uri");
-      ThreadUtil.runOnMain(onFailure);
+      Util.runOnMain(onFailure);
      return;
    }

    if (!(attachment instanceof DatabaseAttachment)) {
      Log.i(TAG, "Not yet in database");
-      ThreadUtil.runOnMain(onFailure);
+      Util.runOnMain(onFailure);
      return;
    }

@@ -75,7 +75,7 @@ public final class AudioWaveForm {
    AudioFileInfo cached   = WAVE_FORM_CACHE.get(cacheKey);
    if (cached != null) {
      Log.i(TAG, "Loaded wave form from cache " + cacheKey);
-      ThreadUtil.runOnMain(() -> onSuccess.accept(cached));
+      Util.runOnMain(() -> onSuccess.accept(cached));
      return;
    }

@@ -83,7 +83,7 @@ public final class AudioWaveForm {
      AudioFileInfo cachedInExecutor = WAVE_FORM_CACHE.get(cacheKey);
      if (cachedInExecutor != null) {
        Log.i(TAG, "Loaded wave form from cache inside executor" + cacheKey);
-        ThreadUtil.runOnMain(() -> onSuccess.accept(cachedInExecutor));
+        Util.runOnMain(() -> onSuccess.accept(cachedInExecutor));
        return;
      }

@@ -92,14 +92,14 @@ public final class AudioWaveForm {
        AudioFileInfo audioFileInfo = AudioFileInfo.fromDatabaseProtobuf(audioHash.getAudioWaveForm());
        if (audioFileInfo.waveForm.length == 0) {
          Log.w(TAG, "Recovering from a wave form generation error  " + cacheKey);
-          ThreadUtil.runOnMain(onFailure);
+          Util.runOnMain(onFailure);
          return;
        } else if (audioFileInfo.waveForm.length != BAR_COUNT) {
          Log.w(TAG, "Wave form from database does not match bar count, regenerating " + cacheKey);
        } else {
          WAVE_FORM_CACHE.put(cacheKey, audioFileInfo);
          Log.i(TAG, "Loaded wave form from DB " + cacheKey);
-          ThreadUtil.runOnMain(() -> onSuccess.accept(audioFileInfo));
+          Util.runOnMain(() -> onSuccess.accept(audioFileInfo));
          return;
        }
      }
@@ -120,10 +120,10 @@ public final class AudioWaveForm {
        attachmentDatabase.writeAudioHash(dbAttachment.getAttachmentId(), fileInfo.toDatabaseProtobuf());

        WAVE_FORM_CACHE.put(cacheKey, fileInfo);
-        ThreadUtil.runOnMain(() -> onSuccess.accept(fileInfo));
+        Util.runOnMain(() -> onSuccess.accept(fileInfo));
      } catch (Throwable e) {
        Log.w(TAG, "Failed to create audio wave form for " + cacheKey, e);
-        ThreadUtil.runOnMain(onFailure);
+        Util.runOnMain(onFailure);
      }
    });
  }
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java
@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms.backup;


-import android.content.ActivityNotFoundException;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
@@ -74,7 +73,7 @@ public class BackupDialog {

          BackupPassphrase.set(context, Util.join(password, " "));
          TextSecurePreferences.setNextBackupTime(context, 0);
-          SignalStore.settings().setBackupEnabled(true);
+          TextSecurePreferences.setBackupEnabled(context, true);
          LocalBackupListener.schedule(context);

          onBackupsEnabled.run();
@@ -127,12 +126,7 @@ public class BackupDialog {
                                     Intent.FLAG_GRANT_WRITE_URI_PERMISSION       |
                                     Intent.FLAG_GRANT_READ_URI_PERMISSION);

-                    try {
-                       fragment.startActivityForResult(intent, requestCode);
-                     } catch (ActivityNotFoundException e) {
-                       Toast.makeText(fragment.requireContext(), R.string.BackupDialog_no_file_picker_available, Toast.LENGTH_LONG)
-                            .show();
-                     }
+                     fragment.startActivityForResult(intent, requestCode);

                     dialog.dismiss();
                   }))
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupFileIOError.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupFileIOError.java
@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.backup;
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.content.Context;
+import android.content.Intent;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -10,8 +11,8 @@ import androidx.annotation.StringRes;
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;

+import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.components.settings.app.AppSettingsActivity;
 import org.thoughtcrime.securesms.notifications.NotificationCancellationHelper;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;

@@ -38,7 +39,11 @@ public enum BackupFileIOError {
  }

  public void postNotification(@NonNull Context context) {
-    PendingIntent pendingIntent           = PendingIntent.getActivity(context, -1, AppSettingsActivity.backups(context), 0);
+    Intent intent = new Intent(context, ApplicationPreferencesActivity.class);
+
+    intent.putExtra(ApplicationPreferencesActivity.LAUNCH_TO_BACKUPS_FRAGMENT, true);
+
+    PendingIntent pendingIntent           = PendingIntent.getActivity(context, -1, intent, 0);
    Notification backupFailedNotification = new NotificationCompat.Builder(context, NotificationChannels.FAILURES)
                                                                  .setSmallIcon(R.drawable.ic_signal_backup)
                                                                  .setContentTitle(context.getString(titleId))
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupPassphrase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupPassphrase.java
@@ -18,7 +18,7 @@ public final class BackupPassphrase {
  private BackupPassphrase() {
  }

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

  public static @Nullable String get(@NonNull Context context) {
    String passphrase          = TextSecurePreferences.getBackupPassphrase(context);
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupBase.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupBase.java
@@ -5,7 +5,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

 import org.greenrobot.eventbus.EventBus;
-import org.signal.core.util.logging.Log;
 import org.whispersystems.libsignal.util.ByteUtil;

 import java.security.MessageDigest;
@@ -14,7 +13,7 @@ import java.security.NoSuchAlgorithmException;
 public abstract class FullBackupBase {

  @SuppressWarnings("unused")
-  private static final String TAG = Log.tag(FullBackupBase.class);
+  private static final String TAG = FullBackupBase.class.getSimpleName();

  static class BackupStream {
    static @NonNull byte[] getBackupKey(@NonNull String passphrase, @Nullable byte[] salt) {
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java
@@ -10,6 +10,7 @@ import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.documentfile.provider.DocumentFile;

+import com.annimon.stream.function.Consumer;
 import com.annimon.stream.function.Predicate;
 import com.google.protobuf.ByteString;

@@ -24,8 +25,8 @@ import org.thoughtcrime.securesms.crypto.ClassicDecryptingPartInputStream;
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.crypto.ModernDecryptingPartInputStream;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
-import org.thoughtcrime.securesms.database.EmojiSearchDatabase;
 import org.thoughtcrime.securesms.database.GroupReceiptDatabase;
+import org.thoughtcrime.securesms.database.JobDatabase;
 import org.thoughtcrime.securesms.database.KeyValueDatabase;
 import org.thoughtcrime.securesms.database.MmsDatabase;
 import org.thoughtcrime.securesms.database.MmsSmsColumns;
@@ -35,13 +36,9 @@ import org.thoughtcrime.securesms.database.SessionDatabase;
 import org.thoughtcrime.securesms.database.SignedPreKeyDatabase;
 import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.thoughtcrime.securesms.database.StickerDatabase;
-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.SetUtil;
 import org.thoughtcrime.securesms.util.Stopwatch;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.libsignal.kdf.HKDFv3;
 import org.whispersystems.libsignal.util.ByteUtil;
@@ -69,7 +66,8 @@ import javax.crypto.spec.SecretKeySpec;

 public class FullBackupExporter extends FullBackupBase {

-  private static final String TAG = Log.tag(FullBackupExporter.class);
+  @SuppressWarnings("unused")
+  private static final String TAG = FullBackupExporter.class.getSimpleName();

  private static final Set<String> BLACKLISTED_TABLES = SetUtil.newHashSet(
    SignedPreKeyDatabase.TABLE_NAME,
@@ -77,19 +75,21 @@ public class FullBackupExporter extends FullBackupBase {
    SessionDatabase.TABLE_NAME,
    SearchDatabase.SMS_FTS_TABLE_NAME,
    SearchDatabase.MMS_FTS_TABLE_NAME,
-    EmojiSearchDatabase.TABLE_NAME
+    JobDatabase.JOBS_TABLE_NAME,
+    JobDatabase.CONSTRAINTS_TABLE_NAME,
+    JobDatabase.DEPENDENCIES_TABLE_NAME,
+    KeyValueDatabase.TABLE_NAME
  );

  public static void export(@NonNull Context context,
                            @NonNull AttachmentSecret attachmentSecret,
                            @NonNull SQLiteDatabase input,
                            @NonNull File output,
-                            @NonNull String passphrase,
-                            @NonNull BackupCancellationSignal cancellationSignal)
+                            @NonNull String passphrase)
      throws IOException
  {
    try (OutputStream outputStream = new FileOutputStream(output)) {
-      internalExport(context, attachmentSecret, input, outputStream, passphrase, true, cancellationSignal);
+      internalExport(context, attachmentSecret, input, outputStream, passphrase);
    }
  }

@@ -98,32 +98,19 @@ public class FullBackupExporter extends FullBackupBase {
                            @NonNull AttachmentSecret attachmentSecret,
                            @NonNull SQLiteDatabase input,
                            @NonNull DocumentFile output,
-                            @NonNull String passphrase,
-                            @NonNull BackupCancellationSignal cancellationSignal)
+                            @NonNull String passphrase)
      throws IOException
  {
    try (OutputStream outputStream = Objects.requireNonNull(context.getContentResolver().openOutputStream(output.getUri()))) {
-      internalExport(context, attachmentSecret, input, outputStream, passphrase, true, cancellationSignal);
+      internalExport(context, attachmentSecret, input, outputStream, passphrase);
    }
  }

-  public static void transfer(@NonNull Context context,
-                              @NonNull AttachmentSecret attachmentSecret,
-                              @NonNull SQLiteDatabase input,
-                              @NonNull OutputStream outputStream,
-                              @NonNull String passphrase)
-      throws IOException
-  {
-    internalExport(context, attachmentSecret, input, outputStream, passphrase, false, () -> false);
-  }
-
  private static void internalExport(@NonNull Context context,
                                     @NonNull AttachmentSecret attachmentSecret,
                                     @NonNull SQLiteDatabase input,
                                     @NonNull OutputStream fileOutputStream,
-                                     @NonNull String passphrase,
-                                     boolean closeOutputStream,
-                                     @NonNull BackupCancellationSignal cancellationSignal)
+                                     @NonNull String passphrase)
      throws IOException
  {
    BackupFrameOutputStream outputStream = new BackupFrameOutputStream(fileOutputStream, passphrase);
@@ -131,51 +118,36 @@ public class FullBackupExporter extends FullBackupBase {

    try {
      outputStream.writeDatabaseVersion(input.getVersion());
-      count++;

      List<String> tables = exportSchema(input, outputStream);
-      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, cancellationSignal);
+          count = exportTable(table, input, outputStream, FullBackupExporter::isNonExpiringMmsMessage, null, count);
        } else if (table.equals(SmsDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, FullBackupExporter::isNonExpiringSmsMessage, null, count, cancellationSignal);
+          count = exportTable(table, input, outputStream, FullBackupExporter::isNonExpiringSmsMessage, null, count);
        } else if (table.equals(GroupReceiptDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(GroupReceiptDatabase.MMS_ID))), null, count, cancellationSignal);
+          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(GroupReceiptDatabase.MMS_ID))), null, count);
        } else if (table.equals(AttachmentDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.MMS_ID))), (cursor, innerCount) -> exportAttachment(attachmentSecret, cursor, outputStream, innerCount), count, cancellationSignal);
+          count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.MMS_ID))), cursor -> exportAttachment(attachmentSecret, cursor, outputStream), count);
        } else if (table.equals(StickerDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, cursor -> true, (cursor, innerCount) -> exportSticker(attachmentSecret, cursor, outputStream, innerCount), count, cancellationSignal);
+          count = exportTable(table, input, outputStream, cursor -> true, cursor -> exportSticker(attachmentSecret, cursor, outputStream), count);
        } else if (!BLACKLISTED_TABLES.contains(table) && !table.startsWith("sqlite_")) {
-          count = exportTable(table, input, outputStream, null, null, count, cancellationSignal);
+          count = exportTable(table, input, outputStream, null, null, count);
        }
        stopwatch.split("table::" + table);
      }

      for (BackupProtos.SharedPreference preference : IdentityKeyUtil.getBackupRecord(context)) {
-        throwIfCanceled(cancellationSignal);
-        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));
        outputStream.write(preference);
      }

      stopwatch.split("prefs");

-      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));
          outputStream.write(avatar.getFilename(), avatar.getInputStream(), avatar.getLength());
@@ -187,19 +159,11 @@ public class FullBackupExporter extends FullBackupBase {

      outputStream.writeEnd();
    } finally {
-      if (closeOutputStream) {
-        outputStream.close();
-      }
+      outputStream.close();
      EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.FINISHED, ++count));
    }
  }

-  private static void throwIfCanceled(@NonNull BackupCancellationSignal cancellationSignal) throws BackupCanceledException {
-    if (cancellationSignal.isCanceled()) {
-      throw new BackupCanceledException();
-    }
-  }
-
  private static List<String> exportSchema(@NonNull SQLiteDatabase input, @NonNull BackupFrameOutputStream outputStream)
      throws IOException
  {
@@ -230,20 +194,19 @@ public class FullBackupExporter extends FullBackupBase {
    return tables;
  }

-  private static int exportTable(@NonNull String table,
-                                 @NonNull SQLiteDatabase input,
-                                 @NonNull BackupFrameOutputStream outputStream,
-                                 @Nullable Predicate<Cursor> predicate,
-                                 @Nullable PostProcessor postProcess,
-                                 int count,
-                                 @NonNull BackupCancellationSignal cancellationSignal)
+  private static int exportTable(@NonNull   String table,
+                                 @NonNull   SQLiteDatabase input,
+                                 @NonNull   BackupFrameOutputStream outputStream,
+                                 @Nullable  Predicate<Cursor> predicate,
+                                 @Nullable  Consumer<Cursor> postProcess,
+                                            int count)
      throws IOException
  {
    String template = "INSERT INTO " + table + " VALUES ";

    try (Cursor cursor = input.rawQuery("SELECT * FROM " + table, null)) {
      while (cursor != null && cursor.moveToNext()) {
-        throwIfCanceled(cancellationSignal);
+        EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count));

        if (predicate == null || predicate.test(cursor)) {
          StringBuilder                     statement        = new StringBuilder(template);
@@ -275,12 +238,9 @@ public class FullBackupExporter extends FullBackupBase {

          statement.append(')');

-          EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count));
          outputStream.write(statementBuilder.setStatement(statement.toString()).build());

-          if (postProcess != null) {
-            count = postProcess.postProcess(cursor, count);
-          }
+          if (postProcess != null) postProcess.accept(cursor);
        }
      }
    }
@@ -288,7 +248,7 @@ public class FullBackupExporter extends FullBackupBase {
    return count;
  }

-  private static int exportAttachment(@NonNull AttachmentSecret attachmentSecret, @NonNull Cursor cursor, @NonNull BackupFrameOutputStream outputStream, int count) {
+  private static void exportAttachment(@NonNull AttachmentSecret attachmentSecret, @NonNull Cursor cursor, @NonNull BackupFrameOutputStream outputStream) {
    try {
      long rowId    = cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.ROW_ID));
      long uniqueId = cursor.getLong(cursor.getColumnIndexOrThrow(AttachmentDatabase.UNIQUE_ID));
@@ -313,17 +273,14 @@ 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));
        outputStream.write(new AttachmentId(rowId, uniqueId), inputStream, size);
      }
    } catch (IOException e) {
      Log.w(TAG, e);
    }
-
-    return count;
  }

-  private static int exportSticker(@NonNull AttachmentSecret attachmentSecret, @NonNull Cursor cursor, @NonNull BackupFrameOutputStream outputStream, int count) {
+  private static void exportSticker(@NonNull AttachmentSecret attachmentSecret, @NonNull Cursor cursor, @NonNull BackupFrameOutputStream outputStream) {
    try {
      long rowId    = cursor.getLong(cursor.getColumnIndexOrThrow(StickerDatabase._ID));
      long size     = cursor.getLong(cursor.getColumnIndexOrThrow(StickerDatabase.FILE_LENGTH));
@@ -332,15 +289,12 @@ 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));
        InputStream inputStream = ModernDecryptingPartInputStream.createFor(attachmentSecret, random, new File(data), 0);
        outputStream.writeSticker(rowId, inputStream, size);
      }
    } catch (IOException e) {
      Log.w(TAG, e);
    }
-
-    return count;
  }

  private static long calculateVeryOldStreamLength(@NonNull AttachmentSecret attachmentSecret, @Nullable byte[] random, @NonNull String data) throws IOException {
@@ -360,46 +314,6 @@ public class FullBackupExporter extends FullBackupBase {
    return result;
  }

-  private static int exportKeyValues(@NonNull BackupFrameOutputStream outputStream,
-                                     @NonNull List<String> keysToIncludeInBackup,
-                                     int count,
-                                     BackupCancellationSignal cancellationSignal) throws IOException
-  {
-    KeyValueDataSet dataSet = KeyValueDatabase.getInstance(ApplicationDependencies.getApplication())
-                                              .getDataSet();
-
-    for (String key : keysToIncludeInBackup) {
-      throwIfCanceled(cancellationSignal);
-      if (!dataSet.containsKey(key)) {
-        continue;
-      }
-      BackupProtos.KeyValue.Builder builder = BackupProtos.KeyValue.newBuilder()
-                                                                   .setKey(key);
-
-      Class<?> type = dataSet.getType(key);
-      if (type == byte[].class) {
-        builder.setBlobValue(ByteString.copyFrom(dataSet.getBlob(key, null)));
-      } else if (type == Boolean.class) {
-        builder.setBooleanValue(dataSet.getBoolean(key, false));
-      } else if (type == Float.class) {
-        builder.setFloatValue(dataSet.getFloat(key, 0));
-      } else if (type == Integer.class) {
-        builder.setIntegerValue(dataSet.getInteger(key, 0));
-      } else if (type == Long.class) {
-        builder.setLongValue(dataSet.getLong(key, 0));
-      } else if (type == String.class) {
-        builder.setStringValue(dataSet.getString(key, null));
-      } else {
-        throw new AssertionError("Unknown type: " + type);
-      }
-
-      EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, ++count));
-      outputStream.write(builder.build());
-    }
-
-    return count;
-  }
-
  private static boolean isNonExpiringMmsMessage(@NonNull Cursor cursor) {
    return cursor.getInt(cursor.getColumnIndexOrThrow(MmsSmsColumns.EXPIRES_IN)) <= 0 &&
           cursor.getInt(cursor.getColumnIndexOrThrow(MmsDatabase.VIEW_ONCE))    <= 0;
@@ -471,10 +385,6 @@ public class FullBackupExporter extends FullBackupBase {
      write(outputStream, BackupProtos.BackupFrame.newBuilder().setPreference(preference).build());
    }

-    public void write(BackupProtos.KeyValue keyValue) throws IOException {
-      write(outputStream, BackupProtos.BackupFrame.newBuilder().setKeyValue(keyValue).build());
-    }
-
    public void write(BackupProtos.SqlStatement statement) throws IOException {
      write(outputStream, BackupProtos.BackupFrame.newBuilder().setStatement(statement).build());
    }
@@ -589,14 +499,4 @@ public class FullBackupExporter extends FullBackupBase {
      outputStream.close();
    }
  }
-
-  public interface PostProcessor {
-    int postProcess(@NonNull Cursor cursor, int count);
-  }
-
-  public interface BackupCancellationSignal {
-    boolean isCanceled();
-  }
-
-  public static final class BackupCanceledException extends IOException { }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.java
@@ -26,12 +26,8 @@ import org.thoughtcrime.securesms.backup.BackupProtos.Sticker;
 import org.thoughtcrime.securesms.crypto.AttachmentSecret;
 import org.thoughtcrime.securesms.crypto.ModernEncryptingPartOutputStream;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
-import org.thoughtcrime.securesms.database.EmojiSearchDatabase;
-import org.thoughtcrime.securesms.database.KeyValueDatabase;
 import org.thoughtcrime.securesms.database.SearchDatabase;
 import org.thoughtcrime.securesms.database.StickerDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.keyvalue.KeyValueDataSet;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.BackupUtil;
@@ -49,8 +45,6 @@ import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
@@ -66,37 +60,25 @@ import javax.crypto.spec.SecretKeySpec;
 public class FullBackupImporter extends FullBackupBase {

  @SuppressWarnings("unused")
-  private static final String TAG = Log.tag(FullBackupImporter.class);
+  private static final String TAG = FullBackupImporter.class.getSimpleName();

  public static void importFile(@NonNull Context context, @NonNull AttachmentSecret attachmentSecret,
                                @NonNull SQLiteDatabase db, @NonNull Uri uri, @NonNull String passphrase)
      throws IOException
-  {
-    try (InputStream is = getInputStream(context, uri)) {
-      importFile(context, attachmentSecret, db, is, passphrase);
-    }
-  }
-
-  public static void importFile(@NonNull Context context, @NonNull AttachmentSecret attachmentSecret,
-                                @NonNull SQLiteDatabase db, @NonNull InputStream is, @NonNull String passphrase)
-      throws IOException
  {
    int count = 0;

-    SQLiteDatabase keyValueDatabase = KeyValueDatabase.getInstance(ApplicationDependencies.getApplication()).getSqlCipherDatabase();
-    try {
+    try (InputStream is = getInputStream(context, uri)) {
      BackupRecordInputStream inputStream = new BackupRecordInputStream(is, passphrase);

      db.beginTransaction();
-      keyValueDatabase.beginTransaction();

      dropAllTables(db);

      BackupFrame frame;

      while (!(frame = inputStream.readFrame()).getEnd()) {
-        if (count % 100 == 0) EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, count));
-        count++;
+        if (count++ % 100 == 0) EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, count));

        if      (frame.hasVersion())    processVersion(db, frame.getVersion());
        else if (frame.hasStatement())  processStatement(db, frame.getStatement());
@@ -104,22 +86,18 @@ public class FullBackupImporter extends FullBackupBase {
        else if (frame.hasAttachment()) processAttachment(context, attachmentSecret, db, frame.getAttachment(), inputStream);
        else if (frame.hasSticker())    processSticker(context, attachmentSecret, db, frame.getSticker(), inputStream);
        else if (frame.hasAvatar())     processAvatar(context, db, frame.getAvatar(), inputStream);
-        else if (frame.hasKeyValue())   processKeyValue(frame.getKeyValue());
-        else                            count--;
      }

      db.setTransactionSuccessful();
-      keyValueDatabase.setTransactionSuccessful();
    } finally {
      db.endTransaction();
-      keyValueDatabase.endTransaction();
    }

    EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.FINISHED, count));
  }

  private static @NonNull InputStream getInputStream(@NonNull Context context, @NonNull Uri uri) throws IOException{
-    if (BackupUtil.isUserSelectionRequired(context) || uri.getScheme().equals("content")) {
+    if (BackupUtil.isUserSelectionRequired(context)) {
      return Objects.requireNonNull(context.getContentResolver().openInputStream(uri));
    } else {
      return new FileInputStream(new File(Objects.requireNonNull(uri.getPath())));
@@ -137,7 +115,6 @@ public class FullBackupImporter extends FullBackupBase {
  private static void processStatement(@NonNull SQLiteDatabase db, SqlStatement statement) {
    boolean isForSmsFtsSecretTable = statement.getStatement().contains(SearchDatabase.SMS_FTS_TABLE_NAME + "_");
    boolean isForMmsFtsSecretTable = statement.getStatement().contains(SearchDatabase.MMS_FTS_TABLE_NAME + "_");
-    boolean isForEmojiSecretTable  = statement.getStatement().contains(EmojiSearchDatabase.TABLE_NAME);
    boolean isForSqliteSecretTable = statement.getStatement().toLowerCase().startsWith("create table sqlite_");

    if (isForSmsFtsSecretTable || isForMmsFtsSecretTable || isForSqliteSecretTable) {
@@ -224,40 +201,10 @@ public class FullBackupImporter extends FullBackupBase {
    }
  }

-  private static void processKeyValue(BackupProtos.KeyValue keyValue) {
-    KeyValueDataSet dataSet = new KeyValueDataSet();
-
-    if (keyValue.hasBlobValue()) {
-      dataSet.putBlob(keyValue.getKey(), keyValue.getBlobValue().toByteArray());
-    } else if (keyValue.hasBooleanValue()) {
-      dataSet.putBoolean(keyValue.getKey(), keyValue.getBooleanValue());
-    } else if (keyValue.hasFloatValue()) {
-      dataSet.putFloat(keyValue.getKey(), keyValue.getFloatValue());
-    } else if (keyValue.hasIntegerValue()) {
-      dataSet.putInteger(keyValue.getKey(), keyValue.getIntegerValue());
-    } else if (keyValue.hasLongValue()) {
-      dataSet.putLong(keyValue.getKey(), keyValue.getLongValue());
-    } else if (keyValue.hasStringValue()) {
-      dataSet.putString(keyValue.getKey(), keyValue.getStringValue());
-    } else {
-      Log.i(TAG, "Unknown KeyValue backup value, skipping");
-      return;
-    }
-
-    KeyValueDatabase.getInstance(ApplicationDependencies.getApplication()).writeDataSet(dataSet, Collections.emptyList());
-  }
-
  @SuppressLint("ApplySharedPref")
  private static void processPreference(@NonNull Context context, SharedPreference preference) {
    SharedPreferences preferences = context.getSharedPreferences(preference.getFile(), 0);
-
-    if (preference.hasValue()) {
-      preferences.edit().putString(preference.getKey(), preference.getValue()).commit();
-    } else if (preference.hasBooleanValue()) {
-      preferences.edit().putBoolean(preference.getKey(), preference.getBooleanValue()).commit();
-    } else if (preference.hasIsStringSetValue() && preference.getIsStringSetValue()) {
-      preferences.edit().putStringSet(preference.getKey(), new HashSet<>(preference.getStringSetValueList())).commit();
-    }
+    preferences.edit().putString(preference.getKey(), preference.getValue()).commit();
  }

  private static void dropAllTables(@NonNull SQLiteDatabase db) {
--- a/app/src/main/java/org/thoughtcrime/securesms/blocked/BlockedUsersActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/blocked/BlockedUsersActivity.java
@@ -124,6 +124,8 @@ public class BlockedUsersActivity extends PassphraseRequiredActivity implements
    ContactSelectionListFragment fragment = new ContactSelectionListFragment();
    Intent                       intent   = getIntent();

+    fragment.setOnContactSelectedListener(this);
+
    intent.putExtra(ContactSelectionListFragment.REFRESHABLE, false);
    intent.putExtra(ContactSelectionListFragment.SELECTION_LIMITS, 1);
    intent.putExtra(ContactSelectionListFragment.HIDE_COUNT, true);
--- a/app/src/main/java/org/thoughtcrime/securesms/color/MaterialColor.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/color/MaterialColor.java
@@ -91,14 +91,14 @@ public enum MaterialColor {
  }

  public @ColorRes int toQuoteBarColorResource(@NonNull Context context, boolean outgoing) {
-    if (!outgoing) {
+    if (outgoing) {
      return isDarkTheme(context) ? tintColor : shadeColor ;
    }
    return R.color.core_white;
  }

  public @ColorInt int toQuoteBackgroundColor(@NonNull Context context, boolean outgoing) {
-    if (!outgoing) {
+    if (outgoing) {
      int color = toConversationColor(context);
      int alpha = isDarkTheme(context) ? (int) (0.2 * 255) : (int) (0.4 * 255);
      return Color.argb(alpha, Color.red(color), Color.green(color), Color.blue(color));
@@ -108,7 +108,7 @@ public enum MaterialColor {
  }

  public @ColorInt int toQuoteFooterColor(@NonNull Context context, boolean outgoing) {
-    if (!outgoing) {
+    if (outgoing) {
      int color = toConversationColor(context);
      int alpha = isDarkTheme(context) ? (int) (0.4 * 255) : (int) (0.6 * 255);
      return Color.argb(alpha, Color.red(color), Color.green(color), Color.blue(color));
--- a/app/src/main/java/org/thoughtcrime/securesms/components/AlertView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/AlertView.java
@@ -9,12 +9,11 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;

-import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;

 public class AlertView extends LinearLayout {

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

  private ImageView approvalIndicator;
  private ImageView failedIndicator;
@@ -69,10 +68,4 @@ public class AlertView extends LinearLayout {
    approvalIndicator.setVisibility(View.GONE);
    failedIndicator.setVisibility(View.VISIBLE);
  }
-
-  public void setRateLimited() {
-    this.setVisibility(View.VISIBLE);
-    approvalIndicator.setVisibility(View.VISIBLE);
-    failedIndicator.setVisibility(View.GONE);
-  }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/components/AudioView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/AudioView.java
@@ -29,7 +29,6 @@ import com.pnikosis.materialishprogress.ProgressWheel;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
-import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.audio.AudioWaveForm;
 import org.thoughtcrime.securesms.components.voice.VoiceNotePlaybackState;
@@ -43,7 +42,7 @@ import java.util.concurrent.TimeUnit;

 public final class AudioView extends FrameLayout {

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

  private static final int FORWARDS =  1;
  private static final int REVERSE  = -1;
--- a/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
@@ -2,33 +2,25 @@ package org.thoughtcrime.securesms.components;

 import android.content.Context;
 import android.content.res.TypedArray;
-import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;

-import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.fragment.app.FragmentActivity;

-import com.bumptech.glide.load.MultiTransformation;
-import com.bumptech.glide.load.Transformation;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.bumptech.glide.load.resource.bitmap.CircleCrop;
-import com.bumptech.glide.load.resource.bitmap.DownsampleStrategy;

-import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.color.MaterialColor;
+import org.thoughtcrime.securesms.contacts.avatars.ContactColors;
 import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
-import org.thoughtcrime.securesms.conversation.colors.AvatarColor;
-import org.thoughtcrime.securesms.conversation.colors.ChatColors;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.groups.ui.managegroup.ManageGroupActivity;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.GlideRequests;
@@ -36,12 +28,9 @@ import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.ui.bottomsheet.RecipientBottomSheetDialogFragment;
 import org.thoughtcrime.securesms.recipients.ui.managerecipient.ManageRecipientActivity;
 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 java.util.ArrayList;
-import java.util.List;
 import java.util.Objects;

 public final class AvatarImageView extends AppCompatImageView {
@@ -50,7 +39,7 @@ public final class AvatarImageView extends AppCompatImageView {
  private static final int SIZE_SMALL = 2;

  @SuppressWarnings("unused")
-  private static final String TAG = Log.tag(AvatarImageView.class);
+  private static final String TAG = AvatarImageView.class.getSimpleName();

  private static final Paint LIGHT_THEME_OUTLINE_PAINT = new Paint();
  private static final Paint DARK_THEME_OUTLINE_PAINT  = new Paint();
@@ -72,8 +61,6 @@ public final class AvatarImageView extends AppCompatImageView {
  private Paint                           outlinePaint;
  private OnClickListener                 listener;
  private Recipient.FallbackPhotoProvider fallbackPhotoProvider;
-  private boolean                         blurred;
-  private ChatColors                      chatColors;

  private @Nullable RecipientContactPhoto recipientContactPhoto;
  private @NonNull  Drawable              unknownRecipientDrawable;
@@ -98,20 +85,18 @@ public final class AvatarImageView extends AppCompatImageView {
      typedArray.recycle();
    }

-    outlinePaint = ThemeUtil.isDarkTheme(context) ? DARK_THEME_OUTLINE_PAINT : LIGHT_THEME_OUTLINE_PAINT;
+    outlinePaint = ThemeUtil.isDarkTheme(getContext()) ? DARK_THEME_OUTLINE_PAINT : LIGHT_THEME_OUTLINE_PAINT;

-    unknownRecipientDrawable = new ResourceContactPhoto(R.drawable.ic_profile_outline_40, R.drawable.ic_profile_outline_20).asDrawable(context, AvatarColor.UNKNOWN.colorInt(), inverted);
-    blurred                  = false;
-    chatColors               = null;
+    unknownRecipientDrawable = new ResourceContactPhoto(R.drawable.ic_profile_outline_40, R.drawable.ic_profile_outline_20).asDrawable(getContext(), ContactColors.UNKNOWN_COLOR.toConversationColor(getContext()), inverted);
  }

  @Override
  protected void onDraw(Canvas canvas) {
    super.onDraw(canvas);

-    float width  = getWidth() - getPaddingRight() - getPaddingLeft();
+    float width  = getWidth()  - getPaddingRight()  - getPaddingLeft();
    float height = getHeight() - getPaddingBottom() - getPaddingTop();
-    float cx     = width / 2f;
+    float cx     = width  / 2f;
    float cy     = height / 2f;
    float radius = Math.min(cx, cy) - (outlinePaint.getStrokeWidth() / 2f);

@@ -133,18 +118,11 @@ public final class AvatarImageView extends AppCompatImageView {
   * Shows self as the actual profile picture.
   */
  public void setRecipient(@NonNull Recipient recipient) {
-    setRecipient(recipient, false);
-  }
-
-  /**
-   * Shows self as the actual profile picture.
-   */
-  public void setRecipient(@NonNull Recipient recipient, boolean quickContactEnabled) {
    if (recipient.isSelf()) {
-      setAvatar(GlideApp.with(this), null, quickContactEnabled);
+      setAvatar(GlideApp.with(this), null, false);
      AvatarUtil.loadIconIntoImageView(recipient, this);
    } else {
-      setAvatar(GlideApp.with(this), recipient, quickContactEnabled);
+      setAvatar(GlideApp.with(this), recipient, false);
    }
  }

@@ -173,32 +151,20 @@ public final class AvatarImageView extends AppCompatImageView {
                                                                                                                                     Recipient.self().getProfileAvatar()))
                                                                                 : new RecipientContactPhoto(recipient);

-      boolean    shouldBlur = recipient.shouldBlurAvatar();
-      ChatColors chatColors = recipient.getChatColors();
-
-      if (!photo.equals(recipientContactPhoto) || shouldBlur != blurred || !Objects.equals(chatColors, this.chatColors)) {
+      if (!photo.equals(recipientContactPhoto)) {
        requestManager.clear(this);
-        this.chatColors       = chatColors;
        recipientContactPhoto = photo;

-        Drawable fallbackContactPhotoDrawable = size == SIZE_SMALL ? photo.recipient.getSmallFallbackContactPhotoDrawable(getContext(), inverted, fallbackPhotoProvider)
-                                                                   : photo.recipient.getFallbackContactPhotoDrawable(getContext(), inverted, fallbackPhotoProvider);
+        Drawable fallbackContactPhotoDrawable = size == SIZE_SMALL
+            ? photo.recipient.getSmallFallbackContactPhotoDrawable(getContext(), inverted, fallbackPhotoProvider)
+            : photo.recipient.getFallbackContactPhotoDrawable(getContext(), inverted, fallbackPhotoProvider);

        if (photo.contactPhoto != null) {
-
-          List<Transformation<Bitmap>> transforms = new ArrayList<>();
-          if (shouldBlur) {
-            transforms.add(new BlurTransformation(ApplicationDependencies.getApplication(), 0.25f, BlurTransformation.MAX_RADIUS));
-          }
-          transforms.add(new CircleCrop());
-          blurred = shouldBlur;
-
          requestManager.load(photo.contactPhoto)
                        .fallback(fallbackContactPhotoDrawable)
                        .error(fallbackContactPhotoDrawable)
                        .diskCacheStrategy(DiskCacheStrategy.ALL)
-                        .downsample(DownsampleStrategy.CENTER_INSIDE)
-                        .transform(new MultiTransformation<>(transforms))
+                        .circleCrop()
                        .into(this);
        } else {
          setImageDrawable(fallbackContactPhotoDrawable);
@@ -211,12 +177,12 @@ public final class AvatarImageView extends AppCompatImageView {
      requestManager.clear(this);
      if (fallbackPhotoProvider != null) {
        setImageDrawable(fallbackPhotoProvider.getPhotoForRecipientWithoutName()
-                                              .asDrawable(getContext(), AvatarColor.UNKNOWN.colorInt(), inverted));
+                                              .asDrawable(getContext(), MaterialColor.STEEL.toAvatarColor(getContext()), inverted));
      } else {
        setImageDrawable(unknownRecipientDrawable);
      }

-      disableQuickContact();
+      super.setOnClickListener(listener);
    }
  }

@@ -238,17 +204,18 @@ public final class AvatarImageView extends AppCompatImageView {
        }
      });
    } else {
-      disableQuickContact();
+      super.setOnClickListener(listener);
+      setClickable(listener != null);
    }
  }

  public void setImageBytesForGroup(@Nullable byte[] avatarBytes,
                                    @Nullable Recipient.FallbackPhotoProvider fallbackPhotoProvider,
-                                    @NonNull AvatarColor color)
+                                    @NonNull MaterialColor color)
  {
    Drawable fallback = Util.firstNonNull(fallbackPhotoProvider, Recipient.DEFAULT_FALLBACK_PHOTO_PROVIDER)
                            .getPhotoForGroup()
-                            .asDrawable(getContext(), color.colorInt());
+                            .asDrawable(getContext(), color.toAvatarColor(getContext()));

    GlideApp.with(this)
            .load(avatarBytes)
@@ -259,16 +226,6 @@ public final class AvatarImageView extends AppCompatImageView {
            .into(this);
  }

-  public void setNonAvatarImageResource(@DrawableRes int imageResource) {
-    recipientContactPhoto = null;
-    setImageResource(imageResource);
-  }
-
-  public void disableQuickContact() {
-    super.setOnClickListener(listener);
-    setClickable(listener != null);
-  }
-
  private static class RecipientContactPhoto {

    private final @NonNull  Recipient    recipient;
@@ -289,7 +246,7 @@ public final class AvatarImageView extends AppCompatImageView {
      if (other == null) return false;

      return other.recipient.equals(recipient) &&
-             other.recipient.getChatColors().equals(recipient.getChatColors()) &&
+             other.recipient.getColor().equals(recipient.getColor()) &&
             other.ready == ready &&
             Objects.equals(other.contactPhoto, contactPhoto);
    }
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java
@@ -35,13 +35,11 @@ import org.thoughtcrime.securesms.components.mention.MentionDeleter;
 import org.thoughtcrime.securesms.components.mention.MentionRendererDelegate;
 import org.thoughtcrime.securesms.components.mention.MentionValidatorWatcher;
 import org.thoughtcrime.securesms.database.model.Mention;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.StringUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;

 import java.util.List;
-import java.util.Objects;

 import static org.thoughtcrime.securesms.database.MentionUtil.MENTION_STARTER;

@@ -83,18 +81,17 @@ public class ComposeText extends EmojiEditText {
  }

  @Override
-  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-    super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+  protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+    super.onLayout(changed, left, top, right, bottom);

-    if (getLayout() != null && !TextUtils.isEmpty(hint)) {
+    if (!TextUtils.isEmpty(hint)) {
      if (!TextUtils.isEmpty(subHint)) {
-        setHintWithChecks(new SpannableStringBuilder().append(ellipsizeToWidth(hint))
-                                                      .append("\n")
-                                                      .append(ellipsizeToWidth(subHint)));
+        setHint(new SpannableStringBuilder().append(ellipsizeToWidth(hint))
+                                            .append("\n")
+                                            .append(ellipsizeToWidth(subHint)));
      } else {
-        setHintWithChecks(ellipsizeToWidth(hint));
+        setHint(ellipsizeToWidth(hint));
      }
-      super.onMeasure(widthMeasureSpec, heightMeasureSpec);
    }
  }

@@ -162,14 +159,14 @@ public class ComposeText extends EmojiEditText {
    }

    if (this.subHint != null) {
-      setHintWithChecks(new SpannableStringBuilder().append(ellipsizeToWidth(this.hint))
-                                                    .append("\n")
-                                                    .append(ellipsizeToWidth(this.subHint)));
+      super.setHint(new SpannableStringBuilder().append(ellipsizeToWidth(this.hint))
+                                                .append("\n")
+                                                .append(ellipsizeToWidth(this.subHint)));
    } else {
-      setHintWithChecks(ellipsizeToWidth(this.hint));
+      super.setHint(ellipsizeToWidth(this.hint));
    }

-    setHintWithChecks(hint);
+    super.setHint(hint);
  }

  public void appendInvite(String invite) {
@@ -202,7 +199,7 @@ public class ComposeText extends EmojiEditText {
  }

  public void setTransport(TransportOption transport) {
-    final boolean useSystemEmoji = SignalStore.settings().isPreferSystemEmoji();
+    final boolean useSystemEmoji = TextSecurePreferences.isSystemEmojiPreferred(getContext());

    int imeOptions = (getImeOptions() & ~EditorInfo.IME_MASK_ACTION) | EditorInfo.IME_ACTION_SEND;
    int inputType  = getInputType();
@@ -226,7 +223,7 @@ public class ComposeText extends EmojiEditText {
  public InputConnection onCreateInputConnection(EditorInfo editorInfo) {
    InputConnection inputConnection = super.onCreateInputConnection(editorInfo);

-    if(SignalStore.settings().isEnterKeySends()) {
+    if(TextSecurePreferences.isEnterSendsEnabled(getContext())) {
      editorInfo.imeOptions &= ~EditorInfo.IME_FLAG_NO_ENTER_ACTION;
    }

@@ -266,14 +263,6 @@ public class ComposeText extends EmojiEditText {
    addTextChangedListener(mentionValidatorWatcher);
  }

-  private void setHintWithChecks(@Nullable CharSequence newHint) {
-    if (getLayout() == null || Objects.equals(getHint(), newHint)) {
-      return;
-    }
-
-    setHint(newHint);
-  }
-
  private boolean changeSelectionForPartialMentions(@NonNull Spanned spanned, int selectionStart, int selectionEnd) {
    Annotation[] annotations = spanned.getSpans(0, spanned.length(), Annotation.class);
    for (Annotation annotation : annotations) {
@@ -375,7 +364,7 @@ public class ComposeText extends EmojiEditText {

  private static class CommitContentListener implements InputConnectionCompat.OnCommitContentListener {

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

    private final InputPanel.MediaListener mediaListener;

--- a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
@@ -6,13 +6,13 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
+import android.os.AsyncTask;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;

-import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

@@ -20,18 +20,15 @@ import com.airbnb.lottie.LottieAnimationView;
 import com.airbnb.lottie.LottieProperty;
 import com.airbnb.lottie.model.KeyPath;

-import org.signal.core.util.concurrent.SignalExecutors;
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.service.ExpiringMessageManager;
 import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.FeatureFlags;
-import org.thoughtcrime.securesms.util.Projection;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.dualsim.SubscriptionInfoCompat;
 import org.thoughtcrime.securesms.util.dualsim.SubscriptionManagerCompat;
@@ -100,7 +97,7 @@ public class ConversationItemFooter extends LinearLayout {
    presentTimer(messageRecord);
    presentInsecureIndicator(messageRecord);
    presentDeliveryStatus(messageRecord);
-    presentAudioDuration(messageRecord);
+    hideAudioDurationViews();
  }

  public void setAudioDuration(long totalDurationMillis, long currentPostionMillis) {
@@ -133,28 +130,6 @@ public class ConversationItemFooter extends LinearLayout {
    presentDeliveryStatus(messageRecord);
  }

-  public void enableBubbleBackground(@DrawableRes int drawableRes, @Nullable Integer tint) {
-    setBackgroundResource(drawableRes);
-
-    if (tint != null) {
-      getBackground().setColorFilter(tint, PorterDuff.Mode.MULTIPLY);
-    } else {
-      getBackground().clearColorFilter();
-    }
-  }
-
-  public void disableBubbleBackground() {
-    setBackground(null);
-  }
-
-  public @Nullable Projection getProjection() {
-    if (getVisibility() == VISIBLE) {
-      return Projection.relativeToViewRoot(this, new Projection.Corners(ViewUtil.dpToPx(11)));
-    } else {
-      return null;
-    }
-  }
-
  private void presentDate(@NonNull MessageRecord messageRecord, @NonNull Locale locale) {
    dateView.forceLayout();
    if (messageRecord.isFailed()) {
@@ -170,8 +145,6 @@ public class ConversationItemFooter extends LinearLayout {
      dateView.setText(errorMsg);
    } else if (messageRecord.isPendingInsecureSmsFallback()) {
      dateView.setText(R.string.ConversationItem_click_to_approve_unencrypted);
-    } else if (messageRecord.isRateLimited()) {
-      dateView.setText(R.string.ConversationItem_send_paused);
    } else {
      dateView.setText(DateUtils.getExtendedRelativeTimeSpanString(getContext(), locale, messageRecord.getTimestamp()));
    }
@@ -209,19 +182,23 @@ public class ConversationItemFooter extends LinearLayout {
        this.timerView.startAnimation();

        if (messageRecord.getExpireStarted() + messageRecord.getExpiresIn() <= System.currentTimeMillis()) {
-          ApplicationDependencies.getExpiringMessageManager().checkSchedule();
+          ApplicationContext.getInstance(getContext()).getExpiringMessageManager().checkSchedule();
        }
      } else if (!messageRecord.isOutgoing() && !messageRecord.isMediaPending()) {
-        SignalExecutors.BOUNDED.execute(() -> {
-          ExpiringMessageManager expirationManager = ApplicationDependencies.getExpiringMessageManager();
-          long                   id                = messageRecord.getId();
-          boolean                mms               = messageRecord.isMms();
+        new AsyncTask<Void, Void, Void>() {
+          @Override
+          protected Void doInBackground(Void... params) {
+            ExpiringMessageManager expirationManager = ApplicationContext.getInstance(getContext()).getExpiringMessageManager();
+            long                   id                = messageRecord.getId();
+            boolean                mms               = messageRecord.isMms();

-          if (mms) DatabaseFactory.getMmsDatabase(getContext()).markExpireStarted(id);
-          else     DatabaseFactory.getSmsDatabase(getContext()).markExpireStarted(id);
+            if (mms) DatabaseFactory.getMmsDatabase(getContext()).markExpireStarted(id);
+            else     DatabaseFactory.getSmsDatabase(getContext()).markExpireStarted(id);

-          expirationManager.scheduleDeletion(id, mms, messageRecord.getExpiresIn());
-        });
+            expirationManager.scheduleDeletion(id, mms, messageRecord.getExpiresIn());
+            return null;
+          }
+        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
      }
    } else {
      this.timerView.setVisibility(View.GONE);
@@ -270,12 +247,6 @@ public class ConversationItemFooter extends LinearLayout {
          moveAudioViewsForIncoming();
        }
        showAudioDurationViews();
-
-        if (messageRecord.getViewedReceiptCount() > 0) {
-          revealDot.setProgress(1f);
-        } else {
-          revealDot.setProgress(0f);
-        }
      } else {
        hideAudioDurationViews();
      }
@@ -293,8 +264,8 @@ public class ConversationItemFooter extends LinearLayout {
    addView(audioDuration, 0);

    int padStart = ViewUtil.dpToPx(60);
-    int padLeft  = ViewUtil.isLtr(this) ? padStart : 0;
-    int padRight = ViewUtil.isRtl(this) ? padStart : 0;
+    int padLeft  = getLayoutDirection() == LAYOUT_DIRECTION_LTR ? padStart : 0;
+    int padRight = getLayoutDirection() == LAYOUT_DIRECTION_RTL ? padStart : 0;

    audioDuration.setPadding(padLeft, 0, padRight, 0);
  }
@@ -312,7 +283,7 @@ public class ConversationItemFooter extends LinearLayout {

  private void showAudioDurationViews() {
    audioSpace.setVisibility(View.VISIBLE);
-    audioDuration.setVisibility(View.GONE);
+    audioDuration.setVisibility(View.VISIBLE);

    if (FeatureFlags.viewedReceipts()) {
      revealDot.setVisibility(View.VISIBLE);
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java
@@ -19,8 +19,6 @@ import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.mms.SlideClickListener;
 import org.thoughtcrime.securesms.mms.SlidesClickedListener;
-import org.thoughtcrime.securesms.util.Projection;
-import org.thoughtcrime.securesms.util.ViewUtil;

 import java.util.List;

@@ -34,9 +32,6 @@ public class ConversationItemThumbnail extends FrameLayout {
  private Outliner               outliner;
  private Outliner               pulseOutliner;
  private boolean                borderless;
-  private int[]                  normalBounds;
-  private int[]                  gifBounds;
-  private int                    minimumThumbnailWidth;

  public ConversationItemThumbnail(Context context) {
    super(context);
@@ -65,30 +60,14 @@ public class ConversationItemThumbnail extends FrameLayout {

    outliner.setColor(ContextCompat.getColor(getContext(), R.color.signal_inverse_transparent_20));

-    int gifWidth = ViewUtil.dpToPx(260);
    if (attrs != null) {
      TypedArray typedArray = getContext().getTheme().obtainStyledAttributes(attrs, R.styleable.ConversationItemThumbnail, 0, 0);
-      normalBounds = new int[]{
-          typedArray.getDimensionPixelSize(R.styleable.ConversationItemThumbnail_conversationThumbnail_minWidth, 0),
-          typedArray.getDimensionPixelSize(R.styleable.ConversationItemThumbnail_conversationThumbnail_maxWidth, 0),
-          typedArray.getDimensionPixelSize(R.styleable.ConversationItemThumbnail_conversationThumbnail_minHeight, 0),
-          typedArray.getDimensionPixelSize(R.styleable.ConversationItemThumbnail_conversationThumbnail_maxHeight, 0)
-      };
-
-      gifWidth = typedArray.getDimensionPixelSize(R.styleable.ConversationItemThumbnail_conversationThumbnail_gifWidth, gifWidth);
+      thumbnail.setBounds(typedArray.getDimensionPixelSize(R.styleable.ConversationItemThumbnail_conversationThumbnail_minWidth, 0),
+                          typedArray.getDimensionPixelSize(R.styleable.ConversationItemThumbnail_conversationThumbnail_maxWidth, 0),
+                          typedArray.getDimensionPixelSize(R.styleable.ConversationItemThumbnail_conversationThumbnail_minHeight, 0),
+                          typedArray.getDimensionPixelSize(R.styleable.ConversationItemThumbnail_conversationThumbnail_maxHeight, 0));
      typedArray.recycle();
-    } else {
-      normalBounds = new int[]{0, 0, 0, 0};
    }
-
-    gifBounds = new int[]{
-        gifWidth,
-        gifWidth,
-        1,
-        Integer.MAX_VALUE
-    };
-
-    minimumThumbnailWidth = -1;
  }

  @SuppressWarnings("SuspiciousNameCombination")
@@ -109,18 +88,6 @@ public class ConversationItemThumbnail extends FrameLayout {
    }
  }

-  public void hideThumbnailView() {
-    thumbnail.setAlpha(0f);
-  }
-
-  public void showThumbnailView() {
-    thumbnail.setAlpha(1f);
-  }
-
-  public @NonNull Projection.Corners getCorners() {
-    return new Projection.Corners(cornerMask.getRadii());
-  }
-
  public void setPulseOutliner(@NonNull Outliner outliner) {
    this.pulseOutliner = outliner;
  }
@@ -154,7 +121,6 @@ public class ConversationItemThumbnail extends FrameLayout {
  }

  public void setMinimumThumbnailWidth(int width) {
-    minimumThumbnailWidth = width;
    thumbnail.setMinimumThumbnailWidth(width);
  }

@@ -171,17 +137,6 @@ public class ConversationItemThumbnail extends FrameLayout {
                               boolean showControls, boolean isPreview)
  {
    if (slides.size() == 1) {
-      Slide slide = slides.get(0);
-      if (slide.isVideoGif()) {
-        setThumbnailBounds(gifBounds);
-      } else {
-        setThumbnailBounds(normalBounds);
-
-        if (minimumThumbnailWidth != -1) {
-          thumbnail.setMinimumThumbnailWidth(minimumThumbnailWidth);
-        }
-      }
-
      thumbnail.setVisibility(VISIBLE);
      album.setVisibility(GONE);

@@ -212,8 +167,4 @@ public class ConversationItemThumbnail extends FrameLayout {
    thumbnail.setDownloadClickListener(listener);
    album.setDownloadClickListener(listener);
  }
-
-  private void setThumbnailBounds(@NonNull int[] bounds) {
-    thumbnail.setBounds(bounds[0], bounds[1], bounds[2], bounds[3]);
-  }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationTypingView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationTypingView.java
@@ -1,15 +1,13 @@
 package org.thoughtcrime.securesms.components;

 import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.LayerDrawable;
+import android.graphics.PorterDuff;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.LinearLayout;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;

 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.mms.GlideRequests;
@@ -36,27 +34,22 @@ public class ConversationTypingView extends LinearLayout {
    indicator = findViewById(R.id.typing_indicator);
  }

-  public void setTypists(@NonNull GlideRequests glideRequests, @NonNull List<Recipient> typists, boolean isGroupThread, boolean hasWallpaper) {
+  public void setTypists(@NonNull GlideRequests glideRequests, @NonNull List<Recipient> typists, boolean isGroupThread) {
    if (typists.isEmpty()) {
      indicator.stopAnimation();
      return;
    }

    Recipient typist = typists.get(0);
+    bubble.getBackground().setColorFilter(typist.getColor().toConversationColor(getContext()), PorterDuff.Mode.MULTIPLY);

    if (isGroupThread) {
-      avatar.setAvatar(glideRequests, typist, true);
+      avatar.setAvatar(glideRequests, typist, false);
      avatar.setVisibility(VISIBLE);
    } else {
      avatar.setVisibility(GONE);
    }

-    if (hasWallpaper) {
-      bubble.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.conversation_item_wallpaper_bubble_color));
-    } else {
-      bubble.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.signal_background_secondary));
-    }
-
    indicator.startAnimation();
  }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/components/CornerMask.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/CornerMask.java
@@ -7,11 +7,9 @@ import android.graphics.Path;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
 import android.graphics.RectF;
-import android.graphics.drawable.shapes.RoundRectShape;
 import android.view.View;

 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;

 public class CornerMask {

@@ -31,7 +29,10 @@ public class CornerMask {
  }

  public void mask(Canvas canvas) {
-    bounds.set(canvas.getClipBounds());
+    bounds.left   = 0;
+    bounds.top    = 0;
+    bounds.right  = canvas.getWidth();
+    bounds.bottom = canvas.getHeight();

    corners.reset();
    corners.addRoundRect(bounds, radii, Path.Direction.CW);
@@ -56,13 +57,6 @@ public class CornerMask {
    radii[6] = radii[7] = bottomLeft;
  }

-  public void setRadii(float topLeft, float topRight, float bottomRight, float bottomLeft) {
-    radii[0] = radii[1] = topLeft;
-    radii[2] = radii[3] = topRight;
-    radii[4] = radii[5] = bottomRight;
-    radii[6] = radii[7] = bottomLeft;
-  }
-
  public void setTopLeftRadius(int radius) {
    radii[0] = radii[1] = radius;
  }
@@ -78,8 +72,4 @@ public class CornerMask {
  public void setBottomLeftRadius(int radius) {
    radii[6] = radii[7] = radius;
  }
-
-  public float[] getRadii() {
-    return radii;
-  }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/components/CustomDefaultPreference.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/CustomDefaultPreference.java
@@ -31,7 +31,7 @@ import java.net.URISyntaxException;

 public class CustomDefaultPreference extends DialogPreference {

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

  private final int    inputType;
  private final String customPreference;
--- a/app/src/main/java/org/thoughtcrime/securesms/components/DeliveryStatusView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/DeliveryStatusView.java
@@ -10,12 +10,11 @@ import android.view.animation.RotateAnimation;
 import android.widget.FrameLayout;
 import android.widget.ImageView;

-import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;

 public class DeliveryStatusView extends FrameLayout {

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

  private static final RotateAnimation ROTATION_ANIMATION = new RotateAnimation(0, 360f,
                                                                                Animation.RELATIVE_TO_SELF, 0.5f,
--- a/app/src/main/java/org/thoughtcrime/securesms/components/DocumentView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/DocumentView.java
@@ -20,7 +20,6 @@ import com.pnikosis.materialishprogress.ProgressWheel;

 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
-import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.events.PartProgressEvent;
@@ -30,7 +29,7 @@ import org.thoughtcrime.securesms.util.Util;

 public class DocumentView extends FrameLayout {

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

  private final @NonNull AnimatingToggle controlToggle;
  private final @NonNull ImageView       downloadButton;
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ExpirationTimerView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ExpirationTimerView.java
@@ -6,8 +6,8 @@ import android.util.AttributeSet;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

-import org.signal.core.util.ThreadUtil;
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.util.Util;

 import java.lang.ref.WeakReference;
 import java.util.concurrent.TimeUnit;
@@ -67,7 +67,7 @@ public class ExpirationTimerView extends androidx.appcompat.widget.AppCompatImag
      else          stopped = false;
    }

-    ThreadUtil.runOnMainDelayed(new AnimationUpdateRunnable(this), calculateAnimationDelay(this.startedAt, this.expiresIn));
+    Util.runOnMainDelayed(new AnimationUpdateRunnable(this), calculateAnimationDelay(this.startedAt, this.expiresIn));
  }

  public void stopAnimation() {
@@ -116,7 +116,7 @@ public class ExpirationTimerView extends androidx.appcompat.widget.AppCompatImag
        }
      }

-      ThreadUtil.runOnMainDelayed(this, timerView.calculateAnimationDelay(timerView.startedAt, timerView.expiresIn));
+      Util.runOnMainDelayed(this, timerView.calculateAnimationDelay(timerView.startedAt, timerView.expiresIn));
    }
  }

--- a/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java
@@ -10,14 +10,13 @@ import android.util.AttributeSet;

 import androidx.annotation.Nullable;

-import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiTextView;
 import org.thoughtcrime.securesms.recipients.Recipient;

 public class FromTextView extends EmojiTextView {

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

  public FromTextView(Context context) {
    super(context);
--- a/app/src/main/java/org/thoughtcrime/securesms/components/InputAwareLayout.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/InputAwareLayout.java
@@ -26,8 +26,8 @@ public class InputAwareLayout extends KeyboardAwareLinearLayout implements OnKey
    addOnKeyboardShownListener(this);
  }

-  @Override
-  public void onKeyboardShown() {
+  @Override public void onKeyboardShown() {
+    hideAttachedInput(true);
  }

  public void show(@NonNull final EditText imeTarget, @NonNull final InputView input) {
--- a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java
@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms.components;
 import android.animation.Animator;
 import android.animation.ValueAnimator;
 import android.content.Context;
-import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.text.format.DateUtils;
 import android.util.AttributeSet;
@@ -23,11 +22,10 @@ import androidx.annotation.DimenRes;
 import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
+import androidx.core.view.ViewCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;

-import org.signal.core.util.ThreadUtil;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
@@ -35,10 +33,7 @@ import org.thoughtcrime.securesms.components.emoji.EmojiKeyboardProvider;
 import org.thoughtcrime.securesms.components.emoji.EmojiToggle;
 import org.thoughtcrime.securesms.components.emoji.MediaKeyboard;
 import org.thoughtcrime.securesms.conversation.ConversationStickerSuggestionAdapter;
-import org.thoughtcrime.securesms.conversation.colors.Colorizer;
 import org.thoughtcrime.securesms.database.model.StickerRecord;
-import org.thoughtcrime.securesms.keyboard.KeyboardPage;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.linkpreview.LinkPreview;
 import org.thoughtcrime.securesms.linkpreview.LinkPreviewRepository;
 import org.thoughtcrime.securesms.mms.GlideApp;
@@ -46,6 +41,8 @@ import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.QuoteModel;
 import org.thoughtcrime.securesms.mms.SlideDeck;
 import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.concurrent.AssertedSuccessListener;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
@@ -53,7 +50,6 @@ import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
 import org.whispersystems.libsignal.util.guava.Optional;

 import java.util.List;
-import java.util.Objects;
 import java.util.concurrent.TimeUnit;

 public class InputPanel extends LinearLayout
@@ -63,7 +59,7 @@ public class InputPanel extends LinearLayout
               ConversationStickerSuggestionAdapter.EventListener
 {

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

  private static final long QUOTE_REVEAL_DURATION_MILLIS = 150;
  private static final int  FADE_TIME                    = 150;
@@ -78,7 +74,6 @@ public class InputPanel extends LinearLayout
  private View            buttonToggle;
  private View            recordingContainer;
  private View            recordLockCancel;
-  private ViewGroup       composeContainer;

  private MicrophoneRecorderView microphoneRecorderView;
  private SlideToCancel          slideToCancel;
@@ -108,7 +103,6 @@ public class InputPanel extends LinearLayout

    View quoteDismiss = findViewById(R.id.quote_dismiss);

-    this.composeContainer       = findViewById(R.id.compose_bubble);
    this.stickerSuggestion      = findViewById(R.id.input_panel_sticker_suggestion);
    this.quoteView              = findViewById(R.id.quote_view);
    this.linkPreview            = findViewById(R.id.link_preview);
@@ -129,7 +123,7 @@ public class InputPanel extends LinearLayout

    this.recordLockCancel.setOnClickListener(v -> microphoneRecorderView.cancelAction());

-    if (SignalStore.settings().isPreferSystemEmoji()) {
+    if (TextSecurePreferences.isSystemEmojiPreferred(getContext())) {
      mediaKeyboard.setVisibility(View.GONE);
      emojiVisible = false;
    } else {
@@ -167,7 +161,7 @@ public class InputPanel extends LinearLayout
                       @NonNull CharSequence body,
                       @NonNull SlideDeck attachments)
  {
-    this.quoteView.setQuote(glideRequests, id, author, body, false, attachments, null);
+    this.quoteView.setQuote(glideRequests, id, author, body, false, attachments);

    int originalHeight = this.quoteView.getVisibility() == VISIBLE ? this.quoteView.getMeasuredHeight()
                                                                   : 0;
@@ -280,8 +274,8 @@ public class InputPanel extends LinearLayout
    mediaKeyboard.setVisibility(show ? View.VISIBLE : GONE);
  }

-  public void setMediaKeyboardToggleMode(@NonNull KeyboardPage page) {
-    mediaKeyboard.setStickerMode(page);
+  public void setMediaKeyboardToggleMode(boolean isSticker) {
+    mediaKeyboard.setStickerMode(isSticker);
  }

  public boolean isStickerMode() {
@@ -292,20 +286,6 @@ public class InputPanel extends LinearLayout
    return mediaKeyboard;
  }

-  public MediaKeyboard.MediaKeyboardListener getMediaKeyboardListener() {
-    return mediaKeyboard;
-  }
-
-  public void setWallpaperEnabled(boolean enabled) {
-    if (enabled) {
-      setBackground(new ColorDrawable(getContext().getResources().getColor(R.color.wallpaper_compose_background)));
-      composeContainer.setBackground(Objects.requireNonNull(ContextCompat.getDrawable(getContext(), R.drawable.compose_background_wallpaper)));
-    } else {
-      setBackground(new ColorDrawable(getContext().getResources().getColor(R.color.signal_background_primary)));
-      composeContainer.setBackground(Objects.requireNonNull(ContextCompat.getDrawable(getContext(), R.drawable.compose_background)));
-    }
-  }
-
  @Override
  public void onRecordPermissionRequired() {
    if (listener != null) listener.onRecorderPermissionRequired();
@@ -343,10 +323,11 @@ public class InputPanel extends LinearLayout
  public void onRecordMoved(float offsetX, float absoluteX) {
    slideToCancel.moveTo(offsetX);

+    int   direction = ViewCompat.getLayoutDirection(this);
    float position  = absoluteX / recordingContainer.getWidth();

-    if (ViewUtil.isLtr(this) && position <= 0.5 ||
-        ViewUtil.isRtl(this) && position >= 0.6)
+    if (direction == ViewCompat.LAYOUT_DIRECTION_LTR && position <= 0.5 ||
+        direction == ViewCompat.LAYOUT_DIRECTION_RTL && position >= 0.6)
    {
      this.microphoneRecorderView.cancelAction();
    }
@@ -509,7 +490,7 @@ public class InputPanel extends LinearLayout
      this.startTime = System.currentTimeMillis();
      this.recordTimeView.setText(DateUtils.formatElapsedTime(0));
      ViewUtil.fadeIn(this.recordTimeView, FADE_TIME);
-      ThreadUtil.runOnMainDelayed(this, TimeUnit.SECONDS.toMillis(1));
+      Util.runOnMainDelayed(this, TimeUnit.SECONDS.toMillis(1));
      microphone.setVisibility(View.VISIBLE);
      microphone.startAnimation(pulseAnimation());
    }
@@ -535,7 +516,7 @@ public class InputPanel extends LinearLayout
          onLimitHit.run();
        } else {
          recordTimeView.setText(DateUtils.formatElapsedTime(elapsedSeconds));
-          ThreadUtil.runOnMainDelayed(this, TimeUnit.SECONDS.toMillis(1));
+          Util.runOnMainDelayed(this, TimeUnit.SECONDS.toMillis(1));
        }
      }
    }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Greyson Parrelli	b08ebe9cae	Bump version to 5.0.10	2021-01-12 01:45:13 -05:00
Greyson Parrelli	6be5319a1f	Updated language translations.	2021-01-12 01:41:49 -05:00
Greyson Parrelli	74eb52b126	Perfom a migration to notify users of new contacts.	2021-01-11 23:18:13 -05:00
Greyson Parrelli	3825eed6ad	Fix issue with Signal join notifications.	2021-01-11 20:35:53 -05:00
Greyson Parrelli	20996c985b	Bump version to 5.0.9	2021-01-08 17:39:13 -05:00
Greyson Parrelli	e5e9a7108e	Add extra conditions for the SMS banner.	2021-01-08 17:31:54 -05:00
Alan Evans	51dfee9cd3	Allow empty group creation.	2021-01-08 12:55:04 -04:00