Bump version to 5.2.2

This reverts commit f24020e7b7.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,3 +1,12 @@
+---
+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.
 

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,20 @@
+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.

.github/workflows/android.yml

@@ -14,16 +14,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
 
     - 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;20.0.5594570" --sdk_root=${ANDROID_SDK_ROOT}
-
     - name: Validate Gradle Wrapper
       uses: gradle/wrapper-validation-action@v1
 

.gitignore

@@ -1,6 +1,8 @@
 .classpath
 captures/
 project.properties
+keystore.debug.properties
+keystore.staging.properties
 .project
 .settings
 bin/

app/build.gradle

@@ -2,25 +2,6 @@ import org.signal.signing.ApkSignerUtil
 
 import java.security.MessageDigest
 
-buildscript {
-    repositories {
-        google()
-        maven {
-            url "https://repo1.maven.org/maven2"
-        }
-        jcenter {
-            content {
-                includeVersion 'org.jetbrains.trove4j', 'trove4j', '20160824'
-            }
-        }
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.3'
-        classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.1.0'
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.10'
-    }
-}
-
 apply plugin: 'com.android.application'
 apply plugin: 'com.google.protobuf'
 apply plugin: 'androidx.navigation.safeargs'
@@ -80,20 +61,23 @@ protobuf {
     }
 }
 
-def canonicalVersionCode = 726
-def canonicalVersionName = "4.75.3"
+def canonicalVersionCode = 771
+def canonicalVersionName = "5.2.2"
 
-def postFixSize = 10
+def postFixSize = 100
 def abiPostFix = ['universal'   : 0,
                   'armeabi-v7a' : 1,
                   'arm64-v8a'   : 2,
                   'x86'         : 3,
                   'x86_64'      : 4]
 
