Bump version to 5.0.10

Updated language translations.
Perfom a migration to notify users of new contacts.
2026-04-11 20:43:34 +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
2533 changed files with 57749 additions and 183692 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,25 +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: Remove Android S
-      run: $ANDROID_HOME/tools/bin/sdkmanager --uninstall "platforms;android-S"
-
    - 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,193 +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="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value />
-      </option>
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </JetCodeStyleSettings>
-    <codeStyleSettings language="JAVA">
-      <option name="BRACE_STYLE" value="5" />
-      <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,16 +3,11 @@ 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'
-apply plugin: 'org.jetbrains.kotlin.android'
-apply plugin: 'app.cash.exhaustive'

 repositories {
    maven {
@@ -21,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 {
@@ -37,9 +44,6 @@ repositories {
    mavenCentral()
    jcenter()
    mavenLocal()
-    maven {
-        url "https://dl.cloudsmith.io/qxAgwaeEE1vN8aLU/mobilecoin/mobilecoin/maven/"
-    }
 }

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

-def canonicalVersionCode = 881
-def canonicalVersionName = "5.17.3"
+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') ]

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

-    kotlinOptions {
-        jvmTarget = "1.8"
-        freeCompilerArgs = ["-Xallow-result-return-type"]
-    }
-
    dexOptions {
        javaMaxHeapSize "4g"
    }
@@ -109,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\""
@@ -118,8 +116,6 @@ android {
        buildConfigField "String", "SIGNAL_SERVICE_STATUS_URL", "\"uptime.signal.org\""
        buildConfigField "String", "SIGNAL_KEY_BACKUP_URL", "\"https://api.backup.signal.org\""
        buildConfigField "String", "SIGNAL_SFU_URL", "\"https://sfu.voip.signal.org\""
-        buildConfigField "String[]", "SIGNAL_SFU_INTERNAL_NAMES", "new String[]{\"Test\", \"Staging\"}"
-        buildConfigField "String[]", "SIGNAL_SFU_INTERNAL_URLS", "new String[]{\"https://sfu.test.voip.signal.org\", \"https://sfu.staging.voip.signal.org\"}"
        buildConfigField "String", "CONTENT_PROXY_HOST", "\"contentproxy.signal.org\""
        buildConfigField "int", "CONTENT_PROXY_PORT", "443"
        buildConfigField "String", "SIGNAL_AGENT", "\"OWA\""
@@ -132,14 +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 "String", "BUILD_DISTRIBUTION_TYPE", "\"unset\""
-        buildConfigField "String", "BUILD_ENVIRONMENT_TYPE", "\"unset\""
-        buildConfigField "String", "BUILD_VARIANT_TYPE", "\"unset\""
+        buildConfigField "int", "TRACE_EVENT_MAX", "3500"

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

    compileOptions {
-        coreLibraryDesugaringEnabled true
        sourceCompatibility JAVA_VERSION
        targetCompatibility JAVA_VERSION
    }
@@ -173,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 {
@@ -205,34 +195,16 @@ android {
                    'proguard/proguard.cfg'
            testProguardFiles 'proguard/proguard-automation.pro',
                    'proguard/proguard.cfg'
-
-            buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Debug\""
        }
        flipper {
            initWith debug
            isDefault false
            minifyEnabled false
            matchingFallbacks = ['debug']
-            buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Flipper\""
        }
        release {
            minifyEnabled true
            proguardFiles = buildTypes.debug.proguardFiles
-            buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Release\""
-        }
-        perf {
-            initWith debug
-            isDefault false
-            debuggable false
-            matchingFallbacks = ['debug']
-            buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Perf\""
-        }
-        mock {
-            initWith debug
-            isDefault false
-            minifyEnabled false
-            matchingFallbacks = ['debug']
-            buildConfigField "String", "BUILD_VARIANT_TYPE", "\"Mock\""
        }
    }

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

        website {
@@ -251,7 +222,6 @@ android {
            ext.websiteUpdateUrl = "https://updates.signal.org/android"
            buildConfigField "boolean", "PLAY_STORE_DISABLED", "true"
            buildConfigField "String", "NOPLAY_UPDATE_URL", "\"$ext.websiteUpdateUrl\""
-            buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"website\""
        }

        internal {
@@ -259,35 +229,13 @@ android {
            ext.websiteUpdateUrl = "null"
            buildConfigField "boolean", "PLAY_STORE_DISABLED", "false"
            buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
-            buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"internal\""
-        }
-
-        nightly {
-            dimension 'distribution'
-            versionNameSuffix "-nightly-untagged-${getDateSuffix()}"
-            ext.websiteUpdateUrl = "null"
-            buildConfigField "boolean", "PLAY_STORE_DISABLED", "false"
-            buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
-            buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"internal\""
-        }
-
-        study {
-            dimension 'distribution'
-
-            applicationIdSuffix ".study"
-            ext.websiteUpdateUrl = "null"
-            buildConfigField "boolean", "PLAY_STORE_DISABLED", "false"
-            buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
-            buildConfigField "String", "BUILD_DISTRIBUTION_TYPE", "\"study\""
+            buildConfigField "int", "TRACE_EVENT_MAX", "30_000"
        }

        prod {
            dimension 'environment'

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

        staging {
@@ -303,53 +251,23 @@ 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\""
-
-            buildConfigField "String", "BUILD_ENVIRONMENT_TYPE", "\"Staging\""
        }
    }

    android.applicationVariants.all { variant ->
        variant.outputs.each { output ->
-            if (output.baseName.contains('nightly')) {
-                output.versionCodeOverride = canonicalVersionCode * postFixSize + 5
-                def tag = getCurrentGitTag()
-                if (tag != null && tag.length() > 0) {
-                    output.versionNameOverride = tag
-                }
-            } else {
-                output.outputFileName = output.outputFileName.replace(".apk", "-${variant.versionName}.apk")
-                def abiName = output.getFilter("ABI") ?: 'universal'
-                def postFix = abiPostFix.get(abiName, 0)
+            output.outputFileName = output.outputFileName.replace(".apk", "-${variant.versionName}.apk")
+            def abiName = output.getFilter("ABI") ?: 'universal'
+            def postFix = abiPostFix.get(abiName, 0)

-                if (postFix >= postFixSize) throw new AssertionError("postFix is too large")
+            if (postFix >= postFixSize) throw new AssertionError("postFix is too large")

-                output.versionCodeOverride = canonicalVersionCode * postFixSize + postFix
-            }
-        }
-    }
-
-    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)
-        } else if (distribution == 'internal' && buildType != 'flipper' && buildType != 'perf' && buildType != 'release') {
-            variant.setIgnore(true)
-        } else if (distribution == 'nightly' && environment != 'prod') {
-            variant.setIgnore(true)
-        } else if (distribution == 'nightly' && buildType != 'flipper' && buildType != 'perf' && buildType != 'release') {
-            variant.setIgnore(true)
+            output.versionCodeOverride = canonicalVersionCode * postFixSize + postFix
        }
    }

@@ -367,17 +285,13 @@ android {
 }

 dependencies {
-    implementation 'androidx.core:core-ktx:1.5.0'
-    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'
@@ -397,10 +311,12 @@ 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.sharetarget:sharetarget: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:22.0.0') {
+    implementation ('com.google.firebase:firebase-messaging:20.2.0') {
        exclude group: 'com.google.firebase', module: 'firebase-core'
        exclude group: 'com.google.firebase', module: 'firebase-analytics'
        exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
@@ -419,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.8.3'
+    implementation 'org.whispersystems:signal-client-android:0.1.5'
    implementation 'com.google.protobuf:protobuf-javalite:3.10.0'
-
-    implementation('com.mobilecoin:android-sdk:1.1.0') {
-        exclude group: 'com.google.protobuf'
-    }
-
    implementation 'org.signal:argon2:13.1@aar'

-    implementation 'org.signal:ringrtc-android:2.10.6'
+    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'
@@ -470,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'
@@ -502,16 +407,8 @@ dependencies {
    testImplementation 'org.robolectric:shadows-multidex:4.4'
    testImplementation 'org.hamcrest:hamcrest:2.2'

-    testImplementation(testFixtures(project(":libsignal-service")))
-
    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"
-
-    implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
-    implementation 'io.reactivex.rxjava3:rxkotlin:3.0.1'
 }

 dependencyVerification {
@@ -580,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'
@@ -595,39 +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()
-}
-
-def getCurrentGitTag() {
-    if (!(new File('.git').exists())) {
-        return ''
-    }
-
-    def stdout = new ByteArrayOutputStream()
-    exec {
-        commandLine 'git', 'tag', '--points-at', 'HEAD'
-        standardOutput = stdout
-    }
-
-    def output = stdout.toString().trim()
-
-    if (output != null && output.size() > 0) {
-        return output.split('\n')[0];
-    } else {
-        return null
-    }
-}
-
 tasks.withType(Test) {
    testLogging {
        events "failed"
@@ -648,9 +508,3 @@ def loadKeystoreProperties(filename) {
        return null;
    }
 }
-
-def getDateSuffix() {
-    def date = new Date()
-    def formattedDate = date.format('yyyy-MM-dd-HH:mm')
-    return formattedDate
-}
--- 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" />
@@ -153,28 +154,17 @@
            <category android:name="android.intent.category.BROWSABLE" />
            <data android:scheme="tsdevice"/>
        </intent-filter>
-
-        <intent-filter>
-            <action android:name="android.intent.action.VIEW" />
-            <category android:name="android.intent.category.DEFAULT" />
-            <category android:name="android.intent.category.BROWSABLE" />
-            <data android:scheme="sgnl"
-                  android:host="linkdevice"/>
-        </intent-filter>
    </activity>

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

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

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

    </activity>

@@ -235,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" />
@@ -263,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,10 +283,13 @@
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />

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

    <activity android:name=".DatabaseMigrationActivity"
              android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar"
@@ -319,7 +297,7 @@
              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

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

@@ -363,43 +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=".components.settings.conversation.ConversationSettingsActivity"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:theme="@style/Signal.DayNight.ConversationSettings"
-            android:windowSoftInputMode="stateAlwaysHidden">
-        </activity>
-
-
-        <activity android:name=".wallpaper.ChatWallpaperActivity"
-                  android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-                  android:windowSoftInputMode="stateAlwaysHidden">
-        </activity>
-
-        <activity android:name=".wallpaper.ChatWallpaperPreviewActivity"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:windowSoftInputMode="stateAlwaysHidden">
-        </activity>
-
-        <activity android:name=".devicetransfer.olddevice.OldDeviceTransferActivity"
-            android:theme="@style/TextSecure.LightRegistrationTheme"
-            android:launchMode="singleTask"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-        <activity android:name=".devicetransfer.olddevice.OldDeviceExitActivity"
-            android:noHistory="true"
-            android:excludeFromRecents="true"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
    <activity android:name=".registration.RegistrationNavigationActivity"
              android:launchMode="singleTask"
              android:theme="@style/TextSecure.LightRegistrationTheme"
@@ -499,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"
@@ -563,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"
@@ -589,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"/>
@@ -651,6 +576,13 @@
        <meta-data android:name="android.provider.CONTACTS_STRUCTURE" android:resource="@xml/contactsformat" />
    </service>

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

    <service android:name=".gcm.FcmFetchService" />
@@ -710,16 +642,26 @@
        </intent-filter>
    </receiver>

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

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

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

-    <receiver android:name=".payments.backup.phrase.ClearClipboardAlarmReceiver" />
-
    <provider android:name=".providers.PartProvider"
              android:grantUriPermissions="true"
              android:exported="false"
@@ -748,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" />
@@ -785,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/androidx/camera/view/SignalCameraXModule.java
+++ b/app/src/main/java/androidx/camera/view/SignalCameraXModule.java
@@ -512,12 +512,7 @@ final class SignalCameraXModule {
    return rotationDegrees;
  }

-  @SuppressLint("UnsafeExperimentalUsageError")
  public void invalidateView() {
-    if (mPreview != null) {
-      mPreview.setTargetRotation(getDisplaySurfaceRotation()); // Fixes issue #10940 (rotation not updated on phones using "Legacy API")
-    }
-
    updateViewInfo();
  }

--- a/app/src/main/java/org/signal/glide/Log.java
+++ b/app/src/main/java/org/signal/glide/Log.java
@@ -24,7 +24,7 @@ public final class Log {
  }

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

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

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

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

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

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

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

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

    private final Loader mLoader;
--- a/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/AppCapabilities.java
@@ -17,6 +17,6 @@ public final class AppCapabilities {
   *                       asking if the user has set a Signal PIN or not.
   */
  public static AccountAttributes.Capabilities getCapabilities(boolean storageCapable) {
-    return new AccountAttributes.Capabilities(UUID_CAPABLE, GV2_CAPABLE, storageCapable, GV1_MIGRATION, FeatureFlags.senderKey());
+    return new AccountAttributes.Capabilities(UUID_CAPABLE, GV2_CAPABLE, storageCapable, GV1_MIGRATION);
  }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/AppInitialization.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/AppInitialization.java
@@ -8,7 +8,6 @@ import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.insights.InsightsOptOut;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
-import org.thoughtcrime.securesms.jobs.EmojiSearchIndexDownloadJob;
 import org.thoughtcrime.securesms.jobs.StickerPackDownloadJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
@@ -44,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()));
  }
@@ -54,34 +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()));
-    EmojiSearchIndexDownloadJob.scheduleImmediately();
-  }
-
-  /**
-   * Temporary migration method that does the safest bits of {@link #onFirstEverAppLaunch(Context)}
-   */
-  public static void onRepairFirstEverAppLaunch(@NonNull Context context) {
-    Log.w(TAG, "onRepairFirstEverAppLaunch()");
-
-    InsightsOptOut.userRequestedOptOut(context);
-    TextSecurePreferences.setAppMigrationVersion(context, ApplicationMigrations.CURRENT_VERSION);
-    TextSecurePreferences.setJobManagerVersion(context, JobManager.CURRENT_VERSION);
-    TextSecurePreferences.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,38 +16,35 @@
 */
 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;

-import net.sqlcipher.database.SQLiteDatabase;
-
 import org.conscrypt.Conscrypt;
 import org.signal.aesgcmprovider.AesGcmProvider;
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.AndroidLogger;
 import org.signal.core.util.logging.Log;
 import org.signal.core.util.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.SqlCipherLibraryLoader;
 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;
@@ -57,41 +54,38 @@ 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.util.ByteUnit;
+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;

-import io.reactivex.rxjava3.plugins.RxJavaPlugins;
-import io.reactivex.rxjava3.schedulers.Schedulers;
-
 /**
 * Will be called once when the TextSecure process is created.
 *
@@ -100,11 +94,16 @@ import io.reactivex.rxjava3.schedulers.Schedulers;
 *
 * @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();
@@ -113,103 +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("sqlcipher-init", () -> SqlCipherLibraryLoader.load(this))
-                            .addBlocking("rx-init", () -> {
-                              RxJavaPlugins.setInitIoSchedulerHandler(schedulerSupplier -> Schedulers.from(SignalExecutors.BOUNDED_IO, true, false));
-                              RxJavaPlugins.setInitComputationSchedulerHandler(schedulerSupplier -> Schedulers.from(SignalExecutors.BOUNDED, true, false));
-                            })
-                            .addBlocking("app-dependencies", this::initializeAppDependencies)
-                            .addBlocking("notification-channels", () -> NotificationChannels.create(this))
-                            .addBlocking("first-launch", this::initializeFirstEverAppLaunch)
-                            .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::initializePendingRetryReceiptManager)
-                            .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)
-                            .addPostRender(() -> DatabaseFactory.getMessageLogDatabase(this).trimOldMessages(System.currentTimeMillis(), FeatureFlags.retryRespondMaxAge()))
-                            .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() {
@@ -248,8 +227,8 @@ public class ApplicationContext extends MultiDexApplication implements AppForegr
  }

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

    SignalProtocolLoggerProvider.setProvider(new CustomSignalProtocolLogger());
  }
@@ -268,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);
    }
  }

@@ -306,15 +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();
-  }
-
-  private void initializePendingRetryReceiptManager() {
-    ApplicationDependencies.getPendingRetryReceiptManager().scheduleIfNecessary();
+    this.viewOnceMessageManager = new ViewOnceMessageManager(this);
  }

  private void initializePeriodicTasks() {
@@ -322,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);
@@ -331,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);
      }

@@ -345,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() {
@@ -368,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,21 +36,12 @@ 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();

  void setEventListener(@Nullable EventListener listener);

-  default void updateTimestamps() {
-    // Intentionally Blank.
-  }
-
  interface EventListener {
    void onQuoteClicked(MmsMessageRecord messageRecord);
    void onLinkPreviewClicked(@NonNull LinkPreview linkPreview);
@@ -69,24 +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 onIncomingIdentityMismatchClicked(@NonNull RecipientId recipientId);
    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 onVoiceNotePlaybackSpeedChanged(@NonNull Uri uri, float speed);
    void onGroupMigrationLearnMoreClicked(@NonNull GroupMigrationMembershipChange membershipChange);
-    void onChatSessionRefreshLearnMoreClicked();
-    void onBadDecryptLearnMoreClicked(@NonNull RecipientId author);
-    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
@@ -0,0 +1,179 @@
+package org.thoughtcrime.securesms;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.AsyncTask;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.method.LinkMovementMethod;
+import android.widget.TextView;
+
+import androidx.appcompat.app.AlertDialog;
+
+import org.thoughtcrime.securesms.crypto.storage.TextSecureIdentityKeyStore;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.MessageDatabase;
+import org.thoughtcrime.securesms.database.PushDatabase;
+import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
+import org.thoughtcrime.securesms.database.model.MessageRecord;
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.jobs.PushDecryptMessageJob;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.recipients.RecipientUtil;
+import org.thoughtcrime.securesms.sms.MessageSender;
+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.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 = ConfirmIdentityDialog.class.getSimpleName();
+
+  private OnClickListener callback;
+
+  public ConfirmIdentityDialog(Context context,
+                               MessageRecord messageRecord,
+                               IdentityKeyMismatch mismatch)
+  {
+    super(context);
+
+      Recipient       recipient       = Recipient.resolved(mismatch.getRecipientId(context));
+      String          name            = recipient.getDisplayName(context);
+      String          introduction    = context.getString(R.string.ConfirmIdentityDialog_your_safety_number_with_s_has_changed, name, name);
+      SpannableString spannableString = new SpannableString(introduction + " " +
+                                                            context.getString(R.string.ConfirmIdentityDialog_you_may_wish_to_verify_your_safety_number_with_this_contact));
+
+      spannableString.setSpan(new VerifySpan(context, mismatch),
+                              introduction.length()+1, spannableString.length(),
+                              Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+      setTitle(name);
+      setMessage(spannableString);
+
+      setButton(AlertDialog.BUTTON_POSITIVE, context.getString(R.string.ConfirmIdentityDialog_accept), new AcceptListener(messageRecord, mismatch, recipient.getId()));
+      setButton(AlertDialog.BUTTON_NEGATIVE, context.getString(android.R.string.cancel),               new CancelListener());
+  }
+
+  @Override
+  public void show() {
+    super.show();
+    ((TextView)this.findViewById(android.R.id.message))
+                   .setMovementMethod(LinkMovementMethod.getInstance());
+  }
+
+  public void setCallback(OnClickListener callback) {
+    this.callback = callback;
+  }
+
+  private class AcceptListener implements OnClickListener {
+
+    private final MessageRecord       messageRecord;
+    private final IdentityKeyMismatch mismatch;
+    private final RecipientId         recipientId;
+
+    private AcceptListener(MessageRecord messageRecord, IdentityKeyMismatch mismatch, RecipientId recipientId) {
+      this.messageRecord = messageRecord;
+      this.mismatch      = mismatch;
+      this.recipientId   = recipientId;
+    }
+
+    @SuppressLint("StaticFieldLeak")
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+      new AsyncTask<Void, Void, Void>()
+      {
+        @Override
+        protected Void doInBackground(Void... params) {
+          synchronized (SESSION_LOCK) {
+            SignalProtocolAddress      mismatchAddress  = new SignalProtocolAddress(Recipient.resolved(recipientId).requireServiceId(), 1);
+            TextSecureIdentityKeyStore identityKeyStore = new TextSecureIdentityKeyStore(getContext());
+
+            identityKeyStore.saveIdentity(mismatchAddress, mismatch.getIdentityKey(), true);
+          }
+
+          processMessageRecord(messageRecord);
+
+          return null;
+        }
+
+        private void processMessageRecord(MessageRecord messageRecord) {
+          if (messageRecord.isOutgoing()) processOutgoingMessageRecord(messageRecord);
+          else                            processIncomingMessageRecord(messageRecord);
+        }
+
+        private void processOutgoingMessageRecord(MessageRecord messageRecord) {
+          MessageDatabase smsDatabase = DatabaseFactory.getSmsDatabase(getContext());
+          MessageDatabase mmsDatabase = DatabaseFactory.getMmsDatabase(getContext());
+
+          if (messageRecord.isMms()) {
+            mmsDatabase.removeMismatchedIdentity(messageRecord.getId(),
+                                                 mismatch.getRecipientId(getContext()),
+                                                 mismatch.getIdentityKey());
+
+            if (messageRecord.getRecipient().isPushGroup()) {
+              MessageSender.resendGroupMessage(getContext(), messageRecord, Recipient.resolved(mismatch.getRecipientId(getContext())).getId());
+            } else {
+              MessageSender.resend(getContext(), messageRecord);
+            }
+          } else {
+            smsDatabase.removeMismatchedIdentity(messageRecord.getId(),
+                                                 mismatch.getRecipientId(getContext()),
+                                                 mismatch.getIdentityKey());
+
+            MessageSender.resend(getContext(), messageRecord);
+          }
+        }
+
+        private void processIncomingMessageRecord(MessageRecord messageRecord) {
+          try {
+            PushDatabase    pushDatabase = DatabaseFactory.getPushDatabase(getContext());
+            MessageDatabase smsDatabase  = DatabaseFactory.getSmsDatabase(getContext());
+
+            smsDatabase.removeMismatchedIdentity(messageRecord.getId(),
+                                                 mismatch.getRecipientId(getContext()),
+                                                 mismatch.getIdentityKey());
+
+            boolean legacy = !messageRecord.isContentBundleKeyExchange();
+
+            SignalServiceEnvelope envelope = new SignalServiceEnvelope(SignalServiceProtos.Envelope.Type.PREKEY_BUNDLE_VALUE,
+                                                                       Optional.of(RecipientUtil.toSignalServiceAddress(getContext(), messageRecord.getIndividualRecipient())),
+                                                                       messageRecord.getRecipientDeviceId(),
+                                                                       messageRecord.getDateSent(),
+                                                                       legacy ? Base64.decode(messageRecord.getBody()) : null,
+                                                                       !legacy ? Base64.decode(messageRecord.getBody()) : null,
+                                                                       0,
+                                                                       0,
+                                                                       null);
+
+            long pushId = pushDatabase.insert(envelope);
+
+            ApplicationDependencies.getJobManager().add(new PushDecryptMessageJob(getContext(), pushId, messageRecord.getId()));
+          } catch (IOException e) {
+            throw new AssertionError(e);
+          }
+        }
+
+      }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+
+      if (callback != null) callback.onClick(null, 0);
+    }
+  }
+
+  private class CancelListener implements OnClickListener {
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+      if (callback != null) callback.onClick(null, 0);
+    }
+  }
+
+}
--- a/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionActivity.java
@@ -20,18 +20,17 @@ import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Bundle;

-import androidx.appcompat.widget.Toolbar;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;

 import org.signal.core.util.logging.Log;
-import org.thoughtcrime.securesms.components.ContactFilterView;
+import org.thoughtcrime.securesms.components.ContactFilterToolbar;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
 import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper;
 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";

@@ -56,8 +55,7 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActivit

  protected ContactSelectionListFragment contactsFragment;

-  private Toolbar           toolbar;
-  private ContactFilterView contactFilterView;
+  private ContactFilterToolbar toolbar;

  @Override
  protected void onPreCreate() {
@@ -67,14 +65,13 @@ 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);
    }

    setContentView(getIntent().getIntExtra(EXTRA_LAYOUT_RES_ID, R.layout.contact_selection_activity));

-    initializeContactFilterView();
    initializeToolbar();
    initializeResources();
    initializeSearch();
@@ -86,34 +83,28 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActivit
    dynamicTheme.onResume(this);
  }

-  protected Toolbar getToolbar() {
+  protected ContactFilterToolbar getToolbar() {
    return toolbar;
  }

-  protected ContactFilterView getContactFilterView() {
-    return contactFilterView;
-  }
-
-  private void initializeContactFilterView() {
-    this.contactFilterView = findViewById(R.id.contact_filter_edit_text);
-  }
-
  private void initializeToolbar() {
    this.toolbar = findViewById(R.id.toolbar);
    setSupportActionBar(toolbar);

    getSupportActionBar().setDisplayHomeAsUpEnabled(false);
+    getSupportActionBar().setDisplayShowTitleEnabled(false);
    getSupportActionBar().setIcon(null);
    getSupportActionBar().setLogo(null);
  }

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

  private void initializeSearch() {
-    contactFilterView.setOnFilterChangedListener(filter -> contactsFragment.setQueryFilter(filter));
+    toolbar.setOnFilterChangedListener(filter -> contactsFragment.setQueryFilter(filter));
  }

  @Override
@@ -164,7 +155,7 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActivit
      ContactSelectionActivity activity = this.activity.get();

      if (activity != null && !activity.isFinishing()) {
-        activity.contactFilterView.clear();
+        activity.toolbar.clear();
        activity.contactsFragment.resetQueryFilter();
      }
    }
--- a/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
@@ -57,14 +57,12 @@ import com.pnikosis.materialishprogress.ProgressWheel;

 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.components.RecyclerViewFastScroller;
-import org.thoughtcrime.securesms.components.recyclerview.ToolbarShadowAnimationHelper;
-import org.thoughtcrime.securesms.contacts.AbstractContactsCursorLoader;
+import org.thoughtcrime.securesms.components.emoji.WarningTextView;
 import org.thoughtcrime.securesms.contacts.ContactChip;
 import org.thoughtcrime.securesms.contacts.ContactSelectionListAdapter;
 import org.thoughtcrime.securesms.contacts.ContactSelectionListItem;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
-import org.thoughtcrime.securesms.contacts.LetterHeaderDecoration;
 import org.thoughtcrime.securesms.contacts.SelectedContact;
 import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper;
 import org.thoughtcrime.securesms.groups.SelectionLimits;
@@ -75,9 +73,9 @@ import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.recipients.LiveRecipient;
 import org.thoughtcrime.securesms.recipients.Recipient;
 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,30 +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";
-  public static final String RV_PADDING_BOTTOM = "recycler_view_padding_bottom";
-  public static final String RV_CLIP           = "recycler_view_clipping";
-
-  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 OnSelectionLimitReachedListener             onSelectionLimitReachedListener;
-  private AbstractContactsCursorLoaderFactoryProvider cursorFactoryProvider;
-  private View                                        shadowView;
-  private ToolbarShadowAnimationHelper                toolbarShadowAnimationHelper;

+  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;
@@ -146,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) {
@@ -156,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
@@ -211,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();
@@ -234,12 +199,9 @@ public final class ContactSelectionListFragment extends LoggingFragment
    showContactsProgress     = view.findViewById(R.id.progress);
    chipGroup                = view.findViewById(R.id.chipGroup);
    chipGroupScrollContainer = view.findViewById(R.id.chipGroupScrollContainer);
+    groupLimit               = view.findViewById(R.id.group_limit);
    constraintLayout         = view.findViewById(R.id.container);
-    shadowView               = view.findViewById(R.id.toolbar_shadow);

-    toolbarShadowAnimationHelper = new ToolbarShadowAnimationHelper(shadowView);
-
-    recyclerView.addOnScrollListener(toolbarShadowAnimationHelper);
    recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
    recyclerView.setItemAnimator(new DefaultItemAnimator() {
      @Override
@@ -248,27 +210,13 @@ public final class ContactSelectionListFragment extends LoggingFragment
      }
    });

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

-    int     recyclerViewPadBottom = arguments.getInt(RV_PADDING_BOTTOM, intent.getIntExtra(RV_PADDING_BOTTOM, -1));
-    boolean recyclerViewClipping  = arguments.getBoolean(RV_CLIP, intent.getBooleanExtra(RV_CLIP, true));
+    swipeRefresh.setEnabled(intent.getBooleanExtra(REFRESHABLE, true));

-    if (recyclerViewPadBottom != -1) {
-      ViewUtil.setPaddingBottom(recyclerView, recyclerViewPadBottom);
-    }
-
-    recyclerView.setClipToPadding(recyclerViewClipping);
-
-    swipeRefresh.setEnabled(arguments.getBoolean(REFRESHABLE, 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;
@@ -276,11 +224,16 @@ public final class ContactSelectionListFragment extends LoggingFragment

    currentSelection = getCurrentSelection();

+    updateGroupLimit(getChipCount());
+
    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));
+    groupLimit.setVisibility(isMulti && !hideCount ? View.VISIBLE : View.GONE);
+    groupLimit.setWarning(selectionWarningLimitExceeded());
  }

  @Override
@@ -304,19 +257,8 @@ public final class ContactSelectionListFragment extends LoggingFragment
    return cursorRecyclerViewAdapter.getSelectedContactsCount();
  }

-  public int getTotalMemberCount() {
-    if (cursorRecyclerViewAdapter == null) {
-      return 0;
-    }
-
-    return cursorRecyclerViewAdapter.getSelectedContactsCount() + cursorRecyclerViewAdapter.getCurrentContactsCount();
-  }
-
  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()));
@@ -352,8 +294,8 @@ public final class ContactSelectionListFragment extends LoggingFragment
      concatenateAdapter.addAdapter(footerAdapter);
    }

-    recyclerView.addItemDecoration(new LetterHeaderDecoration(requireContext(), this::hideLetterHeaders));
    recyclerView.setAdapter(concatenateAdapter);
+    recyclerView.addItemDecoration(new StickyHeaderDecoration(concatenateAdapter, true, true));
    recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
      @Override
      public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
@@ -364,14 +306,6 @@ public final class ContactSelectionListFragment extends LoggingFragment
        }
      }
    });
-
-    if (onContactSelectedListener != null) {
-      onContactSelectedListener.onSelectionChanged();
-    }
-  }
-
-  private boolean hideLetterHeaders() {
-    return hasQueryFilter() || shouldDisplayRecents();
  }

  private View createInviteActionView(@NonNull ListCallback listCallback) {
@@ -438,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 = shouldDisplayRecents();
-
-    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
@@ -486,10 +415,6 @@ public final class ContactSelectionListFragment extends LoggingFragment
    fastScroller.setVisibility(View.GONE);
  }

-  private boolean shouldDisplayRecents() {
-    return safeArguments().getBoolean(RECENTS, requireActivity().getIntent().getBooleanExtra(RECENTS, false));
-  }
-
  @SuppressLint("StaticFieldLeak")
  private void handleContactPermissionGranted() {
    final Context context = requireContext();
@@ -523,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();
@@ -539,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;
        }

@@ -568,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())
@@ -586,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());
@@ -621,19 +539,12 @@ public final class ContactSelectionListFragment extends LoggingFragment
    if (isMulti) {
      addChipForSelectedContact(selectedContact);
    }
-    if (onContactSelectedListener != null) {
-      onContactSelectedListener.onSelectionChanged();
-    }
  }

  private void markContactUnselected(@NonNull SelectedContact selectedContact) {
    cursorRecyclerViewAdapter.removeFromSelectedContacts(selectedContact);
    cursorRecyclerViewAdapter.notifyItemRangeChanged(0, cursorRecyclerViewAdapter.getItemCount(), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
    removeChipForContact(selectedContact);
-
-    if (onContactSelectedListener != null) {
-      onContactSelectedListener.onSelectionChanged();
-    }
  }

  private void removeChipForContact(@NonNull SelectedContact contact) {
@@ -644,6 +555,8 @@ public final class ContactSelectionListFragment extends LoggingFragment
      }
    }

+    updateGroupLimit(getChipCount());
+
    if (getChipCount() == 0) {
      setChipGroupVisibility(ConstraintSet.GONE);
    }
@@ -693,12 +606,9 @@ public final class ContactSelectionListFragment extends LoggingFragment

  private void addChip(@NonNull ContactChip chip) {
    chipGroup.addView(chip);
+    updateGroupLimit(getChipCount());
    if (selectionWarningLimitReachedExactly()) {
-      if (onSelectionLimitReachedListener != null) {
-        onSelectionLimitReachedListener.onSuggestedLimitReached(selectionLimit.getRecommendedLimit());
-      } else {
-        GroupLimitDialog.showRecommendedLimitMessage(requireContext());
-      }
+      GroupLimitDialog.showRecommendedLimitMessage(requireContext());
    }
  }

@@ -720,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();
@@ -732,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);
  }

@@ -745,12 +655,6 @@ public final class ContactSelectionListFragment extends LoggingFragment
    /** @return True if the contact is allowed to be selected, otherwise false. */
    boolean onBeforeContactSelected(Optional<RecipientId> recipientId, String number);
    void onContactDeselected(Optional<RecipientId> recipientId, String number);
-    void onSelectionChanged();
-  }
-
-  public interface OnSelectionLimitReachedListener {
-    void onSuggestedLimitReached(int limit);
-    void onHardLimitReached(int limit);
  }

  public interface ListCallback {
@@ -761,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
@@ -22,8 +22,8 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator;

-import org.thoughtcrime.securesms.components.ContactFilterView;
-import org.thoughtcrime.securesms.components.ContactFilterView.OnFilterChangedListener;
+import org.thoughtcrime.securesms.components.ContactFilterToolbar;
+import org.thoughtcrime.securesms.components.ContactFilterToolbar.OnFilterChangedListener;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
 import org.thoughtcrime.securesms.contacts.SelectedContact;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
@@ -35,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;
@@ -95,41 +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);
-    Toolbar              smsToolbar      = findViewById(R.id.sms_send_frame_toolbar);
-    ContactFilterView    contactFilter   = findViewById(R.id.contact_filter_edit_text);
+    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());
-    smsToolbar.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);
-    }
+    contactFilter.setNavigationIcon(R.drawable.ic_search_conversation_24);
  }

  private Animation loadAnimation(@AnimRes int animResId) {
@@ -149,10 +132,6 @@ public class InviteActivity extends PassphraseRequiredActivity implements Contac
    updateSmsButtonText(contactsFragment.getSelectedContacts().size());
  }

