Move all files to natural position.

app/.tx/config

@@ -0,0 +1,10 @@
+[main]
+host = https://www.transifex.com
+lang_map = da_DK:da-rDK,he:iw,id:in,kn_IN:kn-rIN,pt_BR:pt-rBR,pt_PT:pt,qu_EC:qu-rEC,sv_SE:sv-rSE,zh_CN:zh-rCN,zh_HK:zh-rHK,zh_TW:zh-rTW
+
+[signal-android.master]
+file_filter = src/main/res/values-<lang>/strings.xml
+source_file = src/main/res/values/strings.xml
+source_lang = en
+type = ANDROID
+

app/build.gradle

@@ -345,32 +345,6 @@ android {
         }
     }
 
-    sourceSets {
-        main {
-            manifest.srcFile '../AndroidManifest.xml'
-            java.srcDirs = ['../src']
-            resources.srcDirs = ['../src']
-            aidl.srcDirs = ['../src']
-            renderscript.srcDirs = ['../src']
-            res.srcDirs = ['../res']
-            assets.srcDirs = ['../assets']
-            jniLibs.srcDirs = ['../libs']
-            proto.srcDir '../protobuf'
-        }
-        androidTest {
-            java.srcDirs = ['../test/androidTest/java']
-        }
-        test {
-            java.srcDirs = ['../test/unitTest/java']
-            resources.srcDirs = ['../test/unitTest/resources']
-        }
-        staging {
-            res.srcDirs = ['../staging/res']
-        }
-
-        website.manifest.srcFile '../website/AndroidManifest.xml'
-    }
-
     lintOptions {
         abortOnError true
         baseline file("lint-baseline.xml")

app/jni/Android.mk

@@ -0,0 +1,11 @@
+JNI_DIR := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE     := native-utils
+LOCAL_C_INCLUDES := $(JNI_DIR)/utils/
+LOCAL_CFLAGS     += -Wall
+
+LOCAL_SRC_FILES := $(JNI_DIR)/utils/org_thoughtcrime_securesms_util_FileUtils.cpp
+
+include $(BUILD_SHARED_LIBRARY)

app/jni/Application.mk

@@ -0,0 +1,6 @@
+# Built with NDK 19.2.5345600
+APP_ABI      := armeabi-v7a x86 arm64-v8a x86_64
+APP_PLATFORM := android-19
+APP_STL      := c++_static
+APP_CPPFLAGS += -fexceptions
+APP_OPTIM    := debug

app/jni/utils/org_thoughtcrime_securesms_util_FileUtils.cpp

@@ -0,0 +1,45 @@
+#include "org_thoughtcrime_securesms_util_FileUtils.h"
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <linux/memfd.h>
+#include <syscall.h>
+
+jint JNICALL Java_org_thoughtcrime_securesms_util_FileUtils_getFileDescriptorOwner
+  (JNIEnv *env, jclass clazz, jobject fileDescriptor)
+{
+  jclass fdClass = env->GetObjectClass(fileDescriptor);
+
+  if (fdClass == NULL) {
+    return -1;
+  }
+
+  jfieldID fdFieldId = env->GetFieldID(fdClass, "descriptor", "I");
+
+  if (fdFieldId == NULL) {
+    return -1;
+  }
+
+  int fd = env->GetIntField(fileDescriptor, fdFieldId);
+
+  struct stat stat_struct;
+
+  if (fstat(fd, &stat_struct) != 0) {
+    return -1;
+  }
+
+  return stat_struct.st_uid;
+}
+
+JNIEXPORT jint JNICALL Java_org_thoughtcrime_securesms_util_FileUtils_createMemoryFileDescriptor
+  (JNIEnv *env, jclass clazz, jstring jname)
+{
+  const char *name = env->GetStringUTFChars(jname, NULL);
+
+  int fd = syscall(SYS_memfd_create, name, MFD_CLOEXEC);
+
+  env->ReleaseStringUTFChars(jname, name);
+
+  return fd;
+}

app/jni/utils/org_thoughtcrime_securesms_util_FileUtils.h

@@ -0,0 +1,29 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class org_thoughtcrime_securesms_util_FileUtils */
+
+#ifndef _Included_org_thoughtcrime_securesms_util_FileUtils
+#define _Included_org_thoughtcrime_securesms_util_FileUtils
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     org_thoughtcrime_securesms_util_FileUtils
+ * Method:    getFileDescriptorOwner
+ * Signature: (Ljava/io/FileDescriptor;)I
+ */
+JNIEXPORT jint JNICALL Java_org_thoughtcrime_securesms_util_FileUtils_getFileDescriptorOwner
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     org_thoughtcrime_securesms_util_FileUtils
+ * Method:    createMemoryFileDescriptor
+ * Signature: (Ljava/lang/String;)I
+ */
+JNIEXPORT jint JNICALL Java_org_thoughtcrime_securesms_util_FileUtils_createMemoryFileDescriptor
+  (JNIEnv *, jclass, jstring);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

app/lint-baseline.xml

@@ -7,7 +7,7 @@
         errorLine1="    List<SubscriptionInfo> list = subscriptionManager.getActiveSubscriptionInfoList();"
         errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="src/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java"
+            file="src/main/java/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java"
             line="101"
             column="35"/>
     </issue>
@@ -18,7 +18,7 @@
         errorLine1="                drawables.getColor(1, 0xff000000);"
         errorLine2="                                   ~">
         <location
-            file="src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java"
+            file="src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java"
             line="187"
             column="36"/>
     </issue>

app/src/androidTest/java/org/thoughtcrime/securesms/TextSecureTestCase.java

@@ -0,0 +1,16 @@
+package org.thoughtcrime.securesms;
+
+import android.content.Context;
+import android.test.InstrumentationTestCase;
+
+public class TextSecureTestCase extends InstrumentationTestCase {
+
+  @Override
+  public void setUp() {
+    System.setProperty("dexmaker.dexcache", getInstrumentation().getTargetContext().getCacheDir().getPath());
+  }
+
+  protected Context getContext() {
+    return getInstrumentation().getContext();
+  }
+}

app/src/main/AndroidManifest.xml

@@ -0,0 +1,734 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools"
+          package="org.thoughtcrime.securesms">
+
+    <uses-sdk tools:overrideLibrary="androidx.camera.core,androidx.camera.camera2"/>
+
+    <permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"
+                android:label="Access to TextSecure Secrets"
+                android:protectionLevel="signature" />
+
+    <uses-feature android:name="android.hardware.camera" android:required="false" />
+    <uses-feature android:name="android.hardware.bluetooth" android:required="false" />
+    <uses-feature android:name="android.hardware.location" android:required="false"/>
+    <uses-feature android:name="android.hardware.location.network" android:required="false"/>
+    <uses-feature android:name="android.hardware.location.gps" android:required="false"/>
+    <uses-feature android:name="android.hardware.microphone" android:required="false"/>
+    <uses-feature android:name="android.hardware.wifi" android:required="false"/>
+    <uses-feature android:name="android.hardware.portrait" android:required="false"/>
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
+
+    <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
+    <uses-permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"/>
+    <uses-permission android:name="android.permission.READ_PROFILE"/>
+    <uses-permission android:name="android.permission.WRITE_PROFILE"/>
+    <uses-permission android:name="android.permission.BROADCAST_WAP_PUSH"
+                     tools:ignore="ProtectedPermissions"/>
+    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+    <uses-permission android:name="android.permission.WRITE_CONTACTS"/>
+    <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
+
+    <uses-permission android:name="android.permission.RECEIVE_SMS"/>
+    <uses-permission android:name="android.permission.RECEIVE_MMS"/>
+    <uses-permission android:name="android.permission.READ_SMS"/>
+    <uses-permission android:name="android.permission.SEND_SMS"/>
+    <uses-permission android:name="android.permission.WRITE_SMS"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <uses-permission android:name="android.permission.CAMERA" />
+
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <uses-permission android:name="android.permission.READ_CALL_STATE"/>
+
+    <!-- For sending/receiving events -->
+    <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
+    <uses-permission android:name="android.permission.READ_CALENDAR"/>
+
+
+    <!-- Normal -->
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
+
+    <!-- So we can add a TextSecure 'Account' -->
+    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
+
+    <!-- For conversation 'shortcuts' on the desktop -->
+    <uses-permission android:name="android.permission.INSTALL_SHORTCUT"/>
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+
+    <!-- For fixing MMS -->
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+
+    <!-- Set image as wallpaper -->
+    <uses-permission android:name="android.permission.SET_WALLPAPER"/>
+
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
+
+    <uses-permission android:name="android.permission.CALL_PHONE" />
+    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+    <uses-permission android:name="android.permission.RAISED_THREAD_PRIORITY" />
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
+    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
+
+    <application android:name=".ApplicationContext"
+                 android:icon="@mipmap/ic_launcher"
+                 android:label="@string/app_name"
+                 android:supportsRtl="true"
+                 tools:replace="android:allowBackup"
+                 android:allowBackup="false"
+                 android:theme="@style/TextSecure.LightTheme"
+                 android:largeHeap="true">
+
+    <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value="AIzaSyCSx9xea86GwDKGznCAULE9Y5a8b-TfN9U"/>
+
+    <meta-data android:name="com.google.android.gms.version"
+               android:value="@integer/google_play_services_version" />
+
+    <meta-data android:name="com.google.android.gms.car.application"
+               android:resource="@xml/automotive_app_desc" />
+
+    <meta-data android:name="firebase_analytics_collection_deactivated" android:value="true" />
+    <meta-data android:name="google_analytics_adid_collection_enabled" android:value="false" />
+    <meta-data android:name="firebase_messaging_auto_init_enabled" android:value="false" />
+
+    <activity android:name="org.thoughtcrime.securesms.WebRtcCallActivity"
+              android:theme="@style/TextSecure.LightTheme.WebRTCCall"
+              android:excludeFromRecents="true"
+              android:screenOrientation="portrait"
+              android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|screenSize|fontScale"
+              android:launchMode="singleTask"/>
+
+    <activity android:name=".InviteActivity"
+              android:theme="@style/Signal.Light.NoActionBar.Invite"
+              android:windowSoftInputMode="stateHidden"
+              android:parentActivityName=".MainActivity"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
+        <meta-data
+            android:name="android.support.PARENT_ACTIVITY"
+            android:value="org.thoughtcrime.securesms.MainActivity" />
+    </activity>
+
+    <activity android:name=".PromptMmsActivity"
+              android:label="Configure MMS Settings"
+              android:windowSoftInputMode="stateUnchanged"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".DeviceProvisioningActivity"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
+        <intent-filter>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="tsdevice"/>
+        </intent-filter>
+    </activity>
+
+    <activity android:name=".preferences.MmsPreferencesActivity"
+               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".ShareActivity"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:excludeFromRecents="true"
+              android:launchMode="singleTask"
+              android:taskAffinity=""
+              android:noHistory="true"
+              android:windowSoftInputMode="stateHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
+
+        <intent-filter>
+            <action android:name="android.intent.action.SEND" />
+            <category android:name="android.intent.category.DEFAULT"/>
+            <data android:mimeType="audio/*" />
+            <data android:mimeType="image/*" />
+            <data android:mimeType="text/plain" />
+            <data android:mimeType="video/*" />
+            <data android:mimeType="application/*"/>
+            <data android:mimeType="text/*"/>
+            <data android:mimeType="*/*"/>
+        </intent-filter>
+
+        <meta-data
+                android:name="android.service.chooser.chooser_target_service"
+                android:value=".service.DirectShareService" />
+
+    </activity>
+
+    <activity android:name=".stickers.StickerPackPreviewActivity"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:launchMode="singleTask"
+              android:noHistory="true"
+              android:windowSoftInputMode="stateHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
+        <intent-filter>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="sgnl"
+                  android:host="addstickers" />
+        </intent-filter>
+        <intent-filter>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="https"
+                  android:host="signal.art"
+                  android:pathPrefix="/addstickers"/>
+        </intent-filter>
+    </activity>
+
+    <activity-alias android:name=".RoutingActivity"
+                    android:targetActivity=".MainActivity"
+                    android:exported="true">
+
+        <intent-filter>
+            <action android:name="android.intent.action.MAIN" />
+            <category android:name="android.intent.category.LAUNCHER" />
+            <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
+        </intent-filter>
+
+        <meta-data android:name="com.sec.minimode.icon.portrait.normal"
+                   android:resource="@mipmap/ic_launcher" />
+        <meta-data android:name="com.sec.minimode.icon.landscape.normal"
+                   android:resource="@mipmap/ic_launcher" />
+
+    </activity-alias>
+
+    <activity android:name=".conversation.ConversationActivity"
+              android:windowSoftInputMode="stateUnchanged"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:parentActivityName=".MainActivity">
+        <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.thoughtcrime.securesms.MainActivity" />
+    </activity>
+
+    <activity android:name=".longmessage.LongMessageActivity" />
+
+    <activity android:name=".conversation.ConversationPopupActivity"
+              android:windowSoftInputMode="stateVisible"
+              android:launchMode="singleTask"
+              android:taskAffinity=""
+              android:excludeFromRecents="true"
+              android:theme="@style/TextSecure.LightTheme.Popup"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
+
+    <activity android:name=".MessageDetailsActivity"
+              android:label="@string/AndroidManifest__message_details"
+              android:windowSoftInputMode="stateHidden"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".GroupCreateActivity"
+          android:windowSoftInputMode="stateVisible"
+          android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".DatabaseMigrationActivity"
+              android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".migrations.ApplicationMigrationActivity"
+              android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".ExperienceUpgradeActivity"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".PassphraseCreateActivity"
+              android:label="@string/AndroidManifest__create_passphrase"
+              android:windowSoftInputMode="stateUnchanged"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".PassphrasePromptActivity"
+              android:launchMode="singleTask"
+              android:theme="@style/TextSecure.LightIntroTheme"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".NewConversationActivity"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:windowSoftInputMode="stateAlwaysVisible"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".PushContactSelectionActivity"
+          android:label="@string/AndroidManifest__select_contacts"
+          android:windowSoftInputMode="stateHidden"
+          android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".giph.ui.GiphyActivity"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:windowSoftInputMode="stateHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".mediasend.MediaSendActivity"
+              android:theme="@style/TextSecure.FullScreenMedia"
+              android:windowSoftInputMode="stateHidden"
+              android:launchMode="singleTop"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".PassphraseChangeActivity"
+              android:label="@string/AndroidManifest__change_passphrase"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".VerifyIdentityActivity"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".ApplicationPreferencesActivity"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
+        <intent-filter>
+            <action android:name="android.intent.action.MAIN" />
+            <category android:name="android.intent.category.NOTIFICATION_PREFERENCES" />
+        </intent-filter>
+    </activity>
+
+    <activity android:name=".registration.RegistrationNavigationActivity"
+              android:launchMode="singleTask"
+              android:theme="@style/TextSecure.LightRegistrationTheme"
+              android:windowSoftInputMode="stateUnchanged"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".revealable.ViewOnceMessageActivity"
+              android:launchMode="singleTask"
+              android:theme="@style/TextSecure.FullScreenMedia"
+              android:windowSoftInputMode="stateHidden"
+              android:excludeFromRecents="true"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".stickers.StickerManagementActivity"
+              android:launchMode="singleTask"
+              android:theme="@style/TextSecure.LightTheme"
+              android:windowSoftInputMode="stateUnchanged"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+     <activity android:name=".DeviceActivity"
+               android:label="@string/AndroidManifest__linked_devices"
+               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".LogSubmitActivity"
+              android:label="@string/AndroidManifest__log_submit"
+              android:windowSoftInputMode="stateHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".MediaPreviewActivity"
+              android:label="@string/AndroidManifest__media_preview"
+              android:windowSoftInputMode="stateHidden"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".mediaoverview.MediaOverviewActivity"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:windowSoftInputMode="stateHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".DummyActivity"
+              android:theme="@android:style/Theme.NoDisplay"
+              android:enabled="true"
+              android:allowTaskReparenting="true"
+              android:noHistory="true"
+              android:excludeFromRecents="true"
+              android:alwaysRetainTaskState="false"
+              android:stateNotNeeded="true"
+              android:clearTaskOnLaunch="true"
+              android:finishOnTaskLaunch="true" />
+
+    <activity android:name=".PlayServicesProblemActivity"
+              android:theme="@style/TextSecure.DialogActivity"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".SmsSendtoActivity">
+        <intent-filter>
+            <action android:name="android.intent.action.SENDTO" />
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="sms" />
+            <data android:scheme="smsto" />
+            <data android:scheme="mms" />
+            <data android:scheme="mmsto" />
+        </intent-filter>
+        <intent-filter>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <data android:mimeType="vnd.android.cursor.item/vnd.org.thoughtcrime.securesms.contact" />
+        </intent-filter>
+    </activity>
+
+    <activity android:name="org.thoughtcrime.securesms.webrtc.VoiceCallShare"
+              android:excludeFromRecents="true"
+              android:theme="@style/NoAnimation.Theme.BlackScreen"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
+
+        <intent-filter>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <data android:mimeType="vnd.android.cursor.item/vnd.org.thoughtcrime.securesms.call" />
+        </intent-filter>
+
+    </activity>
+
+    <activity android:name=".RecipientPreferenceActivity"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".BlockedContactsActivity"
+              android:theme="@style/TextSecure.LightTheme"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".scribbles.ImageEditorStickerSelectActivity"
+              android:theme="@style/TextSecure.DarkTheme"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name="com.theartofdev.edmodo.cropper.CropImageActivity"
+              android:theme="@style/TextSecure.DarkTheme"/>
+
+    <activity android:name=".CreateProfileActivity"
+              android:theme="@style/TextSecure.LightRegistrationTheme"
+              android:windowSoftInputMode="stateVisible"
+              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=".contactshare.ContactShareEditActivity"
+              android:theme="@style/TextSecure.LightTheme"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".contactshare.ContactNameEditActivity"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".contactshare.SharedContactDetailsActivity"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".ShortcutLauncherActivity"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:exported="true"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity
+            android:name=".maps.PlacePickerActivity"
+            android:label="@string/PlacePickerActivity_title"
+            android:theme="@style/TextSecure.LightNoActionBar"
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity
+        android:name=".usernames.ProfileEditActivityV2"
+        android:theme="@style/TextSecure.LightNoActionBar"
+        android:windowSoftInputMode="adjustResize"/>
+
+    <activity android:name=".MainActivity"
+              android:theme="@style/TextSecure.LightNoActionBar"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
+
+    <service android:enabled="true" android:name="org.thoughtcrime.securesms.service.WebRtcCallService"/>
+    <service android:enabled="true" android:name=".service.ApplicationMigrationService"/>
+    <service android:enabled="true" android:exported="false" android:name=".service.KeyCachingService"/>
+    <service android:enabled="true" android:name=".service.IncomingMessageObserver$ForegroundService"/>
+
+    <service android:name=".service.QuickResponseService"
+             android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
+             android:exported="true" >
+        <intent-filter>
+            <action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <data android:scheme="sms" />
+            <data android:scheme="smsto" />
+            <data android:scheme="mms" />
+            <data android:scheme="mmsto" />
+        </intent-filter>
+    </service>
+
+    <service android:name=".service.AccountAuthenticatorService" android:exported="true">
+        <intent-filter>
+            <action android:name="android.accounts.AccountAuthenticator" />
+        </intent-filter>
+        <meta-data android:name="android.accounts.AccountAuthenticator" android:resource="@xml/authenticator" />
+    </service>
+
+    <service android:name=".service.ContactsSyncAdapterService" android:exported="true">
+        <intent-filter>
+            <action android:name="android.content.SyncAdapter"/>
+        </intent-filter>
+        <meta-data android:name="android.content.SyncAdapter" android:resource="@xml/syncadapter" />
+        <meta-data android:name="android.provider.CONTACTS_STRUCTURE" android:resource="@xml/contactsformat" />
+    </service>
+
+    <service android:name=".service.DirectShareService"
+             android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
+        <intent-filter>
+            <action android:name="android.service.chooser.ChooserTargetService" />
+        </intent-filter>
+    </service>
+
+    <service android:name=".service.GenericForegroundService"/>
+
+    <service android:name=".gcm.FcmService">
+        <intent-filter>
+            <action android:name="com.google.firebase.MESSAGING_EVENT" />
+        </intent-filter>
+    </service>
+
+    <receiver android:name=".service.SmsListener"
+              android:permission="android.permission.BROADCAST_SMS"
+              android:enabled="true"
+              android:exported="true">
+             <intent-filter android:priority="1001">
+                 <action android:name="android.provider.Telephony.SMS_RECEIVED"/>
+             </intent-filter>
+             <intent-filter>
+                 <action android:name="android.provider.Telephony.SMS_DELIVER"/>
+             </intent-filter>
+    </receiver>
+
+    <receiver android:name=".service.SmsDeliveryListener"
+              android:exported="true">
+        <intent-filter>
+            <action android:name="org.thoughtcrime.securesms.services.MESSAGE_SENT"/>
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".service.MmsListener"
+              android:enabled="true"
+              android:exported="true"
+              android:permission="android.permission.BROADCAST_WAP_PUSH">
+             <intent-filter android:priority="1001">
+                 <action android:name="android.provider.Telephony.WAP_PUSH_RECEIVED"/>
+                 <data android:mimeType="application/vnd.wap.mms-message" />
+             </intent-filter>
+             <intent-filter>
+                 <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER"/>
+                 <data android:mimeType="application/vnd.wap.mms-message" />
+             </intent-filter>
+    </receiver>
+
+    <receiver android:name=".notifications.MarkReadReceiver"
+              android:enabled="true"
+              android:exported="false">
+        <intent-filter>
+            <action android:name="org.thoughtcrime.securesms.notifications.CLEAR"/>
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".notifications.RemoteReplyReceiver"
+              android:enabled="true"
+              android:exported="false">
+        <intent-filter>
+            <action android:name="org.thoughtcrime.securesms.notifications.WEAR_REPLY"/>
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".notifications.AndroidAutoHeardReceiver"
+              android:exported="false">
+        <intent-filter>
+          <action android:name="org.thoughtcrime.securesms.notifications.ANDROID_AUTO_HEARD"/>
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".notifications.AndroidAutoReplyReceiver"
+              android:exported="false">
+        <intent-filter>
+          <action android:name="org.thoughtcrime.securesms.notifications.ANDROID_AUTO_REPLY"/>
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".service.ExpirationListener" />
+
+    <receiver android:name=".revealable.ViewOnceMessageManager$ViewOnceAlarm" />
+
+    <provider android:name=".providers.PartProvider"
+              android:grantUriPermissions="true"
+              android:exported="false"
+              android:authorities="org.thoughtcrime.provider.securesms" />
+
+    <provider android:name=".providers.MmsBodyProvider"
+              android:grantUriPermissions="true"
+              android:exported="false"
+              android:authorities="org.thoughtcrime.provider.securesms.mms" />
+
+    <provider android:name="androidx.core.content.FileProvider"
+              android:authorities="org.thoughtcrime.securesms.fileprovider"
+              android:exported="false"
+              android:grantUriPermissions="true">
+
+        <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_provider_paths" />
+
+    </provider>
+
+    <provider android:name=".database.DatabaseContentProviders$Conversation"
+              android:authorities="org.thoughtcrime.securesms.database.conversation"
+              android:exported="false" />
+
+    <provider android:name=".database.DatabaseContentProviders$ConversationList"
+              android:authorities="org.thoughtcrime.securesms.database.conversationlist"
+              android:exported="false" />
+
+    <provider android:name=".database.DatabaseContentProviders$Attachment"
+              android:authorities="org.thoughtcrime.securesms.database.attachment"
+              android:exported="false" />
+
+    <provider android:name=".database.DatabaseContentProviders$Sticker"
+              android:authorities="org.thoughtcrime.securesms.database.sticker"
+              android:exported="false" />
+
+    <provider android:name=".database.DatabaseContentProviders$StickerPack"
+              android:authorities="org.thoughtcrime.securesms.database.stickerpack"
+              android:exported="false" />
+
+    <provider android:name="androidx.camera.camera2.impl.Camera2Initializer"
+              android:authorities="${applicationId}.camerax-init"
+              android:exported="false"
+              android:enabled="false" />
+
+    <receiver android:name=".service.BootReceiver">
+        <intent-filter>
+            <action android:name="android.intent.action.BOOT_COMPLETED"/>
+            <action android:name="org.thoughtcrime.securesms.RESTART"/>
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".service.DirectoryRefreshListener">
+        <intent-filter>
+            <action android:name="android.intent.action.BOOT_COMPLETED" />
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".service.RotateSignedPreKeyListener">
+        <intent-filter>
+            <action android:name="android.intent.action.BOOT_COMPLETED" />
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".service.RotateSenderCertificateListener">
+        <intent-filter>
+            <action android:name="android.intent.action.BOOT_COMPLETED" />
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".service.LocalBackupListener">
+        <intent-filter>
+            <action android:name="android.intent.action.BOOT_COMPLETED" />
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".service.PersistentConnectionBootListener">
+        <intent-filter>
+            <action android:name="android.intent.action.BOOT_COMPLETED"/>
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".notifications.LocaleChangedReceiver">
+        <intent-filter>
+            <action android:name="android.intent.action.LOCALE_CHANGED"/>
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".notifications.MessageNotifier$ReminderReceiver">
+        <intent-filter>
+            <action android:name="org.thoughtcrime.securesms.MessageNotifier.REMINDER_ACTION"/>
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".notifications.DeleteNotificationReceiver">
+        <intent-filter>
+            <action android:name="org.thoughtcrime.securesms.DELETE_NOTIFICATION"/>
+        </intent-filter>
+    </receiver>
+
+    <receiver android:name=".ExperienceUpgradeActivity$AppUpgradeReceiver">
+        <intent-filter>
+            <action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
+            <data android:scheme="package" />
+        </intent-filter>
+
+        <intent-filter>
+            <action android:name="org.thoughtcrime.securesms.ExperienceUpgradeActivity.DISMISS_ACTION"/>
+        </intent-filter>
+    </receiver>
+
+    <receiver
+        android:name=".service.PanicResponderListener"
+        android:exported="true">
+        <intent-filter>
+            <action android:name="info.guardianproject.panic.action.TRIGGER" />
+        </intent-filter>
+    </receiver>
+
+    <service
+        android:name=".gcm.FcmJobService"
+        android:permission="android.permission.BIND_JOB_SERVICE"
+        android:enabled="@bool/enable_job_service"
+        tools:targetApi="26" />
+
+    <service
+        android:name=".jobmanager.JobSchedulerScheduler$SystemService"
+        android:permission="android.permission.BIND_JOB_SERVICE"
+        android:enabled="@bool/enable_job_service"
+        tools:targetApi="26" />
+
+    <service
+        android:name=".jobmanager.KeepAliveService"
+        android:enabled="@bool/enable_alarm_manager" />
+
+    <receiver
+        android:name=".jobmanager.AlarmManagerScheduler$RetryReceiver"
+        android:enabled="@bool/enable_alarm_manager" />
+
+    <!-- Probably don't need this one -->
+    <receiver
+        android:name=".jobmanager.BootReceiver"
+        android:enabled="true">
+        <intent-filter>
+            <action android:name="android.intent.action.BOOT_COMPLETED" />
+        </intent-filter>
+    </receiver>
+
+    <uses-library android:name="org.apache.http.legacy" android:required="false"/>
+
+    <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/org/thoughtcrime/securesms/ApplicationContext.java

@@ -0,0 +1,395 @@
+/*
+ * Copyright (C) 2013 Open Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.thoughtcrime.securesms;
+
+import android.annotation.SuppressLint;
+
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.camera.camera2.Camera2AppConfig;
+import androidx.camera.core.CameraX;
+import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.ProcessLifecycleOwner;
+import android.content.Context;
+import android.os.AsyncTask;
+import android.os.Build;
+import androidx.annotation.NonNull;
+import androidx.multidex.MultiDexApplication;
+
+import com.google.android.gms.security.ProviderInstaller;
+
+import org.conscrypt.Conscrypt;
+import org.signal.aesgcmprovider.AesGcmProvider;
+import org.signal.ringrtc.CallConnectionFactory;
+import org.thoughtcrime.securesms.components.TypingStatusRepository;
+import org.thoughtcrime.securesms.components.TypingStatusSender;
+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.insights.InsightsOptOut;
+import org.thoughtcrime.securesms.jobmanager.JobManager;
+import org.thoughtcrime.securesms.jobs.CreateSignedPreKeyJob;
+import org.thoughtcrime.securesms.jobs.FcmRefreshJob;
+import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
+import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
+import org.thoughtcrime.securesms.jobs.StickerPackDownloadJob;
+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.UncaughtExceptionLogger;
+import org.thoughtcrime.securesms.mediasend.camerax.CameraXUtil;
+import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
+import org.thoughtcrime.securesms.notifications.MessageNotifier;
+import org.thoughtcrime.securesms.notifications.NotificationChannels;
+import org.thoughtcrime.securesms.providers.BlobProvider;
+import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
+import org.thoughtcrime.securesms.ringrtc.RingRtcLogger;
+import org.thoughtcrime.securesms.service.DirectoryRefreshListener;
+import org.thoughtcrime.securesms.service.ExpiringMessageManager;
+import org.thoughtcrime.securesms.service.IncomingMessageObserver;
+import org.thoughtcrime.securesms.service.KeyCachingService;
+import org.thoughtcrime.securesms.service.LocalBackupListener;
+import org.thoughtcrime.securesms.revealable.ViewOnceMessageManager;
+import org.thoughtcrime.securesms.service.RotateSenderCertificateListener;
+import org.thoughtcrime.securesms.service.RotateSignedPreKeyListener;
+import org.thoughtcrime.securesms.service.UpdateApkRefreshListener;
+import org.thoughtcrime.securesms.stickers.BlessedPacks;
+import org.thoughtcrime.securesms.util.FrameRateTracker;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
+import org.webrtc.voiceengine.WebRtcAudioManager;
+import org.webrtc.voiceengine.WebRtcAudioUtils;
+import org.whispersystems.libsignal.logging.SignalProtocolLoggerProvider;
+
+import java.security.Security;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Will be called once when the TextSecure process is created.
+ *
+ * We're using this as an insertion point to patch up the Android PRNG disaster,
+ * to initialize the job manager, and to check for GCM registration freshness.
+ *
+ * @author Moxie Marlinspike
+ */
+public class ApplicationContext extends MultiDexApplication implements DefaultLifecycleObserver {
+
+  private static final String TAG = ApplicationContext.class.getSimpleName();
+
+  private ExpiringMessageManager   expiringMessageManager;
+  private ViewOnceMessageManager   viewOnceMessageManager;
+  private TypingStatusRepository   typingStatusRepository;
+  private TypingStatusSender       typingStatusSender;
+  private IncomingMessageObserver  incomingMessageObserver;
+  private PersistentLogger         persistentLogger;
+
+  private volatile boolean isAppVisible;
+
+  public static ApplicationContext getInstance(Context context) {
+    return (ApplicationContext)context.getApplicationContext();
+  }
+
+  @Override
+  public void onCreate() {
+    super.onCreate();
+    Log.i(TAG, "onCreate()");
+    initializeSecurityProvider();
+    initializeLogging();
+    initializeCrashHandling();
+    initializeAppDependencies();
+    initializeFirstEverAppLaunch();
+    initializeApplicationMigrations();
+    initializeMessageRetrieval();
+    initializeExpiringMessageManager();
+    initializeRevealableMessageManager();
+    initializeTypingStatusRepository();
+    initializeTypingStatusSender();
+    initializeGcmCheck();
+    initializeSignedPreKeyCheck();
+    initializePeriodicTasks();
+    initializeCircumvention();
+    initializeRingRtc();
+    initializePendingMessages();
+    initializeBlobProvider();
+    initializeCameraX();
+    NotificationChannels.create(this);
+    ProcessLifecycleOwner.get().getLifecycle().addObserver(this);
+
+    if (Build.VERSION.SDK_INT < 21) {
+      AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
+    }
+
+    ApplicationDependencies.getJobManager().beginJobLoop();
+  }
+
+  @Override
+  public void onStart(@NonNull LifecycleOwner owner) {
+    isAppVisible = true;
+    Log.i(TAG, "App is now visible.");
+    ApplicationDependencies.getRecipientCache().warmUp();
+    executePendingContactSync();
+    KeyCachingService.onAppForegrounded(this);
+    ApplicationDependencies.getFrameRateTracker().begin();
+  }
+
+  @Override
+  public void onStop(@NonNull LifecycleOwner owner) {
+    isAppVisible = false;
+    Log.i(TAG, "App is no longer visible.");
+    KeyCachingService.onAppBackgrounded(this);
+    MessageNotifier.setVisibleThread(-1);
+    ApplicationDependencies.getFrameRateTracker().end();
+  }
+
+  public ExpiringMessageManager getExpiringMessageManager() {
+    return expiringMessageManager;
+  }
+
+  public ViewOnceMessageManager getViewOnceMessageManager() {
+    return viewOnceMessageManager;
+  }
+
+  public TypingStatusRepository getTypingStatusRepository() {
+    return typingStatusRepository;
+  }
+
+  public TypingStatusSender getTypingStatusSender() {
+    return typingStatusSender;
+  }
+
+  public boolean isAppVisible() {
+    return isAppVisible;
+  }
+
+  public PersistentLogger getPersistentLogger() {
+    return persistentLogger;
+  }
+
+  private void initializeSecurityProvider() {
+    try {
+      Class.forName("org.signal.aesgcmprovider.AesGcmCipher");
+    } catch (ClassNotFoundException e) {
+      Log.e(TAG, "Failed to find AesGcmCipher class");
+      throw new ProviderInitializationException();
+    }
+
+    int aesPosition = Security.insertProviderAt(new AesGcmProvider(), 1);
+    Log.i(TAG, "Installed AesGcmProvider: " + aesPosition);
+
+    if (aesPosition < 0) {
+      Log.e(TAG, "Failed to install AesGcmProvider()");
+      throw new ProviderInitializationException();
+    }
+
+    int conscryptPosition = Security.insertProviderAt(Conscrypt.newProvider(), 2);
+    Log.i(TAG, "Installed Conscrypt provider: " + conscryptPosition);
+
+    if (conscryptPosition < 0) {
+      Log.w(TAG, "Did not install Conscrypt provider. May already be present.");
+    }
+  }
+
+  private void initializeLogging() {
+    persistentLogger = new PersistentLogger(this);
+    org.thoughtcrime.securesms.logging.Log.initialize(new AndroidLogger(), persistentLogger);
+
+    SignalProtocolLoggerProvider.setProvider(new CustomSignalProtocolLogger());
+  }
+
+  private void initializeCrashHandling() {
+    final Thread.UncaughtExceptionHandler originalHandler = Thread.getDefaultUncaughtExceptionHandler();
+    Thread.setDefaultUncaughtExceptionHandler(new UncaughtExceptionLogger(originalHandler));
+  }
+
+  private void initializeApplicationMigrations() {
+    ApplicationMigrations.onApplicationCreate(this, ApplicationDependencies.getJobManager());
+  }
+
+  public void initializeMessageRetrieval() {
+    this.incomingMessageObserver = new IncomingMessageObserver(this);
+  }
+
+  private void initializeAppDependencies() {
+    ApplicationDependencies.init(this, new ApplicationDependencyProvider(this, new SignalServiceNetworkAccess(this)));
+  }
+
+  private void initializeFirstEverAppLaunch() {
+    if (TextSecurePreferences.getFirstInstallVersion(this) == -1) {
+      if (!SQLCipherOpenHelper.databaseFileExists(this)) {
+        Log.i(TAG, "First ever app launch!");
+
+        InsightsOptOut.userRequestedOptOut(this);
+        TextSecurePreferences.setAppMigrationVersion(this, ApplicationMigrations.CURRENT_VERSION);
+        TextSecurePreferences.setJobManagerVersion(this, JobManager.CURRENT_VERSION);
+        TextSecurePreferences.setLastExperienceVersionCode(this, Util.getCanonicalVersionCode());
+        TextSecurePreferences.setHasSeenStickerIntroTooltip(this, true);
+        ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.ZOZO.getPackId(), BlessedPacks.ZOZO.getPackKey(), false));
+        ApplicationDependencies.getJobManager().add(StickerPackDownloadJob.forInstall(BlessedPacks.BANDIT.getPackId(), BlessedPacks.BANDIT.getPackKey(), false));
+      }
+
+      Log.i(TAG, "Setting first install version to " + BuildConfig.CANONICAL_VERSION_CODE);
+      TextSecurePreferences.setFirstInstallVersion(this, BuildConfig.CANONICAL_VERSION_CODE);
+    }
+  }
+
+  private void initializeGcmCheck() {
+    if (TextSecurePreferences.isPushRegistered(this)) {
+      long nextSetTime = TextSecurePreferences.getFcmTokenLastSetTime(this) + TimeUnit.HOURS.toMillis(6);
+
+      if (TextSecurePreferences.getFcmToken(this) == null || nextSetTime <= System.currentTimeMillis()) {
+        ApplicationDependencies.getJobManager().add(new FcmRefreshJob());
+      }
+    }
+  }
+
+  private void initializeSignedPreKeyCheck() {
+    if (!TextSecurePreferences.isSignedPreKeyRegistered(this)) {
+      ApplicationDependencies.getJobManager().add(new CreateSignedPreKeyJob(this));
+    }
+  }
+
+  private void initializeExpiringMessageManager() {
+    this.expiringMessageManager = new ExpiringMessageManager(this);
+  }
+
+  private void initializeRevealableMessageManager() {
+    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);
+    LocalBackupListener.schedule(this);
+    RotateSenderCertificateListener.schedule(this);
+
+    if (BuildConfig.PLAY_STORE_DISABLED) {
+      UpdateApkRefreshListener.schedule(this);
+    }
+  }
+
+  private void initializeRingRtc() {
+    try {
+      Set<String> HARDWARE_AEC_BLACKLIST = new HashSet<String>() {{
+        add("Pixel");
+        add("Pixel XL");
+        add("Moto G5");
+        add("Moto G (5S) Plus");
+        add("Moto G4");
+        add("TA-1053");
+        add("Mi A1");
+        add("E5823"); // Sony z5 compact
+        add("Redmi Note 5");
+        add("FP2"); // Fairphone FP2
+        add("MI 5");
+      }};
+
+      Set<String> OPEN_SL_ES_WHITELIST = new HashSet<String>() {{
+        add("Pixel");
+        add("Pixel XL");
+      }};
+
+      if (HARDWARE_AEC_BLACKLIST.contains(Build.MODEL)) {
+        WebRtcAudioUtils.setWebRtcBasedAcousticEchoCanceler(true);
+      }
+
+      if (!OPEN_SL_ES_WHITELIST.contains(Build.MODEL)) {
+        WebRtcAudioManager.setBlacklistDeviceForOpenSLESUsage(true);
+      }
+
+      CallConnectionFactory.initialize(this, new RingRtcLogger());
+    } catch (UnsatisfiedLinkError e) {
+      Log.w(TAG, e);
+    }
+  }
+
+  @SuppressLint("StaticFieldLeak")
+  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;
+      }
+    };
+
+    task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+  }
+
+  private void executePendingContactSync() {
+    if (TextSecurePreferences.needsFullContactSync(this)) {
+      ApplicationDependencies.getJobManager().add(new MultiDeviceContactUpdateJob(true));
+    }
+  }
+
+  private void initializePendingMessages() {
+    if (TextSecurePreferences.getNeedsMessagePull(this)) {
+      Log.i(TAG, "Scheduling a message fetch.");
+      if (Build.VERSION.SDK_INT >= 26) {
+        FcmJobService.schedule(this);
+      } else {
+        ApplicationDependencies.getJobManager().add(new PushNotificationReceiveJob(this));
+      }
+      TextSecurePreferences.setNeedsMessagePull(this, false);
+    }
+  }
+
+  private void initializeBlobProvider() {
+    AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
+      BlobProvider.getInstance().onSessionStart(this);
+    });
+  }
+
+  @SuppressLint("RestrictedApi")
+  private void initializeCameraX() {
+    if (CameraXUtil.isSupported()) {
+      new Thread(() -> {
+        try {
+          CameraX.init(this, Camera2AppConfig.create(this));
+        } catch (Throwable t) {
+          Log.w(TAG, "Failed to initialize CameraX.");
+        }
+      }, "signal-camerax-initialization").start();
+    }
+  }
+
+  @Override
+  protected void attachBaseContext(Context base) {
+    super.attachBaseContext(DynamicLanguageContextWrapper.updateContext(base, TextSecurePreferences.getLanguage(base)));
+  }
+
+  private static class ProviderInitializationException extends RuntimeException {
+  }
+}

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

@@ -0,0 +1,282 @@
+/*
+ * Copyright (C) 2011 Whisper Systems
+ * Copyright (C) 2013-2017 Open Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.thoughtcrime.securesms;
+
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.graphics.PorterDuff;
+import android.os.Build;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.preference.Preference;
+
+import org.thoughtcrime.securesms.preferences.AdvancedPreferenceFragment;
+import org.thoughtcrime.securesms.preferences.AppProtectionPreferenceFragment;
+import org.thoughtcrime.securesms.preferences.AppearancePreferenceFragment;
+import org.thoughtcrime.securesms.preferences.ChatsPreferenceFragment;
+import org.thoughtcrime.securesms.preferences.CorrectedPreferenceFragment;
+import org.thoughtcrime.securesms.preferences.NotificationsPreferenceFragment;
+import org.thoughtcrime.securesms.preferences.SmsMmsPreferenceFragment;
+import org.thoughtcrime.securesms.preferences.StoragePreferenceFragment;
+import org.thoughtcrime.securesms.preferences.widgets.ProfilePreference;
+import org.thoughtcrime.securesms.service.KeyCachingService;
+import org.thoughtcrime.securesms.usernames.ProfileEditActivityV2;
+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.
+ *
+ * @author Moxie Marlinspike
+ *
+ */
+
+public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarActivity
+    implements SharedPreferences.OnSharedPreferenceChangeListener
+{
+  @SuppressWarnings("unused")
+  private static final String TAG = ApplicationPreferencesActivity.class.getSimpleName();
+
+  private static final String PREFERENCE_CATEGORY_PROFILE        = "preference_category_profile";
+  private static final String PREFERENCE_CATEGORY_SMS_MMS        = "preference_category_sms_mms";
+  private static final String PREFERENCE_CATEGORY_NOTIFICATIONS  = "preference_category_notifications";
+  private static final String PREFERENCE_CATEGORY_APP_PROTECTION = "preference_category_app_protection";
+  private static final String PREFERENCE_CATEGORY_APPEARANCE     = "preference_category_appearance";
+  private static final String PREFERENCE_CATEGORY_CHATS          = "preference_category_chats";
+  private static final String PREFERENCE_CATEGORY_STORAGE        = "preference_category_storage";
+  private static final String PREFERENCE_CATEGORY_DEVICES        = "preference_category_devices";
+  private static final String PREFERENCE_CATEGORY_ADVANCED       = "preference_category_advanced";
+
+  private final DynamicTheme    dynamicTheme    = new DynamicTheme();
+  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
+
+  @Override
+  protected void onPreCreate() {
+    dynamicTheme.onCreate(this);
+    dynamicLanguage.onCreate(this);
+  }
+
+  @Override
+  protected void onCreate(Bundle icicle, boolean ready) {
+    //noinspection ConstantConditions
+    this.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+    if (getIntent() != null && getIntent().getCategories() != null && getIntent().getCategories().contains("android.intent.category.NOTIFICATION_PREFERENCES")) {
+      initFragment(android.R.id.content, new NotificationsPreferenceFragment());
+    } else if (icicle == null) {
+      initFragment(android.R.id.content, new ApplicationPreferenceFragment());
+    }
+  }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    dynamicTheme.onResume(this);
+    dynamicLanguage.onResume(this);
+  }
+
+  @Override
+  protected void onActivityResult(int requestCode, int resultCode, Intent data)
+  {
+    super.onActivityResult(requestCode, resultCode, data);
+    Fragment fragment = getSupportFragmentManager().findFragmentById(android.R.id.content);
+    fragment.onActivityResult(requestCode, resultCode, data);
+  }
+
+  @Override
+  public boolean onSupportNavigateUp() {
+    FragmentManager fragmentManager = getSupportFragmentManager();
+    if (fragmentManager.getBackStackEntryCount() > 0) {
+      fragmentManager.popBackStack();
+    } else {
+      // TODO [greyson] Navigation
+      Intent intent = new Intent(this, MainActivity.class);
+      intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+      startActivity(intent);
+      finish();
+    }
+    return true;
+  }
+
+  @Override
+  public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+    if (key.equals(TextSecurePreferences.THEME_PREF)) {
+      recreate();
+    } else if (key.equals(TextSecurePreferences.LANGUAGE_PREF)) {
+      recreate();
+
+      Intent intent = new Intent(this, KeyCachingService.class);
+      intent.setAction(KeyCachingService.LOCALE_CHANGE_EVENT);
+      startService(intent);
+    }
+  }
+
+  public static class ApplicationPreferenceFragment extends CorrectedPreferenceFragment {
+
+    @Override
+    public void onCreate(Bundle icicle) {
+      super.onCreate(icicle);
+
+      this.findPreference(PREFERENCE_CATEGORY_PROFILE)
+          .setOnPreferenceClickListener(new ProfileClickListener());
+      this.findPreference(PREFERENCE_CATEGORY_SMS_MMS)
+        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_SMS_MMS));
+      this.findPreference(PREFERENCE_CATEGORY_NOTIFICATIONS)
+        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_NOTIFICATIONS));
+      this.findPreference(PREFERENCE_CATEGORY_APP_PROTECTION)
+        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_APP_PROTECTION));
+      this.findPreference(PREFERENCE_CATEGORY_APPEARANCE)
+        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_APPEARANCE));
+      this.findPreference(PREFERENCE_CATEGORY_CHATS)
+        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_CHATS));
+      this.findPreference(PREFERENCE_CATEGORY_STORAGE)
+        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_STORAGE));
+      this.findPreference(PREFERENCE_CATEGORY_DEVICES)
+        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_DEVICES));
+      this.findPreference(PREFERENCE_CATEGORY_ADVANCED)
+        .setOnPreferenceClickListener(new CategoryClickListener(PREFERENCE_CATEGORY_ADVANCED));
+
+      tintIcons();
+    }
+
+    private void tintIcons() {
+      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);
+    }
+
+    @Override
+    public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) {
+      addPreferencesFromResource(R.xml.preferences);
+    }
+
+    @Override
+    public void onResume() {
+      super.onResume();
+      //noinspection ConstantConditions
+      ((ApplicationPreferencesActivity) getActivity()).getSupportActionBar().setTitle(R.string.text_secure_normal__menu_settings);
+      setCategorySummaries();
+      setCategoryVisibility();
+    }
+
+    private void setCategorySummaries() {
+      ((ProfilePreference)this.findPreference(PREFERENCE_CATEGORY_PROFILE)).refresh();
+
+      this.findPreference(PREFERENCE_CATEGORY_SMS_MMS)
+          .setSummary(SmsMmsPreferenceFragment.getSummary(getActivity()));
+      this.findPreference(PREFERENCE_CATEGORY_NOTIFICATIONS)
+          .setSummary(NotificationsPreferenceFragment.getSummary(getActivity()));
+      this.findPreference(PREFERENCE_CATEGORY_APP_PROTECTION)
+          .setSummary(AppProtectionPreferenceFragment.getSummary(getActivity()));
+      this.findPreference(PREFERENCE_CATEGORY_APPEARANCE)
+          .setSummary(AppearancePreferenceFragment.getSummary(getActivity()));
+      this.findPreference(PREFERENCE_CATEGORY_CHATS)
+          .setSummary(ChatsPreferenceFragment.getSummary(getActivity()));
+    }
+
+    private void setCategoryVisibility() {
+      Preference devicePreference = this.findPreference(PREFERENCE_CATEGORY_DEVICES);
+      if (devicePreference != null && !TextSecurePreferences.isPushRegistered(getActivity())) {
+        getPreferenceScreen().removePreference(devicePreference);
+      }
+    }
+
+    private class CategoryClickListener implements Preference.OnPreferenceClickListener {
+      private String category;
+
+      CategoryClickListener(String category) {
+        this.category = category;
+      }
+
+      @Override
+      public boolean onPreferenceClick(Preference preference) {
+        Fragment fragment = null;
+
+        switch (category) {
+        case PREFERENCE_CATEGORY_SMS_MMS:
+          fragment = new SmsMmsPreferenceFragment();
+          break;
+        case PREFERENCE_CATEGORY_NOTIFICATIONS:
+          fragment = new NotificationsPreferenceFragment();
+          break;
+        case PREFERENCE_CATEGORY_APP_PROTECTION:
+          fragment = new AppProtectionPreferenceFragment();
+          break;
+        case PREFERENCE_CATEGORY_APPEARANCE:
+          fragment = new AppearancePreferenceFragment();
+          break;
+        case PREFERENCE_CATEGORY_CHATS:
+          fragment = new ChatsPreferenceFragment();
+          break;
+        case PREFERENCE_CATEGORY_STORAGE:
+          fragment = new StoragePreferenceFragment();
+          break;
+        case PREFERENCE_CATEGORY_DEVICES:
+          Intent intent = new Intent(getActivity(), DeviceActivity.class);
+          startActivity(intent);
+          break;
+        case PREFERENCE_CATEGORY_ADVANCED:
+          fragment = new AdvancedPreferenceFragment();
+          break;
+        default:
+          throw new AssertionError();
+        }
+
+        if (fragment != null) {
+          Bundle args = new Bundle();
+          fragment.setArguments(args);
+
+          FragmentManager     fragmentManager     = getActivity().getSupportFragmentManager();
+          FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+
+          fragmentTransaction.setCustomAnimations(R.anim.slide_from_end, R.anim.slide_to_start, R.anim.slide_from_start, R.anim.slide_to_end);
+
+          fragmentTransaction.replace(android.R.id.content, fragment);
+          fragmentTransaction.addToBackStack(null);
+          fragmentTransaction.commit();
+        }
+
+        return true;
+      }
+    }
+
+    private class ProfileClickListener implements Preference.OnPreferenceClickListener {
+      @Override
+      public boolean onPreferenceClick(Preference preference) {
+        if (FeatureFlags.USERNAMES) {
+          requireActivity().startActivity(ProfileEditActivityV2.getLaunchIntent(requireContext()));
+        } else {
+          Intent intent = new Intent(preference.getContext(), CreateProfileActivity.class);
+          intent.putExtra(CreateProfileActivity.EXCLUDE_SYSTEM, true);
+
+          requireActivity().startActivity(intent);
+        }
+        return true;
+      }
+    }
+  }
+
+}

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

@@ -0,0 +1,101 @@
+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.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.appcompat.app.AppCompatActivity;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.WindowManager;
+
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageActivityHelper;
+import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
+
+import java.lang.reflect.Field;
+
+
+public abstract class BaseActionBarActivity extends AppCompatActivity {
+  private static final String TAG = BaseActionBarActivity.class.getSimpleName();
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    if (BaseActivity.isMenuWorkaroundRequired()) {
+      forceOverflowMenu();
+    }
+    super.onCreate(savedInstanceState);
+  }
+
+  @Override
+  protected void onResume() {
+    super.onResume();
+    initializeScreenshotSecurity();
+    DynamicLanguageActivityHelper.recreateIfNotInCorrectLanguage(this, TextSecurePreferences.getLanguage(this));
+  }
+
+  @Override
+  public boolean onKeyDown(int keyCode, KeyEvent event) {
+    return (keyCode == KeyEvent.KEYCODE_MENU && BaseActivity.isMenuWorkaroundRequired()) || super.onKeyDown(keyCode, event);
+  }
+
+  @Override
+  public boolean onKeyUp(int keyCode, @NonNull KeyEvent event) {
+    if (keyCode == KeyEvent.KEYCODE_MENU && BaseActivity.isMenuWorkaroundRequired()) {
+      openOptionsMenu();
+      return true;
+    }
+    return super.onKeyUp(keyCode, event);
+  }
+
+  private void initializeScreenshotSecurity() {
+    if (TextSecurePreferences.isScreenSecurityEnabled(this)) {
+      getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
+    } else {
+      getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
+    }
+  }
+
+  /**
+   * Modified from: http://stackoverflow.com/a/13098824
+   */
+  private void forceOverflowMenu() {
+    try {
+      ViewConfiguration config       = ViewConfiguration.get(this);
+      Field             menuKeyField = ViewConfiguration.class.getDeclaredField("sHasPermanentMenuKey");
+      if(menuKeyField != null) {
+        menuKeyField.setAccessible(true);
+        menuKeyField.setBoolean(config, false);
+      }
+    } catch (IllegalAccessException e) {
+      Log.w(TAG, "Failed to force overflow menu.");
+    } catch (NoSuchFieldException e) {
+      Log.w(TAG, "Failed to force overflow menu.");
+    }
+  }
+
+  protected void startActivitySceneTransition(Intent intent, View sharedView, String transitionName) {
+    Bundle bundle = ActivityOptionsCompat.makeSceneTransitionAnimation(this, sharedView, transitionName)
+                                         .toBundle();
+    ActivityCompat.startActivity(this, intent, bundle);
+  }
+
+  @TargetApi(VERSION_CODES.LOLLIPOP)
+  protected void setStatusBarColor(int color) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+      getWindow().setStatusBarColor(color);
+    }
+  }
+
+  @Override
+  protected void attachBaseContext(Context newBase) {
+    super.attachBaseContext(DynamicLanguageContextWrapper.updateContext(newBase, TextSecurePreferences.getLanguage(newBase)));
+  }
+}

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

@@ -0,0 +1,46 @@
+package org.thoughtcrime.securesms;
+
+import android.content.Context;
+import android.os.Build;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentActivity;
+import android.view.KeyEvent;
+
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageActivityHelper;
+import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
+
+public abstract class BaseActivity extends FragmentActivity {
+  @Override
+  public boolean onKeyDown(int keyCode, KeyEvent event) {
+    return (keyCode == KeyEvent.KEYCODE_MENU && isMenuWorkaroundRequired()) || super.onKeyDown(keyCode, event);
+  }
+
+  @Override
+  public boolean onKeyUp(int keyCode, @NonNull KeyEvent event) {
+    if (keyCode == KeyEvent.KEYCODE_MENU && isMenuWorkaroundRequired()) {
+      openOptionsMenu();
+      return true;
+    }
+    return super.onKeyUp(keyCode, event);
+  }
+
+  public static boolean isMenuWorkaroundRequired() {
+    return VERSION.SDK_INT < VERSION_CODES.KITKAT          &&
+           VERSION.SDK_INT > VERSION_CODES.GINGERBREAD_MR1 &&
+           ("LGE".equalsIgnoreCase(Build.MANUFACTURER) || "E6710".equalsIgnoreCase(Build.DEVICE));
+  }
+
+  @Override
+  protected void onResume() {
+    super.onResume();
+    DynamicLanguageActivityHelper.recreateIfNotInCorrectLanguage(this, TextSecurePreferences.getLanguage(this));
+  }
+
+  @Override
+  protected void attachBaseContext(Context newBase) {
+    super.attachBaseContext(DynamicLanguageContextWrapper.updateContext(newBase, TextSecurePreferences.getLanguage(newBase)));
+  }
+}

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

@@ -0,0 +1,55 @@
+package org.thoughtcrime.securesms;
+
+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.ImageView;
+import android.widget.TextView;
+
+public class BasicIntroFragment extends Fragment {
+
+  private static final String ARG_DRAWABLE = "drawable";
+  private static final String ARG_TEXT     = "text";
+  private static final String ARG_SUBTEXT  = "subtext";
+
+  private int drawable;
+  private int text;
+  private int subtext;
+
+  public static BasicIntroFragment newInstance(int drawable, int text, int subtext) {
+    BasicIntroFragment fragment = new BasicIntroFragment();
+    Bundle args = new Bundle();
+    args.putInt(ARG_DRAWABLE, drawable);
+    args.putInt(ARG_TEXT, text);
+    args.putInt(ARG_SUBTEXT, subtext);
+    fragment.setArguments(args);
+    return fragment;
+  }
+
+  public BasicIntroFragment() {}
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    if (getArguments() != null) {
+      drawable = getArguments().getInt(ARG_DRAWABLE);
+      text     = getArguments().getInt(ARG_TEXT    );
+      subtext  = getArguments().getInt(ARG_SUBTEXT );
+    }
+  }
+
+  @Override
+  public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
+                           Bundle savedInstanceState) {
+    View v = inflater.inflate(R.layout.color_fragment, container, false);
+
+    ((ImageView)v.findViewById(R.id.watermark)).setImageResource(drawable);
+    ((TextView)v.findViewById(R.id.blurb)).setText(text);
+    ((TextView)v.findViewById(R.id.subblurb)).setText(subtext);
+
+    return v;
+  }
+}

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

@@ -0,0 +1,49 @@
+package org.thoughtcrime.securesms;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import android.view.View;
+
+import org.thoughtcrime.securesms.contactshare.Contact;
+import org.thoughtcrime.securesms.database.model.MessageRecord;
+import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
+import org.thoughtcrime.securesms.database.model.ReactionRecord;
+import org.thoughtcrime.securesms.linkpreview.LinkPreview;
+import org.thoughtcrime.securesms.mms.GlideRequests;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.stickers.StickerLocator;
+import org.whispersystems.libsignal.util.guava.Optional;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+
+public interface BindableConversationItem extends Unbindable {
+  void bind(@NonNull MessageRecord           messageRecord,
+            @NonNull Optional<MessageRecord> previousMessageRecord,
+            @NonNull Optional<MessageRecord> nextMessageRecord,
+            @NonNull GlideRequests           glideRequests,
+            @NonNull Locale                  locale,
+            @NonNull Set<MessageRecord>      batchSelected,
+            @NonNull Recipient               recipients,
+            @Nullable String                 searchQuery,
+                     boolean                 pulseHighlight);
+
+  MessageRecord getMessageRecord();
+
+  void setEventListener(@Nullable EventListener listener);
+
+  interface EventListener {
+    void onQuoteClicked(MmsMessageRecord messageRecord);
+    void onLinkPreviewClicked(@NonNull LinkPreview linkPreview);
+    void onMoreTextClicked(@NonNull RecipientId conversationRecipientId, long messageId, boolean isMms);
+    void onStickerClicked(@NonNull StickerLocator stickerLocator);
+    void onViewOnceMessageClicked(@NonNull MmsMessageRecord messageRecord);
+    void onSharedContactDetailsClicked(@NonNull Contact contact, @NonNull View avatarTransitionView);
+    void onAddToContactsClicked(@NonNull Contact contact);
+    void onMessageSharedContactClicked(@NonNull List<Recipient> choices);
+    void onInviteSharedContactClicked(@NonNull List<Recipient> choices);
+    void onReactionClicked(long messageId, boolean isMms);
+  }
+}

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

@@ -0,0 +1,17 @@
+package org.thoughtcrime.securesms;
+
+import androidx.annotation.NonNull;
+
+import org.thoughtcrime.securesms.database.model.ThreadRecord;
+import org.thoughtcrime.securesms.mms.GlideRequests;
+
+import java.util.Locale;
+import java.util.Set;
+
+public interface BindableConversationListItem extends Unbindable {
+
+  public void bind(@NonNull ThreadRecord thread,
+                   @NonNull GlideRequests glideRequests, @NonNull Locale locale,
+                   @NonNull Set<Long> typingThreads,
+                   @NonNull Set<Long> selectedThreads, boolean batchMode);
+}

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

@@ -0,0 +1,149 @@
+package org.thoughtcrime.securesms;
+
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.ListFragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.cursoradapter.widget.CursorAdapter;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ListView;
+
+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.util.DynamicLanguage;
+import org.thoughtcrime.securesms.util.DynamicTheme;
+
+public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity {
+
+  private final DynamicTheme    dynamicTheme    = new DynamicTheme();
+  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
+
+  @Override
+  public void onPreCreate() {
+    dynamicTheme.onCreate(this);
+    dynamicLanguage.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);
+    dynamicLanguage.onResume(this);
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    switch (item.getItemId()) {
+      case android.R.id.home: finish(); return true;
+    }
+
+    return false;
+  }
+
+  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(getActivity(), GlideApp.with(this), null));
+      getLoaderManager().initLoader(0, null, this);
+    }
+
+    @Override
+    public void onStart() {
+      super.onStart();
+      getLoaderManager().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();
+      Intent    intent    = new Intent(getActivity(), RecipientPreferenceActivity.class);
+      intent.putExtra(RecipientPreferenceActivity.RECIPIENT_ID, recipient.getId());
+
+      startActivity(intent);
+    }
+
+    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/ClearProfileAvatarActivity.java

@@ -0,0 +1,26 @@
+package org.thoughtcrime.securesms;
+
+
+import android.app.Activity;
+import android.content.Intent;
+import androidx.appcompat.app.AlertDialog;
+
+public class ClearProfileAvatarActivity extends Activity {
+
+  @Override
+  public void onResume() {
+    super.onResume();
+
+    new AlertDialog.Builder(this)
+        .setTitle(R.string.ClearProfileActivity_remove_profile_photo)
+        .setNegativeButton(android.R.string.cancel, (dialog, which) -> finish())
+        .setPositiveButton(R.string.ClearProfileActivity_remove, (dialog, which) -> {
+          Intent result = new Intent();
+          result.putExtra("delete", true);
+          setResult(Activity.RESULT_OK, result);
+          finish();
+        })
+        .show();
+  }
+
+}

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

@@ -0,0 +1,201 @@
+package org.thoughtcrime.securesms;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.database.Cursor;
+import android.os.AsyncTask;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.method.LinkMovementMethod;
+import android.widget.TextView;
+
+import androidx.appcompat.app.AlertDialog;
+
+import org.thoughtcrime.securesms.crypto.storage.TextSecureIdentityKeyStore;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.MmsDatabase;
+import org.thoughtcrime.securesms.database.MmsSmsDatabase;
+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;
+import org.thoughtcrime.securesms.jobs.PushDecryptMessageJob;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.recipients.RecipientUtil;
+import org.thoughtcrime.securesms.sms.MessageSender;
+import org.thoughtcrime.securesms.util.Base64;
+import org.thoughtcrime.securesms.util.VerifySpan;
+import org.whispersystems.libsignal.SignalProtocolAddress;
+import org.whispersystems.libsignal.util.guava.Optional;
+import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
+
+import java.io.IOException;
+
+import static org.whispersystems.libsignal.SessionCipher.SESSION_LOCK;
+
+public class ConfirmIdentityDialog extends AlertDialog {
+
+  @SuppressWarnings("unused")
+  private static final String TAG = ConfirmIdentityDialog.class.getSimpleName();
+
+  private OnClickListener callback;
+
+  public ConfirmIdentityDialog(Context context,
+                               MessageRecord messageRecord,
+                               IdentityKeyMismatch mismatch)
+  {
+    super(context);
+
+      Recipient       recipient       = Recipient.resolved(mismatch.getRecipientId(context));
+      String          name            = recipient.toShortString(context);
+      String          introduction    = context.getString(R.string.ConfirmIdentityDialog_your_safety_number_with_s_has_changed, name, name);
+      SpannableString spannableString = new SpannableString(introduction + " " +
+                                                            context.getString(R.string.ConfirmIdentityDialog_you_may_wish_to_verify_your_safety_number_with_this_contact));
+
+      spannableString.setSpan(new VerifySpan(context, mismatch),
+                              introduction.length()+1, spannableString.length(),
+                              Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+      setTitle(name);
+      setMessage(spannableString);
+
+      setButton(AlertDialog.BUTTON_POSITIVE, context.getString(R.string.ConfirmIdentityDialog_accept), new AcceptListener(messageRecord, mismatch, recipient.getId()));
+      setButton(AlertDialog.BUTTON_NEGATIVE, context.getString(android.R.string.cancel),               new CancelListener());
+  }
+
+  @Override
+  public void show() {
+    super.show();
+    ((TextView)this.findViewById(android.R.id.message))
+                   .setMovementMethod(LinkMovementMethod.getInstance());
+  }
+
+  public void setCallback(OnClickListener callback) {
+    this.callback = callback;
+  }
+
+  private class AcceptListener implements OnClickListener {
+
+    private final MessageRecord       messageRecord;
+    private final IdentityKeyMismatch mismatch;
+    private final RecipientId         recipientId;
+
+    private AcceptListener(MessageRecord messageRecord, IdentityKeyMismatch mismatch, RecipientId recipientId) {
+      this.messageRecord = messageRecord;
+      this.mismatch      = mismatch;
+      this.recipientId   = recipientId;
+    }
+
+    @SuppressLint("StaticFieldLeak")
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+      new AsyncTask<Void, Void, Void>()
+      {
+        @Override
+        protected Void doInBackground(Void... params) {
+          synchronized (SESSION_LOCK) {
+            SignalProtocolAddress      mismatchAddress  = new SignalProtocolAddress(Recipient.resolved(recipientId).requireServiceId(), 1);
+            TextSecureIdentityKeyStore identityKeyStore = new TextSecureIdentityKeyStore(getContext());
+
+            identityKeyStore.saveIdentity(mismatchAddress, mismatch.getIdentityKey(), true);
+          }
+
+          processMessageRecord(messageRecord);
+          processPendingMessageRecords(messageRecord.getThreadId(), mismatch);
+
+          return null;
+        }
+
+        private void processMessageRecord(MessageRecord messageRecord) {
+          if (messageRecord.isOutgoing()) processOutgoingMessageRecord(messageRecord);
+          else                            processIncomingMessageRecord(messageRecord);
+        }
+
+        private void processPendingMessageRecords(long threadId, IdentityKeyMismatch mismatch) {
+          MmsSmsDatabase        mmsSmsDatabase = DatabaseFactory.getMmsSmsDatabase(getContext());
+          Cursor                cursor         = mmsSmsDatabase.getIdentityConflictMessagesForThread(threadId);
+          MmsSmsDatabase.Reader reader         = mmsSmsDatabase.readerFor(cursor);
+          MessageRecord         record;
+
+          try {
+            while ((record = reader.getNext()) != null) {
+              for (IdentityKeyMismatch recordMismatch : record.getIdentityKeyMismatches()) {
+                if (mismatch.equals(recordMismatch)) {
+                  processMessageRecord(record);
+                }
+              }
+            }
+          } finally {
+            if (reader != null)
+              reader.close();
+          }
+        }
+
+        private void processOutgoingMessageRecord(MessageRecord messageRecord) {
+          SmsDatabase        smsDatabase        = DatabaseFactory.getSmsDatabase(getContext());
+          MmsDatabase        mmsDatabase        = DatabaseFactory.getMmsDatabase(getContext());
+
+          if (messageRecord.isMms()) {
+            mmsDatabase.removeMismatchedIdentity(messageRecord.getId(),
+                                                 mismatch.getRecipientId(getContext()),
+                                                 mismatch.getIdentityKey());
+
+            if (messageRecord.getRecipient().isPushGroup()) {
+              MessageSender.resendGroupMessage(getContext(), messageRecord, Recipient.resolved(mismatch.getRecipientId(getContext())).getId());
+            } else {
+              MessageSender.resend(getContext(), messageRecord);
+            }
+          } else {
+            smsDatabase.removeMismatchedIdentity(messageRecord.getId(),
+                                                 mismatch.getRecipientId(getContext()),
+                                                 mismatch.getIdentityKey());
+
+            MessageSender.resend(getContext(), messageRecord);
+          }
+        }
+
+        private void processIncomingMessageRecord(MessageRecord messageRecord) {
+          try {
+            PushDatabase pushDatabase = DatabaseFactory.getPushDatabase(getContext());
+            SmsDatabase  smsDatabase  = DatabaseFactory.getSmsDatabase(getContext());
+
+            smsDatabase.removeMismatchedIdentity(messageRecord.getId(),
+                                                 mismatch.getRecipientId(getContext()),
+                                                 mismatch.getIdentityKey());
+
+            boolean legacy = !messageRecord.isContentBundleKeyExchange();
+
+            SignalServiceEnvelope envelope = new SignalServiceEnvelope(SignalServiceProtos.Envelope.Type.PREKEY_BUNDLE_VALUE,
+                                                                       Optional.of(RecipientUtil.toSignalServiceAddress(getContext(), messageRecord.getIndividualRecipient())),
+                                                                       messageRecord.getRecipientDeviceId(),
+                                                                       messageRecord.getDateSent(),
+                                                                       legacy ? Base64.decode(messageRecord.getBody()) : null,
+                                                                       !legacy ? Base64.decode(messageRecord.getBody()) : null,
+                                                                       0, null);
+
+            long pushId = pushDatabase.insert(envelope);
+
+            ApplicationDependencies.getJobManager().add(new PushDecryptMessageJob(getContext(), pushId, messageRecord.getId()));
+          } catch (IOException e) {
+            throw new AssertionError(e);
+          }
+        }
+
+      }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+
+      if (callback != null) callback.onClick(null, 0);
+    }
+  }
+
+  private class CancelListener implements OnClickListener {
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+      if (callback != null) callback.onClick(null, 0);
+    }
+  }
+
+}

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

@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) 2015 Open Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.thoughtcrime.securesms;
+
+import android.content.Context;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
+import org.thoughtcrime.securesms.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.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.util.DynamicLanguage;
+import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
+import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.ViewUtil;
+import org.whispersystems.libsignal.util.guava.Optional;
+
+import java.io.IOException;
+import java.lang.ref.WeakReference;
+
+/**
+ * Base activity container for selecting a list of contacts.
+ *
+ * @author Moxie Marlinspike
+ *
+ */
+public abstract class ContactSelectionActivity extends PassphraseRequiredActionBarActivity
+                                               implements SwipeRefreshLayout.OnRefreshListener,
+                                                          ContactSelectionListFragment.OnContactSelectedListener
+{
+  private static final String TAG = ContactSelectionActivity.class.getSimpleName();
+
+  private final DynamicTheme    dynamicTheme    = new DynamicNoActionBarTheme();
+  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
+
+  protected ContactSelectionListFragment contactsFragment;
+
+  private ContactFilterToolbar toolbar;
+
+  @Override
+  protected void onPreCreate() {
+    dynamicTheme.onCreate(this);
+    dynamicLanguage.onCreate(this);
+  }
+
+  @Override
+  protected void onCreate(Bundle icicle, boolean ready) {
+    if (!getIntent().hasExtra(ContactSelectionListFragment.DISPLAY_MODE)) {
+      int displayMode = TextSecurePreferences.isSmsEnabled(this) ? DisplayMode.FLAG_ALL
+                                                                 : DisplayMode.FLAG_PUSH | DisplayMode.FLAG_ACTIVE_GROUPS | DisplayMode.FLAG_INACTIVE_GROUPS;
+      getIntent().putExtra(ContactSelectionListFragment.DISPLAY_MODE, displayMode);
+    }
+
+    setContentView(R.layout.contact_selection_activity);
+
+    initializeToolbar();
+    initializeResources();
+    initializeSearch();
+  }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    dynamicTheme.onResume(this);
+    dynamicLanguage.onResume(this);
+  }
+
+  protected ContactFilterToolbar getToolbar() {
+    return toolbar;
+  }
+
+  private void initializeToolbar() {
+    this.toolbar = ViewUtil.findById(this, R.id.toolbar);
+    setSupportActionBar(toolbar);
+
+    assert  getSupportActionBar() != null;
+    getSupportActionBar().setDisplayHomeAsUpEnabled(false);
+    getSupportActionBar().setDisplayShowTitleEnabled(false);
+    getSupportActionBar().setIcon(null);
+    getSupportActionBar().setLogo(null);
+  }
+
+  private void initializeResources() {
+    contactsFragment = (ContactSelectionListFragment) getSupportFragmentManager().findFragmentById(R.id.contact_selection_list_fragment);
+    contactsFragment.setOnContactSelectedListener(this);
+    contactsFragment.setOnRefreshListener(this);
+  }
+
+  private void initializeSearch() {
+    toolbar.setOnFilterChangedListener(filter -> contactsFragment.setQueryFilter(filter));
+  }
+
+  @Override
+  public void onRefresh() {
+    new RefreshDirectoryTask(this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, getApplicationContext());
+  }
+
+  @Override
+  public void onContactSelected(Optional<RecipientId> recipientId, String number) {}
+
+  @Override
+  public void onContactDeselected(Optional<RecipientId> recipientId, String number) {}
+
+  private static class RefreshDirectoryTask extends AsyncTask<Context, Void, Void> {
+
+    private final WeakReference<ContactSelectionActivity> activity;
+
+    private RefreshDirectoryTask(ContactSelectionActivity activity) {
+      this.activity = new WeakReference<>(activity);
+    }
+
+    @Override
+    protected Void doInBackground(Context... params) {
+      try {
+        DirectoryHelper.refreshDirectory(params[0], true);
+      } catch (IOException e) {
+        Log.w(TAG, e);
+      }
+
+      return null;
+    }
+
+    @Override
+    protected void onPostExecute(Void result) {
+      ContactSelectionActivity activity = this.activity.get();
+
+      if (activity != null && !activity.isFinishing()) {
+        activity.toolbar.clear();
+        activity.contactsFragment.resetQueryFilter();
+      }
+    }
+  }
+}

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

@@ -0,0 +1,398 @@
+/*
+ * Copyright (C) 2015 Open Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.thoughtcrime.securesms;
+
+
+import android.Manifest;
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.database.Cursor;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
+import com.pnikosis.materialishprogress.ProgressWheel;
+
+import org.thoughtcrime.securesms.components.RecyclerViewFastScroller;
+import org.thoughtcrime.securesms.contacts.ContactSelectionListAdapter;
+import org.thoughtcrime.securesms.contacts.ContactSelectionListItem;
+import org.thoughtcrime.securesms.contacts.ContactsCursorLoader;
+import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
+import org.thoughtcrime.securesms.contacts.SelectedContact;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.mms.GlideApp;
+import org.thoughtcrime.securesms.permissions.Permissions;
+import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.util.StickyHeaderDecoration;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.UsernameUtil;
+import org.thoughtcrime.securesms.util.ViewUtil;
+import org.thoughtcrime.securesms.util.adapter.FixedViewsAdapter;
+import org.thoughtcrime.securesms.util.adapter.RecyclerViewConcatenateAdapterStickyHeader;
+import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
+import org.whispersystems.libsignal.util.guava.Optional;
+
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Fragment for selecting a one or more contacts from a list.
+ *
+ * @author Moxie Marlinspike
+ *
+ */
+public final class ContactSelectionListFragment extends    Fragment
+                                                implements LoaderManager.LoaderCallbacks<Cursor>
+{
+  @SuppressWarnings("unused")
+  private static final String TAG = Log.tag(ContactSelectionListFragment.class);
+
+  public static final String DISPLAY_MODE = "display_mode";
+  public static final String MULTI_SELECT = "multi_select";
+  public static final String REFRESHABLE  = "refreshable";
+  public static final String RECENTS      = "recents";
+
+  private TextView                    emptyText;
+  private Set<SelectedContact>        selectedContacts;
+  private OnContactSelectedListener   onContactSelectedListener;
+  private SwipeRefreshLayout          swipeRefresh;
+  private View                        showContactsLayout;
+  private Button                      showContactsButton;
+  private TextView                    showContactsDescription;
+  private ProgressWheel               showContactsProgress;
+  private String                      cursorFilter;
+  private RecyclerView                recyclerView;
+  private RecyclerViewFastScroller    fastScroller;
+  private ContactSelectionListAdapter cursorRecyclerViewAdapter;
+
+  @Nullable private FixedViewsAdapter footerAdapter;
+  @Nullable private InviteCallback    inviteCallback;
+
+  @Override
+  public void onAttach(@NonNull Context context) {
+    super.onAttach(context);
+
+    if (context instanceof InviteCallback) {
+      inviteCallback = (InviteCallback) context;
+    }
+  }
+
+  @Override
+  public void onActivityCreated(Bundle icicle) {
+    super.onActivityCreated(icicle);
+
+    initializeCursor();
+  }
+
+  @Override
+  public void onStart() {
+    super.onStart();
+
+    Permissions.with(this)
+               .request(Manifest.permission.WRITE_CONTACTS, Manifest.permission.READ_CONTACTS)
+               .ifNecessary()
+               .onAllGranted(() -> {
+                 if (!TextSecurePreferences.hasSuccessfullyRetrievedDirectory(getActivity())) {
+                   handleContactPermissionGranted();
+                 } else {
+                   this.getLoaderManager().initLoader(0, null, this);
+                 }
+               })
+               .onAnyDenied(() -> {
+                 getActivity().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
+
+                 if (getActivity().getIntent().getBooleanExtra(RECENTS, false)) {
+                   getLoaderManager().initLoader(0, null, ContactSelectionListFragment.this);
+                 } else {
+                   initializeNoContactsPermission();
+                 }
+               })
+               .execute();
+  }
+
+  @Override
+  public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    View view = inflater.inflate(R.layout.contact_selection_list_fragment, container, false);
+
+    emptyText               = ViewUtil.findById(view, android.R.id.empty);
+    recyclerView            = ViewUtil.findById(view, R.id.recycler_view);
+    swipeRefresh            = ViewUtil.findById(view, R.id.swipe_refresh);
+    fastScroller            = ViewUtil.findById(view, R.id.fast_scroller);
+    showContactsLayout      = view.findViewById(R.id.show_contacts_container);
+    showContactsButton      = view.findViewById(R.id.show_contacts_button);
+    showContactsDescription = view.findViewById(R.id.show_contacts_description);
+    showContactsProgress    = view.findViewById(R.id.progress);
+    recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
+
+    swipeRefresh.setEnabled(getActivity().getIntent().getBooleanExtra(REFRESHABLE, true));
+
+    return view;
+  }
+
+  @Override
+  public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+    Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
+  }
+
+  public @NonNull List<SelectedContact> getSelectedContacts() {
+    List<SelectedContact> selected = new LinkedList<>();
+    if (selectedContacts != null) {
+      selected.addAll(selectedContacts);
+    }
+
+    return selected;
+  }
+
+  private boolean isMulti() {
+    return getActivity().getIntent().getBooleanExtra(MULTI_SELECT, false);
+  }
+
+  private void initializeCursor() {
+    cursorRecyclerViewAdapter = new ContactSelectionListAdapter(requireContext(),
+                                                                GlideApp.with(this),
+                                                                null,
+                                                                new ListClickListener(),
+                                                                isMulti());
+    selectedContacts = cursorRecyclerViewAdapter.getSelectedContacts();
+
+    RecyclerViewConcatenateAdapterStickyHeader concatenateAdapter = new RecyclerViewConcatenateAdapterStickyHeader();
+
+    concatenateAdapter.addAdapter(cursorRecyclerViewAdapter);
+    if (inviteCallback != null) {
+      footerAdapter = new FixedViewsAdapter(createInviteActionView(inviteCallback));
+      footerAdapter.hide();
+      concatenateAdapter.addAdapter(footerAdapter);
+    }
+
+    recyclerView.setAdapter(concatenateAdapter);
+    recyclerView.addItemDecoration(new StickyHeaderDecoration(concatenateAdapter, true, true));
+  }
+
+  private View createInviteActionView(@NonNull InviteCallback inviteCallback) {
+    View view = LayoutInflater.from(requireContext())
+                              .inflate(R.layout.contact_selection_invite_action_item, (ViewGroup) requireView(), false);
+    view.setOnClickListener(v -> inviteCallback.onInvite());
+    return view;
+  }
+
+  private void initializeNoContactsPermission() {
+    swipeRefresh.setVisibility(View.GONE);
+
+    showContactsLayout.setVisibility(View.VISIBLE);
+    showContactsProgress.setVisibility(View.INVISIBLE);
+    showContactsDescription.setText(R.string.contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them);
+    showContactsButton.setVisibility(View.VISIBLE);
+
+    showContactsButton.setOnClickListener(v -> {
+      Permissions.with(this)
+                 .request(Manifest.permission.WRITE_CONTACTS, Manifest.permission.READ_CONTACTS)
+                 .ifNecessary()
+                 .withPermanentDenialDialog(getString(R.string.ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts))
+                 .onSomeGranted(permissions -> {
+                   if (permissions.contains(Manifest.permission.WRITE_CONTACTS)) {
+                     handleContactPermissionGranted();
+                   }
+                 })
+                 .execute();
+    });
+  }
+
+  public void setQueryFilter(String filter) {
+    this.cursorFilter = filter;
+    LoaderManager.getInstance(this).restartLoader(0, null, this);
+  }
+
+  public void resetQueryFilter() {
+    setQueryFilter(null);
+    swipeRefresh.setRefreshing(false);
+  }
+
+  public void setRefreshing(boolean refreshing) {
+    swipeRefresh.setRefreshing(refreshing);
+  }
+
+  public void reset() {
+    selectedContacts.clear();
+
+    if (!isDetached() && !isRemoving() && getActivity() != null && !getActivity().isFinishing()) {
+      getLoaderManager().restartLoader(0, null, this);
+    }
+  }
+
+  @Override
+  public @NonNull Loader<Cursor> onCreateLoader(int id, Bundle args) {
+    return new ContactsCursorLoader(getActivity(),
+                                    getActivity().getIntent().getIntExtra(DISPLAY_MODE, DisplayMode.FLAG_ALL),
+                                    cursorFilter, getActivity().getIntent().getBooleanExtra(RECENTS, false));
+  }
+
+  @Override
+  public void onLoadFinished(@NonNull Loader<Cursor> loader, @Nullable Cursor data) {
+    swipeRefresh.setVisibility(View.VISIBLE);
+    showContactsLayout.setVisibility(View.GONE);
+
+    cursorRecyclerViewAdapter.changeCursor(data);
+
+    if (footerAdapter != null) {
+      footerAdapter.show();
+    }
+
+    emptyText.setText(R.string.contact_selection_group_activity__no_contacts);
+    boolean useFastScroller = data != null && data.getCount() > 20;
+    recyclerView.setVerticalScrollBarEnabled(!useFastScroller);
+    if (useFastScroller) {
+      fastScroller.setVisibility(View.VISIBLE);
+      fastScroller.setRecyclerView(recyclerView);
+    } else {
+      fastScroller.setRecyclerView(null);
+      fastScroller.setVisibility(View.GONE);
+    }
+  }
+
+  @Override
+  public void onLoaderReset(@NonNull Loader<Cursor> loader) {
+    cursorRecyclerViewAdapter.changeCursor(null);
+    fastScroller.setVisibility(View.GONE);
+  }
+
+  @SuppressLint("StaticFieldLeak")
+  private void handleContactPermissionGranted() {
+    final Context context = requireContext();
+
+    new AsyncTask<Void, Void, Boolean>() {
+      @Override
+      protected void onPreExecute() {
+        swipeRefresh.setVisibility(View.GONE);
+        showContactsLayout.setVisibility(View.VISIBLE);
+        showContactsButton.setVisibility(View.INVISIBLE);
+        showContactsDescription.setText(R.string.ConversationListFragment_loading);
+        showContactsProgress.setVisibility(View.VISIBLE);
+        showContactsProgress.spin();
+      }
+
+      @Override
+      protected Boolean doInBackground(Void... voids) {
+        try {
+          DirectoryHelper.refreshDirectory(context, false);
+          return true;
+        } catch (IOException e) {
+          Log.w(TAG, e);
+        }
+        return false;
+      }
+
+      @Override
+      protected void onPostExecute(Boolean result) {
+        if (result) {
+          showContactsLayout.setVisibility(View.GONE);
+          swipeRefresh.setVisibility(View.VISIBLE);
+          reset();
+        } else {
+          Toast.makeText(getContext(), R.string.ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection, Toast.LENGTH_LONG).show();
+          initializeNoContactsPermission();
+        }
+      }
+    }.execute();
+  }
+
+  private class ListClickListener implements ContactSelectionListAdapter.ItemClickListener {
+    @Override
+    public void onItemClick(ContactSelectionListItem contact) {
+      SelectedContact selectedContact = contact.isUsernameType() ? SelectedContact.forUsername(contact.getRecipientId().orNull(), contact.getNumber())
+                                                                 : SelectedContact.forPhone(contact.getRecipientId().orNull(), contact.getNumber());
+
+      if (!isMulti() || !selectedContacts.contains(selectedContact)) {
+        if (contact.isUsernameType()) {
+          AlertDialog loadingDialog = SimpleProgressDialog.show(requireContext());
+
+          SimpleTask.run(getViewLifecycleOwner().getLifecycle(), () -> {
+            return UsernameUtil.fetchUuidForUsername(requireContext(), contact.getNumber());
+          }, uuid -> {
+            loadingDialog.dismiss();
+            if (uuid.isPresent()) {
+              Recipient recipient = Recipient.externalUsername(requireContext(), uuid.get(), contact.getNumber());
+              selectedContacts.add(SelectedContact.forUsername(recipient.getId(), contact.getNumber()));
+              contact.setChecked(true);
+
+              if (onContactSelectedListener != null) {
+                onContactSelectedListener.onContactSelected(Optional.of(recipient.getId()), null);
+              }
+            } else {
+              new AlertDialog.Builder(requireContext())
+                             .setTitle(R.string.ContactSelectionListFragment_username_not_found)
+                             .setMessage(getString(R.string.ContactSelectionListFragment_s_is_not_a_signal_user, contact.getNumber()))
+                             .setPositiveButton(R.string.ContactSelectionListFragment_okay, (dialog, which) -> dialog.dismiss())
+                             .show();
+            }
+          });
+        } else {
+          selectedContacts.add(selectedContact);
+          contact.setChecked(true);
+
+          if (onContactSelectedListener != null) {
+            onContactSelectedListener.onContactSelected(contact.getRecipientId(), contact.getNumber());
+          }
+        }
+      } else {
+        selectedContacts.remove(selectedContact);
+        contact.setChecked(false);
+
+        if (onContactSelectedListener != null) {
+          onContactSelectedListener.onContactDeselected(contact.getRecipientId(), contact.getNumber());
+        }
+      }
+    }
+  }
+
+  public void setOnContactSelectedListener(OnContactSelectedListener onContactSelectedListener) {
+    this.onContactSelectedListener = onContactSelectedListener;
+  }
+
+  public void setOnRefreshListener(SwipeRefreshLayout.OnRefreshListener onRefreshListener) {
+    this.swipeRefresh.setOnRefreshListener(onRefreshListener);
+  }
+
+  public interface OnContactSelectedListener {
+    void onContactSelected(Optional<RecipientId> recipientId, String number);
+    void onContactDeselected(Optional<RecipientId> recipientId, String number);
+  }
+
+  public interface InviteCallback {
+    void onInvite();
+  }
+}

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

@@ -0,0 +1,101 @@
+package org.thoughtcrime.securesms;
+
+import android.app.Activity;
+import android.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.ListFragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.ListView;
+import android.widget.SimpleAdapter;
+
+
+import org.thoughtcrime.securesms.database.loaders.CountryListLoader;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+public class CountrySelectionFragment extends ListFragment implements LoaderManager.LoaderCallbacks<ArrayList<Map<String, String>>> {
+
+  private EditText countryFilter;
+  private CountrySelectedListener listener;
+
+  @Override
+  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
+    return inflater.inflate(R.layout.country_selection_fragment, container, false);
+  }
+
+  @Override
+  public void onActivityCreated(Bundle bundle) {
+    super.onActivityCreated(bundle);
+    this.countryFilter = (EditText)getView().findViewById(R.id.country_search);
+    this.countryFilter.addTextChangedListener(new FilterWatcher());
+    getLoaderManager().initLoader(0, null, this).forceLoad();
+  }
+
+  @Override
+  public void onAttach(Activity activity) {
+    super.onAttach(activity);
+    this.listener = (CountrySelectedListener)activity;
+  }
+
+  @Override
+  public void onListItemClick(ListView listView, View view, int position, long id) {
+    Map<String, String> item = (Map<String, String>)this.getListAdapter().getItem(position);
+    if (this.listener != null) {
+      this.listener.countrySelected(item.get("country_name"),
+                                    Integer.parseInt(item.get("country_code").substring(1)));
+    }
+  }
+
+  @Override
+  public @NonNull Loader<ArrayList<Map<String, String>>> onCreateLoader(int arg0, Bundle arg1) {
+    return new CountryListLoader(getActivity());
+  }
+
+  @Override
+  public void onLoadFinished(@NonNull Loader<ArrayList<Map<String, String>>> loader,
+                             ArrayList<Map<String, String>> results)
+  {
+    String[] from = {"country_name", "country_code"};
+    int[] to      = {R.id.country_name, R.id.country_code};
+    this.setListAdapter(new SimpleAdapter(getActivity(), results, R.layout.country_list_item, from, to));
+
+    if (this.countryFilter != null && this.countryFilter.getText().length() != 0) {
+      ((SimpleAdapter)getListAdapter()).getFilter().filter(this.countryFilter.getText().toString());
+    }
+  }
+
+  @Override
+  public void onLoaderReset(@NonNull Loader<ArrayList<Map<String, String>>> arg0) {
+    this.setListAdapter(null);
+  }
+
+  public interface CountrySelectedListener {
+    public void countrySelected(String countryName, int countryCode);
+  }
+
+  private class FilterWatcher implements TextWatcher {
+
+    @Override
+    public void afterTextChanged(Editable s) {
+      if (getListAdapter() != null) {
+        ((SimpleAdapter)getListAdapter()).getFilter().filter(s.toString());
+      }
+    }
+
+    @Override
+    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+    }
+
+    @Override
+    public void onTextChanged(CharSequence s, int start, int before, int count) {
+    }
+  }
+}

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

@@ -0,0 +1,447 @@
+package org.thoughtcrime.securesms;
+
+
+import android.Manifest;
+import android.animation.Animator;
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Build;
+import android.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.ViewAnimationUtils;
+import android.view.WindowManager;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.dd.CircularProgressButton;
+
+import org.thoughtcrime.securesms.avatar.AvatarSelection;
+import org.thoughtcrime.securesms.components.InputAwareLayout;
+import org.thoughtcrime.securesms.components.LabeledEditText;
+import org.thoughtcrime.securesms.components.emoji.EmojiKeyboardProvider;
+import org.thoughtcrime.securesms.components.emoji.EmojiToggle;
+import org.thoughtcrime.securesms.components.emoji.MediaKeyboard;
+import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
+import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.jobs.MultiDeviceProfileKeyUpdateJob;
+import org.thoughtcrime.securesms.jobs.MultiDeviceProfileContentUpdateJob;
+import org.thoughtcrime.securesms.jobs.RefreshOwnProfileJob;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.mms.GlideApp;
+import org.thoughtcrime.securesms.permissions.Permissions;
+import org.thoughtcrime.securesms.profiles.AvatarHelper;
+import org.thoughtcrime.securesms.profiles.ProfileMediaConstraints;
+import org.thoughtcrime.securesms.profiles.SystemProfileUtil;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.util.BitmapDecodingException;
+import org.thoughtcrime.securesms.util.BitmapUtil;
+import org.thoughtcrime.securesms.util.DynamicLanguage;
+import org.thoughtcrime.securesms.util.DynamicRegistrationTheme;
+import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.util.ViewUtil;
+import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
+import org.whispersystems.signalservice.api.SignalServiceAccountManager;
+import org.whispersystems.signalservice.api.crypto.ProfileCipher;
+import org.whispersystems.signalservice.api.util.StreamDetails;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.security.SecureRandom;
+import java.util.concurrent.ExecutionException;
+
+@SuppressLint("StaticFieldLeak")
+public class CreateProfileActivity extends BaseActionBarActivity {
+
+  private static final String TAG = CreateProfileActivity.class.getSimpleName();
+
+  public static final String NEXT_INTENT    = "next_intent";
+  public static final String EXCLUDE_SYSTEM = "exclude_system";
+
+  private final DynamicTheme    dynamicTheme    = new DynamicRegistrationTheme();
+  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
+
+  private InputAwareLayout       container;
+  private ImageView              avatar;
+  private CircularProgressButton finishButton;
+  private LabeledEditText        name;
+  private EmojiToggle            emojiToggle;
+  private MediaKeyboard          mediaKeyboard;
+  private View                   reveal;
+
+  private Intent nextIntent;
+  private byte[] avatarBytes;
+  private File   captureFile;
+
+  @Override
+  public void onCreate(Bundle bundle) {
+    super.onCreate(bundle);
+
+    dynamicTheme.onCreate(this);
+    dynamicLanguage.onCreate(this);
+
+    setContentView(R.layout.profile_create_activity);
+
+    getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+
+    initializeResources();
+    initializeEmojiInput();
+    initializeProfileName(getIntent().getBooleanExtra(EXCLUDE_SYSTEM, false));
+    initializeProfileAvatar(getIntent().getBooleanExtra(EXCLUDE_SYSTEM, false));
+  }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    dynamicTheme.onResume(this);
+    dynamicLanguage.onResume(this);
+  }
+
+  @Override
+  public void onBackPressed() {
+    if (container.isInputOpen()) container.hideCurrentInput(name.getInput());
+    else                         super.onBackPressed();
+  }
+
+  @Override
+  public void onConfigurationChanged(Configuration newConfig) {
+    super.onConfigurationChanged(newConfig);
+
+    if (container.getCurrentInput() == mediaKeyboard) {
+      container.hideAttachedInput(true);
+    }
+  }
+
+  @Override
+  public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) {
+    Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
+  }
+
+  @Override
+  public void onActivityResult(int requestCode, int resultCode, Intent data) {
+    super.onActivityResult(requestCode, resultCode, data);
+
+    switch (requestCode) {
+      case AvatarSelection.REQUEST_CODE_AVATAR:
+        if (resultCode == Activity.RESULT_OK) {
+          Uri outputFile = Uri.fromFile(new File(getCacheDir(), "cropped"));
+          Uri inputFile  = (data != null ? data.getData() : null);
+
+          if (inputFile == null && captureFile != null) {
+            inputFile = Uri.fromFile(captureFile);
+          }
+
+          if (data != null && data.getBooleanExtra("delete", false)) {
+            avatarBytes = null;
+            avatar.setImageDrawable(new ResourceContactPhoto(R.drawable.ic_camera_solid_white_24).asDrawable(this, getResources().getColor(R.color.grey_400)));
+          } else {
+            AvatarSelection.circularCropImage(this, inputFile, outputFile, R.string.CropImageActivity_profile_avatar);
+          }
+        }
+
+        break;
+      case AvatarSelection.REQUEST_CODE_CROP_IMAGE:
+        if (resultCode == Activity.RESULT_OK) {
+          new AsyncTask<Void, Void, byte[]>() {
+            @Override
+            protected byte[] doInBackground(Void... params) {
+              try {
+                BitmapUtil.ScaleResult result = BitmapUtil.createScaledBytes(CreateProfileActivity.this, AvatarSelection.getResultUri(data), new ProfileMediaConstraints());
+                return result.getBitmap();
+              } catch (BitmapDecodingException e) {
+                Log.w(TAG, e);
+                return null;
+              }
+            }
+
+            @Override
+            protected void onPostExecute(byte[] result) {
+              if (result != null) {
+                avatarBytes = result;
+                GlideApp.with(CreateProfileActivity.this)
+                        .load(avatarBytes)
+                        .skipMemoryCache(true)
+                        .diskCacheStrategy(DiskCacheStrategy.NONE)
+                        .circleCrop()
+                        .into(avatar);
+              } else {
+                Toast.makeText(CreateProfileActivity.this, R.string.CreateProfileActivity_error_setting_profile_photo, Toast.LENGTH_LONG).show();
+              }
+            }
+          }.execute();
+        }
+        break;
+    }
+  }
+
+  private void initializeResources() {
+    TextView skipButton       = ViewUtil.findById(this, R.id.skip_button);
+
+    this.avatar       = ViewUtil.findById(this, R.id.avatar);
+    this.name         = ViewUtil.findById(this, R.id.name);
+    this.emojiToggle  = ViewUtil.findById(this, R.id.emoji_toggle);
+    this.mediaKeyboard = ViewUtil.findById(this, R.id.emoji_drawer);
+    this.container    = ViewUtil.findById(this, R.id.container);
+    this.finishButton = ViewUtil.findById(this, R.id.finish_button);
+    this.reveal       = ViewUtil.findById(this, R.id.reveal);
+    this.nextIntent   = getIntent().getParcelableExtra(NEXT_INTENT);
+
+    this.avatar.setOnClickListener(view -> Permissions.with(this)
+                                                      .request(Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                                                      .ifNecessary()
+                                                      .onAnyResult(this::startAvatarSelection)
+                                                      .execute());
+
+    this.name.getInput().addTextChangedListener(new TextWatcher() {
+      @Override
+      public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+      @Override
+      public void onTextChanged(CharSequence s, int start, int before, int count) {}
+      @Override
+      public void afterTextChanged(Editable s) {
+        if (s.toString().getBytes().length > ProfileCipher.NAME_PADDED_LENGTH) {
+          name.getInput().setError(getString(R.string.CreateProfileActivity_too_long));
+          finishButton.setEnabled(false);
+        } else if (name.getInput().getError() != null || !finishButton.isEnabled()) {
+          name.getInput().setError(null);
+          finishButton.setEnabled(true);
+        }
+      }
+    });
+
+    this.finishButton.setOnClickListener(view -> {
+      this.finishButton.setIndeterminateProgressMode(true);
+      this.finishButton.setProgress(50);
+      handleUpload();
+    });
+
+    skipButton.setOnClickListener(view -> {
+      if (nextIntent != null) startActivity(nextIntent);
+      finish();
+    });
+  }
+
+  private void initializeProfileName(boolean excludeSystem) {
+    if (!TextUtils.isEmpty(TextSecurePreferences.getProfileName(this))) {
+      String profileName = TextSecurePreferences.getProfileName(this);
+
+      name.setText(profileName);
+      name.getInput().setSelection(profileName.length(), profileName.length());
+    } else if (!excludeSystem) {
+      SystemProfileUtil.getSystemProfileName(this).addListener(new ListenableFuture.Listener<String>() {
+        @Override
+        public void onSuccess(String result) {
+          if (!TextUtils.isEmpty(result)) {
+            name.setText(result);
+            name.getInput().setSelection(result.length(), result.length());
+          }
+        }
+
+        @Override
+        public void onFailure(ExecutionException e) {
+          Log.w(TAG, e);
+        }
+      });
+    }
+  }
+
+  private void initializeProfileAvatar(boolean excludeSystem) {
+    RecipientId selfId = Recipient.self().getId();
+
+    if (AvatarHelper.getAvatarFile(this, selfId).exists() && AvatarHelper.getAvatarFile(this, selfId).length() > 0) {
+      new AsyncTask<Void, Void, byte[]>() {
+        @Override
+        protected byte[] doInBackground(Void... params) {
+          try {
+            return Util.readFully(AvatarHelper.getInputStreamFor(CreateProfileActivity.this, selfId));
+          } catch (IOException e) {
+            Log.w(TAG, e);
+            return null;
+          }
+        }
+
+        @Override
+        protected void onPostExecute(byte[] result) {
+          if (result != null) {
+            avatarBytes = result;
+            GlideApp.with(CreateProfileActivity.this)
+                    .load(result)
+                    .circleCrop()
+                    .into(avatar);
+          }
+        }
+      }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    } else if (!excludeSystem) {
+      SystemProfileUtil.getSystemProfileAvatar(this, new ProfileMediaConstraints()).addListener(new ListenableFuture.Listener<byte[]>() {
+        @Override
+        public void onSuccess(byte[] result) {
+          if (result != null) {
+            avatarBytes = result;
+            GlideApp.with(CreateProfileActivity.this)
+                    .load(result)
+                    .circleCrop()
+                    .into(avatar);
+          }
+        }
+
+        @Override
+        public void onFailure(ExecutionException e) {
+          Log.w(TAG, e);
+        }
+      });
+    }
+  }
+
+  private void initializeEmojiInput() {
+    this.emojiToggle.attach(mediaKeyboard);
+
+    this.emojiToggle.setOnClickListener(v -> {
+      if (container.getCurrentInput() == mediaKeyboard) {
+        container.showSoftkey(name.getInput());
+      } else {
+        container.show(name.getInput(), mediaKeyboard);
+      }
+    });
+
+    this.mediaKeyboard.setProviders(0, new EmojiKeyboardProvider(this, new EmojiKeyboardProvider.EmojiEventListener() {
+      @Override
+      public void onKeyEvent(KeyEvent keyEvent) {
+        name.dispatchKeyEvent(keyEvent);
+      }
+
+      @Override
+      public void onEmojiSelected(String emoji) {
+        final int start = name.getInput().getSelectionStart();
+        final int end   = name.getInput().getSelectionEnd();
+
+        name.getText().replace(Math.min(start, end), Math.max(start, end), emoji);
+        name.getInput().setSelection(start + emoji.length());
+      }
+    }));
+
+    this.container.addOnKeyboardShownListener(() -> emojiToggle.setToMedia());
+    this.name.setOnClickListener(v -> container.showSoftkey(name.getInput()));
+  }
+
+  private void startAvatarSelection() {
+    captureFile = AvatarSelection.startAvatarSelection(this, avatarBytes != null, true);
+  }
+
+  private void handleUpload() {
+    final String        name;
+    final StreamDetails avatar;
+
+    if (TextUtils.isEmpty(this.name.getText().toString())) name = null;
+    else                                                   name = this.name.getText().toString();
+
+    if (avatarBytes == null || avatarBytes.length == 0) avatar = null;
+    else                                                avatar = new StreamDetails(new ByteArrayInputStream(avatarBytes),
+                                                                                   "image/jpeg", avatarBytes.length);
+
+    new AsyncTask<Void, Void, Boolean>() {
+      @Override
+      protected Boolean doInBackground(Void... params) {
+        Context                     context        = CreateProfileActivity.this;
+        byte[]                      profileKey     = ProfileKeyUtil.getProfileKey(CreateProfileActivity.this);
+        SignalServiceAccountManager accountManager = ApplicationDependencies.getSignalServiceAccountManager();
+
+        try {
+          accountManager.setProfileName(profileKey, name);
+          TextSecurePreferences.setProfileName(context, name);
+          DatabaseFactory.getRecipientDatabase(context).setProfileName(Recipient.self().getId(), name);
+        } catch (IOException e) {
+          Log.w(TAG, e);
+          return false;
+        }
+
+        try {
+          accountManager.setProfileAvatar(profileKey, avatar);
+          AvatarHelper.setAvatar(CreateProfileActivity.this, Recipient.self().getId(), avatarBytes);
+          TextSecurePreferences.setProfileAvatarId(CreateProfileActivity.this, new SecureRandom().nextInt());
+        } catch (IOException e) {
+          Log.w(TAG, e);
+          return false;
+        }
+
+        ApplicationDependencies.getJobManager().add(new MultiDeviceProfileKeyUpdateJob());
+        ApplicationDependencies.getJobManager().add(new MultiDeviceProfileContentUpdateJob());
+
+        return true;
+      }
+
+      @Override
+      public void onPostExecute(Boolean result) {
+        super.onPostExecute(result);
+
+        if (result) {
+          if (captureFile != null) captureFile.delete();
+          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) handleFinishedLollipop();
+          else                                                       handleFinishedLegacy();
+        } else        {
+          Toast.makeText(CreateProfileActivity.this, R.string.CreateProfileActivity_problem_setting_profile, Toast.LENGTH_LONG).show();
+        }
+      }
+    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+  }
+
+  private void handleFinishedLegacy() {
+    finishButton.setProgress(0);
+    if (nextIntent != null) startActivity(nextIntent);
+    finish();
+  }
+
+  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+  private void handleFinishedLollipop() {
+    int[] finishButtonLocation = new int[2];
+    int[] revealLocation       = new int[2];
+
+    finishButton.getLocationInWindow(finishButtonLocation);
+    reveal.getLocationInWindow(revealLocation);
+
+    int finishX = finishButtonLocation[0] - revealLocation[0];
+    int finishY = finishButtonLocation[1] - revealLocation[1];
+
+    finishX += finishButton.getWidth() / 2;
+    finishY += finishButton.getHeight() / 2;
+
+    Animator animation = ViewAnimationUtils.createCircularReveal(reveal, finishX, finishY, 0f, (float) Math.max(reveal.getWidth(), reveal.getHeight()));
+    animation.setDuration(500);
+    animation.addListener(new Animator.AnimatorListener() {
+      @Override
+      public void onAnimationStart(Animator animation) {}
+
+      @Override
+      public void onAnimationEnd(Animator animation) {
+        finishButton.setProgress(0);
+        if (nextIntent != null)  startActivity(nextIntent);
+        finish();
+      }
+
+      @Override
+      public void onAnimationCancel(Animator animation) {}
+      @Override
+      public void onAnimationRepeat(Animator animation) {}
+    });
+
+    reveal.setVisibility(View.VISIBLE);
+    animation.start();
+  }
+}

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

@@ -0,0 +1,195 @@
+package org.thoughtcrime.securesms;
+
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.ServiceConnection;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Message;
+import android.os.Parcelable;
+import android.view.View;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import org.thoughtcrime.securesms.database.SmsMigrator.ProgressDescription;
+import org.thoughtcrime.securesms.service.ApplicationMigrationService;
+import org.thoughtcrime.securesms.service.ApplicationMigrationService.ImportState;
+
+public class DatabaseMigrationActivity extends PassphraseRequiredActionBarActivity {
+
+  private final ImportServiceConnection serviceConnection  = new ImportServiceConnection();
+  private final ImportStateHandler      importStateHandler = new ImportStateHandler();
+  private final BroadcastReceiver       completedReceiver  = new NullReceiver();
+
+  private LinearLayout promptLayout;
+  private LinearLayout progressLayout;
+  private Button       skipButton;
+  private Button       importButton;
+  private ProgressBar  progress;
+  private TextView     progressLabel;
+
+  private ApplicationMigrationService importService;
+  private boolean isVisible = false;
+
+  @Override
+  protected void onCreate(Bundle bundle, boolean ready) {
+    setContentView(R.layout.database_migration_activity);
+
+    initializeResources();
+    initializeServiceBinding();
+  }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    isVisible = true;
+    registerForCompletedNotification();
+  }
+
+  @Override
+  public void onPause() {
+    super.onPause();
+    isVisible = false;
+    unregisterForCompletedNotification();
+  }
+
+  @Override
+  public void onDestroy() {
+    super.onDestroy();
+    shutdownServiceBinding();
+  }
+
+  @Override
+  public void onBackPressed() {
+
+  }
+
+  private void initializeServiceBinding() {
+    Intent intent = new Intent(this, ApplicationMigrationService.class);
+    bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE);
+  }
+
+  private void initializeResources() {
+    this.promptLayout   = (LinearLayout)findViewById(R.id.prompt_layout);
+    this.progressLayout = (LinearLayout)findViewById(R.id.progress_layout);
+    this.skipButton     = (Button)      findViewById(R.id.skip_button);
+    this.importButton   = (Button)      findViewById(R.id.import_button);
+    this.progress       = (ProgressBar) findViewById(R.id.import_progress);
+    this.progressLabel  = (TextView)    findViewById(R.id.import_status);
+
+    this.progressLayout.setVisibility(View.GONE);
+    this.promptLayout.setVisibility(View.GONE);
+
+    this.importButton.setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        Intent intent = new Intent(DatabaseMigrationActivity.this, ApplicationMigrationService.class);
+        intent.setAction(ApplicationMigrationService.MIGRATE_DATABASE);
+        intent.putExtra("master_secret", (Parcelable)getIntent().getParcelableExtra("master_secret"));
+        startService(intent);
+
+        promptLayout.setVisibility(View.GONE);
+        progressLayout.setVisibility(View.VISIBLE);
+      }
+    });
+
+    this.skipButton.setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        ApplicationMigrationService.setDatabaseImported(DatabaseMigrationActivity.this);
+        handleImportComplete();
+      }
+    });
+  }
+
+  private void registerForCompletedNotification() {
+    IntentFilter filter = new IntentFilter();
+    filter.addAction(ApplicationMigrationService.COMPLETED_ACTION);
+    filter.setPriority(1000);
+
+    registerReceiver(completedReceiver, filter);
+  }
+
+  private void unregisterForCompletedNotification() {
+    unregisterReceiver(completedReceiver);
+  }
+
+  private void shutdownServiceBinding() {
+    unbindService(serviceConnection);
+  }
+
+  private void handleStateIdle() {
+    this.promptLayout.setVisibility(View.VISIBLE);
+    this.progressLayout.setVisibility(View.GONE);
+  }
+
+  private void handleStateProgress(ProgressDescription update) {
+    this.promptLayout.setVisibility(View.GONE);
+    this.progressLayout.setVisibility(View.VISIBLE);
+    this.progressLabel.setText(update.primaryComplete + "/" + update.primaryTotal);
+
+    double max               = this.progress.getMax();
+    double primaryTotal      = update.primaryTotal;
+    double primaryComplete   = update.primaryComplete;
+    double secondaryTotal    = update.secondaryTotal;
+    double secondaryComplete = update.secondaryComplete;
+
+    this.progress.setProgress((int)Math.round((primaryComplete / primaryTotal) * max));
+    this.progress.setSecondaryProgress((int)Math.round((secondaryComplete / secondaryTotal) * max));
+  }
+
+  private void handleImportComplete() {
+    if (isVisible) {
+      if (getIntent().hasExtra("next_intent")) {
+        startActivity((Intent)getIntent().getParcelableExtra("next_intent"));
+      } else {
+        // TODO [greyson] Navigation
+        startActivity(new Intent(this, MainActivity.class));
+      }
+    }
+
+    finish();
+  }
+
+  private class ImportStateHandler extends Handler {
+    @Override
+    public void handleMessage(Message message) {
+      switch (message.what) {
+      case ImportState.STATE_IDLE:                   handleStateIdle();                                     break;
+      case ImportState.STATE_MIGRATING_IN_PROGRESS:  handleStateProgress((ProgressDescription)message.obj); break;
+      case ImportState.STATE_MIGRATING_COMPLETE:     handleImportComplete();                                break;
+      }
+    }
+  }
+
+  private class ImportServiceConnection implements ServiceConnection {
+    @Override
+    public void onServiceConnected(ComponentName className, IBinder service) {
+      importService  = ((ApplicationMigrationService.ApplicationMigrationBinder)service).getService();
+      importService.setImportStateHandler(importStateHandler);
+
+      ImportState state = importService.getState();
+      importStateHandler.obtainMessage(state.state, state.progress).sendToTarget();
+    }
+
+    @Override
+    public void onServiceDisconnected(ComponentName name) {
+      importService.setImportStateHandler(null);
+    }
+  }
+
+  private static class NullReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+      abortBroadcast();
+    }
+  }
+
+
+}

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

@@ -0,0 +1,251 @@
+package org.thoughtcrime.securesms;
+
+import android.Manifest;
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Vibrator;
+import android.text.TextUtils;
+import android.transition.TransitionInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Button;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+
+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.push.AccountManagerFactory;
+import org.thoughtcrime.securesms.qr.ScanListener;
+import org.thoughtcrime.securesms.util.Base64;
+import org.thoughtcrime.securesms.util.DynamicLanguage;
+import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
+import org.whispersystems.libsignal.IdentityKeyPair;
+import org.whispersystems.libsignal.InvalidKeyException;
+import org.whispersystems.libsignal.ecc.Curve;
+import org.whispersystems.libsignal.ecc.ECPublicKey;
+import org.whispersystems.libsignal.util.guava.Optional;
+import org.whispersystems.signalservice.api.SignalServiceAccountManager;
+import org.whispersystems.signalservice.api.push.exceptions.NotFoundException;
+import org.whispersystems.signalservice.internal.push.DeviceLimitExceededException;
+
+import java.io.IOException;
+
+public class DeviceActivity extends PassphraseRequiredActionBarActivity
+    implements Button.OnClickListener, ScanListener, DeviceLinkFragment.LinkClickedListener
+{
+
+  private static final String TAG = DeviceActivity.class.getSimpleName();
+
+  private final DynamicTheme    dynamicTheme    = new DynamicTheme();
+  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
+
+  private DeviceAddFragment  deviceAddFragment;
+  private DeviceListFragment deviceListFragment;
+  private DeviceLinkFragment deviceLinkFragment;
+
+  @Override
+  public void onPreCreate() {
+    dynamicTheme.onCreate(this);
+    dynamicLanguage.onCreate(this);
+  }
+
+  @Override
+  public void onCreate(Bundle bundle, boolean ready) {
+    getSupportActionBar().setHomeAsUpIndicator(ContextCompat.getDrawable(this, R.drawable.ic_arrow_left_24));
+    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+    getSupportActionBar().setTitle(R.string.AndroidManifest__linked_devices);
+    this.deviceAddFragment  = new DeviceAddFragment();
+    this.deviceListFragment = new DeviceListFragment();
+    this.deviceLinkFragment = new DeviceLinkFragment();
+
+    this.deviceListFragment.setAddDeviceButtonListener(this);
+    this.deviceAddFragment.setScanListener(this);
+
+    if (getIntent().getBooleanExtra("add", false)) {
+      initFragment(android.R.id.content, deviceAddFragment, dynamicLanguage.getCurrentLocale());
+    } else {
+      initFragment(android.R.id.content, deviceListFragment, dynamicLanguage.getCurrentLocale());
+    }
+
+    overridePendingTransition(R.anim.slide_from_end, R.anim.slide_to_start);
+  }
+
+  @Override
+  protected void onPause() {
+    if (isFinishing()) {
+      overridePendingTransition(R.anim.slide_from_start, R.anim.slide_to_end);
+    }
+    super.onPause();
+  }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    dynamicTheme.onResume(this);
+    dynamicLanguage.onResume(this);
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    switch (item.getItemId()) {
+      case android.R.id.home: finish(); return true;
+    }
+
+    return false;
+  }
+
+  @Override
+  public void onClick(View v) {
+    Permissions.with(this)
+               .request(Manifest.permission.CAMERA)
+               .ifNecessary()
+               .withPermanentDenialDialog(getString(R.string.DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code))
+               .onAllGranted(() -> {
+                 getSupportFragmentManager().beginTransaction()
+                                            .replace(android.R.id.content, deviceAddFragment)
+                                            .addToBackStack(null)
+                                            .commitAllowingStateLoss();
+               })
+               .onAnyDenied(() -> Toast.makeText(this, R.string.DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission, Toast.LENGTH_LONG).show())
+               .execute();
+  }
+
+  @Override
+  public void onQrDataFound(final String data) {
+    Util.runOnMain(() -> {
+      ((Vibrator)getSystemService(Context.VIBRATOR_SERVICE)).vibrate(50);
+      Uri uri = Uri.parse(data);
+      deviceLinkFragment.setLinkClickedListener(uri, DeviceActivity.this);
+
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        deviceAddFragment.setSharedElementReturnTransition(TransitionInflater.from(DeviceActivity.this).inflateTransition(R.transition.fragment_shared));
+        deviceAddFragment.setExitTransition(TransitionInflater.from(DeviceActivity.this).inflateTransition(android.R.transition.fade));
+
+        deviceLinkFragment.setSharedElementEnterTransition(TransitionInflater.from(DeviceActivity.this).inflateTransition(R.transition.fragment_shared));
+        deviceLinkFragment.setEnterTransition(TransitionInflater.from(DeviceActivity.this).inflateTransition(android.R.transition.fade));
+
+        getSupportFragmentManager().beginTransaction()
+                                   .addToBackStack(null)
+                                   .addSharedElement(deviceAddFragment.getDevicesImage(), "devices")
+                                   .replace(android.R.id.content, deviceLinkFragment)
+                                   .commit();
+
+      } else {
+        getSupportFragmentManager().beginTransaction()
+                                   .setCustomAnimations(R.anim.slide_from_bottom, R.anim.slide_to_bottom,
+                                                        R.anim.slide_from_bottom, R.anim.slide_to_bottom)
+                                   .replace(android.R.id.content, deviceLinkFragment)
+                                   .addToBackStack(null)
+                                   .commit();
+      }
+    });
+  }
+
+  @Override
+  public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+    Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
+  }
+
+  @SuppressLint("StaticFieldLeak")
+  @Override
+  public void onLink(final Uri uri) {
+    new ProgressDialogAsyncTask<Void, Void, Integer>(this,
+                                                     R.string.DeviceProvisioningActivity_content_progress_title,
+                                                     R.string.DeviceProvisioningActivity_content_progress_content)
+    {
+      private static final int SUCCESS        = 0;
+      private static final int NO_DEVICE      = 1;
+      private static final int NETWORK_ERROR  = 2;
+      private static final int KEY_ERROR      = 3;
+      private static final int LIMIT_EXCEEDED = 4;
+      private static final int BAD_CODE       = 5;
+
+      @Override
+      protected Integer doInBackground(Void... params) {
+        boolean isMultiDevice = TextSecurePreferences.isMultiDevice(DeviceActivity.this);
+
+        try {
+          Context                     context          = DeviceActivity.this;
+          SignalServiceAccountManager accountManager   = ApplicationDependencies.getSignalServiceAccountManager();
+          String                      verificationCode = accountManager.getNewDeviceVerificationCode();
+          String                      ephemeralId      = uri.getQueryParameter("uuid");
+          String                      publicKeyEncoded = uri.getQueryParameter("pub_key");
+
+          if (TextUtils.isEmpty(ephemeralId) || TextUtils.isEmpty(publicKeyEncoded)) {
+            Log.w(TAG, "UUID or Key is empty!");
+            return BAD_CODE;
+          }
+
+          ECPublicKey      publicKey         = Curve.decodePoint(Base64.decode(publicKeyEncoded), 0);
+          IdentityKeyPair  identityKeyPair   = IdentityKeyUtil.getIdentityKeyPair(context);
+          Optional<byte[]> profileKey        = Optional.of(ProfileKeyUtil.getProfileKey(getContext()));
+
+          TextSecurePreferences.setMultiDevice(DeviceActivity.this, true);
+          TextSecurePreferences.setIsUnidentifiedDeliveryEnabled(context, false);
+          accountManager.addDevice(ephemeralId, publicKey, identityKeyPair, profileKey, verificationCode);
+
+          return SUCCESS;
+        } catch (NotFoundException e) {
+          Log.w(TAG, e);
+          TextSecurePreferences.setMultiDevice(DeviceActivity.this, isMultiDevice);
+          return NO_DEVICE;
+        } catch (DeviceLimitExceededException e) {
+          Log.w(TAG, e);
+          TextSecurePreferences.setMultiDevice(DeviceActivity.this, isMultiDevice);
+          return LIMIT_EXCEEDED;
+        } catch (IOException e) {
+          Log.w(TAG, e);
+          TextSecurePreferences.setMultiDevice(DeviceActivity.this, isMultiDevice);
+          return NETWORK_ERROR;
+        } catch (InvalidKeyException e) {
+          Log.w(TAG, e);
+          TextSecurePreferences.setMultiDevice(DeviceActivity.this, isMultiDevice);
+          return KEY_ERROR;
+        }
+      }
+
+      @Override
+      protected void onPostExecute(Integer result) {
+        super.onPostExecute(result);
+
+        Context context = DeviceActivity.this;
+
+        switch (result) {
+          case SUCCESS:
+            Toast.makeText(context, R.string.DeviceProvisioningActivity_content_progress_success, Toast.LENGTH_SHORT).show();
+            finish();
+            return;
+          case NO_DEVICE:
+            Toast.makeText(context, R.string.DeviceProvisioningActivity_content_progress_no_device, Toast.LENGTH_LONG).show();
+            break;
+          case NETWORK_ERROR:
+            Toast.makeText(context, R.string.DeviceProvisioningActivity_content_progress_network_error, Toast.LENGTH_LONG).show();
+            break;
+          case KEY_ERROR:
+            Toast.makeText(context, R.string.DeviceProvisioningActivity_content_progress_key_error, Toast.LENGTH_LONG).show();
+            break;
+          case LIMIT_EXCEEDED:
+            Toast.makeText(context, R.string.DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already, Toast.LENGTH_LONG).show();
+            break;
+          case BAD_CODE:
+            Toast.makeText(context, R.string.DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code, Toast.LENGTH_LONG).show();
+            break;
+        }
+
+        getSupportFragmentManager().popBackStackImmediate();
+      }
+    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+  }
+}

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

@@ -0,0 +1,112 @@
+package org.thoughtcrime.securesms;
+
+import android.animation.Animator;
+import android.annotation.TargetApi;
+import android.content.res.Configuration;
+import android.os.Build;
+import android.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewAnimationUtils;
+import android.view.ViewGroup;
+import android.view.animation.DecelerateInterpolator;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+
+import org.thoughtcrime.securesms.components.camera.CameraView;
+import org.thoughtcrime.securesms.qr.ScanListener;
+import org.thoughtcrime.securesms.qr.ScanningThread;
+import org.thoughtcrime.securesms.util.ViewUtil;
+
+public class DeviceAddFragment extends Fragment {
+
+  private ViewGroup      container;
+  private LinearLayout   overlay;
+  private ImageView      devicesImage;
+  private CameraView     scannerView;
+  private ScanningThread scanningThread;
+  private ScanListener   scanListener;
+
+  @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);
+
+    if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
+      this.overlay.setOrientation(LinearLayout.HORIZONTAL);
+    } else {
+      this.overlay.setOrientation(LinearLayout.VERTICAL);
+    }
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+      this.container.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
+        @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+        @Override
+        public void onLayoutChange(View v, int left, int top, int right, int bottom,
+                                   int oldLeft, int oldTop, int oldRight, int oldBottom)
+        {
+          v.removeOnLayoutChangeListener(this);
+
+          Animator reveal = ViewAnimationUtils.createCircularReveal(v, right, bottom, 0, (int) Math.hypot(right, bottom));
+          reveal.setInterpolator(new DecelerateInterpolator(2f));
+          reveal.setDuration(800);
+          reveal.start();
+        }
+      });
+    }
+
+    return this.container;
+  }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    this.scanningThread = new ScanningThread();
+    this.scanningThread.setScanListener(scanListener);
+    this.scannerView.onResume();
+    this.scannerView.setPreviewCallback(scanningThread);
+    this.scanningThread.start();
+  }
+
+  @Override
+  public void onPause() {
+    super.onPause();
+    this.scannerView.onPause();
+    this.scanningThread.stopScanning();
+  }
+
+  @Override
+  public void onConfigurationChanged(Configuration newConfiguration) {
+    super.onConfigurationChanged(newConfiguration);
+
+    this.scannerView.onPause();
+
+    if (newConfiguration.orientation == Configuration.ORIENTATION_LANDSCAPE) {
+      overlay.setOrientation(LinearLayout.HORIZONTAL);
+    } else {
+      overlay.setOrientation(LinearLayout.VERTICAL);
+    }
+
+    this.scannerView.onResume();
+    this.scannerView.setPreviewCallback(scanningThread);
+  }
+
+
+  public ImageView getDevicesImage() {
+    return devicesImage;
+  }
+
+  public void setScanListener(ScanListener scanListener) {
+    this.scanListener = scanListener;
+
+    if (this.scanningThread != null) {
+      this.scanningThread.setScanListener(scanListener);
+    }
+  }
+
+
+}

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

@@ -0,0 +1,58 @@
+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;
+
+public class DeviceLinkFragment extends Fragment implements View.OnClickListener {
+
+  private LinearLayout        container;
+  private LinkClickedListener linkClickedListener;
+  private Uri                 uri;
+
+  @Override
+  public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup viewGroup, Bundle bundle) {
+    this.container = (LinearLayout) inflater.inflate(R.layout.device_link_fragment, container, false);
+    this.container.findViewById(R.id.link_device).setOnClickListener(this);
+
+    if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
+      container.setOrientation(LinearLayout.HORIZONTAL);
+    } else {
+      container.setOrientation(LinearLayout.VERTICAL);
+    }
+
+    return this.container;
+  }
+
+  @Override
+  public void onConfigurationChanged(Configuration newConfiguration) {
+    super.onConfigurationChanged(newConfiguration);
+    if (newConfiguration.orientation == Configuration.ORIENTATION_LANDSCAPE) {
+      container.setOrientation(LinearLayout.HORIZONTAL);
+    } else {
+      container.setOrientation(LinearLayout.VERTICAL);
+    }
+  }
+
+  public void setLinkClickedListener(Uri uri, LinkClickedListener linkClickedListener) {
+    this.uri                 = uri;
+    this.linkClickedListener = linkClickedListener;
+  }
+
+  @Override
+  public void onClick(View v) {
+    if (linkClickedListener != null) {
+      linkClickedListener.onLink(uri);
+    }
+  }
+
+  public interface LinkClickedListener {
+    void onLink(Uri uri);
+  }
+}

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

@@ -0,0 +1,217 @@
+package org.thoughtcrime.securesms;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+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;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.ListView;
+import android.widget.Toast;
+
+import com.melnykov.fab.FloatingActionButton;
+
+import org.thoughtcrime.securesms.database.loaders.DeviceListLoader;
+import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.ViewUtil;
+import org.whispersystems.signalservice.api.SignalServiceAccountManager;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Locale;
+
+public class DeviceListFragment extends ListFragment
+    implements LoaderManager.LoaderCallbacks<List<Device>>,
+               ListView.OnItemClickListener, Button.OnClickListener
+{
+
+  private static final String TAG = DeviceListFragment.class.getSimpleName();
+
+  private SignalServiceAccountManager accountManager;
+  private Locale                      locale;
+  private View                        empty;
+  private View                        progressContainer;
+  private FloatingActionButton        addDeviceButton;
+  private Button.OnClickListener      addDeviceButtonListener;
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    this.locale = (Locale) getArguments().getSerializable(PassphraseRequiredActionBarActivity.LOCALE_EXTRA);
+  }
+
+  @Override
+  public void onAttach(Activity activity) {
+    super.onAttach(activity);
+    this.accountManager = ApplicationDependencies.getSignalServiceAccountManager();
+  }
+
+  @Override
+  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
+    View view = inflater.inflate(R.layout.device_list_fragment, container, false);
+
+    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.setOnClickListener(this);
+
+    return view;
+  }
+
+  @Override
+  public void onActivityCreated(Bundle bundle) {
+    super.onActivityCreated(bundle);
+    getLoaderManager().initLoader(0, null, this);
+    getListView().setOnItemClickListener(this);
+  }
+
+  public void setAddDeviceButtonListener(Button.OnClickListener listener) {
+    this.addDeviceButtonListener = listener;
+  }
+
+  @Override
+  public @NonNull Loader<List<Device>> onCreateLoader(int id, Bundle args) {
+    empty.setVisibility(View.GONE);
+    progressContainer.setVisibility(View.VISIBLE);
+
+    return new DeviceListLoader(getActivity(), accountManager);
+  }
+
+  @Override
+  public void onLoadFinished(@NonNull Loader<List<Device>> loader, List<Device> data) {
+    progressContainer.setVisibility(View.GONE);
+
+    if (data == null) {
+      handleLoaderFailed();
+      return;
+    }
+
+    setListAdapter(new DeviceListAdapter(getActivity(), R.layout.device_list_item_view, data, locale));
+
+    if (data.isEmpty()) {
+      empty.setVisibility(View.VISIBLE);
+      TextSecurePreferences.setMultiDevice(getActivity(), false);
+    } else {
+      empty.setVisibility(View.GONE);
+    }
+  }
+
+  @Override
+  public void onLoaderReset(@NonNull Loader<List<Device>> loader) {
+    setListAdapter(null);
+  }
+
+  @Override
+  public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+    final String deviceName = ((DeviceListItem)view).getDeviceName();
+    final long   deviceId   = ((DeviceListItem)view).getDeviceId();
+
+    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+    builder.setTitle(getActivity().getString(R.string.DeviceListActivity_unlink_s, deviceName));
+    builder.setMessage(R.string.DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive);
+    builder.setNegativeButton(android.R.string.cancel, null);
+    builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+      @Override
+      public void onClick(DialogInterface dialog, int which) {
+        handleDisconnectDevice(deviceId);
+      }
+    });
+    builder.show();
+  }
+
+  private void handleLoaderFailed() {
+    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+    builder.setMessage(R.string.DeviceListActivity_network_connection_failed);
+    builder.setPositiveButton(R.string.DeviceListActivity_try_again,
+                              new DialogInterface.OnClickListener() {
+      @Override
+      public void onClick(DialogInterface dialog, int which) {
+        getLoaderManager().restartLoader(0, null, DeviceListFragment.this);
+      }
+    });
+
+    builder.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
+      @Override
+      public void onClick(DialogInterface dialog, int which) {
+        DeviceListFragment.this.getActivity().onBackPressed();
+      }
+    });
+    builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
+      @Override
+      public void onCancel(DialogInterface dialog) {
+        DeviceListFragment.this.getActivity().onBackPressed();
+      }
+    });
+
+    builder.show();
+  }
+
+  @SuppressLint("StaticFieldLeak")
+  private void handleDisconnectDevice(final long deviceId) {
+    new ProgressDialogAsyncTask<Void, Void, Void>(getActivity(),
+                                                  R.string.DeviceListActivity_unlinking_device_no_ellipsis,
+                                                  R.string.DeviceListActivity_unlinking_device)
+    {
+      @Override
+      protected Void doInBackground(Void... params) {
+        try {
+          accountManager.removeDevice(deviceId);
+        } catch (IOException e) {
+          Log.w(TAG, e);
+          Toast.makeText(getActivity(), R.string.DeviceListActivity_network_failed, Toast.LENGTH_LONG).show();
+        }
+        return null;
+      }
+
+      @Override
+      protected void onPostExecute(Void result) {
+        super.onPostExecute(result);
+        getLoaderManager().restartLoader(0, null, DeviceListFragment.this);
+      }
+    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+  }
+
+  @Override
+  public void onClick(View v) {
+    if (addDeviceButtonListener != null) addDeviceButtonListener.onClick(v);
+  }
+
+  private static class DeviceListAdapter extends ArrayAdapter<Device> {
+
+    private final int    resource;
+    private final Locale locale;
+
+    public DeviceListAdapter(Context context, int resource, List<Device> objects, Locale locale) {
+      super(context, resource, objects);
+      this.resource = resource;
+      this.locale = locale;
+    }
+
+    @Override
+    public @NonNull View getView(int position, View convertView, @NonNull ViewGroup parent) {
+      if (convertView == null) {
+        convertView = ((Activity)getContext()).getLayoutInflater().inflate(resource, parent, false);
+      }
+
+      ((DeviceListItem)convertView).set(getItem(position), locale);
+
+      return convertView;
+    }
+  }
+}

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

@@ -0,0 +1,62 @@
+package org.thoughtcrime.securesms;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import org.thoughtcrime.securesms.devicelist.Device;
+import org.thoughtcrime.securesms.util.DateUtils;
+
+import java.util.Locale;
+
+public class DeviceListItem extends LinearLayout {
+
+  private long     deviceId;
+  private TextView name;
+  private TextView created;
+  private TextView lastActive;
+
+  public DeviceListItem(Context context) {
+    super(context);
+  }
+
+  public DeviceListItem(Context context, AttributeSet attrs) {
+    super(context, attrs);
+  }
+
+  @Override
+  public void onFinishInflate() {
+    super.onFinishInflate();
+    this.name       = (TextView) findViewById(R.id.name);
+    this.created    = (TextView) findViewById(R.id.created);
+    this.lastActive = (TextView) findViewById(R.id.active);
+  }
+
+  public void set(Device deviceInfo, Locale locale) {
+    if (TextUtils.isEmpty(deviceInfo.getName())) this.name.setText(R.string.DeviceListItem_unnamed_device);
+    else                                         this.name.setText(deviceInfo.getName());
+
+    this.created.setText(getContext().getString(R.string.DeviceListItem_linked_s,
+                                                DateUtils.getDayPrecisionTimeSpanString(getContext(),
+                                                                                        locale,
+                                                                                        deviceInfo.getCreated())));
+
+    this.lastActive.setText(getContext().getString(R.string.DeviceListItem_last_active_s,
+                                                   DateUtils.getDayPrecisionTimeSpanString(getContext(),
+                                                                                           locale,
+                                                                                           deviceInfo.getLastSeen())));
+
+    this.deviceId = deviceInfo.getId();
+  }
+
+  public long getDeviceId() {
+    return deviceId;
+  }
+
+  public String getDeviceName() {
+    return name.getText().toString();
+  }
+
+}

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

@@ -0,0 +1,42 @@
+package org.thoughtcrime.securesms;
+
+import android.content.Intent;
+import android.os.Bundle;
+import androidx.appcompat.app.AlertDialog;
+import android.view.Window;
+
+public class DeviceProvisioningActivity extends PassphraseRequiredActionBarActivity {
+
+  @SuppressWarnings("unused")
+  private static final String TAG = DeviceProvisioningActivity.class.getSimpleName();
+
+  @Override
+  protected void onPreCreate() {
+    supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
+  }
+
+  @Override
+  protected void onCreate(Bundle bundle, boolean ready) {
+    assert  getSupportActionBar() != null;
+    getSupportActionBar().hide();
+
+    AlertDialog dialog = new AlertDialog.Builder(this)
+        .setTitle(getString(R.string.DeviceProvisioningActivity_link_a_signal_device))
+        .setMessage(getString(R.string.DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner))
+        .setPositiveButton(R.string.DeviceProvisioningActivity_continue, (dialog1, which) -> {
+          Intent intent = new Intent(DeviceProvisioningActivity.this, DeviceActivity.class);
+          intent.putExtra("add", true);
+          startActivity(intent);
+          finish();
+        })
+        .setNegativeButton(R.string.DeviceProvisioningActivity_cancel, (dialog12, which) -> {
+          dialog12.dismiss();
+          finish();
+        })
+        .setOnDismissListener(dialog13 -> finish())
+        .create();
+
+    dialog.setIcon(getResources().getDrawable(R.drawable.icon_dialog));
+    dialog.show();
+  }
+}

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

@@ -0,0 +1,16 @@
+package org.thoughtcrime.securesms;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+/**
+ * Workaround for Android bug:
+ * https://code.google.com/p/android/issues/detail?id=53313
+ */
+public class DummyActivity extends Activity {
+  @Override
+  public void onCreate(Bundle bundle) {
+    super.onCreate(bundle);
+    finish();
+  }
+}

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

@@ -0,0 +1,322 @@
+package org.thoughtcrime.securesms;
+
+import android.app.Notification;
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.core.app.NotificationCompat;
+import androidx.viewpager.widget.ViewPager;
+import android.view.View;
+
+import com.melnykov.fab.FloatingActionButton;
+import com.nineoldandroids.animation.ArgbEvaluator;
+
+import org.thoughtcrime.securesms.IntroPagerAdapter.IntroPage;
+import org.thoughtcrime.securesms.database.model.Sticker;
+import org.thoughtcrime.securesms.experienceupgrades.StickersIntroFragment;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.notifications.NotificationChannels;
+import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
+import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.ServiceUtil;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.util.ViewUtil;
+import org.whispersystems.libsignal.util.guava.Optional;
+
+import java.util.Collections;
+import java.util.List;
+
+public class ExperienceUpgradeActivity extends BaseActionBarActivity
+                                       implements TypingIndicatorIntroFragment.Controller,
+                                                  LinkPreviewsIntroFragment.Controller,
+                                                  StickersIntroFragment.Controller
+{
+  private static final String TAG             = ExperienceUpgradeActivity.class.getSimpleName();
+  private static final String DISMISS_ACTION  = "org.thoughtcrime.securesms.ExperienceUpgradeActivity.DISMISS_ACTION";
+  private static final int    NOTIFICATION_ID = 1339;
+
+  private final DynamicTheme dynamicTheme = new DynamicNoActionBarTheme();
+
+  private enum ExperienceUpgrade {
+    SIGNAL_REBRANDING(157,
+                      new IntroPage(0xFF2090EA,
+                                    BasicIntroFragment.newInstance(R.drawable.splash_logo,
+                                                                   R.string.ExperienceUpgradeActivity_welcome_to_signal_dgaf,
+                                                                   R.string.ExperienceUpgradeActivity_textsecure_is_now_called_signal)),
+                      R.string.ExperienceUpgradeActivity_welcome_to_signal_excited,
+                      R.string.ExperienceUpgradeActivity_textsecure_is_now_signal,
+                      R.string.ExperienceUpgradeActivity_textsecure_is_now_signal_long,
+                      null,
+                      false),
+    VIDEO_CALLS(245,
+                      new IntroPage(0xFF2090EA,
+                                    BasicIntroFragment.newInstance(R.drawable.video_splash,
+                                                                   R.string.ExperienceUpgradeActivity_say_hello_to_video_calls,
+                                                                   R.string.ExperienceUpgradeActivity_signal_now_supports_secure_video_calls)),
+                      R.string.ExperienceUpgradeActivity_say_hello_to_video_calls,
+                      R.string.ExperienceUpgradeActivity_signal_now_supports_secure_video_calling,
+                      R.string.ExperienceUpgradeActivity_signal_now_supports_secure_video_calling_long,
+                null,
+                false),
+    PROFILES(286,
+                 new IntroPage(0xFF2090EA,
+                               BasicIntroFragment.newInstance(R.drawable.profile_splash,
+                                                              R.string.ExperienceUpgradeActivity_ready_for_your_closeup,
+                                                              R.string.ExperienceUpgradeActivity_now_you_can_share_a_profile_photo_and_name_with_friends_on_signal)),
+             R.string.ExperienceUpgradeActivity_signal_profiles_are_here,
+             R.string.ExperienceUpgradeActivity_now_you_can_share_a_profile_photo_and_name_with_friends_on_signal,
+             R.string.ExperienceUpgradeActivity_now_you_can_share_a_profile_photo_and_name_with_friends_on_signal,
+             CreateProfileActivity.class,
+             false),
+    READ_RECEIPTS(299,
+                  new IntroPage(0xFF2090EA,
+                                ReadReceiptsIntroFragment.newInstance()),
+                  R.string.experience_upgrade_preference_fragment__read_receipts_are_here,
+                  R.string.experience_upgrade_preference_fragment__optionally_see_and_share_when_messages_have_been_read,
+                  R.string.experience_upgrade_preference_fragment__optionally_see_and_share_when_messages_have_been_read,
+                  null,
+                  false),
+    TYPING_INDICATORS(432,
+                      new IntroPage(0xFF2090EA,
+                                    TypingIndicatorIntroFragment.newInstance()),
+                      R.string.ExperienceUpgradeActivity_introducing_typing_indicators,
+                      R.string.ExperienceUpgradeActivity_now_you_can_optionally_see_and_share_when_messages_are_being_typed,
+                      R.string.ExperienceUpgradeActivity_now_you_can_optionally_see_and_share_when_messages_are_being_typed,
+                      null,
+                      true),
+    LINK_PREVIEWS(449,
+                  new IntroPage(0xFF2090EA, LinkPreviewsIntroFragment.newInstance()),
+                  R.string.ExperienceUpgradeActivity_introducing_link_previews,
+                  R.string.ExperienceUpgradeActivity_optional_link_previews_are_now_supported,
+                  R.string.ExperienceUpgradeActivity_optional_link_previews_are_now_supported,
+                  null,
+                  true),
+    STICKERS(580,
+             new IntroPage(0xFF2090EA, StickersIntroFragment.newInstance()),
+             R.string.ExperienceUpgradeActivity_introducing_stickers,
+             R.string.ExperienceUpgradeActivity_why_use_words_when_you_can_use_stickers,
+             R.string.ExperienceUpgradeActivity_why_use_words_when_you_can_use_stickers,
+             null,
+             true);
+
+    private            int             version;
+    private            List<IntroPage> pages;
+    private @StringRes int             notificationTitle;
+    private @StringRes int             notificationText;
+    private @StringRes int             notificationBigText;
+    private @Nullable  Class           nextIntent;
+    private            boolean         handlesNavigation;
+
+    ExperienceUpgrade(int version,
+                      @NonNull List<IntroPage> pages,
+                      @StringRes int notificationTitle,
+                      @StringRes int notificationText,
+                      @StringRes int notificationBigText,
+                      @Nullable  Class nextIntent,
+                      boolean handlesNavigation)
+    {
+      this.version             = version;
+      this.pages               = pages;
+      this.notificationTitle   = notificationTitle;
+      this.notificationText    = notificationText;
+      this.notificationBigText = notificationBigText;
+      this.nextIntent          = nextIntent;
+      this.handlesNavigation = handlesNavigation;
+    }
+
+    ExperienceUpgrade(int version,
+                      @NonNull IntroPage page,
+                      @StringRes int notificationTitle,
+                      @StringRes int notificationText,
+                      @StringRes int notificationBigText,
+                      @Nullable Class nextIntent,
+                      boolean handlesNavigation)
+    {
+      this(version, Collections.singletonList(page), notificationTitle, notificationText, notificationBigText, nextIntent, handlesNavigation);
+    }
+
+    public int getVersion() {
+      return version;
+    }
+
+    public List<IntroPage> getPages() {
+      return pages;
+    }
+
+    public IntroPage getPage(int i) {
+      return pages.get(i);
+    }
+
+    public int getNotificationTitle() {
+      return notificationTitle;
+    }
+
+    public int getNotificationText() {
+      return notificationText;
+    }
+
+    public int getNotificationBigText() {
+      return notificationBigText;
+    }
+
+    public boolean handlesNavigation() {
+      return handlesNavigation;
+    }
+  }
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    dynamicTheme.onCreate(this);
+
+    final Optional<ExperienceUpgrade> upgrade = getExperienceUpgrade(this);
+    if (!upgrade.isPresent()) {
+      onContinue(upgrade);
+      return;
+    }
+
+    setContentView(R.layout.experience_upgrade_activity);
+    final ViewPager            pager = ViewUtil.findById(this, R.id.pager);
+    final FloatingActionButton fab   = ViewUtil.findById(this, R.id.fab);
+
+    pager.setAdapter(new IntroPagerAdapter(getSupportFragmentManager(), upgrade.get().getPages()));
+
+    if (upgrade.get().handlesNavigation()) {
+      fab.setVisibility(View.GONE);
+    } else {
+      fab.setVisibility(View.VISIBLE);
+      fab.setOnClickListener(v -> onContinue(upgrade));
+    }
+
+    getWindow().setBackgroundDrawable(new ColorDrawable(upgrade.get().getPage(0).backgroundColor));
+    ServiceUtil.getNotificationManager(this).cancel(NOTIFICATION_ID);
+  }
+
+  @Override
+  protected void onResume() {
+    super.onResume();
+    dynamicTheme.onResume(this);
+  }
+
+  private void onContinue(Optional<ExperienceUpgrade> seenUpgrade) {
+    ServiceUtil.getNotificationManager(this).cancel(NOTIFICATION_ID);
+    int latestVersion = seenUpgrade.isPresent() ? seenUpgrade.get().getVersion()
+                                                : Util.getCanonicalVersionCode();
+    TextSecurePreferences.setLastExperienceVersionCode(this, latestVersion);
+    if (seenUpgrade.isPresent() && seenUpgrade.get().nextIntent != null) {
+      Intent intent     = new Intent(this, seenUpgrade.get().nextIntent);
+      // TODO [greyson] Navigation
+      Intent nextIntent = new Intent(this, MainActivity.class);
+      intent.putExtra("next_intent", nextIntent);
+      startActivity(intent);
+    } else {
+      startActivity(getIntent().getParcelableExtra("next_intent"));
+    }
+
+    finish();
+  }
+
+  public static boolean isUpdate(Context context) {
+    return getExperienceUpgrade(context).isPresent();
+  }
+
+  public static Optional<ExperienceUpgrade> getExperienceUpgrade(Context context) {
+    final int currentVersionCode = Util.getCanonicalVersionCode();
+    final int lastSeenVersion    = TextSecurePreferences.getLastExperienceVersionCode(context);
+    Log.i(TAG, "getExperienceUpgrade(" + lastSeenVersion + ")");
+
+    if (lastSeenVersion >= currentVersionCode) {
+      TextSecurePreferences.setLastExperienceVersionCode(context, currentVersionCode);
+      return Optional.absent();
+    }
+
+    Optional<ExperienceUpgrade> eligibleUpgrade = Optional.absent();
+    for (ExperienceUpgrade upgrade : ExperienceUpgrade.values()) {
+      if (lastSeenVersion < upgrade.getVersion()) eligibleUpgrade = Optional.of(upgrade);
+    }
+
+    return eligibleUpgrade;
+  }
+
+  @Override
+  public void onTypingIndicatorsFinished() {
+    onContinue(Optional.of(ExperienceUpgrade.TYPING_INDICATORS));
+  }
+
+  @Override
+  public void onLinkPreviewsFinished() {
+    onContinue(Optional.of(ExperienceUpgrade.LINK_PREVIEWS));
+  }
+
+  @Override
+  public void onStickersFinished() {
+    onContinue(Optional.of(ExperienceUpgrade.STICKERS));
+  }
+
+  public static class AppUpgradeReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+      if (Intent.ACTION_MY_PACKAGE_REPLACED.equals(intent.getAction()) &&
+          intent.getData().getSchemeSpecificPart().equals(context.getPackageName()))
+      {
+        if (TextSecurePreferences.getLastExperienceVersionCode(context) < 339 &&
+            !TextSecurePreferences.isPasswordDisabled(context))
+        {
+          Notification notification = new NotificationCompat.Builder(context, NotificationChannels.OTHER)
+              .setSmallIcon(R.drawable.icon_notification)
+              .setColor(context.getResources().getColor(R.color.signal_primary))
+              .setContentTitle(context.getString(R.string.ExperienceUpgradeActivity_unlock_to_complete_update))
+              .setContentText(context.getString(R.string.ExperienceUpgradeActivity_please_unlock_signal_to_complete_update))
+              .setStyle(new NotificationCompat.BigTextStyle().bigText(context.getString(R.string.ExperienceUpgradeActivity_please_unlock_signal_to_complete_update)))
+              .setAutoCancel(true)
+              .setContentIntent(PendingIntent.getActivity(context, 0,
+                                                          context.getPackageManager().getLaunchIntentForPackage(context.getPackageName()),
+                                                          PendingIntent.FLAG_UPDATE_CURRENT))
+              .build();
+
+          ServiceUtil.getNotificationManager(context).notify(NOTIFICATION_ID, notification);
+        }
+
+        Optional<ExperienceUpgrade> experienceUpgrade = getExperienceUpgrade(context);
+
+        if (!experienceUpgrade.isPresent()) {
+          return;
+        }
+
+        if (experienceUpgrade.get().getVersion() == TextSecurePreferences.getExperienceDismissedVersionCode(context)) {
+          return;
+        }
+
+        Intent targetIntent  = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
+        Intent dismissIntent = new Intent(context, AppUpgradeReceiver.class);
+        dismissIntent.setAction(DISMISS_ACTION);
+
+        Notification notification = new NotificationCompat.Builder(context, NotificationChannels.OTHER)
+                                        .setSmallIcon(R.drawable.icon_notification)
+                                        .setColor(context.getResources().getColor(R.color.signal_primary))
+                                        .setContentTitle(context.getString(experienceUpgrade.get().getNotificationTitle()))
+                                        .setContentText(context.getString(experienceUpgrade.get().getNotificationText()))
+                                        .setStyle(new NotificationCompat.BigTextStyle().bigText(context.getString(experienceUpgrade.get().getNotificationBigText())))
+                                        .setAutoCancel(true)
+                                        .setContentIntent(PendingIntent.getActivity(context, 0,
+                                                                                    targetIntent,
+                                                                                    PendingIntent.FLAG_UPDATE_CURRENT))
+
+                                        .setDeleteIntent(PendingIntent.getBroadcast(context, 0,
+                                                                                    dismissIntent,
+                                                                                    PendingIntent.FLAG_UPDATE_CURRENT))
+                                        .build();
+        ServiceUtil.getNotificationManager(context).notify(NOTIFICATION_ID, notification);
+      } else if (DISMISS_ACTION.equals(intent.getAction())) {
+        TextSecurePreferences.setExperienceDismissedVersionCode(context, Util.getCanonicalVersionCode());
+      }
+    }
+  }
+}

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

@@ -0,0 +1,87 @@
+package org.thoughtcrime.securesms;
+
+import android.content.Context;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+
+import org.thoughtcrime.securesms.util.ExpirationUtil;
+
+import cn.carbswang.android.numberpickerview.library.NumberPickerView;
+
+public class ExpirationDialog extends AlertDialog {
+
+  protected ExpirationDialog(Context context) {
+    super(context);
+  }
+
+  protected ExpirationDialog(Context context, int theme) {
+    super(context, theme);
+  }
+
+  protected ExpirationDialog(Context context, boolean cancelable, OnCancelListener cancelListener) {
+    super(context, cancelable, cancelListener);
+  }
+
+  public static void show(final Context context,
+                          final int currentExpiration,
+                          final @NonNull OnClickListener listener)
+  {
+    final View view = createNumberPickerView(context, currentExpiration);
+
+    AlertDialog.Builder builder = new AlertDialog.Builder(context);
+    builder.setTitle(context.getString(R.string.ExpirationDialog_disappearing_messages));
+    builder.setView(view);
+    builder.setPositiveButton(android.R.string.ok, (dialog, which) -> {
+      int selected = ((NumberPickerView)view.findViewById(R.id.expiration_number_picker)).getValue();
+      listener.onClick(context.getResources().getIntArray(R.array.expiration_times)[selected]);
+    });
+    builder.setNegativeButton(android.R.string.cancel, null);
+    builder.show();
+  }
+
+  private static View createNumberPickerView(final Context context, final int currentExpiration) {
+    final LayoutInflater   inflater                = LayoutInflater.from(context);
+    final View             view                    = inflater.inflate(R.layout.expiration_dialog, null);
+    final NumberPickerView numberPickerView        = view.findViewById(R.id.expiration_number_picker);
+    final TextView         textView                = view.findViewById(R.id.expiration_details);
+    final int[]            expirationTimes         = context.getResources().getIntArray(R.array.expiration_times);
+    final String[]         expirationDisplayValues = new String[expirationTimes.length];
+
+    int selectedIndex = expirationTimes.length - 1;
+
+    for (int i=0;i<expirationTimes.length;i++) {
+      expirationDisplayValues[i] = ExpirationUtil.getExpirationDisplayValue(context, expirationTimes[i]);
+
+      if ((currentExpiration >= expirationTimes[i]) &&
+          (i == expirationTimes.length -1 || currentExpiration < expirationTimes[i+1])) {
+        selectedIndex = i;
+      }
+    }
+
+    numberPickerView.setDisplayedValues(expirationDisplayValues);
+    numberPickerView.setMinValue(0);
+    numberPickerView.setMaxValue(expirationTimes.length-1);
+
+    NumberPickerView.OnValueChangeListener listener = (picker, oldVal, newVal) -> {
+      if (newVal == 0) {
+        textView.setText(R.string.ExpirationDialog_your_messages_will_not_expire);
+      } else {
+        textView.setText(context.getString(R.string.ExpirationDialog_your_messages_will_disappear_s_after_they_have_been_seen, picker.getDisplayedValues()[newVal]));
+      }
+    };
+
+    numberPickerView.setOnValueChangedListener(listener);
+    numberPickerView.setValue(selectedIndex);
+    listener.onValueChange(numberPickerView, selectedIndex, selectedIndex);
+
+    return view;
+  }
+
+  public interface OnClickListener {
+    public void onClick(int expirationTime);
+  }
+
+}

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

@@ -0,0 +1,601 @@
+/*
+ * Copyright (C) 2014 Open Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.thoughtcrime.securesms;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import android.text.TextUtils;
+
+import org.thoughtcrime.securesms.avatar.AvatarSelection;
+import org.thoughtcrime.securesms.conversation.ConversationActivity;
+import org.thoughtcrime.securesms.logging.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.request.target.SimpleTarget;
+import com.bumptech.glide.request.transition.Transition;
+
+import org.thoughtcrime.securesms.components.PushRecipientsPanel;
+import org.thoughtcrime.securesms.components.PushRecipientsPanel.RecipientsPanelChangedListener;
+import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
+import org.thoughtcrime.securesms.contacts.RecipientsEditor;
+import org.thoughtcrime.securesms.contacts.avatars.ContactColors;
+import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.GroupDatabase;
+import org.thoughtcrime.securesms.database.GroupDatabase.GroupRecord;
+import org.thoughtcrime.securesms.database.RecipientDatabase;
+import org.thoughtcrime.securesms.database.ThreadDatabase;
+import org.thoughtcrime.securesms.groups.GroupManager;
+import org.thoughtcrime.securesms.groups.GroupManager.GroupActionResult;
+import org.thoughtcrime.securesms.mms.GlideApp;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.util.BitmapUtil;
+import org.thoughtcrime.securesms.util.DynamicLanguage;
+import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.SelectedRecipientsAdapter;
+import org.thoughtcrime.securesms.util.SelectedRecipientsAdapter.OnRecipientDeletedListener;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.ViewUtil;
+import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
+import org.whispersystems.libsignal.util.guava.Optional;
+import org.whispersystems.signalservice.api.util.InvalidNumberException;
+
+import java.io.File;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Activity to create and update groups
+ *
+ * @author Jake McGinty
+ */
+public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
+                                 implements OnRecipientDeletedListener,
+                                            RecipientsPanelChangedListener
+{
+
+  private final static String TAG = GroupCreateActivity.class.getSimpleName();
+
+  public static final String GROUP_ID_EXTRA      = "group_id";
+  public static final String GROUP_THREAD_EXTRA  = "group_thread";
+
+  private final DynamicTheme    dynamicTheme    = new DynamicTheme();
+  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
+
+  private static final int PICK_CONTACT = 1;
+  public static final  int AVATAR_SIZE  = 210;
+
+  private EditText     groupName;
+  private ListView     lv;
+  private ImageView    avatar;
+  private TextView     creatingText;
+  private Bitmap       avatarBmp;
+
+  @NonNull private Optional<GroupData> groupToUpdate = Optional.absent();
+
+  @Override
+  protected void onPreCreate() {
+    dynamicTheme.onCreate(this);
+    dynamicLanguage.onCreate(this);
+  }
+
+  @Override
+  protected void onCreate(Bundle state, boolean ready) {
+    setContentView(R.layout.group_create_activity);
+    //noinspection ConstantConditions
+    initializeAppBar();
+    initializeResources();
+    initializeExistingGroup();
+  }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    dynamicTheme.onResume(this);
+    dynamicLanguage.onResume(this);
+    updateViewState();
+  }
+
+  private boolean isSignalGroup() {
+    return TextSecurePreferences.isPushRegistered(this) && !getAdapter().hasNonPushMembers();
+  }
+
+  private void disableSignalGroupViews(int reasonResId) {
+    View pushDisabled = findViewById(R.id.push_disabled);
+    pushDisabled.setVisibility(View.VISIBLE);
+    ((TextView) findViewById(R.id.push_disabled_reason)).setText(reasonResId);
+    avatar.setEnabled(false);
+    groupName.setEnabled(false);
+  }
+
+  private void enableSignalGroupViews() {
+    findViewById(R.id.push_disabled).setVisibility(View.GONE);
+    avatar.setEnabled(true);
+    groupName.setEnabled(true);
+  }
+
+  @SuppressWarnings("ConstantConditions")
+  private void updateViewState() {
+    if (!TextSecurePreferences.isPushRegistered(this)) {
+      disableSignalGroupViews(R.string.GroupCreateActivity_youre_not_registered_for_signal);
+      getSupportActionBar().setTitle(R.string.GroupCreateActivity_actionbar_mms_title);
+    } else if (getAdapter().hasNonPushMembers()) {
+      disableSignalGroupViews(R.string.GroupCreateActivity_contacts_dont_support_push);
+      getSupportActionBar().setTitle(R.string.GroupCreateActivity_actionbar_mms_title);
+    } else {
+      enableSignalGroupViews();
+      getSupportActionBar().setTitle(groupToUpdate.isPresent()
+                                     ? R.string.GroupCreateActivity_actionbar_edit_title
+                                     : R.string.GroupCreateActivity_actionbar_title);
+    }
+  }
+
+  private static boolean isActiveInDirectory(Recipient recipient) {
+    return recipient.resolve().getRegistered() == RecipientDatabase.RegisteredState.REGISTERED;
+  }
+
+  private void addSelectedContacts(@NonNull Recipient... recipients) {
+    new AddMembersTask(this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, recipients);
+  }
+
+  private void addSelectedContacts(@NonNull Collection<Recipient> recipients) {
+    addSelectedContacts(recipients.toArray(new Recipient[recipients.size()]));
+  }
+
+  private void initializeAppBar() {
+    Drawable upIcon = ContextCompat.getDrawable(this, R.drawable.ic_arrow_left_24);
+    getSupportActionBar().setHomeAsUpIndicator(upIcon);
+    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+  }
+
+  private void initializeResources() {
+    RecipientsEditor    recipientsEditor = ViewUtil.findById(this, R.id.recipients_text);
+    PushRecipientsPanel recipientsPanel  = ViewUtil.findById(this, R.id.recipients);
+    lv           = ViewUtil.findById(this, R.id.selected_contacts_list);
+    avatar       = ViewUtil.findById(this, R.id.avatar);
+    groupName    = ViewUtil.findById(this, R.id.group_name);
+    creatingText = ViewUtil.findById(this, R.id.creating_group_text);
+    SelectedRecipientsAdapter adapter = new SelectedRecipientsAdapter(this);
+    adapter.setOnRecipientDeletedListener(this);
+    lv.setAdapter(adapter);
+    recipientsEditor.setHint(R.string.recipients_panel__add_members);
+    recipientsPanel.setPanelChangeListener(this);
+    findViewById(R.id.contacts_button).setOnClickListener(new AddRecipientButtonListener());
+    avatar.setImageDrawable(new ResourceContactPhoto(R.drawable.ic_group_outline_40, R.drawable.ic_group_outline_20).asDrawable(this, ContactColors.UNKNOWN_COLOR.toConversationColor(this)));
+    avatar.setOnClickListener(view -> AvatarSelection.startAvatarSelection(this, false, false));
+  }
+
+  private void initializeExistingGroup() {
+    final String groupId = getIntent().getStringExtra(GROUP_ID_EXTRA);
+
+    if (groupId != null) {
+      new FillExistingGroupInfoAsyncTask(this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, groupId);
+    }
+  }
+
+  @Override
+  public boolean onPrepareOptionsMenu(Menu menu) {
+    MenuInflater inflater = this.getMenuInflater();
+    menu.clear();
+
+    inflater.inflate(R.menu.group_create, menu);
+    super.onPrepareOptionsMenu(menu);
+    return true;
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    super.onOptionsItemSelected(item);
+    switch (item.getItemId()) {
+      case android.R.id.home:
+        finish();
+        return true;
+      case R.id.menu_create_group:
+        if (groupToUpdate.isPresent()) handleGroupUpdate();
+        else                           handleGroupCreate();
+        return true;
+    }
+
+    return false;
+  }
+
+  @Override
+  public void onRecipientDeleted(Recipient recipient) {
+    getAdapter().remove(recipient);
+    updateViewState();
+  }
+
+  @Override
+  public void onRecipientsPanelUpdate(List<Recipient> recipients) {
+    if (recipients != null && !recipients.isEmpty()) addSelectedContacts(recipients);
+  }
+
+  private void handleGroupCreate() {
+    if (getAdapter().getCount() < 1) {
+      Log.i(TAG, getString(R.string.GroupCreateActivity_contacts_no_members));
+      Toast.makeText(getApplicationContext(), R.string.GroupCreateActivity_contacts_no_members, Toast.LENGTH_SHORT).show();
+      return;
+    }
+    if (isSignalGroup()) {
+      new CreateSignalGroupTask(this, avatarBmp, getGroupName(), getAdapter().getRecipients()).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    } else {
+      new CreateMmsGroupTask(this, getAdapter().getRecipients()).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }
+  }
+
+  private void handleGroupUpdate() {
+    new UpdateSignalGroupTask(this, groupToUpdate.get().id, avatarBmp,
+                              getGroupName(), getAdapter().getRecipients()).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+  }
+
+  private void handleOpenConversation(long threadId, Recipient recipient) {
+    Intent intent = new Intent(this, ConversationActivity.class);
+    intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, threadId);
+    intent.putExtra(ConversationActivity.DISTRIBUTION_TYPE_EXTRA, ThreadDatabase.DistributionTypes.DEFAULT);
+    intent.putExtra(ConversationActivity.RECIPIENT_EXTRA, recipient.getId());
+    startActivity(intent);
+    finish();
+  }
+
+  private SelectedRecipientsAdapter getAdapter() {
+    return (SelectedRecipientsAdapter)lv.getAdapter();
+  }
+
+  private @Nullable String getGroupName() {
+    return groupName.getText() != null ? groupName.getText().toString() : null;
+  }
+
+  @Override
+  public void onActivityResult(int reqCode, int resultCode, final Intent data) {
+    super.onActivityResult(reqCode, resultCode, data);
+    Uri outputFile = Uri.fromFile(new File(getCacheDir(), "cropped"));
+
+    if (data == null || resultCode != Activity.RESULT_OK)
+      return;
+
+    switch (reqCode) {
+      case PICK_CONTACT:
+        List<RecipientId> selected = data.getParcelableArrayListExtra(PushContactSelectionActivity.KEY_SELECTED_RECIPIENTS);
+
+        for (RecipientId contact : selected) {
+          Recipient recipient = Recipient.resolved(contact);
+          addSelectedContacts(recipient);
+        }
+
+        break;
+
+      case AvatarSelection.REQUEST_CODE_AVATAR:
+        AvatarSelection.circularCropImage(this, data.getData(), outputFile, R.string.CropImageActivity_group_avatar);
+        break;
+      case AvatarSelection.REQUEST_CODE_CROP_IMAGE:
+        final Uri resultUri = AvatarSelection.getResultUri(data);
+        GlideApp.with(this)
+                .asBitmap()
+                .load(resultUri)
+                .skipMemoryCache(true)
+                .diskCacheStrategy(DiskCacheStrategy.NONE)
+                .centerCrop()
+                .override(AVATAR_SIZE, AVATAR_SIZE)
+                .into(new SimpleTarget<Bitmap>() {
+                  @Override
+                  public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> transition) {
+                    setAvatar(resultUri, resource);
+                  }
+                });
+    }
+  }
+
+  private class AddRecipientButtonListener implements View.OnClickListener {
+    @Override
+    public void onClick(View v) {
+      Intent intent = new Intent(GroupCreateActivity.this, PushContactSelectionActivity.class);
+      if (groupToUpdate.isPresent()) {
+        intent.putExtra(ContactSelectionListFragment.DISPLAY_MODE, DisplayMode.FLAG_PUSH);
+      } else {
+        intent.putExtra(ContactSelectionListFragment.DISPLAY_MODE, DisplayMode.FLAG_PUSH | DisplayMode.FLAG_SMS);
+      }
+      startActivityForResult(intent, PICK_CONTACT);
+    }
+  }
+
+  private static class CreateMmsGroupTask extends AsyncTask<Void,Void,GroupActionResult> {
+    private final GroupCreateActivity activity;
+    private final Set<Recipient>      members;
+
+    public CreateMmsGroupTask(GroupCreateActivity activity, Set<Recipient> members) {
+      this.activity     = activity;
+      this.members      = members;
+    }
+
+    @Override
+    protected GroupActionResult doInBackground(Void... avoid) {
+      List<RecipientId> memberAddresses = new LinkedList<>();
+
+      for (Recipient recipient : members) {
+        memberAddresses.add(recipient.getId());
+      }
+      memberAddresses.add(Recipient.self().getId());
+
+      String      groupId          = DatabaseFactory.getGroupDatabase(activity).getOrCreateGroupForMembers(memberAddresses, true);
+      RecipientId groupRecipientId = DatabaseFactory.getRecipientDatabase(activity).getOrInsertFromGroupId(groupId);
+      Recipient   groupRecipient   = Recipient.resolved(groupRecipientId);
+      long        threadId         = DatabaseFactory.getThreadDatabase(activity).getThreadIdFor(groupRecipient, ThreadDatabase.DistributionTypes.DEFAULT);
+
+      return new GroupActionResult(groupRecipient, threadId);
+    }
+
+    @Override
+    protected void onPostExecute(GroupActionResult result) {
+      activity.handleOpenConversation(result.getThreadId(), result.getGroupRecipient());
+    }
+
+    @Override
+    protected void onProgressUpdate(Void... values) {
+      super.onProgressUpdate(values);
+    }
+  }
+
+  private abstract static class SignalGroupTask extends AsyncTask<Void,Void,Optional<GroupActionResult>> {
+
+    protected GroupCreateActivity activity;
+    protected Bitmap              avatar;
+    protected Set<Recipient>      members;
+    protected String              name;
+
+    public SignalGroupTask(GroupCreateActivity activity,
+                           Bitmap              avatar,
+                           String              name,
+                           Set<Recipient>      members)
+    {
+      this.activity     = activity;
+      this.avatar       = avatar;
+      this.name         = name;
+      this.members      = members;
+    }
+
+    @Override
+    protected void onPreExecute() {
+      activity.findViewById(R.id.group_details_layout).setVisibility(View.GONE);
+      activity.findViewById(R.id.creating_group_layout).setVisibility(View.VISIBLE);
+      activity.findViewById(R.id.menu_create_group).setVisibility(View.GONE);
+        final int titleResId = activity.groupToUpdate.isPresent()
+                             ? R.string.GroupCreateActivity_updating_group
+                             : R.string.GroupCreateActivity_creating_group;
+        activity.creatingText.setText(activity.getString(titleResId, activity.getGroupName()));
+      }
+
+    @Override
+    protected void onPostExecute(Optional<GroupActionResult> groupActionResultOptional) {
+      if (activity.isFinishing()) return;
+      activity.findViewById(R.id.group_details_layout).setVisibility(View.VISIBLE);
+      activity.findViewById(R.id.creating_group_layout).setVisibility(View.GONE);
+      activity.findViewById(R.id.menu_create_group).setVisibility(View.VISIBLE);
+    }
+  }
+
+  private static class CreateSignalGroupTask extends SignalGroupTask {
+    public CreateSignalGroupTask(GroupCreateActivity activity, Bitmap avatar, String name, Set<Recipient> members) {
+      super(activity, avatar, name, members);
+    }
+
+    @Override
+    protected Optional<GroupActionResult> doInBackground(Void... aVoid) {
+      return Optional.of(GroupManager.createGroup(activity, members, avatar, name, false));
+    }
+
+    @Override
+    protected void onPostExecute(Optional<GroupActionResult> result) {
+      if (result.isPresent() && result.get().getThreadId() > -1) {
+        if (!activity.isFinishing()) {
+          activity.handleOpenConversation(result.get().getThreadId(), result.get().getGroupRecipient());
+        }
+      } else {
+        super.onPostExecute(result);
+        Toast.makeText(activity.getApplicationContext(),
+                       R.string.GroupCreateActivity_contacts_invalid_number, Toast.LENGTH_LONG).show();
+      }
+    }
+  }
+
+  private static class UpdateSignalGroupTask extends SignalGroupTask {
+    private String groupId;
+
+    public UpdateSignalGroupTask(GroupCreateActivity activity, String groupId,
+                                 Bitmap avatar, String name, Set<Recipient> members)
+    {
+      super(activity, avatar, name, members);
+      this.groupId = groupId;
+    }
+
+    @Override
+    protected Optional<GroupActionResult> doInBackground(Void... aVoid) {
+      try {
+        return Optional.of(GroupManager.updateGroup(activity, groupId, members, avatar, name));
+      } catch (InvalidNumberException e) {
+        return Optional.absent();
+      }
+    }
+
+    @Override
+    protected void onPostExecute(Optional<GroupActionResult> result) {
+      if (result.isPresent() && result.get().getThreadId() > -1) {
+        if (!activity.isFinishing()) {
+          Intent intent = activity.getIntent();
+          intent.putExtra(GROUP_THREAD_EXTRA, result.get().getThreadId());
+          intent.putExtra(GROUP_ID_EXTRA, result.get().getGroupRecipient().requireGroupId());
+          activity.setResult(RESULT_OK, intent);
+          activity.finish();
+        }
+      } else {
+        super.onPostExecute(result);
+        Toast.makeText(activity.getApplicationContext(),
+                       R.string.GroupCreateActivity_contacts_invalid_number, Toast.LENGTH_LONG).show();
+      }
+    }
+  }
+
+  private static class AddMembersTask extends AsyncTask<Recipient,Void,List<AddMembersTask.Result>> {
+    static class Result {
+      Optional<Recipient> recipient;
+      boolean             isPush;
+      String              reason;
+
+      public Result(@Nullable Recipient recipient, boolean isPush, @Nullable String reason) {
+        this.recipient = Optional.fromNullable(recipient);
+        this.isPush    = isPush;
+        this.reason    = reason;
+      }
+    }
+
+    private GroupCreateActivity activity;
+    private boolean             failIfNotPush;
+
+    public AddMembersTask(@NonNull GroupCreateActivity activity) {
+      this.activity      = activity;
+      this.failIfNotPush = activity.groupToUpdate.isPresent();
+    }
+
+    @Override
+    protected List<Result> doInBackground(Recipient... recipients) {
+      final List<Result> results = new LinkedList<>();
+
+      for (Recipient recipient : recipients) {
+        boolean isPush = isActiveInDirectory(recipient);
+
+        if (failIfNotPush && !isPush) {
+          results.add(new Result(null, false, activity.getString(R.string.GroupCreateActivity_cannot_add_non_push_to_existing_group,
+                                                                 recipient.toShortString(activity))));
+        } else if (TextUtils.equals(TextSecurePreferences.getLocalNumber(activity), recipient.getE164().or(""))) {
+          results.add(new Result(null, false, activity.getString(R.string.GroupCreateActivity_youre_already_in_the_group)));
+        } else {
+          results.add(new Result(recipient, isPush, null));
+        }
+      }
+      return results;
+    }
+
+    @Override
+    protected void onPostExecute(List<Result> results) {
+      if (activity.isFinishing()) return;
+
+      for (Result result : results) {
+        if (result.recipient.isPresent()) {
+          activity.getAdapter().add(result.recipient.get(), result.isPush);
+        } else {
+          Toast.makeText(activity, result.reason, Toast.LENGTH_SHORT).show();
+        }
+      }
+      activity.updateViewState();
+    }
+  }
+
+  private static class FillExistingGroupInfoAsyncTask extends ProgressDialogAsyncTask<String,Void,Optional<GroupData>> {
+    private GroupCreateActivity activity;
+
+    public FillExistingGroupInfoAsyncTask(GroupCreateActivity activity) {
+      super(activity,
+            R.string.GroupCreateActivity_loading_group_details,
+            R.string.please_wait);
+      this.activity = activity;
+    }
+
+    @Override
+    protected Optional<GroupData> doInBackground(String... groupIds) {
+      final GroupDatabase         db               = DatabaseFactory.getGroupDatabase(activity);
+      final List<Recipient>       recipients       = db.getGroupMembers(groupIds[0], false);
+      final Optional<GroupRecord> group            = db.getGroup(groupIds[0]);
+      final Set<Recipient>        existingContacts = new HashSet<>(recipients.size());
+      existingContacts.addAll(recipients);
+
+      if (group.isPresent()) {
+        return Optional.of(new GroupData(groupIds[0],
+                                         existingContacts,
+                                         BitmapUtil.fromByteArray(group.get().getAvatar()),
+                                         group.get().getAvatar(),
+                                         group.get().getTitle()));
+      } else {
+        return Optional.absent();
+      }
+    }
+
+    @Override
+    protected void onPostExecute(Optional<GroupData> group) {
+      super.onPostExecute(group);
+
+      if (group.isPresent() && !activity.isFinishing()) {
+        activity.groupToUpdate = group;
+
+        activity.groupName.setText(group.get().name);
+        if (group.get().avatarBmp != null) {
+          activity.setAvatar(group.get().avatarBytes, group.get().avatarBmp);
+        }
+        SelectedRecipientsAdapter adapter = new SelectedRecipientsAdapter(activity, group.get().recipients);
+        adapter.setOnRecipientDeletedListener(activity);
+        activity.lv.setAdapter(adapter);
+        activity.updateViewState();
+      }
+    }
+  }
+
+  private <T> void setAvatar(T model, Bitmap bitmap) {
+    avatarBmp = bitmap;
+    GlideApp.with(this)
+            .load(model)
+            .circleCrop()
+            .skipMemoryCache(true)
+            .diskCacheStrategy(DiskCacheStrategy.NONE)
+            .into(avatar);
+  }
+
+  private static class GroupData {
+    String         id;
+    Set<Recipient> recipients;
+    Bitmap         avatarBmp;
+    byte[]         avatarBytes;
+    String         name;
+
+    public GroupData(String id, Set<Recipient> recipients, Bitmap avatarBmp, byte[] avatarBytes, String name) {
+      this.id          = id;
+      this.recipients  = recipients;
+      this.avatarBmp   = avatarBmp;
+      this.avatarBytes = avatarBytes;
+      this.name        = name;
+    }
+  }
+}

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

@@ -0,0 +1,133 @@
+package org.thoughtcrime.securesms;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.AsyncTask;
+import androidx.appcompat.app.AlertDialog;
+import android.text.TextUtils;
+
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientExporter;
+import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.Util;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class GroupMembersDialog extends AsyncTask<Void, Void, List<Recipient>> {
+
+  private static final String TAG = GroupMembersDialog.class.getSimpleName();
+
+  private final Recipient  recipient;
+  private final Context    context;
+
+  public GroupMembersDialog(Context context, Recipient recipient) {
+    this.recipient = recipient;
+    this.context   = context;
+  }
+
+  @Override
+  public void onPreExecute() {}
+
+  @Override
+  protected List<Recipient> doInBackground(Void... params) {
+    return DatabaseFactory.getGroupDatabase(context).getGroupMembers(recipient.requireGroupId(), true);
+  }
+
+  @Override
+  public void onPostExecute(List<Recipient> members) {
+    GroupMembers groupMembers = new GroupMembers(members);
+    AlertDialog.Builder builder = new AlertDialog.Builder(context);
+    builder.setTitle(R.string.ConversationActivity_group_members);
+    builder.setIconAttribute(R.attr.group_members_dialog_icon);
+    builder.setCancelable(true);
+    builder.setItems(groupMembers.getRecipientStrings(), new GroupMembersOnClickListener(context, groupMembers));
+    builder.setPositiveButton(android.R.string.ok, null);
+    builder.show();
+  }
+
+  public void display() {
+    executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+  }
+
+  private static class GroupMembersOnClickListener implements DialogInterface.OnClickListener {
+    private final GroupMembers groupMembers;
+    private final Context      context;
+
+    public GroupMembersOnClickListener(Context context, GroupMembers members) {
+      this.context      = context;
+      this.groupMembers = members;
+    }
+
+    @Override
+    public void onClick(DialogInterface dialogInterface, int item) {
+      Recipient recipient = groupMembers.get(item);
+
+      if (recipient.getContactUri() != null) {
+        Intent intent = new Intent(context, RecipientPreferenceActivity.class);
+        intent.putExtra(RecipientPreferenceActivity.RECIPIENT_ID, recipient.getId());
+
+        context.startActivity(intent);
+      } else {
+        context.startActivity(RecipientExporter.export(recipient).asAddContactIntent());
+      }
+    }
+  }
+
+  /**
+   * Wraps a List of Recipient (just like @class Recipients),
+   * but with focus on the order of the Recipients.
+   * So that the order of the RecipientStrings[] matches
+   * the internal order.
+   *
+   * @author Christoph Haefner
+   */
+  private class GroupMembers {
+    private final String TAG = GroupMembers.class.getSimpleName();
+
+    private final LinkedList<Recipient> members = new LinkedList<>();
+
+    public GroupMembers(List<Recipient> recipients) {
+      for (Recipient recipient : recipients) {
+        if (recipient.isLocalNumber()) {
+          members.push(recipient);
+        } else {
+          members.add(recipient);
+        }
+      }
+    }
+
+    public String[] getRecipientStrings() {
+      List<String> recipientStrings = new LinkedList<>();
+
+      for (Recipient recipient : members) {
+        if (recipient.isLocalNumber()) {
+          recipientStrings.add(context.getString(R.string.GroupMembersDialog_me));
+        } else {
+          String name = getRecipientName(recipient);
+          recipientStrings.add(name);
+        }
+      }
+
+      return recipientStrings.toArray(new String[members.size()]);
+    }
+
+    private String getRecipientName(Recipient recipient) {
+      if (FeatureFlags.PROFILE_DISPLAY) return recipient.getDisplayName(context);
+
+      String name = recipient.toShortString(context);
+
+      if (recipient.getName(context) == null && !TextUtils.isEmpty(recipient.getProfileName())) {
+        name += " ~" + recipient.getProfileName();
+      }
+
+      return name;
+    }
+
+    public Recipient get(int index) {
+      return members.get(index);
+    }
+  }
+}

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

@@ -0,0 +1,115 @@
+package org.thoughtcrime.securesms;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.MessagingDatabase.SyncMessageId;
+import org.thoughtcrime.securesms.database.MmsSmsDatabase;
+import org.thoughtcrime.securesms.database.PushDatabase;
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.jobmanager.JobManager;
+import org.thoughtcrime.securesms.jobs.PushDecryptMessageJob;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
+
+import java.io.Closeable;
+import java.util.Locale;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * The central entry point for all envelopes that have been retrieved. Envelopes must be processed
+ * here to guarantee proper ordering.
+ */
+public class IncomingMessageProcessor {
+
+  private static final String TAG = Log.tag(IncomingMessageProcessor.class);
+
+  private final Context       context;
+  private final ReentrantLock lock;
+
+  public IncomingMessageProcessor(@NonNull Context context) {
+    this.context = context;
+    this.lock    = new ReentrantLock();
+  }
+
+  /**
+   * @return An instance of a Processor that will allow you to process messages in a thread safe
+   * way. Must be closed.
+   */
+  public Processor acquire() {
+    lock.lock();
+
+    Thread current = Thread.currentThread();
+    Log.d(TAG, "Lock acquired by thread " + current.getId() + " (" + current.getName() + ")");
+
+    return new Processor(context);
+  }
+
+  private void release() {
+    Thread current = Thread.currentThread();
+    Log.d(TAG, "Lock about to be released by thread " + current.getId() + " (" + current.getName() + ")");
+
+    lock.unlock();
+  }
+
+  public class Processor implements Closeable {
+
+    private final Context           context;
+    private final PushDatabase      pushDatabase;
+    private final MmsSmsDatabase    mmsSmsDatabase;
+    private final JobManager        jobManager;
+
+    private Processor(@NonNull Context context) {
+      this.context           = context;
+      this.pushDatabase      = DatabaseFactory.getPushDatabase(context);
+      this.mmsSmsDatabase    = DatabaseFactory.getMmsSmsDatabase(context);
+      this.jobManager        = ApplicationDependencies.getJobManager();
+    }
+
+    /**
+     * @return The id of the {@link PushDecryptMessageJob} that was scheduled to process the message, if
+     *         one was created. Otherwise null.
+     */
+    public @Nullable String processEnvelope(@NonNull SignalServiceEnvelope envelope) {
+      if (envelope.hasSource()) {
+        Recipient.externalPush(context, envelope.getSourceAddress());
+      }
+
+      if (envelope.isReceipt()) {
+        processReceipt(envelope);
+        return null;
+      } else if (envelope.isPreKeySignalMessage() || envelope.isSignalMessage() || envelope.isUnidentifiedSender()) {
+        return processMessage(envelope);
+      } else {
+        Log.w(TAG, "Received envelope of unknown type: " + envelope.getType());
+        return null;
+      }
+    }
+
+    private @NonNull String processMessage(@NonNull SignalServiceEnvelope envelope) {
+      Log.i(TAG, "Received message. Inserting in PushDatabase.");
+
+      long                  id  = pushDatabase.insert(envelope);
+      PushDecryptMessageJob job = new PushDecryptMessageJob(context, id);
+
+      jobManager.add(job);
+
+      return job.getId();
+    }
+
+    private void processReceipt(@NonNull SignalServiceEnvelope envelope) {
+      Log.i(TAG, String.format(Locale.ENGLISH, "Received receipt: (XXXXX, %d)", envelope.getTimestamp()));
+      mmsSmsDatabase.incrementDeliveryReceiptCount(new SyncMessageId(Recipient.externalPush(context, envelope.getSourceAddress()).getId(), envelope.getTimestamp()),
+                                                   System.currentTimeMillis());
+    }
+
+    @Override
+    public void close() {
+      release();
+    }
+  }
+}

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

@@ -0,0 +1,38 @@
+package org.thoughtcrime.securesms;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+
+import java.util.List;
+
+public class IntroPagerAdapter extends FragmentStatePagerAdapter {
+
+  public static class IntroPage {
+    final int      backgroundColor;
+    final Fragment fragment;
+
+    public IntroPage(int backgroundColor, Fragment fragment) {
+      this.backgroundColor = backgroundColor;
+      this.fragment        = fragment;
+    }
+  }
+
+  private List<IntroPage> pages;
+
+  public IntroPagerAdapter(FragmentManager fm, List<IntroPage> pages) {
+    super(fm);
+    this.pages = pages;
+  }
+
+  @Override
+  public Fragment getItem(int i) {
+    IntroPage page = pages.get(i);
+    return page.fragment;
+  }
+
+  @Override
+  public int getCount() {
+    return pages.size();
+  }
+}

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

@@ -0,0 +1,291 @@
+package org.thoughtcrime.securesms;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.PorterDuff;
+import android.os.AsyncTask;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import androidx.annotation.AnimRes;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
+
+import com.annimon.stream.Stream;
+
+import org.thoughtcrime.securesms.components.ContactFilterToolbar;
+import org.thoughtcrime.securesms.components.ContactFilterToolbar.OnFilterChangedListener;
+import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
+import org.thoughtcrime.securesms.contacts.SelectedContact;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.sms.MessageSender;
+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.ViewUtil;
+import org.thoughtcrime.securesms.util.WindowUtil;
+import org.thoughtcrime.securesms.util.concurrent.ListenableFuture.Listener;
+import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
+import org.whispersystems.libsignal.util.guava.Optional;
+
+import java.util.concurrent.ExecutionException;
+
+public class InviteActivity extends PassphraseRequiredActionBarActivity implements ContactSelectionListFragment.OnContactSelectedListener {
+
+  private ContactSelectionListFragment contactsFragment;
+  private EditText                     inviteText;
+  private ViewGroup                    smsSendFrame;
+  private Button                       smsSendButton;
+  private Animation                    slideInAnimation;
+  private Animation                    slideOutAnimation;
+  private DynamicTheme                 dynamicTheme = new DynamicNoActionBarInviteTheme();
+  private Toolbar                      primaryToolbar;
+
+  @Override
+  protected void onPreCreate() {
+    super.onPreCreate();
+    dynamicTheme.onCreate(this);
+  }
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState, boolean ready) {
+    getIntent().putExtra(ContactSelectionListFragment.DISPLAY_MODE, DisplayMode.FLAG_SMS);
+    getIntent().putExtra(ContactSelectionListFragment.MULTI_SELECT, true);
+    getIntent().putExtra(ContactSelectionListFragment.REFRESHABLE, false);
+
+    setContentView(R.layout.invite_activity);
+
+    initializeAppBar();
+    initializeResources();
+  }
+
+  @Override
+  protected void onResume() {
+    super.onResume();
+    dynamicTheme.onResume(this);
+  }
+
+  private void initializeAppBar() {
+    primaryToolbar = findViewById(R.id.toolbar);
+    setSupportActionBar(primaryToolbar);
+
+    assert getSupportActionBar() != null;
+
+    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+    getSupportActionBar().setTitle(R.string.AndroidManifest__invite_friends);
+  }
+
+  private void initializeResources() {
+    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);
+
+    inviteText        = ViewUtil.findById(this, R.id.invite_text);
+    smsSendFrame      = ViewUtil.findById(this, R.id.sms_send_frame);
+    smsSendButton     = ViewUtil.findById(this, R.id.send_sms_button);
+    contactsFragment  = (ContactSelectionListFragment)getSupportFragmentManager().findFragmentById(R.id.contact_selection_list_fragment);
+
+    inviteText.setText(getString(R.string.InviteActivity_lets_switch_to_signal, getString(R.string.install_url)));
+    updateSmsButtonText();
+
+    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);
+  }
+
+  private Animation loadAnimation(@AnimRes int animResId) {
+    final Animation animation = AnimationUtils.loadAnimation(this, animResId);
+    animation.setInterpolator(new FastOutSlowInInterpolator());
+    return animation;
+  }
+
+  @Override
+  public void onContactSelected(Optional<RecipientId> recipientId, String number) {
+    updateSmsButtonText();
+  }
+
+  @Override
+  public void onContactDeselected(Optional<RecipientId> recipientId, String number) {
+    updateSmsButtonText();
+  }
+
+  private void sendSmsInvites() {
+    new SendSmsInvitesAsyncTask(this, inviteText.getText().toString())
+        .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR,
+                           contactsFragment.getSelectedContacts()
+                                           .toArray(new SelectedContact[contactsFragment.getSelectedContacts().size()]));
+  }
+
+  private void updateSmsButtonText() {
+    smsSendButton.setText(getResources().getQuantityString(R.plurals.InviteActivity_send_sms_to_friends,
+                                                           contactsFragment.getSelectedContacts().size(),
+                                                           contactsFragment.getSelectedContacts().size()));
+    smsSendButton.setEnabled(!contactsFragment.getSelectedContacts().isEmpty());
+  }
+
+  @Override public void onBackPressed() {
+    if (smsSendFrame.getVisibility() == View.VISIBLE) {
+      cancelSmsSelection();
+    } else {
+      super.onBackPressed();
+    }
+  }
+
+  private void cancelSmsSelection() {
+    setPrimaryColorsToolbarNormal();
+    contactsFragment.reset();
+    updateSmsButtonText();
+    ViewUtil.animateOut(smsSendFrame, slideOutAnimation, View.GONE);
+  }
+
+  private void setPrimaryColorsToolbarNormal() {
+    primaryToolbar.setBackgroundColor(0);
+    primaryToolbar.getNavigationIcon().setColorFilter(null);
+    primaryToolbar.setTitleTextColor(ThemeUtil.getThemedColor(this, R.attr.title_text_color_primary));
+
+    if (Build.VERSION.SDK_INT >= 23) {
+      getWindow().setStatusBarColor(ThemeUtil.getThemedColor(this, android.R.attr.statusBarColor));
+      getWindow().setNavigationBarColor(ThemeUtil.getThemedColor(this, android.R.attr.navigationBarColor));
+      WindowUtil.setLightStatusBarFromTheme(this);
+    }
+
+    WindowUtil.setLightNavigationBarFromTheme(this);
+  }
+
+  private void setPrimaryColorsToolbarForSms() {
+    primaryToolbar.setBackgroundColor(ContextCompat.getColor(this, R.color.signal_primary));
+    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));
+
+    if (Build.VERSION.SDK_INT >= 23) {
+      getWindow().setStatusBarColor(ContextCompat.getColor(this, R.color.signal_primary));
+      WindowUtil.clearLightStatusBar(getWindow());
+    }
+
+    if (Build.VERSION.SDK_INT >= 27) {
+      getWindow().setNavigationBarColor(ContextCompat.getColor(this, R.color.signal_primary));
+      WindowUtil.clearLightNavigationBar(getWindow());
+    }
+  }
+
+  private class ShareClickListener implements OnClickListener {
+    @Override
+    public void onClick(View v) {
+      Intent sendIntent = new Intent();
+      sendIntent.setAction(Intent.ACTION_SEND);
+      sendIntent.putExtra(Intent.EXTRA_TEXT, inviteText.getText().toString());
+      sendIntent.setType("text/plain");
+      if (sendIntent.resolveActivity(getPackageManager()) != null) {
+        startActivity(Intent.createChooser(sendIntent, getString(R.string.InviteActivity_invite_to_signal)));
+      } else {
+        Toast.makeText(InviteActivity.this, R.string.InviteActivity_no_app_to_share_to, Toast.LENGTH_LONG).show();
+      }
+    }
+  }
+
+  private class SmsClickListener implements OnClickListener {
+    @Override
+    public void onClick(View v) {
+      setPrimaryColorsToolbarForSms();
+      ViewUtil.animateIn(smsSendFrame, slideInAnimation);
+    }
+  }
+
+  private class SmsCancelClickListener implements OnClickListener {
+    @Override
+    public void onClick(View v) {
+      cancelSmsSelection();
+    }
+  }
+
+  private class SmsSendClickListener implements OnClickListener {
+    @Override
+    public void onClick(View v) {
+      new AlertDialog.Builder(InviteActivity.this)
+          .setTitle(getResources().getQuantityString(R.plurals.InviteActivity_send_sms_invites,
+                                                     contactsFragment.getSelectedContacts().size(),
+                                                     contactsFragment.getSelectedContacts().size()))
+          .setMessage(inviteText.getText().toString())
+          .setPositiveButton(R.string.yes, (dialog, which) -> sendSmsInvites())
+          .setNegativeButton(R.string.no, (dialog, which) -> dialog.dismiss())
+          .show();
+    }
+  }
+
+  private class ContactFilterChangedListener implements OnFilterChangedListener {
+    @Override
+    public void onFilterChanged(String filter) {
+      contactsFragment.setQueryFilter(filter);
+    }
+  }
+
+  @SuppressLint("StaticFieldLeak")
+  private class SendSmsInvitesAsyncTask extends ProgressDialogAsyncTask<SelectedContact,Void,Void> {
+    private final String message;
+
+    SendSmsInvitesAsyncTask(Context context, String message) {
+      super(context, R.string.InviteActivity_sending, R.string.InviteActivity_sending);
+      this.message = message;
+    }
+
+    @Override
+    protected Void doInBackground(SelectedContact... contacts) {
+      final Context context = getContext();
+      if (context == null) return null;
+
+      for (SelectedContact contact : contacts) {
+        RecipientId recipientId    = contact.getOrCreateRecipientId(context);
+        Recipient   recipient      = Recipient.resolved(recipientId);
+        int         subscriptionId = recipient.getDefaultSubscriptionId().or(-1);
+
+        MessageSender.send(context, new OutgoingTextMessage(recipient, message, subscriptionId), -1L, true, null);
+
+        if (recipient.getContactUri() != null) {
+          DatabaseFactory.getRecipientDatabase(context).setHasSentInvite(recipient.getId());
+        }
+      }
+
+      return null;
+    }
+
+    @Override
+    protected void onPostExecute(Void aVoid) {
+      super.onPostExecute(aVoid);
+      final Context context = getContext();
+      if (context == null) return;
+
+      ViewUtil.animateOut(smsSendFrame, slideOutAnimation, View.GONE).addListener(new Listener<Boolean>() {
+        @Override
+        public void onSuccess(Boolean result) {
+          contactsFragment.reset();
+        }
+
+        @Override
+        public void onFailure(ExecutionException e) {}
+      });
+      Toast.makeText(context, R.string.InviteActivity_invitations_sent, Toast.LENGTH_LONG).show();
+    }
+  }
+}

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

@@ -0,0 +1,63 @@
+package org.thoughtcrime.securesms;
+
+
+import android.content.Context;
+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 org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.jobs.MultiDeviceConfigurationUpdateJob;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+
+public class LinkPreviewsIntroFragment extends Fragment {
+
+  private Controller controller;
+
+  public static LinkPreviewsIntroFragment newInstance() {
+    LinkPreviewsIntroFragment fragment = new LinkPreviewsIntroFragment();
+    Bundle                    args     = new Bundle();
+    fragment.setArguments(args);
+    return fragment;
+  }
+
+  public LinkPreviewsIntroFragment() {}
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+  }
+
+  @Override
+  public void onAttach(Context context) {
+    super.onAttach(context);
+
+    if (!(getActivity() instanceof Controller)) {
+      throw new IllegalStateException("Parent activity must implement the Controller interface.");
+    }
+
+    controller = (Controller) getActivity();
+  }
+
+  @Override
+  public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    View view = inflater.inflate(R.layout.experience_upgrade_link_previews_fragment, container, false);
+
+    view.findViewById(R.id.experience_ok_button).setOnClickListener(v -> {
+      ApplicationDependencies.getJobManager().add(new MultiDeviceConfigurationUpdateJob(TextSecurePreferences.isReadReceiptsEnabled(requireContext()),
+                                                                                        TextSecurePreferences.isTypingIndicatorsEnabled(requireContext()),
+                                                                                        TextSecurePreferences.isShowUnidentifiedDeliveryIndicatorsEnabled(requireContext()),
+                                                                                        TextSecurePreferences.isLinkPreviewsEnabled(requireContext())));
+      controller.onLinkPreviewsFinished();
+    });
+
+    return view;
+  }
+
+  public interface Controller {
+    void onLinkPreviewsFinished();
+  }
+}

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

@@ -0,0 +1,78 @@
+package org.thoughtcrime.securesms;
+
+import android.content.ActivityNotFoundException;
+import android.content.Intent;
+import android.os.Bundle;
+import androidx.fragment.app.FragmentTransaction;
+import org.thoughtcrime.securesms.logging.Log;
+import android.view.MenuItem;
+import android.widget.Toast;
+
+import org.thoughtcrime.securesms.logsubmit.SubmitLogFragment;
+import org.thoughtcrime.securesms.util.DynamicTheme;
+
+/**
+ * Activity for submitting logcat logs to a pastebin service.
+ */
+public class LogSubmitActivity extends BaseActionBarActivity implements SubmitLogFragment.OnLogSubmittedListener {
+
+  private static final String TAG = LogSubmitActivity.class.getSimpleName();
+  private DynamicTheme dynamicTheme = new DynamicTheme();
+
+  @Override
+  protected void onCreate(Bundle icicle) {
+    dynamicTheme.onCreate(this);
+    super.onCreate(icicle);
+    setContentView(R.layout.log_submit_activity);
+    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+    SubmitLogFragment fragment = SubmitLogFragment.newInstance();
+    FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+    transaction.replace(R.id.fragment_container, fragment);
+    transaction.commit();
+  }
+
+  @Override
+  protected void onResume() {
+    dynamicTheme.onResume(this);
+    super.onResume();
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    super.onOptionsItemSelected(item);
+    switch (item.getItemId()) {
+    case android.R.id.home:
+      finish();
+      return true;
+    }
+
+    return false;
+  }
+
+  @Override
+  public void onSuccess() {
+    Toast.makeText(getApplicationContext(), R.string.log_submit_activity__thanks, Toast.LENGTH_LONG).show();
+    finish();
+  }
+
+  @Override
+  public void onFailure() {
+    Toast.makeText(getApplicationContext(), R.string.log_submit_activity__log_fetch_failed, Toast.LENGTH_LONG).show();
+    finish();
+  }
+
+  @Override
+  public void onCancel() {
+    finish();
+  }
+
+  @Override
+  public void startActivity(Intent intent) {
+    try {
+      super.startActivity(intent);
+    } catch (ActivityNotFoundException e) {
+      Log.w(TAG, e);
+      Toast.makeText(this, R.string.log_submit_activity__no_browser_installed, Toast.LENGTH_LONG).show();
+    }
+  }
+}

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

@@ -0,0 +1,45 @@
+package org.thoughtcrime.securesms;
+
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+
+import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
+import org.thoughtcrime.securesms.util.DynamicTheme;
+
+public class MainActivity extends PassphraseRequiredActionBarActivity {
+
+  private final DynamicTheme  dynamicTheme = new DynamicNoActionBarTheme();
+  private final MainNavigator navigator    = new MainNavigator(this);
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState, boolean ready) {
+    super.onCreate(savedInstanceState, ready);
+    setContentView(R.layout.main_activity);
+
+    navigator.onCreate(savedInstanceState);
+  }
+
+  @Override
+  protected void onPreCreate() {
+    super.onPreCreate();
+    dynamicTheme.onCreate(this);
+  }
+
+  @Override
+  protected void onResume() {
+    super.onResume();
+    dynamicTheme.onResume(this);
+  }
+
+  @Override
+  public void onBackPressed() {
+    if (!navigator.onBackPressed()) {
+      super.onBackPressed();
+    }
+  }
+
+  public @NonNull MainNavigator getNavigator() {
+    return navigator;
+  }
+}

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

@@ -0,0 +1,22 @@
+package org.thoughtcrime.securesms;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+
+public class MainFragment extends Fragment {
+
+  @Override
+  public void onAttach(@NonNull Context context) {
+    super.onAttach(context);
+
+    if (!(requireActivity() instanceof MainActivity)) {
+      throw new IllegalStateException("Can only be used inside of MainActivity!");
+    }
+  }
+
+  protected @NonNull MainNavigator getNavigator() {
+    return MainNavigator.get(requireActivity());
+  }
+}

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

@@ -0,0 +1,104 @@
+package org.thoughtcrime.securesms;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+
+import org.thoughtcrime.securesms.conversation.ConversationActivity;
+import org.thoughtcrime.securesms.conversationlist.ConversationListArchiveFragment;
+import org.thoughtcrime.securesms.conversationlist.ConversationListFragment;
+import org.thoughtcrime.securesms.insights.InsightsLauncher;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+
+public class MainNavigator {
+
+  private final MainActivity activity;
+
+  public MainNavigator(@NonNull MainActivity activity) {
+    this.activity = activity;
+  }
+
+  public static MainNavigator get(@NonNull Activity activity) {
+    if (!(activity instanceof MainActivity)) {
+      throw new IllegalArgumentException("Activity must be an instance of MainActivity!");
+    }
+
+    return ((MainActivity) activity).getNavigator();
+  }
+
+  public void onCreate(@Nullable Bundle savedInstanceState) {
+    if (savedInstanceState != null) {
+      return;
+    }
+
+    getFragmentManager().beginTransaction()
+                        .add(R.id.fragment_container, ConversationListFragment.newInstance())
+                        .commit();
+  }
+
+  /**
+   * @return True if the back pressed was handled in our own custom way, false if it should be given
+   *         to the system to do the default behavior.
+   */
+  public boolean onBackPressed() {
+    Fragment fragment = getFragmentManager().findFragmentById(R.id.fragment_container);
+
+    if (fragment instanceof BackHandler) {
+      return ((BackHandler) fragment).onBackPressed();
+    }
+
+    return false;
+  }
+
+  public void goToConversation(@NonNull RecipientId recipientId, long threadId, int distributionType, long lastSeen, int startingPosition) {
+    Intent intent = ConversationActivity.buildIntent(activity, recipientId, threadId, distributionType, lastSeen, startingPosition);
+
+    activity.startActivity(intent);
+    activity.overridePendingTransition(R.anim.slide_from_end, R.anim.fade_scale_out);
+  }
+
+  public void goToAppSettings() {
+    Intent intent = new Intent(activity, ApplicationPreferencesActivity.class);
+    activity.startActivity(intent);
+  }
+
+
+  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)
+                        .replace(R.id.fragment_container, ConversationListArchiveFragment.newInstance())
+                        .addToBackStack(null)
+                        .commit();
+  }
+
+  public void goToGroupCreation() {
+    Intent intent = new Intent(activity, GroupCreateActivity.class);
+    activity.startActivity(intent);
+  }
+
+  public void goToInvite() {
+    Intent intent = new Intent(activity, InviteActivity.class);
+    activity.startActivity(intent);
+  }
+
+  public void goToInsights() {
+    InsightsLauncher.showInsightsDashboard(activity.getSupportFragmentManager());
+  }
+
+  private @NonNull FragmentManager getFragmentManager() {
+    return activity.getSupportFragmentManager();
+  }
+
+  public interface BackHandler {
+    /**
+     * @return True if the back pressed was handled in our own custom way, false if it should be given
+     *         to the system to do the default behavior.
+     */
+    boolean onBackPressed();
+  }
+}

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

@@ -0,0 +1,5 @@
+package org.thoughtcrime.securesms;
+
+public interface MasterSecretListener {
+  void onMasterSecretCleared();
+}

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

@@ -0,0 +1,794 @@
+/*
+ * Copyright (C) 2014 Open Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.thoughtcrime.securesms;
+
+import android.Manifest;
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.core.util.Pair;
+import androidx.core.view.ViewCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.lifecycle.ViewModelProviders;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.viewpager.widget.ViewPager;
+
+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.permissions.Permissions;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.util.AttachmentUtil;
+import org.thoughtcrime.securesms.util.DateUtils;
+import org.thoughtcrime.securesms.util.SaveAttachmentTask;
+import org.thoughtcrime.securesms.util.SaveAttachmentTask.Attachment;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * Activity for displaying media attachments in-app
+ */
+public final class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
+  implements LoaderManager.LoaderCallbacks<Pair<Cursor, Integer>>,
+             MediaRailAdapter.RailItemListener,
+             MediaPreviewFragment.Events
+{
+
+  private final static String TAG = MediaPreviewActivity.class.getSimpleName();
+
+  private static final int NOT_IN_A_THREAD = -2;
+
+  public static final String THREAD_ID_EXTRA      = "thread_id";
+  public static final String DATE_EXTRA           = "date";
+  public static final String SIZE_EXTRA           = "size";
+  public static final String CAPTION_EXTRA        = "caption";
+  public static final String LEFT_IS_RECENT_EXTRA = "left_is_recent";
+  public static final String HIDE_ALL_MEDIA_EXTRA = "came_from_all_media";
+  public static final String SHOW_THREAD_EXTRA    = "show_thread";
+  public static final String SORTING_EXTRA        = "sorting";
+
+  private ViewPager             mediaPager;
+  private View                  detailsContainer;
+  private TextView              caption;
+  private View                  captionContainer;
+  private RecyclerView          albumRail;
+  private MediaRailAdapter      albumRailAdapter;
+  private ViewGroup             playbackControlsContainer;
+  private Uri                   initialMediaUri;
+  private String                initialMediaType;
+  private long                  initialMediaSize;
+  private String                initialCaption;
+  private boolean               leftIsRecent;
+  private MediaPreviewViewModel viewModel;
+  private ViewPagerListener     viewPagerListener;
+
+  private int                   restartItem      = -1;
+  private long                  threadId         = NOT_IN_A_THREAD;
+  private boolean               cameFromAllMedia;
+  private boolean               showThread;
+  private MediaDatabase.Sorting sorting;
+
+  @SuppressWarnings("ConstantConditions")
+  @Override
+  protected void onCreate(Bundle bundle, boolean ready) {
+    this.setTheme(R.style.TextSecure_MediaPreview);
+    setContentView(R.layout.media_preview_activity);
+
+    setSupportActionBar(findViewById(R.id.toolbar));
+
+    viewModel = ViewModelProviders.of(this).get(MediaPreviewViewModel.class);
+
+    getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+                         WindowManager.LayoutParams.FLAG_FULLSCREEN);
+
+    showSystemUI();
+
+    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+    initializeViews();
+    initializeResources();
+    initializeObservers();
+  }
+
+  @Override
+  public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+    Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
+  }
+
+  @Override
+  public void onRailItemClicked(int distanceFromActive) {
+    mediaPager.setCurrentItem(mediaPager.getCurrentItem() + distanceFromActive);
+  }
+
+  @Override
+  public void onRailItemDeleteClicked(int distanceFromActive) {
+    throw new UnsupportedOperationException("Callback unsupported.");
+  }
+
+  @SuppressWarnings("ConstantConditions")
+  private void initializeActionBar() {
+    MediaItem mediaItem = getCurrentMediaItem();
+
+    if (mediaItem != null) {
+      getSupportActionBar().setTitle(getTitleText(mediaItem));
+      getSupportActionBar().setSubtitle(getSubTitleText(mediaItem));
+    }
+  }
+
+  private @NonNull String getTitleText(@NonNull MediaItem mediaItem) {
+    String from;
+    if      (mediaItem.outgoing)          from = getString(R.string.MediaPreviewActivity_you);
+    else if (mediaItem.recipient != null) from = mediaItem.recipient.toShortString(this);
+    else                                  from = "";
+
+    if (showThread) {
+      String    to              = null;
+      Recipient threadRecipient = mediaItem.threadRecipient;
+
+      if (threadRecipient != null) {
+        if (mediaItem.outgoing || threadRecipient.isGroup()) {
+          if (threadRecipient.isLocalNumber()) {
+            from = getString(R.string.note_to_self);
+          } else {
+            to = threadRecipient.toShortString(this);
+          }
+        } else {
+          to = getString(R.string.MediaPreviewActivity_you);
+        }
+      }
+
+      return to != null ? getString(R.string.MediaPreviewActivity_s_to_s, from, to)
+                        : from;
+    } else {
+      return from;
+    }
+  }
+
+  private @NonNull String getSubTitleText(@NonNull MediaItem mediaItem) {
+    if (mediaItem.date > 0) {
+      return DateUtils.getExtendedRelativeTimeSpanString(this, Locale.getDefault(), mediaItem.date);
+    } else {
+      return getString(R.string.MediaPreviewActivity_draft);
+    }
+  }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+
+    initializeMedia();
+  }
+
+  @Override
+  public void onPause() {
+    super.onPause();
+    restartItem = cleanupMedia();
+  }
+
+  @Override
+  protected void onNewIntent(Intent intent) {
+    super.onNewIntent(intent);
+    setIntent(intent);
+    initializeResources();
+  }
+
+  private void initializeViews() {
+    mediaPager = findViewById(R.id.media_pager);
+    mediaPager.setOffscreenPageLimit(1);
+    mediaPager.setPageTransformer(true, new DepthPageTransformer());
+
+    viewPagerListener = new ViewPagerListener();
+    mediaPager.addOnPageChangeListener(viewPagerListener);
+
+    albumRail        = findViewById(R.id.media_preview_album_rail);
+    albumRailAdapter = new MediaRailAdapter(GlideApp.with(this), this, false);
+
+    albumRail.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false));
+    albumRail.setAdapter(albumRailAdapter);
+
+    detailsContainer          = findViewById(R.id.media_preview_details_container);
+    caption                   = findViewById(R.id.media_preview_caption);
+    captionContainer          = findViewById(R.id.media_preview_caption_container);
+    playbackControlsContainer = findViewById(R.id.media_preview_playback_controls_container);
+
+    View toolbarLayout = findViewById(R.id.toolbar_layout);
+
+    anchorMarginsToBottomInsets(detailsContainer);
+
+    anchorMarginsToTopInsets(toolbarLayout);
+
+    showAndHideWithSystemUI(getWindow(), detailsContainer, toolbarLayout);
+  }
+
+  private void initializeResources() {
+    Intent intent = getIntent();
+
+    threadId         = intent.getLongExtra(THREAD_ID_EXTRA, NOT_IN_A_THREAD);
+    cameFromAllMedia = intent.getBooleanExtra(HIDE_ALL_MEDIA_EXTRA, false);
+    showThread       = intent.getBooleanExtra(SHOW_THREAD_EXTRA, false);
+    sorting          = MediaDatabase.Sorting.values()[intent.getIntExtra(SORTING_EXTRA, 0)];
+
+    initialMediaUri  = intent.getData();
+    initialMediaType = intent.getType();
+    initialMediaSize = intent.getLongExtra(SIZE_EXTRA, 0);
+    initialCaption   = intent.getStringExtra(CAPTION_EXTRA);
+    leftIsRecent     = intent.getBooleanExtra(LEFT_IS_RECENT_EXTRA, false);
+    restartItem      = -1;
+  }
+
+  private void initializeObservers() {
+    viewModel.getPreviewData().observe(this, previewData -> {
+      if (previewData == null || mediaPager == null || mediaPager.getAdapter() == null) {
+        return;
+      }
+
+      if (!((MediaItemAdapter) mediaPager.getAdapter()).hasFragmentFor(mediaPager.getCurrentItem())) {
+        Log.d(TAG, "MediaItemAdapter wasn't ready. Posting again...");
+        viewModel.resubmitPreviewData();
+      }
+
+      View playbackControls = ((MediaItemAdapter) mediaPager.getAdapter()).getPlaybackControls(mediaPager.getCurrentItem());
+
+      if (previewData.getAlbumThumbnails().isEmpty() && previewData.getCaption() == null && playbackControls == null) {
+        detailsContainer.setVisibility(View.GONE);
+      } else {
+        detailsContainer.setVisibility(View.VISIBLE);
+      }
+
+      albumRail.setVisibility(previewData.getAlbumThumbnails().isEmpty() ? View.GONE : View.VISIBLE);
+      albumRailAdapter.setMedia(previewData.getAlbumThumbnails(), previewData.getActivePosition());
+      albumRail.smoothScrollToPosition(previewData.getActivePosition());
+
+      captionContainer.setVisibility(previewData.getCaption() == null ? View.GONE : View.VISIBLE);
+      caption.setText(previewData.getCaption());
+
+      if (playbackControls != null) {
+        ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        playbackControls.setLayoutParams(params);
+
+        playbackControlsContainer.removeAllViews();
+        playbackControlsContainer.addView(playbackControls);
+      } else {
+        playbackControlsContainer.removeAllViews();
+      }
+    });
+  }
+
+  private void initializeMedia() {
+    if (!isContentTypeSupported(initialMediaType)) {
+      Log.w(TAG, "Unsupported media type sent to MediaPreviewActivity, finishing.");
+      Toast.makeText(getApplicationContext(), R.string.MediaPreviewActivity_unssuported_media_type, Toast.LENGTH_LONG).show();
+      finish();
+    }
+
+    Log.i(TAG, "Loading Part URI: " + initialMediaUri);
+
+    if (isMediaInDb()) {
+      LoaderManager.getInstance(this).restartLoader(0, null, this);
+    } else {
+      mediaPager.setAdapter(new SingleItemPagerAdapter(getSupportFragmentManager(), initialMediaUri, initialMediaType, initialMediaSize));
+
+      if (initialCaption != null) {
+        detailsContainer.setVisibility(View.VISIBLE);
+        captionContainer.setVisibility(View.VISIBLE);
+        caption.setText(initialCaption);
+      }
+    }
+  }
+
+  private int cleanupMedia() {
+    int restartItem = mediaPager.getCurrentItem();
+
+    mediaPager.removeAllViews();
+    mediaPager.setAdapter(null);
+
+    return restartItem;
+  }
+
+  private void showOverview() {
+    startActivity(MediaOverviewActivity.forThread(this, threadId));
+  }
+
+  private void forward() {
+    MediaItem mediaItem = getCurrentMediaItem();
+
+    if (mediaItem != null) {
+      Intent composeIntent = new Intent(this, ShareActivity.class);
+      composeIntent.putExtra(Intent.EXTRA_STREAM, mediaItem.uri);
+      composeIntent.setType(mediaItem.type);
+      startActivity(composeIntent);
+    }
+  }
+
+  @SuppressWarnings("CodeBlock2Expr")
+  @SuppressLint("InlinedApi")
+  private void saveToDisk() {
+    MediaItem mediaItem = getCurrentMediaItem();
+
+    if (mediaItem != null) {
+      SaveAttachmentTask.showWarningDialog(this, (dialogInterface, i) -> {
+        Permissions.with(this)
+                   .request(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE)
+                   .ifNecessary()
+                   .withPermanentDenialDialog(getString(R.string.MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied))
+                   .onAnyDenied(() -> Toast.makeText(this, R.string.MediaPreviewActivity_unable_to_write_to_external_storage_without_permission, Toast.LENGTH_LONG).show())
+                   .onAllGranted(() -> {
+                     SaveAttachmentTask saveTask = new SaveAttachmentTask(MediaPreviewActivity.this);
+                     long saveDate = (mediaItem.date > 0) ? mediaItem.date : System.currentTimeMillis();
+                     saveTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Attachment(mediaItem.uri, mediaItem.type, saveDate, null));
+                   })
+                   .execute();
+      });
+    }
+  }
+
+  @SuppressLint("StaticFieldLeak")
+  private void deleteMedia() {
+    MediaItem mediaItem = getCurrentMediaItem();
+    if (mediaItem == null || mediaItem.attachment == null) {
+      return;
+    }
+
+    AlertDialog.Builder builder = new AlertDialog.Builder(this);
+    builder.setIconAttribute(R.attr.dialog_alert_icon);
+    builder.setTitle(R.string.MediaPreviewActivity_media_delete_confirmation_title);
+    builder.setMessage(R.string.MediaPreviewActivity_media_delete_confirmation_message);
+    builder.setCancelable(true);
+
+    builder.setPositiveButton(R.string.delete, (dialogInterface, which) -> {
+      new AsyncTask<Void, Void, Void>() {
+        @Override
+        protected Void doInBackground(Void... voids) {
+          AttachmentUtil.deleteAttachment(MediaPreviewActivity.this.getApplicationContext(),
+                                          mediaItem.attachment);
+          return null;
+        }
+      }.execute();
+
+      finish();
+    });
+    builder.setNegativeButton(android.R.string.cancel, null);
+    builder.show();
+  }
+
+  @Override
+  public boolean onPrepareOptionsMenu(Menu menu) {
+    super.onPrepareOptionsMenu(menu);
+
+    menu.clear();
+    MenuInflater inflater = this.getMenuInflater();
+    inflater.inflate(R.menu.media_preview, menu);
+
+    if (!isMediaInDb()) {
+      menu.findItem(R.id.media_preview__overview).setVisible(false);
+      menu.findItem(R.id.delete).setVisible(false);
+    }
+
+    if (cameFromAllMedia) {
+      menu.findItem(R.id.media_preview__overview).setVisible(false);
+    }
+
+    return true;
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(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;
+    }
+
+    return false;
+  }
+
+  private boolean isMediaInDb() {
+    return threadId != NOT_IN_A_THREAD;
+  }
+
+  private @Nullable MediaItem getCurrentMediaItem() {
+    MediaItemAdapter adapter = (MediaItemAdapter)mediaPager.getAdapter();
+
+    if (adapter != null) {
+      return adapter.getMediaItemFor(mediaPager.getCurrentItem());
+    } else {
+      return null;
+    }
+  }
+
+  public static boolean isContentTypeSupported(final String contentType) {
+    return contentType != null && (contentType.startsWith("image/") || contentType.startsWith("video/"));
+  }
+
+  @Override
+  public @NonNull Loader<Pair<Cursor, Integer>> onCreateLoader(int id, Bundle args) {
+    return new PagingMediaLoader(this, threadId, initialMediaUri, leftIsRecent, sorting);
+  }
+
+  @Override
+  public void onLoadFinished(@NonNull Loader<Pair<Cursor, Integer>> loader, @Nullable Pair<Cursor, Integer> data) {
+    if (data != null) {
+      @SuppressWarnings("ConstantConditions")
+      CursorPagerAdapter adapter = new CursorPagerAdapter(getSupportFragmentManager(),this, data.first, data.second, leftIsRecent);
+      mediaPager.setAdapter(adapter);
+      adapter.setActive(true);
+
+      viewModel.setCursor(this, data.first, leftIsRecent);
+
+      int item = restartItem >= 0 ? restartItem : data.second;
+      mediaPager.setCurrentItem(item);
+
+      if (item == 0) {
+        viewPagerListener.onPageSelected(0);
+      }
+    }
+  }
+
+  @Override
+  public void onLoaderReset(@NonNull Loader<Pair<Cursor, Integer>> loader) {
+
+  }
+
+  @Override
+  public boolean singleTapOnMedia() {
+    toggleUiVisibility();
+    return true;
+  }
+
+  private void toggleUiVisibility() {
+    int systemUiVisibility = getWindow().getDecorView().getSystemUiVisibility();
+    if ((systemUiVisibility & View.SYSTEM_UI_FLAG_FULLSCREEN) != 0) {
+      showSystemUI();
+    } else {
+      hideSystemUI();
+    }
+  }
+
+  private void hideSystemUI() {
+    getWindow().getDecorView().setSystemUiVisibility(
+        View.SYSTEM_UI_FLAG_IMMERSIVE              |
+        View.SYSTEM_UI_FLAG_LAYOUT_STABLE          |
+        View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+        View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN      |
+        View.SYSTEM_UI_FLAG_HIDE_NAVIGATION        |
+        View.SYSTEM_UI_FLAG_FULLSCREEN              );
+  }
+
+  private void showSystemUI() {
+    getWindow().getDecorView().setSystemUiVisibility(
+        View.SYSTEM_UI_FLAG_LAYOUT_STABLE          |
+        View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+        View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN       );
+  }
+
+  private class ViewPagerListener extends ExtendedOnPageChangedListener {
+
+    @Override
+    public void onPageSelected(int position) {
+      super.onPageSelected(position);
+
+      MediaItemAdapter adapter = (MediaItemAdapter)mediaPager.getAdapter();
+
+      if (adapter != null) {
+        MediaItem item = adapter.getMediaItemFor(position);
+        if (item.recipient != null) item.recipient.live().observe(MediaPreviewActivity.this, r -> initializeActionBar());
+        viewModel.setActiveAlbumRailItem(MediaPreviewActivity.this, position);
+        initializeActionBar();
+      }
+    }
+
+
+    @Override
+    public void onPageUnselected(int position) {
+      MediaItemAdapter adapter = (MediaItemAdapter)mediaPager.getAdapter();
+
+      if (adapter != null) {
+        MediaItem item = adapter.getMediaItemFor(position);
+        if (item.recipient != null) item.recipient.live().removeObservers(MediaPreviewActivity.this);
+
+        adapter.pause(position);
+      }
+    }
+  }
+
+  private static class SingleItemPagerAdapter extends FragmentStatePagerAdapter implements MediaItemAdapter {
+
+    private final Uri    uri;
+    private final String mediaType;
+    private final long   size;
+
+    private MediaPreviewFragment mediaPreviewFragment;
+
+    SingleItemPagerAdapter(@NonNull FragmentManager fragmentManager,
+                           @NonNull Uri uri,
+                           @NonNull String mediaType,
+                           long size)
+    {
+      super(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
+      this.uri       = uri;
+      this.mediaType = mediaType;
+      this.size      = size;
+    }
+
+    @Override
+    public int getCount() {
+      return 1;
+    }
+
+    @NonNull
+    @Override
+    public Fragment getItem(int position) {
+      mediaPreviewFragment = MediaPreviewFragment.newInstance(uri, mediaType, size, true);
+      return mediaPreviewFragment;
+    }
+
+    @Override
+    public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
+      if (mediaPreviewFragment != null) {
+        mediaPreviewFragment.cleanUp();
+        mediaPreviewFragment = null;
+      }
+    }
+
+    @Override
+    public MediaItem getMediaItemFor(int position) {
+      return new MediaItem(null, null, null, uri, mediaType, -1, true);
+    }
+
+    @Override
+    public void pause(int position) {
+      if (mediaPreviewFragment != null) {
+        mediaPreviewFragment.pause();
+      }
+    }
+
+    @Override
+    public @Nullable View getPlaybackControls(int position) {
+      if (mediaPreviewFragment != null) {
+        return mediaPreviewFragment.getPlaybackControls();
+      }
+      return null;
+    }
+
+    @Override
+    public boolean hasFragmentFor(int position) {
+      return mediaPreviewFragment != null;
+    }
+  }
+
+  private static void anchorMarginsToBottomInsets(@NonNull View viewToAnchor) {
+    ViewCompat.setOnApplyWindowInsetsListener(viewToAnchor, (view, insets) -> {
+      ViewGroup.MarginLayoutParams layoutParams = (ViewGroup.MarginLayoutParams) view.getLayoutParams();
+
+      layoutParams.setMargins(insets.getSystemWindowInsetLeft(),
+                              layoutParams.topMargin,
+                              insets.getSystemWindowInsetRight(),
+                              insets.getSystemWindowInsetBottom());
+
+      view.setLayoutParams(layoutParams);
+
+      return insets;
+    });
+  }
+
+  private static void anchorMarginsToTopInsets(@NonNull View viewToAnchor) {
+    ViewCompat.setOnApplyWindowInsetsListener(viewToAnchor, (view, insets) -> {
+      ViewGroup.MarginLayoutParams layoutParams = (ViewGroup.MarginLayoutParams) view.getLayoutParams();
+
+      layoutParams.setMargins(insets.getSystemWindowInsetLeft(),
+                              insets.getSystemWindowInsetTop(),
+                              insets.getSystemWindowInsetRight(),
+                              layoutParams.bottomMargin);
+
+      view.setLayoutParams(layoutParams);
+
+      return insets;
+    });
+  }
+
+  private static void showAndHideWithSystemUI(@NonNull Window window, @NonNull View... views) {
+    window.getDecorView().setOnSystemUiVisibilityChangeListener(visibility -> {
+      boolean hide = (visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) != 0;
+
+      for (View view : views) {
+        view.animate()
+            .alpha(hide ? 0 : 1)
+            .start();
+      }
+    });
+  }
+
+  private static class CursorPagerAdapter extends FragmentStatePagerAdapter implements MediaItemAdapter {
+
+    @SuppressLint("UseSparseArrays")
+    private final Map<Integer, MediaPreviewFragment> mediaFragments = new HashMap<>();
+
+    private final Context context;
+    private final Cursor  cursor;
+    private final boolean leftIsRecent;
+
+    private boolean active;
+    private int     autoPlayPosition;
+
+    CursorPagerAdapter(@NonNull FragmentManager fragmentManager,
+                       @NonNull Context context,
+                       @NonNull Cursor cursor,
+                       int autoPlayPosition,
+                       boolean leftIsRecent)
+    {
+      super(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
+      this.context          = context.getApplicationContext();
+      this.cursor           = cursor;
+      this.autoPlayPosition = autoPlayPosition;
+      this.leftIsRecent     = leftIsRecent;
+    }
+
+    public void setActive(boolean active) {
+      this.active = active;
+      notifyDataSetChanged();
+    }
+
+    @Override
+    public int getCount() {
+      if (!active) return 0;
+      else         return cursor.getCount();
+    }
+
+    @NonNull
+    @Override
+    public Fragment getItem(int position) {
+      boolean autoPlay = autoPlayPosition == position;
+      int cursorPosition = getCursorPosition(position);
+
+      autoPlayPosition = -1;
+
+      cursor.moveToPosition(cursorPosition);
+
+      MediaDatabase.MediaRecord mediaRecord = MediaDatabase.MediaRecord.from(context, cursor);
+      DatabaseAttachment        attachment  = mediaRecord.getAttachment();
+      MediaPreviewFragment      fragment    = MediaPreviewFragment.newInstance(attachment, autoPlay);
+
+      mediaFragments.put(position, fragment);
+
+      return fragment;
+    }
+
+    @Override
+    public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
+      MediaPreviewFragment removed = mediaFragments.remove(position);
+
+      if (removed != null) {
+        removed.cleanUp();
+      }
+
+      super.destroyItem(container, position, object);
+    }
+
+    public MediaItem getMediaItemFor(int position) {
+      cursor.moveToPosition(getCursorPosition(position));
+
+      MediaRecord mediaRecord       = MediaRecord.from(context, cursor);
+      RecipientId recipientId       = mediaRecord.getRecipientId();
+      RecipientId threadRecipientId = mediaRecord.getThreadRecipientId();
+
+      if (mediaRecord.getAttachment().getDataUri() == null) throw new AssertionError();
+
+      return new MediaItem(Recipient.live(recipientId).get(),
+                           Recipient.live(threadRecipientId).get(),
+                           mediaRecord.getAttachment(),
+                           mediaRecord.getAttachment().getDataUri(),
+                           mediaRecord.getContentType(),
+                           mediaRecord.getDate(),
+                           mediaRecord.isOutgoing());
+    }
+
+    @Override
+    public void pause(int position) {
+      MediaPreviewFragment mediaView = mediaFragments.get(position);
+      if (mediaView != null) mediaView.pause();
+    }
+
+    @Override
+    public @Nullable View getPlaybackControls(int position) {
+      MediaPreviewFragment mediaView = mediaFragments.get(position);
+      if (mediaView != null) return mediaView.getPlaybackControls();
+      return null;
+    }
+
+    @Override
+    public boolean hasFragmentFor(int position) {
+      return mediaFragments.containsKey(position);
+    }
+
+    private int getCursorPosition(int position) {
+      if (leftIsRecent) return position;
+      else              return cursor.getCount() - 1 - position;
+    }
+  }
+
+  private static class MediaItem {
+    private final @Nullable Recipient          recipient;
+    private final @Nullable Recipient          threadRecipient;
+    private final @Nullable DatabaseAttachment attachment;
+    private final @NonNull  Uri                uri;
+    private final @NonNull  String             type;
+    private final           long               date;
+    private final           boolean            outgoing;
+
+    private MediaItem(@Nullable Recipient recipient,
+                      @Nullable Recipient threadRecipient,
+                      @Nullable DatabaseAttachment attachment,
+                      @NonNull Uri uri,
+                      @NonNull String type,
+                      long date,
+                      boolean outgoing)
+    {
+      this.recipient       = recipient;
+      this.threadRecipient = threadRecipient;
+      this.attachment      = attachment;
+      this.uri             = uri;
+      this.type            = type;
+      this.date            = date;
+      this.outgoing        = outgoing;
+    }
+  }
+
+  interface MediaItemAdapter {
+    MediaItem getMediaItemFor(int position);
+    void pause(int position);
+    @Nullable View getPlaybackControls(int position);
+    boolean hasFragmentFor(int position);
+  }
+}

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

@@ -0,0 +1,445 @@
+/*
+ * Copyright (C) 2015 Open Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.thoughtcrime.securesms;
+
+import android.annotation.SuppressLint;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.database.Cursor;
+import android.graphics.drawable.ColorDrawable;
+import android.os.AsyncTask;
+import android.os.Build;
+import android.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.loader.app.LoaderManager.LoaderCallbacks;
+import androidx.loader.content.Loader;
+
+import org.thoughtcrime.securesms.conversation.ConversationItem;
+import org.thoughtcrime.securesms.logging.Log;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import org.thoughtcrime.securesms.MessageDetailsRecipientAdapter.RecipientDeliveryStatus;
+import org.thoughtcrime.securesms.color.MaterialColor;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.GroupReceiptDatabase;
+import org.thoughtcrime.securesms.database.GroupReceiptDatabase.GroupReceiptInfo;
+import org.thoughtcrime.securesms.database.MmsDatabase;
+import org.thoughtcrime.securesms.database.MmsSmsDatabase;
+import org.thoughtcrime.securesms.database.SmsDatabase;
+import org.thoughtcrime.securesms.database.loaders.MessageDetailsLoader;
+import org.thoughtcrime.securesms.database.model.MessageRecord;
+import org.thoughtcrime.securesms.mms.GlideApp;
+import org.thoughtcrime.securesms.mms.GlideRequests;
+import org.thoughtcrime.securesms.notifications.MessageNotifier;
+import org.thoughtcrime.securesms.recipients.LiveRecipient;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.sms.MessageSender;
+import org.thoughtcrime.securesms.util.DateUtils;
+import org.thoughtcrime.securesms.util.DynamicDarkActionBarTheme;
+import org.thoughtcrime.securesms.util.DynamicLanguage;
+import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.ExpirationUtil;
+import org.thoughtcrime.securesms.util.Util;
+import org.whispersystems.libsignal.util.guava.Optional;
+
+import java.lang.ref.WeakReference;
+import java.sql.Date;
+import java.text.SimpleDateFormat;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+
+/**
+ * @author Jake McGinty
+ */
+public class MessageDetailsActivity extends PassphraseRequiredActionBarActivity implements LoaderCallbacks<Cursor> {
+  private final static String TAG = MessageDetailsActivity.class.getSimpleName();
+
+  public static final String MESSAGE_ID_EXTRA    = "message_id";
+  public static final String THREAD_ID_EXTRA     = "thread_id";
+  public static final String IS_PUSH_GROUP_EXTRA = "is_push_group";
+  public static final String TYPE_EXTRA          = "type";
+  public static final String RECIPIENT_EXTRA     = "recipient_id";
+
+  private GlideRequests    glideRequests;
+  private long             threadId;
+  private boolean          isPushGroup;
+  private ConversationItem conversationItem;
+  private ViewGroup        itemParent;
+  private View             metadataContainer;
+  private View             expiresContainer;
+  private TextView         errorText;
+  private View             resendButton;
+  private TextView         sentDate;
+  private TextView         receivedDate;
+  private TextView         expiresInText;
+  private View             receivedContainer;
+  private TextView         transport;
+  private TextView         toFrom;
+  private ListView         recipientsList;
+  private LayoutInflater   inflater;
+
+  private DynamicTheme     dynamicTheme    = new DynamicDarkActionBarTheme();
+  private DynamicLanguage  dynamicLanguage = new DynamicLanguage();
+
+  private boolean running;
+
+  @Override
+  protected void onPreCreate() {
+    dynamicTheme.onCreate(this);
+    dynamicLanguage.onCreate(this);
+  }
+
+  @Override
+  public void onCreate(Bundle bundle, boolean ready) {
+    setContentView(R.layout.message_details_activity);
+    running = true;
+
+    initializeResources();
+    initializeActionBar();
+    getSupportLoaderManager().initLoader(0, null, this);
+  }
+
+  @Override
+  protected void onResume() {
+    super.onResume();
+    dynamicTheme.onResume(this);
+    dynamicLanguage.onResume(this);
+
+    assert getSupportActionBar() != null;
+    getSupportActionBar().setTitle(R.string.AndroidManifest__message_details);
+
+    MessageNotifier.setVisibleThread(threadId);
+  }
+
+  @Override
+  protected void onPause() {
+    super.onPause();
+    MessageNotifier.setVisibleThread(-1L);
+  }
+
+  @Override
+  protected void onDestroy() {
+    super.onDestroy();
+    running = false;
+  }
+
+  private void initializeActionBar() {
+    assert getSupportActionBar() != null;
+    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+    LiveRecipient recipient = Recipient.live(getIntent().getParcelableExtra(RECIPIENT_EXTRA));
+    recipient.observe(this, r -> setActionBarColor(r.getColor()));
+
+    setActionBarColor(recipient.get().getColor());
+  }
+
+  private void setActionBarColor(MaterialColor color) {
+    assert getSupportActionBar() != null;
+    getSupportActionBar().setBackgroundDrawable(new ColorDrawable(color.toActionBarColor(this)));
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+      getWindow().setStatusBarColor(color.toStatusBarColor(this));
+    }
+  }
+
+  private void initializeResources() {
+    inflater       = LayoutInflater.from(this);
+    View header = inflater.inflate(R.layout.message_details_header, recipientsList, false);
+
+    threadId          = getIntent().getLongExtra(THREAD_ID_EXTRA, -1);
+    isPushGroup       = getIntent().getBooleanExtra(IS_PUSH_GROUP_EXTRA, false);
+    glideRequests     = GlideApp.with(this);
+    itemParent        = header.findViewById(R.id.item_container);
+    recipientsList    = findViewById(R.id.recipients_list);
+    metadataContainer = header.findViewById(R.id.metadata_container);
+    errorText         = header.findViewById(R.id.error_text);
+    resendButton      = header.findViewById(R.id.resend_button);
+    sentDate          = header.findViewById(R.id.sent_time);
+    receivedContainer = header.findViewById(R.id.received_container);
+    receivedDate      = header.findViewById(R.id.received_time);
+    transport         = header.findViewById(R.id.transport);
+    toFrom            = header.findViewById(R.id.tofrom);
+    expiresContainer  = header.findViewById(R.id.expires_container);
+    expiresInText     = header.findViewById(R.id.expires_in);
+    recipientsList.setHeaderDividersEnabled(false);
+    recipientsList.addHeaderView(header, null, false);
+  }
+
+  private void updateTransport(MessageRecord messageRecord) {
+    final String transportText;
+    if (messageRecord.isOutgoing() && messageRecord.isFailed()) {
+      transportText = "-";
+    } else if (messageRecord.isPending()) {
+      transportText = getString(R.string.ConversationFragment_pending);
+    } else if (messageRecord.isPush()) {
+      transportText = getString(R.string.ConversationFragment_push);
+    } else if (messageRecord.isMms()) {
+      transportText = getString(R.string.ConversationFragment_mms);
+    } else {
+      transportText = getString(R.string.ConversationFragment_sms);
+    }
+
+    transport.setText(transportText);
+  }
+
+  private void updateTime(MessageRecord messageRecord) {
+    sentDate.setOnLongClickListener(null);
+    receivedDate.setOnLongClickListener(null);
+
+    if (messageRecord.isPending() || messageRecord.isFailed()) {
+      sentDate.setText("-");
+      receivedContainer.setVisibility(View.GONE);
+    } else {
+      Locale           dateLocale    = dynamicLanguage.getCurrentLocale();
+      SimpleDateFormat dateFormatter = DateUtils.getDetailedDateFormatter(this, dateLocale);
+      sentDate.setText(dateFormatter.format(new Date(messageRecord.getDateSent())));
+      sentDate.setOnLongClickListener(v -> {
+        copyToClipboard(String.valueOf(messageRecord.getDateSent()));
+        return true;
+      });
+
+      if (messageRecord.getDateReceived() != messageRecord.getDateSent() && !messageRecord.isOutgoing()) {
+        receivedDate.setText(dateFormatter.format(new Date(messageRecord.getDateReceived())));
+        receivedDate.setOnLongClickListener(v -> {
+          copyToClipboard(String.valueOf(messageRecord.getDateReceived()));
+          return true;
+        });
+        receivedContainer.setVisibility(View.VISIBLE);
+      } else {
+        receivedContainer.setVisibility(View.GONE);
+      }
+    }
+  }
+
+  private void updateExpirationTime(final MessageRecord messageRecord) {
+    if (messageRecord.getExpiresIn() <= 0 || messageRecord.getExpireStarted() <= 0) {
+      expiresContainer.setVisibility(View.GONE);
+      return;
+    }
+
+    expiresContainer.setVisibility(View.VISIBLE);
+    Util.runOnMain(new Runnable() {
+      @Override
+      public void run() {
+        long elapsed   = System.currentTimeMillis() - messageRecord.getExpireStarted();
+        long remaining = messageRecord.getExpiresIn() - elapsed;
+
+        String duration = ExpirationUtil.getExpirationDisplayValue(MessageDetailsActivity.this, Math.max((int)(remaining / 1000), 1));
+        expiresInText.setText(duration);
+
+        if (running) {
+          Util.runOnMainDelayed(this, 500);
+        }
+      }
+    });
+  }
+
+  private void updateRecipients(MessageRecord messageRecord, Recipient recipient, List<RecipientDeliveryStatus> recipients) {
+    final int toFromRes;
+    if (messageRecord.isMms() && !messageRecord.isPush() && !messageRecord.isOutgoing()) {
+      toFromRes = R.string.message_details_header__with;
+    } else if (messageRecord.isOutgoing()) {
+      toFromRes = R.string.message_details_header__to;
+    } else {
+      toFromRes = R.string.message_details_header__from;
+    }
+    toFrom.setText(toFromRes);
+    conversationItem.bind(messageRecord, Optional.absent(), Optional.absent(), glideRequests, dynamicLanguage.getCurrentLocale(), new HashSet<>(), recipient, null, false);
+    recipientsList.setAdapter(new MessageDetailsRecipientAdapter(this, glideRequests, messageRecord, recipients, isPushGroup));
+  }
+
+  private void inflateMessageViewIfAbsent(MessageRecord messageRecord) {
+    if (conversationItem == null) {
+      if (messageRecord.isGroupAction()) {
+        conversationItem = (ConversationItem) inflater.inflate(R.layout.conversation_item_update, itemParent, false);
+      } else if (messageRecord.isOutgoing()) {
+        conversationItem = (ConversationItem) inflater.inflate(R.layout.conversation_item_sent, itemParent, false);
+      } else {
+        conversationItem = (ConversationItem) inflater.inflate(R.layout.conversation_item_received, itemParent, false);
+      }
+      itemParent.addView(conversationItem);
+    }
+  }
+
+  private @Nullable MessageRecord getMessageRecord(Context context, Cursor cursor, String type) {
+    switch (type) {
+      case MmsSmsDatabase.SMS_TRANSPORT:
+        SmsDatabase        smsDatabase = DatabaseFactory.getSmsDatabase(context);
+        SmsDatabase.Reader reader      = smsDatabase.readerFor(cursor);
+        return reader.getNext();
+      case MmsSmsDatabase.MMS_TRANSPORT:
+        MmsDatabase        mmsDatabase = DatabaseFactory.getMmsDatabase(context);
+        MmsDatabase.Reader mmsReader   = mmsDatabase.readerFor(cursor);
+        return mmsReader.getNext();
+      default:
+        throw new AssertionError("no valid message type specified");
+    }
+  }
+
+  private void copyToClipboard(@NonNull String text) {
+    ((ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE)).setPrimaryClip(ClipData.newPlainText("text", text));
+  }
+
+  @Override
+  public @NonNull Loader<Cursor> onCreateLoader(int id, Bundle args) {
+    return new MessageDetailsLoader(this, getIntent().getStringExtra(TYPE_EXTRA),
+                                    getIntent().getLongExtra(MESSAGE_ID_EXTRA, -1));
+  }
+
+  @Override
+  public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor cursor) {
+    MessageRecord messageRecord = getMessageRecord(this, cursor, getIntent().getStringExtra(TYPE_EXTRA));
+
+    if (messageRecord == null) {
+      finish();
+    } else {
+      new MessageRecipientAsyncTask(this, messageRecord).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }
+  }
+
+  @Override
+  public void onLoaderReset(@NonNull Loader<Cursor> loader) {
+    recipientsList.setAdapter(null);
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    super.onOptionsItemSelected(item);
+
+    switch (item.getItemId()) {
+      case android.R.id.home: finish(); return true;
+    }
+
+    return false;
+  }
+
+  @SuppressLint("StaticFieldLeak")
+  private class MessageRecipientAsyncTask extends AsyncTask<Void,Void,List<RecipientDeliveryStatus>> {
+
+    private final WeakReference<Context> weakContext;
+    private final MessageRecord          messageRecord;
+
+    MessageRecipientAsyncTask(@NonNull Context context, @NonNull MessageRecord messageRecord) {
+      this.weakContext   = new WeakReference<>(context);
+      this.messageRecord = messageRecord;
+    }
+
+    protected Context getContext() {
+      return weakContext.get();
+    }
+
+    @Override
+    public List<RecipientDeliveryStatus> doInBackground(Void... voids) {
+      Context context = getContext();
+
+      if (context == null) {
+        Log.w(TAG, "associated context is destroyed, finishing early");
+        return null;
+      }
+
+      List<RecipientDeliveryStatus> recipients = new LinkedList<>();
+
+      if (!messageRecord.getRecipient().isGroup()) {
+        recipients.add(new RecipientDeliveryStatus(messageRecord.getRecipient(), getStatusFor(messageRecord.getDeliveryReceiptCount(), messageRecord.getReadReceiptCount(), messageRecord.isPending()), messageRecord.isUnidentified(), -1));
+      } else {
+        List<GroupReceiptInfo> receiptInfoList = DatabaseFactory.getGroupReceiptDatabase(context).getGroupReceiptInfo(messageRecord.getId());
+
+        if (receiptInfoList.isEmpty()) {
+          List<Recipient> group = DatabaseFactory.getGroupDatabase(context).getGroupMembers(messageRecord.getRecipient().requireGroupId(), false);
+
+          for (Recipient recipient : group) {
+            recipients.add(new RecipientDeliveryStatus(recipient, RecipientDeliveryStatus.Status.UNKNOWN, false, -1));
+          }
+        } else {
+          for (GroupReceiptInfo info : receiptInfoList) {
+            recipients.add(new RecipientDeliveryStatus(Recipient.resolved(info.getRecipientId()),
+                                                       getStatusFor(info.getStatus(), messageRecord.isPending(), messageRecord.isFailed()),
+                                                       info.isUnidentified(),
+                                                       info.getTimestamp()));
+          }
+        }
+      }
+
+      return recipients;
+    }
+
+    @Override
+    public void onPostExecute(List<RecipientDeliveryStatus> recipients) {
+      if (getContext() == null) {
+        Log.w(TAG, "AsyncTask finished with a destroyed context, leaving early.");
+        return;
+      }
+
+      inflateMessageViewIfAbsent(messageRecord);
+      updateRecipients(messageRecord, messageRecord.getRecipient(), recipients);
+
+      boolean isGroupNetworkFailure      = messageRecord.isFailed() && !messageRecord.getNetworkFailures().isEmpty();
+      boolean isIndividualNetworkFailure = messageRecord.isFailed() && !isPushGroup && messageRecord.getIdentityKeyMismatches().isEmpty();
+
+      if (isGroupNetworkFailure || isIndividualNetworkFailure) {
+        errorText.setVisibility(View.VISIBLE);
+        resendButton.setVisibility(View.VISIBLE);
+        resendButton.setOnClickListener(this::onResendClicked);
+        metadataContainer.setVisibility(View.GONE);
+      } else if (messageRecord.isFailed()) {
+        errorText.setVisibility(View.VISIBLE);
+        resendButton.setVisibility(View.GONE);
+        resendButton.setOnClickListener(null);
+        metadataContainer.setVisibility(View.GONE);
+      } else {
+        updateTransport(messageRecord);
+        updateTime(messageRecord);
+        updateExpirationTime(messageRecord);
+        errorText.setVisibility(View.GONE);
+        resendButton.setVisibility(View.GONE);
+        resendButton.setOnClickListener(null);
+        metadataContainer.setVisibility(View.VISIBLE);
+      }
+    }
+
+    private RecipientDeliveryStatus.Status getStatusFor(int deliveryReceiptCount, int readReceiptCount, boolean pending) {
+      if      (readReceiptCount > 0)     return RecipientDeliveryStatus.Status.READ;
+      else if (deliveryReceiptCount > 0) return RecipientDeliveryStatus.Status.DELIVERED;
+      else if (!pending)                 return RecipientDeliveryStatus.Status.SENT;
+      else                               return RecipientDeliveryStatus.Status.PENDING;
+    }
+
+    private RecipientDeliveryStatus.Status getStatusFor(int groupStatus, boolean pending, boolean failed) {
+      if      (groupStatus == GroupReceiptDatabase.STATUS_READ)                    return RecipientDeliveryStatus.Status.READ;
+      else if (groupStatus == GroupReceiptDatabase.STATUS_DELIVERED)               return RecipientDeliveryStatus.Status.DELIVERED;
+      else if (groupStatus == GroupReceiptDatabase.STATUS_UNDELIVERED && failed)   return RecipientDeliveryStatus.Status.UNKNOWN;
+      else if (groupStatus == GroupReceiptDatabase.STATUS_UNDELIVERED && !pending) return RecipientDeliveryStatus.Status.SENT;
+      else if (groupStatus == GroupReceiptDatabase.STATUS_UNDELIVERED)             return RecipientDeliveryStatus.Status.PENDING;
+      else if (groupStatus == GroupReceiptDatabase.STATUS_UNKNOWN)                 return RecipientDeliveryStatus.Status.UNKNOWN;
+      throw new AssertionError();
+    }
+
+    private void onResendClicked(View v) {
+      MessageSender.resend(MessageDetailsActivity.this, messageRecord);
+      resendButton.setVisibility(View.GONE);
+    }
+  }
+}

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

@@ -0,0 +1,112 @@
+package org.thoughtcrime.securesms;
+
+import android.content.Context;
+import androidx.annotation.NonNull;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AbsListView;
+import android.widget.BaseAdapter;
+
+import org.thoughtcrime.securesms.database.model.MessageRecord;
+import org.thoughtcrime.securesms.mms.GlideRequests;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.util.Conversions;
+import org.thoughtcrime.securesms.util.adapter.StableIdGenerator;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.List;
+
+class MessageDetailsRecipientAdapter extends BaseAdapter implements AbsListView.RecyclerListener {
+
+  private final Context                        context;
+  private final GlideRequests                  glideRequests;
+  private final MessageRecord                  record;
+  private final List<RecipientDeliveryStatus>  members;
+  private final boolean                        isPushGroup;
+  private final StableIdGenerator<RecipientId> idGenerator;
+
+  MessageDetailsRecipientAdapter(@NonNull Context context, @NonNull GlideRequests glideRequests,
+                                 @NonNull MessageRecord record, @NonNull List<RecipientDeliveryStatus> members,
+                                 boolean isPushGroup)
+  {
+    this.context       = context;
+    this.glideRequests = glideRequests;
+    this.record        = record;
+    this.isPushGroup   = isPushGroup;
+    this.members       = members;
+    this.idGenerator   = new StableIdGenerator<>();
+  }
+
+  @Override
+  public int getCount() {
+    return members.size();
+  }
+
+  @Override
+  public Object getItem(int position) {
+    return members.get(position);
+  }
+
+  @Override
+  public long getItemId(int position) {
+    return idGenerator.getId(members.get(position).recipient.getId());
+  }
+
+  @Override
+  public View getView(int position, View convertView, ViewGroup parent) {
+    if (convertView == null) {
+      convertView = LayoutInflater.from(context).inflate(R.layout.message_recipient_list_item, parent, false);
+    }
+
+    RecipientDeliveryStatus member = members.get(position);
+
+    ((MessageRecipientListItem)convertView).set(glideRequests, record, member, isPushGroup);
+    return convertView;
+  }
+
+  @Override
+  public void onMovedToScrapHeap(View view) {
+    ((MessageRecipientListItem)view).unbind();
+  }
+
+
+  static class RecipientDeliveryStatus {
+
+    enum Status {
+      UNKNOWN, PENDING, SENT, DELIVERED, READ
+    }
+
+    private final Recipient recipient;
+    private final Status    deliveryStatus;
+    private final boolean   isUnidentified;
+    private final long      timestamp;
+
+    RecipientDeliveryStatus(Recipient recipient, Status deliveryStatus, boolean isUnidentified, long timestamp) {
+      this.recipient      = recipient;
+      this.deliveryStatus = deliveryStatus;
+      this.isUnidentified = isUnidentified;
+      this.timestamp      = timestamp;
+    }
+
+    Status getDeliveryStatus() {
+      return deliveryStatus;
+    }
+
+    boolean isUnidentified() {
+      return isUnidentified;
+    }
+
+    public long getTimestamp() {
+      return timestamp;
+    }
+
+    public Recipient getRecipient() {
+      return recipient;
+    }
+
+  }
+
+}

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

@@ -0,0 +1,178 @@
+/*
+ * Copyright (C) 2014 Open Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.thoughtcrime.securesms;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+
+import org.thoughtcrime.securesms.MessageDetailsRecipientAdapter.RecipientDeliveryStatus;
+import org.thoughtcrime.securesms.components.AvatarImageView;
+import org.thoughtcrime.securesms.components.DeliveryStatusView;
+import org.thoughtcrime.securesms.components.FromTextView;
+import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
+import org.thoughtcrime.securesms.database.documents.NetworkFailure;
+import org.thoughtcrime.securesms.database.model.MessageRecord;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.mms.GlideRequests;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientForeverObserver;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+
+/**
+ * A simple view to show the recipients of a message
+ *
+ * @author Jake McGinty
+ */
+public class MessageRecipientListItem extends RelativeLayout
+    implements RecipientForeverObserver
+{
+  @SuppressWarnings("unused")
+  private final static String TAG = MessageRecipientListItem.class.getSimpleName();
+
+  private RecipientDeliveryStatus member;
+  private GlideRequests           glideRequests;
+  private FromTextView            fromView;
+  private TextView                errorDescription;
+  private TextView                actionDescription;
+  private Button                  conflictButton;
+  private AvatarImageView         contactPhotoImage;
+  private ImageView               unidentifiedDeliveryIcon;
+  private DeliveryStatusView      deliveryStatusView;
+
+  public MessageRecipientListItem(Context context) {
+    super(context);
+  }
+
+  public MessageRecipientListItem(Context context, AttributeSet attrs) {
+    super(context, attrs);
+  }
+
+  @Override
+  protected void onFinishInflate() {
+    super.onFinishInflate();
+    this.fromView                 = findViewById(R.id.from);
+    this.errorDescription         = findViewById(R.id.error_description);
+    this.actionDescription        = findViewById(R.id.action_description);
+    this.contactPhotoImage        = findViewById(R.id.contact_photo_image);
+    this.conflictButton           = findViewById(R.id.conflict_button);
+    this.unidentifiedDeliveryIcon = findViewById(R.id.ud_indicator);
+    this.deliveryStatusView       = findViewById(R.id.delivery_status);
+  }
+
+  public void set(final GlideRequests glideRequests,
+                  final MessageRecord record,
+                  final RecipientDeliveryStatus member,
+                  final boolean isPushGroup)
+  {
+    if (this.member != null) this.member.getRecipient().live().removeForeverObserver(this);
+
+    this.glideRequests = glideRequests;
+    this.member        = member;
+
+    member.getRecipient().live().observeForever(this);
+    fromView.setText(member.getRecipient());
+    contactPhotoImage.setAvatar(glideRequests, member.getRecipient(), false);
+    setIssueIndicators(record, isPushGroup);
+    unidentifiedDeliveryIcon.setVisibility(TextSecurePreferences.isShowUnidentifiedDeliveryIndicatorsEnabled(getContext()) && member.isUnidentified() ? VISIBLE : GONE);
+  }
+
+  private void setIssueIndicators(final MessageRecord record,
+                                  final boolean isPushGroup)
+  {
+    final NetworkFailure      networkFailure = getNetworkFailure(record);
+    final IdentityKeyMismatch keyMismatch    = networkFailure == null ? getKeyMismatch(record) : null;
+
+    String errorText = "";
+
+    if (keyMismatch != null) {
+      conflictButton.setVisibility(View.VISIBLE);
+
+      errorText = getContext().getString(R.string.MessageDetailsRecipient_new_safety_number);
+      conflictButton.setOnClickListener(v -> new ConfirmIdentityDialog(getContext(), record, keyMismatch).show());
+    } else if ((networkFailure != null && !record.isPending()) || (!isPushGroup && record.isFailed())) {
+      conflictButton.setVisibility(View.GONE);
+      errorText = getContext().getString(R.string.MessageDetailsRecipient_failed_to_send);
+    } else {
+      if (record.isOutgoing()) {
+        if (member.getDeliveryStatus() == RecipientDeliveryStatus.Status.PENDING || member.getDeliveryStatus() == RecipientDeliveryStatus.Status.UNKNOWN) {
+          deliveryStatusView.setVisibility(View.GONE);
+        } else if (member.getDeliveryStatus() == RecipientDeliveryStatus.Status.READ) {
+          deliveryStatusView.setRead();
+          deliveryStatusView.setVisibility(View.VISIBLE);
+        } else if (member.getDeliveryStatus() == RecipientDeliveryStatus.Status.DELIVERED) {
+          deliveryStatusView.setDelivered();
+          deliveryStatusView.setVisibility(View.VISIBLE);
+        } else if (member.getDeliveryStatus() == RecipientDeliveryStatus.Status.SENT) {
+          deliveryStatusView.setSent();
+          deliveryStatusView.setVisibility(View.VISIBLE);
+        }
+      } else {
+        deliveryStatusView.setVisibility(View.GONE);
+      }
+
+      conflictButton.setVisibility(View.GONE);
+    }
+
+    errorDescription.setText(errorText);
+    errorDescription.setVisibility(TextUtils.isEmpty(errorText) ? View.GONE : View.VISIBLE);
+  }
+
+  private NetworkFailure getNetworkFailure(final MessageRecord record) {
+    if (record.hasNetworkFailures()) {
+      for (final NetworkFailure failure : record.getNetworkFailures()) {
+        if (failure.getRecipientId(getContext()).equals(member.getRecipient().getId())) {
+          return failure;
+        }
+      }
+    }
+    return null;
+  }
+
+  private IdentityKeyMismatch getKeyMismatch(final MessageRecord record) {
+    if (record.isIdentityMismatchFailure()) {
+      for (final IdentityKeyMismatch mismatch : record.getIdentityKeyMismatches()) {
+        if (mismatch.getRecipientId(getContext()).equals(member.getRecipient().getId())) {
+          return mismatch;
+        }
+      }
+    }
+    return null;
+  }
+
+  public void unbind() {
+    if (this.member != null && this.member.getRecipient() != null) this.member.getRecipient().live().removeForeverObserver(this);
+  }
+
+  @Override
+  public void onRecipientChanged(@NonNull Recipient recipient) {
+    if (this.member != null && this.member.getRecipient().equals(recipient)) {
+      Log.d(TAG, "onRecipientChanged -- valid");
+      fromView.setText(recipient);
+      contactPhotoImage.setAvatar(glideRequests, recipient, false);
+    } else {
+      Log.d(TAG, "onRecipientChanged -- invalid");
+    }
+  }
+}

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

@@ -0,0 +1,54 @@
+package org.thoughtcrime.securesms;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+
+import java.util.concurrent.TimeUnit;
+
+public class MuteDialog extends AlertDialog {
+
+
+  protected MuteDialog(Context context) {
+    super(context);
+  }
+
+  protected MuteDialog(Context context, boolean cancelable, OnCancelListener cancelListener) {
+    super(context, cancelable, cancelListener);
+  }
+
+  protected MuteDialog(Context context, int theme) {
+    super(context, theme);
+  }
+
+  public static void show(final Context context, final @NonNull MuteSelectionListener listener) {
+    AlertDialog.Builder builder = new AlertDialog.Builder(context);
+    builder.setTitle(R.string.MuteDialog_mute_notifications);
+    builder.setItems(R.array.mute_durations, new DialogInterface.OnClickListener() {
+      @Override
+      public void onClick(DialogInterface dialog, final int which) {
+        final long muteUntil;
+
+        switch (which) {
+          case 0:  muteUntil = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(1);  break;
+          case 1:  muteUntil = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(2);  break;
+          case 2:  muteUntil = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(1);   break;
+          case 3:  muteUntil = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(7);   break;
+          case 4:  muteUntil = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(365); break;
+          default: muteUntil = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(1);  break;
+        }
+
+        listener.onMuted(muteUntil);
+      }
+    });
+
+    builder.show();
+
+  }
+
+  public interface MuteSelectionListener {
+    public void onMuted(long until);
+  }
+
+}

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

@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2015 Open Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.thoughtcrime.securesms;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Toast;
+
+import org.thoughtcrime.securesms.conversation.ConversationActivity;
+import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.ThreadDatabase;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.whispersystems.libsignal.util.guava.Optional;
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.UsernameUtil;
+import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
+import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.whispersystems.libsignal.util.guava.Optional;
+import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
+import org.whispersystems.signalservice.api.util.UuidUtil;
+
+import java.io.IOException;
+import java.util.UUID;
+
+/**
+ * Activity container for starting a new conversation.
+ *
+ * @author Moxie Marlinspike
+ *
+ */
+public class NewConversationActivity extends ContactSelectionActivity
+                                    implements ContactSelectionListFragment.InviteCallback
+{
+
+  @SuppressWarnings("unused")
+  private static final String TAG = NewConversationActivity.class.getSimpleName();
+
+  @Override
+  public void onCreate(Bundle bundle, boolean ready) {
+    super.onCreate(bundle, ready);
+    assert getSupportActionBar() != null;
+    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+  }
+
+  @Override
+  public void onContactSelected(Optional<RecipientId> recipientId, String number) {
+    Recipient recipient;
+    if (recipientId.isPresent()) {
+      recipient = Recipient.resolved(recipientId.get());
+    } else {
+      Log.i(TAG, "[onContactSelected] Maybe creating a new recipient.");
+      recipient = Recipient.external(this, number);
+    }
+    launch(recipient);
+  }
+
+  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);
+
+    intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, existingThread);
+    intent.putExtra(ConversationActivity.DISTRIBUTION_TYPE_EXTRA, ThreadDatabase.DistributionTypes.DEFAULT);
+    startActivity(intent);
+    finish();
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    super.onOptionsItemSelected(item);
+
+    switch (item.getItemId()) {
+    case android.R.id.home:   super.onBackPressed(); return true;
+    case R.id.menu_refresh:   handleManualRefresh(); return true;
+    case R.id.menu_new_group: handleCreateGroup();   return true;
+    case R.id.menu_invite:    handleInvite();        return true;
+    }
+
+    return false;
+  }
+
+  private void handleManualRefresh() {
+    contactsFragment.setRefreshing(true);
+    onRefresh();
+  }
+
+  private void handleCreateGroup() {
+    startActivity(new Intent(this, GroupCreateActivity.class));
+  }
+
+  private void handleInvite() {
+    startActivity(new Intent(this, InviteActivity.class));
+  }
+
+  @Override
+  protected boolean onPrepareOptionsPanel(View view, Menu menu) {
+    MenuInflater inflater = this.getMenuInflater();
+    menu.clear();
+    inflater.inflate(R.menu.new_conversation_activity, menu);
+    super.onPrepareOptionsMenu(menu);
+    return true;
+  }
+
+  @Override
+  public void onInvite() {
+    handleInvite();
+  }
+}

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

@@ -0,0 +1,77 @@
+/**
+ * Copyright (C) 2011 Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.thoughtcrime.securesms;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.IBinder;
+import org.thoughtcrime.securesms.logging.Log;
+
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.service.KeyCachingService;
+
+
+/**
+ * Base Activity for changing/prompting local encryption passphrase.
+ *
+ * @author Moxie Marlinspike
+ */
+public abstract class PassphraseActivity extends BaseActionBarActivity {
+
+  private static final String TAG = PassphraseActivity.class.getSimpleName();
+
+  private KeyCachingService keyCachingService;
+  private MasterSecret masterSecret;
+
+  protected void setMasterSecret(MasterSecret masterSecret) {
+    this.masterSecret = masterSecret;
+    Intent bindIntent = new Intent(this, KeyCachingService.class);
+    startService(bindIntent);
+    bindService(bindIntent, serviceConnection, Context.BIND_AUTO_CREATE);
+  }
+
+  protected abstract void cleanup();
+
+  private ServiceConnection serviceConnection = new ServiceConnection() {
+      @Override
+      public void onServiceConnected(ComponentName className, IBinder service) {
+        keyCachingService = ((KeyCachingService.KeySetBinder)service).getService();
+        keyCachingService.setMasterSecret(masterSecret);
+
+        PassphraseActivity.this.unbindService(PassphraseActivity.this.serviceConnection);
+
+        masterSecret = null;
+        cleanup();
+
+        Intent nextIntent = getIntent().getParcelableExtra("next_intent");
+        if (nextIntent != null) {
+            try {
+                startActivity(nextIntent);
+            } catch (java.lang.SecurityException e) {
+                Log.w(TAG, "Access permission not passed from PassphraseActivity, retry sharing.");
+            }
+        }
+        finish();
+      }
+      @Override
+      public void onServiceDisconnected(ComponentName name) {
+        keyCachingService = null;
+      }
+  };
+}

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

@@ -0,0 +1,175 @@
+/**
+ * Copyright (C) 2011 Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.thoughtcrime.securesms;
+
+import android.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.thoughtcrime.securesms.crypto.InvalidPassphraseException;
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
+import org.thoughtcrime.securesms.util.DynamicLanguage;
+import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+
+/**
+ * Activity for changing a user's local encryption passphrase.
+ *
+ * @author Moxie Marlinspike
+ */
+
+public class PassphraseChangeActivity extends PassphraseActivity {
+
+  private DynamicTheme    dynamicTheme    = new DynamicTheme();
+  private DynamicLanguage dynamicLanguage = new DynamicLanguage();
+
+  private EditText originalPassphrase;
+  private EditText newPassphrase;
+  private EditText repeatPassphrase;
+  private Button   okButton;
+  private Button   cancelButton;
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    dynamicTheme.onCreate(this);
+    dynamicLanguage.onCreate(this);
+    super.onCreate(savedInstanceState);
+
+    setContentView(R.layout.change_passphrase_activity);
+
+    initializeResources();
+  }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    dynamicTheme.onResume(this);
+    dynamicLanguage.onResume(this);
+  }
+
+  private void initializeResources() {
+    this.originalPassphrase      = (EditText) findViewById(R.id.old_passphrase      );
+    this.newPassphrase           = (EditText) findViewById(R.id.new_passphrase      );
+    this.repeatPassphrase        = (EditText) findViewById(R.id.repeat_passphrase   );
+
+    this.okButton                = (Button  ) findViewById(R.id.ok_button           );
+    this.cancelButton            = (Button  ) findViewById(R.id.cancel_button       );
+
+    this.okButton.setOnClickListener(new OkButtonClickListener());
+    this.cancelButton.setOnClickListener(new CancelButtonClickListener());
+
+    if (TextSecurePreferences.isPasswordDisabled(this)) {
+      this.originalPassphrase.setVisibility(View.GONE);
+    } else {
+      this.originalPassphrase.setVisibility(View.VISIBLE);
+    }
+  }
+
+  private void verifyAndSavePassphrases() {
+    Editable originalText = this.originalPassphrase.getText();
+    Editable newText      = this.newPassphrase.getText();
+    Editable repeatText   = this.repeatPassphrase.getText();
+
+    String original         = (originalText == null ? "" : originalText.toString());
+    String passphrase       = (newText == null ? "" : newText.toString());
+    String passphraseRepeat = (repeatText == null ? "" : repeatText.toString());
+
+    if (TextSecurePreferences.isPasswordDisabled(this)) {
+      original = MasterSecretUtil.UNENCRYPTED_PASSPHRASE;
+    }
+
+    if (!passphrase.equals(passphraseRepeat)) {
+      this.newPassphrase.setText("");
+      this.repeatPassphrase.setText("");
+      this.newPassphrase.setError(getString(R.string.PassphraseChangeActivity_passphrases_dont_match_exclamation));
+      this.newPassphrase.requestFocus();
+    } else if (passphrase.equals("")) {
+      this.newPassphrase.setError(getString(R.string.PassphraseChangeActivity_enter_new_passphrase_exclamation));
+      this.newPassphrase.requestFocus();
+    } else {
+      new ChangePassphraseTask(this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, original, passphrase);
+    }
+  }
+
+  private class CancelButtonClickListener implements OnClickListener {
+    public void onClick(View v) {
+      finish();
+    }
+  }
+
+  private class OkButtonClickListener implements OnClickListener {
+    public void onClick(View v) {
+      verifyAndSavePassphrases();
+    }
+  }
+
+  private class ChangePassphraseTask extends AsyncTask<String, Void, MasterSecret> {
+    private final Context context;
+
+    public ChangePassphraseTask(Context context) {
+      this.context = context;
+    }
+
+    @Override
+    protected void onPreExecute() {
+      okButton.setEnabled(false);
+    }
+
+    @Override
+    protected MasterSecret doInBackground(String... params) {
+      try {
+        MasterSecret masterSecret = MasterSecretUtil.changeMasterSecretPassphrase(context, params[0], params[1]);
+        TextSecurePreferences.setPasswordDisabled(context, false);
+
+        return masterSecret;
+
+      } catch (InvalidPassphraseException e) {
+        Log.w(PassphraseChangeActivity.class.getSimpleName(), e);
+        return null;
+      }
+    }
+
+    @Override
+    protected void onPostExecute(MasterSecret masterSecret) {
+      okButton.setEnabled(true);
+
+      if (masterSecret != null) {
+        setMasterSecret(masterSecret);
+      } else {
+        originalPassphrase.setText("");
+        originalPassphrase.setError(getString(R.string.PassphraseChangeActivity_incorrect_old_passphrase_exclamation));
+        originalPassphrase.requestFocus();
+      }
+    }
+  }
+
+  @Override
+  protected void cleanup() {
+    this.originalPassphrase = null;
+    this.newPassphrase      = null;
+    this.repeatPassphrase   = null;
+
+    System.gc();
+  }
+}

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

@@ -0,0 +1,88 @@
+/**
+ * Copyright (C) 2011 Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.thoughtcrime.securesms;
+
+import android.os.AsyncTask;
+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;
+
+/**
+ * Activity for creating a user's local encryption passphrase.
+ *
+ * @author Moxie Marlinspike
+ */
+
+public class PassphraseCreateActivity extends PassphraseActivity {
+
+  public PassphraseCreateActivity() { }
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+
+    setContentView(R.layout.create_passphrase_activity);
+
+    initializeResources();
+  }
+
+  private void initializeResources() {
+    new SecretGenerator().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, MasterSecretUtil.UNENCRYPTED_PASSPHRASE);
+  }
+
+  private class SecretGenerator extends AsyncTask<String, Void, Void> {
+    private MasterSecret   masterSecret;
+
+    @Override
+    protected void onPreExecute() {
+    }
+
+    @Override
+    protected Void doInBackground(String... params) {
+      String passphrase = params[0];
+      masterSecret      = MasterSecretUtil.generateMasterSecret(PassphraseCreateActivity.this,
+                                                                passphrase);
+
+      MasterSecretUtil.generateAsymmetricMasterSecret(PassphraseCreateActivity.this, masterSecret);
+      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;
+    }
+
+    @Override
+    protected void onPostExecute(Void param) {
+      setMasterSecret(masterSecret);
+    }
+  }
+
+  @Override
+  protected void cleanup() {
+    System.gc();
+  }
+}

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

@@ -0,0 +1,394 @@
+/*
+ * Copyright (C) 2011 Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.thoughtcrime.securesms;
+
+import android.animation.Animator;
+import android.annotation.SuppressLint;
+import android.app.KeyguardManager;
+import android.content.Context;
+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;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.WindowManager;
+import android.view.animation.Animation;
+import android.view.animation.BounceInterpolator;
+import android.view.animation.TranslateAnimation;
+import android.view.inputmethod.EditorInfo;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
+import org.thoughtcrime.securesms.components.AnimatingToggle;
+import org.thoughtcrime.securesms.crypto.InvalidPassphraseException;
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
+import org.thoughtcrime.securesms.util.DynamicIntroTheme;
+import org.thoughtcrime.securesms.util.DynamicLanguage;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+
+/**
+ * Activity that prompts for a user's passphrase.
+ *
+ * @author Moxie Marlinspike
+ */
+public class PassphrasePromptActivity extends PassphraseActivity {
+
+  private static final String TAG = PassphrasePromptActivity.class.getSimpleName();
+
+  private DynamicIntroTheme dynamicTheme    = new DynamicIntroTheme();
+  private DynamicLanguage   dynamicLanguage = new DynamicLanguage();
+
+  private View            passphraseAuthContainer;
+  private ImageView       fingerprintPrompt;
+  private TextView        lockScreenButton;
+
+  private EditText        passphraseText;
+  private ImageButton     showButton;
+  private ImageButton     hideButton;
+  private AnimatingToggle visibilityToggle;
+
+  private FingerprintManagerCompat fingerprintManager;
+  private CancellationSignal       fingerprintCancellationSignal;
+  private FingerprintListener      fingerprintListener;
+
+  private boolean authenticated;
+  private boolean failure;
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    Log.i(TAG, "onCreate()");
+    dynamicTheme.onCreate(this);
+    dynamicLanguage.onCreate(this);
+    getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+    getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+    super.onCreate(savedInstanceState);
+
+    setContentView(R.layout.prompt_passphrase_activity);
+    initializeResources();
+  }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    dynamicTheme.onResume(this);
+    dynamicLanguage.onResume(this);
+
+    setLockTypeVisibility();
+
+    if (TextSecurePreferences.isScreenLockEnabled(this) && !authenticated && !failure) {
+      resumeScreenLock();
+    }
+
+    failure = false;
+  }
+
+  @Override
+  public void onPause() {
+    super.onPause();
+
+    if (TextSecurePreferences.isScreenLockEnabled(this)) {
+      pauseScreenLock();
+    }
+  }
+
+  @Override
+  protected void onNewIntent(Intent intent) {
+    super.onNewIntent(intent);
+    setIntent(intent);
+  }
+
+  @Override
+  public boolean onPrepareOptionsMenu(Menu menu) {
+    MenuInflater inflater = this.getMenuInflater();
+    menu.clear();
+
+    inflater.inflate(R.menu.log_submit, menu);
+    super.onPrepareOptionsMenu(menu);
+    return true;
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    super.onOptionsItemSelected(item);
+    switch (item.getItemId()) {
+    case R.id.menu_submit_debug_logs: handleLogSubmit(); return true;
+    }
+
+    return false;
+  }
+
+  @Override
+  @SuppressLint("MissingSuperCall") // no fragments to dispatch to
+  public void onActivityResult(int requestCode, int resultcode, Intent data) {
+    if (requestCode != 1) return;
+
+    if (resultcode == RESULT_OK) {
+      handleAuthenticated();
+    } else {
+      Log.w(TAG, "Authentication failed");
+      failure = true;
+    }
+  }
+
+  private void handleLogSubmit() {
+    Intent intent = new Intent(this, LogSubmitActivity.class);
+    startActivity(intent);
+  }
+
+  private void handlePassphrase() {
+    try {
+      Editable text             = passphraseText.getText();
+      String passphrase         = (text == null ? "" : text.toString());
+      MasterSecret masterSecret = MasterSecretUtil.getMasterSecret(this, passphrase);
+
+      setMasterSecret(masterSecret);
+    } catch (InvalidPassphraseException ipe) {
+      passphraseText.setText("");
+      passphraseText.setError(
+              getString(R.string.PassphrasePromptActivity_invalid_passphrase_exclamation));
+    }
+  }
+
+  private void handleAuthenticated() {
+    try {
+      authenticated = true;
+      
+      MasterSecret masterSecret = MasterSecretUtil.getMasterSecret(this, MasterSecretUtil.UNENCRYPTED_PASSPHRASE);
+      setMasterSecret(masterSecret);
+    } catch (InvalidPassphraseException e) {
+      throw new AssertionError(e);
+    }
+  }
+
+  private void setPassphraseVisibility(boolean visibility) {
+    int cursorPosition = passphraseText.getSelectionStart();
+    if (visibility) {
+      passphraseText.setInputType(InputType.TYPE_CLASS_TEXT |
+                                  InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);
+    } else {
+      passphraseText.setInputType(InputType.TYPE_CLASS_TEXT |
+                                  InputType.TYPE_TEXT_VARIATION_PASSWORD);
+    }
+    passphraseText.setSelection(cursorPosition);
+  }
+
+  private void initializeResources() {
+
+    ImageButton okButton = findViewById(R.id.ok_button);
+    Toolbar     toolbar  = findViewById(R.id.toolbar);
+
+    showButton                    = findViewById(R.id.passphrase_visibility);
+    hideButton                    = findViewById(R.id.passphrase_visibility_off);
+    visibilityToggle              = findViewById(R.id.button_toggle);
+    passphraseText                = findViewById(R.id.passphrase_edit);
+    passphraseAuthContainer       = findViewById(R.id.password_auth_container);
+    fingerprintPrompt             = findViewById(R.id.fingerprint_auth_container);
+    lockScreenButton              = findViewById(R.id.lock_screen_auth_container);
+    fingerprintManager            = FingerprintManagerCompat.from(this);
+    fingerprintCancellationSignal = new CancellationSignal();
+    fingerprintListener           = new FingerprintListener();
+
+    setSupportActionBar(toolbar);
+    getSupportActionBar().setTitle("");
+
+    SpannableString hint = new SpannableString("  " + getString(R.string.PassphrasePromptActivity_enter_passphrase));
+    hint.setSpan(new RelativeSizeSpan(0.9f), 0, hint.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+    hint.setSpan(new TypefaceSpan("sans-serif"), 0, hint.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+
+    passphraseText.setHint(hint);
+    okButton.setOnClickListener(new OkButtonClickListener());
+    showButton.setOnClickListener(new ShowButtonOnClickListener());
+    hideButton.setOnClickListener(new HideButtonOnClickListener());
+    passphraseText.setOnEditorActionListener(new PassphraseActionListener());
+    passphraseText.setImeActionLabel(getString(R.string.prompt_passphrase_activity__unlock),
+                                     EditorInfo.IME_ACTION_DONE);
+
+    fingerprintPrompt.setImageResource(R.drawable.ic_fingerprint_white_48dp);
+    fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.signal_primary), PorterDuff.Mode.SRC_IN);
+
+    lockScreenButton.setOnClickListener(v -> resumeScreenLock());
+  }
+
+  private void setLockTypeVisibility() {
+    if (TextSecurePreferences.isScreenLockEnabled(this)) {
+      passphraseAuthContainer.setVisibility(View.GONE);
+
+      if (fingerprintManager.isHardwareDetected() && fingerprintManager.hasEnrolledFingerprints()) {
+        fingerprintPrompt.setVisibility(View.VISIBLE);
+        lockScreenButton.setVisibility(View.GONE);
+      } else {
+        fingerprintPrompt.setVisibility(View.GONE);
+        lockScreenButton.setVisibility(View.VISIBLE);
+      }
+    } else {
+      passphraseAuthContainer.setVisibility(View.VISIBLE);
+      fingerprintPrompt.setVisibility(View.GONE);
+      lockScreenButton.setVisibility(View.GONE);
+    }
+  }
+
+  private void resumeScreenLock() {
+    KeyguardManager keyguardManager = (KeyguardManager) getSystemService(Context.KEYGUARD_SERVICE);
+
+    assert keyguardManager != null;
+
+    if (!keyguardManager.isKeyguardSecure()) {
+      Log.w(TAG ,"Keyguard not secure...");
+      handleAuthenticated();
+      return;
+    }
+
+    if (fingerprintManager.isHardwareDetected() && fingerprintManager.hasEnrolledFingerprints()) {
+      Log.i(TAG, "Listening for fingerprints...");
+      fingerprintCancellationSignal = new CancellationSignal();
+      fingerprintManager.authenticate(null, 0, fingerprintCancellationSignal, fingerprintListener, null);
+    } else if (Build.VERSION.SDK_INT >= 21){
+      Log.i(TAG, "firing intent...");
+      Intent intent = keyguardManager.createConfirmDeviceCredentialIntent(getString(R.string.PassphrasePromptActivity_unlock_signal), "");
+      startActivityForResult(intent, 1);
+    } else {
+      Log.w(TAG, "Not compatible...");
+      handleAuthenticated();
+    }
+  }
+
+  private void pauseScreenLock() {
+    if (fingerprintCancellationSignal != null) {
+      fingerprintCancellationSignal.cancel();
+    }
+  }
+
+  private class PassphraseActionListener implements TextView.OnEditorActionListener {
+    @Override
+    public boolean onEditorAction(TextView exampleView, int actionId, KeyEvent keyEvent) {
+      if ((keyEvent == null && actionId == EditorInfo.IME_ACTION_DONE) ||
+          (keyEvent != null && keyEvent.getAction() == KeyEvent.ACTION_DOWN &&
+              (actionId == EditorInfo.IME_NULL)))
+      {
+        handlePassphrase();
+        return true;
+      } else if (keyEvent != null && keyEvent.getAction() == KeyEvent.ACTION_UP &&
+                 actionId == EditorInfo.IME_NULL)
+      {
+        return true;
+      }
+
+      return false;
+    }
+  }
+
+  private class OkButtonClickListener implements OnClickListener {
+    @Override
+    public void onClick(View v) {
+      handlePassphrase();
+    }
+  }
+
+  private class ShowButtonOnClickListener implements OnClickListener {
+    @Override
+    public void onClick(View v) {
+      visibilityToggle.display(hideButton);
+      setPassphraseVisibility(true);
+    }
+  }
+
+  private class HideButtonOnClickListener implements OnClickListener {
+    @Override
+    public void onClick(View v) {
+      visibilityToggle.display(showButton);
+      setPassphraseVisibility(false);
+    }
+  }
+
+  @Override
+  protected void cleanup() {
+    this.passphraseText.setText("");
+    System.gc();
+  }
+
+  private class FingerprintListener extends FingerprintManagerCompat.AuthenticationCallback {
+    @Override
+    public void onAuthenticationError(int errMsgId, CharSequence errString) {
+      Log.w(TAG, "Authentication error: " + errMsgId + " " + errString);
+      onAuthenticationFailed();
+    }
+
+    @Override
+    public void onAuthenticationSucceeded(FingerprintManagerCompat.AuthenticationResult result) {
+      Log.i(TAG, "onAuthenticationSucceeded");
+      fingerprintPrompt.setImageResource(R.drawable.ic_check_white_48dp);
+      fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.green_500), PorterDuff.Mode.SRC_IN);
+      fingerprintPrompt.animate().setInterpolator(new BounceInterpolator()).scaleX(1.1f).scaleY(1.1f).setDuration(500).setListener(new AnimationCompleteListener() {
+        @Override
+        public void onAnimationEnd(Animator animation) {
+          handleAuthenticated();
+
+          fingerprintPrompt.setImageResource(R.drawable.ic_fingerprint_white_48dp);
+          fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.signal_primary), PorterDuff.Mode.SRC_IN);
+        }
+      }).start();
+    }
+
+    @Override
+    public void onAuthenticationFailed() {
+      Log.w(TAG, "onAuthenticatoinFailed()");
+      FingerprintManagerCompat.AuthenticationCallback callback = this;
+
+      fingerprintPrompt.setImageResource(R.drawable.ic_close_white_48dp);
+      fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.red_500), PorterDuff.Mode.SRC_IN);
+
+      TranslateAnimation shake = new TranslateAnimation(0, 30, 0, 0);
+      shake.setDuration(50);
+      shake.setRepeatCount(7);
+      shake.setAnimationListener(new Animation.AnimationListener() {
+        @Override
+        public void onAnimationStart(Animation animation) {}
+
+        @Override
+        public void onAnimationEnd(Animation animation) {
+          fingerprintPrompt.setImageResource(R.drawable.ic_fingerprint_white_48dp);
+          fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.signal_primary), PorterDuff.Mode.SRC_IN);
+        }
+
+        @Override
+        public void onAnimationRepeat(Animation animation) {}
+      });
+
+      fingerprintPrompt.startAnimation(shake);
+    }
+
+  }
+}

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

@@ -0,0 +1,226 @@
+package org.thoughtcrime.securesms;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.migrations.ApplicationMigrationActivity;
+import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
+import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
+import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity;
+import org.thoughtcrime.securesms.service.KeyCachingService;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+
+import java.util.Locale;
+
+public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarActivity implements MasterSecretListener {
+  private static final String TAG = PassphraseRequiredActionBarActivity.class.getSimpleName();
+
+  public static final String LOCALE_EXTRA = "locale_extra";
+
+  private static final int STATE_NORMAL              = 0;
+  private static final int STATE_CREATE_PASSPHRASE   = 1;
+  private static final int STATE_PROMPT_PASSPHRASE   = 2;
+  private static final int STATE_UI_BLOCKING_UPGRADE = 3;
+  private static final int STATE_EXPERIENCE_UPGRADE  = 4;
+  private static final int STATE_WELCOME_PUSH_SCREEN = 5;
+
+  private SignalServiceNetworkAccess networkAccess;
+  private BroadcastReceiver          clearKeyReceiver;
+
+  @Override
+  protected final void onCreate(Bundle savedInstanceState) {
+    Log.d(TAG, "[" + Log.tag(getClass()) + "] onCreate()");
+    this.networkAccess = new SignalServiceNetworkAccess(this);
+    onPreCreate();
+
+    final boolean locked = KeyCachingService.isLocked(this);
+    routeApplicationState(locked);
+
+    super.onCreate(savedInstanceState);
+
+    if (!isFinishing()) {
+      initializeClearKeyReceiver();
+      onCreate(savedInstanceState, true);
+    }
+  }
+
+  protected void onPreCreate() {}
+  protected void onCreate(Bundle savedInstanceState, boolean ready) {}
+
+  @Override
+  protected void onResume() {
+    Log.d(TAG, "[" + Log.tag(getClass()) + "] onResume()");
+    super.onResume();
+
+    if (networkAccess.isCensored(this)) {
+      ApplicationDependencies.getJobManager().add(new PushNotificationReceiveJob(this));
+    }
+  }
+
+  @Override
+  protected void onStart() {
+    Log.d(TAG, "[" + Log.tag(getClass()) + "] onStart()");
+    super.onStart();
+  }
+
+  @Override
+  protected void onPause() {
+    Log.d(TAG, "[" + Log.tag(getClass()) + "] onPause()");
+    super.onPause();
+  }
+
+  @Override
+  protected void onStop() {
+    Log.d(TAG, "[" + Log.tag(getClass()) + "] onStop()");
+    super.onStop();
+  }
+
+  @Override
+  protected void onDestroy() {
+    Log.d(TAG, "[" + Log.tag(getClass()) + "] onDestroy()");
+    super.onDestroy();
+    removeClearKeyReceiver(this);
+  }
+
+  @Override
+  public void onMasterSecretCleared() {
+    Log.d(TAG, "onMasterSecretCleared()");
+    if (ApplicationContext.getInstance(this).isAppVisible()) routeApplicationState(true);
+    else                                                     finish();
+  }
+
+  protected <T extends Fragment> T initFragment(@IdRes int target,
+                                                @NonNull T fragment)
+  {
+    return initFragment(target, fragment, null);
+  }
+
+  protected <T extends Fragment> T initFragment(@IdRes int target,
+                                                @NonNull T fragment,
+                                                @Nullable Locale locale)
+  {
+    return initFragment(target, fragment, locale, null);
+  }
+
+  protected <T extends Fragment> T initFragment(@IdRes int target,
+                                                @NonNull T fragment,
+                                                @Nullable Locale locale,
+                                                @Nullable Bundle extras)
+  {
+    Bundle args = new Bundle();
+    args.putSerializable(LOCALE_EXTRA, locale);
+
+    if (extras != null) {
+      args.putAll(extras);
+    }
+
+    fragment.setArguments(args);
+    getSupportFragmentManager().beginTransaction()
+                               .replace(target, fragment)
+                               .commitAllowingStateLoss();
+    return fragment;
+  }
+
+  private void routeApplicationState(boolean locked) {
+    Intent intent = getIntentForState(getApplicationState(locked));
+    if (intent != null) {
+      startActivity(intent);
+      finish();
+    }
+  }
+
+  private Intent getIntentForState(int state) {
+    Log.d(TAG, "routeApplicationState(), state: " + state);
+
+    switch (state) {
+      case STATE_CREATE_PASSPHRASE:   return getCreatePassphraseIntent();
+      case STATE_PROMPT_PASSPHRASE:   return getPromptPassphraseIntent();
+      case STATE_UI_BLOCKING_UPGRADE: return getUiBlockingUpgradeIntent();
+      case STATE_WELCOME_PUSH_SCREEN: return getPushRegistrationIntent();
+      case STATE_EXPERIENCE_UPGRADE:  return getExperienceUpgradeIntent();
+      default:                        return null;
+    }
+  }
+
+  private int getApplicationState(boolean locked) {
+    if (!MasterSecretUtil.isPassphraseInitialized(this)) {
+      return STATE_CREATE_PASSPHRASE;
+    } else if (locked) {
+      return STATE_PROMPT_PASSPHRASE;
+    } else if (ApplicationMigrations.isUpdate(this) && ApplicationMigrations.isUiBlockingMigrationRunning()) {
+      return STATE_UI_BLOCKING_UPGRADE;
+    } else if (!TextSecurePreferences.hasPromptedPushRegistration(this)) {
+      return STATE_WELCOME_PUSH_SCREEN;
+    } else if (ExperienceUpgradeActivity.isUpdate(this)) {
+      return STATE_EXPERIENCE_UPGRADE;
+    } else {
+      return STATE_NORMAL;
+    }
+  }
+
+  private Intent getCreatePassphraseIntent() {
+    return getRoutedIntent(PassphraseCreateActivity.class, getIntent());
+  }
+
+  private Intent getPromptPassphraseIntent() {
+    return getRoutedIntent(PassphrasePromptActivity.class, getIntent());
+  }
+
+  private Intent getUiBlockingUpgradeIntent() {
+    return getRoutedIntent(ApplicationMigrationActivity.class,
+                           TextSecurePreferences.hasPromptedPushRegistration(this)
+                               ? getConversationListIntent()
+                               : getPushRegistrationIntent());
+  }
+
+  private Intent getExperienceUpgradeIntent() {
+    return getRoutedIntent(ExperienceUpgradeActivity.class, getIntent());
+  }
+
+  private Intent getPushRegistrationIntent() {
+    return RegistrationNavigationActivity.newIntentForNewRegistration(this);
+  }
+
+  private Intent getRoutedIntent(Class<?> destination, @Nullable Intent nextIntent) {
+    final Intent intent = new Intent(this, destination);
+    if (nextIntent != null)   intent.putExtra("next_intent", nextIntent);
+    return intent;
+  }
+
+  private Intent getConversationListIntent() {
+    // TODO [greyson] Navigation
+    return new Intent(this, MainActivity.class);
+  }
+
+  private void initializeClearKeyReceiver() {
+    this.clearKeyReceiver = new BroadcastReceiver() {
+      @Override
+      public void onReceive(Context context, Intent intent) {
+        Log.i(TAG, "onReceive() for clear key event");
+        onMasterSecretCleared();
+      }
+    };
+
+    IntentFilter filter = new IntentFilter(KeyCachingService.CLEAR_KEY_EVENT);
+    registerReceiver(clearKeyReceiver, filter, KeyCachingService.KEY_PERMISSION, null);
+  }
+
+  private void removeClearKeyReceiver(Context context) {
+    if (clearKeyReceiver != null) {
+      context.unregisterReceiver(clearKeyReceiver);
+      clearKeyReceiver = null;
+    }
+  }
+}

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

@@ -0,0 +1,30 @@
+/**
+ * Copyright (C) 2014 Open Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.thoughtcrime.securesms;
+
+import android.os.Bundle;
+import androidx.fragment.app.FragmentActivity;
+
+public class PlayServicesProblemActivity extends FragmentActivity {
+
+  @Override
+  public void onCreate(Bundle bundle) {
+    super.onCreate(bundle);
+    PlayServicesProblemFragment fragment = new PlayServicesProblemFragment();
+    fragment.show(getSupportFragmentManager(), "dialog");
+  }
+}

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

@@ -0,0 +1,65 @@
+/**
+ * Copyright (C) 2014 Open Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.thoughtcrime.securesms;
+
+import android.app.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 com.google.android.gms.common.GoogleApiAvailability;
+
+public class PlayServicesProblemFragment extends DialogFragment {
+
+  @Override
+  public @NonNull Dialog onCreateDialog(@Nullable Bundle bundle) {
+    int    code   = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(getActivity());
+    Dialog dialog = GoogleApiAvailability.getInstance().getErrorDialog(getActivity(), code, 9111);
+
+    if (dialog == null) {
+      return new AlertDialog.Builder(requireActivity())
+              .setNegativeButton(android.R.string.ok, null)
+              .setMessage(R.string.PlayServicesProblemFragment_the_version_of_google_play_services_you_have_installed_is_not_functioning)
+              .create();
+    } else {
+      return dialog;
+    }
+  }
+
+  @Override
+  public void onCancel(DialogInterface dialog) {
+    super.onCancel(dialog);
+    finish();
+  }
+
+  @Override
+  public void onDismiss(DialogInterface dialog) {
+    super.onDismiss(dialog);
+    finish();
+  }
+
+  private void finish() {
+    Activity activity = getActivity();
+    if (activity != null) activity.finish();
+  }
+  
+}

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

@@ -0,0 +1,31 @@
+package org.thoughtcrime.securesms;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.Button;
+
+import org.thoughtcrime.securesms.preferences.MmsPreferencesActivity;
+
+public class PromptMmsActivity extends PassphraseRequiredActionBarActivity {
+
+  @Override
+  protected void onCreate(Bundle bundle, boolean ready) {
+    setContentView(R.layout.prompt_apn_activity);
+    initializeResources();
+  }
+
+  private void initializeResources() {
+    Button okButton = findViewById(R.id.ok_button);
+    Button cancelButton = findViewById(R.id.cancel_button);
+
+    okButton.setOnClickListener(v -> {
+      Intent intent = new Intent(PromptMmsActivity.this, MmsPreferencesActivity.class);
+      intent.putExtras(PromptMmsActivity.this.getIntent().getExtras());
+      startActivity(intent);
+      finish();
+    });
+
+    cancelButton.setOnClickListener(v -> finish());
+  }
+
+}

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

@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2011 Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.thoughtcrime.securesms;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.annimon.stream.Stream;
+
+import org.thoughtcrime.securesms.contacts.SelectedContact;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Activity container for selecting a list of contacts.
+ *
+ * @author Moxie Marlinspike
+ *
+ */
+public class PushContactSelectionActivity extends ContactSelectionActivity {
+
+  public static final String KEY_SELECTED_RECIPIENTS = "recipients";
+
+  @SuppressWarnings("unused")
+  private final static String TAG = PushContactSelectionActivity.class.getSimpleName();
+
+  @Override
+  protected void onCreate(Bundle icicle, boolean ready) {
+    getIntent().putExtra(ContactSelectionListFragment.MULTI_SELECT, true);
+    super.onCreate(icicle, ready);
+
+    getToolbar().setNavigationIcon(R.drawable.ic_check_24);
+    getToolbar().setNavigationOnClickListener(v -> {
+      Intent                resultIntent     = getIntent();
+      List<SelectedContact> selectedContacts = contactsFragment.getSelectedContacts();
+      List<RecipientId>     recipients       = Stream.of(selectedContacts).map(sc -> sc.getOrCreateRecipientId(this)).toList();
+
+      resultIntent.putParcelableArrayListExtra(KEY_SELECTED_RECIPIENTS, new ArrayList<>(recipients));
+
+      setResult(RESULT_OK, resultIntent);
+      finish();
+    });
+  }
+}

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

@@ -0,0 +1,50 @@
+package org.thoughtcrime.securesms;
+
+
+import android.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.appcompat.widget.SwitchCompat;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.jobs.MultiDeviceConfigurationUpdateJob;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.ViewUtil;
+
+public class ReadReceiptsIntroFragment extends Fragment {
+
+  public static ReadReceiptsIntroFragment newInstance() {
+    ReadReceiptsIntroFragment fragment = new ReadReceiptsIntroFragment();
+    Bundle args = new Bundle();
+    fragment.setArguments(args);
+    return fragment;
+  }
+
+  public ReadReceiptsIntroFragment() {}
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+  }
+
+  @Override
+  public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    View         v          = inflater.inflate(R.layout.experience_upgrade_preference_fragment, container, false);
+    SwitchCompat preference = ViewUtil.findById(v, R.id.preference);
+
+    preference.setChecked(TextSecurePreferences.isReadReceiptsEnabled(getContext()));
+    preference.setOnCheckedChangeListener((buttonView, isChecked) -> {
+      TextSecurePreferences.setReadReceiptsEnabled(getContext(), isChecked);
+      ApplicationDependencies.getJobManager()
+                             .add(new MultiDeviceConfigurationUpdateJob(isChecked,
+                                                                        TextSecurePreferences.isTypingIndicatorsEnabled(requireContext()),
+                                                                        TextSecurePreferences.isShowUnidentifiedDeliveryIndicatorsEnabled(getContext()),
+                                                                        TextSecurePreferences.isLinkPreviewsEnabled(getContext())));
+    });
+
+    return v;
+  }
+}

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

@@ -0,0 +1,821 @@
+package org.thoughtcrime.securesms;
+
+import android.annotation.SuppressLint;
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.graphics.Color;
+import android.media.Ringtone;
+import android.media.RingtoneManager;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Build;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.telephony.PhoneNumberUtils;
+import android.util.Pair;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.view.ViewCompat;
+import androidx.fragment.app.Fragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.preference.CheckBoxPreference;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.google.android.material.appbar.CollapsingToolbarLayout;
+
+import org.thoughtcrime.securesms.color.MaterialColor;
+import org.thoughtcrime.securesms.color.MaterialColors;
+import org.thoughtcrime.securesms.components.SwitchPreferenceCompat;
+import org.thoughtcrime.securesms.components.ThreadPhotoRailView;
+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.crypto.IdentityKeyParcelable;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.IdentityDatabase;
+import org.thoughtcrime.securesms.database.IdentityDatabase.IdentityRecord;
+import org.thoughtcrime.securesms.database.MediaDatabase;
+import org.thoughtcrime.securesms.database.RecipientDatabase;
+import org.thoughtcrime.securesms.database.RecipientDatabase.VibrateState;
+import org.thoughtcrime.securesms.database.loaders.RecipientMediaLoader;
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.mediaoverview.MediaOverviewActivity;
+import org.thoughtcrime.securesms.mms.GlideApp;
+import org.thoughtcrime.securesms.mms.GlideRequests;
+import org.thoughtcrime.securesms.notifications.NotificationChannels;
+import org.thoughtcrime.securesms.permissions.Permissions;
+import org.thoughtcrime.securesms.preferences.CorrectedPreferenceFragment;
+import org.thoughtcrime.securesms.preferences.widgets.ColorPickerPreference;
+import org.thoughtcrime.securesms.preferences.widgets.ContactPreference;
+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.CommunicationActions;
+import org.thoughtcrime.securesms.util.Dialogs;
+import org.thoughtcrime.securesms.util.DynamicDarkToolbarTheme;
+import org.thoughtcrime.securesms.util.DynamicLanguage;
+import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.IdentityUtil;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.ThemeUtil;
+import org.thoughtcrime.securesms.util.ViewUtil;
+import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
+import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
+import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.whispersystems.libsignal.util.guava.Optional;
+
+import java.util.concurrent.ExecutionException;
+
+@SuppressLint("StaticFieldLeak")
+public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActivity implements LoaderManager.LoaderCallbacks<Cursor>
+{
+  private static final String TAG = RecipientPreferenceActivity.class.getSimpleName();
+
+  public static final String RECIPIENT_ID                 = "recipient_address";
+  public static final String CAN_HAVE_SAFETY_NUMBER_EXTRA = "can_have_safety_number";
+
+  private static final String PREFERENCE_MUTED                 = "pref_key_recipient_mute";
+  private static final String PREFERENCE_MESSAGE_TONE          = "pref_key_recipient_ringtone";
+  private static final String PREFERENCE_CALL_TONE             = "pref_key_recipient_call_ringtone";
+  private static final String PREFERENCE_MESSAGE_VIBRATE       = "pref_key_recipient_vibrate";
+  private static final String PREFERENCE_CALL_VIBRATE          = "pref_key_recipient_call_vibrate";
+  private static final String PREFERENCE_BLOCK                 = "pref_key_recipient_block";
+  private static final String PREFERENCE_COLOR                 = "pref_key_recipient_color";
+  private static final String PREFERENCE_IDENTITY              = "pref_key_recipient_identity";
+  private static final String PREFERENCE_ABOUT                 = "pref_key_number";
+  private static final String PREFERENCE_CUSTOM_NOTIFICATIONS  = "pref_key_recipient_custom_notifications";
+
+  private final DynamicTheme    dynamicTheme    = new DynamicDarkToolbarTheme();
+  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
+
+  private ImageView               avatar;
+  private GlideRequests           glideRequests;
+  private RecipientId             recipientId;
+  private TextView                threadPhotoRailLabel;
+  private ThreadPhotoRailView     threadPhotoRailView;
+  private CollapsingToolbarLayout toolbarLayout;
+
+  @Override
+  public void onPreCreate() {
+    dynamicTheme.onCreate(this);
+    dynamicLanguage.onCreate(this);
+  }
+
+  @Override
+  public void onCreate(Bundle instanceState, boolean ready) {
+    setContentView(R.layout.recipient_preference_activity);
+    this.glideRequests = GlideApp.with(this);
+    this.recipientId   = getIntent().getParcelableExtra(RECIPIENT_ID);
+
+    LiveRecipient recipient = Recipient.live(recipientId);
+
+    initializeToolbar();
+    setHeader(recipient.get());
+    recipient.observe(this, this::setHeader);
+
+    getSupportLoaderManager().initLoader(0, null, this);
+  }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    dynamicTheme.onResume(this);
+    dynamicLanguage.onResume(this);
+  }
+
+  @Override
+  protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+    super.onActivityResult(requestCode, resultCode, data);
+    Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.preference_fragment);
+    fragment.onActivityResult(requestCode, resultCode, data);
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    super.onOptionsItemSelected(item);
+    switch (item.getItemId()) {
+      case android.R.id.home:
+        onBackPressed();
+        return true;
+    }
+
+    return false;
+  }
+
+  @Override
+  public void onBackPressed() {
+    finish();
+    overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
+  }
+
+  private void initializeToolbar() {
+    this.toolbarLayout        = ViewUtil.findById(this, R.id.collapsing_toolbar);
+    this.avatar               = ViewUtil.findById(this, R.id.avatar);
+    this.threadPhotoRailView  = ViewUtil.findById(this, R.id.recent_photos);
+    this.threadPhotoRailLabel = ViewUtil.findById(this, R.id.rail_label);
+
+    this.toolbarLayout.setExpandedTitleColor(ThemeUtil.getThemedColor(this, R.attr.conversation_title_color));
+    this.toolbarLayout.setCollapsedTitleTextColor(ThemeUtil.getThemedColor(this, R.attr.conversation_title_color));
+
+    this.threadPhotoRailView.setListener(mediaRecord -> {
+      Intent intent = new Intent(RecipientPreferenceActivity.this, MediaPreviewActivity.class);
+      intent.putExtra(MediaPreviewActivity.THREAD_ID_EXTRA, mediaRecord.getThreadId());
+      intent.putExtra(MediaPreviewActivity.DATE_EXTRA, mediaRecord.getDate());
+      intent.putExtra(MediaPreviewActivity.SIZE_EXTRA, mediaRecord.getAttachment().getSize());
+      intent.putExtra(MediaPreviewActivity.CAPTION_EXTRA, mediaRecord.getAttachment().getCaption());
+      intent.putExtra(MediaPreviewActivity.LEFT_IS_RECENT_EXTRA, ViewCompat.getLayoutDirection(threadPhotoRailView) == ViewCompat.LAYOUT_DIRECTION_LTR);
+      intent.setDataAndType(mediaRecord.getAttachment().getDataUri(), mediaRecord.getContentType());
+      startActivity(intent);
+    });
+
+    SimpleTask.run(
+      () -> DatabaseFactory.getThreadDatabase(this).getThreadIdFor(recipientId),
+      (threadId) -> {
+        if (threadId == null) {
+          Log.i(TAG, "No thread id for recipient.");
+        } else {
+          this.threadPhotoRailLabel.setOnClickListener(v -> startActivity(MediaOverviewActivity.forThread(this, threadId)));
+        }
+      }
+    );
+
+    Toolbar toolbar = ViewUtil.findById(this, R.id.toolbar);
+    setSupportActionBar(toolbar);
+    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+    getSupportActionBar().setLogo(null);
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+      getWindow().setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS, WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+      getWindow().setStatusBarColor(Color.TRANSPARENT);
+    }
+  }
+
+  private void setHeader(@NonNull Recipient recipient) {
+    ContactPhoto         contactPhoto  = recipient.isLocalNumber() ? new ProfileContactPhoto(recipient.getId(), String.valueOf(TextSecurePreferences.getProfileAvatarId(this)))
+                                                                   : recipient.getContactPhoto();
+    FallbackContactPhoto fallbackPhoto = recipient.isLocalNumber() ? new ResourceContactPhoto(R.drawable.ic_profile_outline_40, R.drawable.ic_profile_outline_20, R.drawable.ic_person_large)
+                                                                   : recipient.getFallbackContactPhoto();
+
+    glideRequests.load(contactPhoto)
+                 .fallback(fallbackPhoto.asCallCard(this))
+                 .error(fallbackPhoto.asCallCard(this))
+                 .diskCacheStrategy(DiskCacheStrategy.ALL)
+                 .into(this.avatar);
+
+    if (contactPhoto == null) this.avatar.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
+    else                      this.avatar.setScaleType(ImageView.ScaleType.CENTER_CROP);
+
+    this.avatar.setBackgroundColor(recipient.getColor().toActionBarColor(this));
+    this.toolbarLayout.setTitle(recipient.toShortString(this));
+    this.toolbarLayout.setContentScrimColor(recipient.getColor().toActionBarColor(this));
+  }
+
+  @Override
+  public @NonNull Loader<Cursor> onCreateLoader(int id, Bundle args) {
+    return new RecipientMediaLoader(this, recipientId, RecipientMediaLoader.MediaType.GALLERY, MediaDatabase.Sorting.Newest);
+  }
+
+  @Override
+  public void onLoadFinished(@NonNull Loader<Cursor> loader, Cursor data) {
+    if (data != null && data.getCount() > 0) {
+      this.threadPhotoRailLabel.setVisibility(View.VISIBLE);
+      this.threadPhotoRailView.setVisibility(View.VISIBLE);
+    } else {
+      this.threadPhotoRailLabel.setVisibility(View.GONE);
+      this.threadPhotoRailView.setVisibility(View.GONE);
+    }
+
+    this.threadPhotoRailView.setCursor(glideRequests, data);
+
+    Bundle bundle = new Bundle();
+    bundle.putParcelable(RECIPIENT_ID, recipientId);
+    initFragment(R.id.preference_fragment, new RecipientPreferenceFragment(), null, bundle);
+  }
+
+  @Override
+  public void onLoaderReset(@NonNull Loader<Cursor> loader) {
+    this.threadPhotoRailView.setCursor(glideRequests, null);
+  }
+
+  public static class RecipientPreferenceFragment extends CorrectedPreferenceFragment {
+    private LiveRecipient recipient;
+    private boolean       canHaveSafetyNumber;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+      Log.i(TAG, "onCreate (fragment)");
+      super.onCreate(icicle);
+
+      initializeRecipients();
+
+      this.canHaveSafetyNumber = getActivity().getIntent()
+                                 .getBooleanExtra(RecipientPreferenceActivity.CAN_HAVE_SAFETY_NUMBER_EXTRA, false);
+
+      Preference customNotificationsPref  = this.findPreference(PREFERENCE_CUSTOM_NOTIFICATIONS);
+
+      if (NotificationChannels.supported()) {
+        ((SwitchPreferenceCompat) customNotificationsPref).setChecked(recipient.get().getNotificationChannel() != null);
+        customNotificationsPref.setOnPreferenceChangeListener(new CustomNotificationsChangedListener());
+
+        this.findPreference(PREFERENCE_MESSAGE_TONE).setDependency(PREFERENCE_CUSTOM_NOTIFICATIONS);
+        this.findPreference(PREFERENCE_MESSAGE_VIBRATE).setDependency(PREFERENCE_CUSTOM_NOTIFICATIONS);
+
+        if (recipient.get().getNotificationChannel() != null) {
+          final Context context = requireContext();
+          new AsyncTask<Void, Void, Void>() {
+            @Override
+            protected Void doInBackground(Void... voids) {
+              RecipientDatabase db = DatabaseFactory.getRecipientDatabase(getContext());
+              db.setMessageRingtone(recipient.getId(), NotificationChannels.getMessageRingtone(context, recipient.get()));
+              db.setMessageVibrate(recipient.getId(), NotificationChannels.getMessageVibrate(context, recipient.get()) ? VibrateState.ENABLED : VibrateState.DISABLED);
+              NotificationChannels.ensureCustomChannelConsistency(context);
+              return null;
+            }
+          }.executeOnExecutor(AsyncTask.SERIAL_EXECUTOR);
+        }
+      } else {
+        customNotificationsPref.setVisible(false);
+      }
+
+      this.findPreference(PREFERENCE_MESSAGE_TONE)
+          .setOnPreferenceChangeListener(new RingtoneChangeListener(false));
+      this.findPreference(PREFERENCE_MESSAGE_TONE)
+          .setOnPreferenceClickListener(new RingtoneClickedListener(false));
+      this.findPreference(PREFERENCE_CALL_TONE)
+          .setOnPreferenceChangeListener(new RingtoneChangeListener(true));
+      this.findPreference(PREFERENCE_CALL_TONE)
+          .setOnPreferenceClickListener(new RingtoneClickedListener(true));
+      this.findPreference(PREFERENCE_MESSAGE_VIBRATE)
+          .setOnPreferenceChangeListener(new VibrateChangeListener(false));
+      this.findPreference(PREFERENCE_CALL_VIBRATE)
+          .setOnPreferenceChangeListener(new VibrateChangeListener(true));
+      this.findPreference(PREFERENCE_MUTED)
+          .setOnPreferenceClickListener(new MuteClickedListener());
+      this.findPreference(PREFERENCE_BLOCK)
+          .setOnPreferenceClickListener(new BlockClickedListener());
+      this.findPreference(PREFERENCE_COLOR)
+          .setOnPreferenceChangeListener(new ColorChangeListener());
+      ((ContactPreference)this.findPreference(PREFERENCE_ABOUT))
+          .setListener(new AboutNumberClickedListener());
+    }
+
+    @Override
+    public void onCreatePreferences(@Nullable Bundle savedInstanceState, String rootKey) {
+      Log.i(TAG, "onCreatePreferences...");
+      addPreferencesFromResource(R.xml.recipient_preferences);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) {
+      Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
+    }
+
+    @Override
+    public void onResume() {
+      super.onResume();
+      setSummaries(recipient.get());
+    }
+
+    @Override
+    public void onDestroy() {
+      super.onDestroy();
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+      if (requestCode == 1 && resultCode == RESULT_OK && data != null) {
+        Uri uri = data.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI);
+
+        findPreference(PREFERENCE_MESSAGE_TONE).getOnPreferenceChangeListener().onPreferenceChange(findPreference(PREFERENCE_MESSAGE_TONE), uri);
+      } else if (requestCode == 2 && resultCode == RESULT_OK && data != null) {
+        Uri uri = data.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI);
+
+        findPreference(PREFERENCE_CALL_TONE).getOnPreferenceChangeListener().onPreferenceChange(findPreference(PREFERENCE_CALL_TONE), uri);
+      }
+    }
+
+    @Override
+    public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) {
+      RecyclerView recyclerView = super.onCreateRecyclerView(inflater, parent, savedInstanceState);
+      recyclerView.setItemAnimator(null);
+      recyclerView.setLayoutAnimation(null);
+      return recyclerView;
+    }
+
+    private void initializeRecipients() {
+      this.recipient = Recipient.live(getArguments().getParcelable(RECIPIENT_ID));
+      this.recipient.observe(this, this::setSummaries);
+    }
+
+    private void setSummaries(Recipient recipient) {
+      CheckBoxPreference    mutePreference            = (CheckBoxPreference) this.findPreference(PREFERENCE_MUTED);
+      Preference            customPreference          = this.findPreference(PREFERENCE_CUSTOM_NOTIFICATIONS);
+      Preference            ringtoneMessagePreference = this.findPreference(PREFERENCE_MESSAGE_TONE);
+      Preference            ringtoneCallPreference    = this.findPreference(PREFERENCE_CALL_TONE);
+      ListPreference        vibrateMessagePreference  = (ListPreference) this.findPreference(PREFERENCE_MESSAGE_VIBRATE);
+      ListPreference        vibrateCallPreference     = (ListPreference) this.findPreference(PREFERENCE_CALL_VIBRATE);
+      ColorPickerPreference colorPreference           = (ColorPickerPreference) this.findPreference(PREFERENCE_COLOR);
+      Preference            blockPreference           = this.findPreference(PREFERENCE_BLOCK);
+      Preference            identityPreference        = this.findPreference(PREFERENCE_IDENTITY);
+      PreferenceCategory    callCategory              = (PreferenceCategory)this.findPreference("call_settings");
+      PreferenceCategory    aboutCategory             = (PreferenceCategory)this.findPreference("about");
+      PreferenceCategory    aboutDivider              = (PreferenceCategory)this.findPreference("about_divider");
+      ContactPreference     aboutPreference           = (ContactPreference)this.findPreference(PREFERENCE_ABOUT);
+      PreferenceCategory    privacyCategory           = (PreferenceCategory) this.findPreference("privacy_settings");
+      PreferenceCategory    divider                   = (PreferenceCategory) this.findPreference("divider");
+
+      mutePreference.setChecked(recipient.isMuted());
+
+      ringtoneMessagePreference.setSummary(ringtoneMessagePreference.isEnabled() ? getRingtoneSummary(getContext(), recipient.getMessageRingtone()) : "");
+      ringtoneCallPreference.setSummary(getRingtoneSummary(getContext(), recipient.getCallRingtone()));
+
+      Pair<String, Integer> vibrateMessageSummary = getVibrateSummary(getContext(), recipient.getMessageVibrate());
+      Pair<String, Integer> vibrateCallSummary    = getVibrateSummary(getContext(), recipient.getCallVibrate());
+
+      vibrateMessagePreference.setSummary(vibrateMessagePreference.isEnabled() ? vibrateMessageSummary.first : "");
+      vibrateMessagePreference.setValueIndex(vibrateMessageSummary.second);
+
+      vibrateCallPreference.setSummary(vibrateCallSummary.first);
+      vibrateCallPreference.setValueIndex(vibrateCallSummary.second);
+
+      blockPreference.setVisible(RecipientUtil.isBlockable(recipient));
+      if (recipient.isBlocked()) blockPreference.setTitle(R.string.RecipientPreferenceActivity_unblock);
+      else                       blockPreference.setTitle(R.string.RecipientPreferenceActivity_block);
+
+      if (recipient.isLocalNumber()) {
+        mutePreference.setVisible(false);
+        customPreference.setVisible(false);
+        ringtoneMessagePreference.setVisible(false);
+        vibrateMessagePreference.setVisible(false);
+
+        if (identityPreference != null) identityPreference.setVisible(false);
+        if (aboutCategory      != null) aboutCategory.setVisible(false);
+        if (aboutDivider       != null) aboutDivider.setVisible(false);
+        if (privacyCategory    != null) privacyCategory.setVisible(false);
+        if (divider            != null) divider.setVisible(false);
+        if (callCategory       != null) callCategory.setVisible(false);
+      }
+
+      if (recipient.isGroup()) {
+        if (colorPreference    != null) colorPreference.setVisible(false);
+        if (identityPreference != null) identityPreference.setVisible(false);
+        if (callCategory       != null) callCategory.setVisible(false);
+        if (aboutCategory      != null) aboutCategory.setVisible(false);
+        if (aboutDivider       != null) aboutDivider.setVisible(false);
+        if (divider            != null) divider.setVisible(false);
+      } else {
+        colorPreference.setColors(MaterialColors.CONVERSATION_PALETTE.asConversationColorArray(requireActivity()));
+        colorPreference.setColor(recipient.getColor().toActionBarColor(requireActivity()));
+
+        if (FeatureFlags.PROFILE_DISPLAY) {
+          aboutPreference.setTitle(recipient.getDisplayName(requireContext()));
+          aboutPreference.setSummary(recipient.resolve().getE164().or(""));
+        } else {
+          aboutPreference.setTitle(formatRecipient(recipient));
+          aboutPreference.setSummary(recipient.getCustomLabel());
+        }
+
+        aboutPreference.setSecure(recipient.getRegistered() == RecipientDatabase.RegisteredState.REGISTERED);
+
+        IdentityUtil.getRemoteIdentityKey(getActivity(), recipient).addListener(new ListenableFuture.Listener<Optional<IdentityRecord>>() {
+          @Override
+          public void onSuccess(Optional<IdentityRecord> result) {
+            if (result.isPresent()) {
+              if (identityPreference != null) identityPreference.setOnPreferenceClickListener(new IdentityClickedListener(result.get()));
+              if (identityPreference != null) identityPreference.setEnabled(true);
+            } else if (canHaveSafetyNumber) {
+              if (identityPreference != null) identityPreference.setSummary(R.string.RecipientPreferenceActivity_available_once_a_message_has_been_sent_or_received);
+              if (identityPreference != null) identityPreference.setEnabled(false);
+            } else {
+              if (identityPreference != null) getPreferenceScreen().removePreference(identityPreference);
+            }
+          }
+
+          @Override
+          public void onFailure(ExecutionException e) {
+            if (identityPreference != null) getPreferenceScreen().removePreference(identityPreference);
+          }
+        });
+      }
+
+      if (recipient.isMmsGroup() && privacyCategory != null) {
+        privacyCategory.setVisible(false);
+      }
+    }
+
+    private @NonNull String formatRecipient(@NonNull Recipient recipient) {
+      if      (recipient.getE164().isPresent())  return PhoneNumberUtils.formatNumber(recipient.requireE164());
+      else if (recipient.getEmail().isPresent()) return recipient.requireEmail();
+      else                                       return "";
+    }
+
+    private @NonNull String getRingtoneSummary(@NonNull Context context, @Nullable Uri ringtone) {
+      if (ringtone == null) {
+        return context.getString(R.string.preferences__default);
+      } else if (ringtone.toString().isEmpty()) {
+        return context.getString(R.string.preferences__silent);
+      } else {
+        Ringtone tone = RingtoneManager.getRingtone(getActivity(), ringtone);
+
+        if (tone != null) {
+          return tone.getTitle(context);
+        }
+      }
+
+      return context.getString(R.string.preferences__default);
+    }
+
+    private @NonNull Pair<String, Integer> getVibrateSummary(@NonNull Context context, @NonNull VibrateState vibrateState) {
+      if (vibrateState == VibrateState.DEFAULT) {
+        return new Pair<>(context.getString(R.string.preferences__default), 0);
+      } else if (vibrateState == VibrateState.ENABLED) {
+        return new Pair<>(context.getString(R.string.RecipientPreferenceActivity_enabled), 1);
+      } else {
+        return new Pair<>(context.getString(R.string.RecipientPreferenceActivity_disabled), 2);
+      }
+    }
+
+    private class RingtoneChangeListener implements Preference.OnPreferenceChangeListener {
+
+      private final boolean calls;
+
+      RingtoneChangeListener(boolean calls) {
+        this.calls = calls;
+      }
+
+      @Override
+      public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final Context context = preference.getContext();
+
+        Uri value = (Uri)newValue;
+
+        Uri defaultValue;
+
+        if (calls) defaultValue = TextSecurePreferences.getCallNotificationRingtone(context);
+        else       defaultValue = TextSecurePreferences.getNotificationRingtone(context);
+
+        if (defaultValue.equals(value)) value = null;
+        else if (value == null)         value = Uri.EMPTY;
+
+
+        new AsyncTask<Uri, Void, Void>() {
+          @Override
+          protected Void doInBackground(Uri... params) {
+            if (calls) {
+              DatabaseFactory.getRecipientDatabase(context).setCallRingtone(recipient.getId(), params[0]);
+            } else {
+              DatabaseFactory.getRecipientDatabase(context).setMessageRingtone(recipient.getId(), params[0]);
+              NotificationChannels.updateMessageRingtone(context, recipient.get(), params[0]);
+            }
+            return null;
+          }
+        }.executeOnExecutor(AsyncTask.SERIAL_EXECUTOR, value);
+
+        return false;
+      }
+    }
+
+    private class RingtoneClickedListener implements Preference.OnPreferenceClickListener {
+
+      private final boolean calls;
+
+      RingtoneClickedListener(boolean calls) {
+        this.calls = calls;
+      }
+
+      @Override
+      public boolean onPreferenceClick(Preference preference) {
+        Uri current;
+        Uri defaultUri;
+
+        if (calls) {
+          current    = recipient.get().getCallRingtone();
+          defaultUri = TextSecurePreferences.getCallNotificationRingtone(getContext());
+        } else  {
+          current    = recipient.get().getMessageRingtone();
+          defaultUri = TextSecurePreferences.getNotificationRingtone(getContext());
+        }
+
+        if      (current == null)              current = Settings.System.DEFAULT_NOTIFICATION_URI;
+        else if (current.toString().isEmpty()) current = null;
+
+        Intent intent = new Intent(RingtoneManager.ACTION_RINGTONE_PICKER);
+        intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, true);
+        intent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, true);
+        intent.putExtra(RingtoneManager.EXTRA_RINGTONE_DEFAULT_URI, defaultUri);
+        intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, calls ? RingtoneManager.TYPE_RINGTONE : RingtoneManager.TYPE_NOTIFICATION);
+        intent.putExtra(RingtoneManager.EXTRA_RINGTONE_EXISTING_URI, current);
+
+        startActivityForResult(intent, calls ? 2 : 1);
+
+        return true;
+      }
+    }
+
+    private class VibrateChangeListener implements Preference.OnPreferenceChangeListener {
+
+      private final boolean call;
+
+      VibrateChangeListener(boolean call) {
+        this.call = call;
+      }
+
+      @Override
+      public boolean onPreferenceChange(Preference preference, Object newValue) {
+              int          value        = Integer.parseInt((String) newValue);
+        final VibrateState vibrateState = VibrateState.fromId(value);
+        final Context      context      = preference.getContext();
+
+        new AsyncTask<Void, Void, Void>() {
+          @Override
+          protected Void doInBackground(Void... params) {
+            if (call) {
+              DatabaseFactory.getRecipientDatabase(context).setCallVibrate(recipient.getId(), vibrateState);
+            }
+            else {
+              DatabaseFactory.getRecipientDatabase(context).setMessageVibrate(recipient.getId(), vibrateState);
+              NotificationChannels.updateMessageVibrate(context, recipient.get(), vibrateState);
+            }
+            return null;
+          }
+        }.executeOnExecutor(AsyncTask.SERIAL_EXECUTOR);
+
+        return false;
+      }
+    }
+
+    private class ColorChangeListener implements Preference.OnPreferenceChangeListener {
+
+      @Override
+      public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final Context context = getContext();
+        if (context == null) return true;
+
+        final int           value         = (Integer) newValue;
+        final MaterialColor selectedColor = MaterialColors.CONVERSATION_PALETTE.getByColor(context, value);
+        final MaterialColor currentColor  = recipient.get().getColor();
+
+        if (selectedColor == null) return true;
+
+        if (preference.isEnabled() && !currentColor.equals(selectedColor)) {
+          new AsyncTask<Void, Void, Void>() {
+            @Override
+            protected Void doInBackground(Void... params) {
+              DatabaseFactory.getRecipientDatabase(context).setColor(recipient.getId(), selectedColor);
+
+              if (recipient.get().resolve().getRegistered() == RecipientDatabase.RegisteredState.REGISTERED) {
+                ApplicationDependencies.getJobManager().add(new MultiDeviceContactUpdateJob(recipient.getId()));
+              }
+              return null;
+            }
+          }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+        }
+        return true;
+      }
+    }
+
+    private class MuteClickedListener implements Preference.OnPreferenceClickListener {
+
+      @Override
+      public boolean onPreferenceClick(Preference preference) {
+        if (recipient.get().isMuted()) handleUnmute(preference.getContext());
+        else                           handleMute(preference.getContext());
+
+        return true;
+      }
+
+      private void handleMute(@NonNull Context context) {
+        MuteDialog.show(context, until -> setMuted(context, recipient.get(), until));
+
+        setSummaries(recipient.get());
+      }
+
+      private void handleUnmute(@NonNull Context context) {
+        setMuted(context, recipient.get(), 0);
+      }
+
+      private void setMuted(@NonNull final Context context, final Recipient recipient, final long until) {
+        new AsyncTask<Void, Void, Void>() {
+          @Override
+          protected Void doInBackground(Void... params) {
+            DatabaseFactory.getRecipientDatabase(context)
+                           .setMuted(recipient.getId(), until);
+            return null;
+          }
+        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+      }
+    }
+
+    private class IdentityClickedListener implements Preference.OnPreferenceClickListener {
+
+      private final IdentityRecord identityKey;
+
+      private IdentityClickedListener(IdentityRecord identityKey) {
+        Log.i(TAG, "Identity record: " + identityKey);
+        this.identityKey = identityKey;
+      }
+
+      @Override
+      public boolean onPreferenceClick(Preference preference) {
+        Intent verifyIdentityIntent = new Intent(preference.getContext(), VerifyIdentityActivity.class);
+        verifyIdentityIntent.putExtra(VerifyIdentityActivity.RECIPIENT_EXTRA, recipient.getId());
+        verifyIdentityIntent.putExtra(VerifyIdentityActivity.IDENTITY_EXTRA, new IdentityKeyParcelable(identityKey.getIdentityKey()));
+        verifyIdentityIntent.putExtra(VerifyIdentityActivity.VERIFIED_EXTRA, identityKey.getVerifiedStatus() == IdentityDatabase.VerifiedStatus.VERIFIED);
+        startActivity(verifyIdentityIntent);
+
+        return true;
+      }
+    }
+
+    private class BlockClickedListener implements Preference.OnPreferenceClickListener {
+      @Override
+      public boolean onPreferenceClick(Preference preference) {
+        if (recipient.get().isBlocked()) handleUnblock(preference.getContext());
+        else                             handleBlock(preference.getContext());
+
+        return true;
+      }
+
+      private void handleBlock(@NonNull final Context context) {
+        new AsyncTask<Void, Void, Pair<Integer, Integer>>() {
+
+          @Override
+          protected Pair<Integer, Integer> doInBackground(Void... voids) {
+            int titleRes = R.string.RecipientPreferenceActivity_block_this_contact_question;
+            int bodyRes  = R.string.RecipientPreferenceActivity_you_will_no_longer_receive_messages_and_calls_from_this_contact;
+
+            if (recipient.get().isGroup()) {
+              bodyRes = R.string.RecipientPreferenceActivity_block_and_leave_group_description;
+
+              if (recipient.get().isGroup() && DatabaseFactory.getGroupDatabase(context).isActive(recipient.get().requireGroupId())) {
+                titleRes = R.string.RecipientPreferenceActivity_block_and_leave_group;
+              } else {
+                titleRes = R.string.RecipientPreferenceActivity_block_group;
+              }
+            }
+
+            return new Pair<>(titleRes, bodyRes);
+          }
+
+          @Override
+          protected void onPostExecute(Pair<Integer, Integer> titleAndBody) {
+            new AlertDialog.Builder(context)
+                           .setTitle(titleAndBody.first)
+                           .setMessage(titleAndBody.second)
+                           .setCancelable(true)
+                           .setNegativeButton(android.R.string.cancel, null)
+                           .setPositiveButton(R.string.RecipientPreferenceActivity_block, (dialog, which) -> {
+                             setBlocked(context, recipient.get(), true);
+                           }).show();
+          }
+        }.execute();
+      }
+
+      private void handleUnblock(@NonNull Context context) {
+        int titleRes = R.string.RecipientPreferenceActivity_unblock_this_contact_question;
+        int bodyRes  = R.string.RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact;
+
+        if (recipient.resolve().isGroup()) {
+          titleRes = R.string.RecipientPreferenceActivity_unblock_this_group_question;
+          bodyRes  = R.string.RecipientPreferenceActivity_unblock_this_group_description;
+        }
+
+        new AlertDialog.Builder(context)
+                       .setTitle(titleRes)
+                       .setMessage(bodyRes)
+                       .setCancelable(true)
+                       .setNegativeButton(android.R.string.cancel, null)
+                       .setPositiveButton(R.string.RecipientPreferenceActivity_unblock, (dialog, which) -> setBlocked(context, recipient.get(), false)).show();
+      }
+
+      private void setBlocked(@NonNull final Context context, final Recipient recipient, final boolean blocked) {
+        SignalExecutors.BOUNDED.execute(() -> {
+          if (blocked) {
+            RecipientUtil.block(context, recipient);
+          } else {
+            RecipientUtil.unblock(context, recipient);
+          }
+        });
+      }
+    }
+
+    private class AboutNumberClickedListener implements ContactPreference.Listener {
+
+      @Override
+      public void onMessageClicked() {
+        CommunicationActions.startConversation(getContext(), recipient.get(), null);
+      }
+
+      @Override
+      public void onSecureCallClicked() {
+        CommunicationActions.startVoiceCall(getActivity(), recipient.get());
+      }
+
+      @Override
+      public void onSecureVideoClicked() {
+        CommunicationActions.startVideoCall(getActivity(), recipient.get());
+      }
+
+      @Override
+      public void onInSecureCallClicked() {
+        try {
+          Intent dialIntent = new Intent(Intent.ACTION_DIAL,
+                                         Uri.parse("tel:" + recipient.get().requireE164()));
+          startActivity(dialIntent);
+        } catch (ActivityNotFoundException anfe) {
+          Log.w(TAG, anfe);
+          Dialogs.showAlertDialog(getContext(),
+                                  getString(R.string.ConversationActivity_calls_not_supported),
+                                  getString(R.string.ConversationActivity_this_device_does_not_appear_to_support_dial_actions));
+        }
+      }
+    }
+
+    private class CustomNotificationsChangedListener implements Preference.OnPreferenceChangeListener {
+
+      @Override
+      public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final Context context = preference.getContext();
+        final boolean enabled = (boolean) newValue;
+
+        new AsyncTask<Void, Void, Void>() {
+          @Override
+          protected Void doInBackground(Void... params) {
+            if (enabled) {
+              String channel = NotificationChannels.createChannelFor(context, recipient.get());
+              DatabaseFactory.getRecipientDatabase(context).setNotificationChannel(recipient.getId(), channel);
+            } else {
+              NotificationChannels.deleteChannelFor(context, recipient.get());
+              DatabaseFactory.getRecipientDatabase(context).setNotificationChannel(recipient.getId(), null);
+            }
+            return null;
+          }
+        }.executeOnExecutor(AsyncTask.SERIAL_EXECUTOR);
+
+        return true;
+      }
+    }
+  }
+}

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

@@ -0,0 +1,379 @@
+/*
+ * Copyright (C) 2014-2017 Open Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.thoughtcrime.securesms;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.Process;
+import android.provider.OpenableColumns;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.ImageView;
+
+import org.thoughtcrime.securesms.components.SearchToolbar;
+import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
+import org.thoughtcrime.securesms.conversation.ConversationActivity;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.ThreadDatabase;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.mediasend.Media;
+import org.thoughtcrime.securesms.mms.PartAuthority;
+import org.thoughtcrime.securesms.providers.BlobProvider;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.stickers.StickerLocator;
+import org.thoughtcrime.securesms.util.DynamicLanguage;
+import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
+import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.FileUtils;
+import org.thoughtcrime.securesms.util.MediaUtil;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.ViewUtil;
+import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.whispersystems.libsignal.util.Pair;
+import org.whispersystems.libsignal.util.guava.Optional;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+
+/**
+ * An activity to quickly share content with contacts
+ *
+ * @author Jake McGinty
+ */
+public class ShareActivity extends PassphraseRequiredActionBarActivity
+    implements ContactSelectionListFragment.OnContactSelectedListener, SwipeRefreshLayout.OnRefreshListener
+{
+  private static final String TAG = ShareActivity.class.getSimpleName();
+
+  public static final String EXTRA_THREAD_ID          = "thread_id";
+  public static final String EXTRA_RECIPIENT_ID       = "recipient_id";
+  public static final String EXTRA_DISTRIBUTION_TYPE  = "distribution_type";
+
+  private final DynamicTheme    dynamicTheme    = new DynamicNoActionBarTheme();
+  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
+
+  private ContactSelectionListFragment contactsFragment;
+  private SearchToolbar                searchToolbar;
+  private ImageView                    searchAction;
+  private View                         progressWheel;
+  private Uri                          resolvedExtra;
+  private String                       mimeType;
+  private boolean                      isPassingAlongMedia;
+
+  @Override
+  protected void onPreCreate() {
+    dynamicTheme.onCreate(this);
+    dynamicLanguage.onCreate(this);
+  }
+
+  @Override
+  protected void onCreate(Bundle icicle, boolean ready) {
+    if (!getIntent().hasExtra(ContactSelectionListFragment.DISPLAY_MODE)) {
+      int mode = DisplayMode.FLAG_PUSH | DisplayMode.FLAG_ACTIVE_GROUPS;
+
+      if (TextSecurePreferences.isSmsEnabled(this))  {
+        mode |= DisplayMode.FLAG_SMS;
+
+      }
+      getIntent().putExtra(ContactSelectionListFragment.DISPLAY_MODE, mode);
+    }
+
+    getIntent().putExtra(ContactSelectionListFragment.REFRESHABLE, false);
+    getIntent().putExtra(ContactSelectionListFragment.RECENTS, true);
+
+    setContentView(R.layout.share_activity);
+
+    initializeToolbar();
+    initializeResources();
+    initializeSearch();
+    initializeMedia();
+  }
+
+  @Override
+  protected void onNewIntent(Intent intent) {
+    Log.i(TAG, "onNewIntent()");
+    super.onNewIntent(intent);
+    setIntent(intent);
+    initializeMedia();
+  }
+
+  @Override
+  public void onResume() {
+    Log.i(TAG, "onResume()");
+    super.onResume();
+    dynamicTheme.onResume(this);
+    dynamicLanguage.onResume(this);
+  }
+
+  @Override
+  public void onPause() {
+    super.onPause();
+    if (!isPassingAlongMedia && resolvedExtra != null) {
+      BlobProvider.getInstance().delete(this, resolvedExtra);
+
+      if (!isFinishing()) {
+        finish();
+      }
+    }
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    switch (item.getItemId()) {
+      case android.R.id.home:
+        onBackPressed();
+        return true;
+    }
+    return super.onOptionsItemSelected(item);
+  }
+
+  @Override
+  public void onBackPressed() {
+    if (searchToolbar.isVisible()) searchToolbar.collapse();
+    else                           super.onBackPressed();
+  }
+
+  private void initializeToolbar() {
+    Toolbar toolbar = findViewById(R.id.toolbar);
+    setSupportActionBar(toolbar);
+
+    ActionBar actionBar = getSupportActionBar();
+
+    if (actionBar != null) {
+      actionBar.setDisplayHomeAsUpEnabled(true);
+    }
+  }
+
+  private void initializeResources() {
+    progressWheel    = findViewById(R.id.progress_wheel);
+    searchToolbar    = findViewById(R.id.search_toolbar);
+    searchAction     = findViewById(R.id.search_action);
+    contactsFragment = (ContactSelectionListFragment) getSupportFragmentManager().findFragmentById(R.id.contact_selection_list_fragment);
+    contactsFragment.setOnContactSelectedListener(this);
+    contactsFragment.setOnRefreshListener(this);
+  }
+
+  private void initializeSearch() {
+    searchAction.setOnClickListener(v -> searchToolbar.display(searchAction.getX() + (searchAction.getWidth() / 2),
+                                                               searchAction.getY() + (searchAction.getHeight() / 2)));
+
+    searchToolbar.setListener(new SearchToolbar.SearchListener() {
+      @Override
+      public void onSearchTextChange(String text) {
+        if (contactsFragment != null) {
+          contactsFragment.setQueryFilter(text);
+        }
+      }
+
+      @Override
+      public void onSearchClosed() {
+        if (contactsFragment != null) {
+          contactsFragment.resetQueryFilter();
+        }
+      }
+    });
+  }
+
+  private void initializeMedia() {
+    final Context context = this;
+    isPassingAlongMedia = false;
+
+    Uri streamExtra = getIntent().getParcelableExtra(Intent.EXTRA_STREAM);
+    mimeType        = getMimeType(streamExtra);
+
+    if (streamExtra != null && PartAuthority.isLocalUri(streamExtra)) {
+      isPassingAlongMedia = true;
+      resolvedExtra       = streamExtra;
+      handleResolvedMedia(getIntent(), false);
+    } else {
+      contactsFragment.getView().setVisibility(View.GONE);
+      progressWheel.setVisibility(View.VISIBLE);
+      new ResolveMediaTask(context).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, streamExtra);
+    }
+  }
+
+  private void handleResolvedMedia(Intent intent, boolean animate) {
+    long        threadId         = intent.getLongExtra(EXTRA_THREAD_ID, -1);
+    int         distributionType = intent.getIntExtra(EXTRA_DISTRIBUTION_TYPE, -1);
+    RecipientId recipientId      = null;
+
+    if (intent.hasExtra(EXTRA_RECIPIENT_ID)) {
+      recipientId = RecipientId.from(intent.getStringExtra(EXTRA_RECIPIENT_ID));
+    }
+
+    boolean hasResolvedDestination = threadId != -1 && recipientId != null && distributionType != -1;
+
+    if (hasResolvedDestination) {
+      createConversation(threadId, recipientId, distributionType);
+    } else if (animate) {
+      ViewUtil.fadeIn(contactsFragment.requireView(), 300);
+      ViewUtil.fadeOut(progressWheel, 300);
+    } else {
+      contactsFragment.requireView().setVisibility(View.VISIBLE);
+      progressWheel.setVisibility(View.GONE);
+    }
+  }
+
+  private void createConversation(long threadId, @NonNull RecipientId recipientId, int distributionType) {
+    final Intent intent = getBaseShareIntent(ConversationActivity.class);
+    intent.putExtra(ConversationActivity.RECIPIENT_EXTRA, recipientId);
+    intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, threadId);
+    intent.putExtra(ConversationActivity.DISTRIBUTION_TYPE_EXTRA, distributionType);
+
+    isPassingAlongMedia = true;
+    startActivity(intent);
+  }
+
+  private Intent getBaseShareIntent(final @NonNull Class<?> target) {
+    final Intent           intent       = new Intent(this, target);
+    final String           textExtra    = getIntent().getStringExtra(Intent.EXTRA_TEXT);
+    final ArrayList<Media> mediaExtra   = getIntent().getParcelableArrayListExtra(ConversationActivity.MEDIA_EXTRA);
+    final StickerLocator   stickerExtra = getIntent().getParcelableExtra(ConversationActivity.STICKER_EXTRA);
+
+    intent.putExtra(ConversationActivity.TEXT_EXTRA, textExtra);
+    intent.putExtra(ConversationActivity.MEDIA_EXTRA, mediaExtra);
+    intent.putExtra(ConversationActivity.STICKER_EXTRA, stickerExtra);
+
+    if (resolvedExtra != null) intent.setDataAndType(resolvedExtra, mimeType);
+
+    return intent;
+  }
+
+  private String getMimeType(@Nullable Uri uri) {
+    if (uri != null) {
+      final String mimeType = MediaUtil.getMimeType(getApplicationContext(), uri);
+      if (mimeType != null) return mimeType;
+    }
+    return MediaUtil.getCorrectedMimeType(getIntent().getType());
+  }
+
+  @Override
+  public void onContactSelected(Optional<RecipientId> recipientId, String number) {
+    SimpleTask.run(this.getLifecycle(), () -> {
+      Recipient recipient;
+      if (recipientId.isPresent()) {
+        recipient = Recipient.resolved(recipientId.get());
+      } else {
+        Log.i(TAG, "[onContactSelected] Maybe creating a new recipient.");
+        recipient = Recipient.external(this, number);
+      }
+
+      long existingThread = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(recipient);
+      return new Pair<>(existingThread, recipient);
+    }, result -> {
+      createConversation(result.first(), result.second().getId(), ThreadDatabase.DistributionTypes.DEFAULT);
+    });
+  }
+
+  @Override
+  public void onContactDeselected(@NonNull Optional<RecipientId> recipientId, String number) {
+
+  }
+
+  @Override
+  public void onRefresh() {
+
+  }
+
+  @SuppressLint("StaticFieldLeak")
+  private class ResolveMediaTask extends AsyncTask<Uri, Void, Uri> {
+    private final Context context;
+
+    ResolveMediaTask(Context context) {
+      this.context = context;
+    }
+
+    @Override
+    protected Uri doInBackground(Uri... uris) {
+      try {
+        if (uris.length != 1 || uris[0] == null) {
+          return null;
+        }
+
+        InputStream inputStream;
+
+        if ("file".equals(uris[0].getScheme())) {
+          inputStream = openFileUri(uris[0]);
+        } else {
+          inputStream = context.getContentResolver().openInputStream(uris[0]);
+        }
+
+        if (inputStream == null) {
+          return null;
+        }
+
+        Cursor cursor   = getContentResolver().query(uris[0], new String[] {OpenableColumns.DISPLAY_NAME, OpenableColumns.SIZE}, null, null, null);
+        String fileName = null;
+        Long   fileSize = null;
+
+        try {
+          if (cursor != null && cursor.moveToFirst()) {
+            try {
+              fileName = cursor.getString(cursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME));
+              fileSize = cursor.getLong(cursor.getColumnIndexOrThrow(OpenableColumns.SIZE));
+            } catch (IllegalArgumentException e) {
+              Log.w(TAG, e);
+            }
+          }
+        } finally {
+          if (cursor != null) cursor.close();
+        }
+
+        return BlobProvider.getInstance()
+                           .forData(inputStream, fileSize == null ? 0 : fileSize)
+                           .withMimeType(mimeType)
+                           .withFileName(fileName)
+                           .createForMultipleSessionsOnDisk(context);
+      } catch (IOException ioe) {
+        Log.w(TAG, ioe);
+        return null;
+      }
+    }
+
+    @Override
+    protected void onPostExecute(Uri uri) {
+      resolvedExtra = uri;
+      handleResolvedMedia(getIntent(), true);
+    }
+
+    private InputStream openFileUri(Uri uri) throws IOException {
+      FileInputStream fin   = new FileInputStream(uri.getPath());
+      int             owner = FileUtils.getFileDescriptorOwner(fin.getFD());
+      
+      if (owner == -1 || owner == Process.myUid()) {
+        fin.close();
+        throw new IOException("File owned by application");
+      }
+
+      return fin;
+    }
+  }
+}

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

@@ -0,0 +1,50 @@
+package org.thoughtcrime.securesms;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.TaskStackBuilder;
+import androidx.appcompat.app.AppCompatActivity;
+import android.widget.Toast;
+
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.util.CommunicationActions;
+
+public class ShortcutLauncherActivity extends AppCompatActivity {
+
+  private static final String KEY_RECIPIENT = "recipient_id";
+
+  public static Intent createIntent(@NonNull Context context, @NonNull RecipientId recipientId) {
+    Intent intent = new Intent(context, ShortcutLauncherActivity.class);
+    intent.setAction(Intent.ACTION_MAIN);
+    intent.putExtra(KEY_RECIPIENT, recipientId.serialize());
+
+    return intent;
+  }
+
+  @Override
+  protected void onCreate(@Nullable Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+
+    String rawId = getIntent().getStringExtra(KEY_RECIPIENT);
+
+    if (rawId == null) {
+      Toast.makeText(this, R.string.ShortcutLauncherActivity_invalid_shortcut, Toast.LENGTH_SHORT).show();
+      // TODO [greyson] Navigation
+      startActivity(new Intent(this, MainActivity.class));
+      finish();
+      return;
+    }
+
+    Recipient        recipient = Recipient.live(RecipientId.from(rawId)).get();
+    // TODO [greyson] Navigation
+    TaskStackBuilder backStack = TaskStackBuilder.create(this)
+                                                 .addNextIntent(new Intent(this, MainActivity.class));
+
+    CommunicationActions.startConversation(this, recipient, null, backStack);
+    finish();
+  }
+}

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

@@ -0,0 +1,109 @@
+package org.thoughtcrime.securesms;
+
+import android.app.Activity;
+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 org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.util.Rfc5724Uri;
+
+import java.net.URISyntaxException;
+
+public class SmsSendtoActivity extends Activity {
+
+  private static final String TAG = SmsSendtoActivity.class.getSimpleName();
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    startActivity(getNextIntent(getIntent()));
+    finish();
+    super.onCreate(savedInstanceState);
+  }
+
+  private Intent getNextIntent(Intent original) {
+    DestinationAndBody destination;
+
+    if (original.getAction().equals(Intent.ACTION_SENDTO)) {
+      destination = getDestinationForSendTo(original);
+    } else if (original.getData() != null && "content".equals(original.getData().getScheme())) {
+      destination = getDestinationForSyncAdapter(original);
+    } else {
+      destination = getDestinationForView(original);
+    }
+
+    final Intent nextIntent;
+
+    if (TextUtils.isEmpty(destination.destination)) {
+      nextIntent = new Intent(this, NewConversationActivity.class);
+      nextIntent.putExtra(ConversationActivity.TEXT_EXTRA, 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);
+
+      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());
+    }
+    return nextIntent;
+  }
+
+  private @NonNull DestinationAndBody getDestinationForSendTo(Intent intent) {
+    return new DestinationAndBody(intent.getData().getSchemeSpecificPart(),
+                                  intent.getStringExtra("sms_body"));
+  }
+
+  private @NonNull DestinationAndBody getDestinationForView(Intent intent) {
+    try {
+      Rfc5724Uri smsUri = new Rfc5724Uri(intent.getData().toString());
+      return new DestinationAndBody(smsUri.getPath(), smsUri.getQueryParams().get("body"));
+    } catch (URISyntaxException e) {
+      Log.w(TAG, "unable to parse RFC5724 URI from intent", e);
+      return new DestinationAndBody("", "");
+    }
+  }
+
+  private @NonNull DestinationAndBody getDestinationForSyncAdapter(Intent intent) {
+    Cursor cursor = null;
+
+    try {
+      cursor = getContentResolver().query(intent.getData(), null, null, null, null);
+
+      if (cursor != null && cursor.moveToNext()) {
+        return new DestinationAndBody(cursor.getString(cursor.getColumnIndexOrThrow(ContactsContract.RawContacts.Data.DATA1)), "");
+      }
+
+      return new DestinationAndBody("", "");
+    } finally {
+      if (cursor != null) cursor.close();
+    }
+  }
+
+  private static class DestinationAndBody {
+    private final String destination;
+    private final String body;
+
+    private DestinationAndBody(String destination, String body) {
+      this.destination = destination;
+      this.body = body;
+    }
+
+    public String getDestination() {
+      return destination;
+    }
+
+    public String getBody() {
+      return body;
+    }
+  }
+}

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

@@ -0,0 +1,7 @@
+package org.thoughtcrime.securesms;
+
+public class TextSecureExpiredException extends Exception {
+  public TextSecureExpiredException(String message) {
+    super(message);
+  }
+}

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

@@ -0,0 +1,146 @@
+package org.thoughtcrime.securesms;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+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;
+import org.whispersystems.libsignal.util.guava.Optional;
+
+public class TransportOption implements Parcelable {
+
+  public enum Type {
+    SMS,
+    TEXTSECURE
+  }
+
+  private final int                             drawable;
+  private final int                             backgroundColor;
+  private final @NonNull String                 text;
+  private final @NonNull Type                   type;
+  private final @NonNull String                 composeHint;
+  private final @NonNull CharacterCalculator    characterCalculator;
+  private final @NonNull Optional<CharSequence> simName;
+  private final @NonNull Optional<Integer>      simSubscriptionId;
+
+  public TransportOption(@NonNull  Type type,
+                         @DrawableRes int drawable,
+                         int backgroundColor,
+                         @NonNull String text,
+                         @NonNull String composeHint,
+                         @NonNull CharacterCalculator characterCalculator)
+  {
+    this(type, drawable, backgroundColor, text, composeHint, characterCalculator,
+         Optional.<CharSequence>absent(), Optional.<Integer>absent());
+  }
+
+  public TransportOption(@NonNull  Type type,
+                         @DrawableRes int drawable,
+                         int backgroundColor,
+                         @NonNull String text,
+                         @NonNull String composeHint,
+                         @NonNull CharacterCalculator characterCalculator,
+                         @NonNull Optional<CharSequence> simName,
+                         @NonNull Optional<Integer> simSubscriptionId)
+  {
+    this.type                = type;
+    this.drawable            = drawable;
+    this.backgroundColor     = backgroundColor;
+    this.text                = text;
+    this.composeHint         = composeHint;
+    this.characterCalculator = characterCalculator;
+    this.simName             = simName;
+    this.simSubscriptionId   = simSubscriptionId;
+  }
+
+  TransportOption(Parcel in) {
+    this(Type.valueOf(in.readString()),
+         in.readInt(),
+         in.readInt(),
+         in.readString(),
+         in.readString(),
+         CharacterCalculator.readFromParcel(in),
+         Optional.fromNullable(TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in)),
+         in.readInt() == 1 ? Optional.of(in.readInt()) : Optional.absent());
+  }
+
+  public @NonNull Type getType() {
+    return type;
+  }
+
+  public boolean isType(Type type) {
+    return this.type == type;
+  }
+
+  public boolean isSms() {
+    return type == Type.SMS;
+  }
+
+  public CharacterState calculateCharacters(String messageBody) {
+    return characterCalculator.calculateCharacters(messageBody);
+  }
+
+  public @DrawableRes int getDrawable() {
+    return drawable;
+  }
+
+  public int getBackgroundColor() {
+    return backgroundColor;
+  }
+
+  public @NonNull String getComposeHint() {
+    return composeHint;
+  }
+
+  public @NonNull String getDescription() {
+    return text;
+  }
+
+  @NonNull
+  public Optional<CharSequence> getSimName() {
+    return simName;
+  }
+
+  @NonNull
+  public Optional<Integer> getSimSubscriptionId() {
+    return simSubscriptionId;
+  }
+
+  @Override
+  public int describeContents() {
+    return 0;
+  }
+
+  @Override
+  public void writeToParcel(Parcel dest, int flags) {
+    dest.writeString(type.name());
+    dest.writeInt(drawable);
+    dest.writeInt(backgroundColor);
+    dest.writeString(text);
+    dest.writeString(composeHint);
+    CharacterCalculator.writeToParcel(dest, characterCalculator);
+    TextUtils.writeToParcel(simName.orNull(), dest, flags);
+
+    if (simSubscriptionId.isPresent()) {
+      dest.writeInt(1);
+      dest.writeInt(simSubscriptionId.get());
+    } else {
+      dest.writeInt(0);
+    }
+  }
+
+  public static final Creator<TransportOption> CREATOR = new Creator<TransportOption>() {
+    @Override
+    public TransportOption createFromParcel(Parcel in) {
+      return new TransportOption(in);
+    }
+
+    @Override
+    public TransportOption[] newArray(int size) {
+      return new TransportOption[size];
+    }
+  };
+}

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

@@ -0,0 +1,223 @@
+package org.thoughtcrime.securesms;
+
+import android.Manifest;
+import android.content.Context;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.thoughtcrime.securesms.permissions.Permissions;
+import org.thoughtcrime.securesms.util.CharacterCalculator;
+import org.thoughtcrime.securesms.util.MmsCharacterCalculator;
+import org.thoughtcrime.securesms.util.PushCharacterCalculator;
+import org.thoughtcrime.securesms.util.SmsCharacterCalculator;
+import org.thoughtcrime.securesms.util.dualsim.SubscriptionInfoCompat;
+import org.thoughtcrime.securesms.util.dualsim.SubscriptionManagerCompat;
+import org.whispersystems.libsignal.util.guava.Optional;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import static org.thoughtcrime.securesms.TransportOption.Type;
+
+public class TransportOptions {
+
+  private static final String TAG = TransportOptions.class.getSimpleName();
+
+  private final List<OnTransportChangedListener> listeners = new LinkedList<>();
+  private final Context                          context;
+  private final List<TransportOption>            enabledTransports;
+
+  private Type                      defaultTransportType  = Type.SMS;
+  private Optional<Integer>         defaultSubscriptionId = Optional.absent();
+  private Optional<TransportOption> selectedOption        = Optional.absent();
+
+  private final Optional<Integer> systemSubscriptionId;
+
+  public TransportOptions(Context context, boolean media) {
+    this.context              = context;
+    this.enabledTransports    = initializeAvailableTransports(media);
+    this.systemSubscriptionId = new SubscriptionManagerCompat(context).getPreferredSubscriptionId();
+  }
+
+  public void reset(boolean media) {
+    List<TransportOption> transportOptions = initializeAvailableTransports(media);
+
+    this.enabledTransports.clear();
+    this.enabledTransports.addAll(transportOptions);
+
+    if (selectedOption.isPresent() && !isEnabled(selectedOption.get())) {
+      setSelectedTransport(null);
+    } else {
+      this.defaultTransportType = Type.SMS;
+      this.defaultSubscriptionId = Optional.absent();
+
+      notifyTransportChangeListeners();
+    }
+  }
+
+  public void setDefaultTransport(Type type) {
+    this.defaultTransportType = type;
+
+    if (!selectedOption.isPresent()) {
+      notifyTransportChangeListeners();
+    }
+  }
+
+  public void setDefaultSubscriptionId(Optional<Integer> subscriptionId) {
+    if  (defaultSubscriptionId.equals(subscriptionId)) {
+      return;
+    }
+
+    this.defaultSubscriptionId = subscriptionId;
+
+    if (!selectedOption.isPresent()) {
+      notifyTransportChangeListeners();
+    }
+  }
+
+  public void setSelectedTransport(@Nullable  TransportOption transportOption) {
+    this.selectedOption = Optional.fromNullable(transportOption);
+    notifyTransportChangeListeners();
+  }
+
+  public boolean isManualSelection() {
+    return this.selectedOption.isPresent();
+  }
+
+  public @NonNull TransportOption getSelectedTransport() {
+    if (selectedOption.isPresent()) return selectedOption.get();
+
+    if (defaultTransportType == Type.SMS) {
+      TransportOption transportOption = findEnabledSmsTransportOption(defaultSubscriptionId.or(systemSubscriptionId));
+      if (transportOption != null) {
+        return transportOption;
+      }
+    }
+
+    for (TransportOption transportOption : enabledTransports) {
+      if (transportOption.getType() == defaultTransportType) {
+        return transportOption;
+      }
+    }
+
+    throw new AssertionError("No options of default type!");
+  }
+
+  public static @NonNull TransportOption getPushTransportOption(@NonNull Context context) {
+    return new TransportOption(Type.TEXTSECURE,
+                               R.drawable.ic_send_lock_24,
+                               context.getResources().getColor(R.color.textsecure_primary),
+                               context.getString(R.string.ConversationActivity_transport_signal),
+                               context.getString(R.string.conversation_activity__type_message_push),
+                               new PushCharacterCalculator());
+
+  }
+
+  private @Nullable TransportOption findEnabledSmsTransportOption(Optional<Integer> subscriptionId) {
+    if (subscriptionId.isPresent()) {
+      final int subId = subscriptionId.get();
+
+      for (TransportOption transportOption : enabledTransports) {
+        if (transportOption.getType() == Type.SMS &&
+            subId == transportOption.getSimSubscriptionId().or(-1)) {
+          return transportOption;
+        }
+      }
+    }
+    return null;
+  }
+
+  public void disableTransport(Type type) {
+    TransportOption selected = selectedOption.orNull();
+
+    Iterator<TransportOption> iterator = enabledTransports.iterator();
+    while (iterator.hasNext()) {
+      TransportOption option = iterator.next();
+
+      if (option.isType(type)) {
+        if (selected == option) {
+          setSelectedTransport(null);
+        }
+        iterator.remove();
+      }
+    }
+  }
+
+  public List<TransportOption> getEnabledTransports() {
+    return enabledTransports;
+  }
+
+  public void addOnTransportChangedListener(OnTransportChangedListener listener) {
+    this.listeners.add(listener);
+  }
+
+  private List<TransportOption> initializeAvailableTransports(boolean isMediaMessage) {
+    List<TransportOption> results = new LinkedList<>();
+
+    if (isMediaMessage) {
+      results.addAll(getTransportOptionsForSimCards(context.getString(R.string.ConversationActivity_transport_insecure_mms),
+                                                    context.getString(R.string.conversation_activity__type_message_mms_insecure),
+                                                    new MmsCharacterCalculator()));
+    } else {
+      results.addAll(getTransportOptionsForSimCards(context.getString(R.string.ConversationActivity_transport_insecure_sms),
+                                                    context.getString(R.string.conversation_activity__type_message_sms_insecure),
+                                                    new SmsCharacterCalculator()));
+    }
+
+    results.add(getPushTransportOption(context));
+
+    return results;
+  }
+
+  private @NonNull List<TransportOption> getTransportOptionsForSimCards(@NonNull String text,
+                                                                        @NonNull String composeHint,
+                                                                        @NonNull CharacterCalculator characterCalculator)
+  {
+    List<TransportOption>              results             = new LinkedList<>();
+    SubscriptionManagerCompat          subscriptionManager = new SubscriptionManagerCompat(context);
+    Collection<SubscriptionInfoCompat> subscriptions;
+
+    if (Permissions.hasAll(context, Manifest.permission.READ_PHONE_STATE)) {
+      subscriptions = subscriptionManager.getActiveAndReadySubscriptionInfos();
+    } else {
+      subscriptions = Collections.emptyList();
+    }
+
+    if (subscriptions.size() < 2) {
+      results.add(new TransportOption(Type.SMS, R.drawable.ic_send_unlock_24,
+                                      context.getResources().getColor(R.color.core_grey_50),
+                                      text, composeHint, characterCalculator));
+    } else {
+      for (SubscriptionInfoCompat subscriptionInfo : subscriptions) {
+        results.add(new TransportOption(Type.SMS, R.drawable.ic_send_unlock_24,
+                                        context.getResources().getColor(R.color.core_grey_50),
+                                        text, composeHint, characterCalculator,
+                                        Optional.of(subscriptionInfo.getDisplayName()),
+                                        Optional.of(subscriptionInfo.getSubscriptionId())));
+      }
+    }
+
+    return results;
+  }
+
+  private void notifyTransportChangeListeners() {
+    for (OnTransportChangedListener listener : listeners) {
+      listener.onChange(getSelectedTransport(), selectedOption.isPresent());
+    }
+  }
+
+  private boolean isEnabled(TransportOption transportOption) {
+    for (TransportOption option : enabledTransports) {
+      if (option.equals(transportOption)) return true;
+    }
+
+    return false;
+  }
+
+  public interface OnTransportChangedListener {
+    public void onChange(TransportOption newTransport, boolean manuallySelected);
+  }
+}

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

@@ -0,0 +1,74 @@
+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;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.thoughtcrime.securesms.util.ViewUtil;
+
+import java.util.List;
+
+public class TransportOptionsAdapter extends BaseAdapter {
+
+  private final LayoutInflater inflater;
+
+  private List<TransportOption> enabledTransports;
+
+  public TransportOptionsAdapter(@NonNull Context context,
+                                 @NonNull List<TransportOption> enabledTransports)
+  {
+    super();
+    this.inflater          = LayoutInflater.from(context);
+    this.enabledTransports = enabledTransports;
+  }
+
+  public void setEnabledTransports(List<TransportOption> enabledTransports) {
+    this.enabledTransports = enabledTransports;
+  }
+
+  @Override
+  public int getCount() {
+    return enabledTransports.size();
+  }
+
+  @Override
+  public Object getItem(int position) {
+    return enabledTransports.get(position);
+  }
+
+  @Override
+  public long getItemId(int position) {
+    return position;
+  }
+
+  @Override
+  public View getView(int position, View convertView, ViewGroup parent) {
+    if (convertView == null) {
+      convertView = inflater.inflate(R.layout.transport_selection_list_item, parent, false);
+    }
+
+    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.getBackground().setColorFilter(transport.getBackgroundColor(), Mode.MULTIPLY);
+    imageView.setImageResource(transport.getDrawable());
+    textView.setText(transport.getDescription());
+
+    if (transport.getSimName().isPresent()) {
+      subtextView.setText(transport.getSimName().get());
+      subtextView.setVisibility(View.VISIBLE);
+    } else {
+      subtextView.setVisibility(View.GONE);
+    }
+
+    return convertView;
+  }
+}

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

@@ -0,0 +1,49 @@
+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 java.util.LinkedList;
+import java.util.List;
+
+public class TransportOptionsPopup extends ListPopupWindow implements ListView.OnItemClickListener {
+
+  private final TransportOptionsAdapter adapter;
+  private final SelectedListener        listener;
+
+  public TransportOptionsPopup(@NonNull Context context, @NonNull View anchor, @NonNull SelectedListener listener) {
+    super(context);
+    this.listener = listener;
+    this.adapter  = new TransportOptionsAdapter(context, new LinkedList<TransportOption>());
+
+    setVerticalOffset(context.getResources().getDimensionPixelOffset(R.dimen.transport_selection_popup_yoff));
+    setHorizontalOffset(context.getResources().getDimensionPixelOffset(R.dimen.transport_selection_popup_xoff));
+    setInputMethodMode(ListPopupWindow.INPUT_METHOD_NOT_NEEDED);
+    setModal(true);
+    setAnchorView(anchor);
+    setAdapter(adapter);
+    setContentWidth(context.getResources().getDimensionPixelSize(R.dimen.transport_selection_popup_width));
+
+    setOnItemClickListener(this);
+  }
+
+  public void display(List<TransportOption> enabledTransports) {
+    adapter.setEnabledTransports(enabledTransports);
+    adapter.notifyDataSetChanged();
+    show();
+  }
+
+  @Override
+  public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+    listener.onSelected((TransportOption)adapter.getItem(position));
+  }
+
+  public interface SelectedListener {
+    void onSelected(TransportOption option);
+  }
+
+}

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

@@ -0,0 +1,73 @@
+package org.thoughtcrime.securesms;
+
+
+import android.content.Context;
+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 org.thoughtcrime.securesms.components.TypingIndicatorView;
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.jobs.MultiDeviceConfigurationUpdateJob;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+
+public class TypingIndicatorIntroFragment extends Fragment {
+
+  private Controller controller;
+
+  public static TypingIndicatorIntroFragment newInstance() {
+    TypingIndicatorIntroFragment fragment = new TypingIndicatorIntroFragment();
+    Bundle                       args     = new Bundle();
+    fragment.setArguments(args);
+    return fragment;
+  }
+
+  public TypingIndicatorIntroFragment() {}
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+  }
+
+  @Override
+  public void onAttach(Context context) {
+    super.onAttach(context);
+
+    if (!(getActivity() instanceof Controller)) {
+      throw new IllegalStateException("Parent activity must implement the Controller interface.");
+    }
+
+    controller = (Controller) getActivity();
+  }
+
+  @Override
+  public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    View view      = inflater.inflate(R.layout.experience_upgrade_typing_indicators_fragment, container, false);
+    View yesButton = view.findViewById(R.id.experience_yes_button);
+    View noButton  = view.findViewById(R.id.experience_no_button);
+
+    ((TypingIndicatorView) view.findViewById(R.id.typing_indicator)).startAnimation();
+
+    yesButton.setOnClickListener(v -> onButtonClicked(true));
+    noButton.setOnClickListener(v -> onButtonClicked(false));
+
+    return view;
+  }
+
+  private void onButtonClicked(boolean typingEnabled) {
+    TextSecurePreferences.setTypingIndicatorsEnabled(getContext(), typingEnabled);
+    ApplicationDependencies.getJobManager().add(new MultiDeviceConfigurationUpdateJob(TextSecurePreferences.isReadReceiptsEnabled(requireContext()),
+                                                                                      typingEnabled,
+                                                                                      TextSecurePreferences.isShowUnidentifiedDeliveryIndicatorsEnabled(getContext()),
+                                                                                      TextSecurePreferences.isLinkPreviewsEnabled(getContext())));
+
+    controller.onTypingIndicatorsFinished();
+  }
+
+  public interface Controller {
+    void onTypingIndicatorsFinished();
+  }
+}

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

@@ -0,0 +1,5 @@
+package org.thoughtcrime.securesms;
+
+public interface Unbindable {
+  public void unbind();
+}

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

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

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

@@ -0,0 +1,414 @@
+/*
+ * Copyright (C) 2016 Open Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.thoughtcrime.securesms;
+
+import android.Manifest;
+import android.app.Activity;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.media.AudioManager;
+import android.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+
+import org.thoughtcrime.securesms.logging.Log;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import org.thoughtcrime.securesms.components.webrtc.WebRtcAnswerDeclineButton;
+import org.thoughtcrime.securesms.components.webrtc.WebRtcCallControls;
+import org.thoughtcrime.securesms.components.webrtc.WebRtcCallScreen;
+import org.thoughtcrime.securesms.crypto.storage.TextSecureIdentityKeyStore;
+import org.thoughtcrime.securesms.events.WebRtcViewModel;
+import org.thoughtcrime.securesms.permissions.Permissions;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.service.WebRtcCallService;
+import org.thoughtcrime.securesms.util.ServiceUtil;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.ViewUtil;
+import org.webrtc.SurfaceViewRenderer;
+import org.whispersystems.libsignal.IdentityKey;
+import org.whispersystems.libsignal.SignalProtocolAddress;
+
+import static org.whispersystems.libsignal.SessionCipher.SESSION_LOCK;
+
+public class WebRtcCallActivity extends Activity {
+
+  private static final String TAG = WebRtcCallActivity.class.getSimpleName();
+
+  private static final int STANDARD_DELAY_FINISH    = 1000;
+  public  static final int BUSY_SIGNAL_DELAY_FINISH = 5500;
+
+  public static final String ANSWER_ACTION   = WebRtcCallActivity.class.getCanonicalName() + ".ANSWER_ACTION";
+  public static final String DENY_ACTION     = WebRtcCallActivity.class.getCanonicalName() + ".DENY_ACTION";
+  public static final String END_CALL_ACTION = WebRtcCallActivity.class.getCanonicalName() + ".END_CALL_ACTION";
+
+  public static final String EXTRA_ENABLE_VIDEO_IF_AVAILABLE = WebRtcCallActivity.class.getCanonicalName() + ".ENABLE_VIDEO_IF_AVAILABLE";
+
+  private WebRtcCallScreen callScreen;
+  private boolean          enableVideoIfAvailable;
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    Log.i(TAG, "onCreate()");
+    getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+    getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+    super.onCreate(savedInstanceState);
+
+    requestWindowFeature(Window.FEATURE_NO_TITLE);
+    setContentView(R.layout.webrtc_call_activity);
+
+    setVolumeControlStream(AudioManager.STREAM_VOICE_CALL);
+
+    initializeResources();
+
+    processIntent(getIntent());
+
+    enableVideoIfAvailable = getIntent().getBooleanExtra(EXTRA_ENABLE_VIDEO_IF_AVAILABLE, false);
+    getIntent().removeExtra(EXTRA_ENABLE_VIDEO_IF_AVAILABLE);
+  }
+
+
+  @Override
+  public void onResume() {
+    Log.i(TAG, "onResume()");
+    super.onResume();
+    initializeScreenshotSecurity();
+    EventBus.getDefault().register(this);
+  }
+
+  @Override
+  public void onNewIntent(Intent intent){
+    Log.i(TAG, "onNewIntent");
+    processIntent(intent);
+  }
+
+  @Override
+  public void onPause() {
+    Log.i(TAG, "onPause");
+    super.onPause();
+    EventBus.getDefault().unregister(this);
+  }
+
+  @Override
+  public void onConfigurationChanged(Configuration newConfiguration) {
+    super.onConfigurationChanged(newConfiguration);
+  }
+
+  @Override
+  public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+    Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
+  }
+
+  private void processIntent(@NonNull Intent intent) {
+    if (ANSWER_ACTION.equals(intent.getAction())) {
+      handleAnswerCall();
+    } else if (DENY_ACTION.equals(intent.getAction())) {
+      handleDenyCall();
+    } else if (END_CALL_ACTION.equals(intent.getAction())) {
+      handleEndCall();
+    }
+  }
+
+  private void initializeScreenshotSecurity() {
+    if (TextSecurePreferences.isScreenSecurityEnabled(this)) {
+      getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
+    } else {
+      getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
+    }
+  }
+
+  private void initializeResources() {
+    callScreen = ViewUtil.findById(this, R.id.callScreen);
+    callScreen.setHangupButtonListener(new HangupButtonListener());
+    callScreen.setIncomingCallActionListener(new IncomingCallActionListener());
+    callScreen.setAudioMuteButtonListener(new AudioMuteButtonListener());
+    callScreen.setVideoMuteButtonListener(new VideoMuteButtonListener());
+    callScreen.setCameraFlipButtonListener(new CameraFlipButtonListener());
+    callScreen.setSpeakerButtonListener(new SpeakerButtonListener());
+    callScreen.setBluetoothButtonListener(new BluetoothButtonListener());
+  }
+
+  private void handleSetAudioSpeaker(boolean enabled) {
+    Intent intent = new Intent(this, WebRtcCallService.class);
+    intent.setAction(WebRtcCallService.ACTION_SET_AUDIO_SPEAKER);
+    intent.putExtra(WebRtcCallService.EXTRA_SPEAKER, enabled);
+    startService(intent);
+  }
+
+  private void handleSetAudioBluetooth(boolean enabled) {
+    Intent intent = new Intent(this, WebRtcCallService.class);
+    intent.setAction(WebRtcCallService.ACTION_SET_AUDIO_BLUETOOTH);
+    intent.putExtra(WebRtcCallService.EXTRA_BLUETOOTH, enabled);
+    startService(intent);
+  }
+
+  private void handleSetMuteAudio(boolean enabled) {
+    Intent intent = new Intent(this, WebRtcCallService.class);
+    intent.setAction(WebRtcCallService.ACTION_SET_MUTE_AUDIO);
+    intent.putExtra(WebRtcCallService.EXTRA_MUTE, enabled);
+    startService(intent);
+  }
+
+  private void handleSetMuteVideo(boolean muted) {
+    Intent intent = new Intent(this, WebRtcCallService.class);
+    intent.setAction(WebRtcCallService.ACTION_SET_MUTE_VIDEO);
+    intent.putExtra(WebRtcCallService.EXTRA_MUTE, muted);
+    startService(intent);
+  }
+
+  private void handleFlipCamera() {
+    Intent intent = new Intent(this, WebRtcCallService.class);
+    intent.setAction(WebRtcCallService.ACTION_FLIP_CAMERA);
+    startService(intent);
+  }
+
+  private void handleAnswerCall() {
+    WebRtcViewModel event = EventBus.getDefault().getStickyEvent(WebRtcViewModel.class);
+
+    if (event != null) {
+      Permissions.with(this)
+                 .request(Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA)
+                 .ifNecessary()
+                 .withRationaleDialog(getString(R.string.WebRtcCallActivity_to_answer_the_call_from_s_give_signal_access_to_your_microphone, event.getRecipient().toShortString(this)),
+                                      R.drawable.ic_mic_solid_24, R.drawable.ic_video_solid_24_tinted)
+                 .withPermanentDenialDialog(getString(R.string.WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls))
+                 .onAllGranted(() -> {
+                   callScreen.setActiveCall(event.getRecipient(), getString(R.string.RedPhone_answering), event.getLocalRenderer());
+
+                   Intent intent = new Intent(this, WebRtcCallService.class);
+                   intent.setAction(WebRtcCallService.ACTION_ANSWER_CALL);
+                   startService(intent);
+                 })
+                 .onAnyDenied(this::handleDenyCall)
+                 .execute();
+    }
+  }
+
+  private void handleDenyCall() {
+    WebRtcViewModel event = EventBus.getDefault().getStickyEvent(WebRtcViewModel.class);
+
+    if (event != null) {
+      Intent intent = new Intent(this, WebRtcCallService.class);
+      intent.setAction(WebRtcCallService.ACTION_DENY_CALL);
+      startService(intent);
+
+      callScreen.setActiveCall(event.getRecipient(), getString(R.string.RedPhone_ending_call), event.getLocalRenderer());
+      delayedFinish();
+    }
+  }
+
+  private void handleEndCall() {
+    Log.i(TAG, "Hangup pressed, handling termination now...");
+    Intent intent = new Intent(WebRtcCallActivity.this, WebRtcCallService.class);
+    intent.setAction(WebRtcCallService.ACTION_LOCAL_HANGUP);
+    startService(intent);
+  }
+
+  private void handleIncomingCall(@NonNull WebRtcViewModel event) {
+    callScreen.setIncomingCall(event.getRecipient());
+  }
+
+  private void handleOutgoingCall(@NonNull WebRtcViewModel event) {
+    callScreen.setActiveCall(event.getRecipient(), getString(R.string.RedPhone_dialing), event.getLocalRenderer());
+  }
+
+  private void handleTerminate(@NonNull Recipient recipient, @NonNull SurfaceViewRenderer localRenderer /*, int terminationType */) {
+    Log.i(TAG, "handleTerminate called");
+
+    callScreen.setActiveCall(recipient, getString(R.string.RedPhone_ending_call), localRenderer);
+    EventBus.getDefault().removeStickyEvent(WebRtcViewModel.class);
+
+    delayedFinish();
+  }
+
+  private void handleCallRinging(@NonNull WebRtcViewModel event) {
+    callScreen.setActiveCall(event.getRecipient(), getString(R.string.RedPhone_ringing), event.getLocalRenderer());
+  }
+
+  private void handleCallBusy(@NonNull WebRtcViewModel event) {
+    callScreen.setActiveCall(event.getRecipient(), getString(R.string.RedPhone_busy), event.getLocalRenderer());
+
+    delayedFinish(BUSY_SIGNAL_DELAY_FINISH);
+  }
+
+  private void handleCallConnected(@NonNull WebRtcViewModel event) {
+    getWindow().addFlags(WindowManager.LayoutParams.FLAG_IGNORE_CHEEK_PRESSES);
+    callScreen.setActiveCall(event.getRecipient(), getString(R.string.RedPhone_connected), "", event.getLocalRenderer(), event.getRemoteRenderer());
+  }
+
+  private void handleRecipientUnavailable(@NonNull WebRtcViewModel event) {
+    callScreen.setActiveCall(event.getRecipient(), getString(R.string.RedPhone_recipient_unavailable), event.getLocalRenderer());
+    delayedFinish();
+  }
+
+  private void handleServerFailure(@NonNull WebRtcViewModel event) {
+    callScreen.setActiveCall(event.getRecipient(), getString(R.string.RedPhone_network_failed), event.getLocalRenderer());
+    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
+    AlertDialog.Builder dialog = new AlertDialog.Builder(this);
+    dialog.setTitle(R.string.RedPhone_number_not_registered);
+    dialog.setIconAttribute(R.attr.dialog_alert_icon);
+    dialog.setMessage(R.string.RedPhone_the_number_you_dialed_does_not_support_secure_voice);
+    dialog.setCancelable(true);
+    dialog.setPositiveButton(R.string.RedPhone_got_it, new OnClickListener() {
+      @Override
+      public void onClick(DialogInterface dialog, int which) {
+        WebRtcCallActivity.this.handleTerminate(event.getRecipient(), event.getLocalRenderer());
+      }
+    });
+    dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
+      @Override
+      public void onCancel(DialogInterface dialog) {
+        WebRtcCallActivity.this.handleTerminate(event.getRecipient(), event.getLocalRenderer());
+      }
+    });
+    dialog.show();
+  }
+
+  private void handleUntrustedIdentity(@NonNull WebRtcViewModel event) {
+    final IdentityKey theirIdentity = event.getIdentityKey();
+    final Recipient   recipient     = event.getRecipient();
+
+    callScreen.setUntrustedIdentity(recipient, theirIdentity);
+    callScreen.setAcceptIdentityListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        synchronized (SESSION_LOCK) {
+          TextSecureIdentityKeyStore identityKeyStore = new TextSecureIdentityKeyStore(WebRtcCallActivity.this);
+          identityKeyStore.saveIdentity(new SignalProtocolAddress(recipient.requireServiceId(), 1), theirIdentity, true);
+        }
+
+        Intent intent = new Intent(WebRtcCallActivity.this, WebRtcCallService.class);
+        intent.putExtra(WebRtcCallService.EXTRA_REMOTE_RECIPIENT, recipient.getId());
+        intent.setAction(WebRtcCallService.ACTION_OUTGOING_CALL);
+        startService(intent);
+      }
+    });
+
+    callScreen.setCancelIdentityButton(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        handleTerminate(recipient, event.getLocalRenderer());
+      }
+    });
+  }
+
+  private void delayedFinish() {
+    delayedFinish(STANDARD_DELAY_FINISH);
+  }
+
+  private void delayedFinish(int delayMillis) {
+    callScreen.postDelayed(new Runnable() {
+      public void run() {
+        WebRtcCallActivity.this.finish();
+      }
+    }, delayMillis);
+  }
+
+  @Subscribe(sticky = true, threadMode = ThreadMode.MAIN)
+  public void onEventMainThread(final WebRtcViewModel event) {
+    Log.i(TAG, "Got message from service: " + event);
+
+    switch (event.getState()) {
+      case CALL_CONNECTED:          handleCallConnected(event);                                      break;
+      case NETWORK_FAILURE:         handleServerFailure(event);                                      break;
+      case CALL_RINGING:            handleCallRinging(event);                                        break;
+      case CALL_DISCONNECTED:       handleTerminate(event.getRecipient(), event.getLocalRenderer()); break;
+      case NO_SUCH_USER:            handleNoSuchUser(event);                                         break;
+      case RECIPIENT_UNAVAILABLE:   handleRecipientUnavailable(event);                               break;
+      case CALL_INCOMING:           handleIncomingCall(event);                                       break;
+      case CALL_OUTGOING:           handleOutgoingCall(event);                                       break;
+      case CALL_BUSY:               handleCallBusy(event);                                           break;
+      case UNTRUSTED_IDENTITY:      handleUntrustedIdentity(event);                                  break;
+    }
+
+    callScreen.setRemoteVideoEnabled(event.isRemoteVideoEnabled());
+    callScreen.updateAudioState(event.isBluetoothAvailable(), event.isMicrophoneEnabled());
+    callScreen.setControlsEnabled(event.getState() != WebRtcViewModel.State.CALL_INCOMING);
+    callScreen.setLocalVideoState(event.getLocalCameraState(), event.getLocalRenderer());
+
+    if (event.getLocalCameraState().getCameraCount() > 0 && enableVideoIfAvailable) {
+      enableVideoIfAvailable = false;
+      handleSetMuteVideo(false);
+    }
+  }
+
+  private class HangupButtonListener implements WebRtcCallScreen.HangupButtonListener {
+    public void onClick() {
+      handleEndCall();
+    }
+  }
+
+  private class AudioMuteButtonListener implements WebRtcCallControls.MuteButtonListener {
+    @Override
+    public void onToggle(boolean isMuted) {
+      WebRtcCallActivity.this.handleSetMuteAudio(isMuted);
+    }
+  }
+
+  private class VideoMuteButtonListener implements WebRtcCallControls.MuteButtonListener {
+    @Override
+    public void onToggle(boolean isMuted) {
+      WebRtcCallActivity.this.handleSetMuteVideo(isMuted);
+    }
+  }
+
+  private class CameraFlipButtonListener implements WebRtcCallControls.CameraFlipButtonListener {
+    @Override
+    public void onToggle() {
+      WebRtcCallActivity.this.handleFlipCamera();
+    }
+  }
+
+  private class SpeakerButtonListener implements WebRtcCallControls.SpeakerButtonListener {
+    @Override
+    public void onSpeakerChange(boolean isSpeaker) {
+      WebRtcCallActivity.this.handleSetAudioSpeaker(isSpeaker);
+    }
+  }
+
+  private class BluetoothButtonListener implements WebRtcCallControls.BluetoothButtonListener {
+    @Override
+    public void onBluetoothChange(boolean isBluetooth) {
+      WebRtcCallActivity.this.handleSetAudioBluetooth(isBluetooth);
+    }
+  }
+
+  private class IncomingCallActionListener implements WebRtcAnswerDeclineButton.AnswerDeclineListener {
+    @Override
+    public void onAnswered() {
+      WebRtcCallActivity.this.handleAnswerCall();
+    }
+
+    @Override
+    public void onDeclined() {
+      WebRtcCallActivity.this.handleDenyCall();
+    }
+  }
+
+}

app/src/main/java/org/thoughtcrime/securesms/animation/AnimationCompleteListener.java

@@ -0,0 +1,17 @@
+package org.thoughtcrime.securesms.animation;
+
+
+import android.animation.Animator;
+
+public abstract class AnimationCompleteListener implements Animator.AnimatorListener {
+  @Override
+  public final void onAnimationStart(Animator animation) {}
+
+  @Override
+  public abstract void onAnimationEnd(Animator animation);
+
+  @Override
+  public final void onAnimationCancel(Animator animation) {}
+  @Override
+  public final void onAnimationRepeat(Animator animation) {}
+}

app/src/main/java/org/thoughtcrime/securesms/animation/DepthPageTransformer.java

@@ -0,0 +1,40 @@
+package org.thoughtcrime.securesms.animation;
+
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.viewpager.widget.ViewPager;
+
+/**
+ * Based on https://developer.android.com/training/animation/screen-slide#depth-page
+ */
+public final class DepthPageTransformer implements ViewPager.PageTransformer {
+  private static final float MIN_SCALE = 0.75f;
+
+  public void transformPage(@NonNull View view, float position) {
+    final int pageWidth = view.getWidth();
+
+    if (position < -1f) {
+      view.setAlpha(0f);
+
+    } else if (position <= 0f) {
+      view.setAlpha(1f);
+      view.setTranslationX(0f);
+      view.setScaleX(1f);
+      view.setScaleY(1f);
+
+    } else if (position <= 1f) {
+      view.setAlpha(1f - position);
+
+      view.setTranslationX(pageWidth * -position);
+
+      final float scaleFactor = MIN_SCALE + (1f - MIN_SCALE) * (1f - Math.abs(position));
+
+      view.setScaleX(scaleFactor);
+      view.setScaleY(scaleFactor);
+
+    } else {
+      view.setAlpha(0f);
+    }
+  }
+}

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

@@ -0,0 +1,169 @@
+package org.thoughtcrime.securesms.attachments;
+
+import android.net.Uri;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.thoughtcrime.securesms.blurhash.BlurHash;
+import org.thoughtcrime.securesms.database.AttachmentDatabase;
+import org.thoughtcrime.securesms.database.AttachmentDatabase.TransformProperties;
+import org.thoughtcrime.securesms.stickers.StickerLocator;
+
+public abstract class Attachment {
+
+  @NonNull
+  private final String  contentType;
+  private final int     transferState;
+  private final long    size;
+
+  @Nullable
+  private final String fileName;
+
+  @Nullable
+  private final String  location;
+
+  @Nullable
+  private final String  key;
+
+  @Nullable
+  private final String relay;
+
+  @Nullable
+  private final byte[] digest;
+
+  @Nullable
+  private final String fastPreflightId;
+
+  private final boolean voiceNote;
+  private final int width;
+  private final int height;
+
+  private final boolean quote;
+
+  @Nullable
+  private final String caption;
+
+  @Nullable
+  private final StickerLocator stickerLocator;
+
+  @Nullable
+  private final BlurHash blurHash;
+
+  @NonNull
+  private final TransformProperties transformProperties;
+
+  public Attachment(@NonNull String contentType, int transferState, long size, @Nullable String fileName,
+                    @Nullable String location, @Nullable String key, @Nullable String relay,
+                    @Nullable byte[] digest, @Nullable String fastPreflightId, boolean voiceNote,
+                    int width, int height, boolean quote, @Nullable String caption, @Nullable StickerLocator stickerLocator,
+                    @Nullable BlurHash blurHash, @Nullable TransformProperties transformProperties)
+  {
+    this.contentType         = contentType;
+    this.transferState       = transferState;
+    this.size                = size;
+    this.fileName            = fileName;
+    this.location            = location;
+    this.key                 = key;
+    this.relay               = relay;
+    this.digest              = digest;
+    this.fastPreflightId     = fastPreflightId;
+    this.voiceNote           = voiceNote;
+    this.width               = width;
+    this.height              = height;
+    this.quote               = quote;
+    this.stickerLocator      = stickerLocator;
+    this.caption             = caption;
+    this.blurHash            = blurHash;
+    this.transformProperties = transformProperties != null ? transformProperties : TransformProperties.empty();
+  }
+
+  @Nullable
+  public abstract Uri getDataUri();
+
+  @Nullable
+  public abstract Uri getThumbnailUri();
+
+  public int getTransferState() {
+    return transferState;
+  }
+
+  public boolean isInProgress() {
+    return transferState != AttachmentDatabase.TRANSFER_PROGRESS_DONE &&
+           transferState != AttachmentDatabase.TRANSFER_PROGRESS_FAILED;
+  }
+
+  public long getSize() {
+    return size;
+  }
+
+  @Nullable
+  public String getFileName() {
+    return fileName;
+  }
+
+  @NonNull
+  public String getContentType() {
+    return contentType;
+  }
+
+  @Nullable
+  public String getLocation() {
+    return location;
+  }
+
+  @Nullable
+  public String getKey() {
+    return key;
+  }
+
+  @Nullable
+  public String getRelay() {
+    return relay;
+  }
+
+  @Nullable
+  public byte[] getDigest() {
+    return digest;
+  }
+
+  @Nullable
+  public String getFastPreflightId() {
+    return fastPreflightId;
+  }
+
+  public boolean isVoiceNote() {
+    return voiceNote;
+  }
+
+  public int getWidth() {
+    return width;
+  }
+
+  public int getHeight() {
+    return height;
+  }
+
+  public boolean isQuote() {
+    return quote;
+  }
+
+  public boolean isSticker() {
+    return stickerLocator != null;
+  }
+
+  public @Nullable StickerLocator getSticker() {
+    return stickerLocator;
+  }
+
+  public @Nullable BlurHash getBlurHash() {
+    return blurHash;
+  }
+
+  public @Nullable String getCaption() {
+    return caption;
+  }
+
+  public @NonNull TransformProperties getTransformProperties() {
+    return transformProperties;
+  }
+}

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

@@ -0,0 +1,57 @@
+package org.thoughtcrime.securesms.attachments;
+
+import androidx.annotation.NonNull;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import org.thoughtcrime.securesms.util.Util;
+
+public class AttachmentId {
+
+  @JsonProperty
+  private final long rowId;
+
+  @JsonProperty
+  private final long uniqueId;
+
+  public AttachmentId(@JsonProperty("rowId") long rowId, @JsonProperty("uniqueId") long uniqueId) {
+    this.rowId    = rowId;
+    this.uniqueId = uniqueId;
+  }
+
+  public long getRowId() {
+    return rowId;
+  }
+
+  public long getUniqueId() {
+    return uniqueId;
+  }
+
+  public String[] toStrings() {
+    return new String[] {String.valueOf(rowId), String.valueOf(uniqueId)};
+  }
+
+  public @NonNull String toString() {
+    return "AttachmentId::(" + rowId + ", " + uniqueId + ")";
+  }
+
+  public boolean isValid() {
+    return rowId >= 0 && uniqueId >= 0;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+
+    AttachmentId attachmentId = (AttachmentId)o;
+
+    if (rowId != attachmentId.rowId) return false;
+    return uniqueId == attachmentId.uniqueId;
+  }
+
+  @Override
+  public int hashCode() {
+    return Util.hashCode(rowId, uniqueId);
+  }
+}

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

@@ -0,0 +1,84 @@
+package org.thoughtcrime.securesms.attachments;
+
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.thoughtcrime.securesms.blurhash.BlurHash;
+import org.thoughtcrime.securesms.database.AttachmentDatabase;
+import org.thoughtcrime.securesms.database.AttachmentDatabase.TransformProperties;
+import org.thoughtcrime.securesms.mms.PartAuthority;
+import org.thoughtcrime.securesms.stickers.StickerLocator;
+
+public class DatabaseAttachment extends Attachment {
+
+  private final AttachmentId attachmentId;
+  private final long         mmsId;
+  private final boolean      hasData;
+  private final boolean      hasThumbnail;
+
+  public DatabaseAttachment(AttachmentId attachmentId, long mmsId,
+                            boolean hasData, boolean hasThumbnail,
+                            String contentType, int transferProgress, long size,
+                            String fileName, String location, String key, String relay,
+                            byte[] digest, String fastPreflightId, boolean voiceNote,
+                            int width, int height, boolean quote, @Nullable String caption,
+                            @Nullable StickerLocator stickerLocator, @Nullable BlurHash blurHash,
+                            @Nullable TransformProperties transformProperties)
+  {
+    super(contentType, transferProgress, size, fileName, location, key, relay, digest, fastPreflightId, voiceNote, width, height, quote, caption, stickerLocator, blurHash, transformProperties);
+    this.attachmentId = attachmentId;
+    this.hasData      = hasData;
+    this.hasThumbnail = hasThumbnail;
+    this.mmsId        = mmsId;
+  }
+
+  @Override
+  @Nullable
+  public Uri getDataUri() {
+    if (hasData) {
+      return PartAuthority.getAttachmentDataUri(attachmentId);
+    } else {
+      return null;
+    }
+  }
+
+  @Override
+  @Nullable
+  public Uri getThumbnailUri() {
+    if (hasThumbnail) {
+      return PartAuthority.getAttachmentThumbnailUri(attachmentId);
+    } else {
+      return null;
+    }
+  }
+
+  public AttachmentId getAttachmentId() {
+    return attachmentId;
+  }
+
+  @Override
+  public boolean equals(Object other) {
+    return other != null &&
+           other instanceof DatabaseAttachment &&
+           ((DatabaseAttachment) other).attachmentId.equals(this.attachmentId);
+  }
+
+  @Override
+  public int hashCode() {
+    return attachmentId.hashCode();
+  }
+
+  public long getMmsId() {
+    return mmsId;
+  }
+
+  public boolean hasData() {
+    return hasData;
+  }
+
+  public boolean hasThumbnail() {
+    return hasThumbnail;
+  }
+}

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

@@ -0,0 +1,39 @@
+package org.thoughtcrime.securesms.attachments;
+
+
+import android.net.Uri;
+import androidx.annotation.Nullable;
+
+import org.thoughtcrime.securesms.database.AttachmentDatabase;
+import org.thoughtcrime.securesms.database.MmsDatabase;
+
+public class MmsNotificationAttachment extends Attachment {
+
+  public MmsNotificationAttachment(int status, long size) {
+    super("application/mms", getTransferStateFromStatus(status), size, null, null, null, null, null, null, false, 0, 0, false, null, null, null, null);
+  }
+
+  @Nullable
+  @Override
+  public Uri getDataUri() {
+    return null;
+  }
+
+  @Nullable
+  @Override
+  public Uri getThumbnailUri() {
+    return null;
+  }
+
+  private static int getTransferStateFromStatus(int status) {
+    if (status == MmsDatabase.Status.DOWNLOAD_INITIALIZED ||
+        status == MmsDatabase.Status.DOWNLOAD_NO_CONNECTIVITY)
+    {
+      return AttachmentDatabase.TRANSFER_PROGRESS_PENDING;
+    } else if (status == MmsDatabase.Status.DOWNLOAD_CONNECTING) {
+      return AttachmentDatabase.TRANSFER_PROGRESS_STARTED;
+    } else {
+      return AttachmentDatabase.TRANSFER_PROGRESS_FAILED;
+    }
+  }
+}

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

@@ -0,0 +1,128 @@
+package org.thoughtcrime.securesms.attachments;
+
+import android.net.Uri;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.thoughtcrime.securesms.blurhash.BlurHash;
+import org.thoughtcrime.securesms.database.AttachmentDatabase;
+import org.thoughtcrime.securesms.stickers.StickerLocator;
+import org.thoughtcrime.securesms.util.Base64;
+import org.whispersystems.libsignal.util.guava.Optional;
+import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
+import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class PointerAttachment extends Attachment {
+
+  private PointerAttachment(@NonNull String contentType, int transferState, long size,
+                            @Nullable String fileName,  @NonNull String location,
+                            @Nullable String key, @Nullable String relay,
+                            @Nullable byte[] digest, @Nullable String fastPreflightId, boolean voiceNote,
+                            int width, int height, @Nullable String caption, @Nullable StickerLocator stickerLocator,
+                            @Nullable BlurHash blurHash)
+  {
+    super(contentType, transferState, size, fileName, location, key, relay, digest, fastPreflightId, voiceNote, width, height, false, caption, stickerLocator, blurHash, null);
+  }
+
+  @Nullable
+  @Override
+  public Uri getDataUri() {
+    return null;
+  }
+
+  @Nullable
+  @Override
+  public Uri getThumbnailUri() {
+    return null;
+  }
+
+
+  public static List<Attachment> forPointers(Optional<List<SignalServiceAttachment>> pointers) {
+    List<Attachment> results = new LinkedList<>();
+
+    if (pointers.isPresent()) {
+      for (SignalServiceAttachment pointer : pointers.get()) {
+        Optional<Attachment> result = forPointer(Optional.of(pointer));
+
+        if (result.isPresent()) {
+          results.add(result.get());
+        }
+      }
+    }
+
+    return results;
+  }
+
+  public static List<Attachment> forPointers(List<SignalServiceDataMessage.Quote.QuotedAttachment> pointers) {
+    List<Attachment> results = new LinkedList<>();
+
+    if (pointers != null) {
+      for (SignalServiceDataMessage.Quote.QuotedAttachment pointer : pointers) {
+        Optional<Attachment> result = forPointer(pointer);
+
+        if (result.isPresent()) {
+          results.add(result.get());
+        }
+      }
+    }
+
+    return results;
+  }
+
+  public static Optional<Attachment> forPointer(Optional<SignalServiceAttachment> pointer) {
+    return forPointer(pointer, null, null);
+  }
+
+  public static Optional<Attachment> forPointer(Optional<SignalServiceAttachment> pointer, @Nullable StickerLocator stickerLocator) {
+    return forPointer(pointer, stickerLocator, null);
+  }
+
+  public static Optional<Attachment> forPointer(Optional<SignalServiceAttachment> pointer, @Nullable StickerLocator stickerLocator, @Nullable String fastPreflightId) {
+    if (!pointer.isPresent() || !pointer.get().isPointer()) return Optional.absent();
+
+    String encodedKey = null;
+
+    if (pointer.get().asPointer().getKey() != null) {
+      encodedKey = Base64.encodeBytes(pointer.get().asPointer().getKey());
+    }
+
+    return Optional.of(new PointerAttachment(pointer.get().getContentType(),
+                                      AttachmentDatabase.TRANSFER_PROGRESS_PENDING,
+                                      pointer.get().asPointer().getSize().or(0),
+                                      pointer.get().asPointer().getFileName().orNull(),
+                                      String.valueOf(pointer.get().asPointer().getId()),
+                                      encodedKey, null,
+                                      pointer.get().asPointer().getDigest().orNull(),
+                                      fastPreflightId,
+                                      pointer.get().asPointer().getVoiceNote(),
+                                      pointer.get().asPointer().getWidth(),
+                                      pointer.get().asPointer().getHeight(),
+                                      pointer.get().asPointer().getCaption().orNull(),
+                                      stickerLocator,
+                                      BlurHash.parseOrNull(pointer.get().asPointer().getBlurHash().orNull())));
+
+  }
+
+  public static Optional<Attachment> forPointer(SignalServiceDataMessage.Quote.QuotedAttachment pointer) {
+    SignalServiceAttachment thumbnail = pointer.getThumbnail();
+
+    return Optional.of(new PointerAttachment(pointer.getContentType(),
+                                             AttachmentDatabase.TRANSFER_PROGRESS_PENDING,
+                                             thumbnail != null ? thumbnail.asPointer().getSize().or(0) : 0,
+                                             pointer.getFileName(),
+                                             String.valueOf(thumbnail != null ? thumbnail.asPointer().getId() : 0),
+                                             thumbnail != null && thumbnail.asPointer().getKey() != null ? Base64.encodeBytes(thumbnail.asPointer().getKey()) : null,
+                                             null,
+                                             thumbnail != null ? thumbnail.asPointer().getDigest().orNull() : null,
+                                             null,
+                                             false,
+                                             thumbnail != null ? thumbnail.asPointer().getWidth() : 0,
+                                             thumbnail != null ? thumbnail.asPointer().getHeight() : 0,
+                                             thumbnail != null ? thumbnail.asPointer().getCaption().orNull() : null,
+                                             null,
+                                             null));
+  }
+}

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

@@ -0,0 +1,31 @@
+package org.thoughtcrime.securesms.attachments;
+
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.thoughtcrime.securesms.database.AttachmentDatabase;
+
+/**
+ * An attachment that represents where an attachment used to be. Useful when you need to know that
+ * a message had an attachment and some metadata about it (like the contentType), even though the
+ * underlying media no longer exists. An example usecase would be view-once messages, so that we can
+ * quote them and know their contentType even though the media has been deleted.
+ */
+public class TombstoneAttachment extends Attachment {
+
+  public TombstoneAttachment(@NonNull String contentType, boolean quote) {
+    super(contentType, AttachmentDatabase.TRANSFER_PROGRESS_DONE, 0, null, null, null, null, null, null, false, 0, 0, quote, null, null, null, null);
+  }
+
+  @Override
+  public @Nullable Uri getDataUri() {
+    return null;
+  }
+
+  @Override
+  public @Nullable Uri getThumbnailUri() {
+    return null;
+  }
+}

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

@@ -0,0 +1,56 @@
+package org.thoughtcrime.securesms.attachments;
+
+import android.net.Uri;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.thoughtcrime.securesms.blurhash.BlurHash;
+import org.thoughtcrime.securesms.database.AttachmentDatabase;
+import org.thoughtcrime.securesms.database.AttachmentDatabase.TransformProperties;
+import org.thoughtcrime.securesms.stickers.StickerLocator;
+
+public class UriAttachment extends Attachment {
+
+  private final @NonNull  Uri dataUri;
+  private final @Nullable Uri thumbnailUri;
+
+  public UriAttachment(@NonNull Uri uri, @NonNull String contentType, int transferState, long size,
+                       @Nullable String fileName, boolean voiceNote, boolean quote, @Nullable String caption,
+                       @Nullable StickerLocator stickerLocator, @Nullable BlurHash blurHash, @Nullable TransformProperties transformProperties)
+  {
+    this(uri, uri, contentType, transferState, size, 0, 0, fileName, null, voiceNote, quote, caption, stickerLocator, blurHash, transformProperties);
+  }
+
+  public UriAttachment(@NonNull Uri dataUri, @Nullable Uri thumbnailUri,
+                       @NonNull String contentType, int transferState, long size, int width, int height,
+                       @Nullable String fileName, @Nullable String fastPreflightId,
+                       boolean voiceNote, boolean quote, @Nullable String caption, @Nullable StickerLocator stickerLocator,
+                       @Nullable BlurHash blurHash, @Nullable TransformProperties transformProperties)
+  {
+    super(contentType, transferState, size, fileName, null, null, null, null, fastPreflightId, voiceNote, width, height, quote, caption, stickerLocator, blurHash, transformProperties);
+    this.dataUri      = dataUri;
+    this.thumbnailUri = thumbnailUri;
+  }
+
+  @Override
+  @NonNull
+  public Uri getDataUri() {
+    return dataUri;
+  }
+
+  @Override
+  @Nullable
+  public Uri getThumbnailUri() {
+    return thumbnailUri;
+  }
+
+  @Override
+  public boolean equals(Object other) {
+    return other != null && other instanceof UriAttachment && ((UriAttachment) other).dataUri.equals(this.dataUri);
+  }
+
+  @Override
+  public int hashCode() {
+    return dataUri.hashCode();
+  }
+}

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

@@ -0,0 +1,198 @@
+package org.thoughtcrime.securesms.audio;
+
+import android.annotation.TargetApi;
+import android.media.AudioFormat;
+import android.media.AudioRecord;
+import android.media.MediaCodec;
+import android.media.MediaCodecInfo;
+import android.media.MediaFormat;
+import android.media.MediaRecorder;
+import android.os.Build;
+import org.thoughtcrime.securesms.logging.Log;
+
+import org.thoughtcrime.securesms.util.Util;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+
+@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
+public class AudioCodec {
+
+  private static final String TAG = AudioCodec.class.getSimpleName();
+
+  private static final int    SAMPLE_RATE       = 44100;
+  private static final int    SAMPLE_RATE_INDEX = 4;
+  private static final int    CHANNELS          = 1;
+  private static final int    BIT_RATE          = 32000;
+
+  private final int         bufferSize;
+  private final MediaCodec  mediaCodec;
+  private final AudioRecord audioRecord;
+
+  private boolean running  = true;
+  private boolean finished = false;
+
+  public AudioCodec() throws IOException {
+    this.bufferSize  = AudioRecord.getMinBufferSize(SAMPLE_RATE, AudioFormat.CHANNEL_IN_MONO, AudioFormat.ENCODING_PCM_16BIT);
+    this.audioRecord = createAudioRecord(this.bufferSize);
+    this.mediaCodec  = createMediaCodec(this.bufferSize);
+
+    this.mediaCodec.start();
+
+    try {
+      audioRecord.startRecording();
+    } catch (Exception e) {
+      Log.w(TAG, e);
+      mediaCodec.release();
+      throw new IOException(e);
+    }
+  }
+
+  public synchronized void stop() {
+    running = false;
+    while (!finished) Util.wait(this, 0);
+  }
+
+  public void start(final OutputStream outputStream) {
+    new Thread(new Runnable() {
+      @Override
+      public void run() {
+        MediaCodec.BufferInfo bufferInfo         = new MediaCodec.BufferInfo();
+        byte[]                audioRecordData    = new byte[bufferSize];
+        ByteBuffer[]          codecInputBuffers  = mediaCodec.getInputBuffers();
+        ByteBuffer[]          codecOutputBuffers = mediaCodec.getOutputBuffers();
+
+        try {
+          while (true) {
+            boolean running = isRunning();
+
+            handleCodecInput(audioRecord, audioRecordData, mediaCodec, codecInputBuffers, running);
+            handleCodecOutput(mediaCodec, codecOutputBuffers, bufferInfo, outputStream);
+
+            if (!running) break;
+          }
+        } catch (IOException e) {
+          Log.w(TAG, e);
+        } finally {
+          mediaCodec.stop();
+          audioRecord.stop();
+
+          mediaCodec.release();
+          audioRecord.release();
+
+          Util.close(outputStream);
+          setFinished();
+        }
+      }
+    }, "signal-AudioCodec").start();
+  }
+
+  private synchronized boolean isRunning() {
+    return running;
+  }
+
+  private synchronized void setFinished() {
+    finished = true;
+    notifyAll();
+  }
+
+  private void handleCodecInput(AudioRecord audioRecord, byte[] audioRecordData,
+                                MediaCodec mediaCodec, ByteBuffer[] codecInputBuffers,
+                                boolean running)
+  {
+    int length                = audioRecord.read(audioRecordData, 0, audioRecordData.length);
+    int codecInputBufferIndex = mediaCodec.dequeueInputBuffer(10 * 1000);
+
+    if (codecInputBufferIndex >= 0) {
+      ByteBuffer codecBuffer = codecInputBuffers[codecInputBufferIndex];
+      codecBuffer.clear();
+      codecBuffer.put(audioRecordData);
+      mediaCodec.queueInputBuffer(codecInputBufferIndex, 0, length, 0, running ? 0 : MediaCodec.BUFFER_FLAG_END_OF_STREAM);
+    }
+  }
+
+  private void handleCodecOutput(MediaCodec mediaCodec,
+                                 ByteBuffer[] codecOutputBuffers,
+                                 MediaCodec.BufferInfo bufferInfo,
+                                 OutputStream outputStream)
+      throws IOException
+  {
+    int codecOutputBufferIndex = mediaCodec.dequeueOutputBuffer(bufferInfo, 0);
+
+    while (codecOutputBufferIndex != MediaCodec.INFO_TRY_AGAIN_LATER) {
+      if (codecOutputBufferIndex >= 0) {
+        ByteBuffer encoderOutputBuffer = codecOutputBuffers[codecOutputBufferIndex];
+
+        encoderOutputBuffer.position(bufferInfo.offset);
+        encoderOutputBuffer.limit(bufferInfo.offset + bufferInfo.size);
+
+        if ((bufferInfo.flags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) != MediaCodec.BUFFER_FLAG_CODEC_CONFIG) {
+          byte[] header = createAdtsHeader(bufferInfo.size - bufferInfo.offset);
+
+
+          outputStream.write(header);
+
+          byte[] data = new byte[encoderOutputBuffer.remaining()];
+          encoderOutputBuffer.get(data);
+          outputStream.write(data);
+        }
+
+        encoderOutputBuffer.clear();
+
+        mediaCodec.releaseOutputBuffer(codecOutputBufferIndex, false);
+      }  else if (codecOutputBufferIndex== MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED) {
+        codecOutputBuffers = mediaCodec.getOutputBuffers();
+      }
+
+      codecOutputBufferIndex = mediaCodec.dequeueOutputBuffer(bufferInfo, 0);
+    }
+
+  }
+
+  private byte[] createAdtsHeader(int length) {
+    int    frameLength = length + 7;
+    byte[] adtsHeader  = new byte[7];
+
+    adtsHeader[0]  = (byte) 0xFF; // Sync Word
+    adtsHeader[1]  = (byte) 0xF1; // MPEG-4, Layer (0), No CRC
+    adtsHeader[2]  = (byte) ((MediaCodecInfo.CodecProfileLevel.AACObjectLC - 1) << 6);
+    adtsHeader[2] |= (((byte) SAMPLE_RATE_INDEX) << 2);
+    adtsHeader[2] |= (((byte) CHANNELS) >> 2);
+    adtsHeader[3]  = (byte) (((CHANNELS & 3) << 6) | ((frameLength >> 11) & 0x03));
+    adtsHeader[4]  = (byte) ((frameLength >> 3) & 0xFF);
+    adtsHeader[5]  = (byte) (((frameLength & 0x07) << 5) | 0x1f);
+    adtsHeader[6]  = (byte) 0xFC;
+
+    return adtsHeader;
+  }
+
+  private AudioRecord createAudioRecord(int bufferSize) {
+    return new AudioRecord(MediaRecorder.AudioSource.MIC, SAMPLE_RATE,
+                           AudioFormat.CHANNEL_IN_MONO,
+                           AudioFormat.ENCODING_PCM_16BIT, bufferSize * 10);
+  }
+
+  private MediaCodec createMediaCodec(int bufferSize) throws IOException {
+    MediaCodec  mediaCodec  = MediaCodec.createEncoderByType("audio/mp4a-latm");
+    MediaFormat mediaFormat = new MediaFormat();
+
+    mediaFormat.setString(MediaFormat.KEY_MIME, "audio/mp4a-latm");
+    mediaFormat.setInteger(MediaFormat.KEY_SAMPLE_RATE, SAMPLE_RATE);
+    mediaFormat.setInteger(MediaFormat.KEY_CHANNEL_COUNT, CHANNELS);
+    mediaFormat.setInteger(MediaFormat.KEY_MAX_INPUT_SIZE, bufferSize);
+    mediaFormat.setInteger(MediaFormat.KEY_BIT_RATE, BIT_RATE);
+    mediaFormat.setInteger(MediaFormat.KEY_AAC_PROFILE, MediaCodecInfo.CodecProfileLevel.AACObjectLC);
+
+    try {
+      mediaCodec.configure(mediaFormat, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
+    } catch (Exception e) {
+      Log.w(TAG, e);
+      mediaCodec.release();
+      throw new IOException(e);
+    }
+
+    return mediaCodec;
+  }
+
+}