Bump version to 4.53.2

Fixes #9323

.github/ISSUE_TEMPLATE.md

@@ -1,17 +1,21 @@
-<!-- This is a bug report template. By following the instructions below and filling out the sections with your information, you will help the developers to get all the necessary data to fix your issue.
+<!-- This is a bug report template. By following the instructions below and filling out the sections with your information, you will help the developers get all the necessary data to fix your issue.
 You can also preview your report before submitting it. You may remove sections that aren't relevant to your particular case.
 
-Before we begin, please note that this tracker is only for issues, not questions or comments.
+Before we begin, please note that this tracker is only for issues. It is not for questions, comments, or feature requests.
 
-If you are looking for support, please see our support center instead:
-https://support.whispersystems.org/
-or email support@whispersystems.org
+If you would like to discuss a new feature or submit suggestions, please visit the community forum:
+https://community.signalusers.org
 
-Let's begin with a checklist: replace the empty checkboxes [ ] below with checked ones [x] accordingly -->
+If you are looking for support, please visit our support center:
+https://support.signal.org/
+or email support@signal.org
 
-I have:
-- [ ] searched open and closed issues for duplicates
-- [ ] read https://github.com/WhisperSystems/Signal-Android/wiki/Submitting-useful-bug-reports
+Let's begin with a checklist: Replace the empty checkboxes [ ] below with checked ones [x] accordingly. -->
+
+- [ ] I have searched open and closed issues for duplicates
+- [ ] I am submitting a bug report for existing functionality that does not work as intended
+- [ ] I have read https://github.com/signalapp/Signal-Android/wiki/Submitting-useful-bug-reports
+- [ ] This isn't a feature request or a discussion topic
 
 ----------------------------------------
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,19 +1,18 @@
 <!-- You can remove this first section if you have contributed before -->
 ### First time contributor checklist
 <!-- replace the empty checkboxes [ ] below with checked ones [x] accordingly -->