-  @Override
-  public void onSelectionChanged() {
-  }
-
  private void sendSmsInvites() {
    new SendSmsInvitesAsyncTask(this, inviteText.getText().toString())
        .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR,
--- 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,62 +8,36 @@ import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

-import org.thoughtcrime.securesms.components.voice.VoiceNoteMediaController;
-import org.thoughtcrime.securesms.components.voice.VoiceNoteMediaControllerOwner;
-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;

-public class MainActivity extends PassphraseRequiredActivity implements VoiceNoteMediaControllerOwner {
+@Trace
+public class MainActivity extends PassphraseRequiredActivity {

  public static final int RESULT_CONFIG_CHANGED = Activity.RESULT_FIRST_USER + 901;

  private final DynamicTheme  dynamicTheme = new DynamicNoActionBarTheme();
  private final MainNavigator navigator    = new MainNavigator(this);

-  private VoiceNoteMediaController mediaController;
-
-  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);

-    mediaController = new VoiceNoteMediaController(this);
    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
@@ -77,9 +50,6 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
  protected void onResume() {
    super.onResume();
    dynamicTheme.onResume(this);
-    if (SignalStore.misc().isOldDeviceTransferLocked()) {
-      OldDeviceTransferLockedDialog.show(getSupportFragmentManager());
-    }
  }

  @Override
@@ -107,16 +77,4 @@ public class MainActivity extends PassphraseRequiredActivity implements VoiceNot
      CommunicationActions.handlePotentialGroupLinkUrl(this, data.toString());
    }
  }