+def keystores = [ 'debug'  : loadKeystoreProperties('keystore.debug.properties') ]
+
 android {
-    flavorDimensions "none"
-    compileSdkVersion 29
-    buildToolsVersion '29.0.3'
+    buildToolsVersion BUILD_TOOL_VERSION
+    compileSdkVersion COMPILE_SDK
+
+    flavorDimensions 'distribution', 'environment'
     useLibrary 'org.apache.http.legacy'
 
     dexOptions {
@@ -101,11 +85,13 @@ android {
     }
 
     signingConfigs {
-        staging {
-            storeFile file("${project.rootDir}/dev.keystore")
-            storePassword 'android'
-            keyAlias 'staging'
-            keyPassword 'android'
+        if (keystores.debug != null) {
+            debug {
+                storeFile file("${project.rootDir}/${keystores.debug.storeFile}")
+                storePassword keystores.debug.storePassword
+                keyAlias keystores.debug.keyAlias
+                keyPassword keystores.debug.keyPassword
+            }
         }
     }
 
@@ -113,8 +99,9 @@ android {
         versionCode canonicalVersionCode * postFixSize
         versionName canonicalVersionName
 
-        minSdkVersion 19
-        targetSdkVersion 29
+        minSdkVersion MINIMUM_SDK
+        targetSdkVersion TARGET_SDK
+
         multiDexEnabled true
 
         vectorDrawables.useSupportLibrary = true
@@ -128,6 +115,7 @@ android {
         buildConfigField "String", "SIGNAL_CONTACT_DISCOVERY_URL", "\"https://api.directory.signal.org\""
         buildConfigField "String", "SIGNAL_SERVICE_STATUS_URL", "\"uptime.signal.org\""
         buildConfigField "String", "SIGNAL_KEY_BACKUP_URL", "\"https://api.backup.signal.org\""
+        buildConfigField "String", "SIGNAL_SFU_URL", "\"https://sfu.voip.signal.org\""
         buildConfigField "String", "CONTENT_PROXY_HOST", "\"contentproxy.signal.org\""
         buildConfigField "int", "CONTENT_PROXY_PORT", "443"
         buildConfigField "String", "SIGNAL_AGENT", "\"OWA\""
@@ -160,8 +148,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JAVA_VERSION
+        targetCompatibility JAVA_VERSION
     }
 
     packagingOptions {
@@ -180,6 +168,10 @@ android {
 
     buildTypes {
         debug {
+            if (keystores['debug'] != null) {
+                signingConfig signingConfigs.debug
+            }
+            isDefault true
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'),
                     'proguard/proguard-firebase-messaging.pro',
@@ -203,10 +195,57 @@ android {
             testProguardFiles 'proguard/proguard-automation.pro',
                     'proguard/proguard.cfg'
         }
-        staging {
+        flipper {
             initWith debug
+            isDefault false
+            minifyEnabled false
+            matchingFallbacks = ['debug']
+        }
+        release {
+            minifyEnabled true
+            proguardFiles = buildTypes.debug.proguardFiles
+        }
+        perf {
+            initWith debug
+            isDefault false
+            debuggable false
+            matchingFallbacks = ['debug']
+        }
+    }
+
+    productFlavors {
+        play {
+            dimension 'distribution'
+            isDefault true
+            ext.websiteUpdateUrl = "null"
+            buildConfigField "boolean", "PLAY_STORE_DISABLED", "false"
+            buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
+        }
+
+        website {
+            dimension 'distribution'
+            ext.websiteUpdateUrl = "https://updates.signal.org/android"
+            buildConfigField "boolean", "PLAY_STORE_DISABLED", "true"
+            buildConfigField "String", "NOPLAY_UPDATE_URL", "\"$ext.websiteUpdateUrl\""
+        }
+
+        internal {
+            dimension 'distribution'
+            ext.websiteUpdateUrl = "null"
+            buildConfigField "boolean", "PLAY_STORE_DISABLED", "false"
+            buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
+        }
+
+        prod {
+            dimension 'environment'
+
+            isDefault true
+        }
+
+        staging {
+            dimension 'environment'
+
             applicationIdSuffix ".staging"
-            signingConfig signingConfigs.staging
 
             buildConfigField "String", "SIGNAL_URL", "\"https://textsecure-service-staging.whispersystems.org\""
             buildConfigField "String", "STORAGE_URL", "\"https://storage-staging.signal.org\""
@@ -222,30 +261,6 @@ android {
             buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx\""
             buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdls=\""
         }
-        flipper {
-            initWith debug
-            minifyEnabled false
-        }
-        release {
-            minifyEnabled true
-            proguardFiles = buildTypes.debug.proguardFiles
-        }
-    }
-
-    productFlavors {
-        play {
-            dimension "none"
-            ext.websiteUpdateUrl = "null"
-            buildConfigField "boolean", "PLAY_STORE_DISABLED", "false"
-            buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
-        }
-
-        website {
-            dimension "none"
-            ext.websiteUpdateUrl = "https://updates.signal.org/android"
-            buildConfigField "boolean", "PLAY_STORE_DISABLED", "true"
-            buildConfigField "String", "NOPLAY_UPDATE_URL", "\"$ext.websiteUpdateUrl\""
-        }
     }
 
     android.applicationVariants.all { variant ->
@@ -276,31 +291,30 @@ android {
 dependencies {
     lintChecks project(':lintchecks')
 
-    implementation('androidx.appcompat:appcompat:1.1.0-beta01') {
+    implementation ('androidx.appcompat:appcompat:1.2.0') {
         force = true
     }
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation 'com.google.android.material:material:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.preference:preference:1.0.0'
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation 'androidx.exifinterface:exifinterface:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.navigation:navigation-fragment:2.1.0'
     implementation 'androidx.navigation:navigation-ui:2.1.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:1.0.0-alpha05'
     implementation 'androidx.lifecycle:lifecycle-common-java8:2.1.0'
-    implementation "androidx.camera:camera-core:1.0.0-beta01"
-    implementation "androidx.camera:camera-camera2:1.0.0-beta01"
-    implementation "androidx.camera:camera-lifecycle:1.0.0-beta01"
+    implementation "androidx.camera:camera-core:1.0.0-beta11"
+    implementation "androidx.camera:camera-camera2:1.0.0-beta11"
+    implementation "androidx.camera:camera-lifecycle:1.0.0-beta11"
+    implementation "androidx.camera:camera-view:1.0.0-alpha18"
     implementation "androidx.concurrent:concurrent-futures:1.0.0"
     implementation "androidx.autofill:autofill:1.0.0"
-    implementation "androidx.paging:paging-common:2.1.2"
-    implementation "androidx.paging:paging-runtime:2.1.2"
     implementation 'com.google.firebase:firebase-ml-vision:24.0.3'
     implementation 'com.google.firebase:firebase-ml-vision-face-model:20.0.1'
 
@@ -321,11 +335,16 @@ dependencies {
     implementation 'org.signal:aesgcmprovider:0.0.3'
 
     implementation project(':libsignal-service')
-    implementation 'org.signal:zkgroup-android:0.7.0'
+    implementation project(':paging')
+    implementation project(':core-util')
+    implementation project(':video')
 
+    implementation 'org.signal:zkgroup-android:0.7.0'
+    implementation 'org.whispersystems:signal-client-android:0.1.5'
+    implementation 'com.google.protobuf:protobuf-javalite:3.10.0'
     implementation 'org.signal:argon2:13.1@aar'
 
-    implementation 'org.signal:ringrtc-android:2.7.3'
+    implementation 'org.signal:ringrtc-android:2.8.9'
 
     implementation "me.leolin:ShortcutBadger:1.1.16"
     implementation 'se.emilsjolander:stickylistheaders:2.7.0'
@@ -397,10 +416,9 @@ dependencies {
 }
 
 dependencyVerification {
-    configuration = '(play|website)(Debug|Release)RuntimeClasspath'
+    configuration = '(play|website)(Prod|Staging)(Debug|Release)RuntimeClasspath'
 }
 
-
 def assembleWebsiteDescriptor = { variant, file ->
     if (file.exists()) {
         MessageDigest md = MessageDigest.getInstance("SHA-256");
@@ -444,13 +462,19 @@ def signProductionRelease = { variant ->
 
 task signProductionPlayRelease {
     doLast {
-        signProductionRelease(android.applicationVariants.find { (it.name == 'playRelease') })
+        signProductionRelease(android.applicationVariants.find { (it.name == 'playProdRelease') })
+    }
+}
+
+task signProductionInternalRelease {
+    doLast {
+        signProductionRelease(android.applicationVariants.find { (it.name == 'internalProdRelease') })
     }
 }
 
 task signProductionWebsiteRelease {
     doLast {
-        def  variant       = android.applicationVariants.find { (it.name == 'websiteRelease') }
+        def  variant       = android.applicationVariants.find { (it.name == 'websiteProdRelease') }
         File signedRelease = signProductionRelease(variant).find { it.name.contains('universal') }
         assembleWebsiteDescriptor(variant, signedRelease)
     }
@@ -477,3 +501,14 @@ tasks.withType(Test) {
         showStackTraces true
     }
 }
+
+def loadKeystoreProperties(filename) {
+    def keystorePropertiesFile = file("${project.rootDir}/${filename}")
+    if (keystorePropertiesFile.exists()) {
+        def keystoreProperties = new Properties()
+        keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+        return keystoreProperties;
+    } else {
+        return null;
+    }
+}

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

@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.database;
 
+import android.app.Application;
 import android.content.Context;
 import android.database.Cursor;
 import android.text.TextUtils;
@@ -14,8 +15,8 @@ import net.sqlcipher.DatabaseUtils;
 import net.sqlcipher.database.SQLiteDatabase;
 import net.sqlcipher.database.SQLiteStatement;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
-import org.thoughtcrime.securesms.logging.Log;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -24,6 +25,7 @@ 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}
@@ -42,8 +44,16 @@ public class FlipperSqlCipherAdapter extends DatabaseDriver<FlipperSqlCipherAdap
     try {
       Field databaseHelperField = DatabaseFactory.class.getDeclaredField("databaseHelper");
       databaseHelperField.setAccessible(true);
-      SQLCipherOpenHelper sqlCipherOpenHelper = (SQLCipherOpenHelper) databaseHelperField.get(DatabaseFactory.getInstance(getContext()));
-      return Collections.singletonList(new Descriptor(sqlCipherOpenHelper));
+
+      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));
     } catch (Exception e) {
       Log.i(TAG, "Unable to use reflection to access raw database.", e);
     }
@@ -235,9 +245,9 @@ public class FlipperSqlCipherAdapter extends DatabaseDriver<FlipperSqlCipherAdap
   }
 
   static class Descriptor implements DatabaseDescriptor {
-    private final SQLCipherOpenHelper sqlCipherOpenHelper;
+    private final SignalDatabase sqlCipherOpenHelper;
 
-    Descriptor(@NonNull SQLCipherOpenHelper sqlCipherOpenHelper) {
+    Descriptor(@NonNull SignalDatabase sqlCipherOpenHelper) {
       this.sqlCipherOpenHelper = sqlCipherOpenHelper;
     }
 
@@ -247,11 +257,11 @@ public class FlipperSqlCipherAdapter extends DatabaseDriver<FlipperSqlCipherAdap
     }
 
     public @NonNull SQLiteDatabase getReadable() {
-      return sqlCipherOpenHelper.getReadableDatabase();
+      return sqlCipherOpenHelper.getSqlCipherDatabase();
     }
 
     public @NonNull SQLiteDatabase getWritable() {
-      return sqlCipherOpenHelper.getWritableDatabase();
+      return sqlCipherOpenHelper.getSqlCipherDatabase();
     }
   }
 }

app/src/flipper/res/values/strings.xml

@@ -1,4 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="app_name">Signal (Flipper)</string>
-</resources>

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

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

app/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
           xmlns:tools="http://schemas.android.com/tools"
           package="org.thoughtcrime.securesms">
 
-    <uses-sdk tools:overrideLibrary="androidx.camera.core,androidx.camera.camera2,androidx.camera.lifecycle" />
+    <uses-sdk tools:overrideLibrary="androidx.camera.core,androidx.camera.camera2,androidx.camera.lifecycle,androidx.camera.view" />
 
     <permission android:name="${applicationId}.ACCESS_SECRETS"
                 android:label="Access to TextSecure Secrets"
@@ -35,6 +35,7 @@
     <uses-permission android:name="android.permission.SEND_SMS"/>
     <uses-permission android:name="android.permission.WRITE_SMS"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.READ_PHONE_NUMBERS" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
                      android:maxSdkVersion="28" />
@@ -115,7 +116,7 @@
     <meta-data android:name="firebase_messaging_auto_init_enabled" android:value="false" />
 
     <activity android:name=".WebRtcCallActivity"
-              android:theme="@style/TextSecure.LightTheme.WebRTCCall"
+              android:theme="@style/TextSecure.DarkTheme.WebRTCCall"
               android:excludeFromRecents="true"
               android:screenOrientation="portrait"
               android:supportsPictureInPicture="true"
@@ -224,6 +225,17 @@
             <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" />
@@ -240,13 +252,7 @@
             <data android:scheme="https"
                   android:host="signal.group"/>
         </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>
 
     <activity android:name=".conversation.ConversationActivity"
               android:windowSoftInputMode="stateUnchanged"
@@ -258,6 +264,11 @@
                 android:value="org.thoughtcrime.securesms.MainActivity" />
     </activity>
 
+    <activity android:name=".conversation.BubbleConversationActivity"
+              android:theme="@style/Signal.DayNight"
+              android:allowEmbedded="true"
+              android:resizeableActivity="true" />
+
     <activity android:name=".longmessage.LongMessageActivity" />
 
     <activity android:name=".conversation.ConversationPopupActivity"
@@ -269,15 +280,10 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
 
     <activity android:name=".messagedetails.MessageDetailsActivity"
-              android:label="@string/AndroidManifest__message_details"
               android:windowSoftInputMode="stateHidden"
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".groups.ui.pendingmemberinvites.PendingMemberInvitesActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
-
     <activity android:name=".groups.ui.invitesandrequests.ManagePendingAndRequestingMembersActivity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
@@ -372,7 +378,6 @@
                android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".logsubmit.SubmitDebugLogActivity"
-              android:label="@string/AndroidManifest__log_submit"
               android:windowSoftInputMode="stateHidden"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -443,7 +448,7 @@
               android:theme="@style/TextSecure.FullScreenMedia"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".BlockedContactsActivity"
+    <activity android:name=".blocked.BlockedUsersActivity"
               android:theme="@style/TextSecure.LightTheme"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -465,17 +470,11 @@
             android:windowSoftInputMode="adjustResize"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".ClearProfileAvatarActivity"
-            android:theme="@style/Theme.AppCompat.Dialog.Alert"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-            android:icon="@drawable/clear_profile_avatar"
-            android:label="@string/AndroidManifest_remove_photo">
-
-        <intent-filter>
-            <action android:name="org.thoughtcrime.securesms.action.CLEAR_PROFILE_PHOTO"/>
-            <category android:name="android.intent.category.DEFAULT"/>
-        </intent-filter>
-    </activity>
+    <activity android:name=".ClearAvatarPromptActivity"
+              android:theme="@style/Theme.AppCompat.Dialog.Alert"
+              android:icon="@drawable/clear_profile_avatar"
+              android:label="@string/AndroidManifest_remove_photo"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".contacts.TurnOffContactJoinedNotificationsActivity"
               android:theme="@style/Theme.AppCompat.Dialog.Alert" />
@@ -510,7 +509,6 @@
 
     <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"
@@ -673,6 +671,11 @@
               android:exported="false"
               android:authorities="${applicationId}.part" />
 
+    <provider android:name=".providers.BlobContentProvider"
+              android:authorities="${applicationId}.blob"
+              android:exported="false"
+              android:grantUriPermissions="true" />
+
     <provider android:name=".providers.MmsBodyProvider"
               android:grantUriPermissions="true"
               android:exported="false"
@@ -797,12 +800,5 @@
 
     <uses-library android:name="org.apache.http.legacy" android:required="false"/>
 
-    <uses-library android:name="com.sec.android.app.multiwindow" android:required="false"/>
-    <meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
-    <meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_W" android:value="632.0dip" />
-    <meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_H" android:value="598.0dip" />
-    <meta-data android:name="com.sec.android.multiwindow.MINIMUM_SIZE_W" android:value="632.0dip" />
-    <meta-data android:name="com.sec.android.multiwindow.MINIMUM_SIZE_H" android:value="598.0dip" />
-
 </application>
 </manifest>

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.thoughtcrime.securesms.mediasend.camerax;
+package androidx.camera.view;
 
 import android.Manifest.permission;
 import android.annotation.SuppressLint;
@@ -45,43 +45,44 @@ import androidx.annotation.RestrictTo;
 import androidx.annotation.RestrictTo.Scope;
 import androidx.camera.core.Camera;
 import androidx.camera.core.CameraSelector;
-import androidx.camera.core.DisplayOrientedMeteringPointFactory;
 import androidx.camera.core.FocusMeteringAction;
 import androidx.camera.core.FocusMeteringResult;
 import androidx.camera.core.ImageCapture;
 import androidx.camera.core.ImageCapture.OnImageCapturedCallback;
+import androidx.camera.core.ImageCapture.OnImageSavedCallback;
 import androidx.camera.core.ImageProxy;
+import androidx.camera.core.Logger;
 import androidx.camera.core.MeteringPoint;
+import androidx.camera.core.MeteringPointFactory;
+import androidx.camera.core.VideoCapture;
+import androidx.camera.core.VideoCapture.OnVideoSavedCallback;
 import androidx.camera.core.impl.LensFacingConverter;
 import androidx.camera.core.impl.utils.executor.CameraXExecutors;
 import androidx.camera.core.impl.utils.futures.FutureCallback;
 import androidx.camera.core.impl.utils.futures.Futures;
 import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LiveData;
 
 import com.google.common.util.concurrent.ListenableFuture;
 
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.logging.Log;
-
-import java.io.FileDescriptor;
+import java.io.File;
 import java.util.concurrent.Executor;
 
 /**
  * A {@link View} that displays a preview of the camera with methods {@link
  * #takePicture(Executor, OnImageCapturedCallback)},
- * {@link #startRecording(FileDescriptor, Executor, VideoCapture.OnVideoSavedCallback)} and {@link #stopRecording()}.
+ * {@link #takePicture(ImageCapture.OutputFileOptions, Executor, OnImageSavedCallback)},
+ * {@link #startRecording(File , Executor , OnVideoSavedCallback callback)}
+ * and {@link #stopRecording()}.
  *
  * <p>Because the Camera is a limited resource and consumes a high amount of power, CameraView must
  * be opened/closed. CameraView will handle opening/closing automatically through use of a {@link
  * LifecycleOwner}. Use {@link #bindToLifecycle(LifecycleOwner)} to start the camera.
  */
-// Begin Signal Custom Code Block
 @RequiresApi(21)
 @SuppressLint("RestrictedApi")
-// End Signal Custom Code Block
-public final class CameraXView extends FrameLayout {
-  static final String TAG = CameraXView.class.getSimpleName();
-  static final boolean DEBUG = false;
+public final class SignalCameraView extends FrameLayout {
+  static final String TAG = SignalCameraView.class.getSimpleName();
 
   static final int INDEFINITE_VIDEO_DURATION = -1;
   static final int INDEFINITE_VIDEO_SIZE = -1;
@@ -107,7 +108,7 @@ public final class CameraXView extends FrameLayout {
   // For pinch-to-zoom
   private PinchToZoomGestureDetector mPinchToZoomGestureDetector;
   private boolean mIsPinchToZoomEnabled = true;
-  CameraXModule mCameraModule;
+  SignalCameraXModule mCameraModule;
   private final DisplayManager.DisplayListener mDisplayListener =
       new DisplayListener() {
         @Override
@@ -124,26 +125,25 @@ public final class CameraXView extends FrameLayout {
         }
       };
   private PreviewView mPreviewView;
-  private ScaleType mScaleType = ScaleType.CENTER_CROP;
   // For accessibility event
   private MotionEvent mUpEvent;
 
-  public CameraXView(@NonNull Context context) {
+  public SignalCameraView(@NonNull Context context) {
     this(context, null);
   }
 
-  public CameraXView(@NonNull Context context, @Nullable AttributeSet attrs) {
+  public SignalCameraView(@NonNull Context context, @Nullable AttributeSet attrs) {
     this(context, attrs, 0);
   }
 
-  public CameraXView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyle) {
+  public SignalCameraView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyle) {
     super(context, attrs, defStyle);
     init(context, attrs);
   }
 
   @RequiresApi(21)
-  public CameraXView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr,
-                    int defStyleRes) {
+  public SignalCameraView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr,
+                          int defStyleRes) {
     super(context, attrs, defStyleAttr, defStyleRes);
     init(context, attrs);
   }
@@ -172,23 +172,23 @@ public final class CameraXView extends FrameLayout {
 
   private void init(Context context, @Nullable AttributeSet attrs) {
     addView(mPreviewView = new PreviewView(getContext()), 0 /* view position */);
-    mCameraModule = new CameraXModule(this);
+    mCameraModule = new SignalCameraXModule(this);
 
     if (attrs != null) {
-      TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.CameraXView);
+      TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.CameraView);
       setScaleType(
-          ScaleType.fromId(
-              a.getInteger(R.styleable.CameraXView_scaleType,
+          PreviewView.ScaleType.fromId(
+              a.getInteger(R.styleable.CameraView_scaleType,
                   getScaleType().getId())));
       setPinchToZoomEnabled(
           a.getBoolean(
-              R.styleable.CameraXView_pinchToZoomEnabled, isPinchToZoomEnabled()));
+              R.styleable.CameraView_pinchToZoomEnabled, isPinchToZoomEnabled()));
       setCaptureMode(
           CaptureMode.fromId(
-              a.getInteger(R.styleable.CameraXView_captureMode,
+              a.getInteger(R.styleable.CameraView_captureMode,
                   getCaptureMode().getId())));
 
-      int lensFacing = a.getInt(R.styleable.CameraXView_lensFacing, LENS_FACING_BACK);
+      int lensFacing = a.getInt(R.styleable.CameraView_lensFacing, LENS_FACING_BACK);
       switch (lensFacing) {
         case LENS_FACING_NONE:
           setCameraLensFacing(null);
@@ -203,7 +203,7 @@ public final class CameraXView extends FrameLayout {
           // Unhandled event.
       }
 
-      int flashMode = a.getInt(R.styleable.CameraXView_flash, 0);
+      int flashMode = a.getInt(R.styleable.CameraView_flash, 0);
       switch (flashMode) {
         case FLASH_MODE_AUTO:
           setFlash(ImageCapture.FLASH_MODE_AUTO);
@@ -265,7 +265,7 @@ public final class CameraXView extends FrameLayout {
     if (savedState instanceof Bundle) {
       Bundle state = (Bundle) savedState;
       super.onRestoreInstanceState(state.getParcelable(EXTRA_SUPER));
-      setScaleType(ScaleType.fromId(state.getInt(EXTRA_SCALE_TYPE)));
+      setScaleType(PreviewView.ScaleType.fromId(state.getInt(EXTRA_SCALE_TYPE)));
       setZoomRatio(state.getFloat(EXTRA_ZOOM_RATIO));
       setPinchToZoomEnabled(state.getBoolean(EXTRA_PINCH_TO_ZOOM_ENABLED));
       setFlash(FlashModeConverter.valueOf(state.getString(EXTRA_FLASH)));
@@ -298,6 +298,21 @@ public final class CameraXView extends FrameLayout {
     dpyMgr.unregisterDisplayListener(mDisplayListener);
   }
 
+  /**
+   * Gets the {@link LiveData} of the underlying {@link PreviewView}'s
+   * {@link PreviewView.StreamState}.
+   *
+   * @return A {@link LiveData} containing the {@link PreviewView.StreamState}. Apps can either
+   * get current value by {@link LiveData#getValue()} or register a observer by
+   * {@link LiveData#observe}.
+   * @see PreviewView#getPreviewStreamState()
+   */
+  @NonNull
+  public LiveData<PreviewView.StreamState> getPreviewStreamState() {
+    return mPreviewView.getPreviewStreamState();
+  }
+
+  @NonNull
   PreviewView getPreviewView() {
     return mPreviewView;
   }
@@ -347,11 +362,11 @@ public final class CameraXView extends FrameLayout {
   /**
    * Returns the scale type used to scale the preview.
    *
-   * @return The current {@link ScaleType}.
+   * @return The current {@link PreviewView.ScaleType}.
    */
   @NonNull
-  public ScaleType getScaleType() {
-    return mScaleType;
+  public PreviewView.ScaleType getScaleType() {
+    return mPreviewView.getScaleType();
   }
 
   /**
@@ -359,13 +374,10 @@ public final class CameraXView extends FrameLayout {
    *
    * <p>This controls how the view finder should be scaled and positioned within the view.
    *
-   * @param scaleType The desired {@link ScaleType}.
+   * @param scaleType The desired {@link PreviewView.ScaleType}.
    */
-  public void setScaleType(@NonNull ScaleType scaleType) {
-    if (scaleType != mScaleType) {
-      mScaleType = scaleType;
-      requestLayout();
-    }
+  public void setScaleType(@NonNull PreviewView.ScaleType scaleType) {
+    mPreviewView.setScaleType(scaleType);
   }
 
   /**
@@ -401,8 +413,10 @@ public final class CameraXView extends FrameLayout {
   }
 
   /**
-   * Sets the maximum video duration before {@link VideoCapture.OnVideoSavedCallback#onVideoSaved(FileDescriptor)} is
-   * called automatically. Use {@link #INDEFINITE_VIDEO_DURATION} to disable the timeout.
+   * Sets the maximum video duration before
+   * {@link OnVideoSavedCallback#onVideoSaved(VideoCapture.OutputFileResults)} is called
+   * automatically.
+   * Use {@link #INDEFINITE_VIDEO_DURATION} to disable the timeout.
    */
   private void setMaxVideoDuration(long duration) {
     mCameraModule.setMaxVideoDuration(duration);
@@ -417,7 +431,8 @@ public final class CameraXView extends FrameLayout {
   }
 
   /**
-   * Sets the maximum video size in bytes before {@link VideoCapture.OnVideoSavedCallback#onVideoSaved(FileDescriptor)}
+   * Sets the maximum video size in bytes before
+   * {@link OnVideoSavedCallback#onVideoSaved(VideoCapture.OutputFileResults)}
    * is called automatically. Use {@link #INDEFINITE_VIDEO_SIZE} to disable the size restriction.
    */
   private void setMaxVideoSize(long size) {
@@ -435,28 +450,38 @@ public final class CameraXView extends FrameLayout {
     mCameraModule.takePicture(executor, callback);
   }
 
+  /**
+   * Takes a picture and calls
+   * {@link OnImageSavedCallback#onImageSaved(ImageCapture.OutputFileResults)} when done.
+   *
+   * <p> The value of {@link ImageCapture.Metadata#isReversedHorizontal()} in the
+   * {@link ImageCapture.OutputFileOptions} will be overwritten based on camera direction. For
+   * front camera, it will be set to true; for back camera, it will be set to false.
+   *
+   * @param outputFileOptions Options to store the newly captured image.
+   * @param executor          The executor in which the callback methods will be run.
+   * @param callback          Callback which will receive success or failure.
+   */
+  public void takePicture(@NonNull ImageCapture.OutputFileOptions outputFileOptions,
+                          @NonNull Executor executor,
+                          @NonNull OnImageSavedCallback callback) {
+    mCameraModule.takePicture(outputFileOptions, executor, callback);
+  }
+
   /**
    * Takes a video and calls the OnVideoSavedCallback when done.
    *
-   * @param file     The destination.
-   * @param executor The executor in which the callback methods will be run.
-   * @param callback Callback which will receive success or failure.
+   * @param outputFileOptions     Options to store the newly captured video.
+   * @param executor              The executor in which the callback methods will be run.
+   * @param callback              Callback which will receive success or failure.
    */
-  // Begin Signal Custom Code Block
-  @RequiresApi(26)
-  // End Signal Custom Code Block
-  public void startRecording(// Begin Signal Custom Code Block
-                             @NonNull FileDescriptor file,
-                             // End Signal Custom Code Block
+  public void startRecording(@NonNull VideoCapture.OutputFileOptions outputFileOptions,
                              @NonNull Executor executor,
-                             @NonNull VideoCapture.OnVideoSavedCallback callback) {
-    mCameraModule.startRecording(file, executor, callback);
+                             @NonNull OnVideoSavedCallback callback) {
+    mCameraModule.startRecording(outputFileOptions, executor, callback);
   }
 
   /** Stops an in progress video. */
-  // Begin Signal Custom Code Block
-  @RequiresApi(26)
-  // End Signal Custom Code Block
   public void stopRecording() {
     mCameraModule.stopRecording();
   }
@@ -554,7 +579,8 @@ public final class CameraXView extends FrameLayout {
         mDownEventTimestamp = System.currentTimeMillis();
         break;
       case MotionEvent.ACTION_UP:
-        if (delta() < ViewConfiguration.getLongPressTimeout()) {
+        if (delta() < ViewConfiguration.getLongPressTimeout()
+            && mCameraModule.isBoundToLifecycle()) {
           mUpEvent = event;
           performClick();
         }
@@ -578,19 +604,14 @@ public final class CameraXView extends FrameLayout {
     final float y = (mUpEvent != null) ? mUpEvent.getY() : getY() + getHeight() / 2f;
     mUpEvent = null;
 
-    CameraSelector cameraSelector =
-        new CameraSelector.Builder().requireLensFacing(
-            mCameraModule.getLensFacing()).build();
-
-    DisplayOrientedMeteringPointFactory pointFactory = new DisplayOrientedMeteringPointFactory(
-        getDisplay(), cameraSelector, mPreviewView.getWidth(), mPreviewView.getHeight());
-    float afPointWidth = 1.0f / 6.0f;  // 1/6 total area
-    float aePointWidth = afPointWidth * 1.5f;
-    MeteringPoint afPoint = pointFactory.createPoint(x, y, afPointWidth);
-    MeteringPoint aePoint = pointFactory.createPoint(x, y, aePointWidth);
-
     Camera camera = mCameraModule.getCamera();
     if (camera != null) {
+      MeteringPointFactory pointFactory = mPreviewView.getMeteringPointFactory();
+      float afPointWidth = 1.0f / 6.0f;  // 1/6 total area
+      float aePointWidth = afPointWidth * 1.5f;
+      MeteringPoint afPoint = pointFactory.createPoint(x, y, afPointWidth);
+      MeteringPoint aePoint = pointFactory.createPoint(x, y, aePointWidth);
+
       ListenableFuture<FocusMeteringResult> future =
           camera.getCameraControl().startFocusAndMetering(
               new FocusMeteringAction.Builder(afPoint,
@@ -609,7 +630,7 @@ public final class CameraXView extends FrameLayout {
       }, CameraXExecutors.directExecutor());
 
     } else {
-      Log.d(TAG, "cannot access camera");
+      Logger.d(TAG, "cannot access camera");
     }
 
     return true;
@@ -711,45 +732,11 @@ public final class CameraXView extends FrameLayout {
     return mCameraModule.isTorchOn();
   }
 
-  /** Options for scaling the bounds of the view finder to the bounds of this view. */
-  public enum ScaleType {
-    /**
-     * Scale the view finder, maintaining the source aspect ratio, so the view finder fills the
-     * entire view. This will cause the view finder to crop the source image if the camera
-     * aspect ratio does not match the view aspect ratio.
-     */
-    CENTER_CROP(0),
-    /**
-     * Scale the view finder, maintaining the source aspect ratio, so the view finder is
-     * entirely contained within the view.
-     */
-    CENTER_INSIDE(1);
-
-    private final int mId;
-
-    int getId() {
-      return mId;
-    }
-
-    ScaleType(int id) {
-      mId = id;
-    }
-
-    static ScaleType fromId(int id) {
-      for (ScaleType st : values()) {
-        if (st.mId == id) {
-          return st;
-        }
-      }
-      throw new IllegalArgumentException();
-    }
-  }
-
   /**
    * The capture mode used by CameraView.
    *
    * <p>This enum can be used to determine which capture mode will be enabled for {@link
-   * CameraXView}.
+   * SignalCameraView}.
    */
   public enum CaptureMode {
     /** A mode where image capture is enabled. */
@@ -832,4 +819,4 @@ public final class CameraXView extends FrameLayout {
     public void onScaleEnd(ScaleGestureDetector detector) {
     }
   }
-}
+}

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.thoughtcrime.securesms.mediasend.camerax;
+package androidx.camera.view;
 
 import android.Manifest.permission;
 import android.annotation.SuppressLint;
@@ -28,16 +28,19 @@ import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.RequiresPermission;
 import androidx.camera.core.Camera;
+import androidx.camera.core.CameraInfoUnavailableException;
 import androidx.camera.core.CameraSelector;
-import androidx.camera.core.CameraX;
 import androidx.camera.core.ImageCapture;
 import androidx.camera.core.ImageCapture.OnImageCapturedCallback;
+import androidx.camera.core.ImageCapture.OnImageSavedCallback;
+import androidx.camera.core.Logger;
 import androidx.camera.core.Preview;
 import androidx.camera.core.TorchState;
 import androidx.camera.core.UseCase;
+import androidx.camera.core.VideoCapture;
+import androidx.camera.core.VideoCapture.OnVideoSavedCallback;
 import androidx.camera.core.impl.CameraInternal;
 import androidx.camera.core.impl.LensFacingConverter;
-import androidx.camera.core.impl.VideoCaptureConfig;
 import androidx.camera.core.impl.utils.CameraOrientationUtil;
 import androidx.camera.core.impl.utils.executor.CameraXExecutors;
 import androidx.camera.core.impl.utils.futures.FutureCallback;
@@ -51,11 +54,10 @@ import androidx.lifecycle.OnLifecycleEvent;
 
 import com.google.common.util.concurrent.ListenableFuture;
 
-import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.mediasend.camerax.CameraXUtil;
 import org.thoughtcrime.securesms.mms.MediaConstraints;
 import org.thoughtcrime.securesms.video.VideoUtil;
 
-import java.io.FileDescriptor;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.LinkedHashSet;
@@ -68,10 +70,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import static androidx.camera.core.ImageCapture.FLASH_MODE_OFF;
 
 /** CameraX use case operation built on @{link androidx.camera.core}. */
-// Begin Signal Custom Code Block
 @RequiresApi(21)
-// End Signal Custom Code Block
-final class CameraXModule {
+@SuppressLint("RestrictedApi")
+final class SignalCameraXModule {
   public static final String TAG = "CameraXModule";
 
   private static final float UNITY_ZOOM_SCALE = 1f;
@@ -82,13 +83,13 @@ final class CameraXModule {
   private static final Rational ASPECT_RATIO_3_4 = new Rational(3, 4);
 
   private final Preview.Builder mPreviewBuilder;
-  private final VideoCaptureConfig.Builder mVideoCaptureConfigBuilder;
+  private final VideoCapture.Builder mVideoCaptureBuilder;
   private final ImageCapture.Builder mImageCaptureBuilder;
-  private final CameraXView mCameraXView;
+  private final SignalCameraView mCameraView;
   final AtomicBoolean mVideoIsRecording = new AtomicBoolean(false);
-  private CameraXView.CaptureMode mCaptureMode = CameraXView.CaptureMode.IMAGE;
-  private long mMaxVideoDuration = CameraXView.INDEFINITE_VIDEO_DURATION;
-  private long mMaxVideoSize = CameraXView.INDEFINITE_VIDEO_SIZE;
+  private SignalCameraView.CaptureMode mCaptureMode = SignalCameraView.CaptureMode.IMAGE;
+  private long mMaxVideoDuration = SignalCameraView.INDEFINITE_VIDEO_DURATION;
+  private long mMaxVideoSize = SignalCameraView.INDEFINITE_VIDEO_SIZE;
   @ImageCapture.FlashMode
   private int mFlash = FLASH_MODE_OFF;
   @Nullable
@@ -110,7 +111,6 @@ final class CameraXModule {
         public void onDestroy(LifecycleOwner owner) {
           if (owner == mCurrentLifecycle) {
             clearCurrentLifecycle();
-            mPreview.setSurfaceProvider(null);
           }
         }
       };
@@ -123,8 +123,8 @@ final class CameraXModule {
   @Nullable
   ProcessCameraProvider mCameraProvider;
 
-  CameraXModule(CameraXView view) {
-    mCameraXView = view;
+  SignalCameraXModule(SignalCameraView view) {
+    mCameraView = view;
 
     Futures.addCallback(ProcessCameraProvider.getInstance(view.getContext()),
         new FutureCallback<ProcessCameraProvider>() {
@@ -149,14 +149,12 @@ final class CameraXModule {
 
     mImageCaptureBuilder = new ImageCapture.Builder().setTargetName("ImageCapture");
 
-    // Begin Signal Custom Code Block
-    mVideoCaptureConfigBuilder =
-        new VideoCaptureConfig.Builder().setTargetName("VideoCapture")
-                                        .setAudioBitRate(VideoUtil.AUDIO_BIT_RATE)
-                                        .setVideoFrameRate(VideoUtil.VIDEO_FRAME_RATE)
-                                        .setBitRate(VideoUtil.VIDEO_BIT_RATE);
-    // End Signal Custom Code Block
+    mVideoCaptureBuilder = new VideoCapture.Builder().setTargetName("VideoCapture")
+                                                     .setAudioBitRate(VideoUtil.AUDIO_BIT_RATE)
+                                                     .setVideoFrameRate(VideoUtil.VIDEO_FRAME_RATE)
+                                                     .setBitRate(VideoUtil.VIDEO_BIT_RATE);
   }
+
   @RequiresPermission(permission.CAMERA)
   void bindToLifecycle(LifecycleOwner lifecycleOwner) {
     mNewLifecycle = lifecycleOwner;
@@ -173,12 +171,15 @@ final class CameraXModule {
     }
 
     clearCurrentLifecycle();
+    if (mNewLifecycle.getLifecycle().getCurrentState() == Lifecycle.State.DESTROYED) {
+      // Lifecycle is already in a destroyed state. Since it may have been a valid
+      // lifecycle when bound, but became destroyed while waiting for layout, treat this as
+      // a no-op now that we have cleared the previous lifecycle.
+      mNewLifecycle = null;
+      return;
+    }
     mCurrentLifecycle = mNewLifecycle;
     mNewLifecycle = null;
-    if (mCurrentLifecycle.getLifecycle().getCurrentState() == Lifecycle.State.DESTROYED) {
-      mCurrentLifecycle = null;
-      throw new IllegalArgumentException("Cannot bind to lifecycle in a destroyed state.");
-    }
 
     if (mCameraProvider == null) {
       // try again once the camera provider is no longer null
@@ -188,18 +189,18 @@ final class CameraXModule {
     Set<Integer> available = getAvailableCameraLensFacing();
 
     if (available.isEmpty()) {
-      Log.w(TAG, "Unable to bindToLifeCycle since no cameras available");
+      Logger.w(TAG, "Unable to bindToLifeCycle since no cameras available");
       mCameraLensFacing = null;
     }
 
     // Ensure the current camera exists, or default to another camera
     if (mCameraLensFacing != null && !available.contains(mCameraLensFacing)) {
-      Log.w(TAG, "Camera does not exist with direction " + mCameraLensFacing);
+      Logger.w(TAG, "Camera does not exist with direction " + mCameraLensFacing);
 
       // Default to the first available camera direction
       mCameraLensFacing = available.iterator().next();
 
-      Log.w(TAG, "Defaulting to primary camera with direction " + mCameraLensFacing);
+      Logger.w(TAG, "Defaulting to primary camera with direction " + mCameraLensFacing);
     }
 
     // Do not attempt to create use cases for a null cameraLensFacing. This could occur if
@@ -216,14 +217,12 @@ final class CameraXModule {
     boolean isDisplayPortrait = getDisplayRotationDegrees() == 0
         || getDisplayRotationDegrees() == 180;
 
-    Rational targetAspectRatio;
-
     // Begin Signal Custom Code Block
     int resolution = CameraXUtil.getIdealResolution(Resources.getSystem().getDisplayMetrics().widthPixels, Resources.getSystem().getDisplayMetrics().heightPixels);
     // End Signal Custom Code Block
 
-    if (getCaptureMode() == CameraXView.CaptureMode.IMAGE) {
-//      mImageCaptureBuilder.setTargetAspectRatio(AspectRatio.RATIO_4_3);
+    Rational targetAspectRatio;
+    if (getCaptureMode() == SignalCameraView.CaptureMode.IMAGE) {
       // Begin Signal Custom Code Block
       mImageCaptureBuilder.setTargetResolution(CameraXUtil.buildResolutionForRatio(resolution, ASPECT_RATIO_4_3, isDisplayPortrait));
       // End Signal Custom Code Block
@@ -232,7 +231,6 @@ final class CameraXModule {
       // Begin Signal Custom Code Block
       mImageCaptureBuilder.setTargetResolution(CameraXUtil.buildResolutionForRatio(resolution, ASPECT_RATIO_16_9, isDisplayPortrait));
       // End Signal Custom Code Block
-//      mImageCaptureBuilder.setTargetAspectRatio(AspectRatio.RATIO_16_9);
       targetAspectRatio = isDisplayPortrait ? ASPECT_RATIO_9_16 : ASPECT_RATIO_16_9;
     }
 
@@ -245,15 +243,14 @@ final class CameraXModule {
 
     // Begin Signal Custom Code Block
     Size size = VideoUtil.getVideoRecordingSize();
-    mVideoCaptureConfigBuilder.setTargetResolution(size);
-    mVideoCaptureConfigBuilder.setMaxResolution(size);
+    mVideoCaptureBuilder.setTargetResolution(size);
+    mVideoCaptureBuilder.setMaxResolution(size);
     // End Signal Custom Code Block
 
-    mVideoCaptureConfigBuilder.setTargetRotation(getDisplaySurfaceRotation());
-
+    mVideoCaptureBuilder.setTargetRotation(getDisplaySurfaceRotation());
     // Begin Signal Custom Code Block
     if (MediaConstraints.isVideoTranscodeAvailable()) {
-      mVideoCapture = new VideoCapture(mVideoCaptureConfigBuilder.getUseCaseConfig());
+      mVideoCapture = mVideoCaptureBuilder.build();
     }
     // End Signal Custom Code Block
 
@@ -262,15 +259,15 @@ final class CameraXModule {
     mPreviewBuilder.setTargetResolution(new Size(getMeasuredWidth(), height));
 
     mPreview = mPreviewBuilder.build();
-    mPreview.setSurfaceProvider(mCameraXView.getPreviewView().getPreviewSurfaceProvider());
+    mPreview.setSurfaceProvider(mCameraView.getPreviewView().getSurfaceProvider());
 
     CameraSelector cameraSelector =
         new CameraSelector.Builder().requireLensFacing(mCameraLensFacing).build();
-    if (getCaptureMode() == CameraXView.CaptureMode.IMAGE) {
+    if (getCaptureMode() == SignalCameraView.CaptureMode.IMAGE) {
       mCamera = mCameraProvider.bindToLifecycle(mCurrentLifecycle, cameraSelector,
           mImageCapture,
           mPreview);
-    } else if (getCaptureMode() == CameraXView.CaptureMode.VIDEO) {
+    } else if (getCaptureMode() == SignalCameraView.CaptureMode.VIDEO) {
       mCamera = mCameraProvider.bindToLifecycle(mCurrentLifecycle, cameraSelector,
           mVideoCapture,
           mPreview);
@@ -301,7 +298,7 @@ final class CameraXModule {
       return;
     }
 
-    if (getCaptureMode() == CameraXView.CaptureMode.VIDEO) {
+    if (getCaptureMode() == SignalCameraView.CaptureMode.VIDEO) {
       throw new IllegalStateException("Can not take picture under VIDEO capture mode.");
     }
 
@@ -312,17 +309,32 @@ final class CameraXModule {
     mImageCapture.takePicture(executor, callback);
   }
 
-  // Begin Signal Custom Code Block
-  @RequiresApi(26)
-  public void startRecording(FileDescriptor file,
-                             // End Signal Custom Code Block
-                             Executor executor,
-                             final VideoCapture.OnVideoSavedCallback callback) {
+  public void takePicture(@NonNull ImageCapture.OutputFileOptions outputFileOptions,
+                          @NonNull Executor executor, OnImageSavedCallback callback) {
+    if (mImageCapture == null) {
+      return;
+    }
+
+    if (getCaptureMode() == SignalCameraView.CaptureMode.VIDEO) {
+      throw new IllegalStateException("Can not take picture under VIDEO capture mode.");
+    }
+
+    if (callback == null) {
+      throw new IllegalArgumentException("OnImageSavedCallback should not be empty");
+    }
+
+    outputFileOptions.getMetadata().setReversedHorizontal(mCameraLensFacing != null
+        && mCameraLensFacing == CameraSelector.LENS_FACING_FRONT);
+    mImageCapture.takePicture(outputFileOptions, executor, callback);
+  }
+
+  public void startRecording(VideoCapture.OutputFileOptions outputFileOptions,
+                             Executor executor, final OnVideoSavedCallback callback) {
     if (mVideoCapture == null) {
       return;
     }
 
-    if (getCaptureMode() == CameraXView.CaptureMode.IMAGE) {
+    if (getCaptureMode() == SignalCameraView.CaptureMode.IMAGE) {
       throw new IllegalStateException("Can not record video under IMAGE capture mode.");
     }
 
@@ -332,15 +344,14 @@ final class CameraXModule {
 
     mVideoIsRecording.set(true);
     mVideoCapture.startRecording(
-        file,
+        outputFileOptions,
         executor,
         new VideoCapture.OnVideoSavedCallback() {
           @Override
-          // Begin Signal Custom Code Block
-          public void onVideoSaved(@NonNull FileDescriptor savedFile) {
-          // End Signal Custom Code Block
+          public void onVideoSaved(
+              @NonNull VideoCapture.OutputFileResults outputFileResults) {
             mVideoIsRecording.set(false);
-            callback.onVideoSaved(savedFile);
+            callback.onVideoSaved(outputFileResults);
           }
 
           @Override
@@ -349,15 +360,12 @@ final class CameraXModule {
               @NonNull String message,
               @Nullable Throwable cause) {
             mVideoIsRecording.set(false);
-            Log.e(TAG, message, cause);
+            Logger.e(TAG, message, cause);
             callback.onError(videoCaptureError, message, cause);
           }
         });
   }
 
-  // Begin Signal Custom Code Block
-  @RequiresApi(26)
-  // End Signal Custom Code Block
   public void stopRecording() {
     if (mVideoCapture == null) {
       return;
@@ -388,14 +396,15 @@ final class CameraXModule {
 
   @RequiresPermission(permission.CAMERA)
   public boolean hasCameraWithLensFacing(@CameraSelector.LensFacing int lensFacing) {
-    String cameraId;
-    try {
-      cameraId = CameraX.getCameraWithLensFacing(lensFacing);
-    } catch (Exception e) {
-      throw new IllegalStateException("Unable to query lens facing.", e);
+    if (mCameraProvider == null) {
+      return false;
+    }
+    try {
+      return mCameraProvider.hasCamera(
+          new CameraSelector.Builder().requireLensFacing(lensFacing).build());
+    } catch (CameraInfoUnavailableException e) {
+      return false;
     }
-
-    return cameraId != null;
   }
 
   @Nullable
@@ -454,7 +463,7 @@ final class CameraXModule {
         }
       }, CameraXExecutors.directExecutor());
     } else {
-      Log.e(TAG, "Failed to set zoom ratio");
+      Logger.e(TAG, "Failed to set zoom ratio");
     }
   }
 
@@ -486,6 +495,10 @@ final class CameraXModule {
     }
   }
 
+  boolean isBoundToLifecycle() {
+    return mCamera != null;
+  }
+
   int getRelativeCameraOrientation(boolean compensateForMirroring) {
     int rotationDegrees = 0;
     if (mCamera != null) {
@@ -520,6 +533,11 @@ final class CameraXModule {
       if (!toUnbind.isEmpty()) {
         mCameraProvider.unbind(toUnbind.toArray((new UseCase[0])));
       }
+
+      // Remove surface provider once unbound.
+      if (mPreview != null) {
+        mPreview.setSurfaceProvider(null);
+      }
     }
     mCamera = null;
     mCurrentLifecycle = null;
@@ -532,7 +550,7 @@ final class CameraXModule {
       mImageCapture.setTargetRotation(getDisplaySurfaceRotation());
     }
 
-    if (mVideoCapture != null && MediaConstraints.isVideoTranscodeAvailable()) {
+    if (mVideoCapture != null) {
       mVideoCapture.setTargetRotation(getDisplaySurfaceRotation());
     }
   }
@@ -567,7 +585,7 @@ final class CameraXModule {
       return false;
     }
 
-    CameraInternal camera = mImageCapture.getBoundCamera();
+    CameraInternal camera = mImageCapture.getCamera();
 
     if (camera == null) {
       return false;
@@ -614,15 +632,15 @@ final class CameraXModule {
   }
 
   public Context getContext() {
-    return mCameraXView.getContext();
+    return mCameraView.getContext();
   }
 
   public int getWidth() {
-    return mCameraXView.getWidth();
+    return mCameraView.getWidth();
   }
 
   public int getHeight() {
-    return mCameraXView.getHeight();
+    return mCameraView.getHeight();
   }
 
   public int getDisplayRotationDegrees() {
@@ -630,15 +648,15 @@ final class CameraXModule {
   }
 
   protected int getDisplaySurfaceRotation() {
-    return mCameraXView.getDisplaySurfaceRotation();
+    return mCameraView.getDisplaySurfaceRotation();
   }
 
   private int getMeasuredWidth() {
-    return mCameraXView.getMeasuredWidth();
+    return mCameraView.getMeasuredWidth();
   }
 
   private int getMeasuredHeight() {
-    return mCameraXView.getMeasuredHeight();
+    return mCameraView.getMeasuredHeight();
   }
 
   @Nullable
@@ -647,11 +665,11 @@ final class CameraXModule {
   }
 
   @NonNull
-  public CameraXView.CaptureMode getCaptureMode() {
+  public SignalCameraView.CaptureMode getCaptureMode() {
     return mCaptureMode;
   }
 
-  public void setCaptureMode(@NonNull CameraXView.CaptureMode captureMode) {
+  public void setCaptureMode(@NonNull SignalCameraView.CaptureMode captureMode) {
     this.mCaptureMode = captureMode;
     rebindToLifecycle();
   }

app/src/main/java/org/signal/glide/apng/APNGDrawable.java

@@ -7,8 +7,8 @@ package org.signal.glide.apng;
 
 import android.content.Context;
 
-import org.signal.glide.common.FrameAnimationDrawable;
 import org.signal.glide.apng.decode.APNGDecoder;
+import org.signal.glide.common.FrameAnimationDrawable;
 import org.signal.glide.common.decode.FrameSeqDecoder;
 import org.signal.glide.common.loader.AssetStreamLoader;
 import org.signal.glide.common.loader.FileLoader;

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

@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms;
 
+import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.whispersystems.signalservice.api.account.AccountAttributes;
 
 public final class AppCapabilities {
@@ -7,15 +8,15 @@ public final class AppCapabilities {
   private AppCapabilities() {
   }
 
-  private static final boolean UUID_CAPABLE           = false;
-  private static final boolean GV2_CAPABLE            = true;
-  private static final boolean GV1_MIGRATION_CAPABLE  = false;
+  private static final boolean UUID_CAPABLE  = false;
+  private static final boolean GV2_CAPABLE   = true;
+  private static final boolean GV1_MIGRATION = true;
 
   /**
    * @param storageCapable Whether or not the user can use storage service. This is another way of
    *                       asking if the user has set a Signal PIN or not.
    */
   public static AccountAttributes.Capabilities getCapabilities(boolean storageCapable) {
-    return new AccountAttributes.Capabilities(UUID_CAPABLE, GV2_CAPABLE, storageCapable, GV1_MIGRATION_CAPABLE);
+    return new AccountAttributes.Capabilities(UUID_CAPABLE, GV2_CAPABLE, storageCapable, GV1_MIGRATION);
   }
 }

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

@@ -4,12 +4,12 @@ import android.content.Context;
 
 import androidx.annotation.NonNull;
 
+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.StickerPackDownloadJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
 import org.thoughtcrime.securesms.stickers.BlessedPacks;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
@@ -34,6 +34,11 @@ public final class AppInitialization {
     TextSecurePreferences.setJobManagerVersion(context, JobManager.CURRENT_VERSION);
     TextSecurePreferences.setLastExperienceVersionCode(context, Util.getCanonicalVersionCode());
     TextSecurePreferences.setHasSeenStickerIntroTooltip(context, true);
+    TextSecurePreferences.setPasswordDisabled(context, true);
+    TextSecurePreferences.setLastExperienceVersionCode(context, Util.getCanonicalVersionCode());
+    TextSecurePreferences.setReadReceiptsEnabled(context, true);
+    TextSecurePreferences.setTypingIndicatorsEnabled(context, true);
+    TextSecurePreferences.setHasSeenWelcomeScreen(context, false);
     ApplicationDependencies.getMegaphoneRepository().onFirstEverAppLaunch();
     SignalStore.onFirstEverAppLaunch();
     ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.ZOZO.getPackId(), BlessedPacks.ZOZO.getPackKey(), false));
@@ -45,6 +50,28 @@ public final class AppInitialization {
   public static void onPostBackupRestore(@NonNull Context context) {
     Log.i(TAG, "onPostBackupRestore()");
 
+    ApplicationDependencies.getMegaphoneRepository().onFirstEverAppLaunch();
+    SignalStore.onFirstEverAppLaunch();
+    SignalStore.onboarding().clearAll();
+    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.forReference(BlessedPacks.SWOON_HANDS.getPackId(), BlessedPacks.SWOON_HANDS.getPackKey()));
+    ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forReference(BlessedPacks.SWOON_FACES.getPackId(), BlessedPacks.SWOON_FACES.getPackKey()));
+  }
+
+  /**
+   * Temporary migration method that does the safest bits of {@link #onFirstEverAppLaunch(Context)}
+   */
+  public static void onRepairFirstEverAppLaunch(@NonNull Context context) {
+    Log.w(TAG, "onRepairFirstEverAppLaunch()");
+
+    InsightsOptOut.userRequestedOptOut(context);
+    TextSecurePreferences.setAppMigrationVersion(context, ApplicationMigrations.CURRENT_VERSION);
+    TextSecurePreferences.setJobManagerVersion(context, JobManager.CURRENT_VERSION);
+    TextSecurePreferences.setLastExperienceVersionCode(context, Util.getCanonicalVersionCode());
+    TextSecurePreferences.setHasSeenStickerIntroTooltip(context, true);
+    TextSecurePreferences.setPasswordDisabled(context, true);
+    TextSecurePreferences.setLastExperienceVersionCode(context, Util.getCanonicalVersionCode());
     ApplicationDependencies.getMegaphoneRepository().onFirstEverAppLaunch();
     SignalStore.onFirstEverAppLaunch();
     ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.ZOZO.getPackId(), BlessedPacks.ZOZO.getPackKey(), false));

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

@@ -16,13 +16,13 @@
  */
 package org.thoughtcrime.securesms;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
-import android.os.AsyncTask;
+import android.hardware.SensorManager;
 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;
@@ -33,27 +33,30 @@ import com.google.android.gms.security.ProviderInstaller;
 
 import org.conscrypt.Conscrypt;
 import org.signal.aesgcmprovider.AesGcmProvider;
+import org.signal.core.util.ShakeDetector;
+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.components.TypingStatusRepository;
-import org.thoughtcrime.securesms.components.TypingStatusSender;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencyProvider;
 import org.thoughtcrime.securesms.gcm.FcmJobService;
+import org.thoughtcrime.securesms.jobmanager.JobManager;
 import org.thoughtcrime.securesms.jobs.CreateSignedPreKeyJob;
 import org.thoughtcrime.securesms.jobs.FcmRefreshJob;
+import org.thoughtcrime.securesms.jobs.GroupV1MigrationJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
 import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
 import org.thoughtcrime.securesms.jobs.RefreshPreKeysJob;
 import org.thoughtcrime.securesms.jobs.RetrieveProfileJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.logging.AndroidLogger;
 import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger;
-import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.logging.PersistentLogger;
-import org.thoughtcrime.securesms.logging.SignalUncaughtExceptionHandler;
+import org.thoughtcrime.securesms.logging.LogSecretProvider;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.providers.BlobProvider;
@@ -68,11 +71,15 @@ 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.shakereport.ShakeToReport;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
+import org.thoughtcrime.securesms.util.AppStartup;
+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.concurrent.SignalExecutors;
+import org.thoughtcrime.securesms.util.VersionTracker;
 import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
 import org.webrtc.voiceengine.WebRtcAudioManager;
 import org.webrtc.voiceengine.WebRtcAudioUtils;
@@ -95,11 +102,9 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
 
   private static final String TAG = ApplicationContext.class.getSimpleName();
 
-  private ExpiringMessageManager   expiringMessageManager;
-  private ViewOnceMessageManager   viewOnceMessageManager;
-  private TypingStatusRepository   typingStatusRepository;
-  private TypingStatusSender       typingStatusSender;
-  private PersistentLogger         persistentLogger;
+  private ExpiringMessageManager expiringMessageManager;
+  private ViewOnceMessageManager viewOnceMessageManager;
+  private PersistentLogger       persistentLogger;
 
   private volatile boolean isAppVisible;
 
@@ -109,57 +114,81 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
 
   @Override
   public void onCreate() {
+    Tracer.getInstance().start("Application#onCreate()");
+    AppStartup.getInstance().onApplicationCreate();
+
     long startTime = System.currentTimeMillis();
-    super.onCreate();
-    initializeSecurityProvider();
-    initializeLogging();
-    Log.i(TAG, "onCreate()");
-    initializeCrashHandling();
-    initializeAppDependencies();
-    initializeFirstEverAppLaunch();
-    initializeApplicationMigrations();
-    initializeMessageRetrieval();
-    initializeExpiringMessageManager();
-    initializeRevealableMessageManager();
-    initializeTypingStatusRepository();
-    initializeTypingStatusSender();
-    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);
+    if (FeatureFlags.internalUser()) {
+      Tracer.getInstance().setMaxBufferSize(35_000);
     }
 
-    ApplicationDependencies.getJobManager().beginJobLoop();
+    super.onCreate();
+
+    AppStartup.getInstance().addBlocking("security-provider", this::initializeSecurityProvider)
+                            .addBlocking("logging", () -> {
+                                initializeLogging();
+                                Log.i(TAG, "onCreate()");
+                            })
+                            .addBlocking("crash-handling", this::initializeCrashHandling)
+                            .addBlocking("eat-db", () -> DatabaseFactory.getInstance(this))
+                            .addBlocking("app-dependencies", this::initializeAppDependencies)
+                            .addBlocking("first-launch", this::initializeFirstEverAppLaunch)
+                            .addBlocking("app-migrations", this::initializeApplicationMigrations)
+                            .addBlocking("ring-rtc", this::initializeRingRtc)
+                            .addBlocking("mark-registration", () -> RegistrationUtil.maybeMarkRegistrationComplete(this))
+                            .addBlocking("lifecycle-observer", () -> ProcessLifecycleOwner.get().getLifecycle().addObserver(this))
+                            .addBlocking("message-retriever", this::initializeMessageRetrieval)
+                            .addBlocking("dynamic-theme", () -> DynamicTheme.setDefaultDayNightMode(this))
+                            .addBlocking("vector-compat", () -> {
+                              if (Build.VERSION.SDK_INT < 21) {
+                                AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
+                              }
+                            })
+                            .addNonBlocking(this::initializeRevealableMessageManager)
+                            .addNonBlocking(this::initializeGcmCheck)
+                            .addNonBlocking(this::initializeSignedPreKeyCheck)
+                            .addNonBlocking(this::initializePeriodicTasks)
+                            .addNonBlocking(this::initializeCircumvention)
+                            .addNonBlocking(this::initializePendingMessages)
+                            .addNonBlocking(this::initializeCleanup)
+                            .addNonBlocking(this::initializeGlideCodecs)
+                            .addNonBlocking(FeatureFlags::init)
+                            .addNonBlocking(RefreshPreKeysJob::scheduleIfNecessary)
+                            .addNonBlocking(StorageSyncHelper::scheduleRoutineSync)
+                            .addNonBlocking(() -> ApplicationDependencies.getJobManager().beginJobLoop())
+                            .addPostRender(this::initializeExpiringMessageManager)
+                            .addPostRender(this::initializeBlobProvider)
+                            .addPostRender(() -> NotificationChannels.create(this))
+                            .execute();
+
+    ProcessLifecycleOwner.get().getLifecycle().addObserver(this);
+
     Log.d(TAG, "onCreate() took " + (System.currentTimeMillis() - startTime) + " ms");
+    Tracer.getInstance().end("Application#onCreate()");
   }
 
   @Override
   public void onStart(@NonNull LifecycleOwner owner) {
+    long startTime = System.currentTimeMillis();
     isAppVisible = true;
     Log.i(TAG, "App is now visible.");
-    FeatureFlags.refreshIfNecessary();
-    ApplicationDependencies.getRecipientCache().warmUp();
-    RetrieveProfileJob.enqueueRoutineFetchIfNecessary(this);
-    executePendingContactSync();
-    KeyCachingService.onAppForegrounded(this);
+
     ApplicationDependencies.getFrameRateTracker().begin();
     ApplicationDependencies.getMegaphoneRepository().onAppForegrounded();
-    checkBuildExpiration();
+
+    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");
   }
 
   @Override
@@ -169,9 +198,13 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     KeyCachingService.onAppBackgrounded(this);
     ApplicationDependencies.getMessageNotifier().clearVisibleThread();
     ApplicationDependencies.getFrameRateTracker().end();
+    ApplicationDependencies.getShakeToReport().disable();
   }
 
   public ExpiringMessageManager getExpiringMessageManager() {
+    if (expiringMessageManager == null) {
+      initializeExpiringMessageManager();
+    }
     return expiringMessageManager;
   }
 
@@ -179,14 +212,6 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     return viewOnceMessageManager;
   }
 
-  public TypingStatusRepository getTypingStatusRepository() {
-    return typingStatusRepository;
-  }
-
-  public TypingStatusSender getTypingStatusSender() {
-    return typingStatusSender;
-  }
-
   public boolean isAppVisible() {
     return isAppVisible;
   }
@@ -227,8 +252,8 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
   }
 
   private void initializeLogging() {
-    persistentLogger = new PersistentLogger(this);
-    org.thoughtcrime.securesms.logging.Log.initialize(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());
   }
@@ -252,13 +277,16 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
 
   private void initializeFirstEverAppLaunch() {
     if (TextSecurePreferences.getFirstInstallVersion(this) == -1) {
-      if (!SQLCipherOpenHelper.databaseFileExists(this)) {
+      if (!SQLCipherOpenHelper.databaseFileExists(this) || VersionTracker.getDaysSinceFirstInstalled(this) < 365) {
         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);
     }
   }
 
@@ -286,14 +314,6 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     this.viewOnceMessageManager = new ViewOnceMessageManager(this);
   }
 
-  private void initializeTypingStatusRepository() {
-    this.typingStatusRepository = new TypingStatusRepository();
-  }
-
-  private void initializeTypingStatusSender() {
-    this.typingStatusSender = new TypingStatusSender(this);
-  }
-
   private void initializePeriodicTasks() {
     RotateSignedPreKeyListener.schedule(this);
     DirectoryRefreshListener.schedule(this);
@@ -341,23 +361,15 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     }
   }
 
-  @SuppressLint("StaticFieldLeak")
+  @WorkerThread
   private void initializeCircumvention() {
-    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;
+    if (new SignalServiceNetworkAccess(ApplicationContext.this).isCensored(ApplicationContext.this)) {
+      try {
+        ProviderInstaller.installIfNeeded(ApplicationContext.this);
+      } catch (Throwable t) {
+        Log.w(TAG, t);
       }
-    };
-
-    task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }
   }
 
   private void executePendingContactSync() {
@@ -378,17 +390,15 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     }
   }
 
+  @WorkerThread
   private void initializeBlobProvider() {
-    SignalExecutors.BOUNDED.execute(() -> {
-      BlobProvider.getInstance().onSessionStart(this);
-    });
+    BlobProvider.getInstance().onSessionStart(this);
   }
 
+  @WorkerThread
   private void initializeCleanup() {
-    SignalExecutors.BOUNDED.execute(() -> {
-      int deleted = DatabaseFactory.getAttachmentDatabase(this).deleteAbandonedPreuploadedAttachments();
-      Log.i(TAG, "Deleted " + deleted + " abandoned attachments.");
-    });
+    int deleted = DatabaseFactory.getAttachmentDatabase(this).deleteAbandonedPreuploadedAttachments();
+    Log.i(TAG, "Deleted " + deleted + " abandoned attachments.");
   }
 
   private void initializeGlideCodecs() {
@@ -422,7 +432,8 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
 
   @Override
   protected void attachBaseContext(Context base) {
-    super.attachBaseContext(DynamicLanguageContextWrapper.updateContext(base, TextSecurePreferences.getLanguage(base)));
+    DynamicLanguageContextWrapper.updateContext(base);
+    super.attachBaseContext(base);
   }
 
   private static class ProviderInitializationException extends RuntimeException {

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

@@ -18,7 +18,6 @@
 package org.thoughtcrime.securesms;
 
 import android.app.AlertDialog;
-import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.PorterDuff;
@@ -27,9 +26,9 @@ 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.fragment.app.FragmentTransaction;
 import androidx.preference.Preference;
 
 import org.thoughtcrime.securesms.help.HelpFragment;
@@ -40,20 +39,20 @@ 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.DataAndStoragePreferenceFragment;
 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;
-import org.thoughtcrime.securesms.util.ThemeUtil;
 
 /**
  * The Activity for application preference display and management.
@@ -66,6 +65,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActivity
     implements SharedPreferences.OnSharedPreferenceChangeListener
 {
   public static final String LAUNCH_TO_BACKUPS_FRAGMENT = "launch.to.backups.fragment";
+  public static final String LAUNCH_TO_HELP_FRAGMENT    = "launch.to.help.fragment";
 
   @SuppressWarnings("unused")
   private static final String TAG = ApplicationPreferencesActivity.class.getSimpleName();
@@ -83,9 +83,13 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActivity
   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);
@@ -101,11 +105,21 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActivity
       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 (getIntent() != null && getIntent().getBooleanExtra(LAUNCH_TO_HELP_FRAGMENT, false)) {
+      initFragment(android.R.id.content, new HelpFragment());
     } 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();
@@ -127,20 +141,29 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActivity
     if (fragmentManager.getBackStackEntryCount() > 0) {
       fragmentManager.popBackStack();
     } else {
-      // TODO [greyson] Navigation
-      Intent intent = new Intent(this, MainActivity.class);
-      intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-      startActivity(intent);
+      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);
@@ -195,7 +218,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActivity
       if (Build.VERSION.SDK_INT >= 21) return;
 
       Preference preference = this.findPreference(PREFERENCE_CATEGORY_SMS_MMS);
-      preference.getIcon().setColorFilter(ThemeUtil.getThemedColor(requireContext(), R.attr.icon_tint), PorterDuff.Mode.SRC_IN);
+      preference.getIcon().setColorFilter(ContextCompat.getColor(requireContext(), R.color.signal_icon_tint_primary), PorterDuff.Mode.SRC_IN);
     }
 
     @Override
@@ -289,7 +312,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActivity
           fragment = new ChatsPreferenceFragment();
           break;
         case PREFERENCE_CATEGORY_STORAGE:
-          fragment = new StoragePreferenceFragment();
+          fragment = new DataAndStoragePreferenceFragment();
           break;
         case PREFERENCE_CATEGORY_DEVICES:
           Intent intent = new Intent(getActivity(), DeviceActivity.class);

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

@@ -26,11 +26,11 @@ import com.bumptech.glide.request.target.CustomTarget;
 import com.bumptech.glide.request.target.Target;
 import com.bumptech.glide.request.transition.Transition;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;

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

@@ -1,23 +1,24 @@
 package org.thoughtcrime.securesms;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
-import android.os.Build.VERSION_CODES;
+import android.content.res.Configuration;
 import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.ActionBar;
-import androidx.core.app.ActivityCompat;
-import androidx.core.app.ActivityOptionsCompat;
-import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.view.WindowManager;
 
-import org.thoughtcrime.securesms.logging.Log;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
+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.DynamicLanguageActivityHelper;
 import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
 
 import java.util.Objects;
@@ -32,20 +33,22 @@ public abstract class BaseActivity extends AppCompatActivity {
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
+    AppStartup.getInstance().onCriticalRenderEventStart();
     logEvent("onCreate()");
     super.onCreate(savedInstanceState);
+    AppStartup.getInstance().onCriticalRenderEventEnd();
   }
 
   @Override
   protected void onResume() {
     super.onResume();
     initializeScreenshotSecurity();
-    DynamicLanguageActivityHelper.recreateIfNotInCorrectLanguage(this, TextSecurePreferences.getLanguage(this));
   }
 
   @Override
   protected void onStart() {
     logEvent("onStart()");
+    ApplicationDependencies.getShakeToReport().registerActivity(this);
     super.onStart();
   }
 
@@ -75,16 +78,23 @@ public abstract class BaseActivity extends AppCompatActivity {
     ActivityCompat.startActivity(this, intent, bundle);
   }
 
-  @TargetApi(21)
-  protected void setStatusBarColor(int color) {
-    if (Build.VERSION.SDK_INT >= 21) {
-      getWindow().setStatusBarColor(color);
-    }
+  @Override
+  protected void attachBaseContext(@NonNull Context newBase) {
+    super.attachBaseContext(newBase);
+
+    Configuration configuration      = new Configuration(newBase.getResources().getConfiguration());
+    int           appCompatNightMode = getDelegate().getLocalNightMode() != AppCompatDelegate.MODE_NIGHT_UNSPECIFIED ? getDelegate().getLocalNightMode()
+                                                                                                                     : AppCompatDelegate.getDefaultNightMode();
+
+    configuration.uiMode = (configuration.uiMode & ~Configuration.UI_MODE_NIGHT_MASK) | mapNightModeToConfigurationUiMode(newBase, appCompatNightMode);
+
+    applyOverrideConfiguration(configuration);
   }
 
   @Override
-  protected void attachBaseContext(Context newBase) {
-    super.attachBaseContext(DynamicLanguageContextWrapper.updateContext(newBase, TextSecurePreferences.getLanguage(newBase)));
+  public void applyOverrideConfiguration(@NonNull Configuration overrideConfiguration) {
+    DynamicLanguageContextWrapper.prepareOverrideConfiguration(this, overrideConfiguration);
+    super.applyOverrideConfiguration(overrideConfiguration);
   }
 
   private void logEvent(@NonNull String event) {
@@ -94,4 +104,13 @@ public abstract class BaseActivity extends AppCompatActivity {
   public final @NonNull ActionBar requireSupportActionBar() {
     return Objects.requireNonNull(getSupportActionBar());
   }
+
+  private static int mapNightModeToConfigurationUiMode(@NonNull Context context, @AppCompatDelegate.NightMode int appCompatNightMode) {
+    if (appCompatNightMode == AppCompatDelegate.MODE_NIGHT_YES) {
+      return Configuration.UI_MODE_NIGHT_YES;
+    } else if (appCompatNightMode == AppCompatDelegate.MODE_NIGHT_NO) {
+      return Configuration.UI_MODE_NIGHT_NO;
+    }
+    return ConfigurationUtil.getNightModeConfiguration(context.getApplicationContext());
+  }
 }

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

@@ -14,6 +14,7 @@ import org.thoughtcrime.securesms.conversation.ConversationMessage;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
 import org.thoughtcrime.securesms.groups.GroupId;
+import org.thoughtcrime.securesms.groups.GroupMigrationMembershipChange;
 import org.thoughtcrime.securesms.linkpreview.LinkPreview;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.Recipient;
@@ -59,6 +60,11 @@ public interface BindableConversationItem extends Unbindable {
     void onVoiceNotePause(@NonNull Uri uri);
     void onVoiceNotePlay(@NonNull Uri uri, long messageId, double position);
     void onVoiceNoteSeekTo(@NonNull Uri uri, double position);
+    void onGroupMigrationLearnMoreClicked(@NonNull GroupMigrationMembershipChange membershipChange);
+    void onDecryptionFailedLearnMoreClicked();
+    void onSafetyNumberLearnMoreClicked(@NonNull Recipient recipient);
+    void onJoinGroupCallClicked();
+    void onInviteFriendsToGroupClicked(@NonNull GroupId.V2 groupId);
 
     /** @return true if handled, false if you want to let the normal url handling continue */
     boolean onUrlClicked(@NonNull String url);

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

@@ -11,9 +11,6 @@ import androidx.lifecycle.Lifecycle;
 
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.recipients.RecipientUtil;
-import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
 import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
 
 /**

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

@@ -1,139 +0,0 @@
-package org.thoughtcrime.securesms;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ListView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.cursoradapter.widget.CursorAdapter;
-import androidx.fragment.app.ListFragment;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.Loader;
-
-import org.thoughtcrime.securesms.database.RecipientDatabase;
-import org.thoughtcrime.securesms.database.loaders.BlockedContactsLoader;
-import org.thoughtcrime.securesms.mms.GlideApp;
-import org.thoughtcrime.securesms.mms.GlideRequests;
-import org.thoughtcrime.securesms.preferences.BlockedContactListItem;
-import org.thoughtcrime.securesms.recipients.LiveRecipient;
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.recipients.RecipientUtil;
-import org.thoughtcrime.securesms.util.DynamicTheme;
-
-public class BlockedContactsActivity extends PassphraseRequiredActivity {
-
-  private final DynamicTheme dynamicTheme = new DynamicTheme();
-
-  @Override
-  public void onPreCreate() {
-    dynamicTheme.onCreate(this);
-  }
-
-  @Override
-  public void onCreate(Bundle bundle, boolean ready) {
-    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-    getSupportActionBar().setTitle(R.string.BlockedContactsActivity_blocked_contacts);
-    initFragment(android.R.id.content, new BlockedContactsFragment());
-  }
-
-  @Override
-  public void onResume() {
-    super.onResume();
-    dynamicTheme.onResume(this);
-  }
-
-  @Override
-  public boolean onSupportNavigateUp() {
-    onBackPressed();
-    return true;
-  }
-
-  public static class BlockedContactsFragment
-      extends ListFragment
-      implements LoaderManager.LoaderCallbacks<Cursor>, ListView.OnItemClickListener
-  {
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
-      return inflater.inflate(R.layout.blocked_contacts_fragment, container, false);
-    }
-
-    @Override
-    public void onCreate(Bundle bundle) {
-      super.onCreate(bundle);
-      setListAdapter(new BlockedContactAdapter(requireActivity(), GlideApp.with(this), null));
-      LoaderManager.getInstance(this).initLoader(0, null, this);
-    }
-
-    @Override
-    public void onStart() {
-      super.onStart();
-      LoaderManager.getInstance(this).restartLoader(0, null, this);
-    }
-
-    @Override
-    public void onActivityCreated(Bundle bundle) {
-      super.onActivityCreated(bundle);
-      getListView().setOnItemClickListener(this);
-    }
-
-    @Override
-    public @NonNull Loader<Cursor> onCreateLoader(int id, Bundle args) {
-      return new BlockedContactsLoader(getActivity());
-    }
-
-    @Override
-    public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor data) {
-      if (getListAdapter() != null) {
-        ((CursorAdapter) getListAdapter()).changeCursor(data);
-      }
-    }
-
-    @Override
-    public void onLoaderReset(@NonNull Loader<Cursor> loader) {
-      if (getListAdapter() != null) {
-        ((CursorAdapter) getListAdapter()).changeCursor(null);
-      }
-    }
-
-    @Override
-    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-      Recipient recipient = ((BlockedContactListItem)view).getRecipient();
-      BlockUnblockDialog.showUnblockFor(requireContext(), getLifecycle(), recipient, () -> {
-        RecipientUtil.unblock(requireContext(), recipient);
-        LoaderManager.getInstance(this).restartLoader(0, null, this);
-      });
-    }
-
-    private static class BlockedContactAdapter extends CursorAdapter {
-
-      private final GlideRequests glideRequests;
-
-      BlockedContactAdapter(@NonNull Context context, @NonNull GlideRequests glideRequests, @Nullable Cursor c) {
-        super(context, c);
-        this.glideRequests = glideRequests;
-      }
-
-      @Override
-      public View newView(Context context, Cursor cursor, ViewGroup parent) {
-        return LayoutInflater.from(context)
-                             .inflate(R.layout.blocked_contact_list_item, parent, false);
-      }
-
-      @Override
-      public void bindView(View view, Context context, Cursor cursor) {
-        RecipientId   recipientId = RecipientId.from(cursor.getLong(cursor.getColumnIndexOrThrow(RecipientDatabase.ID)));
-        LiveRecipient recipient   = Recipient.live(recipientId);
-
-        ((BlockedContactListItem) view).set(glideRequests, recipient);
-      }
-    }
-  }
-}

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

@@ -3,26 +3,25 @@ package org.thoughtcrime.securesms;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.os.Bundle;
 import android.view.ContextThemeWrapper;
 
-import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 
-import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.util.DynamicTheme;
-import org.thoughtcrime.securesms.util.ThemeUtil;
 
-public class ClearProfileAvatarActivity extends Activity {
+public final class ClearAvatarPromptActivity extends Activity {
 
   private static final String ARG_TITLE = "arg_title";
 
   public static Intent createForUserProfilePhoto() {
-    return new Intent("org.thoughtcrime.securesms.action.CLEAR_PROFILE_PHOTO");
+    Intent intent = new Intent(ApplicationDependencies.getApplication(), ClearAvatarPromptActivity.class);
+    intent.putExtra(ARG_TITLE, R.string.ClearProfileActivity_remove_profile_photo);
+    return intent;
   }
 
   public static Intent createForGroupProfilePhoto() {
-    Intent intent = new Intent("org.thoughtcrime.securesms.action.CLEAR_PROFILE_PHOTO");
+    Intent intent = new Intent(ApplicationDependencies.getApplication(), ClearAvatarPromptActivity.class);
     intent.putExtra(ARG_TITLE, R.string.ClearProfileActivity_remove_group_photo);
     return intent;
   }
@@ -31,10 +30,10 @@ public class ClearProfileAvatarActivity extends Activity {
   public void onResume() {
     super.onResume();
 
-    int titleId = getIntent().getIntExtra(ARG_TITLE, R.string.ClearProfileActivity_remove_profile_photo);
+    int message = getIntent().getIntExtra(ARG_TITLE, 0);
 
     new AlertDialog.Builder(new ContextThemeWrapper(this, DynamicTheme.isDarkTheme(this) ? R.style.TextSecure_DarkTheme : R.style.TextSecure_LightTheme))
-                   .setMessage(titleId)
+                   .setMessage(message)
                    .setNegativeButton(android.R.string.cancel, (dialog, which) -> finish())
                    .setPositiveButton(R.string.ClearProfileActivity_remove, (dialog, which) -> {
                      Intent result = new Intent();

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

@@ -14,9 +14,7 @@ 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.MmsDatabase;
 import org.thoughtcrime.securesms.database.PushDatabase;
-import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;

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

@@ -22,10 +22,10 @@ import android.os.Bundle;
 
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.components.ContactFilterToolbar;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
 import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;

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

@@ -55,6 +55,7 @@ import com.annimon.stream.Stream;
 import com.google.android.material.chip.ChipGroup;
 import com.pnikosis.materialishprogress.ProgressWheel;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.components.RecyclerViewFastScroller;
 import org.thoughtcrime.securesms.components.emoji.WarningTextView;
 import org.thoughtcrime.securesms.contacts.ContactChip;
@@ -66,7 +67,6 @@ import org.thoughtcrime.securesms.contacts.SelectedContact;
 import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper;
 import org.thoughtcrime.securesms.groups.SelectionLimits;
 import org.thoughtcrime.securesms.groups.ui.GroupLimitDialog;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.permissions.Permissions;
@@ -448,8 +448,11 @@ public final class ContactSelectionListFragment extends LoggingFragment
           swipeRefresh.setVisibility(View.VISIBLE);
           reset();
         } else {
-          Toast.makeText(getContext(), R.string.ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection, Toast.LENGTH_LONG).show();
-          initializeNoContactsPermission();
+          Context context = getContext();
+          if (context != null) {
+            Toast.makeText(getContext(), R.string.ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection, Toast.LENGTH_LONG).show();
+            initializeNoContactsPermission();
+          }
         }
       }
     }.execute();

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

@@ -9,6 +9,7 @@ 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;
@@ -150,7 +151,7 @@ public class DatabaseMigrationActivity extends PassphraseRequiredActivity {
         startActivity((Intent)getIntent().getParcelableExtra("next_intent"));
       } else {
         // TODO [greyson] Navigation
-        startActivity(new Intent(this, MainActivity.class));
+        startActivity(MainActivity.clearTop(this));
       }
     }
 
@@ -158,6 +159,11 @@ public class DatabaseMigrationActivity extends PassphraseRequiredActivity {
   }
 
   private class ImportStateHandler extends Handler {
+
+    public ImportStateHandler() {
+      super(Looper.getMainLooper());
+    }
+
     @Override
     public void handleMessage(Message message) {
       switch (message.what) {

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

@@ -18,10 +18,10 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.qr.ScanListener;
 import org.thoughtcrime.securesms.util.Base64;

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

@@ -5,8 +5,6 @@ import android.annotation.TargetApi;
 import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewAnimationUtils;
@@ -15,6 +13,8 @@ import android.view.animation.DecelerateInterpolator;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
+import androidx.annotation.NonNull;
+
 import org.thoughtcrime.securesms.components.camera.CameraView;
 import org.thoughtcrime.securesms.qr.ScanListener;
 import org.thoughtcrime.securesms.qr.ScanningThread;
@@ -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      = 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);
+    this.overlay      = this.container.findViewById(R.id.overlay);
+    this.scannerView  = this.container.findViewById(R.id.scanner);
+    this.devicesImage = this.container.findViewById(R.id.devices);
 
     if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
       this.overlay.setOrientation(LinearLayout.HORIZONTAL);

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

@@ -3,13 +3,14 @@ package org.thoughtcrime.securesms;
 import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+
 public class DeviceLinkFragment extends Fragment implements View.OnClickListener {
 
   private LinearLayout        container;

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

@@ -6,15 +6,6 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.ListFragment;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.Loader;
-import androidx.appcompat.app.AlertDialog;
-
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.devicelist.Device;
-import org.thoughtcrime.securesms.logging.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -24,12 +15,20 @@ import android.widget.Button;
 import android.widget.ListView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.ListFragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+
 import com.melnykov.fab.FloatingActionButton;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.loaders.DeviceListLoader;
-import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
+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;
 
 import java.io.IOException;
@@ -68,7 +67,7 @@ public class DeviceListFragment extends ListFragment
 
     this.empty             = view.findViewById(R.id.empty);
     this.progressContainer = view.findViewById(R.id.progress_container);
-    this.addDeviceButton   = ViewUtil.findById(view, R.id.add_device);
+    this.addDeviceButton   = view.findViewById(R.id.add_device);
     this.addDeviceButton.setOnClickListener(this);
 
     return view;

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

@@ -2,9 +2,10 @@ package org.thoughtcrime.securesms;
 
 import android.content.Intent;
 import android.os.Bundle;
-import androidx.appcompat.app.AlertDialog;
 import android.view.Window;
 
+import androidx.appcompat.app.AlertDialog;
+
 public class DeviceProvisioningActivity extends PassphraseRequiredActivity {
 
   @SuppressWarnings("unused")

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

@@ -28,7 +28,7 @@ public final class GroupMembersDialog {
   public void display() {
     AlertDialog dialog = new AlertDialog.Builder(fragmentActivity)
                                         .setTitle(R.string.ConversationActivity_group_members)
-                                        .setIconAttribute(R.attr.group_members_dialog_icon)
+                                        .setIcon(R.drawable.ic_group_24)
                                         .setCancelable(true)
                                         .setView(R.layout.dialog_group_members)
                                         .setPositiveButton(android.R.string.ok, null)

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

@@ -35,6 +35,7 @@ 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;
@@ -93,26 +94,33 @@ public class InviteActivity extends PassphraseRequiredActivity implements Contac
     slideInAnimation  = loadAnimation(R.anim.slide_from_bottom);
     slideOutAnimation = loadAnimation(R.anim.slide_to_bottom);
 
-    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);
+    View                 shareButton     = findViewById(R.id.share_button);
+    Button               smsButton       = findViewById(R.id.sms_button);
+    Button               smsCancelButton = findViewById(R.id.cancel_sms_button);
+    ContactFilterToolbar contactFilter   = findViewById(R.id.contact_filter);
 
-    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);
+    inviteText        = findViewById(R.id.invite_text);
+    smsSendFrame      = findViewById(R.id.sms_send_frame);
+    smsSendButton     = findViewById(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)));
     updateSmsButtonText(contactsFragment.getSelectedContacts().size());
 
     contactsFragment.setOnContactSelectedListener(this);
-    shareButton.setOnClickListener(new ShareClickListener());
-    smsButton.setOnClickListener(new SmsClickListener());
     smsCancelButton.setOnClickListener(new SmsCancelClickListener());
     smsSendButton.setOnClickListener(new SmsSendClickListener());
     contactFilter.setOnFilterChangedListener(new ContactFilterChangedListener());
     contactFilter.setNavigationIcon(R.drawable.ic_search_conversation_24);
+
+    if (Util.isDefaultSmsProvider(this)) {
+      shareButton.setOnClickListener(new ShareClickListener());
+      smsButton.setOnClickListener(new SmsClickListener());
+    } else {
+      shareButton.setVisibility(View.GONE);
+      smsButton.setOnClickListener(new ShareClickListener());
+      smsButton.setText(R.string.InviteActivity_share);
+    }
   }
 
   private Animation loadAnimation(@AnimRes int animResId) {
@@ -164,10 +172,10 @@ public class InviteActivity extends PassphraseRequiredActivity implements Contac
   private void setPrimaryColorsToolbarNormal() {
     primaryToolbar.setBackgroundColor(0);
     primaryToolbar.getNavigationIcon().setColorFilter(null);
-    primaryToolbar.setTitleTextColor(ThemeUtil.getThemedColor(this, R.attr.title_text_color_primary));
+    primaryToolbar.setTitleTextColor(ContextCompat.getColor(this, R.color.signal_text_primary));
 
     if (Build.VERSION.SDK_INT >= 23) {
-      getWindow().setStatusBarColor(ThemeUtil.getThemedColor(this, android.R.attr.statusBarColor));
+      WindowUtil.setStatusBarColor(getWindow(), ThemeUtil.getThemedColor(this, android.R.attr.statusBarColor));
       getWindow().setNavigationBarColor(ThemeUtil.getThemedColor(this, android.R.attr.navigationBarColor));
       WindowUtil.setLightStatusBarFromTheme(this);
     }
@@ -177,11 +185,11 @@ public class InviteActivity extends PassphraseRequiredActivity implements Contac
 
   private void setPrimaryColorsToolbarForSms() {
     primaryToolbar.setBackgroundColor(ContextCompat.getColor(this, R.color.core_ultramarine));
-    primaryToolbar.getNavigationIcon().setColorFilter(ThemeUtil.getThemedColor(this, R.attr.conversation_subtitle_color), PorterDuff.Mode.SRC_IN);
-    primaryToolbar.setTitleTextColor(ThemeUtil.getThemedColor(this, R.attr.conversation_title_color));
+    primaryToolbar.getNavigationIcon().setColorFilter(ContextCompat.getColor(this, R.color.signal_text_toolbar_subtitle), PorterDuff.Mode.SRC_IN);
+    primaryToolbar.setTitleTextColor(ContextCompat.getColor(this, R.color.signal_text_toolbar_title));
 
     if (Build.VERSION.SDK_INT >= 23) {
-      getWindow().setStatusBarColor(ContextCompat.getColor(this, R.color.core_ultramarine));
+      WindowUtil.setStatusBarColor(getWindow(), ContextCompat.getColor(this, R.color.core_ultramarine));
       WindowUtil.clearLightStatusBar(getWindow());
     }
 

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

@@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import org.thoughtcrime.securesms.logging.Log;
+import org.signal.core.util.logging.Log;
 
 /**
  * Simply logs out lifecycle events.

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

@@ -1,28 +1,55 @@
 package org.thoughtcrime.securesms;
 
+import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
+import org.thoughtcrime.securesms.util.AppStartup;
+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 {
 
+  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);
 
+  public static @NonNull Intent clearTop(@NonNull Context context) {
+    Intent intent = new Intent(context, MainActivity.class);
+
+    intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP |
+                    Intent.FLAG_ACTIVITY_NEW_TASK  |
+                    Intent.FLAG_ACTIVITY_SINGLE_TOP);
+
+    return intent;
+  }
+
   @Override
   protected void onCreate(Bundle savedInstanceState, boolean ready) {
+    AppStartup.getInstance().onCriticalRenderEventStart();
     super.onCreate(savedInstanceState, ready);
     setContentView(R.layout.main_activity);
 
     navigator.onCreate(savedInstanceState);
 
     handleGroupLinkInIntent(getIntent());
+
+    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
@@ -50,6 +77,14 @@ public class MainActivity extends PassphraseRequiredActivity {
     }
   }
 
+  @Override
+  protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+    super.onActivityResult(requestCode, resultCode, data);
+    if (requestCode == MainNavigator.REQUEST_CONFIG_CHANGES && resultCode == RESULT_CONFIG_CHANGED) {
+      recreate();
+    }
+  }
+
   public @NonNull MainNavigator getNavigator() {
     return navigator;
   }

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

@@ -9,7 +9,7 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
-import org.thoughtcrime.securesms.conversation.ConversationActivity;
+import org.thoughtcrime.securesms.conversation.ConversationIntents;
 import org.thoughtcrime.securesms.conversationlist.ConversationListArchiveFragment;
 import org.thoughtcrime.securesms.conversationlist.ConversationListFragment;
 import org.thoughtcrime.securesms.groups.ui.creategroup.CreateGroupActivity;
@@ -18,6 +18,8 @@ import org.thoughtcrime.securesms.recipients.RecipientId;
 
 public class MainNavigator {
 
+  public static final int REQUEST_CONFIG_CHANGES = 901;
+
   private final MainActivity activity;
 
   public MainNavigator(@NonNull MainActivity activity) {
@@ -57,7 +59,10 @@ public class MainNavigator {
   }
 
   public void goToConversation(@NonNull RecipientId recipientId, long threadId, int distributionType, int startingPosition) {
-    Intent intent = ConversationActivity.buildIntent(activity, recipientId, threadId, distributionType, startingPosition);
+    Intent intent = ConversationIntents.createBuilder(activity, recipientId, threadId)
+                                       .withDistributionType(distributionType)
+                                       .withStartingPosition(startingPosition)
+                                       .build();
 
     activity.startActivity(intent);
     activity.overridePendingTransition(R.anim.slide_from_end, R.anim.fade_scale_out);
@@ -65,10 +70,9 @@ public class MainNavigator {
 
   public void goToAppSettings() {
     Intent intent = new Intent(activity, ApplicationPreferencesActivity.class);
-    activity.startActivity(intent);
+    activity.startActivityForResult(intent, REQUEST_CONFIG_CHANGES);
   }
 
-
   public void goToArchiveList() {
     getFragmentManager().beginTransaction()
                         .setCustomAnimations(R.anim.slide_from_end, R.anim.slide_to_start, R.anim.slide_from_start, R.anim.slide_to_end)

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

@@ -18,12 +18,14 @@ package org.thoughtcrime.securesms;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.database.ContentObserver;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.view.Menu;
@@ -37,6 +39,8 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.core.app.ShareCompat;
 import androidx.core.util.Pair;
 import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
@@ -49,18 +53,19 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager.widget.ViewPager;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.animation.DepthPageTransformer;
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
 import org.thoughtcrime.securesms.components.viewpager.ExtendedOnPageChangedListener;
 import org.thoughtcrime.securesms.database.MediaDatabase;
 import org.thoughtcrime.securesms.database.MediaDatabase.MediaRecord;
 import org.thoughtcrime.securesms.database.loaders.PagingMediaLoader;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mediaoverview.MediaOverviewActivity;
 import org.thoughtcrime.securesms.mediapreview.MediaPreviewFragment;
 import org.thoughtcrime.securesms.mediapreview.MediaPreviewViewModel;
 import org.thoughtcrime.securesms.mediapreview.MediaRailAdapter;
 import org.thoughtcrime.securesms.mms.GlideApp;
+import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
@@ -138,6 +143,12 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
     return intent;
   }
 
+  @Override
+  protected void attachBaseContext(@NonNull Context newBase) {
+    getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+    super.attachBaseContext(newBase);
+  }
+
   @SuppressWarnings("ConstantConditions")
   @Override
   protected void onCreate(Bundle bundle, boolean ready) {
@@ -378,6 +389,27 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
     }
   }
 
+  private void share() {
+    MediaItem mediaItem = getCurrentMediaItem();
+
+    if (mediaItem != null) {
+      Uri    publicUri   = PartAuthority.getAttachmentPublicUri(mediaItem.uri);
+      String mimeType    = Intent.normalizeMimeType(mediaItem.type);
+      Intent shareIntent = ShareCompat.IntentBuilder.from(this)
+                                                    .setStream(publicUri)
+                                                    .setType(mimeType)
+                                                    .createChooserIntent()
+                                                    .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+
+      try {
+        startActivity(shareIntent);
+      } catch (ActivityNotFoundException e) {
+        Log.w(TAG, "No activity existed to share the media.", e);
+        Toast.makeText(this, R.string.MediaPreviewActivity_cant_find_an_app_able_to_share_this_media, Toast.LENGTH_LONG).show();
+      }
+    }
+  }
+
   @SuppressWarnings("CodeBlock2Expr")
   @SuppressLint("InlinedApi")
   private void saveToDisk() {
@@ -417,7 +449,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
     }
 
     AlertDialog.Builder builder = new AlertDialog.Builder(this);
-    builder.setIconAttribute(R.attr.dialog_alert_icon);
+    builder.setIcon(R.drawable.ic_warning);
     builder.setTitle(R.string.MediaPreviewActivity_media_delete_confirmation_title);
     builder.setMessage(R.string.MediaPreviewActivity_media_delete_confirmation_message);
     builder.setCancelable(true);
@@ -455,6 +487,9 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
       menu.findItem(R.id.delete).setVisible(false);
     }
 
+    // Restricted to API26 because of MemoryFileUtil not supporting lower API levels well
+    menu.findItem(R.id.media_preview__share).setVisible(Build.VERSION.SDK_INT >= 26);
+
     if (cameFromAllMedia) {
       menu.findItem(R.id.media_preview__overview).setVisible(false);
     }
@@ -464,16 +499,17 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
   }
 
   @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
+  public boolean onOptionsItemSelected(@NonNull MenuItem item) {
     super.onOptionsItemSelected(item);
 
-    switch (item.getItemId()) {
-      case R.id.media_preview__overview: showOverview(); return true;
-      case R.id.media_preview__forward:  forward();      return true;
-      case R.id.save:                    saveToDisk();   return true;
-      case R.id.delete:                  deleteMedia();  return true;
-      case android.R.id.home:            finish();       return true;
-    }
+    int itemId = item.getItemId();
+
+    if (itemId == R.id.media_preview__overview) { showOverview(); return true; }
+    if (itemId == R.id.media_preview__forward)  { forward();      return true; }
+    if (itemId == R.id.media_preview__share)    { share();        return true; }
+    if (itemId == R.id.save)                    { saveToDisk();   return true; }
+    if (itemId == R.id.delete)                  { deleteMedia();  return true; }
+    if (itemId == android.R.id.home)            { finish();       return true; }
 
     return false;
   }

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

@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms;
 
-import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;

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

@@ -23,16 +23,14 @@ import android.view.MenuItem;
 
 import androidx.appcompat.app.AlertDialog;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper;
-import org.thoughtcrime.securesms.conversation.ConversationActivity;
+import org.thoughtcrime.securesms.conversation.ConversationIntents;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.groups.ui.creategroup.CreateGroupActivity;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
 import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
@@ -99,15 +97,13 @@ public class NewConversationActivity extends ContactSelectionActivity
   }
 
   private void launch(Recipient recipient) {
-    Intent intent = new Intent(this, ConversationActivity.class);
-    intent.putExtra(ConversationActivity.RECIPIENT_EXTRA, recipient.getId());
-    intent.putExtra(ConversationActivity.TEXT_EXTRA, getIntent().getStringExtra(ConversationActivity.TEXT_EXTRA));
-    intent.setDataAndType(getIntent().getData(), getIntent().getType());
+    long   existingThread = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(recipient.getId());
+    Intent intent         = ConversationIntents.createBuilder(this, recipient.getId(), existingThread)
+                                               .withDraftText(getIntent().getStringExtra(Intent.EXTRA_TEXT))
+                                               .withDataUri(getIntent().getData())
+                                               .withDataType(getIntent().getType())
+                                               .build();
 
-    long existingThread = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(recipient.getId());
-
-    intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, existingThread);
-    intent.putExtra(ConversationActivity.DISTRIBUTION_TYPE_EXTRA, ThreadDatabase.DistributionTypes.DEFAULT);
     startActivity(intent);
     finish();
   }

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

@@ -21,8 +21,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
-import org.thoughtcrime.securesms.logging.Log;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 

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

@@ -20,12 +20,12 @@ import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.text.Editable;
-import org.thoughtcrime.securesms.logging.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.EditText;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.crypto.InvalidPassphraseException;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;

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

@@ -22,8 +22,6 @@ import android.os.Bundle;
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.VersionTracker;
 
 /**
@@ -66,12 +64,6 @@ public class PassphraseCreateActivity extends PassphraseActivity {
       IdentityKeyUtil.generateIdentityKeys(PassphraseCreateActivity.this);
       VersionTracker.updateLastSeenVersion(PassphraseCreateActivity.this);
 
-      TextSecurePreferences.setLastExperienceVersionCode(PassphraseCreateActivity.this, Util.getCanonicalVersionCode());
-      TextSecurePreferences.setPasswordDisabled(PassphraseCreateActivity.this, true);
-      TextSecurePreferences.setReadReceiptsEnabled(PassphraseCreateActivity.this, true);
-      TextSecurePreferences.setTypingIndicatorsEnabled(PassphraseCreateActivity.this, true);
-      TextSecurePreferences.setHasSeenWelcomeScreen(PassphraseCreateActivity.this, false);
-
       return null;
     }
 

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

@@ -24,16 +24,12 @@ import android.content.Intent;
 import android.graphics.PorterDuff;
 import android.os.Build;
 import android.os.Bundle;
-import androidx.core.hardware.fingerprint.FingerprintManagerCompat;
-import androidx.core.os.CancellationSignal;
-import androidx.appcompat.widget.Toolbar;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.style.RelativeSizeSpan;
 import android.text.style.TypefaceSpan;
-import org.thoughtcrime.securesms.logging.Log;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -50,6 +46,11 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.hardware.fingerprint.FingerprintManagerCompat;
+import androidx.core.os.CancellationSignal;
+
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
 import org.thoughtcrime.securesms.components.AnimatingToggle;
 import org.thoughtcrime.securesms.crypto.InvalidPassphraseException;

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

@@ -11,12 +11,13 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
+import org.signal.core.util.logging.Log;
+import org.signal.core.util.tracing.Tracer;
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.lock.v2.CreateKbsPinActivity;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrationActivity;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
 import org.thoughtcrime.securesms.pin.PinRestoreActivity;
@@ -25,6 +26,7 @@ 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.util.TextSecurePreferences;
 
 import java.util.Locale;
@@ -49,6 +51,8 @@ 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();
 
@@ -61,6 +65,9 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
       initializeClearKeyReceiver();
       onCreate(savedInstanceState, true);
     }
+
+    AppStartup.getInstance().onCriticalRenderEventEnd();
+    Tracer.getInstance().end(Log.tag(getClass()) + "#onCreate()");
   }
 
   protected void onPreCreate() {}
@@ -218,15 +225,17 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
 
   private Intent getConversationListIntent() {
     // TODO [greyson] Navigation
-    return new Intent(this, MainActivity.class);
+    return MainActivity.clearTop(this);
   }
 
   private void initializeClearKeyReceiver() {
     this.clearKeyReceiver = new BroadcastReceiver() {
       @Override
       public void onReceive(Context context, Intent intent) {
-        Log.i(TAG, "onReceive() for clear key event");
-        onMasterSecretCleared();
+        Log.i(TAG, "onReceive() for clear key event. PasswordDisabled: " + TextSecurePreferences.isPasswordDisabled(context) + ", ScreenLock: " + TextSecurePreferences.isScreenLockEnabled(context));
+        if (TextSecurePreferences.isScreenLockEnabled(context) || !TextSecurePreferences.isPasswordDisabled(context)) {
+          onMasterSecretCleared();
+        }
       }
     };
 

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

@@ -17,6 +17,7 @@
 package org.thoughtcrime.securesms;
 
 import android.os.Bundle;
+
 import androidx.fragment.app.FragmentActivity;
 
 public class PlayServicesProblemActivity extends FragmentActivity {

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

@@ -21,10 +21,11 @@ import android.app.Activity;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.fragment.app.DialogFragment;
 import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
 
 import com.google.android.gms.common.GoogleApiAvailability;
 

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

@@ -3,11 +3,12 @@ package org.thoughtcrime.securesms;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.widget.Toast;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.app.TaskStackBuilder;
 import androidx.appcompat.app.AppCompatActivity;
-import android.widget.Toast;
+import androidx.core.app.TaskStackBuilder;
 
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
@@ -34,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(new Intent(this, MainActivity.class));
+      startActivity(MainActivity.clearTop(this));
       finish();
       return;
     }
@@ -42,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(new Intent(this, MainActivity.class));
+                                                 .addNextIntent(MainActivity.clearTop(this));
 
     CommunicationActions.startConversation(this, recipient, null, backStack);
     finish();

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

@@ -5,13 +5,13 @@ import android.content.Intent;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.provider.ContactsContract;
-import androidx.annotation.NonNull;
 import android.text.TextUtils;
-
-import org.thoughtcrime.securesms.conversation.ConversationActivity;
-import org.thoughtcrime.securesms.logging.Log;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+
+import org.signal.core.util.logging.Log;
+import org.thoughtcrime.securesms.conversation.ConversationIntents;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.Rfc5724Uri;
@@ -44,16 +44,15 @@ public class SmsSendtoActivity extends Activity {
 
     if (TextUtils.isEmpty(destination.destination)) {
       nextIntent = new Intent(this, NewConversationActivity.class);
-      nextIntent.putExtra(ConversationActivity.TEXT_EXTRA, destination.getBody());
+      nextIntent.putExtra(Intent.EXTRA_TEXT, destination.getBody());
       Toast.makeText(this, R.string.ConversationActivity_specify_recipient, Toast.LENGTH_LONG).show();
     } else {
       Recipient recipient = Recipient.external(this, destination.getDestination());
       long      threadId  = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(recipient.getId());
 
-      nextIntent = new Intent(this, ConversationActivity.class);
-      nextIntent.putExtra(ConversationActivity.TEXT_EXTRA, destination.getBody());
-      nextIntent.putExtra(ConversationActivity.THREAD_ID_EXTRA, threadId);
-      nextIntent.putExtra(ConversationActivity.RECIPIENT_EXTRA, recipient.getId());
+      nextIntent = ConversationIntents.createBuilder(this, recipient.getId(), threadId)
+                                      .withDraftText(destination.getBody())
+                                      .build();
     }
     return nextIntent;
   }

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

@@ -2,9 +2,10 @@ package org.thoughtcrime.securesms;
 
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.text.TextUtils;
+
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
-import android.text.TextUtils;
 
 import org.thoughtcrime.securesms.util.CharacterCalculator;
 import org.thoughtcrime.securesms.util.CharacterCalculator.CharacterState;

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

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms;
 
 import android.Manifest;
 import android.content.Context;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 

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

@@ -2,7 +2,6 @@ package org.thoughtcrime.securesms;
 
 import android.content.Context;
 import android.graphics.PorterDuff.Mode;
-import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -10,7 +9,7 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import org.thoughtcrime.securesms.util.ViewUtil;
+import androidx.annotation.NonNull;
 
 import java.util.List;
 
@@ -54,9 +53,9 @@ public class TransportOptionsAdapter extends BaseAdapter {
     }
 
     TransportOption transport   = (TransportOption) getItem(position);
-    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       imageView   = convertView.findViewById(R.id.icon);
+    TextView        textView    = convertView.findViewById(R.id.text);
+    TextView        subtextView = convertView.findViewById(R.id.subtext);
 
     imageView.getBackground().setColorFilter(transport.getBackgroundColor(), Mode.MULTIPLY);
     imageView.setImageResource(transport.getDrawable());

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

@@ -1,12 +1,13 @@
 package org.thoughtcrime.securesms;
 
 import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.appcompat.widget.ListPopupWindow;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.ListPopupWindow;
+
 import java.util.LinkedList;
 import java.util.List;
 

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

@@ -22,7 +22,6 @@ import android.animation.ValueAnimator;
 import android.annotation.SuppressLint;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
@@ -32,7 +31,6 @@ import android.graphics.PorterDuff;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.ColorDrawable;
 import android.os.AsyncTask;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Vibrator;
 import android.text.Html;
@@ -62,6 +60,7 @@ import androidx.appcompat.widget.SwitchCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
 
+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.IdentityKeyParcelable;
@@ -71,7 +70,6 @@ import org.thoughtcrime.securesms.database.IdentityDatabase;
 import org.thoughtcrime.securesms.database.IdentityDatabase.VerifiedStatus;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.jobs.MultiDeviceVerifiedUpdateJob;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.qr.QrCode;
 import org.thoughtcrime.securesms.qr.ScanListener;
@@ -87,18 +85,17 @@ 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.libsignal.util.guava.Optional;
 import org.whispersystems.signalservice.api.util.UuidUtil;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
 import java.util.Locale;
-import java.util.UUID;
 
 import static org.whispersystems.libsignal.SessionCipher.SESSION_LOCK;
 
@@ -228,9 +225,7 @@ public class VerifyIdentityActivity extends PassphraseRequiredActivity implement
   private void setActionBarNotificationBarColor(MaterialColor color) {
     getSupportActionBar().setBackgroundDrawable(new ColorDrawable(color.toActionBarColor(this)));
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      getWindow().setStatusBarColor(color.toStatusBarColor(this));
-    }
+    WindowUtil.setStatusBarColor(getWindow(), color.toStatusBarColor(this));
   }
 
   public static class VerifyDisplayFragment extends Fragment implements CompoundButton.OnCheckedChangeListener {
@@ -263,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 = 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.numbersContainer = container.findViewById(R.id.number_table);
+      this.qrCode           = container.findViewById(R.id.qr_code);
+      this.verified         = container.findViewById(R.id.verified_switch);
+      this.qrVerified       = container.findViewById(R.id.qr_verified);
+      this.description      = container.findViewById(R.id.description);
+      this.tapLabel         = container.findViewById(R.id.tap_label);
+      this.codes[0]         = container.findViewById(R.id.code_first);
+      this.codes[1]         = container.findViewById(R.id.code_second);
+      this.codes[2]         = container.findViewById(R.id.code_third);
+      this.codes[3]         = container.findViewById(R.id.code_fourth);
+      this.codes[4]         = container.findViewById(R.id.code_fifth);
+      this.codes[5]         = container.findViewById(R.id.code_sixth);
+      this.codes[6]         = container.findViewById(R.id.code_seventh);
+      this.codes[7]         = container.findViewById(R.id.code_eighth);
+      this.codes[8]         = container.findViewById(R.id.code_ninth);
+      this.codes[9]         = container.findViewById(R.id.code_tenth);
+      this.codes[10]        = container.findViewById(R.id.code_eleventh);
+      this.codes[11]        = container.findViewById(R.id.code_twelth);
 
       this.qrCode.setOnClickListener(clickListener);
       this.registerForContextMenu(numbersContainer);
@@ -669,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 = ViewUtil.findById(container, R.id.scanner);
+      this.cameraView = container.findViewById(R.id.scanner);
 
       return container;
     }

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

@@ -19,6 +19,7 @@ package org.thoughtcrime.securesms;
 
 import android.Manifest;
 import android.app.PictureInPictureParams;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
@@ -26,45 +27,56 @@ import android.media.AudioManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Rational;
+import android.view.View;
 import android.view.Window;
+import android.view.WindowInsetsController;
 import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.content.ContextCompat;
 import androidx.lifecycle.ViewModelProviders;
+import androidx.transition.Transition;
+import androidx.transition.TransitionListenerAdapter;
 
 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.components.TooltipPopup;
+import org.thoughtcrime.securesms.components.webrtc.CallParticipantsListUpdatePopupWindow;
 import org.thoughtcrime.securesms.components.webrtc.CallParticipantsState;
+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.events.WebRtcViewModel;
-import org.thoughtcrime.securesms.logging.Log;
 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.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.WindowUtil;
 import org.whispersystems.libsignal.IdentityKey;
 import org.whispersystems.signalservice.api.messages.calls.HangupMessage;
 import org.whispersystems.signalservice.api.messages.calls.OfferMessage;
 
-public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumberChangeDialog.Callback {
+import java.util.List;
 
+public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChangeDialog.Callback {
 
-  private static final String TAG = WebRtcCallActivity.class.getSimpleName();
+  private static final String TAG = Log.tag(WebRtcCallActivity.class);
 
-  private static final int STANDARD_DELAY_FINISH    = 1000;
+  private static final int STANDARD_DELAY_FINISH = 1000;
 
   public static final String ANSWER_ACTION   = WebRtcCallActivity.class.getCanonicalName() + ".ANSWER_ACTION";
   public static final String DENY_ACTION     = WebRtcCallActivity.class.getCanonicalName() + ".DENY_ACTION";
@@ -72,11 +84,20 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
 
   public static final String EXTRA_ENABLE_VIDEO_IF_AVAILABLE = WebRtcCallActivity.class.getCanonicalName() + ".ENABLE_VIDEO_IF_AVAILABLE";
 
+  private CallParticipantsListUpdatePopupWindow participantUpdateWindow;
+
+  private FullscreenHelper    fullscreenHelper;
   private WebRtcCallView      callScreen;
   private TooltipPopup        videoTooltip;
   private WebRtcCallViewModel viewModel;
   private boolean             enableVideoIfAvailable;
 
+  @Override
+  protected void attachBaseContext(@NonNull Context newBase) {
+    getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+    super.attachBaseContext(newBase);
+  }
+
   @Override
   public void onCreate(Bundle savedInstanceState) {
     Log.i(TAG, "onCreate()");
@@ -86,8 +107,8 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
 
     requestWindowFeature(Window.FEATURE_NO_TITLE);
     setContentView(R.layout.webrtc_call_activity);
-    //noinspection ConstantConditions
-    getSupportActionBar().hide();
+
+    fullscreenHelper = new FullscreenHelper(this);
 
     setVolumeControlStream(AudioManager.STREAM_VOICE_CALL);
 
@@ -112,7 +133,7 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
   }
 
   @Override
-  public void onNewIntent(Intent intent){
+  public void onNewIntent(Intent intent) {
     Log.i(TAG, "onNewIntent");
     super.onNewIntent(intent);
     processIntent(intent);
@@ -127,9 +148,11 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
       EventBus.getDefault().unregister(this);
     }
 
-    CallParticipantsState state = viewModel.getCallParticipantsState().getValue();
-    if (state != null && state.getCallState() == WebRtcViewModel.State.CALL_PRE_JOIN) {
-      finish();
+    if (!viewModel.isCallStarting()) {
+      CallParticipantsState state = viewModel.getCallParticipantsState().getValue();
+      if (state != null && state.getCallState().isPreJoinOrNetworkUnavailable()) {
+        finish();
+      }
     }
   }
 
@@ -140,11 +163,13 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
 
     EventBus.getDefault().unregister(this);
 
-    CallParticipantsState state = viewModel.getCallParticipantsState().getValue();
-    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);
+    if (!viewModel.isCallStarting()) {
+      CallParticipantsState state = viewModel.getCallParticipantsState().getValue();
+      if (state != null && state.getCallState().isPreJoinOrNetworkUnavailable()) {
+        Intent intent = new Intent(this, WebRtcCallService.class);
+        intent.setAction(WebRtcCallService.ACTION_CANCEL_PRE_JOIN_CALL);
+        startService(intent);
+      }
     }
   }
 
@@ -168,6 +193,7 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
   @Override
   public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode, Configuration newConfig) {
     viewModel.setIsInPipMode(isInPictureInPictureMode);
+    participantUpdateWindow.setEnabled(!isInPictureInPictureMode);
   }
 
   private boolean enterPipModeIfPossible() {
@@ -176,6 +202,8 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
               .setAspectRatio(new Rational(9, 16))
               .build();
       enterPictureInPictureMode(params);
+      CallParticipantsListDialog.dismiss(getSupportFragmentManager());
+
       return true;
     }
     return false;
@@ -207,6 +235,8 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
   private void initializeResources() {
     callScreen = findViewById(R.id.callScreen);
     callScreen.setControlsListener(new ControlsListener());
+
+    participantUpdateWindow = new CallParticipantsListUpdatePopupWindow(callScreen);
   }
 
   private void initializeViewModel() {
@@ -217,33 +247,53 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
     viewModel.getEvents().observe(this, this::handleViewModelEvent);
     viewModel.getCallTime().observe(this, this::handleCallTime);
     viewModel.getCallParticipantsState().observe(this, callScreen::updateCallParticipants);
+    viewModel.getCallParticipantListUpdate().observe(this, participantUpdateWindow::addCallParticipantListUpdate);
+    viewModel.getSafetyNumberChangeEvent().observe(this, this::handleSafetyNumberChangeEvent);
+    viewModel.getGroupMembers().observe(this, unused -> updateGroupMembersForGroupCall());
+    viewModel.shouldShowSpeakerHint().observe(this, this::updateSpeakerHint);
+
+    callScreen.getViewTreeObserver().addOnGlobalLayoutListener(() -> {
+      CallParticipantsState state = viewModel.getCallParticipantsState().getValue();
+      if (state != null) {
+        if (state.needsNewRequestSizes()) {
+          Intent intent = new Intent(WebRtcCallActivity.this, WebRtcCallService.class);
+          intent.setAction(WebRtcCallService.ACTION_GROUP_UPDATE_RENDERED_RESOLUTIONS);
+          startService(intent);
+        }
+      }
+    });
   }
 
   private void handleViewModelEvent(@NonNull WebRtcCallViewModel.Event event) {
+    if (event instanceof WebRtcCallViewModel.Event.StartCall) {
+      startCall(((WebRtcCallViewModel.Event.StartCall)event).isVideoCall());
+      return;
+    } else if (event instanceof WebRtcCallViewModel.Event.ShowGroupCallSafetyNumberChange) {
+      SafetyNumberChangeDialog.showForGroupCall(getSupportFragmentManager(), ((WebRtcCallViewModel.Event.ShowGroupCallSafetyNumberChange) event).getIdentityRecords());
+      return;
+    }
+
     if (isInPipMode()) {
       return;
     }
 
-    switch (event) {
-      case SHOW_VIDEO_TOOLTIP:
-        if (videoTooltip == null) {
-          videoTooltip = TooltipPopup.forTarget(callScreen.getVideoTooltipTarget())
-                                     .setBackgroundTint(ContextCompat.getColor(this, R.color.core_ultramarine))
-                                     .setTextColor(ContextCompat.getColor(this, R.color.core_white))
-                                     .setText(R.string.WebRtcCallActivity__tap_here_to_turn_on_your_video)
-                                     .setOnDismissListener(() -> viewModel.onDismissedVideoTooltip())
-                                     .show(TooltipPopup.POSITION_ABOVE);
-          return;
-        }
-        break;
-      case DISMISS_VIDEO_TOOLTIP:
-        if (videoTooltip != null) {
-          videoTooltip.dismiss();
-          videoTooltip = null;
-        }
-        break;
-      default:
-        throw new IllegalArgumentException("Unknown event: " + event);
+    if (event instanceof WebRtcCallViewModel.Event.ShowVideoTooltip) {
+      if (videoTooltip == null) {
+        videoTooltip = TooltipPopup.forTarget(callScreen.getVideoTooltipTarget())
+                                   .setBackgroundTint(ContextCompat.getColor(this, R.color.core_ultramarine))
+                                   .setTextColor(ContextCompat.getColor(this, R.color.core_white))
+                                   .setText(R.string.WebRtcCallActivity__tap_here_to_turn_on_your_video)
+                                   .setOnDismissListener(() -> viewModel.onDismissedVideoTooltip())
+                                   .show(TooltipPopup.POSITION_ABOVE);
+        return;
+      }
+    } else if (event instanceof WebRtcCallViewModel.Event.DismissVideoTooltip) {
+      if (videoTooltip != null) {
+        videoTooltip.dismiss();
+        videoTooltip = null;
+      }
+    } else {
+      throw new IllegalArgumentException("Unknown event: " + event);
     }
   }
 
@@ -381,8 +431,12 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
     startService(intent);
   }
 
-  private void handleOutgoingCall() {
-    callScreen.setStatus(getString(R.string.WebRtcCallActivity__calling));
+  private void handleOutgoingCall(@NonNull WebRtcViewModel event) {
+    if (event.getGroupState().isNotIdle()) {
+      callScreen.setStatusFromGroupCallState(event.getGroupState());
+    } else {
+      callScreen.setStatus(getString(R.string.WebRtcCallActivity__calling));
+    }
   }
 
   private void handleTerminate(@NonNull Recipient recipient, @NonNull HangupMessage.Type hangupType) {
@@ -408,8 +462,11 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
     delayedFinish(WebRtcCallService.BUSY_TONE_LENGTH);
   }
 
-  private void handleCallConnected() {
+  private void handleCallConnected(@NonNull WebRtcViewModel event) {
     getWindow().addFlags(WindowManager.LayoutParams.FLAG_IGNORE_CHEEK_PRESSES);
+    if (event.getGroupState().isNotIdleOrConnected()) {
+      callScreen.setStatusFromGroupCallState(event.getGroupState());
+    }
   }
 
   private void handleRecipientUnavailable() {
@@ -421,14 +478,13 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
   private void handleServerFailure() {
     EventBus.getDefault().removeStickyEvent(WebRtcViewModel.class);
     callScreen.setStatus(getString(R.string.RedPhone_network_failed));
-    delayedFinish();
   }
 
   private void handleNoSuchUser(final @NonNull WebRtcViewModel event) {
     if (isFinishing()) return; // XXX Stuart added this check above, not sure why, so I'm repeating in ignorance. - moxie
     new AlertDialog.Builder(this)
                    .setTitle(R.string.RedPhone_number_not_registered)
-                   .setIconAttribute(R.attr.dialog_alert_icon)
+                   .setIcon(R.drawable.ic_warning)
                    .setMessage(R.string.RedPhone_the_number_you_dialed_does_not_support_secure_voice)
                    .setCancelable(true)
                    .setPositiveButton(R.string.RedPhone_got_it, (d, w) -> handleTerminate(event.getRecipient(), HangupMessage.Type.NORMAL))
@@ -447,13 +503,40 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
     SafetyNumberChangeDialog.showForCall(getSupportFragmentManager(), recipient.getId());
   }
 
-  @Override
-  public void onSendAnywayAfterSafetyNumberChange() {
-    Intent intent = new Intent(WebRtcCallActivity.this, WebRtcCallService.class);
-    intent.setAction(WebRtcCallService.ACTION_OUTGOING_CALL)
-          .putExtra(WebRtcCallService.EXTRA_REMOTE_PEER, new RemotePeer(viewModel.getRecipient().getId()));
+  public void handleSafetyNumberChangeEvent(@NonNull WebRtcCallViewModel.SafetyNumberChangeEvent safetyNumberChangeEvent) {
+    if (Util.hasItems(safetyNumberChangeEvent.getRecipientIds())) {
+      if (safetyNumberChangeEvent.isInPipMode()) {
+        GroupCallSafetyNumberChangeNotificationUtil.showNotification(this, viewModel.getRecipient().get());
+      } else {
+        GroupCallSafetyNumberChangeNotificationUtil.cancelNotification(this, viewModel.getRecipient().get());
+        SafetyNumberChangeDialog.showForDuringGroupCall(getSupportFragmentManager(), safetyNumberChangeEvent.getRecipientIds());
+      }
+    }
+  }
 
-    startService(intent);
+  private void updateGroupMembersForGroupCall() {
+    startService(new Intent(this, WebRtcCallService.class).setAction(WebRtcCallService.ACTION_GROUP_REQUEST_UPDATE_MEMBERS));
+  }
+
+  private void updateSpeakerHint(boolean showSpeakerHint) {
+    if (showSpeakerHint) {
+      callScreen.showSpeakerViewHint();
+    } else {
+      callScreen.hideSpeakerViewHint();
+    }
+  }
+
+  @Override
+  public void onSendAnywayAfterSafetyNumberChange(@NonNull List<RecipientId> changedRecipients) {
+    CallParticipantsState state = viewModel.getCallParticipantsState().getValue();
+    if (state.getGroupCallState().isConnected()) {
+      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());
+    }
   }
 
   @Override
@@ -461,7 +544,19 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
 
   @Override
   public void onCanceled() {
-    handleTerminate(viewModel.getRecipient().get(), HangupMessage.Type.NORMAL);
+    CallParticipantsState state = viewModel.getCallParticipantsState().getValue();
+    if (state != null && state.getGroupCallState().isNotIdle()) {
+      if (state.getCallState().isPreJoinOrNetworkUnavailable()) {
+        Intent intent = new Intent(this, WebRtcCallService.class);
+        intent.setAction(WebRtcCallService.ACTION_CANCEL_PRE_JOIN_CALL);
+        startService(intent);
+        finish();
+      } else {
+        handleEndCall();
+      }
+    } else {
+      handleTerminate(viewModel.getRecipient().get(), HangupMessage.Type.NORMAL);
+    }
   }
 
   private boolean isSystemPipEnabledAndAvailable() {
@@ -485,7 +580,8 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
     callScreen.setRecipient(event.getRecipient());
 
     switch (event.getState()) {
-      case CALL_CONNECTED:          handleCallConnected();                                                     break;
+      case CALL_PRE_JOIN:           handleCallPreJoin(event);                                                  break;
+      case CALL_CONNECTED:          handleCallConnected(event);                                                break;
       case NETWORK_FAILURE:         handleServerFailure();                                                     break;
       case CALL_RINGING:            handleCallRinging();                                                       break;
       case CALL_DISCONNECTED:       handleTerminate(event.getRecipient(), HangupMessage.Type.NORMAL);          break;
@@ -495,7 +591,7 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
       case CALL_NEEDS_PERMISSION:   handleTerminate(event.getRecipient(), HangupMessage.Type.NEED_PERMISSION); break;
       case NO_SUCH_USER:            handleNoSuchUser(event);                                                   break;
       case RECIPIENT_UNAVAILABLE:   handleRecipientUnavailable();                                              break;
-      case CALL_OUTGOING:           handleOutgoingCall();                                                      break;
+      case CALL_OUTGOING:           handleOutgoingCall(event);                                                 break;
       case CALL_BUSY:               handleCallBusy();                                                          break;
       case UNTRUSTED_IDENTITY:      handleUntrustedIdentity(event);                                            break;
     }
@@ -510,19 +606,29 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
     }
   }
 
+  private void handleCallPreJoin(@NonNull WebRtcViewModel event) {
+    if (event.getGroupState().isNotIdle()) {
+      callScreen.setStatusFromGroupCallState(event.getGroupState());
+    }
+  }
+
+  private void startCall(boolean isVideoCall) {
+    enableVideoIfAvailable = isVideoCall;
+
+    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();
+  }
+
   private final class ControlsListener implements WebRtcCallView.ControlsListener {
 
     @Override
     public void onStartCall(boolean isVideoCall) {
-      enableVideoIfAvailable = isVideoCall;
-
-      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();
+      viewModel.startCall(isVideoCall);
     }
 
     @Override
@@ -537,6 +643,16 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
       }
     }
 
+    @Override
+    public void showSystemUI() {
+      fullscreenHelper.showSystemUI();
+    }
+
+    @Override
+    public void hideSystemUI() {
+      fullscreenHelper.hideSystemUI();
+    }
+
     @Override
     public void onAudioOutputChanged(@NonNull WebRtcAudioOutput audioOutput) {
       switch (audioOutput) {
@@ -602,6 +718,10 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
     public void onPageChanged(@NonNull CallParticipantsState.SelectedPage page) {
       viewModel.setIsViewingFocusedParticipant(page);
     }
-  }
 
+    @Override
+    public void onLocalPictureInPictureClicked() {
+      viewModel.onLocalPictureInPictureClicked();
+    }
+  }
 }

app/src/main/java/org/thoughtcrime/securesms/attachments/MmsNotificationAttachment.java

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.attachments;
 
 
 import android.net.Uri;
+
 import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.database.AttachmentDatabase;

app/src/main/java/org/thoughtcrime/securesms/attachments/PointerAttachment.java

@@ -1,10 +1,10 @@
 package org.thoughtcrime.securesms.attachments;
 
 import android.net.Uri;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.thoughtcrime.securesms.audio.AudioHash;
 import org.thoughtcrime.securesms.blurhash.BlurHash;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.stickers.StickerLocator;

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

@@ -8,8 +8,9 @@ import android.media.MediaCodecInfo;
 import android.media.MediaFormat;
 import android.media.MediaRecorder;
 import android.os.Build;
-import org.thoughtcrime.securesms.logging.Log;
 
+import org.signal.core.util.StreamUtil;
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.util.Util;
 
 import java.io.IOException;
@@ -81,7 +82,7 @@ public class AudioCodec {
           mediaCodec.release();
           audioRecord.release();
 
-          Util.close(outputStream);
+          StreamUtil.close(outputStream);
           setFinished();
         }
       }

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

@@ -5,15 +5,16 @@ import android.content.Context;
 import android.net.Uri;
 import android.os.Build;
 import android.os.ParcelFileDescriptor;
-import androidx.annotation.NonNull;
-import org.thoughtcrime.securesms.logging.Log;
 
+import androidx.annotation.NonNull;
+
+import org.signal.core.util.concurrent.SignalExecutors;
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
 import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
-import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
 import org.whispersystems.libsignal.util.Pair;
 
 import java.io.IOException;

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

@@ -16,18 +16,18 @@ import androidx.core.util.Consumer;
 
 import com.google.protobuf.ByteString;
 
+import org.signal.core.util.concurrent.SignalExecutors;
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.model.databaseprotos.AudioWaveFormData;
-import org.thoughtcrime.securesms.logging.Log;
 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 org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

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

@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.backup;
 
 
+import android.content.ActivityNotFoundException;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
@@ -22,9 +23,9 @@ import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.registration.fragments.RestoreBackupFragment;
 import org.thoughtcrime.securesms.service.LocalBackupListener;
 import org.thoughtcrime.securesms.util.BackupUtil;
@@ -126,7 +127,12 @@ public class BackupDialog {
                                      Intent.FLAG_GRANT_WRITE_URI_PERMISSION       |
                                      Intent.FLAG_GRANT_READ_URI_PERMISSION);
 
-                     fragment.startActivityForResult(intent, requestCode);
+                    try {
+                       fragment.startActivityForResult(intent, requestCode);
+                     } catch (ActivityNotFoundException e) {
+                       Toast.makeText(fragment.requireContext(), R.string.BackupDialog_no_file_picker_available, Toast.LENGTH_LONG)
+                            .show();
+                     }
 
                      dialog.dismiss();
                    }))

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

@@ -13,15 +13,16 @@ import androidx.core.app.NotificationManagerCompat;
 
 import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.notifications.NotificationCancellationHelper;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 
 import java.io.IOException;
 
 public enum BackupFileIOError {
-  ACCESS_ERROR(R.string.LocalBackupJobApi29_backups_disabled, R.string.LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved),
+  ACCESS_ERROR(R.string.LocalBackupJobApi29_backup_failed, R.string.LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved),
   FILE_TOO_LARGE(R.string.LocalBackupJobApi29_backup_failed, R.string.LocalBackupJobApi29_your_backup_file_is_too_large),
   NOT_ENOUGH_SPACE(R.string.LocalBackupJobApi29_backup_failed, R.string.LocalBackupJobApi29_there_is_not_enough_space),
-  UNKNOWN(R.string.LocalBackupJobApi29_backup_failed, R.string.LocalBackupJobApi29_backup_failed_for_an_unknown_reason);
+  UNKNOWN(R.string.LocalBackupJobApi29_backup_failed, R.string.LocalBackupJobApi29_tap_to_manage_backups);
 
   private static final short BACKUP_FAILED_ID = 31321;
 
@@ -34,7 +35,7 @@ public enum BackupFileIOError {
   }
 
   public static void clearNotification(@NonNull Context context) {
-    NotificationManagerCompat.from(context).cancel(BACKUP_FAILED_ID);
+    NotificationCancellationHelper.cancelLegacy(context, BACKUP_FAILED_ID);
   }
 
   public void postNotification(@NonNull Context context) {
@@ -42,8 +43,8 @@ public enum BackupFileIOError {
 
     intent.putExtra(ApplicationPreferencesActivity.LAUNCH_TO_BACKUPS_FRAGMENT, true);
 
-    PendingIntent pendingIntent            = PendingIntent.getActivity(context, -1, intent, 0);
-    Notification backupFailedNotification = new NotificationCompat.Builder(context, NotificationChannels.BACKUPS)
+    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))
                                                                   .setContentText(context.getString(messageId))

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

@@ -6,8 +6,8 @@ import android.os.Build;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.crypto.KeyStoreHelper;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 /**

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

@@ -12,12 +12,13 @@ import androidx.documentfile.provider.DocumentFile;
 
 import com.annimon.stream.function.Consumer;
 import com.annimon.stream.function.Predicate;
-import com.google.android.collect.Sets;
 import com.google.protobuf.ByteString;
 
 import net.sqlcipher.database.SQLiteDatabase;
 
 import org.greenrobot.eventbus.EventBus;
+import org.signal.core.util.Conversions;
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.attachments.AttachmentId;
 import org.thoughtcrime.securesms.crypto.AttachmentSecret;
 import org.thoughtcrime.securesms.crypto.ClassicDecryptingPartInputStream;
@@ -35,9 +36,8 @@ 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.logging.Log;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
-import org.thoughtcrime.securesms.util.Conversions;
+import org.thoughtcrime.securesms.util.SetUtil;
 import org.thoughtcrime.securesms.util.Stopwatch;
 import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.libsignal.kdf.HKDFv3;
@@ -69,16 +69,12 @@ public class FullBackupExporter extends FullBackupBase {
   @SuppressWarnings("unused")
   private static final String TAG = FullBackupExporter.class.getSimpleName();
 
-  private static final Set<String> BLACKLISTED_TABLES = Sets.newHashSet(
+  private static final Set<String> BLACKLISTED_TABLES = SetUtil.newHashSet(
     SignedPreKeyDatabase.TABLE_NAME,
     OneTimePreKeyDatabase.TABLE_NAME,
     SessionDatabase.TABLE_NAME,
     SearchDatabase.SMS_FTS_TABLE_NAME,
-    SearchDatabase.MMS_FTS_TABLE_NAME,
-    JobDatabase.JOBS_TABLE_NAME,
-    JobDatabase.CONSTRAINTS_TABLE_NAME,
-    JobDatabase.DEPENDENCIES_TABLE_NAME,
-    KeyValueDatabase.TABLE_NAME
+    SearchDatabase.MMS_FTS_TABLE_NAME
   );
 
   public static void export(@NonNull Context context,

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

@@ -14,6 +14,9 @@ import androidx.annotation.NonNull;
 import net.sqlcipher.database.SQLiteDatabase;
 
 import org.greenrobot.eventbus.EventBus;
+import org.signal.core.util.Conversions;
+import org.signal.core.util.StreamUtil;
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.backup.BackupProtos.Attachment;
 import org.thoughtcrime.securesms.backup.BackupProtos.BackupFrame;
 import org.thoughtcrime.securesms.backup.BackupProtos.DatabaseVersion;
@@ -25,13 +28,10 @@ import org.thoughtcrime.securesms.crypto.ModernEncryptingPartOutputStream;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.database.SearchDatabase;
 import org.thoughtcrime.securesms.database.StickerDatabase;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.BackupUtil;
-import org.thoughtcrime.securesms.util.Conversions;
 import org.thoughtcrime.securesms.util.SqlUtil;
-import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.libsignal.kdf.HKDFv3;
 import org.whispersystems.libsignal.util.ByteUtil;
 
@@ -237,11 +237,11 @@ public class FullBackupImporter extends FullBackupBase {
         this.in = in;
 
         byte[] headerLengthBytes = new byte[4];
-        Util.readFully(in, headerLengthBytes);
+        StreamUtil.readFully(in, headerLengthBytes);
 
         int headerLength = Conversions.byteArrayToInt(headerLengthBytes);
         byte[] headerFrame = new byte[headerLength];
-        Util.readFully(in, headerFrame);
+        StreamUtil.readFully(in, headerFrame);
 
         BackupFrame frame = BackupFrame.parseFrom(headerFrame);
 
@@ -313,7 +313,7 @@ public class FullBackupImporter extends FullBackupBase {
         byte[] theirMac = new byte[10];
 
         try {
-          Util.readFully(in, theirMac);
+          StreamUtil.readFully(in, theirMac);
         } catch (IOException e) {
           throw new IOException(e);
         }
@@ -329,10 +329,10 @@ public class FullBackupImporter extends FullBackupBase {
     private BackupFrame readFrame(InputStream in) throws IOException {
       try {
         byte[] length = new byte[4];
-        Util.readFully(in, length);
+        StreamUtil.readFully(in, length);
 
         byte[] frame = new byte[Conversions.byteArrayToInt(length)];
-        Util.readFully(in, frame);
+        StreamUtil.readFully(in, frame);
 
         byte[] theirMac = new byte[10];
         System.arraycopy(frame, frame.length - 10, theirMac, 0, theirMac.length);

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

@@ -0,0 +1,171 @@
+package org.thoughtcrime.securesms.blocked;
+
+import android.app.AlertDialog;
+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;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.ViewModelProviders;
+
+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.ContactFilterToolbar;
+import org.thoughtcrime.securesms.contacts.ContactsCursorLoader;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
+import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.whispersystems.libsignal.util.guava.Optional;
+
+public class BlockedUsersActivity extends PassphraseRequiredActivity implements BlockedUsersFragment.Listener, ContactSelectionListFragment.OnContactSelectedListener {
+
+  private static final String CONTACT_SELECTION_FRAGMENT = "Contact.Selection.Fragment";
+
+  private final DynamicTheme dynamicTheme = new DynamicNoActionBarTheme();
+
+  private BlockedUsersViewModel viewModel;
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState, boolean ready) {
+    super.onCreate(savedInstanceState, ready);
+
+    dynamicTheme.onCreate(this);
+
+    setContentView(R.layout.blocked_users_activity);
+
+    BlockedUsersRepository        repository = new BlockedUsersRepository(this);
+    BlockedUsersViewModel.Factory factory    = new BlockedUsersViewModel.Factory(repository);
+
+    viewModel = ViewModelProviders.of(this, factory).get(BlockedUsersViewModel.class);
+
+    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());
+    contactFilterToolbar.setNavigationOnClickListener(unused -> onBackPressed());
+    contactFilterToolbar.setOnFilterChangedListener(query -> {
+      Fragment fragment = getSupportFragmentManager().findFragmentByTag(CONTACT_SELECTION_FRAGMENT);
+      if (fragment != null) {
+        ((ContactSelectionListFragment) fragment).setQueryFilter(query);
+      }
+    });
+    contactFilterToolbar.setHint(R.string.BlockedUsersActivity__add_blocked_user);
+
+    //noinspection CodeBlock2Expr
+    getSupportFragmentManager().addOnBackStackChangedListener(() -> {
+      viewSwitcher.setDisplayedChild(getSupportFragmentManager().getBackStackEntryCount());
+
+      if (getSupportFragmentManager().getBackStackEntryCount() == 1) {
+        contactFilterToolbar.focusAndShowKeyboard();
+      }
+    });
+
+    getSupportFragmentManager().beginTransaction()
+                               .add(R.id.fragment_container, new BlockedUsersFragment())
+                               .commit();
+
+    viewModel.getEvents().observe(this, event -> handleEvent(container, event));
+  }
+
+  @Override
+  protected void onResume() {
+    super.onResume();
+
+    dynamicTheme.onResume(this);
+  }
+
+  @Override
+  public boolean onBeforeContactSelected(Optional<RecipientId> recipientId, String number) {
+    final String displayName = recipientId.transform(id -> Recipient.resolved(id).getDisplayName(this)).or(number);
+
+    AlertDialog confirmationDialog = new AlertDialog.Builder(BlockedUsersActivity.this)
+                                                    .setTitle(R.string.BlockedUsersActivity__block_user)
+                                                    .setMessage(getString(R.string.BlockedUserActivity__s_will_not_be_able_to, displayName))
+                                                    .setPositiveButton(R.string.BlockedUsersActivity__block, (dialog, which) -> {
+                                                      if (recipientId.isPresent()) {
+                                                        viewModel.block(recipientId.get());
+                                                      } else {
+                                                        viewModel.createAndBlock(number);
+                                                      }
+                                                      dialog.dismiss();
+                                                      onBackPressed();
+                                                    })
+                                                    .setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.dismiss())
+                                                    .setCancelable(true)
+                                                    .create();
+
+    confirmationDialog.setOnShowListener(dialog -> {
+      confirmationDialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(Color.RED);
+    });
+
+    confirmationDialog.show();
+
+    return false;
+  }
+
+  @Override
+  public void onContactDeselected(Optional<RecipientId> recipientId, String number) {
+
+  }
+
+  @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);
+    intent.putExtra(ContactSelectionListFragment.DISPLAY_MODE,
+                    ContactsCursorLoader.DisplayMode.FLAG_PUSH            |
+                    ContactsCursorLoader.DisplayMode.FLAG_SMS             |
+                    ContactsCursorLoader.DisplayMode.FLAG_ACTIVE_GROUPS   |
+                    ContactsCursorLoader.DisplayMode.FLAG_INACTIVE_GROUPS |
+                    ContactsCursorLoader.DisplayMode.FLAG_BLOCK);
+
+    getSupportFragmentManager().beginTransaction()
+                               .replace(R.id.fragment_container, fragment, CONTACT_SELECTION_FRAGMENT)
+                               .addToBackStack(null)
+                               .commit();
+  }
+
+  private void handleEvent(@NonNull View view, @NonNull BlockedUsersViewModel.Event event) {
+    final String displayName;
+
+    if (event.getRecipient() == null) {
+      displayName = event.getNumber();
+    } else {
+      displayName = event.getRecipient().getDisplayName(this);
+    }
+
+    final @StringRes int messageResId;
+    switch (event.getEventType()) {
+      case BLOCK_SUCCEEDED:
+        messageResId = R.string.BlockedUsersActivity__s_has_been_blocked;
+        break;
+      case BLOCK_FAILED:
+        messageResId = R.string.BlockedUsersActivity__failed_to_block_s;
+        break;
+      case UNBLOCK_SUCCEEDED:
+        messageResId = R.string.BlockedUsersActivity__s_has_been_unblocked;
+        break;
+      default:
+        throw new IllegalArgumentException("Unsupported event type " + event);
+    }
+
+    Snackbar.make(view, getString(messageResId, displayName), Snackbar.LENGTH_SHORT).show();
+  }
+}

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

@@ -0,0 +1,96 @@
+package org.thoughtcrime.securesms.blocked;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.core.util.Consumer;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.ListAdapter;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.components.AvatarImageView;
+import org.thoughtcrime.securesms.recipients.Recipient;
+
+import java.util.Objects;
+
+final class BlockedUsersAdapter extends ListAdapter<Recipient, BlockedUsersAdapter.ViewHolder> {
+
+  private final RecipientClickedListener recipientClickedListener;
+
+  BlockedUsersAdapter(@NonNull RecipientClickedListener recipientClickedListener) {
+    super(new RecipientDiffCallback());
+
+    this.recipientClickedListener = recipientClickedListener;
+  }
+
+  @Override
+  public @NonNull ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+    return new ViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.blocked_users_adapter_item, parent, false),
+                          position -> recipientClickedListener.onRecipientClicked(Objects.requireNonNull(getItem(position))));
+  }
+
+  @Override
+  public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
+    holder.bind(Objects.requireNonNull(getItem(position)));
+  }
+
+  static final class ViewHolder extends RecyclerView.ViewHolder {
+
+    private final AvatarImageView avatar;
+    private final TextView        displayName;
+    private final TextView        numberOrUsername;
+
+    public ViewHolder(@NonNull View itemView, Consumer<Integer> clickConsumer) {
+      super(itemView);
+
+      this.avatar           = itemView.findViewById(R.id.avatar);
+      this.displayName      = itemView.findViewById(R.id.display_name);
+      this.numberOrUsername = itemView.findViewById(R.id.number_or_username);
+
+      itemView.setOnClickListener(unused -> {
+        if (getAdapterPosition() != RecyclerView.NO_POSITION) {
+          clickConsumer.accept(getAdapterPosition());
+        }
+      });
+    }
+
+    public void bind(@NonNull Recipient recipient) {
+      avatar.setAvatar(recipient);
+      displayName.setText(recipient.getDisplayName(itemView.getContext()));
+
+      if (recipient.hasAUserSetDisplayName(itemView.getContext())) {
+        String identifier = recipient.getE164().or(recipient.getUsername()).orNull();
+
+        if (identifier != null) {
+          numberOrUsername.setText(identifier);
+          numberOrUsername.setVisibility(View.VISIBLE);
+        } else {
+          numberOrUsername.setVisibility(View.GONE);
+        }
+      } else {
+        numberOrUsername.setVisibility(View.GONE);
+      }
+    }
+  }
+
+  private static final class RecipientDiffCallback extends DiffUtil.ItemCallback<Recipient> {
+
+    @Override
+    public boolean areItemsTheSame(@NonNull Recipient oldItem, @NonNull Recipient newItem) {
+      return oldItem.equals(newItem);
+    }
+
+    @Override
+    public boolean areContentsTheSame(@NonNull Recipient oldItem, @NonNull Recipient newItem) {
+      return oldItem.equals(newItem);
+    }
+  }
+
+  interface RecipientClickedListener {
+    void onRecipientClicked(@NonNull Recipient recipient);
+  }
+}

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

@@ -0,0 +1,100 @@
+package org.thoughtcrime.securesms.blocked;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.ViewModelProviders;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.recipients.Recipient;
+
+public class BlockedUsersFragment extends Fragment {
+
+  private BlockedUsersViewModel viewModel;
+  private Listener              listener;
+
+  @Override
+  public void onAttach(@NonNull Context context) {
+    super.onAttach(context);
+
+    if (context instanceof Listener) {
+      listener = (Listener) context;
+    } else {
+      throw new ClassCastException("Expected context to implement Listener");
+    }
+  }
+
+  @Override
+  public void onDetach() {
+    super.onDetach();
+
+    listener = null;
+  }
+
+  @Override
+  public @Nullable View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    return inflater.inflate(R.layout.blocked_users_fragment, container, false);
+  }
+
+  @Override
+  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+    View                addUser  = view.findViewById(R.id.add_blocked_user_touch_target);
+    RecyclerView        recycler = view.findViewById(R.id.blocked_users_recycler);
+    View                empty    = view.findViewById(R.id.no_blocked_users);
+    BlockedUsersAdapter adapter  = new BlockedUsersAdapter(this::handleRecipientClicked);
+
+    recycler.setAdapter(adapter);
+
+    addUser.setOnClickListener(unused -> {
+      if (listener != null) {
+        listener.handleAddUserToBlockedList();
+      }
+    });
+
+    viewModel = ViewModelProviders.of(requireActivity()).get(BlockedUsersViewModel.class);
+    viewModel.getRecipients().observe(getViewLifecycleOwner(), list -> {
+      if (list.isEmpty()) {
+        empty.setVisibility(View.VISIBLE);
+      } else {
+        empty.setVisibility(View.GONE);
+      }
+
+      adapter.submitList(list);
+    });
+  }
+
+  private void handleRecipientClicked(@NonNull Recipient recipient) {
+    AlertDialog confirmationDialog = new AlertDialog.Builder(requireContext())
+                                                    .setTitle(R.string.BlockedUsersActivity__unblock_user)
+                                                    .setMessage(getString(R.string.BlockedUsersActivity__do_you_want_to_unblock_s, recipient.getDisplayName(requireContext())))
+                                                    .setPositiveButton(R.string.BlockedUsersActivity__unblock, (dialog, which) -> {
+                                                      viewModel.unblock(recipient.getId());
+                                                      dialog.dismiss();
+                                                    })
+                                                    .setNegativeButton(android.R.string.cancel, (dialog, which) -> {
+                                                      dialog.dismiss();
+                                                    })
+                                                    .setCancelable(true)
+                                                    .create();
+
+    confirmationDialog.setOnShowListener(dialog -> {
+      confirmationDialog.getButton(DialogInterface.BUTTON_POSITIVE).setTextColor(Color.RED);
+    });
+
+    confirmationDialog.show();
+  }
+
+  interface Listener {
+    void handleAddUserToBlockedList();
+  }
+}

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

@@ -0,0 +1,76 @@
+package org.thoughtcrime.securesms.blocked;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.core.util.Consumer;
+
+import org.signal.core.util.concurrent.SignalExecutors;
+import org.signal.core.util.logging.Log;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.RecipientDatabase;
+import org.thoughtcrime.securesms.groups.GroupChangeBusyException;
+import org.thoughtcrime.securesms.groups.GroupChangeFailedException;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.recipients.RecipientUtil;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+class BlockedUsersRepository {
+
+  private static final String TAG = Log.tag(BlockedUsersRepository.class);
+
+  private final Context context;
+
+  BlockedUsersRepository(@NonNull Context context) {
+    this.context = context;
+  }
+
+  void getBlocked(@NonNull Consumer<List<Recipient>> blockedUsers) {
+    SignalExecutors.BOUNDED.execute(() -> {
+      RecipientDatabase db = DatabaseFactory.getRecipientDatabase(context);
+      try (RecipientDatabase.RecipientReader reader = db.readerForBlocked(db.getBlocked())) {
+        int count = reader.getCount();
+        if (count == 0) {
+          blockedUsers.accept(Collections.emptyList());
+        } else {
+          List<Recipient> recipients = new ArrayList<>();
+          while (reader.getNext() != null) {
+            recipients.add(reader.getCurrent());
+          }
+          blockedUsers.accept(recipients);
+        }
+      }
+    });
+  }
+
+  void block(@NonNull RecipientId recipientId, @NonNull Runnable success, @NonNull Runnable failure) {
+    SignalExecutors.BOUNDED.execute(() -> {
+      try {
+        RecipientUtil.block(context, Recipient.resolved(recipientId));
+        success.run();
+      } catch (IOException | GroupChangeFailedException | GroupChangeBusyException e) {
+        Log.w(TAG, "block: failed to block recipient: ", e);
+        failure.run();
+      }
+    });
+  }
+
+  void createAndBlock(@NonNull String number, @NonNull Runnable success) {
+    SignalExecutors.BOUNDED.execute(() -> {
+      RecipientUtil.blockNonGroup(context, Recipient.external(context, number));
+      success.run();
+    });
+  }
+
+  void unblock(@NonNull RecipientId recipientId, @NonNull Runnable success) {
+    SignalExecutors.BOUNDED.execute(() -> {
+      RecipientUtil.unblock(context, Recipient.resolved(recipientId));
+      success.run();
+    });
+  }
+}

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

@@ -0,0 +1,115 @@
+package org.thoughtcrime.securesms.blocked;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModelProvider;
+
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.util.SingleLiveEvent;
+
+import java.util.List;
+import java.util.Objects;
+
+public class BlockedUsersViewModel extends ViewModel {
+
+  private final BlockedUsersRepository           repository;
+  private final MutableLiveData<List<Recipient>> recipients;
+  private final SingleLiveEvent<Event>           events = new SingleLiveEvent<>();
+
+  private BlockedUsersViewModel(@NonNull BlockedUsersRepository repository) {
+    this.repository  = repository;
+    this.recipients = new MutableLiveData<>();
+
+    loadRecipients();
+   }
+
+  public LiveData<List<Recipient>> getRecipients() {
+    return recipients;
+  }
+
+  public LiveData<Event> getEvents() {
+    return events;
+  }
+
+  void block(@NonNull RecipientId recipientId) {
+    repository.block(recipientId,
+                     () -> {
+                       loadRecipients();
+                       events.postValue(new Event(EventType.BLOCK_SUCCEEDED, Recipient.resolved(recipientId)));
+                     },
+                     () -> events.postValue(new Event(EventType.BLOCK_FAILED, Recipient.resolved(recipientId))));
+  }
+
+  void createAndBlock(@NonNull String number) {
+    repository.createAndBlock(number, () -> {
+      loadRecipients();
+      events.postValue(new Event(EventType.BLOCK_SUCCEEDED, number));
+    });
+  }
+
+  void unblock(@NonNull RecipientId recipientId) {
+    repository.unblock(recipientId, () -> {
+      loadRecipients();
+      events.postValue(new Event(EventType.UNBLOCK_SUCCEEDED, Recipient.resolved(recipientId)));
+    });
+  }
+
+  private void loadRecipients() {
+    repository.getBlocked(recipients::postValue);
+  }
+
+  enum EventType {
+    BLOCK_SUCCEEDED,
+    BLOCK_FAILED,
+    UNBLOCK_SUCCEEDED
+  }
+
+  public static final class Event {
+
+    private final EventType eventType;
+    private final Recipient recipient;
+    private final String    number;
+
+    private Event(@NonNull EventType eventType, @NonNull Recipient recipient) {
+      this.eventType = eventType;
+      this.recipient = recipient;
+      this.number    = null;
+    }
+
+    private Event(@NonNull EventType eventType, @NonNull String number) {
+      this.eventType = eventType;
+      this.recipient = null;
+      this.number    = number;
+    }
+
+    public @Nullable Recipient getRecipient() {
+      return recipient;
+    }
+
+    public @Nullable String getNumber() {
+      return number;
+    }
+
+    public @NonNull EventType getEventType() {
+      return eventType;
+    }
+  }
+
+  public static class Factory implements ViewModelProvider.Factory {
+
+    private final BlockedUsersRepository repository;
+
+    public Factory(@NonNull BlockedUsersRepository repository) {
+      this.repository = repository;
+    }
+
+    @Override
+    public @NonNull <T extends ViewModel> T create(@NonNull Class<T> modelClass) {
+      return Objects.requireNonNull(modelClass.cast(new BlockedUsersViewModel(repository)));
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/blurhash/Base83.java

@@ -20,8 +20,6 @@
  */
 package org.thoughtcrime.securesms.blurhash;
 
-import android.text.TextUtils;
-
 import androidx.annotation.Nullable;
 
 final class Base83 {

app/src/main/java/org/thoughtcrime/securesms/color/MaterialColor.java

@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms.color;
 
 import android.content.Context;
-import android.content.res.Configuration;
 import android.graphics.Color;
 
 import androidx.annotation.ColorInt;

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

@@ -1,15 +1,16 @@
 package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
-import androidx.annotation.ColorInt;
-import androidx.annotation.IdRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.Slide;

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

@@ -4,7 +4,6 @@ import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.Build.VERSION_CODES;
-import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;

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

@@ -371,10 +371,11 @@ public final class AudioView extends FrameLayout {
   }
 
   private void showPlayButton() {
-    if (!smallView || seekBar.getProgress() == 0) {
+    if (!smallView) {
+      circleProgress.setVisibility(GONE);
+    } else if (seekBar.getProgress() == 0) {
       circleProgress.setInstantProgress(1);
     }
-    circleProgress.setVisibility(GONE);
     playPauseButton.setVisibility(VISIBLE);
     controlToggle.displayQuick(progressAndPlay);
   }

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

@@ -19,6 +19,7 @@ import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.color.MaterialColor;
 import org.thoughtcrime.securesms.contacts.avatars.ContactColors;
 import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
+import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
 import org.thoughtcrime.securesms.groups.ui.managegroup.ManageGroupActivity;
 import org.thoughtcrime.securesms.mms.GlideApp;
@@ -132,9 +133,23 @@ public final class AvatarImageView extends AppCompatImageView {
     setAvatar(GlideApp.with(this), recipient, false);
   }
 
+  /**
+   * Shows self as the profile avatar.
+   */
+  public void setAvatarUsingProfile(@Nullable Recipient recipient) {
+    setAvatar(GlideApp.with(this), recipient, false, true);
+  }
+
   public void setAvatar(@NonNull GlideRequests requestManager, @Nullable Recipient recipient, boolean quickContactEnabled) {
+    setAvatar(requestManager, recipient, quickContactEnabled, false);
+  }
+
+  public void setAvatar(@NonNull GlideRequests requestManager, @Nullable Recipient recipient, boolean quickContactEnabled, boolean useSelfProfileAvatar) {
     if (recipient != null) {
-      RecipientContactPhoto photo = new RecipientContactPhoto(recipient);
+      RecipientContactPhoto photo = (recipient.isSelf() && useSelfProfileAvatar) ? new RecipientContactPhoto(recipient,
+                                                                                                             new ProfileContactPhoto(Recipient.self(),
+                                                                                                                                     Recipient.self().getProfileAvatar()))
+                                                                                 : new RecipientContactPhoto(recipient);
 
       if (!photo.equals(recipientContactPhoto)) {
         requestManager.clear(this);
@@ -218,9 +233,13 @@ public final class AvatarImageView extends AppCompatImageView {
     private final           boolean      ready;
 
     RecipientContactPhoto(@NonNull Recipient recipient) {
+      this(recipient, recipient.getContactPhoto());
+    }
+
+    RecipientContactPhoto(@NonNull Recipient recipient, @Nullable ContactPhoto contactPhoto) {
       this.recipient    = recipient;
       this.ready        = !recipient.isResolving();
-      this.contactPhoto = recipient.getContactPhoto();
+      this.contactPhoto = contactPhoto;
     }
 
     public boolean equals(@Nullable RecipientContactPhoto other) {

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

@@ -1,12 +1,13 @@
 package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.FrameLayout;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.bumptech.glide.load.resource.bitmap.CenterCrop;
 import com.bumptech.glide.load.resource.bitmap.CenterInside;
 

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

@@ -5,9 +5,10 @@ import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
-import androidx.appcompat.widget.AppCompatImageView;
 import android.util.AttributeSet;
 
+import androidx.appcompat.widget.AppCompatImageView;
+
 import org.thoughtcrime.securesms.R;
 
 public class CircleColorImageView extends AppCompatImageView {

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

@@ -21,10 +21,12 @@ import android.view.inputmethod.InputConnection;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
 import androidx.core.view.inputmethod.EditorInfoCompat;
 import androidx.core.view.inputmethod.InputConnectionCompat;
 import androidx.core.view.inputmethod.InputContentInfoCompat;
 
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.TransportOption;
 import org.thoughtcrime.securesms.components.emoji.EmojiEditText;
@@ -33,12 +35,9 @@ 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.logging.Log;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.StringUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.thoughtcrime.securesms.util.ThemeUtil;
 
 import java.util.List;
 
@@ -82,8 +81,8 @@ public class ComposeText extends EmojiEditText {
   }
 
   @Override
-  protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-    super.onLayout(changed, left, top, right, bottom);
+  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+    super.onMeasure(widthMeasureSpec, heightMeasureSpec);
 
     if (!TextUtils.isEmpty(hint)) {
       if (!TextUtils.isEmpty(subHint)) {
@@ -93,6 +92,7 @@ public class ComposeText extends EmojiEditText {
       } else {
         setHint(ellipsizeToWidth(hint));
       }
+      super.onMeasure(widthMeasureSpec, heightMeasureSpec);
     }
   }
 
@@ -257,7 +257,7 @@ public class ComposeText extends EmojiEditText {
       setImeOptions(getImeOptions() | 16777216);
     }
 
-    mentionRendererDelegate = new MentionRendererDelegate(getContext(), ThemeUtil.getThemedColor(getContext(), R.attr.conversation_mention_background_color));
+    mentionRendererDelegate = new MentionRendererDelegate(getContext(), ContextCompat.getColor(getContext(), R.color.conversation_mention_background_color));
 
     addTextChangedListener(new MentionDeleter());
     mentionValidatorWatcher = new MentionValidatorWatcher();

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

@@ -19,6 +19,7 @@ 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 ContactFilterToolbar extends DarkOverflowToolbar {
@@ -125,6 +126,10 @@ public final class ContactFilterToolbar extends DarkOverflowToolbar {
     attributes.recycle();
   }
 
+  public void focusAndShowKeyboard() {
+    ViewUtil.focusAndShowKeyboard(searchText);
+  }
+
   public void clear() {
     searchText.setText("");
     notifyListener();

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

@@ -1,10 +1,11 @@
 package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
-import com.google.android.material.tabs.TabLayout;
 import android.util.AttributeSet;
 import android.view.View;
 
+import com.google.android.material.tabs.TabLayout;
+
 import java.util.List;
 
 /**

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

@@ -1,11 +1,12 @@
 package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.viewpager.widget.ViewPager;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
 
 import org.thoughtcrime.securesms.components.viewpager.HackyViewPager;
 

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

@@ -6,7 +6,6 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
-import android.os.AsyncTask;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;
@@ -20,6 +19,7 @@ import com.airbnb.lottie.LottieAnimationView;
 import com.airbnb.lottie.LottieProperty;
 import com.airbnb.lottie.model.KeyPath;
 
+import org.signal.core.util.concurrent.SignalExecutors;
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
@@ -185,20 +185,16 @@ public class ConversationItemFooter extends LinearLayout {
           ApplicationContext.getInstance(getContext()).getExpiringMessageManager().checkSchedule();
         }
       } else if (!messageRecord.isOutgoing() && !messageRecord.isMediaPending()) {
-        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();
+        SignalExecutors.BOUNDED.execute(() -> {
+          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());
-            return null;
-          }
-        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+          expirationManager.scheduleDeletion(id, mms, messageRecord.getExpiresIn());
+        });
       }
     } else {
       this.timerView.setVisibility(View.GONE);

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

@@ -3,13 +3,15 @@ package org.thoughtcrime.securesms.components;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
+import android.util.AttributeSet;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.UiThread;
-import android.util.AttributeSet;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
+import androidx.core.content.ContextCompat;
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.attachments.Attachment;
@@ -17,7 +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.ThemeUtil;
 
 import java.util.List;
 
@@ -57,7 +58,7 @@ public class ConversationItemThumbnail extends FrameLayout {
     this.cornerMask = new CornerMask(this);
     this.outliner   = new Outliner();
 
-    outliner.setColor(ThemeUtil.getThemedColor(getContext(), R.attr.conversation_item_image_outline_color));
+    outliner.setColor(ContextCompat.getColor(getContext(), R.color.signal_inverse_transparent_20));
 
     if (attrs != null) {
       TypedArray typedArray = getContext().getTheme().obtainStyledAttributes(attrs, R.styleable.ConversationItemThumbnail, 0, 0);

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

@@ -1,13 +1,14 @@
 package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.constraintlayout.widget.ConstraintLayout;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;
+
 import org.thoughtcrime.securesms.R;
 
 /**