-- [ ] I have read [how to contribute](https://github.com/WhisperSystems/Signal-Android/blob/master/CONTRIBUTING.md) to this project
+- [ ] I have read [how to contribute](https://github.com/signalapp/Signal-Android/blob/master/CONTRIBUTING.md) to this project
 - [ ] I have signed the [Contributor License Agreement](https://whispersystems.org/cla/)
 
 ### Contributor checklist
 <!-- replace the empty checkboxes [ ] below with checked ones [x] accordingly -->
-- [ ] I am following the [Code Style Guidelines](https://github.com/WhisperSystems/Signal-Android/wiki/Code-Style-Guidelines)
+- [ ] I am following the [Code Style Guidelines](https://github.com/signalapp/Signal-Android/wiki/Code-Style-Guidelines)
 - [ ] I have tested my contribution on these devices:
  * Device A, Android X.Y.Z
  * Device B, Android Z.Y
  * Virtual device W, Android Y.Y.Z
 - [ ] My contribution is fully baked and ready to be merged as is
 - [ ] I ensure that all the open issues my contribution fixes are mentioned in the commit message of my first commit using the `Fixes #1234` [syntax](https://help.github.com/articles/closing-issues-via-commit-messages/)
-- [ ] I have made the choice whether I want the [BitHub reward](https://github.com/WhisperSystems/Signal-Android/wiki/BitHub-Rewards) or not by omitting or adding the word `FREEBIE` in the commit message of my first commit
 
 ----------
 

.github/workflows/android.yml

@@ -0,0 +1,17 @@
+name: Android CI
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Build with Gradle
+      run: ./gradlew qa

.gitignore

@@ -1,4 +1,5 @@
 .classpath
+captures/
 project.properties
 .project
 .settings
@@ -8,7 +9,6 @@ gen/
 *.iml
 out
 tests
-lint.xml
 local.properties
 ant.properties
 .DS_Store
@@ -24,3 +24,4 @@ test/androidTestEspresso/res/values/arrays.xml
 obj/
 jni/libspeex/.deps/
 *.sh
+pkcs11.password

.tx/config

@@ -1,11 +0,0 @@
-[main]
-host = https://www.transifex.com
-lang_map = fr_CA:fr-rCA,pt_BR:pt-rBR,pt_PT:pt,zh_CN:zh-rCN,zh_HK:zh-rHK,zh_TW:zh-rTW,da_DK:da-rDK,de_DE:de,tr_TR:tr,fr_FR:fr,es_ES:es,hu_HU:hu,sv_SE:sv-rSE,bg_BG:bg,el_GR:el,kn_IN:kn-rIN,cs_CZ:cs,sr:sr,he:iw,id:in,lt_LT:lt,km_KH:km-rKH
-
-
-[signal-android.master]
-file_filter = res/values-<lang>/strings.xml
-source_file = res/values/strings.xml
-source_lang = en
-type = ANDROID
-

AndroidManifest.xml

@@ -1,569 +0,0 @@
-<?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="com.amulyakhare.textdrawable,com.astuetz.pagerslidingtabstrip,pl.tajchert.waitingdots,com.h6ah4i.android.multiselectlistpreferencecompat,android.support.v13,com.davemorrissey.labs.subscaleview,com.tomergoldst.tooltips"/>
-
-    <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="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.RECEIVE_BOOT_COMPLETED" />
-    <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.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.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_CALL_LOG" />
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
-
-    <!-- For sending location tiles in the future -->
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-
-    <!-- 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"/>
-
-    <!-- For sending/receiving events -->
-    <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
-    <uses-permission android:name="android.permission.READ_CALENDAR"/>
-
-    <!-- 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"/>
-
-    <!-- Permissions from RedPhone -->
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
-    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
-    <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" />
-    <uses-permission android:name="android.permission.CALL_PHONE" />
-    <uses-permission android:name="android.permission.CALL_PRIVILEGED" />
-    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
-    <uses-permission android:name="android.permission.RAISED_THREAD_PRIORITY" />
-    <uses-permission android:name="android.permission.READ_CALL_STATE"/>
-    <uses-permission android:name="android.permission.READ_LOGS"/>
-    <uses-permission android:name="android.permission.WRITE_CALL_LOG"/>
-    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
-
-    <permission android:name="org.thoughtcrime.securesms.permission.C2D_MESSAGE"
-                android:protectionLevel="signature" />
-    <uses-permission android:name="org.thoughtcrime.securesms.permission.C2D_MESSAGE" />
-
-    <application android:name=".ApplicationContext"
-                 android:icon="@drawable/icon"
-                 android:roundIcon="@drawable/icon_circle"
-                 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="org.thoughtcrime.securesms.mms.TextSecureGlideModule"
-               android:value="GlideModule" />
-
-    <meta-data android:name="com.google.android.gms.car.application"
-               android:resource="@xml/automotive_app_desc" />
-
-    <activity android:name="org.thoughtcrime.securesms.WebRtcCallActivity"
-              android:excludeFromRecents="true"
-              android:screenOrientation="portrait"
-              android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|screenSize|fontScale"
-              android:launchMode="singleTask">
-    </activity>
-
-
-    <activity android:name=".CountrySelectionActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".ImportExportActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".InviteActivity"
-              android:theme="@style/TextSecure.HighlightTheme"
-              android:windowSoftInputMode="stateHidden"
-              android:parentActivityName=".ConversationListActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
-        <meta-data
-            android:name="android.support.PARENT_ACTIVITY"
-            android:value="org.thoughtcrime.securesms.ConversationListActivity" />
-    </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:excludeFromRecents="true"
-              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.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/*" />
-        </intent-filter>
-
-        <meta-data
-                android:name="android.service.chooser.chooser_target_service"
-                android:value=".service.DirectShareService" />
-
-    </activity>
-
-    <activity android:name=".ConversationListActivity"
-          android:label="@string/app_name"
-          android:launchMode="singleTask"
-          android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-          android:exported="true" />
-
-    <activity-alias android:name=".RoutingActivity"
-                    android:targetActivity=".ConversationListActivity"
-                    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="@drawable/icon" />
-        <meta-data android:name="com.sec.minimode.icon.landscape.normal"
-            android:resource="@drawable/icon" />
-
-    </activity-alias>
-
-    <activity android:name=".ConversationListArchiveActivity"
-              android:label="@string/AndroidManifest_archived_conversations"
-              android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:parentActivityName=".ConversationListActivity">
-        <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.thoughtcrime.securesms.ConversationListActivity" />
-    </activity>
-
-    <activity android:name=".ConversationActivity"
-              android:windowSoftInputMode="stateUnchanged"
-              android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:parentActivityName=".ConversationListActivity">
-        <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.thoughtcrime.securesms.ConversationListActivity" />
-    </activity>
-
-    <activity android:name=".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=".DatabaseUpgradeActivity"
-              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/Theme.AppCompat.Light.NoActionBar"
-              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:label="@string/AndroidManifest__enter_passphrase"
-              android:launchMode="singleTask"
-              android:theme="@style/TextSecure.LightIntroTheme"
-              android:windowSoftInputMode="stateAlwaysVisible"
-              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=".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"/>
-
-    <activity android:name=".RegistrationActivity"
-              android:windowSoftInputMode="stateUnchanged"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".RegistrationProgressActivity"
-              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=".MediaOverviewActivity"
-              android:windowSoftInputMode="stateHidden"
-              android:launchMode="singleTask"
-              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.ScribbleActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
-              android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".scribbles.StickerSelectActivity"
-              android:theme="@style/TextSecure.LightTheme"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name="com.soundcloud.android.crop.CropImageActivity" />
-
-    <service android:enabled="true" android:name="org.thoughtcrime.securesms.service.WebRtcCallService"/>
-
-    <service android:enabled="true" android:name=".service.ApplicationMigrationService"/>
-    <service android:enabled="true" android:name=".service.KeyCachingService"/>
-    <service android:enabled="true" android:name=".service.RegistrationService"/>
-    <service android:enabled="true" android:name=".service.MessageRetrievalService"/>
-
-    <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>
-
-    <receiver android:name=".gcm.GcmBroadcastReceiver" android:permission="com.google.android.c2dm.permission.SEND" >
-        <intent-filter>
-            <action android:name="com.google.android.c2dm.intent.RECEIVE" />
-            <category android:name="org.thoughtcrime.securesms" />
-        </intent-filter>
-    </receiver>
-
-    <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>
-
-
-    <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" />
-
-    <receiver android:name=".service.RegistrationNotifier"
-              android:exported="false">
-        <intent-filter>
-            <action android:name="org.thoughtcrime.securesms.REGISTRATION_EVENT" />
-        </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.PersistentConnectionBootListener">
-        <intent-filter>
-            <action android:name="android.intent.action.BOOT_COMPLETED"/>
-        </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.PACKAGE_REPLACED"/>
-            <data android:scheme="package" />
-        </intent-filter>
-    </receiver>
-
-    <receiver
-        android:name=".service.PanicResponderListener"
-        android:exported="true">
-        <intent-filter>
-            <action android:name="info.guardianproject.panic.action.TRIGGER" />
-        </intent-filter>
-    </receiver>
-
-    <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>

BUILDING.md

@@ -15,26 +15,28 @@ The following steps should help you (re)build Signal from the command line.
 
 1. Checkout the Signal-Android project source with the command:
 
-        git clone https://github.com/WhisperSystems/Signal-Android.git
+        git clone https://github.com/signalapp/Signal-Android.git
 
 2. Make sure you have the [Android SDK](https://developer.android.com/sdk/index.html) installed.
 3. Ensure that the following packages are installed from the Android SDK manager:
     * Android SDK Build Tools (see buildToolsVersion in build.gradle)
-    * SDK Platform (API level 22)
+    * SDK Platform (All API levels)
     * Android Support Repository
     * Google Repository
 4. Create a local.properties file at the root of your source checkout and add an sdk.dir entry to it.  For example:
 
         sdk.dir=/Application/android-sdk-macosx
 
-5. Execute Gradle:
+5. Using Java 8 
+
+6. Execute Gradle:
 
         ./gradlew build
 
 Visual assets
 ----------------------
 
-Source assets tend to be large binary blobs, which are best stored outside of git repositories. We host ours in a [Pixelapse repository](https://www.pixelapse.com/openwhispersystems/projects/signal-android/). Some source files are SVGs that can be auto-colored and sized using a tool like [android-res-utils](https://github.com/sebkur/android-res-utils).
+Source assets tend to be large binary blobs, which are best stored outside of git repositories. Some source files are SVGs that can be auto-colored and sized using a tool like [android-res-utils](https://github.com/sebkur/android-res-utils).
 
 Sample command for generating our audio placeholder image:
 
@@ -53,7 +55,7 @@ Setting up a development environment
 3. From the Quickstart panel, choose "Configure" then "SDK Manager".
 4. In the SDK Tools tab of the SDK Manager, make sure that the "Android Support Repository" is installed, and that the latest "Android SDK build-tools" are installed. Click "OK" to return to the Quickstart panel.
 5. From the Quickstart panel, choose "Checkout from Version Control" then "git".
-6. Paste the URL for the Signal-Android project when prompted (https://github.com/WhisperSystems/Signal-Android.git).
+6. Paste the URL for the Signal-Android project when prompted (https://github.com/signalapp/Signal-Android.git).
 7. Android studio should detect the presence of a project file and ask you whether to open it. Click "yes".
 9. Default config options should be good enough.
 9. Project initialisation and build should proceed.

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing to Signal Android
 
-Thank you for deciding to help this project! If you have contributed to other open source projects before please note that some conventions here might be a bit different than what you are used to. Reading this document will save you, other contributors and the developers time.
+Thank you for supporting Signal and looking for ways to help. Please note that some conventions here might be a bit different than what you are used to, even if you have contributed to other open source projects before. Reading this document will help you save time and work effectively with the developers and other contributors.
 
 
 ## Development Ideology
@@ -9,80 +9,81 @@ Truths which we believe to be self-evident:
 
 1. **The answer is not more options.**  If you feel compelled to add a preference that's exposed to the user, it's very possible you've made a wrong turn somewhere.
 1. **The user doesn't know what a key is.**  We need to minimize the points at which a user is exposed to this sort of terminology as extremely as possible.
-1. **There are no power users.** The idea that some users "understand" concepts better than others has proven to be, for the most part, false. If anything, "power users" are more dangerous than the rest, and we should avoid exposing dangerous functionality to them.
+1. **There are no power users.**  The idea that some users "understand" concepts better than others has proven to be, for the most part, false. If anything, "power users" are more dangerous than the rest, and we should avoid exposing dangerous functionality to them.
 1. **If it's "like PGP," it's wrong.**  PGP is our guide for what not to do.
 1. **It's an asynchronous world.**  Be wary of anything that is anti-asynchronous: ACKs, protocol confirmations, or any protocol-level "advisory" message.
-1. **There is no such thing as time.** Protocol ideas that require synchronized clocks are doomed to failure.
+1. **There is no such thing as time.**  Protocol ideas that require synchronized clocks are doomed to failure.
 
 
 ## Translations
 
-Please do not submit issues or pull requests for translation fixes. Anyone can update the translations in [Transifex](https://www.transifex.com/projects/p/signal-android/). Please submit your corrections there.
+Thanks to a dedicated community of volunteer translators, Signal is now available in more than one hundred languages. We use Transifex to manage our translation efforts, not GitHub. Any suggestions, corrections, or new translations should be submitted to the [Signal localization project for Android](https://www.transifex.com/signalapp/signal-android/).
 
 
 ## Issues
 
 ### Useful bug reports
-1. Please search both open and closed issues first to make sure your issue is not a duplicate.
-1. Read the [Submitting useful bug reports guide](https://github.com/WhisperSystems/Signal-Android/wiki/Submitting-useful-bug-reports) before posting a bug.
+1. Please search both open and closed issues to make sure your bug report is not a duplicate.
+1. Read the [guide to submitting useful bug reports](https://github.com/signalapp/Signal-Android/wiki/Submitting-useful-bug-reports) before posting a bug.
 
-### Issue tracker is for bugs
-The main purpose of this issue tracker is to track bugs for the Android client. Relevant, concise and to the point comments that help to solve the issue are very welcome.
+### The issue tracker is for bugs, not feature requests
+The GitHub issue tracker is not used for feature requests, but new ideas can be submitted and discussed on the [community forum](https://community.signalusers.org/c/feature-requests). The purpose of this issue tracker is to track bugs in the Android client. Bug reports should only be submitted for existing functionality that does not work as intended. Comments that are relevant and concise will help the developers solve issues more quickly.
 
-##### Send support questions to support
-Please do **not** ask support questions at the issue tracker. We want to help you using Signal and we have created our support system just for that. You can reach support by sending email to support@whispersystems.org or by going to our [Support Center](http://support.whispersystems.org). You can also search for existing troubleshooting articles at the [Support Center](http://support.whispersystems.org).
+### Send support questions to support
+You can reach support by sending an email to support@signal.org or by visiting the [Signal Support Center](https://support.signal.org/) where you can also search for existing troubleshooting articles and find answers to frequently asked questions. Please do not post support questions on the GitHub issue tracker.
 
-##### Not a discussion forum
-Please do **not** use this issue tracker as a discussion forum. Discussion related to the bug in question should of course go to the issue itself. However other discussion should take place at the [community forum](https://whispersystems.discoursehosting.net). You can use that forum to discuss any Signal related topics or to just hang out with your fellow users.
+### GitHub is not a generic discussion forum
+Conversations about open bug reports belong here. However, all other discussions should take place on the [community forum](https://community.signalusers.org). You can use the community forum to discuss anything that is related to Signal or to hang out with your fellow users in the "Off Topic" category.
 
 ### Don't bump issues
-Every time someone comments on an issue, GitHub sends email to [everyone who is watching](https://github.com/WhisperSystems/Signal-Android/watchers) the repository (currently around 500 people). Thus bumping issues with :+1:s, _me toos_ or asking for updates generates a lot of unnecessary email notifications. Moreover bumping an issue does not help solve it. Please be respectful of everyone's time and only comment if you have relevant new information to add.
+Every time someone comments on an issue, GitHub sends an email to [hundreds of people](https://github.com/signalapp/Signal-Android/watchers). Bumping issues with a "+1" (or asking for updates) generates a lot of unnecessary email notifications and does not help anyone solve the issue any faster. Please be respectful of everyone's time and only comment when you have new information to add.
 
 ### Open issues
 
-#### If it's open it's tracked
-Have you followed all the points in the [Submitting useful bug reports guide](https://github.com/WhisperSystems/Signal-Android/wiki/Submitting-useful-bug-reports) but nobody has commented on your issue? Is there no milestone or person assigned to it? Don't worry, the developers read every issue and if it's open it means it's tracked and taken into account. It might just take time as other issues have higher priority. And remember that this is an open source project: Everyone is encouraged to take an active role in fixing open issues.
+#### If it's open, it's tracked
+The developers read every issue, but high-priority bugs or features can take precedence over others. Signal is an open source project, and everyone is encouraged to play an active role in diagnosing and fixing open issues.
 
 ### Closed issues
 
 #### "My issue was closed without giving a reason!"
-Please understand that writing detailed explanations every time for every issue someone comes up with takes time. Sometimes a reason has been posted earlier to another related issue which you can search for. It's also possible that your issue was not in line with the guidelines of the project (see especially the [Development Ideology](https://github.com/WhisperSystems/Signal-Android/blob/master/CONTRIBUTING.md#development-ideology)), or it was decided that the issue is not something that Signal should do at this time.
+Although we do our best, writing detailed explanations for every issue can be time consuming, and the topic also might have been covered previously in other related issues.
 
 
 ## Pull requests
 
-### Sign the Contributor Licence Agreement (CLA)
-You need to sign our CLA before your pull request can be merged. You can sign it at: https://whispersystems.org/cla/
+### Smaller is better
+Big changes are significantly less likely to be accepted. Large features often require protocol modifications and necessitate a staged rollout process that is coordinated across millions of users on multiple platforms (Android, iOS, and Desktop).
+
+Try not to take on too much at once. As a first-time contributor, we recommend starting with small and simple PRs in order to become familiar with the codebase. Most of the work should go into discovering which three lines need to change rather than writing the code.
+
+### Sign the Contributor License Agreement (CLA)
+You will need to [sign our CLA](https://signal.org/cla/) before your pull request can be merged.
 
 ### Follow the Code Style Guidelines
-Before submitting a pull request please check that your code adheres to the [Code Style Guidelines](https://github.com/WhisperSystems/Signal-Android/wiki/Code-Style-Guidelines).
+Ensure that your code adheres to the [Code Style Guidelines](https://github.com/signalapp/Signal-Android/wiki/Code-Style-Guidelines) before submitting a pull request.
 
-### Submit only complete PRs and test them
-Please do not submit pull requests that are still a work in progress. Pull requests should be ready for a merge when you submit them. Also please do not submit pull requests that you have not tested.
-
-### Smaller is better
-Please do not try to change too much at once. Big changes are less likely to be merged. If you are a first time contributor start with small and simple PRs to get to know the codebase.
+### Submit finished and well-tested pull requests
+Please do not submit pull requests that are still a work in progress. Pull requests should be thoroughly tested and ready to merge before they are submitted.
 
 ### Merging can sometimes take a while
-If your pull request follows all the advice above but still has not been merged it usually means the developers haven't simply had the time to review it yet. We understand that this might feel frustrating. We are sorry!
-
-### Bithub
-Accepted pull requests will be rewarded with Bitcoins! After your pull request has been merged you will automatically receive an email to the address you have specified as your Git commit email. Follow the instructions in the email to claim your coins. If you wish to submit your contribution for free please add the word `FREEBIE` in your Git commit message. You may wish to explore some previously merged commits to see how it all works.
+If your pull request follows all of the advice above but still has not been merged, this usually means that the developers haven't had time to review it yet. We understand that this might feel frustrating, and we apologize. The Signal team is still small, but [we are hiring](https://signal.org/workworkwork/).
 
 
 ## How can I contribute?
-Anyone can help by
-- advising new people about the guidelines of this project
- - redirecting support questions to support@whispersystems.org and the [support site](https://support.whispersystems.org)
- - redirecting non-bug related discussions to the [community forum](https://whispersystems.discoursehosting.net)
-- improving documentation in the [wiki](https://github.com/WhisperSystems/Signal-Android/wiki)
-- [translating](https://www.transifex.com/projects/p/signal-android/)
-- finding and marking duplicate issues
-- trying to reproduce issues
-- finding solutions to open issues and posting relevant findings as comments
-- submitting pull requests
-- testing other people's pull requests
-- spreading the joy of Signal to your friends and family
-- donating money to our [BitHub](https://www.coinbase.com/checkouts/51dac699e660a4d773216b5ad94d6a0b) or through the [Freedom of the Press Foundation's donation page](https://freedom.press/crowdfunding/signal/)
+There are several other ways to get involved:
+* Help new users learn about Signal.
+  * Redirect support questions to support@signal.org and the [Signal Support Center](https://support.signal.org/).
+  * Redirect non-bug discussions to the [community forum](https://community.signalusers.org).
+* Improve documentation in the [wiki](https://github.com/signalapp/Signal-Android/wiki).
+* Join the community of volunteer translators on Transifex:
+  * [Android](https://www.transifex.com/signalapp/signal-android/)
+  * [iOS](https://www.transifex.com/signalapp/signal-ios/)
+  * [Desktop](https://www.transifex.com/signalapp/signal-desktop/)
+* Find and mark duplicate issues.
+* Try to reproduce issues and help with troubleshooting.
+* Discover solutions to open issues and post any relevant findings.
+* Test other people's pull requests.
+* Contribute to Signal via the [Freedom of the Press Foundation's donation page](https://freedom.press/crowdfunding/signal/).
+* Share Signal with your friends and family.
 
-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/WhisperSystems/Signal-Android?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+Signal is made for you. Thank you for your feedback and support.

Dockerfile

@@ -1,19 +1,18 @@
-FROM ubuntu:14.04.3
+FROM ubuntu:17.10
 
 RUN dpkg --add-architecture i386 && \
     apt-get update -y && \
     apt-get install -y software-properties-common && \
-    add-apt-repository -y ppa:openjdk-r/ppa && \
     apt-get update -y && \
-    apt-get install -y libc6:i386=2.19-0ubuntu6.7 libncurses5:i386=5.9+20140118-1ubuntu1 libstdc++6:i386=4.8.4-2ubuntu1~14.04.1 lib32z1=1:1.2.8.dfsg-1ubuntu1 wget openjdk-8-jdk=8u72-b15-1~trusty1 git unzip && \
+    apt-get install -y libc6:i386=2.26-0ubuntu2.1 libncurses5:i386=6.0+20160625-1ubuntu1 libstdc++6:i386=7.2.0-8ubuntu3.2 lib32z1=1:1.2.11.dfsg-0ubuntu2 wget openjdk-8-jdk=8u171-b11-0ubuntu0.17.10.1 git unzip opensc pcscd && \
     rm -rf /var/lib/apt/lists/* && \
     apt-get autoremove -y && \
     apt-get clean
 
 ENV ANDROID_SDK_FILENAME android-sdk_r24.4.1-linux.tgz
 ENV ANDROID_SDK_URL https://dl.google.com/android/${ANDROID_SDK_FILENAME}
-ENV ANDROID_API_LEVELS android-25
-ENV ANDROID_BUILD_TOOLS_VERSION 25.0.0
+ENV ANDROID_API_LEVELS android-28
+ENV ANDROID_BUILD_TOOLS_VERSION 28.0.3
 ENV ANDROID_HOME /usr/local/android-sdk-linux
 ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
 RUN cd /usr/local/ && \

README.md

@@ -6,12 +6,12 @@ Signal uses your phone's data connection (WiFi/3G/4G) to communicate securely, o
 
 Currently available on the Play store.
 
-<a href="https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms&utm_source=global_co&utm_medium=prtnr&utm_content=Mar2515&utm_campaign=PartBadge&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1"><img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" height=36px /></a>
+<a href='https://play.google.com/store/apps/details?id=org.thoughtcrime.securesms&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height='80px'/></a>
 
 ## Contributing Bug reports
 We use GitHub for bug tracking. Please search the existing issues for your bug and create a new one if the issue is not yet tracked!
 
-https://github.com/WhisperSystems/Signal-Android/issues
+https://github.com/signalapp/Signal-Android/issues
 
 ## Joining the Beta
 Want to live life on the bleeding edge and help out with testing?
@@ -27,35 +27,26 @@ Interested in helping to translate Signal? Contribute here:
 https://www.transifex.com/projects/p/signal-android/
 
 ## Contributing Code
-Instructions on how to setup your development environment and build Signal can be found in  [BUILDING.md](https://github.com/WhisperSystems/Signal-Android/blob/master/BUILDING.md).
+Instructions on how to setup your development environment and build Signal can be found in  [BUILDING.md](https://github.com/signalapp/Signal-Android/blob/master/BUILDING.md).
 
-If you're new to the Signal codebase, we recommend going through our issues and picking out a simple bug to fix (check the "easy" label in our issues) in order to get yourself familiar. Also please have a look at the [CONTRIBUTING.md](https://github.com/WhisperSystems/Signal-Android/blob/master/CONTRIBUTING.md), that might answer some of your questions.
+If you're new to the Signal codebase, we recommend going through our issues and picking out a simple bug to fix (check the "easy" label in our issues) in order to get yourself familiar. Also please have a look at the [CONTRIBUTING.md](https://github.com/signalapp/Signal-Android/blob/master/CONTRIBUTING.md), that might answer some of your questions.
 
-For larger changes and feature ideas, we ask that you propose it on the [unofficial Community Forum](https://whispersystems.discoursehosting.net) for a high-level discussion with the wider community before implementation.
-
-This repository is set up with [BitHub](https://whispersystems.org/blog/bithub/), so you can make money for committing to Signal. The current BitHub price for an accepted pull request is:
-
-[![Current BitHub Price](https://bithub.herokuapp.com/v1/status/payment/commit/)](https://whispersystems.org/blog/bithub/)
+For larger changes and feature ideas, we ask that you propose it on the [unofficial Community Forum](https://community.signalusers.org) for a high-level discussion with the wider community before implementation.
 
 ## Contributing Ideas
-Have something you want to say about Open Whisper Systems projects or want to be part of the conversation? Get involved in the [community forum](https://whispersystems.discoursehosting.net).
-
-## Contributing Funds
-[![Donate](https://cloud.githubusercontent.com/assets/3121306/11278543/d46e03d0-8eeb-11e5-9691-0da1bf643192.png)](https://www.coinbase.com/checkouts/51dac699e660a4d773216b5ad94d6a0b)
-
-You can add funds to BitHub to directly help further development efforts.
+Have something you want to say about Open Whisper Systems projects or want to be part of the conversation? Get involved in the [community forum](https://community.signalusers.org).
 
 Help
 ====
 ## Support
 For troubleshooting and questions, please visit our support center!
 
-https://support.whispersystems.org/
+https://support.signal.org/
 
 ## Documentation
 Looking for documentation? Check out the wiki!
 
-https://github.com/WhisperSystems/Signal-Android/wiki
+https://github.com/signalapp/Signal-Android/wiki
 
 # Legal things
 ## Cryptography Notice
@@ -71,6 +62,8 @@ The form and manner of this distribution makes it eligible for export under the
 
 Copyright 2011 Whisper Systems
 
-Copyright 2013-2016 Open Whisper Systems
+Copyright 2013-2020 Open Whisper Systems
 
 Licensed under the GPLv3: http://www.gnu.org/licenses/gpl-3.0.html
+
+Google Play and the Google Play logo are trademarks of Google Inc.

ReproducibleBuilds.md

@@ -0,0 +1,287 @@
+# Reproducible Builds
+
+
+## TL;DR
+
+You can just use these [instructions](https://signal.org/blog/reproducible-android/) from the official announcement at Open Whisper Systems's blog:
+```
+# Clone the Signal Android source repository
+$ git clone https://github.com/signalapp/Signal-Android.git && cd Signal-Android
+
+# Check out the release tag for the version you'd like to compare
+$ git checkout v[the version number]
+
+# Build using the Docker environment
+$ docker run --rm -v $(pwd):/project -w /project whispersystems/signal-android:1.3 ./gradlew clean assembleRelease
+
+# Verify the APKs
+$ python3 apkdiff/apkdiff.py build/outputs/apks/project-release-unsigned.apk path/to/SignalFromPlay.apk
+```
+
+Note that the instructions above use a pre-built Signal Docker image from [Docker Hub](https://hub.docker.com/u/whispersystems/). If you wish to compile the image yourself, continue reading the longer version below.
+
+
+***
+
+
+## Introduction
+
+Since version 3.15.0 Signal for Android has supported reproducible builds. This is achieved by replicating the build environment as a Docker image. You'll need to build the image, run a container instance of it, compile Signal inside the container and finally compare the resulted APK to the APK that is distributed in the Google Play Store.
+
+The command line parts in this guide are written for Linux but with some little modifications you can adapt them to macOS (OS X) and Windows. In the following sections we will use `3.15.2` as an example Signal version. You'll just need to replace all occurrences of `3.15.2` with the version number you are about to verify.
+
+
+## Setting up directories
+
+First let's create a new directory for this whole reproducible builds project. In your home folder (`~`), create a new directory called `reproducible-signal`.
+```
+user@host:$ mkdir ~/reproducible-signal
+```
+
+Next create another directory inside `reproducible-signal` called `apk-from-google-play-store`.
+```
+user@host:$ mkdir ~/reproducible-signal/apk-from-google-play-store
+```
+
+We will use this directory to share APKs between the host OS and the Docker container.
+
+Finally create one more directory inside `reproducible-signal` called `image-build-context`.
+```
+user@host:$ mkdir ~/reproducible-signal/image-build-context
+```
+
+This directory will be used later to build our Docker image.
+
+
+## Getting the Google Play Store version of Signal APK
+
+To compare the APKs we of course need a version of Signal from the Google Play Store.
+
+First make sure that the Signal version you want to verify is installed on your Android device. You'll need `adb` for this part.
+
+Plug your device to your computer and run this command to pull the APK from the device:
+
+```
+user@host:$ adb pull $(adb shell pm path org.thoughtcrime.securesms | grep /base.apk | awk -F':' '{print $2}') ~/reproducible-signal/apk-from-google-play-store/Signal-$(adb shell dumpsys package org.thoughtcrime.securesms | grep versionName | awk -F'=' '{print $2}').apk
+```
+
+This will pull a file into `~/reproducible-signal/apk-from-google-play-store/` with the name `Signal-<version>.apk`
+
+Alternatively, you can do this step-by-step:
+
+```
+user@host:$ adb shell pm path org.thoughtcrime.securesms
+```
+This will output something like:
+```
+package:/data/app/org.thoughtcrime.securesms-aWRzcGlzcG9wZA==/base.apk
+```
+
+The output will tell you where the Signal APK is located in your device. (In this example the path is `/data/app/org.thoughtcrime.securesms-aWRzcGlzcG9wZA==/base.apk`)
+
+Now using this information, pull the APK from your device to the `reproducible-signal/apk-from-google-play-store` directory you created before:
+```
+user@host:$ adb pull \
+              /data/app/org.thoughtcrime.securesms-aWRzcGlzcG9wZA==/base.apk \
+              ~/reproducible-signal/apk-from-google-play-store/Signal-3.15.2.apk
+```
+
+We will use this APK in the final part when we compare it with the self-built APK from GitHub.
+
+## Identifying the ABI
+
+Since v4.37.0, the APKs have been split by ABI, the CPU architecture of the target device. Google play will serve the correct one to you for your device.
+
+To identify which ABIs the google play APK supports, we can look inside the APK, which is just a zip file:
+
+```
+user@host:$ unzip -l ~/reproducible-signal/apk-from-google-play-store/Signal-*.apk | grep lib/
+```
+
+Example:
+
+```
+  1214348  00-00-1980 00:00   lib/armeabi-v7a/libconscrypt_jni.so
+   151980  00-00-1980 00:00   lib/armeabi-v7a/libcurve25519.so
+  4164320  00-00-1980 00:00   lib/armeabi-v7a/libjingle_peerconnection_so.so
+    13948  00-00-1980 00:00   lib/armeabi-v7a/libnative-utils.so
+  2357812  00-00-1980 00:00   lib/armeabi-v7a/libsqlcipher.so
+```
+
+As there is just one sub directory of `lib/` called `armeabi-v7a`, that is your ABI. Make a note of that for later. If you see more than one subdirectory of `lib/`:
+
+```
+  1214348  00-00-1980 00:00   lib/armeabi-v7a/libconscrypt_jni.so
+   151980  00-00-1980 00:00   lib/armeabi-v7a/libcurve25519.so
+  4164320  00-00-1980 00:00   lib/armeabi-v7a/libjingle_peerconnection_so.so
+    13948  00-00-1980 00:00   lib/armeabi-v7a/libnative-utils.so
+  2357812  00-00-1980 00:00   lib/armeabi-v7a/libsqlcipher.so
+  2111376  00-00-1980 00:00   lib/x86/libconscrypt_jni.so
+   201056  00-00-1980 00:00   lib/x86/libcurve25519.so
+  7303888  00-00-1980 00:00   lib/x86/libjingle_peerconnection_so.so
+     5596  00-00-1980 00:00   lib/x86/libnative-utils.so
+  3977636  00-00-1980 00:00   lib/x86/libsqlcipher.so
+```
+
+Then that means you have the `universal` APK.
+
+## Installing Docker
+
+Install Docker by following the instructions for your platform at https://docs.docker.com/engine/installation/
+
+Your platform might also have its own preferred way of installing Docker. E.g. Ubuntu has its own Docker package (`docker.io`) if you do not want to follow Docker's instructions.
+
+In the following sections we will assume that your Docker installation works without issues. So after installing, please make sure that everything is running smoothly before continuing.
+
+
+## Building a Docker image for Signal
+
+#### Grabbing the `Dockerfile`
+
+First you will need the `Dockerfile` for Signal Android. It comes bundled with Signal's source code. The `Dockerfile` contains instructions on how to automatically build a Docker image for Signal. You just need to run it and it builds itself.
+
+Download the `Dockerfile` to the `image-build-context` directory.
+
+```
+user@host:$ wget -O ~/reproducible-signal/image-build-context/Dockerfile_v3.15.2 \
+                    https://raw.githubusercontent.com/signalapp/Signal-Android/v3.15.2/Dockerfile
+```
+
+Note that the `Dockerfile` is specific to the Signal version you want to compare to. Again you have to adjust the URL above to match the right version. (Though sometimes the file might not be up to date, see the [Troubleshooting section](#troubleshooting))
+
+
+#### Building the image
+
+Now we have everything we need to build the Docker image for Signal. Go to the `image-build-context` directory:
+
+```
+user@host:$ cd ~/reproducible-signal/image-build-context
+```
+
+And list the contents.
+```
+user@host:$ ls
+```
+The output should look like this:
+```
+Dockerfile_v3.15.2
+```
+
+Now in this directory build the image using `Dockerfile_v3.15.2`:
+```
+user@host:$ docker build --file Dockerfile_v3.15.2 --tag signal-android .
+```
+
+(Note that there is a dot at the end of that command!)
+
+Wait a few years for the build to finish... :construction_worker:
+
+(Depending on your computer and network connection, this may take several minutes.)
+
+:calendar: :sleeping:
+
+After the build has finished, you may wish to list all your Docker images to see that it's really there:
+```
+user@host:$ docker images
+```
+Output should look something like this:
+```
+REPOSITORY          TAG                 IMAGE ID            CREATED             VIRTUAL SIZE
+signal-android      latest              c6b84450b896        46 seconds ago      2.94 GB
+ubuntu              14.04.3             8693db7e8a00        9 weeks ago         187.9 MB
+```
+
+
+## Compiling Signal inside a container
+
+Next we will run a container of the image we just built, grab Signal's source code and compile Signal.
+
+First go to the `reproducible-signal` directory:
+
+```
+user@host:$ cd ~/reproducible-signal/
+```
+
+To run a new ephemeral container with an interactive terminal session execute the following long command:
+```
+user@host:$ docker run \
+              --name signal \
+              --rm \
+              --interactive \
+              --tty \
+              --volume $(pwd)/apk-from-google-play-store:/signal-build/apk-from-google-play-store \
+              --workdir /signal-build \
+              signal-android
+```
+Now you are inside the container.
+
+Grab Signal's source code from GitHub and go to the repository directory:
+```
+root@container:# git clone https://github.com/signalapp/Signal-Android.git
+root@container:# cd Signal-Android
+```
+
+Before you can compile, you **must** ensure that you are at the right commit. In other words you **must** checkout the version you wish to verify (here we are verifying 3.15.2):
+```
+root@container:# git checkout --quiet v3.15.2
+```
+
+Now you may compile the release APK by running:
+```
+root@container:# ./gradlew clean assemblePlayRelease --exclude-task signProductionPlayRelease
+```
+This will take a few minutes :sleeping:
+
+
+#### Checking if the APKs match
+
+After the build has completed successfully we can finally compare if the APKs match. For the comparison we need of course the Google Play Store version of Signal APK which you copied to the `apk-from-google-play-store` directory in the beginning of this guide. Because we used that directory as a `--volume` parameter for our container, we can see all the files in that directory within our container.
+
+So now we can compare the APKs using the `apkdiff.py` tool.
+
+The above build step produced several APKs, one for each supported ABI and one universal one. You will need to determine the correct APK to compare.
+
+Currently, the most common ABI is `armeabi-v7a`. Other options at this time include `x86` and `universal`. In the future it will also include 64-bit options, such as `x86_64` and `arm64-v8a`.
+
+See [Identifying the ABI](#identifying-the-abi) above if you don't know the ABI of your play store APK.
+
+Once you have determined the ABI, add an `abi` environment variable. For example, suppose we determine that `armeabi-v7a` is the ABI google play has served:
+
+```
+root@container:# export abi=armeabi-v7a
+```
+
+And the diff script to compare:
+```
+root@container:# python3 apkdiff/apkdiff.py \
+                   build/outputs/apk/play/release/*play-$abi-release-unsigned*.apk \
+                   ../apk-from-google-play-store/Signal-3.15.2.apk
+```
+Output:
+```
+APKs match!
+```
+
+If you get `APKs match!`, you have successfully verified that the Google Play release matches with your own self-built version of Signal. Congratulations! Your APKs are a match made in heaven! :sparkles:
+
+If you get `APKs don't match!`, you did something wrong in the previous steps. See the [Troubleshooting section](#troubleshooting) for more info.
+
+
+## Comparing next time
+
+If the build environment (i.e. `Dockerfile`) has not changed, you don't need to build the image again to verify a newer APK. You can just [run the container again](#compiling-signal-inside-a-container).
+
+
+## Troubleshooting
+
+If you cannot get things to work, please do not open an issue or comment on an existing issue at GitHub. Instead, ask for help at https://community.signalusers.org/c/development
+
+Some common issues why things may not work:
+- some pinned packages in the `Dockerfile` are not available anymore and building of the Docker image fails
+- the Android packages in the Docker image are outdated and compiling Signal fails
+- you built the Docker image with a wrong version of the `Dockerfile`
+- you didn't checkout the correct Signal version tag with Git before compiling
+- the ABI you selected is not the correct ABI, particularly if you see an error along the lines of `Sorted manifests don't match, lib/x86/libcurve25519.so vs lib/armeabi-v7a/libcurve25519.so`.
+- this guide is outdated
+- you are in a dream
+- if you run into this issue: https://issuetracker.google.com/issues/110237303 try to add `resources.arsc` to the list of ignored files and compare again

apkdiff/apkdiff.py

@@ -1,20 +1,21 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 import sys
 from zipfile import ZipFile
 
 class ApkDiff:
-
-    IGNORE_FILES = ["META-INF/CERT.RSA", "META-INF/CERT.SF", "META-INF/MANIFEST.MF"]
+    # resources.arsc is ignored due to https://issuetracker.google.com/issues/110237303
+    # May be fixed in Android Gradle Plugin 3.4
+    IGNORE_FILES = ["META-INF/MANIFEST.MF", "META-INF/SIGNAL_S.RSA", "META-INF/SIGNAL_S.SF", "resources.arsc"]
 
     def compare(self, sourceApk, destinationApk):
         sourceZip      = ZipFile(sourceApk, 'r')
         destinationZip = ZipFile(destinationApk, 'r')
 
         if self.compareManifests(sourceZip, destinationZip) and self.compareEntries(sourceZip, destinationZip) == True:
-            print "APKs match!"
+            print("APKs match!")
         else:
-            print "APKs don't match!"
+            print("APKs don't match!")
 
     def compareManifests(self, sourceZip, destinationZip):
         sourceEntrySortedList      = sorted(sourceZip.namelist())
@@ -23,23 +24,23 @@ class ApkDiff:
         for ignoreFile in self.IGNORE_FILES:
             while ignoreFile in sourceEntrySortedList: sourceEntrySortedList.remove(ignoreFile)
             while ignoreFile in destinationEntrySortedList: destinationEntrySortedList.remove(ignoreFile)
-                    
+
         if len(sourceEntrySortedList) != len(destinationEntrySortedList):
-            print "Manifest lengths differ!"
-        
+            print("Manifest lengths differ!")
+
         for (sourceEntryName, destinationEntryName) in zip(sourceEntrySortedList, destinationEntrySortedList):
             if sourceEntryName != destinationEntryName:
-                print "Sorted manifests don't match, %s vs %s" % (sourceEntryName, destinationEntryName)   
+                print("Sorted manifests don't match, %s vs %s" % (sourceEntryName, destinationEntryName))
                 return False
 
         return True
-            
+
     def compareEntries(self, sourceZip, destinationZip):
-        sourceInfoList      = filter(lambda sourceInfo: sourceInfo.filename not in self.IGNORE_FILES, sourceZip.infolist())
-        destinationInfoList = filter(lambda destinationInfo: destinationInfo.filename not in self.IGNORE_FILES, destinationZip.infolist())
-        
+        sourceInfoList      = list(filter(lambda sourceInfo: sourceInfo.filename not in self.IGNORE_FILES, sourceZip.infolist()))
+        destinationInfoList = list(filter(lambda destinationInfo: destinationInfo.filename not in self.IGNORE_FILES, destinationZip.infolist()))
+
         if len(sourceInfoList) != len(destinationInfoList):
-            print "APK info lists of different length!"
+            print("APK info lists of different length!")
             return False
 
         for sourceEntryInfo in sourceInfoList:
@@ -49,19 +50,19 @@ class ApkDiff:
                     destinationEntry = destinationZip.open(destinationEntryInfo, 'r')
 
                     if self.compareFiles(sourceEntry, destinationEntry) != True:
-                        print "APK entry %s does not match %s!" % (sourceEntryInfo.filename, destinationEntryInfo.filename)
+                        print("APK entry %s does not match %s!" % (sourceEntryInfo.filename, destinationEntryInfo.filename))
                         return False
 
                     destinationInfoList.remove(destinationEntryInfo)
                     break
-                
+
         return True
 
     def compareFiles(self, sourceFile, destinationFile):
         sourceChunk      = sourceFile.read(1024)
         destinationChunk = destinationFile.read(1024)
 
-        while sourceChunk != "" or destinationChunk != "":
+        while sourceChunk != b"" or destinationChunk != b"":
             if sourceChunk != destinationChunk:
                 return False
 
@@ -72,7 +73,7 @@ class ApkDiff:
 
 if __name__ == '__main__':
     if len(sys.argv) != 3:
-        print "Usage: apkdiff <pathToFirstApk> <pathToSecondApk>"
+        print("Usage: apkdiff <pathToFirstApk> <pathToSecondApk>")
         sys.exit(1)
 
     ApkDiff().compare(sys.argv[1], sys.argv[2])

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

@@ -0,0 +1,436 @@
+import org.signal.signing.ApkSignerUtil
+
+import java.security.MessageDigest
+
+buildscript {
+    repositories {
+        google()
+        maven {
+            url "https://repo1.maven.org/maven2"
+        }
+        jcenter {
+            content {
+                includeVersion 'org.jetbrains.trove4j', 'trove4j', '20160824'
+            }
+        }
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.1.0'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.10'
+    }
+}
+
+apply plugin: 'com.android.application'
+apply plugin: 'com.google.protobuf'
+apply plugin: 'androidx.navigation.safeargs'
+apply plugin: 'witness'
+apply from: 'translations.gradle'
+apply from: 'witness-verifications.gradle'
+
+repositories {
+    maven {
+        url "https://raw.github.com/signalapp/maven/master/photoview/releases/"
+        content {
+            includeGroupByRegex "com\\.github\\.chrisbanes.*"
+        }
+    }
+    maven {
+        url "https://raw.github.com/signalapp/maven/master/shortcutbadger/releases/"
+        content {
+            includeGroupByRegex "me\\.leolin.*"
+        }
+    }
+    maven {
+        url "https://raw.github.com/signalapp/maven/master/circular-progress-button/releases/"
+        content {
+            includeGroupByRegex "com\\.github\\.dmytrodanylyk\\.circular-progress-button\\.*"
+        }
+    }
+    maven {
+        url "https://raw.github.com/signalapp/maven/master/sqlcipher/release/"
+        content {
+            includeGroupByRegex "org\\.signal.*"
+        }
+    }
+    maven { // textdrawable
+        url 'https://dl.bintray.com/amulyakhare/maven'
+        content {
+            includeGroupByRegex "com\\.amulyakhare.*"
+        }
+    }
+    google()
+    mavenCentral()
+    jcenter()
+    mavenLocal()
+}
+
+protobuf {
+    protoc {
+        artifact = 'com.google.protobuf:protoc:3.10.0'
+    }
+    generateProtoTasks {
+        all().each { task ->
+            task.builtins {
+                java {
+                    option "lite"
+                }
+            }
+        }
+    }
+}
+
+dependencies {
+    implementation 'androidx.appcompat:appcompat:1.1.0-beta01'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.preference:preference:1.0.0'
+    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
+    implementation 'androidx.gridlayout:gridlayout:1.0.0'
+    implementation 'androidx.exifinterface:exifinterface:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.multidex:multidex:2.0.1'
+    implementation 'androidx.navigation:navigation-fragment:2.1.0'
+    implementation 'androidx.navigation:navigation-ui:2.1.0'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:1.0.0-alpha05'
+    implementation 'androidx.lifecycle:lifecycle-common-java8:2.1.0'
+    implementation "androidx.camera:camera-core:1.0.0-alpha06"
+    implementation "androidx.camera:camera-camera2:1.0.0-alpha06"
+
+    implementation('com.google.firebase:firebase-messaging:17.3.4') {
+        exclude group: 'com.google.firebase', module: 'firebase-core'
+        exclude group: 'com.google.firebase', module: 'firebase-analytics'
+        exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
+    }
+
+    implementation 'com.google.android.gms:play-services-maps:16.1.0'
+    implementation 'com.google.android.gms:play-services-auth:16.0.1'
+
+    implementation 'com.google.android.exoplayer:exoplayer-core:2.9.1'
+    implementation 'com.google.android.exoplayer:exoplayer-ui:2.9.1'
+
+    implementation 'org.conscrypt:conscrypt-android:2.0.0'
+    implementation 'org.signal:aesgcmprovider:0.0.3'
+
+    implementation project(':libsignal-service')
+
+    implementation 'org.signal:ringrtc-android:0.3.1'
+
+    implementation "me.leolin:ShortcutBadger:1.1.16"
+    implementation 'se.emilsjolander:stickylistheaders:2.7.0'
+    implementation 'com.jpardogo.materialtabstrip:library:1.0.9'
+    implementation 'org.apache.httpcomponents:httpclient-android:4.3.5'
+    implementation 'com.github.chrisbanes:PhotoView:2.1.3'
+    implementation 'com.github.bumptech.glide:glide:4.9.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
+    annotationProcessor 'androidx.annotation:annotation:1.1.0'
+    implementation 'com.makeramen:roundedimageview:2.1.0'
+    implementation 'com.pnikosis:materialish-progress:1.5'
+    implementation 'org.greenrobot:eventbus:3.0.0'
+    implementation 'pl.tajchert:waitingdots:0.1.0'
+    implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
+    implementation 'com.melnykov:floatingactionbutton:1.3.0'
+    implementation 'com.google.zxing:android-integration:3.1.0'
+    implementation 'mobi.upod:time-duration-picker:1.1.3'
+    implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
+    implementation 'com.google.zxing:core:3.2.1'
+    implementation ('com.davemorrissey.labs:subsampling-scale-image-view:3.6.0') {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    }
+    implementation ('cn.carbswang.android:NumberPickerView:1.0.9') {
+        exclude group: 'com.android.support', module: 'appcompat-v7'
+    }
+    implementation ('com.tomergoldst.android:tooltips:1.0.6') {
+        exclude group: 'com.android.support', module: 'appcompat-v7'
+    }
+    implementation ('com.klinkerapps:android-smsmms:4.0.1') {
+        exclude group: 'com.squareup.okhttp', module: 'okhttp'
+        exclude group: 'com.squareup.okhttp', module: 'okhttp-urlconnection'
+    }
+    implementation 'com.annimon:stream:1.1.8'
+    implementation ('com.takisoft.fix:colorpicker:0.9.1') {
+        exclude group: 'com.android.support', module: 'appcompat-v7'
+        exclude group: 'com.android.support', module: 'recyclerview-v7'
+    }
+
+    implementation 'com.airbnb.android:lottie:3.0.7'
+
+    implementation 'com.codewaves.stickyheadergrid:stickyheadergrid:0.9.4'
+    implementation 'com.github.dmytrodanylyk.circular-progress-button:library:1.1.3-S2'
+    implementation 'org.signal:android-database-sqlcipher:3.5.9-S3'
+    implementation ('com.googlecode.ez-vcard:ez-vcard:0.9.11') {
+        exclude group: 'com.fasterxml.jackson.core'
+        exclude group: 'org.freemarker'
+    }
+
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.assertj:assertj-core:3.11.1'
+    testImplementation 'org.mockito:mockito-core:1.9.5'
+    testImplementation 'org.powermock:powermock-api-mockito:1.6.1'
+    testImplementation 'org.powermock:powermock-module-junit4:1.6.1'
+    testImplementation 'org.powermock:powermock-module-junit4-rule:1.6.1'
+    testImplementation 'org.powermock:powermock-classloading-xstream:1.6.1'
+
+    testImplementation 'androidx.test:core:1.2.0'
+    androidTestImplementation 'androidx.multidex:multidex:2.0.1'
+    androidTestImplementation 'androidx.multidex:multidex-instrumentation:2.0.0'
+    androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
+    androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
+    androidTestImplementation ('org.assertj:assertj-core:1.7.1') {
+        exclude group: 'org.hamcrest', module: 'hamcrest-core'
+    }
+    androidTestImplementation ('com.squareup.assertj:assertj-android:1.1.1') {
+        exclude group: 'org.hamcrest',        module: 'hamcrest-core'
+        exclude group: 'com.android.support', module: 'support-annotations'
+    }
+    testImplementation 'org.robolectric:robolectric:4.2'
+    testImplementation 'org.robolectric:shadows-multidex:4.2'
+}
+
+dependencyVerification {
+    configuration = '(play|website)(Debug|Release)RuntimeClasspath'
+}
+
+def canonicalVersionCode = 587
+def canonicalVersionName = "4.53.2"
+
+def postFixSize = 10
+def abiPostFix = ['universal'   : 0,
+                  'armeabi-v7a' : 1,
+                  'arm64-v8a'   : 2,
+                  'x86'         : 3,
+                  'x86_64'      : 4]
+
+android {
+    flavorDimensions "none"
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
+    useLibrary 'org.apache.http.legacy'
+
+    dexOptions {
+        javaMaxHeapSize "4g"
+    }
+
+    defaultConfig {
+        versionCode canonicalVersionCode * postFixSize
+        versionName canonicalVersionName
+
+        minSdkVersion 19
+        targetSdkVersion 28
+        multiDexEnabled true
+
+        vectorDrawables.useSupportLibrary = true
+        project.ext.set("archivesBaseName", "Signal");
+
+        buildConfigField "long", "BUILD_TIMESTAMP", getLastCommitTimestamp() + "L"
+        buildConfigField "String", "SIGNAL_URL", "\"https://textsecure-service.whispersystems.org\""
+        buildConfigField "String", "STORAGE_URL", "\"https://storage.signal.org\""
+        buildConfigField "String", "SIGNAL_CDN_URL", "\"https://cdn.signal.org\""
+        buildConfigField "String", "SIGNAL_CONTACT_DISCOVERY_URL", "\"https://api.directory.signal.org\""
+        buildConfigField "String", "SIGNAL_SERVICE_STATUS_URL", "\"uptime.signal.org\""
+        buildConfigField "String", "SIGNAL_KEY_BACKUP_URL", "\"https://api.backup.signal.org\""
+        buildConfigField "String", "CONTENT_PROXY_HOST", "\"contentproxy.signal.org\""
+        buildConfigField "int", "CONTENT_PROXY_PORT", "443"
+        buildConfigField "String", "USER_AGENT", "\"OWA\""
+        buildConfigField "boolean", "DEV_BUILD", "false"
+        buildConfigField "String", "MRENCLAVE", "\"cd6cfc342937b23b1bdd3bbf9721aa5615ac9ff50a75c5527d441cd3276826c9\""
+        buildConfigField "String", "KEY_BACKUP_ENCLAVE_NAME", "\"f2e2a5004794a6c1bac5c4949eadbc243dd02e02d1a93f10fe24584fb70815d8\""
+        buildConfigField "String", "KEY_BACKUP_MRENCLAVE", "\"f51f435802ada769e67aaf5744372bb7e7d519eecf996d335eb5b46b872b5789\""
+        buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF\""
+        buildConfigField "String[]", "LANGUAGES", "new String[]{\"" + autoResConfig().collect { s -> s.replace('-r', '_') }.join('", "') + '"}'
+        buildConfigField "int", "CANONICAL_VERSION_CODE", "$canonicalVersionCode"
+
+        ndk {
+            abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+        }
+
+        resConfigs autoResConfig()
+
+        splits {
+            abi {
+                enable true
+                reset()
+                include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+                universalApk true
+            }
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    packagingOptions {
+        exclude 'LICENSE.txt'
+        exclude 'LICENSE'
+        exclude 'NOTICE'
+        exclude 'asm-license.txt'
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/NOTICE'
+        exclude 'META-INF/proguard/androidx-annotations.pro'
+    }
+
+    buildTypes {
+        debug {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'),
+                    'proguard/proguard-firebase-messaging.pro',
+                    'proguard/proguard-google-play-services.pro',
+                    'proguard/proguard-jackson.pro',
+                    'proguard/proguard-sqlite.pro',
+                    'proguard/proguard-appcompat-v7.pro',
+                    'proguard/proguard-square-okhttp.pro',
+                    'proguard/proguard-square-okio.pro',
+                    'proguard/proguard-spongycastle.pro',
+                    'proguard/proguard-rounded-image-view.pro',
+                    'proguard/proguard-glide.pro',
+                    'proguard/proguard-shortcutbadger.pro',
+                    'proguard/proguard-retrofit.pro',
+                    'proguard/proguard-webrtc.pro',
+                    'proguard/proguard-klinker.pro',
+                    'proguard/proguard-retrolambda.pro',
+                    'proguard/proguard-okhttp.pro',
+                    'proguard/proguard-ez-vcard.pro',
+                    'proguard/proguard.cfg'
+            testProguardFiles 'proguard/proguard-automation.pro',
+                    'proguard/proguard.cfg'
+        }
+        staging {
+            initWith debug
+
+            buildConfigField "String", "SIGNAL_URL", "\"https://textsecure-service-staging.whispersystems.org\""
+            buildConfigField "String", "STORAGE_URL", "\"https://storage-staging.signal.org\""
+            buildConfigField "String", "SIGNAL_CDN_URL", "\"https://cdn-staging.signal.org\""
+            buildConfigField "String", "SIGNAL_CONTACT_DISCOVERY_URL", "\"https://api-staging.directory.signal.org\""
+            buildConfigField "String", "SIGNAL_KEY_BACKUP_URL", "\"https://api-staging.backup.signal.org\""
+            buildConfigField "String", "MRENCLAVE", "\"ba4ebb438bc07713819ee6c98d94037747006d7df63fc9e44d2d6f1fec962a79\""
+            buildConfigField "String", "KEY_BACKUP_ENCLAVE_NAME", "\"b5a865941f95887018c86725cc92308d34a3084dc2b4e7bd2de5e5e1690b50c6\""
+            buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx\""
+        }
+        release {
+            minifyEnabled true
+            proguardFiles = buildTypes.debug.proguardFiles
+        }
+    }
+
+    productFlavors {
+        play {
+            dimension "none"
+            ext.websiteUpdateUrl = "null"
+            buildConfigField "boolean", "PLAY_STORE_DISABLED", "false"
+            buildConfigField "String", "NOPLAY_UPDATE_URL", "$ext.websiteUpdateUrl"
+        }
+
+        website {
+            dimension "none"
+            ext.websiteUpdateUrl = "https://updates.signal.org/android"
+            buildConfigField "boolean", "PLAY_STORE_DISABLED", "true"
+            buildConfigField "String", "NOPLAY_UPDATE_URL", "\"$ext.websiteUpdateUrl\""
+        }
+    }
+
+    android.applicationVariants.all { variant ->
+        variant.outputs.each { output ->
+            output.outputFileName = output.outputFileName.replace(".apk", "-${variant.versionName}.apk")
+            def abiName = output.getFilter("ABI") ?: 'universal'
+            def postFix = abiPostFix.get(abiName, 0)
+
+            if (postFix >= postFixSize) throw new AssertionError("postFix is too large")
+
+            output.versionCodeOverride = canonicalVersionCode * postFixSize + postFix
+        }
+    }
+
+    lintOptions {
+        abortOnError true
+        baseline file("lint-baseline.xml")
+        disable "LintError"
+    }
+
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+        }
+    }
+}
+
+def assembleWebsiteDescriptor = { variant, file ->
+    if (file.exists()) {
+        MessageDigest md = MessageDigest.getInstance("SHA-256");
+        file.eachByte 4096, {bytes, size ->
+            md.update(bytes, 0, size);
+        }
+
+        String digest  = md.digest().collect {String.format "%02x", it}.join();
+        String url     = variant.productFlavors.get(0).ext.websiteUpdateUrl
+        String apkName = file.getName()
+
+        String descriptor = "{" +
+                "\"versionCode\" : ${canonicalVersionCode * postFixSize + abiPostFix['universal']}," +
+                "\"versionName\" : \"$canonicalVersionName\"," +
+                "\"sha256sum\" : \"$digest\"," +
+                "\"url\" : \"$url/$apkName\"" +
+                "}"
+
+        File descriptorFile = new File(file.getParent(), apkName.replace(".apk", ".json"))
+
+        descriptorFile.write(descriptor)
+    }
+}
+
+def signProductionRelease = { variant ->
+    variant.outputs.collect { output ->
+        String apkName    = output.outputFile.name
+        File   inputFile  = new File(output.outputFile.path)
+        File   outputFile = new File(output.outputFile.parent, apkName.replace('-unsigned', ''))
+
+        new ApkSignerUtil('sun.security.pkcs11.SunPKCS11',
+                          'pkcs11.config',
+                          'PKCS11',
+                          'file:pkcs11.password').calculateSignature(inputFile.getAbsolutePath(),
+                                                                     outputFile.getAbsolutePath())
+
+        inputFile.delete()
+        outputFile
+    }
+}
+
+task signProductionPlayRelease {
+    doLast {
+        signProductionRelease(android.applicationVariants.find { (it.name == 'playRelease') })
+    }
+}
+
+task signProductionWebsiteRelease {
+    doLast {
+        def  variant       = android.applicationVariants.find { (it.name == 'websiteRelease') }
+        File signedRelease = signProductionRelease(variant).find { it.name.contains('universal') }
+        assembleWebsiteDescriptor(variant, signedRelease)
+    }
+}
+
+tasks.whenTaskAdded { task ->
+    if (task.name.equals("assemblePlayRelease")) {
+        task.finalizedBy signProductionPlayRelease
+    }
+
+    if (task.name.equals("assembleWebsiteRelease")) {
+        task.finalizedBy signProductionWebsiteRelease
+    }
+}
+
+def getLastCommitTimestamp() {
+    new ByteArrayOutputStream().withStream { os ->
+        def result = exec {
+            executable = 'git'
+            args = ['log', '-1', '--pretty=format:%ct']
+            standardOutput = os
+        }
+
+        return os.toString() + "000"
+    }
+}

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

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="5" by="lint 3.3.2" client="gradle" variant="playRelease" version="3.3.2">
+
+    <issue
+        id="MissingPermission"
+        message="Call requires permission which may be rejected by user: code should explicitly check to see if permission is available (with `checkPermission`) or explicitly handle a potential `SecurityException`"
+        errorLine1="    List&lt;SubscriptionInfo> list = subscriptionManager.getActiveSubscriptionInfoList();"
+        errorLine2="                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/java/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java"
+            line="101"
+            column="35"/>
+    </issue>
+
+    <issue
+        id="ResourceType"
+        message="Expected resource of type styleable"
+        errorLine1="                drawables.getColor(1, 0xff000000);"
+        errorLine2="                                   ~">
+        <location
+            file="src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java"
+            line="187"
+            column="36"/>
+    </issue>
+
+    <issue
+        id="AppLinkUrlError"
+        message="Missing URL"
+        errorLine1="        &lt;intent-filter>"
+        errorLine2="        ^">
+        <location
+            file="AndroidManifest.xml"
+            line="368"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="AppLinkUrlError"
+        message="Missing URL"
+        errorLine1="        &lt;intent-filter>"
+        errorLine2="        ^">
+        <location
+            file="AndroidManifest.xml"
+            line="381"
+            column="9"/>
+    </issue>
+
+</issues>

app/lint.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+
+    <!-- L10N errors -->
+    <!-- This is a runtime crash so we don't want to ship with this. -->
+    <issue id="StringFormatMatches" severity="error" />
+
+    <!-- L10N warnings -->
+    <issue id="MissingTranslation" severity="warning" />
+    <issue id="MissingQuantity" severity="warning" />
+    <issue id="ExtraTranslation" severity="warning" />
+    <issue id="ImpliedQuantity" severity="warning" />
+
+    <issue id="CanvasSize" severity="error" />
+    <issue id="HardcodedText" severity="error" />
+    <issue id="VectorRaster" severity="error" />
+    <issue id="ButtonOrder" severity="error" />
+    <issue id="ExtraTranslation" severity="warning" />
+
+    <issue id="RestrictedApi" severity="error">
+        <ignore path="*/org/thoughtcrime/securesms/mediasend/camerax/VideoCapture.java" />
+        <ignore path="*/org/thoughtcrime/securesms/mediasend/camerax/CameraXModule.java" />
+    </issue>
+
+</lint>

app/proguard/proguard-ez-vcard.pro

@@ -0,0 +1 @@
+-dontwarn ezvcard.io.html.HCardPage

app/proguard/proguard-firebase-messaging.pro

@@ -0,0 +1 @@
+-dontwarn com.google.firebase.analytics.connector.AnalyticsConnector

app/proguard/proguard-glide.pro

@@ -0,0 +1,6 @@
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public class * extends com.bumptech.glide.AppGlideModule
+-keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** {
+    **[] $VALUES;
+    public *;
+}

app/proguard/proguard-klinker.pro

@@ -0,0 +1,3 @@
+-dontwarn android.net.ConnectivityManager
+-dontwarn android.net.ConnectivityManager$NetworkCallback
+-dontwarn org.webrtc.NetworkMonitorAutoDetect$ConnectivityManagerDelegate

app/proguard/proguard-okhttp.pro

@@ -0,0 +1,3 @@
+-dontwarn okio.**
+-dontwarn javax.annotation.Nullable
+-dontwarn javax.annotation.ParametersAreNonnullByDefault

app/proguard/proguard-retrolambda.pro

@@ -0,0 +1,2 @@
+-dontwarn java.lang.invoke.*
+-dontwarn **$$Lambda$*

app/proguard/proguard-sqlite.pro

@@ -0,0 +1,5 @@
+-keep class org.sqlite.** { *; }
+-keep class org.sqlite.database.** { *; }
+
+-keep class net.sqlcipher.** { *; }
+-dontwarn net.sqlcipher.**

app/proguard/proguard.cfg

@@ -0,0 +1,11 @@
+-dontoptimize
+-dontobfuscate
+-keepattributes SourceFile,LineNumberTable
+-keep class org.whispersystems.** { *; }
+-keep class org.thoughtcrime.securesms.** { *; }
+-keepclassmembers class ** {
+    public void onEvent*(**);
+}
+
+# Protobuf lite
+-keep class * extends com.google.protobuf.GeneratedMessageLite { *; }

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

@@ -1,23 +1,24 @@
 package org.thoughtcrime.securesms;
 
 import android.annotation.TargetApi;
-import android.app.ActivityOptions;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.ActivityOptionsCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
+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 android.view.animation.AnimationUtils;
 
+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;
 
@@ -37,6 +38,7 @@ public abstract class BaseActionBarActivity extends AppCompatActivity {
   protected void onResume() {
     super.onResume();
     initializeScreenshotSecurity();
+    DynamicLanguageActivityHelper.recreateIfNotInCorrectLanguage(this, TextSecurePreferences.getLanguage(this));
   }
 
   @Override
@@ -54,9 +56,7 @@ public abstract class BaseActionBarActivity extends AppCompatActivity {
   }
 
   private void initializeScreenshotSecurity() {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH &&
-            TextSecurePreferences.isScreenSecurityEnabled(this))
-    {
+    if (TextSecurePreferences.isScreenSecurityEnabled(this)) {
       getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
     } else {
       getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
@@ -94,4 +94,8 @@ public abstract class BaseActionBarActivity extends AppCompatActivity {
     }
   }
 
+  @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

@@ -1,7 +1,8 @@
 package org.thoughtcrime.securesms;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -41,7 +42,7 @@ public class BasicIntroFragment extends Fragment {
   }
 
   @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup container,
+  public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                            Bundle savedInstanceState) {
     View v = inflater.inflate(R.layout.color_fragment, container, false);
 

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

@@ -2,9 +2,10 @@ package org.thoughtcrime.securesms;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v4.app.ListFragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
+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;
@@ -54,12 +55,12 @@ public class CountrySelectionFragment extends ListFragment implements LoaderMana
   }
 
   @Override
-  public Loader<ArrayList<Map<String, String>>> onCreateLoader(int arg0, Bundle arg1) {
+  public @NonNull Loader<ArrayList<Map<String, String>>> onCreateLoader(int arg0, Bundle arg1) {
     return new CountryListLoader(getActivity());
   }
 
   @Override
-  public void onLoadFinished(Loader<ArrayList<Map<String, String>>> loader,
+  public void onLoadFinished(@NonNull Loader<ArrayList<Map<String, String>>> loader,
                              ArrayList<Map<String, String>> results)
   {
     String[] from = {"country_name", "country_code"};
@@ -72,7 +73,7 @@ public class CountrySelectionFragment extends ListFragment implements LoaderMana
   }
 
   @Override
-  public void onLoaderReset(Loader<ArrayList<Map<String, String>>> arg0) {
+  public void onLoaderReset(@NonNull Loader<ArrayList<Map<String, String>>> arg0) {
     this.setListAdapter(null);
   }
 

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

@@ -10,14 +10,13 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
-import android.support.annotation.NonNull;
+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.crypto.MasterSecret;
 import org.thoughtcrime.securesms.database.SmsMigrator.ProgressDescription;
 import org.thoughtcrime.securesms.service.ApplicationMigrationService;
 import org.thoughtcrime.securesms.service.ApplicationMigrationService.ImportState;
@@ -39,7 +38,7 @@ public class DatabaseMigrationActivity extends PassphraseRequiredActionBarActivi
   private boolean isVisible = false;
 
   @Override
-  protected void onCreate(Bundle bundle, @NonNull MasterSecret masterSecret) {
+  protected void onCreate(Bundle bundle, boolean ready) {
     setContentView(R.layout.database_migration_activity);
 
     initializeResources();
@@ -92,7 +91,7 @@ public class DatabaseMigrationActivity extends PassphraseRequiredActionBarActivi
       public void onClick(View v) {
         Intent intent = new Intent(DatabaseMigrationActivity.this, ApplicationMigrationService.class);
         intent.setAction(ApplicationMigrationService.MIGRATE_DATABASE);
-        intent.putExtra("master_secret", getIntent().getParcelableExtra("master_secret"));
+        intent.putExtra("master_secret", (Parcelable)getIntent().getParcelableExtra("master_secret"));
         startService(intent);
 
         promptLayout.setVisibility(View.GONE);
@@ -150,7 +149,8 @@ public class DatabaseMigrationActivity extends PassphraseRequiredActionBarActivi
       if (getIntent().hasExtra("next_intent")) {
         startActivity((Intent)getIntent().getParcelableExtra("next_intent"));
       } else {
-        startActivity(new Intent(this, ConversationListActivity.class));
+        // TODO [greyson] Navigation
+        startActivity(new Intent(this, MainActivity.class));
       }
     }
 

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

@@ -2,15 +2,11 @@ package org.thoughtcrime.securesms;
 
 import android.animation.Animator;
 import android.annotation.TargetApi;
-import android.content.Context;
 import android.content.res.Configuration;
-import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewAnimationUtils;
@@ -19,21 +15,9 @@ import android.view.animation.DecelerateInterpolator;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
-import com.google.zxing.BinaryBitmap;
-import com.google.zxing.ChecksumException;
-import com.google.zxing.FormatException;
-import com.google.zxing.NotFoundException;
-import com.google.zxing.PlanarYUVLuminanceSource;
-import com.google.zxing.Result;
-import com.google.zxing.common.HybridBinarizer;
-import com.google.zxing.qrcode.QRCodeReader;
-
 import org.thoughtcrime.securesms.components.camera.CameraView;
-import org.thoughtcrime.securesms.components.camera.CameraView.PreviewCallback;
-import org.thoughtcrime.securesms.components.camera.CameraView.PreviewFrame;
 import org.thoughtcrime.securesms.qr.ScanListener;
 import org.thoughtcrime.securesms.qr.ScanningThread;
-import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
 public class DeviceAddFragment extends Fragment {
@@ -46,7 +30,7 @@ public class DeviceAddFragment extends Fragment {
   private ScanListener   scanListener;
 
   @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup viewGroup, Bundle bundle) {
+  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);

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

@@ -3,7 +3,8 @@ package org.thoughtcrime.securesms;
 import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -16,7 +17,7 @@ public class DeviceLinkFragment extends Fragment implements View.OnClickListener
   private Uri                 uri;
 
   @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup viewGroup, Bundle bundle) {
+  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);
 
@@ -31,6 +32,7 @@ public class DeviceLinkFragment extends Fragment implements View.OnClickListener
 
   @Override
   public void onConfigurationChanged(Configuration newConfiguration) {
+    super.onConfigurationChanged(newConfiguration);
     if (newConfiguration.orientation == Configuration.ORIENTATION_LANDSCAPE) {
       container.setOrientation(LinearLayout.HORIZONTAL);
     } else {
@@ -51,6 +53,6 @@ public class DeviceLinkFragment extends Fragment implements View.OnClickListener
   }
 
   public interface LinkClickedListener {
-    public void onLink(Uri uri);
+    void onLink(Uri uri);
   }
 }

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

@@ -1,14 +1,20 @@
 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 android.support.v4.app.ListFragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
-import android.support.v7.app.AlertDialog;
-import android.util.Log;
+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;
@@ -21,34 +27,28 @@ import android.widget.Toast;
 import com.melnykov.fab.FloatingActionButton;
 
 import org.thoughtcrime.securesms.database.loaders.DeviceListLoader;
-import org.thoughtcrime.securesms.dependencies.InjectableType;
 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 org.whispersystems.signalservice.api.messages.multidevice.DeviceInfo;
 
 import java.io.IOException;
 import java.util.List;
 import java.util.Locale;
 
-import javax.inject.Inject;
-
 public class DeviceListFragment extends ListFragment
-    implements LoaderManager.LoaderCallbacks<List<DeviceInfo>>,
-               ListView.OnItemClickListener, InjectableType, Button.OnClickListener
+    implements LoaderManager.LoaderCallbacks<List<Device>>,
+               ListView.OnItemClickListener, Button.OnClickListener
 {
 
   private static final String TAG = DeviceListFragment.class.getSimpleName();
 
-  @Inject
-  SignalServiceAccountManager accountManager;
-
-  private Locale                 locale;
-  private View                   empty;
-  private View                   progressContainer;
-  private FloatingActionButton   addDeviceButton;
-  private Button.OnClickListener addDeviceButtonListener;
+  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) {
@@ -59,7 +59,7 @@ public class DeviceListFragment extends ListFragment
   @Override
   public void onAttach(Activity activity) {
     super.onAttach(activity);
-    ApplicationContext.getInstance(activity).injectDependencies(this);
+    this.accountManager = ApplicationDependencies.getSignalServiceAccountManager();
   }
 
   @Override
@@ -86,7 +86,7 @@ public class DeviceListFragment extends ListFragment
   }
 
   @Override
-  public Loader<List<DeviceInfo>> onCreateLoader(int id, Bundle args) {
+  public @NonNull Loader<List<Device>> onCreateLoader(int id, Bundle args) {
     empty.setVisibility(View.GONE);
     progressContainer.setVisibility(View.VISIBLE);
 
@@ -94,7 +94,7 @@ public class DeviceListFragment extends ListFragment
   }
 
   @Override
-  public void onLoadFinished(Loader<List<DeviceInfo>> loader, List<DeviceInfo> data) {
+  public void onLoadFinished(@NonNull Loader<List<Device>> loader, List<Device> data) {
     progressContainer.setVisibility(View.GONE);
 
     if (data == null) {
@@ -113,7 +113,7 @@ public class DeviceListFragment extends ListFragment
   }
 
   @Override
-  public void onLoaderReset(Loader<List<DeviceInfo>> loader) {
+  public void onLoaderReset(@NonNull Loader<List<Device>> loader) {
     setListAdapter(null);
   }
 
@@ -162,6 +162,7 @@ public class DeviceListFragment extends ListFragment
     builder.show();
   }
 
+  @SuppressLint("StaticFieldLeak")
   private void handleDisconnectDevice(final long deviceId) {
     new ProgressDialogAsyncTask<Void, Void, Void>(getActivity(),
                                                   R.string.DeviceListActivity_unlinking_device_no_ellipsis,
@@ -183,7 +184,7 @@ public class DeviceListFragment extends ListFragment
         super.onPostExecute(result);
         getLoaderManager().restartLoader(0, null, DeviceListFragment.this);
       }
-    }.execute();
+    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
   }
 
   @Override
@@ -191,19 +192,19 @@ public class DeviceListFragment extends ListFragment
     if (addDeviceButtonListener != null) addDeviceButtonListener.onClick(v);
   }
 
-  private static class DeviceListAdapter extends ArrayAdapter<DeviceInfo> {
+  private static class DeviceListAdapter extends ArrayAdapter<Device> {
 
     private final int    resource;
     private final Locale locale;
 
-    public DeviceListAdapter(Context context, int resource, List<DeviceInfo> objects, 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 View getView(int position, View convertView, ViewGroup parent) {
+    public @NonNull View getView(int position, View convertView, @NonNull ViewGroup parent) {
       if (convertView == null) {
         convertView = ((Activity)getContext()).getLayoutInflater().inflate(resource, parent, false);
       }

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

@@ -6,8 +6,8 @@ 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 org.whispersystems.signalservice.api.messages.multidevice.DeviceInfo;
 
 import java.util.Locale;
 
@@ -34,7 +34,7 @@ public class DeviceListItem extends LinearLayout {
     this.lastActive = (TextView) findViewById(R.id.active);
   }
 
-  public void set(DeviceInfo deviceInfo, Locale locale) {
+  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());
 

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/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

@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
 
 import java.util.List;
 

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

@@ -3,14 +3,13 @@ package org.thoughtcrime.securesms;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.ActionBarActivity;
-import android.util.Log;
+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;
-import org.whispersystems.libpastelog.SubmitLogFragment;
 
 /**
  * Activity for submitting logcat logs to a pastebin service.

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/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

@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms;
 
 import android.content.Context;
 import android.content.DialogInterface;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
 
 import java.util.concurrent.TimeUnit;
 

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

@@ -21,7 +21,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
-import android.util.Log;
+import org.thoughtcrime.securesms.logging.Log;
 
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.service.KeyCachingService;
@@ -34,6 +34,8 @@ import org.thoughtcrime.securesms.service.KeyCachingService;
  */
 public abstract class PassphraseActivity extends BaseActionBarActivity {
 
+  private static final String TAG = PassphraseActivity.class.getSimpleName();
+
   private KeyCachingService keyCachingService;
   private MasterSecret masterSecret;
 
@@ -62,8 +64,7 @@ public abstract class PassphraseActivity extends BaseActionBarActivity {
             try {
                 startActivity(nextIntent);
             } catch (java.lang.SecurityException e) {
-                Log.w("PassphraseActivity",
-                        "Access permission not passed from PassphraseActivity, retry sharing.");
+                Log.w(TAG, "Access permission not passed from PassphraseActivity, retry sharing.");
             }
         }
         finish();

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

@@ -20,7 +20,7 @@ import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.text.Editable;
-import android.util.Log;
+import org.thoughtcrime.securesms.logging.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
@@ -108,7 +108,7 @@ public class PassphraseChangeActivity extends PassphraseActivity {
       this.newPassphrase.setError(getString(R.string.PassphraseChangeActivity_enter_new_passphrase_exclamation));
       this.newPassphrase.requestFocus();
     } else {
-      new ChangePassphraseTask(this).execute(original, passphrase);
+      new ChangePassphraseTask(this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, original, passphrase);
     }
   }
 

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

@@ -18,7 +18,6 @@ package org.thoughtcrime.securesms;
 
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v7.app.ActionBar;
 
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
@@ -47,7 +46,7 @@ public class PassphraseCreateActivity extends PassphraseActivity {
   }
 
   private void initializeResources() {
-    new SecretGenerator().execute(MasterSecretUtil.UNENCRYPTED_PASSPHRASE);
+    new SecretGenerator().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, MasterSecretUtil.UNENCRYPTED_PASSPHRASE);
   }
 
   private class SecretGenerator extends AsyncTask<String, Void, Void> {
@@ -66,8 +65,12 @@ public class PassphraseCreateActivity extends PassphraseActivity {
       MasterSecretUtil.generateAsymmetricMasterSecret(PassphraseCreateActivity.this, masterSecret);
       IdentityKeyUtil.generateIdentityKeys(PassphraseCreateActivity.this);
       VersionTracker.updateLastSeenVersion(PassphraseCreateActivity.this);
-      TextSecurePreferences.setLastExperienceVersionCode(PassphraseCreateActivity.this, Util.getCurrentApkReleaseVersion(PassphraseCreateActivity.this));
+
+      TextSecurePreferences.setLastExperienceVersionCode(PassphraseCreateActivity.this, Util.getCanonicalVersionCode());
       TextSecurePreferences.setPasswordDisabled(PassphraseCreateActivity.this, true);
+      TextSecurePreferences.setReadReceiptsEnabled(PassphraseCreateActivity.this, true);
+      TextSecurePreferences.setTypingIndicatorsEnabled(PassphraseCreateActivity.this, true);
+      TextSecurePreferences.setHasSeenWelcomeScreen(PassphraseCreateActivity.this, false);
 
       return null;
     }

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

@@ -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

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

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();
+  }
+  
+}