-
-  private void handleProxyInIntent(Intent intent) {
-    Uri data = intent.getData();
-    if (data != null) {
-      CommunicationActions.handlePotentialProxyLinkUrl(this, data.toString());
-    }
-  }
-
-  @Override
-  public @NonNull VoiceNoteMediaController getVoiceNoteMediaController() {
-    return mediaController;
-  }
 }
--- 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;

@@ -103,7 +103,6 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
  public static final String HIDE_ALL_MEDIA_EXTRA = "came_from_all_media";
  public static final String SHOW_THREAD_EXTRA    = "show_thread";
  public static final String SORTING_EXTRA        = "sorting";
-  public static final String IS_VIDEO_GIF         = "is_video_gif";

  private ViewPager             mediaPager;
  private View                  detailsContainer;
@@ -116,7 +115,6 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
  private String                initialMediaType;
  private long                  initialMediaSize;
  private String                initialCaption;
-  private boolean               initialMediaIsVideoGif;
  private boolean               leftIsRecent;
  private MediaPreviewViewModel viewModel;
  private ViewPagerListener     viewPagerListener;
@@ -141,7 +139,6 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
    intent.putExtra(MediaPreviewActivity.SIZE_EXTRA, attachment.getSize());
    intent.putExtra(MediaPreviewActivity.CAPTION_EXTRA, attachment.getCaption());
    intent.putExtra(MediaPreviewActivity.LEFT_IS_RECENT_EXTRA, leftIsRecent);
-    intent.putExtra(MediaPreviewActivity.IS_VIDEO_GIF, attachment.isVideoGif());
    intent.setDataAndType(attachment.getUri(), mediaRecord.getContentType());
    return intent;
  }
@@ -299,13 +296,12 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
    showThread       = intent.getBooleanExtra(SHOW_THREAD_EXTRA, false);
    sorting          = MediaDatabase.Sorting.values()[intent.getIntExtra(SORTING_EXTRA, 0)];

-    initialMediaUri        = intent.getData();
-    initialMediaType       = intent.getType();
-    initialMediaSize       = intent.getLongExtra(SIZE_EXTRA, 0);
-    initialCaption         = intent.getStringExtra(CAPTION_EXTRA);
-    leftIsRecent           = intent.getBooleanExtra(LEFT_IS_RECENT_EXTRA, false);
-    initialMediaIsVideoGif = intent.getBooleanExtra(IS_VIDEO_GIF, false);
-    restartItem            = -1;
+    initialMediaUri  = intent.getData();
+    initialMediaType = intent.getType();
+    initialMediaSize = intent.getLongExtra(SIZE_EXTRA, 0);
+    initialCaption   = intent.getStringExtra(CAPTION_EXTRA);
+    leftIsRecent     = intent.getBooleanExtra(LEFT_IS_RECENT_EXTRA, false);
+    restartItem      = -1;
  }

  private void initializeObservers() {
@@ -358,7 +354,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
    if (isMediaInDb()) {
      LoaderManager.getInstance(this).restartLoader(0, null, this);
    } else {
-      mediaPager.setAdapter(new SingleItemPagerAdapter(getSupportFragmentManager(), initialMediaUri, initialMediaType, initialMediaSize, initialMediaIsVideoGif));
+      mediaPager.setAdapter(new SingleItemPagerAdapter(getSupportFragmentManager(), initialMediaUri, initialMediaType, initialMediaSize));

      if (initialCaption != null) {
        detailsContainer.setVisibility(View.VISIBLE);
@@ -636,24 +632,21 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity

  private static class SingleItemPagerAdapter extends FragmentStatePagerAdapter implements MediaItemAdapter {

-    private final Uri     uri;
-    private final String  mediaType;
-    private final long    size;
-    private final boolean isVideoGif;
+    private final Uri    uri;
+    private final String mediaType;
+    private final long   size;

    private MediaPreviewFragment mediaPreviewFragment;

    SingleItemPagerAdapter(@NonNull FragmentManager fragmentManager,
                           @NonNull Uri uri,
                           @NonNull String mediaType,
-                           long size,
-                           boolean isVideoGif)
+                           long size)
    {
      super(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
-      this.uri        = uri;
-      this.mediaType  = mediaType;
-      this.size       = size;
-      this.isVideoGif = isVideoGif;
+      this.uri       = uri;
+      this.mediaType = mediaType;
+      this.size      = size;
    }

    @Override
@@ -664,7 +657,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
    @NonNull
    @Override
    public Fragment getItem(int position) {
-      mediaPreviewFragment = MediaPreviewFragment.newInstance(uri, mediaType, size, true, isVideoGif);
+      mediaPreviewFragment = MediaPreviewFragment.newInstance(uri, mediaType, size, true);
      return mediaPreviewFragment;
    }

--- a/app/src/main/java/org/thoughtcrime/securesms/MuteDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/MuteDialog.java
@@ -7,8 +7,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;

-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
 import java.util.concurrent.TimeUnit;

 public class MuteDialog extends AlertDialog {
@@ -31,7 +29,7 @@ public class MuteDialog extends AlertDialog {
  }

  public static void show(final Context context, final @NonNull MuteSelectionListener listener, @Nullable Runnable cancelListener) {
-    AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context);
+    AlertDialog.Builder builder = new AlertDialog.Builder(context);
    builder.setTitle(R.string.MuteDialog_mute_notifications);
    builder.setItems(R.array.mute_durations, new DialogInterface.OnClickListener() {
      @Override
@@ -40,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,14 +49,13 @@ 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) {
    super.onCreate(bundle, ready);
    assert getSupportActionBar() != null;
    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-    getSupportActionBar().setTitle(R.string.NewConversationActivity__new_message);
  }

  @Override
@@ -97,10 +96,6 @@ public class NewConversationActivity extends ContactSelectionActivity
    return true;
  }

-  @Override
-  public void onSelectionChanged() {
-  }
-
  private void launch(Recipient recipient) {
    long   existingThread = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(recipient.getId());
    Intent intent         = ConversationIntents.createBuilder(this, recipient.getId(), existingThread)
--- 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) {
@@ -65,8 +64,4 @@ public class PushContactSelectionActivity extends ContactSelectionActivity {
    setResult(RESULT_OK, resultIntent);
    finish();
  }
-
-  @Override
-  public void onSelectionChanged() {
-  }
 }
--- 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
@@ -29,6 +29,7 @@ import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.ColorDrawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Vibrator;
@@ -59,11 +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.ReentrantSessionLock;
 import org.thoughtcrime.securesms.crypto.IdentityKeyParcelable;
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
@@ -79,22 +78,27 @@ 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;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
+import org.thoughtcrime.securesms.util.WindowUtil;
 import org.whispersystems.libsignal.IdentityKey;
 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.
 *
@@ -109,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();
@@ -157,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));
@@ -181,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();
@@ -213,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";
@@ -243,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);
@@ -291,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()) {
@@ -409,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);
      }
    }

@@ -606,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 = ReentrantSessionLock.INSTANCE.acquire()) {
-          if (isChecked) {
-            Log.i(TAG, "Saving identity: " + recipientId);
-            DatabaseFactory.getIdentityDatabase(getActivity())
-                           .saveIdentity(recipientId,
-                                         remoteIdentity,
-                                         VerifiedStatus.VERIFIED, false,
-                                         System.currentTimeMillis(), true);
-          } else {
-            DatabaseFactory.getIdentityDatabase(getActivity())
-                           .setVerified(recipientId,
-                                        remoteIdentity,
-                                        VerifiedStatus.DEFAULT);
+            ApplicationDependencies.getJobManager()
+                                   .add(new MultiDeviceVerifiedUpdateJob(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());
    }
  }

@@ -647,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/animation/transitions/CircleAvatarTransition.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/animation/transitions/CircleAvatarTransition.kt
@@ -1,97 +0,0 @@
-package org.thoughtcrime.securesms.animation.transitions
-
-import android.animation.Animator
-import android.animation.ObjectAnimator
-import android.animation.PropertyValuesHolder
-import android.animation.TypeEvaluator
-import android.content.Context
-import android.transition.Transition
-import android.transition.TransitionValues
-import android.util.AttributeSet
-import android.view.View
-import android.view.ViewGroup
-import android.view.animation.AccelerateInterpolator
-import android.view.animation.DecelerateInterpolator
-import android.view.animation.Interpolator
-import androidx.annotation.RequiresApi
-import org.thoughtcrime.securesms.components.AvatarImageView
-
-private const val POSITION_ON_SCREEN = "signal.circleavatartransition.positiononscreen"
-private const val WIDTH = "signal.circleavatartransition.width"
-private const val HEIGHT = "signal.circleavatartransition.height"
-
-/**
- * Custom transition for Circular avatars, because once you have multiple things animating stuff was getting broken and weird.
- */
-@RequiresApi(21)
-class CircleAvatarTransition(context: Context, attrs: AttributeSet?) : Transition(context, attrs) {
-  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 AvatarImageView) {
-      val topLeft = intArrayOf(0, 0)
-      view.getLocationOnScreen(topLeft)
-      transitionValues.values[POSITION_ON_SCREEN] = topLeft
-      transitionValues.values[WIDTH] = view.measuredWidth
-      transitionValues.values[HEIGHT] = view.measuredHeight
-    }
-  }
-
-  override fun createAnimator(sceneRoot: ViewGroup, startValues: TransitionValues?, endValues: TransitionValues?): Animator? {
-    if (startValues == null || endValues == null) {
-      return null
-    }
-
-    val view: View = endValues.view
-    if (view !is AvatarImageView || view.transitionName != "avatar") {
-      return null
-    }
-
-    val startCoords: IntArray = startValues.values[POSITION_ON_SCREEN] as? IntArray ?: intArrayOf(0, 0).apply { view.getLocationOnScreen(this) }
-    val endCoords: IntArray = endValues.values[POSITION_ON_SCREEN] as? IntArray ?: intArrayOf(0, 0).apply { view.getLocationOnScreen(this) }
-
-    val startWidth: Int = startValues.values[WIDTH] as? Int ?: view.measuredWidth
-    val endWidth: Int = endValues.values[WIDTH] as? Int ?: view.measuredWidth
-
-    val startHeight: Int = startValues.values[HEIGHT] as? Int ?: view.measuredHeight
-    val endHeight: Int = endValues.values[HEIGHT] as? Int ?: view.measuredHeight
-
-    val startHeightOffset = (endHeight - startHeight) / 2f
-    val startWidthOffset = (endWidth - startWidth) / 2f
-
-    val translateXHolder = PropertyValuesHolder.ofFloat("translationX", startCoords[0] - endCoords[0] - startWidthOffset, 0f).apply {
-      setEvaluator(FloatInterpolatorEvaluator(DecelerateInterpolator()))
-    }
-    val translateYHolder = PropertyValuesHolder.ofFloat("translationY", startCoords[1] - endCoords[1] - startHeightOffset, 0f).apply {
-      setEvaluator(FloatInterpolatorEvaluator(AccelerateInterpolator()))
-    }
-
-    val widthRatio = startWidth.toFloat() / endWidth
-    val scaleXHolder = PropertyValuesHolder.ofFloat("scaleX", widthRatio, 1f)
-
-    val heightRatio = startHeight.toFloat() / endHeight
-    val scaleYHolder = PropertyValuesHolder.ofFloat("scaleY", heightRatio, 1f)
-
-    return ObjectAnimator.ofPropertyValuesHolder(view, translateXHolder, translateYHolder, scaleXHolder, scaleYHolder)
-  }
-
-  private class FloatInterpolatorEvaluator(
-    private val interpolator: Interpolator
-  ) : TypeEvaluator<Float> {
-
-    override fun evaluate(fraction: Float, startValue: Float, endValue: Float): Float {
-      val interpolatedFraction = interpolator.getInterpolation(fraction)
-      val delta = endValue - startValue
-
-      return delta * interpolatedFraction + startValue
-    }
-  }
-}
--- a/app/src/main/java/org/thoughtcrime/securesms/animation/transitions/WipeDownTransition.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/animation/transitions/WipeDownTransition.kt
@@ -1,63 +0,0 @@
-package org.thoughtcrime.securesms.animation.transitions
-
-import android.animation.Animator
-import android.animation.ObjectAnimator
-import android.animation.RectEvaluator
-import android.content.Context
-import android.graphics.Rect
-import android.transition.Transition
-import android.transition.TransitionValues
-import android.util.AttributeSet
-import android.view.View
-import android.view.ViewGroup
-import androidx.annotation.RequiresApi
-import androidx.core.animation.addListener
-import androidx.fragment.app.FragmentContainerView
-
-private const val BOUNDS = "signal.wipedowntransition.bottom"
-
-/**
- * WipeDownTransition will animate the bottom position of a view such that it "wipes" down the screen to a final position.
- */
-@RequiresApi(21)
-class WipeDownTransition(context: Context, attrs: AttributeSet?) : Transition(context, attrs) {
-  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 ViewGroup) {
-      val rect = Rect()
-      view.getLocalVisibleRect(rect)
-      transitionValues.values[BOUNDS] = rect
-    }
-  }
-
-  override fun createAnimator(sceneRoot: ViewGroup, startValues: TransitionValues?, endValues: TransitionValues?): Animator? {
-    if (startValues == null || endValues == null) {
-      return null
-    }
-
-    val view: View = endValues.view
-    if (view !is FragmentContainerView) {
-      return null
-    }
-
-    val startBottom: Rect = startValues.values[BOUNDS] as? Rect ?: Rect().apply { view.getLocalVisibleRect(this) }
-    val endBottom: Rect = endValues.values[BOUNDS] as? Rect ?: Rect().apply { view.getLocalVisibleRect(this) }
-
-    return ObjectAnimator.ofObject(view, "clipBounds", RectEvaluator(), startBottom, endBottom).apply {
-      addListener(
-        onEnd = {
-          view.clipBounds = null
-        }
-      )
-    }
-  }
-}
--- 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,14 +8,14 @@ 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.components.voice.VoiceNoteDraft;
 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;

 import java.io.IOException;
 import java.util.concurrent.ExecutorService;
@@ -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");

@@ -51,7 +51,7 @@ public class AudioRecorder {
        captureUri = BlobProvider.getInstance()
                                 .forData(new ParcelFileDescriptor.AutoCloseInputStream(fds[0]), 0)
                                 .withMimeType(MediaUtil.AUDIO_AAC)
-                                 .createForDraftAttachmentAsync(context, () -> Log.i(TAG, "Write successful."), e -> Log.w(TAG, "Error during recording", e));
+                                 .createForSingleSessionOnDiskAsync(context, () -> Log.i(TAG, "Write successful."), e -> Log.w(TAG, "Error during recording", e));
        audioCodec = new AudioCodec();

        audioCodec.start(new ParcelFileDescriptor.AutoCloseOutputStream(fds[1]));
@@ -61,10 +61,10 @@ public class AudioRecorder {
    });
  }

-  public @NonNull ListenableFuture<VoiceNoteDraft> stopRecording() {
+  public @NonNull ListenableFuture<Pair<Uri, Long>> stopRecording() {
    Log.i(TAG, "stopRecording()");

-    final SettableFuture<VoiceNoteDraft> future = new SettableFuture<>();
+    final SettableFuture<Pair<Uri, Long>> future = new SettableFuture<>();

    executor.execute(() -> {
      if (audioCodec == null) {
@@ -76,7 +76,7 @@ public class AudioRecorder {

      try {
        long size = MediaUtil.getMediaSize(context, captureUri);
-        sendToFuture(future, new VoiceNoteDraft(captureUri, size));
+        sendToFuture(future, new Pair<>(captureUri, size));
      } catch (IOException ioe) {
        Log.w(TAG, ioe);
        sendToFuture(future, ioe);
@@ -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,7 +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");
+      Util.runOnMain(onFailure);
      return;
    }

@@ -69,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;
    }

@@ -77,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;
      }

@@ -86,58 +92,38 @@ 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;
        }
      }

-      if (attachment instanceof DatabaseAttachment) {
-        try {
-          AttachmentDatabase attachmentDatabase = DatabaseFactory.getAttachmentDatabase(context);
-          DatabaseAttachment dbAttachment       = (DatabaseAttachment) attachment;
-          long               startTime          = System.currentTimeMillis();
+      try {
+        AttachmentDatabase attachmentDatabase = DatabaseFactory.getAttachmentDatabase(context);
+        DatabaseAttachment dbAttachment       = (DatabaseAttachment) attachment;
+        long               startTime          = System.currentTimeMillis();

-          attachmentDatabase.writeAudioHash(dbAttachment.getAttachmentId(), AudioWaveFormData.getDefaultInstance());
+        attachmentDatabase.writeAudioHash(dbAttachment.getAttachmentId(), AudioWaveFormData.getDefaultInstance());

-          Log.i(TAG, String.format("Starting wave form generation (%s)", cacheKey));
+        Log.i(TAG, String.format("Starting wave form generation (%s)", cacheKey));

-          AudioFileInfo fileInfo = generateWaveForm(uri);
+        AudioFileInfo fileInfo = generateWaveForm(uri);

-          Log.i(TAG, String.format(Locale.US, "Audio wave form generation time %d ms (%s)", System.currentTimeMillis() - startTime, cacheKey));
+        Log.i(TAG, String.format(Locale.US, "Audio wave form generation time %d ms (%s)", System.currentTimeMillis() - startTime, cacheKey));

-          attachmentDatabase.writeAudioHash(dbAttachment.getAttachmentId(), fileInfo.toDatabaseProtobuf());
+        attachmentDatabase.writeAudioHash(dbAttachment.getAttachmentId(), fileInfo.toDatabaseProtobuf());

-          WAVE_FORM_CACHE.put(cacheKey, fileInfo);
-          ThreadUtil.runOnMain(() -> onSuccess.accept(fileInfo));
-        } catch (Throwable e) {
-          Log.w(TAG, "Failed to create audio wave form for " + cacheKey, e);
-          ThreadUtil.runOnMain(onFailure);
-        }
-      } else {
-        try {
-          Log.i(TAG, "Not in database and not cached. Generating wave form on-the-fly.");
-
-          long startTime = System.currentTimeMillis();
-
-          Log.i(TAG, String.format("Starting wave form generation (%s)", cacheKey));
-
-          AudioFileInfo fileInfo = generateWaveForm(uri);
-
-          Log.i(TAG, String.format(Locale.US, "Audio wave form generation time %d ms (%s)", System.currentTimeMillis() - startTime, cacheKey));
-
-          WAVE_FORM_CACHE.put(cacheKey, fileInfo);
-          ThreadUtil.runOnMain(() -> onSuccess.accept(fileInfo));
-        } catch (IOException e) {
-          Log.w(TAG, "Failed to create audio wave form for " + cacheKey, e);
-          ThreadUtil.runOnMain(onFailure);
-        }
+        WAVE_FORM_CACHE.put(cacheKey, fileInfo);
+        Util.runOnMain(() -> onSuccess.accept(fileInfo));
+      } catch (Throwable e) {
+        Log.w(TAG, "Failed to create audio wave form for " + cacheKey, e);
+        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,28 +25,20 @@ 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;
 import org.thoughtcrime.securesms.database.OneTimePreKeyDatabase;
-import org.thoughtcrime.securesms.database.PendingRetryReceiptDatabase;
 import org.thoughtcrime.securesms.database.SearchDatabase;
-import org.thoughtcrime.securesms.database.SenderKeyDatabase;
-import org.thoughtcrime.securesms.database.SenderKeySharedDatabase;
 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.service.PendingRetryReceiptManager;
 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;
@@ -73,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,
@@ -81,22 +75,21 @@ public class FullBackupExporter extends FullBackupBase {
    SessionDatabase.TABLE_NAME,
    SearchDatabase.SMS_FTS_TABLE_NAME,
    SearchDatabase.MMS_FTS_TABLE_NAME,
-    EmojiSearchDatabase.TABLE_NAME,
-    SenderKeyDatabase.TABLE_NAME,
-    SenderKeySharedDatabase.TABLE_NAME,
-    PendingRetryReceiptDatabase.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);
    }
  }

@@ -105,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);
@@ -138,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());
@@ -194,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
  {
@@ -219,11 +176,11 @@ public class FullBackupExporter extends FullBackupBase {
        String type = cursor.getString(2);

        if (sql != null) {
-          boolean isSmsFtsSecretTable   = name != null && !name.equals(SearchDatabase.SMS_FTS_TABLE_NAME) && name.startsWith(SearchDatabase.SMS_FTS_TABLE_NAME);
-          boolean isMmsFtsSecretTable   = name != null && !name.equals(SearchDatabase.MMS_FTS_TABLE_NAME) && name.startsWith(SearchDatabase.MMS_FTS_TABLE_NAME);
-          boolean isEmojiFtsSecretTable = name != null && !name.equals(EmojiSearchDatabase.TABLE_NAME) && name.startsWith(EmojiSearchDatabase.TABLE_NAME);

-          if (!isSmsFtsSecretTable && !isMmsFtsSecretTable && !isEmojiFtsSecretTable) {
+          boolean isSmsFtsSecretTable = name != null && !name.equals(SearchDatabase.SMS_FTS_TABLE_NAME) && name.startsWith(SearchDatabase.SMS_FTS_TABLE_NAME);
+          boolean isMmsFtsSecretTable = name != null && !name.equals(SearchDatabase.MMS_FTS_TABLE_NAME) && name.startsWith(SearchDatabase.MMS_FTS_TABLE_NAME);
+
+          if (!isSmsFtsSecretTable && !isMmsFtsSecretTable) {
            if ("table".equals(type)) {
              tables.add(name);
            }
@@ -237,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);
@@ -282,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);
        }
      }
    }
@@ -295,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));
@@ -320,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));
@@ -339,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 {
@@ -367,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;
@@ -478,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());
    }
@@ -596,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,10 +115,9 @@ 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 || isForEmojiSecretTable || isForSqliteSecretTable) {
+    if (isForSmsFtsSecretTable || isForMmsFtsSecretTable || isForSqliteSecretTable) {
      Log.i(TAG, "Ignoring import for statement: " + statement.getStatement());
      return;
    }
@@ -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
@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.view.View;
+import android.widget.ViewSwitcher;

 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
@@ -17,7 +18,7 @@ import com.google.android.material.snackbar.Snackbar;
 import org.thoughtcrime.securesms.ContactSelectionListFragment;
 import org.thoughtcrime.securesms.PassphraseRequiredActivity;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.components.ContactFilterView;
+import org.thoughtcrime.securesms.components.ContactFilterToolbar;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
@@ -46,26 +47,27 @@ public class BlockedUsersActivity extends PassphraseRequiredActivity implements

    viewModel = ViewModelProviders.of(this, factory).get(BlockedUsersViewModel.class);

-    Toolbar           toolbar           = findViewById(R.id.toolbar);
-    ContactFilterView contactFilterView = findViewById(R.id.contact_filter_edit_text);
-    View              container         = findViewById(R.id.fragment_container);
+    ViewSwitcher         viewSwitcher         = findViewById(R.id.toolbar_switcher);
+    Toolbar              toolbar              = findViewById(R.id.toolbar);
+    ContactFilterToolbar contactFilterToolbar = findViewById(R.id.filter_toolbar);
+    View                 container            = findViewById(R.id.fragment_container);

    toolbar.setNavigationOnClickListener(unused -> onBackPressed());
-    contactFilterView.setOnFilterChangedListener(query -> {
+    contactFilterToolbar.setNavigationOnClickListener(unused -> onBackPressed());
+    contactFilterToolbar.setOnFilterChangedListener(query -> {
      Fragment fragment = getSupportFragmentManager().findFragmentByTag(CONTACT_SELECTION_FRAGMENT);
      if (fragment != null) {
        ((ContactSelectionListFragment) fragment).setQueryFilter(query);
      }
    });
-    contactFilterView.setHint(R.string.BlockedUsersActivity__add_blocked_user);
+    contactFilterToolbar.setHint(R.string.BlockedUsersActivity__add_blocked_user);

    //noinspection CodeBlock2Expr
    getSupportFragmentManager().addOnBackStackChangedListener(() -> {
+      viewSwitcher.setDisplayedChild(getSupportFragmentManager().getBackStackEntryCount());
+
      if (getSupportFragmentManager().getBackStackEntryCount() == 1) {
-        contactFilterView.setVisibility(View.VISIBLE);
-        contactFilterView.focusAndShowKeyboard();
-      } else {
-        contactFilterView.setVisibility(View.GONE);
+        contactFilterToolbar.focusAndShowKeyboard();
      }
    });

@@ -117,15 +119,13 @@ public class BlockedUsersActivity extends PassphraseRequiredActivity implements

  }

-  @Override
-  public void onSelectionChanged() {
-  }
-
  @Override
  public void handleAddUserToBlockedList() {
    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);
@@ -166,6 +166,6 @@ public class BlockedUsersActivity extends PassphraseRequiredActivity implements
        throw new IllegalArgumentException("Unsupported event type " + event);
    }

-    Snackbar.make(view, getString(messageResId, displayName), Snackbar.LENGTH_SHORT).setTextColor(Color.WHITE).show();
+    Snackbar.make(view, getString(messageResId, displayName), Snackbar.LENGTH_SHORT).show();
  }
 }
--- 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,23 +42,19 @@ import java.util.concurrent.TimeUnit;

 public final class AudioView extends FrameLayout {

-  private static final String TAG = Log.tag(AudioView.class);
-
-  private static final int MODE_NORMAL = 0;
-  private static final int MODE_SMALL  = 1;
-  private static final int MODE_DRAFT  = 2;
+  private static final String TAG = AudioView.class.getSimpleName();

  private static final int FORWARDS =  1;
  private static final int REVERSE  = -1;

-  @NonNull  private final AnimatingToggle     controlToggle;
-  @NonNull  private final View                progressAndPlay;
-  @NonNull  private final LottieAnimationView playPauseButton;
-  @NonNull  private final ImageView           downloadButton;
-  @Nullable private final ProgressWheel       circleProgress;
-  @NonNull  private final SeekBar             seekBar;
-            private final boolean             smallView;
-            private final boolean             autoRewind;
+  @NonNull private final AnimatingToggle     controlToggle;
+  @NonNull private final View                progressAndPlay;
+  @NonNull private final LottieAnimationView playPauseButton;
+  @NonNull private final ImageView           downloadButton;
+  @NonNull private final ProgressWheel       circleProgress;
+  @NonNull private final SeekBar             seekBar;
+           private final boolean             smallView;
+           private final boolean             autoRewind;

  @Nullable private final TextView duration;

@@ -91,23 +86,10 @@ public final class AudioView extends FrameLayout {
    try {
      typedArray = context.getTheme().obtainStyledAttributes(attrs, R.styleable.AudioView, 0, 0);

-      int mode   = typedArray.getInteger(R.styleable.AudioView_audioView_mode, MODE_NORMAL);
-      smallView  = mode == MODE_SMALL;
+      smallView  = typedArray.getBoolean(R.styleable.AudioView_small, false);
      autoRewind = typedArray.getBoolean(R.styleable.AudioView_autoRewind, false);

-      switch (mode) {
-        case MODE_NORMAL:
-          inflate(context, R.layout.audio_view, this);
-          break;
-        case MODE_SMALL:
-          inflate(context, R.layout.audio_view_small, this);
-          break;
-        case MODE_DRAFT:
-          inflate(context, R.layout.audio_view_draft, this);
-          break;
-        default:
-          throw new IllegalStateException("Unsupported mode: " + mode);
-      }
+      inflate(context, smallView ? R.layout.audio_view_small : R.layout.audio_view, this);

      this.controlToggle   = findViewById(R.id.control_toggle);
      this.playPauseButton = findViewById(R.id.play);
@@ -127,7 +109,7 @@ public final class AudioView extends FrameLayout {
      this.waveFormUnplayedBarsColor = typedArray.getColor(R.styleable.AudioView_waveformUnplayedBarsColor, Color.WHITE);
      this.waveFormThumbTint         = typedArray.getColor(R.styleable.AudioView_waveformThumbTint, Color.WHITE);

-      setProgressAndPlayBackgroundTint(typedArray.getColor(R.styleable.AudioView_progressAndPlayTint, Color.BLACK));
+      progressAndPlay.getBackground().setColorFilter(typedArray.getColor(R.styleable.AudioView_progressAndPlayTint, Color.BLACK), PorterDuff.Mode.SRC_IN);
    } finally {
      if (typedArray != null) {
        typedArray.recycle();
@@ -147,10 +129,6 @@ public final class AudioView extends FrameLayout {
    EventBus.getDefault().unregister(this);
  }

-  public void setProgressAndPlayBackgroundTint(@ColorInt int color) {
-    progressAndPlay.getBackground().setColorFilter(color, PorterDuff.Mode.SRC_IN);
-  }
-
  public Observer<VoiceNotePlaybackState> getPlaybackStateObserver() {
    return playbackStateObserver;
  }
@@ -179,20 +157,16 @@ public final class AudioView extends FrameLayout {
      controlToggle.displayQuick(downloadButton);
      seekBar.setEnabled(false);
      downloadButton.setOnClickListener(new DownloadClickedListener(audio));
-      if (circleProgress != null) {
-        if (circleProgress.isSpinning()) circleProgress.stopSpinning();
-        circleProgress.setVisibility(View.GONE);
-      }
+      if (circleProgress.isSpinning()) circleProgress.stopSpinning();
+      circleProgress.setVisibility(View.GONE);
    } else if (showControls && audio.getTransferState() == AttachmentDatabase.TRANSFER_PROGRESS_STARTED) {
      controlToggle.displayQuick(progressAndPlay);
      seekBar.setEnabled(false);
-      if (circleProgress != null) {
-        circleProgress.setVisibility(View.VISIBLE);
-        circleProgress.spin();
-      }
+      circleProgress.setVisibility(View.VISIBLE);
+      circleProgress.spin();
    } else {
      seekBar.setEnabled(true);
-      if (circleProgress != null && circleProgress.isSpinning()) circleProgress.stopSpinning();
+      if (circleProgress.isSpinning()) circleProgress.stopSpinning();
      showPlayButton();
    }

@@ -236,11 +210,10 @@ public final class AudioView extends FrameLayout {

  private void onPlaybackState(@NonNull VoiceNotePlaybackState voiceNotePlaybackState) {
    onDuration(voiceNotePlaybackState.getUri(), voiceNotePlaybackState.getTrackDuration());
+    onStart(voiceNotePlaybackState.getUri(), voiceNotePlaybackState.isAutoReset());
    onProgress(voiceNotePlaybackState.getUri(),
               (double) voiceNotePlaybackState.getPlayheadPositionMillis() / voiceNotePlaybackState.getTrackDuration(),
               voiceNotePlaybackState.getPlayheadPositionMillis());
-    onSpeedChanged(voiceNotePlaybackState.getUri(), voiceNotePlaybackState.getSpeed());
-    onStart(voiceNotePlaybackState.getUri(), voiceNotePlaybackState.isPlaying(), voiceNotePlaybackState.isAutoReset());
  }

  private void onDuration(@NonNull Uri uri, long durationMillis) {
@@ -249,8 +222,8 @@ public final class AudioView extends FrameLayout {
    }
  }

-  private void onStart(@NonNull Uri uri, boolean statePlaying, boolean autoReset) {
-    if (!isTarget(uri) || !statePlaying) {
+  private void onStart(@NonNull Uri uri, boolean autoReset) {
+    if (!isTarget(uri)) {
      if (hasAudioUri()) {
        onStop(audioSlide.getUri(), autoReset);
      }
@@ -300,12 +273,6 @@ public final class AudioView extends FrameLayout {
    }
  }

-  private void onSpeedChanged(@NonNull Uri uri, float speed) {
-    if (callbacks != null) {
-      callbacks.onSpeedChanged(speed, isTarget(uri));
-    }
-  }
-
  private boolean isTarget(@NonNull Uri uri) {
    return hasAudioUri() && Objects.equals(uri, audioSlide.getUri());
  }
@@ -350,7 +317,7 @@ public final class AudioView extends FrameLayout {
      duration.setText(getResources().getString(R.string.AudioView_duration, remainingSecs / 60, remainingSecs % 60));
    }

-    if (smallView && circleProgress != null) {
+    if (smallView) {
      circleProgress.setInstantProgress(seekBar.getProgress() == 0 ? 1 : progress);
    }
  }
@@ -361,10 +328,7 @@ public final class AudioView extends FrameLayout {
                                                    new LottieValueCallback<>(new SimpleColorFilter(foregroundTint))));

    this.downloadButton.setColorFilter(foregroundTint, PorterDuff.Mode.SRC_IN);
-
-    if (circleProgress != null) {
-      this.circleProgress.setBarColor(foregroundTint);
-    }
+    this.circleProgress.setBarColor(foregroundTint);

    if (this.duration != null) {
      this.duration.setTextColor(foregroundTint);
@@ -407,14 +371,11 @@ public final class AudioView extends FrameLayout {
  }

  private void showPlayButton() {
-    if (circleProgress != null) {
-      if (!smallView) {
-        circleProgress.setVisibility(GONE);
-      } else if (seekBar.getProgress() == 0) {
-        circleProgress.setInstantProgress(1);
-      }
+    if (!smallView) {
+      circleProgress.setVisibility(GONE);
+    } else if (seekBar.getProgress() == 0) {
+      circleProgress.setInstantProgress(1);
    }
-
    playPauseButton.setVisibility(VISIBLE);
    controlToggle.displayQuick(progressAndPlay);
  }
@@ -489,8 +450,6 @@ public final class AudioView extends FrameLayout {
      if (callbacks != null) {
        if (wasPlaying) {
          callbacks.onSeekTo(audioSlide.getUri(), getProgress());
-        } else {
-          callbacks.onProgressUpdated(durationMillis, Math.round(durationMillis * getProgress()));
        }
      }
    }
@@ -505,7 +464,7 @@ public final class AudioView extends FrameLayout {

  @Subscribe(sticky = true, threadMode = ThreadMode.MAIN)
  public void onEventAsync(final PartProgressEvent event) {
-    if (audioSlide != null && circleProgress != null && event.attachment.equals(audioSlide.asAttachment())) {
+    if (audioSlide != null && event.attachment.equals(audioSlide.asAttachment())) {
      circleProgress.setInstantProgress(((float) event.progress) / event.total);
    }
  }
@@ -515,7 +474,6 @@ public final class AudioView extends FrameLayout {
    void onPause(@NonNull Uri audioUri);
    void onSeekTo(@NonNull Uri audioUri, double progress);
    void onStopAndReset(@NonNull Uri audioUri);
-    void onSpeedChanged(float speed, boolean isPlaying);
    void onProgressUpdated(long durationMillis, long playheadMillis);
  }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
@@ -2,51 +2,35 @@ 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.Rect;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;

-import androidx.annotation.DrawableRes;
-import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.Px;
 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 com.bumptech.glide.request.target.SimpleTarget;
-import com.bumptech.glide.request.transition.Transition;

-import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.components.settings.conversation.ConversationSettingsActivity;
+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.GlideRequest;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 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 {
@@ -55,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();
@@ -77,9 +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 FixedSizeTarget                 fixedSizeTarget;

  private @Nullable RecipientContactPhoto recipientContactPhoto;
  private @NonNull  Drawable              unknownRecipientDrawable;
@@ -99,30 +80,23 @@ public final class AvatarImageView extends AppCompatImageView {

    if (attrs != null) {
      TypedArray typedArray = context.getTheme().obtainStyledAttributes(attrs, R.styleable.AvatarImageView, 0, 0);
-      inverted = typedArray.getBoolean(R.styleable.AvatarImageView_inverted, false);
-      size     = typedArray.getInt(R.styleable.AvatarImageView_fallbackImageSize, SIZE_LARGE);
+      inverted              = typedArray.getBoolean(R.styleable.AvatarImageView_inverted, false);
+      size                  = typedArray.getInt(R.styleable.AvatarImageView_fallbackImageSize, SIZE_LARGE);
      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;
-  }
-
-  @Override
-  public void setClipBounds(Rect clipBounds) {
-    super.setClipBounds(clipBounds);
+    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);

@@ -144,25 +118,14 @@ 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);
    }
  }

-  public AvatarOptions.Builder buildOptions() {
-    return new AvatarOptions.Builder(this);
-  }
-
  /**
   * Shows self as the note to self icon.
   */
@@ -182,78 +145,44 @@ public final class AvatarImageView extends AppCompatImageView {
  }

  public void setAvatar(@NonNull GlideRequests requestManager, @Nullable Recipient recipient, boolean quickContactEnabled, boolean useSelfProfileAvatar) {
-    setAvatar(requestManager, recipient, new AvatarOptions.Builder(this)
-                                                          .withUseSelfProfileAvatar(useSelfProfileAvatar)
-                                                          .withQuickContactEnabled(quickContactEnabled)
-                                                          .build());
-  }
-
-  private void setAvatar(@Nullable Recipient recipient, @NonNull AvatarOptions avatarOptions) {
-    setAvatar(GlideApp.with(this), recipient, avatarOptions);
-  }
-
-  private void setAvatar(@NonNull GlideRequests requestManager, @Nullable Recipient recipient, @NonNull AvatarOptions avatarOptions) {
    if (recipient != null) {
-      RecipientContactPhoto photo = (recipient.isSelf() && avatarOptions.useSelfProfileAvatar) ? new RecipientContactPhoto(recipient,
-                                                                                                                           new ProfileContactPhoto(Recipient.self(),
-                                                                                                                                                   Recipient.self().getProfileAvatar()))
-                                                                                               : new RecipientContactPhoto(recipient);
+      RecipientContactPhoto photo = (recipient.isSelf() && useSelfProfileAvatar) ? new RecipientContactPhoto(recipient,
+                                                                                                             new ProfileContactPhoto(Recipient.self(),
+                                                                                                                                     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);
-
-        if (fixedSizeTarget != null) {
-          requestManager.clear(fixedSizeTarget);
-        }
+        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;
-
-          GlideRequest<Drawable> request = requestManager.load(photo.contactPhoto)
-                                                         .fallback(fallbackContactPhotoDrawable)
-                                                         .error(fallbackContactPhotoDrawable)
-                                                         .diskCacheStrategy(DiskCacheStrategy.ALL)
-                                                         .downsample(DownsampleStrategy.CENTER_INSIDE)
-                                                         .transform(new MultiTransformation<>(transforms));
-
-          if (avatarOptions.fixedSize > 0) {
-            fixedSizeTarget = new FixedSizeTarget(avatarOptions.fixedSize);
-            request.into(fixedSizeTarget);
-          } else {
-            request.into(this);
-          }
-
+          requestManager.load(photo.contactPhoto)
+                        .fallback(fallbackContactPhotoDrawable)
+                        .error(fallbackContactPhotoDrawable)
+                        .diskCacheStrategy(DiskCacheStrategy.ALL)
+                        .circleCrop()
+                        .into(this);
        } else {
          setImageDrawable(fallbackContactPhotoDrawable);
        }
      }

-      setAvatarClickHandler(recipient, avatarOptions.quickContactEnabled);
+      setAvatarClickHandler(recipient, quickContactEnabled);
    } else {
      recipientContactPhoto = null;
      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);
    }
  }

@@ -262,30 +191,31 @@ public final class AvatarImageView extends AppCompatImageView {
      super.setOnClickListener(v -> {
        Context context = getContext();
        if (recipient.isPushGroup()) {
-          context.startActivity(ConversationSettingsActivity.forGroup(context, recipient.requireGroupId().requirePush()),
-                                ConversationSettingsActivity.createTransitionBundle(context, this));
+          context.startActivity(ManageGroupActivity.newIntent(context, recipient.requireGroupId().requirePush()),
+                                ManageGroupActivity.createTransitionBundle(context, this));
        } else {
          if (context instanceof FragmentActivity) {
            RecipientBottomSheetDialogFragment.create(recipient.getId(), null)
                                              .show(((FragmentActivity) context).getSupportFragmentManager(), "BOTTOM");
          } else {
-            context.startActivity(ConversationSettingsActivity.forRecipient(context, recipient.getId()),
-                                  ConversationSettingsActivity.createTransitionBundle(context, this));
+            context.startActivity(ManageRecipientActivity.newIntent(context, recipient.getId()),
+                                  ManageRecipientActivity.createTransitionBundle(context, this));
          }
        }
      });
    } 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)
@@ -296,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;
@@ -326,70 +246,9 @@ 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);
    }
  }
-
-  private final class FixedSizeTarget extends SimpleTarget<Drawable> {
-
-    FixedSizeTarget(int size) {
-      super(size, size);
-    }
-
-    @Override
-    public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
-      setImageDrawable(resource);
-    }
-  }
-
-  public static final class AvatarOptions {
-
-    private final boolean quickContactEnabled;
-    private final boolean useSelfProfileAvatar;
-    private final int     fixedSize;
-
-    private AvatarOptions(@NonNull Builder builder) {
-      this.quickContactEnabled  = builder.quickContactEnabled;
-      this.useSelfProfileAvatar = builder.useSelfProfileAvatar;
-      this.fixedSize            = builder.fixedSize;
-    }
-
-    public static final class Builder {
-
-      private final AvatarImageView avatarImageView;
-
-      private boolean quickContactEnabled  = false;
-      private boolean useSelfProfileAvatar = false;
-      private int     fixedSize            = -1;
-
-      private Builder(@NonNull AvatarImageView avatarImageView) {
-        this.avatarImageView = avatarImageView;
-      }
-
-      public @NonNull Builder withQuickContactEnabled(boolean quickContactEnabled) {
-        this.quickContactEnabled = quickContactEnabled;
-        return this;
-      }
-
-      public @NonNull Builder withUseSelfProfileAvatar(boolean useSelfProfileAvatar) {
-        this.useSelfProfileAvatar = useSelfProfileAvatar;
-        return this;
-      }
-
-      public @NonNull Builder withFixedSize(@Px @IntRange(from = 1) int fixedSize) {
-        this.fixedSize = fixedSize;
-        return this;
-      }
-
-      public AvatarOptions build() {
-        return new AvatarOptions(this);
-      }
-
-      public void load(@Nullable Recipient recipient) {
-        avatarImageView.setAvatar(recipient, build());
-      }
-    }
-  }
 }
--- 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/ContactFilterToolbar.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ContactFilterToolbar.java
@@ -10,7 +10,6 @@ import android.util.AttributeSet;
 import android.view.TouchDelegate;
 import android.view.View;
 import android.widget.EditText;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;

@@ -21,8 +20,9 @@ import androidx.core.widget.TextViewCompat;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.util.ServiceUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;
+import org.thoughtcrime.securesms.util.views.DarkOverflowToolbar;

-public final class ContactFilterView extends FrameLayout {
+public final class ContactFilterToolbar extends DarkOverflowToolbar {
  private   OnFilterChangedListener listener;

  private final EditText        searchText;
@@ -32,17 +32,17 @@ public final class ContactFilterView extends FrameLayout {
  private final ImageView       clearToggle;
  private final LinearLayout    toggleContainer;

-  public ContactFilterView(Context context) {
+  public ContactFilterToolbar(Context context) {
    this(context, null);
  }

-  public ContactFilterView(Context context, AttributeSet attrs) {
+  public ContactFilterToolbar(Context context, AttributeSet attrs) {
    this(context, attrs, R.attr.toolbarStyle);
  }

-  public ContactFilterView(Context context, AttributeSet attrs, int defStyleAttr) {
+  public ContactFilterToolbar(Context context, AttributeSet attrs, int defStyleAttr) {
    super(context, attrs, defStyleAttr);
-    inflate(context, R.layout.contact_filter_view, this);
+    inflate(context, R.layout.contact_filter_toolbar, this);

    this.searchText      = findViewById(R.id.search_view);
    this.toggle          = findViewById(R.id.button_toggle);
@@ -99,6 +99,8 @@ public final class ContactFilterView extends FrameLayout {
      }
    });

+    setLogo(null);
+    setContentInsetStartWithNavigation(0);
    expandTapArea(toggleContainer, dialpadToggle);
    applyAttributes(searchText, context, attrs, defStyleAttr);
    searchText.requestFocus();
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ControllableTabLayout.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ControllableTabLayout.java
@@ -4,9 +4,6 @@ import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;

-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
 import com.google.android.material.tabs.TabLayout;

 import java.util.List;
@@ -18,8 +15,6 @@ public class ControllableTabLayout extends TabLayout {

  private List<View> touchables;

-  private NewTabListener newTabListener;
-
  public ControllableTabLayout(Context context) {
    super(context);
  }
@@ -44,28 +39,4 @@ public class ControllableTabLayout extends TabLayout {

    super.setEnabled(enabled);
  }
-
-  public void setNewTabListener(@Nullable NewTabListener newTabListener) {
-    this.newTabListener = newTabListener;
-  }
-
-  @Override
-  public @NonNull Tab newTab() {
-    Tab tab = super.newTab();
-
-    if (newTabListener != null) {
-      newTabListener.onNewTab(tab);
-    }
-
-    return tab;
-  }
-
-  /**
-   * Allows implementor to modify tabs when they are created, before they are added to the tab layout.
-   * This is useful for loading custom views, to ensure that time is not spent inflating these views
-   * as the user is switching between pages.
-   */
-  public interface NewTabListener {
-    void onNewTab(@NonNull Tab tab);
-  }
 }
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
@@ -1,41 +1,34 @@
 package org.thoughtcrime.securesms.components;

 import android.Manifest;
-import android.animation.Animator;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
-import android.graphics.Rect;
+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.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.constraintlayout.widget.ConstraintSet;

 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.signal.core.util.logging.Log;
+import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
 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.Projection;
+import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.dualsim.SubscriptionInfoCompat;
 import org.thoughtcrime.securesms.util.dualsim.SubscriptionManagerCompat;
@@ -44,24 +37,17 @@ import org.whispersystems.libsignal.util.guava.Optional;
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;

-public class ConversationItemFooter extends ConstraintLayout {
+public class ConversationItemFooter extends LinearLayout {

-  private TextView                    dateView;
-  private TextView                    simView;
-  private ExpirationTimerView         timerView;
-  private ImageView                   insecureIndicatorView;
-  private DeliveryStatusView          deliveryStatusView;
-  private boolean                     onlyShowSendingStatus;
-  private TextView                    audioDuration;
-  private LottieAnimationView         revealDot;
-  private PlaybackSpeedToggleTextView playbackSpeedToggleTextView;
-  private boolean                     isOutgoing;
-  private boolean                     hasShrunkDate;
-
-  private OnTouchDelegateChangedListener onTouchDelegateChangedListener;
-
-  private final Rect speedToggleHitRect = new Rect();
-  private final int  touchTargetSize    = ViewUtil.dpToPx(48);
+  private TextView            dateView;
+  private TextView            simView;
+  private ExpirationTimerView timerView;
+  private ImageView           insecureIndicatorView;
+  private DeliveryStatusView  deliveryStatusView;
+  private boolean             onlyShowSendingStatus;
+  private View                audioSpace;
+  private TextView            audioDuration;
+  private LottieAnimationView revealDot;

  public ConversationItemFooter(Context context) {
    super(context);
@@ -79,55 +65,24 @@ public class ConversationItemFooter extends ConstraintLayout {
  }

  private void init(@Nullable AttributeSet attrs) {
-    final TypedArray typedArray;
+    inflate(getContext(), R.layout.conversation_item_footer, this);
+
+    dateView              = findViewById(R.id.footer_date);
+    simView               = findViewById(R.id.footer_sim_info);
+    timerView             = findViewById(R.id.footer_expiration_timer);
+    insecureIndicatorView = findViewById(R.id.footer_insecure_indicator);
+    deliveryStatusView    = findViewById(R.id.footer_delivery_status);
+    audioDuration         = findViewById(R.id.footer_audio_duration);
+    audioSpace            = findViewById(R.id.footer_audio_duration_space);
+    revealDot             = findViewById(R.id.footer_revealed_dot);
+
    if (attrs != null) {
-      typedArray = getContext().getTheme().obtainStyledAttributes(attrs, R.styleable.ConversationItemFooter, 0, 0);
-    } else {
-      typedArray = null;
-    }
-
-    final @LayoutRes int contentId;
-    if (typedArray != null) {
-      int mode = typedArray.getInt(R.styleable.ConversationItemFooter_footer_mode, 0);
-      isOutgoing = mode == 0;
-
-      if (isOutgoing) {
-        contentId = R.layout.conversation_item_footer_outgoing;
-      } else {
-        contentId = R.layout.conversation_item_footer_incoming;
-      }
-    } else {
-      contentId  = R.layout.conversation_item_footer_outgoing;
-      isOutgoing = true;
-    }
-
-    inflate(getContext(), contentId, this);
-
-    dateView                    = findViewById(R.id.footer_date);
-    simView                     = findViewById(R.id.footer_sim_info);
-    timerView                   = findViewById(R.id.footer_expiration_timer);
-    insecureIndicatorView       = findViewById(R.id.footer_insecure_indicator);
-    deliveryStatusView          = findViewById(R.id.footer_delivery_status);
-    audioDuration               = findViewById(R.id.footer_audio_duration);
-    revealDot                   = findViewById(R.id.footer_revealed_dot);
-    playbackSpeedToggleTextView = findViewById(R.id.footer_audio_playback_speed_toggle);
-
-    if (typedArray != null) {
+      TypedArray typedArray = getContext().getTheme().obtainStyledAttributes(attrs, R.styleable.ConversationItemFooter, 0, 0);
      setTextColor(typedArray.getInt(R.styleable.ConversationItemFooter_footer_text_color, getResources().getColor(R.color.core_white)));
      setIconColor(typedArray.getInt(R.styleable.ConversationItemFooter_footer_icon_color, getResources().getColor(R.color.core_white)));
      setRevealDotColor(typedArray.getInt(R.styleable.ConversationItemFooter_footer_reveal_dot_color, getResources().getColor(R.color.core_white)));
      typedArray.recycle();
    }
-
-    dateView.addOnLayoutChangeListener((v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {
-      if (oldLeft != left || oldRight != right) {
-        notifyTouchDelegateChanged(getPlaybackSpeedToggleTouchDelegateRect(), playbackSpeedToggleTextView);
-      }
-    });
-  }
-
-  public void setOnTouchDelegateChangedListener(@Nullable OnTouchDelegateChangedListener onTouchDelegateChangedListener) {
-    this.onTouchDelegateChangedListener = onTouchDelegateChangedListener;
  }

  @Override
@@ -142,7 +97,7 @@ public class ConversationItemFooter extends ConstraintLayout {
    presentTimer(messageRecord);
    presentInsecureIndicator(messageRecord);
    presentDeliveryStatus(messageRecord);
-    presentAudioDuration(messageRecord);
+    hideAudioDurationViews();
  }

  public void setAudioDuration(long totalDurationMillis, long currentPostionMillis) {
@@ -150,20 +105,6 @@ public class ConversationItemFooter extends ConstraintLayout {
    audioDuration.setText(getResources().getString(R.string.AudioView_duration, remainingSecs / 60, remainingSecs % 60));
  }

-  public void setPlaybackSpeedListener(@Nullable PlaybackSpeedToggleTextView.PlaybackSpeedListener playbackSpeedListener) {
-    playbackSpeedToggleTextView.setPlaybackSpeedListener(playbackSpeedListener);
-  }
-
-  public void setAudioPlaybackSpeed(float playbackSpeed, boolean isPlaying) {
-    if (isPlaying) {
-      showPlaybackSpeedToggle();
-    } else {
-      hidePlaybackSpeedToggle();
-    }
-
-    playbackSpeedToggleTextView.setCurrentSpeed(playbackSpeed);
-  }
-
  public void setTextColor(int color) {
    dateView.setTextColor(color);
    simView.setTextColor(color);
@@ -180,7 +121,7 @@ public class ConversationItemFooter extends ConstraintLayout {
    revealDot.addValueCallback(
        new KeyPath("**"),
        LottieProperty.COLOR_FILTER,
-        frameInfo -> new PorterDuffColorFilter(color, PorterDuff.Mode.SRC_IN)
+        frameInfo -> new PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP)
    );
  }

@@ -189,106 +130,6 @@ public class ConversationItemFooter extends ConstraintLayout {
    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 notifyTouchDelegateChanged(@NonNull Rect rect, @NonNull View touchDelegate) {
-    if (onTouchDelegateChangedListener != null) {
-      onTouchDelegateChangedListener.onTouchDelegateChanged(rect, touchDelegate);
-    }
-  }
-
-  private void showPlaybackSpeedToggle() {
-    if (hasShrunkDate) {
-      return;
-    }
-
-    hasShrunkDate = true;
-
-    playbackSpeedToggleTextView.animate()
-                               .alpha(1f)
-                               .scaleX(1f)
-                               .scaleY(1f)
-                               .setDuration(150L)
-                               .setListener(new AnimationCompleteListener() {
-                                 @Override
-                                 public void onAnimationEnd(Animator animation) {
-                                   playbackSpeedToggleTextView.setClickable(true);
-                                 }
-                               });
-
-    if (isOutgoing) {
-      dateView.setMaxWidth(ViewUtil.dpToPx(28));
-    } else {
-      ConstraintSet constraintSet = new ConstraintSet();
-      constraintSet.clone(this);
-      constraintSet.constrainMaxWidth(R.id.date_and_expiry_wrapper, ViewUtil.dpToPx(40));
-      constraintSet.applyTo(this);
-    }
-  }
-
-  private void hidePlaybackSpeedToggle() {
-    if (!hasShrunkDate) {
-      return;
-    }
-
-    hasShrunkDate = false;
-
-    playbackSpeedToggleTextView.animate()
-                               .alpha(0f)
-                               .scaleX(0.5f)
-                               .scaleY(0.5f)
-                               .setDuration(150L).setListener(new AnimationCompleteListener() {
-                                 @Override
-                                 public void onAnimationEnd(Animator animation) {
-                                   playbackSpeedToggleTextView.setClickable(false);
-                                   playbackSpeedToggleTextView.clearRequestedSpeed();
-                                 }
-                               });
-
-    if (isOutgoing) {
-      dateView.setMaxWidth(Integer.MAX_VALUE);
-    } else {
-      ConstraintSet constraintSet = new ConstraintSet();
-      constraintSet.clone(this);
-      constraintSet.constrainMaxWidth(R.id.date_and_expiry_wrapper, -1);
-      constraintSet.applyTo(this);
-    }
-  }
-
-  private @NonNull Rect getPlaybackSpeedToggleTouchDelegateRect() {
-    playbackSpeedToggleTextView.getHitRect(speedToggleHitRect);
-
-    int widthOffset  = (touchTargetSize - speedToggleHitRect.width()) / 2;
-    int heightOffset = (touchTargetSize - speedToggleHitRect.height()) / 2;
-
-    speedToggleHitRect.top -= heightOffset;
-    speedToggleHitRect.left -= widthOffset;
-    speedToggleHitRect.right += widthOffset;
-    speedToggleHitRect.bottom += heightOffset;
-
-    return speedToggleHitRect;
-  }
-
  private void presentDate(@NonNull MessageRecord messageRecord, @NonNull Locale locale) {
    dateView.forceLayout();
    if (messageRecord.isFailed()) {
@@ -304,8 +145,6 @@ public class ConversationItemFooter extends ConstraintLayout {
      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()));
    }
@@ -323,7 +162,7 @@ public class ConversationItemFooter extends ConstraintLayout {
        simView.setText(getContext().getString(R.string.ConversationItem_from_s, subscriptionInfo.get().getDisplayName()));
        simView.setVisibility(View.VISIBLE);
      } else if (subscriptionInfo.isPresent()) {
-        simView.setText(getContext().getString(R.string.ConversationItem_to_s, subscriptionInfo.get().getDisplayName()));
+        simView.setText(getContext().getString(R.string.ConversationItem_to_s,  subscriptionInfo.get().getDisplayName()));
        simView.setVisibility(View.VISIBLE);
      } else {
        simView.setVisibility(View.GONE);
@@ -343,19 +182,23 @@ public class ConversationItemFooter extends ConstraintLayout {
        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);
@@ -379,7 +222,7 @@ public class ConversationItemFooter extends ConstraintLayout {
        deliveryStatusView.setNone();
      }
    } else {
-      if (!messageRecord.isOutgoing()) {
+      if (!messageRecord.isOutgoing())  {
        deliveryStatusView.setNone();
      } else if (messageRecord.isPending()) {
        deliveryStatusView.setPending();
@@ -398,13 +241,12 @@ public class ConversationItemFooter extends ConstraintLayout {
      MmsMessageRecord mmsMessageRecord = (MmsMessageRecord) messageRecord;

      if (mmsMessageRecord.getSlideDeck().getAudioSlide() != null) {
-        showAudioDurationViews();
-
-        if (messageRecord.getViewedReceiptCount() > 0) {
-          revealDot.setProgress(1f);
+        if (messageRecord.isOutgoing()) {
+          moveAudioViewsForOutgoing();
        } else {
-          revealDot.setProgress(0f);
+          moveAudioViewsForIncoming();
        }
+        showAudioDurationViews();
      } else {
        hideAudioDurationViews();
      }
@@ -413,19 +255,44 @@ public class ConversationItemFooter extends ConstraintLayout {
    }
  }

+  private void moveAudioViewsForOutgoing() {
+    removeView(audioSpace);
+    removeView(audioDuration);
+    removeView(revealDot);
+    addView(audioSpace, 0);
+    addView(revealDot, 0);
+    addView(audioDuration, 0);
+
+    int padStart = ViewUtil.dpToPx(60);
+    int padLeft  = getLayoutDirection() == LAYOUT_DIRECTION_LTR ? padStart : 0;
+    int padRight = getLayoutDirection() == LAYOUT_DIRECTION_RTL ? padStart : 0;
+
+    audioDuration.setPadding(padLeft, 0, padRight, 0);
+  }
+
+  private void moveAudioViewsForIncoming() {
+    removeView(audioSpace);
+    removeView(audioDuration);
+    removeView(revealDot);
+    addView(audioSpace);
+    addView(revealDot);
+    addView(audioDuration);
+
+    audioDuration.setPadding(0, 0, 0, 0);
+  }
+
  private void showAudioDurationViews() {
+    audioSpace.setVisibility(View.VISIBLE);
    audioDuration.setVisibility(View.VISIBLE);
-    revealDot.setVisibility(View.VISIBLE);
-    playbackSpeedToggleTextView.setVisibility(View.VISIBLE);
+
+    if (FeatureFlags.viewedReceipts()) {
+      revealDot.setVisibility(View.VISIBLE);
+    }
  }

  private void hideAudioDurationViews() {
+    audioSpace.setVisibility(View.GONE);
    audioDuration.setVisibility(View.GONE);
    revealDot.setVisibility(View.GONE);
-    playbackSpeedToggleTextView.setVisibility(View.GONE);
-  }
-
-  public interface OnTouchDelegateChangedListener {
-    void onTouchDelegateChanged(@NonNull Rect delegateRect, @NonNull View delegateView);
  }
 }
--- 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
@@ -4,31 +4,22 @@ import android.content.Context;
 import android.graphics.PorterDuff;
 import android.util.AttributeSet;
 import android.view.View;
-import android.widget.TextView;
+import android.widget.LinearLayout;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.core.content.ContextCompat;
-
-import com.annimon.stream.Stream;

 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.whispersystems.libsignal.util.Pair;

-import java.util.LinkedList;
 import java.util.List;

-public class ConversationTypingView extends ConstraintLayout {
+public class ConversationTypingView extends LinearLayout {

-  private AvatarImageView     avatar1;
-  private AvatarImageView     avatar2;
-  private AvatarImageView     avatar3;
+  private AvatarImageView     avatar;
  private View                bubble;
  private TypingIndicatorView indicator;
-  private TextView            typistCount;

  public ConversationTypingView(Context context, @Nullable AttributeSet attrs) {
    super(context, attrs);
@@ -38,58 +29,27 @@ public class ConversationTypingView extends ConstraintLayout {
  protected void onFinishInflate() {
    super.onFinishInflate();

-    avatar1     = findViewById(R.id.typing_avatar_1);
-    avatar2     = findViewById(R.id.typing_avatar_2);
-    avatar3     = findViewById(R.id.typing_avatar_3);
-    typistCount = findViewById(R.id.typing_count);
-    bubble      = findViewById(R.id.typing_bubble);
-    indicator   = findViewById(R.id.typing_indicator);
+    avatar    = findViewById(R.id.typing_avatar);
+    bubble    = findViewById(R.id.typing_bubble);
+    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;
    }

-    avatar1.setVisibility(GONE);
-    avatar2.setVisibility(GONE);
-    avatar3.setVisibility(GONE);
-    typistCount.setVisibility(GONE);
+    Recipient typist = typists.get(0);
+    bubble.getBackground().setColorFilter(typist.getColor().toConversationColor(getContext()), PorterDuff.Mode.MULTIPLY);

    if (isGroupThread) {
-      presentGroupThreadAvatars(glideRequests, typists);
-    }
-
-    if (hasWallpaper) {
-      bubble.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.conversation_item_wallpaper_bubble_color));
-      typistCount.getBackground().setColorFilter(ContextCompat.getColor(getContext(), R.color.conversation_item_wallpaper_bubble_color), PorterDuff.Mode.SRC_IN);
+      avatar.setAvatar(glideRequests, typist, false);
+      avatar.setVisibility(VISIBLE);
    } else {
-      bubble.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.signal_background_secondary));
-      typistCount.getBackground().setColorFilter(ContextCompat.getColor(getContext(), R.color.signal_background_secondary), PorterDuff.Mode.SRC_IN);
+      avatar.setVisibility(GONE);
    }

    indicator.startAnimation();
  }
-
-  private void presentGroupThreadAvatars(@NonNull GlideRequests glideRequests, @NonNull List<Recipient> typists) {
-    avatar1.setAvatar(glideRequests, typists.get(0), typists.size() == 1);
-    avatar1.setVisibility(VISIBLE);
-
-    if (typists.size() > 1) {
-      avatar2.setAvatar(glideRequests, typists.get(1), false);
-      avatar2.setVisibility(VISIBLE);
-    }
-
-    if (typists.size() == 3) {
-      avatar3.setAvatar(glideRequests, typists.get(2), false);
-      avatar3.setVisibility(VISIBLE);
-    }
-
-    if (typists.size() > 3) {
-      typistCount.setText(getResources().getString(R.string.ConversationTypingView__plus_d, typists.size() - 2));
-      typistCount.setVisibility(VISIBLE);
-    }
-  }
 }
-
--- 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/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