Bump version to 4.53.7

Fixes #9323

.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

README.md

@@ -62,7 +62,7 @@ The form and manner of this distribution makes it eligible for export under the
 
 Copyright 2011 Whisper Systems
 
-Copyright 2013-2017 Open Whisper Systems
+Copyright 2013-2020 Open Whisper Systems
 
 Licensed under the GPLv3: http://www.gnu.org/licenses/gpl-3.0.html
 

app/.tx/config

@@ -3,8 +3,8 @@ 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 = res/values-<lang>/strings.xml
-source_file = res/values/strings.xml
+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

@@ -17,12 +17,15 @@ buildscript {
     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 {
@@ -57,10 +60,26 @@ repositories {
         }
     }
     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'
@@ -96,9 +115,10 @@ dependencies {
     implementation 'org.conscrypt:conscrypt-android:2.0.0'
     implementation 'org.signal:aesgcmprovider:0.0.3'
 
-    implementation 'org.whispersystems:signal-service-android:2.13.9'
+    implementation project(':libsignal-service')
 
-    implementation 'org.signal:ringrtc-android:0.1.4'
+    implementation 'org.signal:argon2:13.0@aar'
+    implementation 'org.signal:ringrtc-android:0.3.1'
 
     implementation "me.leolin:ShortcutBadger:1.1.16"
     implementation 'se.emilsjolander:stickylistheaders:2.7.0'
@@ -175,8 +195,8 @@ dependencyVerification {
     configuration = '(play|website)(Debug|Release)RuntimeClasspath'
 }
 
-def canonicalVersionCode = 551
-def canonicalVersionName = "4.49.4"
+def canonicalVersionCode = 592
+def canonicalVersionName = "4.53.7"
 
 def postFixSize = 10
 def abiPostFix = ['universal'   : 0,
@@ -208,14 +228,18 @@ android {
 
         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"
@@ -255,34 +279,37 @@ android {
         debug {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'),
-                          'proguard-firebase-messaging.pro',
-                          'proguard-google-play-services.pro',
-                          'proguard-jackson.pro',
-                          'proguard-sqlite.pro',
-                          'proguard-appcompat-v7.pro',
-                          'proguard-square-okhttp.pro',
-                          'proguard-square-okio.pro',
-                          'proguard-spongycastle.pro',
-                          'proguard-rounded-image-view.pro',
-                          'proguard-glide.pro',
-                          'proguard-shortcutbadger.pro',
-                          'proguard-retrofit.pro',
-                          'proguard-webrtc.pro',
-                          'proguard-klinker.pro',
-                          'proguard-retrolambda.pro',
-                          'proguard-okhttp.pro',
-                          'proguard-ez-vcard.pro',
-                          'proguard.cfg'
-            testProguardFiles 'proguard-automation.pro',
-                          'proguard.cfg'
+                    '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 {
@@ -319,28 +346,6 @@ android {
         }
     }
 
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            resources.srcDirs = ['src']
-            aidl.srcDirs = ['src']
-            renderscript.srcDirs = ['src']
-            res.srcDirs = ['res']
-            assets.srcDirs = ['assets']
-            jniLibs.srcDirs = ['libs']
-        }
-        androidTest {
-            java.srcDirs = ['test/androidTest/java']
-        }
-        test {
-            java.srcDirs = ['test/unitTest/java']
-            resources.srcDirs = ['test/unitTest/resources']
-        }
-
-        website.manifest.srcFile 'website/AndroidManifest.xml'
-    }
-
     lintOptions {
         abortOnError true
         baseline file("lint-baseline.xml")
@@ -430,26 +435,3 @@ def getLastCommitTimestamp() {
         return os.toString() + "000"
     }
 }
-
-/**
- * Discovers supported languages listed as under the res/values- directory.
- */
-static def autoResConfig() {
-    def files = new ArrayList<String>()
-    def root = new File('res')
-    root.eachFile { f -> files.add(f.name) }
-    ['en'] + files.collect { f -> f =~ /^values-([a-z]{2}(-r[A-Z]{2})?)$/ }
-         .findAll { matcher -> matcher.find() }
-         .collect { matcher -> matcher.group(1) }
-         .sort()
-}
-
-task qa {
-  group 'Verification'
-  description 'Quality Assurance. Run before pushing.'
-  dependsOn ':testPlayReleaseUnitTest', ':lintPlayRelease', ':assemblePlayDebug'
-}
-
-wrapper {
-    distributionType = Wrapper.DistributionType.ALL
-}

app/lint-baseline.xml

@@ -1,20 +1,13 @@
 <?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="LintError"
-        message="Unexpected failure during lint analysis of JobManager.java (this is a bug in lint or one of the libraries it depends on)&#xA;&#xA;Stack: `NullPointerException:ClsFileImpl.getMirror(ClsFileImpl.java:342)←ClsElementImpl.getMirror(ClsElementImpl.java:159)←ClsElementImpl.getText(ClsElementImpl.java:202)←InferenceSession.argConstraints(InferenceSession.java:1817)←InferenceSession.isFunctionalTypeMoreSpecific(InferenceSession.java:1748)←InferenceSession.isFunctionalTypeMoreSpecificOnExpression(InferenceSession.java:1729)←JavaMethodsConflictResolver.isFunctionalTypeMoreSpecific(JavaMethodsConflictResolver.java:776)←JavaMethodsConflictResolver.isTypeMoreSpecific(JavaMethodsConflictResolver.java:670)`&#xA;&#xA;You can set environment variable `LINT_PRINT_STACKTRACE=true` to dump a full stacktrace to stdout.">
-        <location
-            file="src/org/thoughtcrime/securesms/jobmanager/JobManager.java"/>
-    </issue>
-
     <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/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java"
+            file="src/main/java/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java"
             line="101"
             column="35"/>
     </issue>
@@ -25,7 +18,7 @@
         errorLine1="                drawables.getColor(1, 0xff000000);"
         errorLine2="                                   ~">
         <location
-            file="src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java"
+            file="src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java"
             line="187"
             column="36"/>
     </issue>

app/lint.xml

@@ -12,9 +12,14 @@
     <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="src/org/thoughtcrime/securesms/mediasend/camerax/VideoCapture.java" />
+        <ignore path="*/org/thoughtcrime/securesms/mediasend/camerax/VideoCapture.java" />
+        <ignore path="*/org/thoughtcrime/securesms/mediasend/camerax/CameraXModule.java" />
     </issue>
 
 </lint>

app/proguard/proguard.cfg

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

app/src/main/AndroidManifest.xml

@@ -27,6 +27,7 @@
                      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"/>
@@ -120,13 +121,13 @@
               android:launchMode="singleTask"/>
 
     <activity android:name=".InviteActivity"
-              android:theme="@style/TextSecure.HighlightTheme"
+              android:theme="@style/Signal.Light.NoActionBar.Invite"
               android:windowSoftInputMode="stateHidden"
-              android:parentActivityName=".ConversationListActivity"
+              android:parentActivityName=".MainActivity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
         <meta-data
             android:name="android.support.PARENT_ACTIVITY"
-            android:value="org.thoughtcrime.securesms.ConversationListActivity" />
+            android:value="org.thoughtcrime.securesms.MainActivity" />
     </activity>
 
     <activity android:name=".PromptMmsActivity"
@@ -187,18 +188,18 @@
             <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 android:name=".ConversationListActivity"
-              android:label="@string/app_name"
-              android:launchMode="singleTask"
-              android:theme="@style/TextSecure.LightNoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:exported="true" />
-
     <activity-alias android:name=".RoutingActivity"
-                    android:targetActivity=".ConversationListActivity"
+                    android:targetActivity=".MainActivity"
                     android:exported="true">
 
         <intent-filter>
@@ -214,24 +215,14 @@
 
     </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=".conversation.ConversationActivity"
               android:windowSoftInputMode="stateUnchanged"
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:parentActivityName=".ConversationListActivity">
+              android:parentActivityName=".MainActivity">
         <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.thoughtcrime.securesms.ConversationListActivity" />
+                android:value="org.thoughtcrime.securesms.MainActivity" />
     </activity>
 
     <activity android:name=".longmessage.LongMessageActivity" />
@@ -265,7 +256,7 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".ExperienceUpgradeActivity"
-              android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+              android:theme="@style/TextSecure.LightNoActionBar"
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -296,10 +287,11 @@
               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: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"
@@ -350,10 +342,9 @@
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".MediaOverviewActivity"
+    <activity android:name=".mediaoverview.MediaOverviewActivity"
               android:theme="@style/TextSecure.LightNoActionBar"
               android:windowSoftInputMode="stateHidden"
-              android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".DummyActivity"
@@ -411,11 +402,7 @@
               android:theme="@style/TextSecure.LightTheme"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".scribbles.StickerSelectActivity"
-              android:theme="@style/TextSecure.DarkTheme"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
-    <activity android:name=".scribbles.NewStickerSelectActivity"
+    <activity android:name=".scribbles.ImageEditorStickerSelectActivity"
               android:theme="@style/TextSecure.DarkTheme"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -459,7 +446,18 @@
     <activity
             android:name=".maps.PlacePickerActivity"
             android:label="@string/PlacePickerActivity_title"
-            android:theme="@style/TextSecure.LightNoActionBar" />
+            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"/>

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

@@ -37,31 +37,29 @@ 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.DatabaseFactory;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencyProvider;
 import org.thoughtcrime.securesms.gcm.FcmJobService;
+import org.thoughtcrime.securesms.insights.InsightsOptOut;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
-import org.thoughtcrime.securesms.jobmanager.JobMigrator;
-import org.thoughtcrime.securesms.jobmanager.impl.JsonDataSerializer;
 import org.thoughtcrime.securesms.jobs.CreateSignedPreKeyJob;
-import org.thoughtcrime.securesms.jobs.FastJobStorage;
 import org.thoughtcrime.securesms.jobs.FcmRefreshJob;
-import org.thoughtcrime.securesms.jobs.JobManagerFactories;
 import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
 import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
-import org.thoughtcrime.securesms.jobs.RefreshUnidentifiedDeliveryAbilityJob;
+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;
@@ -71,8 +69,10 @@ 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.VersionTracker;
+import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
 import org.webrtc.voiceengine.WebRtcAudioManager;
 import org.webrtc.voiceengine.WebRtcAudioUtils;
@@ -115,8 +115,8 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     initializeSecurityProvider();
     initializeLogging();
     initializeCrashHandling();
-    initializeFirstEverAppLaunch();
     initializeAppDependencies();
+    initializeFirstEverAppLaunch();
     initializeApplicationMigrations();
     initializeMessageRetrieval();
     initializeExpiringMessageManager();
@@ -129,7 +129,6 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     initializeCircumvention();
     initializeRingRtc();
     initializePendingMessages();
-    initializeUnidentifiedDeliveryAbilityRefresh();
     initializeBlobProvider();
     initializeCameraX();
     NotificationChannels.create(this);
@@ -149,6 +148,7 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     ApplicationDependencies.getRecipientCache().warmUp();
     executePendingContactSync();
     KeyCachingService.onAppForegrounded(this);
+    ApplicationDependencies.getFrameRateTracker().begin();
   }
 
   @Override
@@ -157,6 +157,7 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     Log.i(TAG, "App is no longer visible.");
     KeyCachingService.onAppBackgrounded(this);
     MessageNotifier.setVisibleThread(-1);
+    ApplicationDependencies.getFrameRateTracker().end();
   }
 
   public ExpiringMessageManager getExpiringMessageManager() {
@@ -236,8 +237,13 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
       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);
@@ -298,6 +304,7 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
         add("Moto G4");
         add("TA-1053");
         add("Mi A1");
+        add("Mi A2");
         add("E5823"); // Sony z5 compact
         add("Redmi Note 5");
         add("FP2"); // Fairphone FP2
@@ -317,7 +324,7 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
         WebRtcAudioManager.setBlacklistDeviceForOpenSLESUsage(true);
       }
 
-      CallConnectionFactory.initialize(this);
+      CallConnectionFactory.initialize(this, new RingRtcLogger());
     } catch (UnsatisfiedLinkError e) {
       Log.w(TAG, e);
     }
@@ -360,12 +367,6 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     }
   }
 
-  private void initializeUnidentifiedDeliveryAbilityRefresh() {
-    if (TextSecurePreferences.isMultiDevice(this) && !TextSecurePreferences.isUnidentifiedDeliveryEnabled(this)) {
-      ApplicationDependencies.getJobManager().add(new RefreshUnidentifiedDeliveryAbilityJob());
-    }
-  }
-
   private void initializeBlobProvider() {
     AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
       BlobProvider.getInstance().onSessionStart(this);
@@ -374,7 +375,7 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
 
   @SuppressLint("RestrictedApi")
   private void initializeCameraX() {
-    if (Build.VERSION.SDK_INT >= 21) {
+    if (CameraXUtil.isSupported()) {
       new Thread(() -> {
         try {
           CameraX.init(this, Camera2AppConfig.create(this));

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

@@ -19,10 +19,11 @@ 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.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
@@ -35,11 +36,15 @@ 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.
@@ -60,6 +65,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
   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";
 
@@ -105,7 +111,8 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
     if (fragmentManager.getBackStackEntryCount() > 0) {
       fragmentManager.popBackStack();
     } else {
-      Intent intent = new Intent(this, ConversationListActivity.class);
+      // TODO [greyson] Navigation
+      Intent intent = new Intent(this, MainActivity.class);
       intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
       startActivity(intent);
       finish();
@@ -144,10 +151,21 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
         .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
@@ -213,6 +231,9 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
         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);
@@ -245,11 +266,14 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
     private class ProfileClickListener implements Preference.OnPreferenceClickListener {
       @Override
       public boolean onPreferenceClick(Preference preference) {
-        Intent intent = new Intent(preference.getContext(), CreateProfileActivity.class);
-        intent.putExtra(CreateProfileActivity.EXCLUDE_SYSTEM, true);
+        if (FeatureFlags.USERNAMES) {
+          requireActivity().startActivity(ProfileEditActivityV2.getLaunchIntent(requireContext()));
+        } else {
+          Intent intent = new Intent(preference.getContext(), CreateProfileActivity.class);
+          intent.putExtra(CreateProfileActivity.EXCLUDE_SYSTEM, true);
 
-        getActivity().startActivity(intent);
-//        ((BaseActionBarActivity)getActivity()).startActivitySceneTransition(intent, getActivity().findViewById(R.id.avatar), "avatar");
+          requireActivity().startActivity(intent);
+        }
         return true;
       }
     }

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

@@ -5,9 +5,9 @@ import androidx.annotation.Nullable;
 import android.view.View;
 
 import org.thoughtcrime.securesms.contactshare.Contact;
-import org.thoughtcrime.securesms.database.Address;
 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;
@@ -44,5 +44,6 @@ public interface BindableConversationItem extends Unbindable {
     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/ConfirmIdentityDialog.java

@@ -5,12 +5,13 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.database.Cursor;
 import android.os.AsyncTask;
-import androidx.appcompat.app.AlertDialog;
 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;
@@ -20,13 +21,15 @@ 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.PushDecryptJob;
+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;
 
@@ -48,7 +51,7 @@ public class ConfirmIdentityDialog extends AlertDialog {
     super(context);
 
       Recipient       recipient       = Recipient.resolved(mismatch.getRecipientId(context));
-      String          name            = recipient.toShortString();
+      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));
@@ -95,7 +98,7 @@ public class ConfirmIdentityDialog extends AlertDialog {
         @Override
         protected Void doInBackground(Void... params) {
           synchronized (SESSION_LOCK) {
-            SignalProtocolAddress      mismatchAddress  = new SignalProtocolAddress(Recipient.resolved(recipientId).requireAddress().toPhoneString(), 1);
+            SignalProtocolAddress      mismatchAddress  = new SignalProtocolAddress(Recipient.resolved(recipientId).requireServiceId(), 1);
             TextSecureIdentityKeyStore identityKeyStore = new TextSecureIdentityKeyStore(getContext());
 
             identityKeyStore.saveIdentity(mismatchAddress, mismatch.getIdentityKey(), true);
@@ -167,7 +170,7 @@ public class ConfirmIdentityDialog extends AlertDialog {
             boolean legacy = !messageRecord.isContentBundleKeyExchange();
 
             SignalServiceEnvelope envelope = new SignalServiceEnvelope(SignalServiceProtos.Envelope.Type.PREKEY_BUNDLE_VALUE,
-                                                                       messageRecord.getIndividualRecipient().requireAddress().toPhoneString(),
+                                                                       Optional.of(RecipientUtil.toSignalServiceAddress(getContext(), messageRecord.getIndividualRecipient())),
                                                                        messageRecord.getRecipientDeviceId(),
                                                                        messageRecord.getDateSent(),
                                                                        legacy ? Base64.decode(messageRecord.getBody()) : null,
@@ -176,7 +179,7 @@ public class ConfirmIdentityDialog extends AlertDialog {
 
             long pushId = pushDatabase.insert(envelope);
 
-            ApplicationDependencies.getJobManager().add(new PushDecryptJob(getContext(), pushId, messageRecord.getId()));
+            ApplicationDependencies.getJobManager().add(new PushDecryptMessageJob(getContext(), pushId, messageRecord.getId()));
           } catch (IOException e) {
             throw new AssertionError(e);
           }

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

@@ -25,12 +25,15 @@ import org.thoughtcrime.securesms.logging.Log;
 
 import org.thoughtcrime.securesms.components.ContactFilterToolbar;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
-import org.thoughtcrime.securesms.util.DirectoryHelper;
+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;
@@ -64,7 +67,7 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActionB
   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_GROUPS;
+                                                                 : DisplayMode.FLAG_PUSH | DisplayMode.FLAG_ACTIVE_GROUPS | DisplayMode.FLAG_INACTIVE_GROUPS;
       getIntent().putExtra(ContactSelectionListFragment.DISPLAY_MODE, displayMode);
     }
 
@@ -113,10 +116,10 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActionB
   }
 
   @Override
-  public void onContactSelected(String number) {}
+  public void onContactSelected(Optional<RecipientId> recipientId, String number) {}
 
   @Override
-  public void onContactDeselected(String number) {}
+  public void onContactDeselected(Optional<RecipientId> recipientId, String number) {}
 
   private static class RefreshDirectoryTask extends AsyncTask<Context, Void, Void> {
 
@@ -128,7 +131,6 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActionB
 
     @Override
     protected Void doInBackground(Context... params) {
-
       try {
         DirectoryHelper.refreshDirectory(params[0], true);
       } catch (IOException e) {

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

@@ -33,6 +33,7 @@ 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;
@@ -47,15 +48,22 @@ 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.util.DirectoryHelper;
+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;
@@ -80,7 +88,7 @@ public final class ContactSelectionListFragment extends    Fragment
   public static final String RECENTS      = "recents";
 
   private TextView                    emptyText;
-  private Set<String>                 selectedContacts;
+  private Set<SelectedContact>        selectedContacts;
   private OnContactSelectedListener   onContactSelectedListener;
   private SwipeRefreshLayout          swipeRefresh;
   private View                        showContactsLayout;
@@ -161,8 +169,8 @@ public final class ContactSelectionListFragment extends    Fragment
     Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
   }
 
-  public @NonNull List<String> getSelectedContacts() {
-    List<String> selected = new LinkedList<>();
+  public @NonNull List<SelectedContact> getSelectedContacts() {
+    List<SelectedContact> selected = new LinkedList<>();
     if (selectedContacts != null) {
       selected.addAll(selectedContacts);
     }
@@ -284,6 +292,8 @@ public final class ContactSelectionListFragment extends    Fragment
 
   @SuppressLint("StaticFieldLeak")
   private void handleContactPermissionGranted() {
+    final Context context = requireContext();
+
     new AsyncTask<Void, Void, Boolean>() {
       @Override
       protected void onPreExecute() {
@@ -298,7 +308,7 @@ public final class ContactSelectionListFragment extends    Fragment
       @Override
       protected Boolean doInBackground(Void... voids) {
         try {
-          DirectoryHelper.refreshDirectory(getContext(), false);
+          DirectoryHelper.refreshDirectory(context, false);
           return true;
         } catch (IOException e) {
           Log.w(TAG, e);
@@ -323,14 +333,48 @@ public final class ContactSelectionListFragment extends    Fragment
   private class ListClickListener implements ContactSelectionListAdapter.ItemClickListener {
     @Override
     public void onItemClick(ContactSelectionListItem contact) {
-      if (!isMulti() || !selectedContacts.contains(contact.getNumber())) {
-        selectedContacts.add(contact.getNumber());
-        contact.setChecked(true);
-        if (onContactSelectedListener != null) onContactSelectedListener.onContactSelected(contact.getNumber());
+      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(contact.getNumber());
+        selectedContacts.remove(selectedContact);
         contact.setChecked(false);
-        if (onContactSelectedListener != null) onContactSelectedListener.onContactDeselected(contact.getNumber());
+
+        if (onContactSelectedListener != null) {
+          onContactSelectedListener.onContactDeselected(contact.getRecipientId(), contact.getNumber());
+        }
       }
     }
   }
@@ -344,8 +388,8 @@ public final class ContactSelectionListFragment extends    Fragment
   }
 
   public interface OnContactSelectedListener {
-    void onContactSelected(String number);
-    void onContactDeselected(String number);
+    void onContactSelected(Optional<RecipientId> recipientId, String number);
+    void onContactDeselected(Optional<RecipientId> recipientId, String number);
   }
 
   public interface InviteCallback {

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

@@ -36,11 +36,11 @@ 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.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.database.RecipientDatabase;
 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;
@@ -382,6 +382,7 @@ public class CreateProfileActivity extends BaseActionBarActivity {
         }
 
         ApplicationDependencies.getJobManager().add(new MultiDeviceProfileKeyUpdateJob());
+        ApplicationDependencies.getJobManager().add(new MultiDeviceProfileContentUpdateJob());
 
         return true;
       }

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

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

@@ -20,6 +20,7 @@ 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;
@@ -177,7 +178,7 @@ public class DeviceActivity extends PassphraseRequiredActionBarActivity
 
         try {
           Context                     context          = DeviceActivity.this;
-          SignalServiceAccountManager accountManager   = AccountManagerFactory.createManager(context);
+          SignalServiceAccountManager accountManager   = ApplicationDependencies.getSignalServiceAccountManager();
           String                      verificationCode = accountManager.getNewDeviceVerificationCode();
           String                      ephemeralId      = uri.getQueryParameter("uuid");
           String                      publicKeyEncoded = uri.getQueryParameter("pub_key");

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

@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -13,7 +14,6 @@ import androidx.appcompat.app.AlertDialog;
 
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.devicelist.Device;
-import org.thoughtcrime.securesms.jobs.RefreshUnidentifiedDeliveryAbilityJob;
 import org.thoughtcrime.securesms.logging.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -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,
@@ -171,7 +172,6 @@ public class DeviceListFragment extends ListFragment
       protected Void doInBackground(Void... params) {
         try {
           accountManager.removeDevice(deviceId);
-          ApplicationDependencies.getJobManager().add(new RefreshUnidentifiedDeliveryAbilityJob());
         } catch (IOException e) {
           Log.w(TAG, e);
           Toast.makeText(getActivity(), R.string.DeviceListActivity_network_failed, Toast.LENGTH_LONG).show();

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

@@ -18,8 +18,12 @@ 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;
@@ -29,11 +33,17 @@ 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 {
+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,
@@ -86,8 +96,15 @@ public class ExperienceUpgradeActivity extends BaseActionBarActivity implements
                   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);
+                  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;
@@ -157,7 +174,7 @@ public class ExperienceUpgradeActivity extends BaseActionBarActivity implements
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    setStatusBarColor(getResources().getColor(R.color.signal_primary_dark));
+    dynamicTheme.onCreate(this);
 
     final Optional<ExperienceUpgrade> upgrade = getExperienceUpgrade(this);
     if (!upgrade.isPresent()) {
@@ -182,6 +199,12 @@ public class ExperienceUpgradeActivity extends BaseActionBarActivity implements
     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()
@@ -189,7 +212,8 @@ public class ExperienceUpgradeActivity extends BaseActionBarActivity implements
     TextSecurePreferences.setLastExperienceVersionCode(this, latestVersion);
     if (seenUpgrade.isPresent() && seenUpgrade.get().nextIntent != null) {
       Intent intent     = new Intent(this, seenUpgrade.get().nextIntent);
-      Intent nextIntent = new Intent(this, ConversationListActivity.class);
+      // TODO [greyson] Navigation
+      Intent nextIntent = new Intent(this, MainActivity.class);
       intent.putExtra("next_intent", nextIntent);
       startActivity(intent);
     } else {
@@ -231,29 +255,9 @@ public class ExperienceUpgradeActivity extends BaseActionBarActivity implements
     onContinue(Optional.of(ExperienceUpgrade.LINK_PREVIEWS));
   }
 
-  private final class OnPageChangeListener implements ViewPager.OnPageChangeListener {
-    private final ArgbEvaluator     evaluator = new ArgbEvaluator();
-    private final ExperienceUpgrade upgrade;
-
-    public OnPageChangeListener(ExperienceUpgrade upgrade) {
-      this.upgrade = upgrade;
-    }
-
-    @Override
-    public void onPageSelected(int position) {}
-
-    @Override
-    public void onPageScrollStateChanged(int state) {}
-
-    @Override
-    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-      final int nextPosition = (position + 1) % upgrade.getPages().size();
-
-      final int color = (Integer)evaluator.evaluate(positionOffset,
-                                                    upgrade.getPage(position).backgroundColor,
-                                                    upgrade.getPage(nextPosition).backgroundColor);
-      getWindow().setBackgroundDrawable(new ColorDrawable(color));
-    }
+  @Override
+  public void onStickersFinished() {
+    onContinue(Optional.of(ExperienceUpgrade.STICKERS));
   }
 
   public static class AppUpgradeReceiver extends BroadcastReceiver {

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

@@ -52,7 +52,6 @@ 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.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.GroupDatabase;
 import org.thoughtcrime.securesms.database.GroupDatabase.GroupRecord;
@@ -93,7 +92,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
 
   private final static String TAG = GroupCreateActivity.class.getSimpleName();
 
-  public static final String GROUP_ADDRESS_EXTRA = "group_recipient";
+  public static final String GROUP_ID_EXTRA      = "group_id";
   public static final String GROUP_THREAD_EXTRA  = "group_thread";
 
   private final DynamicTheme    dynamicTheme    = new DynamicTheme();
@@ -203,10 +202,10 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void initializeExistingGroup() {
-    final Address groupAddress = getIntent().getParcelableExtra(GROUP_ADDRESS_EXTRA);
+    final String groupId = getIntent().getStringExtra(GROUP_ID_EXTRA);
 
-    if (groupAddress != null) {
-      new FillExistingGroupInfoAsyncTask(this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, groupAddress.toGroupString());
+    if (groupId != null) {
+      new FillExistingGroupInfoAsyncTask(this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, groupId);
     }
   }
 
@@ -292,12 +291,13 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
 
     switch (reqCode) {
       case PICK_CONTACT:
-        List<String> selected = data.getStringArrayListExtra("contacts");
+        List<RecipientId> selected = data.getParcelableArrayListExtra(PushContactSelectionActivity.KEY_SELECTED_RECIPIENTS);
 
-        for (String contact : selected) {
-          Recipient recipient = Recipient.external(this, contact);
+        for (RecipientId contact : selected) {
+          Recipient recipient = Recipient.resolved(contact);
           addSelectedContacts(recipient);
         }
+
         break;
 
       case AvatarSelection.REQUEST_CODE_AVATAR:
@@ -458,7 +458,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
         if (!activity.isFinishing()) {
           Intent intent = activity.getIntent();
           intent.putExtra(GROUP_THREAD_EXTRA, result.get().getThreadId());
-          intent.putExtra(GROUP_ADDRESS_EXTRA, result.get().getGroupRecipient().requireAddress());
+          intent.putExtra(GROUP_ID_EXTRA, result.get().getGroupRecipient().requireGroupId());
           activity.setResult(RESULT_OK, intent);
           activity.finish();
         }
@@ -500,8 +500,8 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
 
         if (failIfNotPush && !isPush) {
           results.add(new Result(null, false, activity.getString(R.string.GroupCreateActivity_cannot_add_non_push_to_existing_group,
-                                                                 recipient.toShortString())));
-        } else if (TextUtils.equals(TextSecurePreferences.getLocalNumber(activity), recipient.requireAddress().serialize())) {
+                                                                 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));

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

@@ -10,6 +10,7 @@ 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;
@@ -32,7 +33,7 @@ public class GroupMembersDialog extends AsyncTask<Void, Void, List<Recipient>> {
 
   @Override
   protected List<Recipient> doInBackground(Void... params) {
-    return DatabaseFactory.getGroupDatabase(context).getGroupMembers(recipient.requireAddress().toGroupString(), true);
+    return DatabaseFactory.getGroupDatabase(context).getGroupMembers(recipient.requireGroupId(), true);
   }
 
   @Override
@@ -90,7 +91,7 @@ public class GroupMembersDialog extends AsyncTask<Void, Void, List<Recipient>> {
 
     public GroupMembers(List<Recipient> recipients) {
       for (Recipient recipient : recipients) {
-        if (isLocalNumber(recipient)) {
+        if (recipient.isLocalNumber()) {
           members.push(recipient);
         } else {
           members.add(recipient);
@@ -102,15 +103,10 @@ public class GroupMembersDialog extends AsyncTask<Void, Void, List<Recipient>> {
       List<String> recipientStrings = new LinkedList<>();
 
       for (Recipient recipient : members) {
-        if (isLocalNumber(recipient)) {
+        if (recipient.isLocalNumber()) {
           recipientStrings.add(context.getString(R.string.GroupMembersDialog_me));
         } else {
-          String name = recipient.toShortString();
-
-          if (recipient.getName() == null && !TextUtils.isEmpty(recipient.getProfileName())) {
-            name += " ~" + recipient.getProfileName();
-          }
-
+          String name = getRecipientName(recipient);
           recipientStrings.add(name);
         }
       }
@@ -118,12 +114,20 @@ public class GroupMembersDialog extends AsyncTask<Void, Void, List<Recipient>> {
       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);
     }
-
-    private boolean isLocalNumber(Recipient recipient) {
-      return Util.isOwnNumber(context, recipient.requireAddress());
-    }
   }
 }

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

@@ -5,16 +5,13 @@ import android.content.Context;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.thoughtcrime.securesms.database.Address;
 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.database.RecipientDatabase;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
-import org.thoughtcrime.securesms.jobs.DirectoryRefreshJob;
-import org.thoughtcrime.securesms.jobs.PushDecryptJob;
+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;
@@ -62,31 +59,24 @@ public class IncomingMessageProcessor {
   public class Processor implements Closeable {
 
     private final Context           context;
-    private final RecipientDatabase recipientDatabase;
     private final PushDatabase      pushDatabase;
     private final MmsSmsDatabase    mmsSmsDatabase;
     private final JobManager        jobManager;
 
     private Processor(@NonNull Context context) {
       this.context           = context;
-      this.recipientDatabase = DatabaseFactory.getRecipientDatabase(context);
       this.pushDatabase      = DatabaseFactory.getPushDatabase(context);
       this.mmsSmsDatabase    = DatabaseFactory.getMmsSmsDatabase(context);
       this.jobManager        = ApplicationDependencies.getJobManager();
     }
 
     /**
-     * @return The id of the {@link PushDecryptJob} that was scheduled to process the message, if
+     * @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 recipient = Recipient.external(context, envelope.getSource());
-
-        if (!isActiveNumber(recipient)) {
-          recipientDatabase.setRegistered(recipient.getId(), RecipientDatabase.RegisteredState.REGISTERED);
-          jobManager.add(new DirectoryRefreshJob(recipient, false));
-        }
+        Recipient.externalPush(context, envelope.getSourceAddress());
       }
 
       if (envelope.isReceipt()) {
@@ -103,8 +93,8 @@ public class IncomingMessageProcessor {
     private @NonNull String processMessage(@NonNull SignalServiceEnvelope envelope) {
       Log.i(TAG, "Received message. Inserting in PushDatabase.");
 
-      long           id  = pushDatabase.insert(envelope);
-      PushDecryptJob job = new PushDecryptJob(context, id);
+      long                  id  = pushDatabase.insert(envelope);
+      PushDecryptMessageJob job = new PushDecryptMessageJob(context, id);
 
       jobManager.add(job);
 
@@ -113,14 +103,10 @@ public class IncomingMessageProcessor {
 
     private void processReceipt(@NonNull SignalServiceEnvelope envelope) {
       Log.i(TAG, String.format(Locale.ENGLISH, "Received receipt: (XXXXX, %d)", envelope.getTimestamp()));
-      mmsSmsDatabase.incrementDeliveryReceiptCount(new SyncMessageId(Recipient.external(context, envelope.getSource()).getId(), envelope.getTimestamp()),
+      mmsSmsDatabase.incrementDeliveryReceiptCount(new SyncMessageId(Recipient.externalPush(context, envelope.getSourceAddress()).getId(), envelope.getTimestamp()),
                                                    System.currentTimeMillis());
     }
 
-    private boolean isActiveNumber(@NonNull Recipient recipient) {
-      return recipient.resolve().getRegistered() == RecipientDatabase.RegisteredState.REGISTERED;
-    }
-
     @Override
     public void close() {
       release();

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

@@ -1,43 +1,46 @@
 package org.thoughtcrime.securesms;
 
-import android.animation.Animator;
 import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
+import android.graphics.PorterDuff;
 import android.os.AsyncTask;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
+import android.os.Build;
 import android.os.Bundle;
-import androidx.annotation.AnimRes;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.content.ContextCompat;
-import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
-import androidx.appcompat.app.AlertDialog;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.view.ViewAnimationUtils;
 import android.view.ViewGroup;
-import android.view.ViewTreeObserver.OnPreDrawListener;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.ImageView;
 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;
 
@@ -49,7 +52,14 @@ public class InviteActivity extends PassphraseRequiredActionBarActivity implemen
   private Button                       smsSendButton;
   private Animation                    slideInAnimation;
   private Animation                    slideOutAnimation;
-  private ImageView                    heart;
+  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) {
@@ -63,9 +73,15 @@ public class InviteActivity extends PassphraseRequiredActionBarActivity implemen
     initializeResources();
   }
 
+  @Override
+  protected void onResume() {
+    super.onResume();
+    dynamicTheme.onResume(this);
+  }
+
   private void initializeAppBar() {
-    Toolbar toolbar = findViewById(R.id.toolbar);
-    setSupportActionBar(toolbar);
+    primaryToolbar = findViewById(R.id.toolbar);
+    setSupportActionBar(primaryToolbar);
 
     assert getSupportActionBar() != null;
 
@@ -85,22 +101,18 @@ public class InviteActivity extends PassphraseRequiredActionBarActivity implemen
     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);
-    heart             = ViewUtil.findById(this, R.id.heart);
     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();
 
-    if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
-      heart.getViewTreeObserver().addOnPreDrawListener(new HeartPreDrawListener());
-    }
     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_24);
+    contactFilter.setNavigationIcon(R.drawable.ic_search_conversation_24);
   }
 
   private Animation loadAnimation(@AnimRes int animResId) {
@@ -110,12 +122,12 @@ public class InviteActivity extends PassphraseRequiredActionBarActivity implemen
   }
 
   @Override
-  public void onContactSelected(String number) {
+  public void onContactSelected(Optional<RecipientId> recipientId, String number) {
     updateSmsButtonText();
   }
 
   @Override
-  public void onContactDeselected(String number) {
+  public void onContactDeselected(Optional<RecipientId> recipientId, String number) {
     updateSmsButtonText();
   }
 
@@ -123,7 +135,7 @@ public class InviteActivity extends PassphraseRequiredActionBarActivity implemen
     new SendSmsInvitesAsyncTask(this, inviteText.getText().toString())
         .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR,
                            contactsFragment.getSelectedContacts()
-                                           .toArray(new String[contactsFragment.getSelectedContacts().size()]));
+                                           .toArray(new SelectedContact[contactsFragment.getSelectedContacts().size()]));
   }
 
   private void updateSmsButtonText() {
@@ -142,11 +154,42 @@ public class InviteActivity extends PassphraseRequiredActionBarActivity implemen
   }
 
   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) {
@@ -165,6 +208,7 @@ public class InviteActivity extends PassphraseRequiredActionBarActivity implemen
   private class SmsClickListener implements OnClickListener {
     @Override
     public void onClick(View v) {
+      setPrimaryColorsToolbarForSms();
       ViewUtil.animateIn(smsSendFrame, slideInAnimation);
     }
   }
@@ -197,25 +241,8 @@ public class InviteActivity extends PassphraseRequiredActionBarActivity implemen
     }
   }
 
-  private class HeartPreDrawListener implements OnPreDrawListener {
-    @Override
-    @TargetApi(VERSION_CODES.LOLLIPOP)
-    public boolean onPreDraw() {
-      heart.getViewTreeObserver().removeOnPreDrawListener(this);
-      final int w = heart.getWidth();
-      final int h = heart.getHeight();
-      Animator reveal = ViewAnimationUtils.createCircularReveal(heart,
-                                                                w / 2, h,
-                                                                0, (float)Math.sqrt(h*h + (w*w/4)));
-      reveal.setInterpolator(new FastOutSlowInInterpolator());
-      reveal.setDuration(800);
-      reveal.start();
-      return false;
-    }
-  }
-
   @SuppressLint("StaticFieldLeak")
-  private class SendSmsInvitesAsyncTask extends ProgressDialogAsyncTask<String,Void,Void> {
+  private class SendSmsInvitesAsyncTask extends ProgressDialogAsyncTask<SelectedContact,Void,Void> {
     private final String message;
 
     SendSmsInvitesAsyncTask(Context context, String message) {
@@ -224,18 +251,19 @@ public class InviteActivity extends PassphraseRequiredActionBarActivity implemen
     }
 
     @Override
-    protected Void doInBackground(String... numbers) {
+    protected Void doInBackground(SelectedContact... contacts) {
       final Context context = getContext();
       if (context == null) return null;
 
-      for (String number : numbers) {
-        Recipient recipient      = Recipient.external(context, number);
-        int       subscriptionId = recipient.getDefaultSubscriptionId().or(-1);
+      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).setSeenInviteReminder(recipient.getId(), true);
+          DatabaseFactory.getRecipientDatabase(context).setHasSentInvite(recipient.getId());
         }
       }
 

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

@@ -52,11 +52,11 @@ 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.Address;
 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;
@@ -68,7 +68,6 @@ 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 org.thoughtcrime.securesms.util.Util;
 
 import java.util.HashMap;
 import java.util.Locale;
@@ -85,12 +84,16 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
 
   private final static String TAG = MediaPreviewActivity.class.getSimpleName();
 
-  public static final String RECIPIENT_EXTRA      = "recipient_id";
+  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 OUTGOING_EXTRA       = "outgoing";
   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;
@@ -103,12 +106,15 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
   private String                initialMediaType;
   private long                  initialMediaSize;
   private String                initialCaption;
-  private Recipient             conversationRecipient;
   private boolean               leftIsRecent;
   private MediaPreviewViewModel viewModel;
   private ViewPagerListener     viewPagerListener;
 
-  private int restartItem = -1;
+  private int                   restartItem      = -1;
+  private long                  threadId         = NOT_IN_A_THREAD;
+  private boolean               cameFromAllMedia;
+  private boolean               showThread;
+  private MediaDatabase.Sorting sorting;
 
   @SuppressWarnings("ConstantConditions")
   @Override
@@ -152,19 +158,45 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
     MediaItem mediaItem = getCurrentMediaItem();
 
     if (mediaItem != null) {
-      CharSequence relativeTimeSpan;
+      getSupportActionBar().setTitle(getTitleText(mediaItem));
+      getSupportActionBar().setSubtitle(getSubTitleText(mediaItem));
+    }
+  }
 
-      if (mediaItem.date > 0) {
-        relativeTimeSpan = DateUtils.getExtendedRelativeTimeSpanString(this, Locale.getDefault(), mediaItem.date);
-      } else {
-        relativeTimeSpan = getString(R.string.MediaPreviewActivity_draft);
+  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);
+        }
       }
 
-      if      (mediaItem.outgoing)          getSupportActionBar().setTitle(getString(R.string.MediaPreviewActivity_you));
-      else if (mediaItem.recipient != null) getSupportActionBar().setTitle(mediaItem.recipient.toShortString());
-      else                                  getSupportActionBar().setTitle("");
+      return to != null ? getString(R.string.MediaPreviewActivity_s_to_s, from, to)
+                        : from;
+    } else {
+      return from;
+    }
+  }
 
-      getSupportActionBar().setSubtitle(relativeTimeSpan);
+  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);
     }
   }
 
@@ -217,20 +249,19 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
   }
 
   private void initializeResources() {
-    RecipientId recipientId = getIntent().getParcelableExtra(RECIPIENT_EXTRA);
+    Intent intent = getIntent();
 
-    initialMediaUri  = getIntent().getData();
-    initialMediaType = getIntent().getType();
-    initialMediaSize = getIntent().getLongExtra(SIZE_EXTRA, 0);
-    initialCaption   = getIntent().getStringExtra(CAPTION_EXTRA);
-    leftIsRecent     = getIntent().getBooleanExtra(LEFT_IS_RECENT_EXTRA, false);
+    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;
-
-    if (recipientId != null) {
-      conversationRecipient = Recipient.live(recipientId).get();
-    } else {
-      conversationRecipient = null;
-    }
   }
 
   private void initializeObservers() {
@@ -239,6 +270,11 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
         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) {
@@ -275,7 +311,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
 
     Log.i(TAG, "Loading Part URI: " + initialMediaUri);
 
-    if (conversationRecipient != null) {
+    if (isMediaInDb()) {
       LoaderManager.getInstance(this).restartLoader(0, null, this);
     } else {
       mediaPager.setAdapter(new SingleItemPagerAdapter(getSupportFragmentManager(), initialMediaUri, initialMediaType, initialMediaSize));
@@ -298,9 +334,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
   }
 
   private void showOverview() {
-    Intent intent = new Intent(this, MediaOverviewActivity.class);
-    intent.putExtra(MediaOverviewActivity.RECIPIENT_EXTRA, conversationRecipient.getId());
-    startActivity(intent);
+    startActivity(MediaOverviewActivity.forThread(this, threadId));
   }
 
   private void forward() {
@@ -378,6 +412,10 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
       menu.findItem(R.id.delete).setVisible(false);
     }
 
+    if (cameFromAllMedia) {
+      menu.findItem(R.id.media_preview__overview).setVisible(false);
+    }
+
     return true;
   }
 
@@ -397,7 +435,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
   }
 
   private boolean isMediaInDb() {
-    return conversationRecipient != null;
+    return threadId != NOT_IN_A_THREAD;
   }
 
   private @Nullable MediaItem getCurrentMediaItem() {
@@ -416,7 +454,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
 
   @Override
   public @NonNull Loader<Pair<Cursor, Integer>> onCreateLoader(int id, Bundle args) {
-    return new PagingMediaLoader(this, conversationRecipient, initialMediaUri, leftIsRecent);
+    return new PagingMediaLoader(this, threadId, initialMediaUri, leftIsRecent, sorting);
   }
 
   @Override
@@ -427,14 +465,14 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
       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);
       }
-
-      Util.postToMain(() -> viewModel.setCursor(this, data.first, leftIsRecent));
     }
   }
 
@@ -546,7 +584,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
 
     @Override
     public MediaItem getMediaItemFor(int position) {
-      return new MediaItem(null, null, uri, mediaType, -1, true);
+      return new MediaItem(null, null, null, uri, mediaType, -1, true);
     }
 
     @Override
@@ -563,6 +601,11 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
       }
       return null;
     }
+
+    @Override
+    public boolean hasFragmentFor(int position) {
+      return mediaPreviewFragment != null;
+    }
   }
 
   private static void anchorMarginsToBottomInsets(@NonNull View viewToAnchor) {
@@ -675,12 +718,15 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
 
     public MediaItem getMediaItemFor(int position) {
       cursor.moveToPosition(getCursorPosition(position));
-      MediaRecord mediaRecord = MediaRecord.from(context, cursor);
-      RecipientId recipientId = mediaRecord.getRecipientId();
+
+      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(),
@@ -701,6 +747,11 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
       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;
@@ -709,6 +760,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
 
   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;
@@ -716,18 +768,20 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
     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.attachment = attachment;
-      this.uri        = uri;
-      this.type       = type;
-      this.date       = date;
-      this.outgoing   = outgoing;
+      this.recipient       = recipient;
+      this.threadRecipient = threadRecipient;
+      this.attachment      = attachment;
+      this.uri             = uri;
+      this.type            = type;
+      this.date            = date;
+      this.outgoing        = outgoing;
     }
   }
 
@@ -735,5 +789,6 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
     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

@@ -368,7 +368,7 @@ public class MessageDetailsActivity extends PassphraseRequiredActionBarActivity
         List<GroupReceiptInfo> receiptInfoList = DatabaseFactory.getGroupReceiptDatabase(context).getGroupReceiptInfo(messageRecord.getId());
 
         if (receiptInfoList.isEmpty()) {
-          List<Recipient> group = DatabaseFactory.getGroupDatabase(context).getGroupMembers(messageRecord.getRecipient().requireAddress().toGroupString(), false);
+          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));

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

@@ -11,7 +11,9 @@ 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;
@@ -19,11 +21,12 @@ 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 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,
@@ -34,6 +37,7 @@ class MessageDetailsRecipientAdapter extends BaseAdapter implements AbsListView.
     this.record        = record;
     this.isPushGroup   = isPushGroup;
     this.members       = members;
+    this.idGenerator   = new StableIdGenerator<>();
   }
 
   @Override
@@ -48,11 +52,7 @@ class MessageDetailsRecipientAdapter extends BaseAdapter implements AbsListView.
 
   @Override
   public long getItemId(int position) {
-    try {
-      return Conversions.byteArrayToLong(MessageDigest.getInstance("SHA1").digest(members.get(position).recipient.requireAddress().serialize().getBytes()));
-    } catch (NoSuchAlgorithmException e) {
-      throw new AssertionError(e);
-    }
+    return idGenerator.getId(members.get(position).recipient.getId());
   }
 
   @Override

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

@@ -34,6 +34,7 @@ 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;
@@ -166,7 +167,12 @@ public class MessageRecipientListItem extends RelativeLayout
 
   @Override
   public void onRecipientChanged(@NonNull Recipient recipient) {
-    fromView.setText(recipient);
-    contactPhotoImage.setAvatar(glideRequests, recipient, false);
+    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/NewConversationActivity.java

@@ -22,11 +22,29 @@ 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.
@@ -49,9 +67,18 @@ public class NewConversationActivity extends ContactSelectionActivity
   }
 
   @Override
-  public void onContactSelected(String number) {
-    Recipient recipient = Recipient.external(this, number);
+  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));

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

@@ -277,7 +277,7 @@ public class PassphrasePromptActivity extends PassphraseActivity {
       fingerprintManager.authenticate(null, 0, fingerprintCancellationSignal, fingerprintListener, null);
     } else if (Build.VERSION.SDK_INT >= 21){
       Log.i(TAG, "firing intent...");
-      Intent intent = keyguardManager.createConfirmDeviceCredentialIntent("Unlock Signal", "");
+      Intent intent = keyguardManager.createConfirmDeviceCredentialIntent(getString(R.string.PassphrasePromptActivity_unlock_signal), "");
       startActivityForResult(intent, 1);
     } else {
       Log.w(TAG, "Not compatible...");

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

@@ -41,6 +41,7 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
 
   @Override
   protected final void onCreate(Bundle savedInstanceState) {
+    Log.d(TAG, "[" + Log.tag(getClass()) + "] onCreate()");
     this.networkAccess = new SignalServiceNetworkAccess(this);
     onPreCreate();
 
@@ -60,7 +61,7 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
 
   @Override
   protected void onResume() {
-    Log.i(TAG, "onResume()");
+    Log.d(TAG, "[" + Log.tag(getClass()) + "] onResume()");
     super.onResume();
 
     if (networkAccess.isCensored(this)) {
@@ -68,22 +69,34 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
     }
   }
 
+  @Override
+  protected void onStart() {
+    Log.d(TAG, "[" + Log.tag(getClass()) + "] onStart()");
+    super.onStart();
+  }
+
   @Override
   protected void onPause() {
-    Log.i(TAG, "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.i(TAG, "onDestroy()");
+    Log.d(TAG, "[" + Log.tag(getClass()) + "] onDestroy()");
     super.onDestroy();
     removeClearKeyReceiver(this);
   }
 
   @Override
   public void onMasterSecretCleared() {
-    Log.i(TAG, "onMasterSecretCleared()");
+    Log.d(TAG, "onMasterSecretCleared()");
     if (ApplicationContext.getInstance(this).isAppVisible()) routeApplicationState(true);
     else                                                     finish();
   }
@@ -129,7 +142,7 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
   }
 
   private Intent getIntentForState(int state) {
-    Log.i(TAG, "routeApplicationState(), state: " + state);
+    Log.d(TAG, "routeApplicationState(), state: " + state);
 
     switch (state) {
       case STATE_CREATE_PASSPHRASE:   return getCreatePassphraseIntent();
@@ -187,11 +200,11 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
   }
 
   private Intent getConversationListIntent() {
-    return new Intent(this, ConversationListActivity.class);
+    // TODO [greyson] Navigation
+    return new Intent(this, MainActivity.class);
   }
 
   private void initializeClearKeyReceiver() {
-    Log.i(TAG, "initializeClearKeyReceiver()");
     this.clearKeyReceiver = new BroadcastReceiver() {
       @Override
       public void onReceive(Context context, Intent intent) {

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

@@ -19,6 +19,11 @@ package org.thoughtcrime.securesms;
 import android.content.Intent;
 import android.os.Bundle;
 
+import com.annimon.stream.Stream;
+
+import org.thoughtcrime.securesms.contacts.SelectedContact;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -30,6 +35,8 @@ import java.util.List;
  */
 public class PushContactSelectionActivity extends ContactSelectionActivity {
 
+  public static final String KEY_SELECTED_RECIPIENTS = "recipients";
+
   @SuppressWarnings("unused")
   private final static String TAG = PushContactSelectionActivity.class.getSimpleName();
 
@@ -40,12 +47,11 @@ public class PushContactSelectionActivity extends ContactSelectionActivity {
 
     getToolbar().setNavigationIcon(R.drawable.ic_check_24);
     getToolbar().setNavigationOnClickListener(v -> {
-      Intent resultIntent = getIntent();
-      List<String> selectedContacts = contactsFragment.getSelectedContacts();
+      Intent                resultIntent     = getIntent();
+      List<SelectedContact> selectedContacts = contactsFragment.getSelectedContacts();
+      List<RecipientId>     recipients       = Stream.of(selectedContacts).map(sc -> sc.getOrCreateRecipientId(this)).toList();
 
-      if (selectedContacts != null) {
-        resultIntent.putStringArrayListExtra("contacts", new ArrayList<>(selectedContacts));
-      }
+      resultIntent.putParcelableArrayListExtra(KEY_SELECTED_RECIPIENTS, new ArrayList<>(recipients));
 
       setResult(RESULT_OK, resultIntent);
       finish();

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

@@ -13,58 +13,55 @@ import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
+import android.telephony.PhoneNumberUtils;
+import android.util.Pair;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.ImageView;
+import android.widget.TextView;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import com.google.android.material.appbar.CollapsingToolbarLayout;
-
-import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
-import androidx.core.view.ViewCompat;
-import androidx.appcompat.app.AlertDialog;
 import androidx.preference.CheckBoxPreference;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
-import androidx.appcompat.widget.Toolbar;
-import android.telephony.PhoneNumberUtils;
+import androidx.recyclerview.widget.RecyclerView;
 
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.google.android.material.appbar.CollapsingToolbarLayout;
+
+import org.thoughtcrime.securesms.color.MaterialColor;
+import org.thoughtcrime.securesms.color.MaterialColors;
 import org.thoughtcrime.securesms.components.SwitchPreferenceCompat;
+import org.thoughtcrime.securesms.components.ThreadPhotoRailView;
 import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
-import org.thoughtcrime.securesms.database.GroupDatabase;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobs.RotateProfileKeyJob;
-import org.thoughtcrime.securesms.logging.Log;
-import android.util.Pair;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-
-import org.thoughtcrime.securesms.color.MaterialColor;
-import org.thoughtcrime.securesms.color.MaterialColors;
-import org.thoughtcrime.securesms.components.ThreadPhotoRailView;
 import org.thoughtcrime.securesms.crypto.IdentityKeyParcelable;
-import org.thoughtcrime.securesms.database.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.IdentityDatabase;
 import org.thoughtcrime.securesms.database.IdentityDatabase.IdentityRecord;
+import org.thoughtcrime.securesms.database.MediaDatabase;
 import org.thoughtcrime.securesms.database.RecipientDatabase;
 import org.thoughtcrime.securesms.database.RecipientDatabase.VibrateState;
-import org.thoughtcrime.securesms.database.loaders.ThreadMediaLoader;
-import org.thoughtcrime.securesms.jobs.MultiDeviceBlockedUpdateJob;
+import org.thoughtcrime.securesms.database.loaders.RecipientMediaLoader;
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.mediaoverview.MediaOverviewActivity;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.GlideRequests;
-import org.thoughtcrime.securesms.mms.OutgoingGroupMediaMessage;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.preferences.CorrectedPreferenceFragment;
@@ -73,18 +70,20 @@ import org.thoughtcrime.securesms.preferences.widgets.ContactPreference;
 import org.thoughtcrime.securesms.recipients.LiveRecipient;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.sms.MessageSender;
+import org.thoughtcrime.securesms.recipients.RecipientUtil;
 import org.thoughtcrime.securesms.util.CommunicationActions;
 import org.thoughtcrime.securesms.util.Dialogs;
 import org.thoughtcrime.securesms.util.DynamicDarkToolbarTheme;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
-import org.thoughtcrime.securesms.util.GroupUtil;
+import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.IdentityUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
+import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
+import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
 import org.whispersystems.libsignal.util.guava.Optional;
 
 import java.util.concurrent.ExecutionException;
@@ -182,8 +181,7 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
 
     this.threadPhotoRailView.setListener(mediaRecord -> {
       Intent intent = new Intent(RecipientPreferenceActivity.this, MediaPreviewActivity.class);
-      intent.putExtra(MediaPreviewActivity.RECIPIENT_EXTRA, recipientId);
-      intent.putExtra(MediaPreviewActivity.OUTGOING_EXTRA, mediaRecord.isOutgoing());
+      intent.putExtra(MediaPreviewActivity.THREAD_ID_EXTRA, mediaRecord.getThreadId());
       intent.putExtra(MediaPreviewActivity.DATE_EXTRA, mediaRecord.getDate());
       intent.putExtra(MediaPreviewActivity.SIZE_EXTRA, mediaRecord.getAttachment().getSize());
       intent.putExtra(MediaPreviewActivity.CAPTION_EXTRA, mediaRecord.getAttachment().getCaption());
@@ -192,11 +190,16 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
       startActivity(intent);
     });
 
-    this.threadPhotoRailLabel.setOnClickListener(v -> {
-      Intent intent = new Intent(this, MediaOverviewActivity.class);
-      intent.putExtra(MediaOverviewActivity.RECIPIENT_EXTRA, recipientId);
-      startActivity(intent);
-    });
+    SimpleTask.run(
+      () -> DatabaseFactory.getThreadDatabase(this).getThreadIdFor(recipientId),
+      (threadId) -> {
+        if (threadId == null) {
+          Log.i(TAG, "No thread id for recipient.");
+        } else {
+          this.threadPhotoRailLabel.setOnClickListener(v -> startActivity(MediaOverviewActivity.forThread(this, threadId)));
+        }
+      }
+    );
 
     Toolbar toolbar = ViewUtil.findById(this, R.id.toolbar);
     setSupportActionBar(toolbar);
@@ -206,6 +209,11 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
       getWindow().setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS, WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
       getWindow().setStatusBarColor(Color.TRANSPARENT);
+
+      ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.recipient_preference_root), (v, insets) -> {
+        ViewUtil.setTopMargin(toolbar, insets.getSystemWindowInsetTop());
+        return insets;
+      });
     }
   }
 
@@ -225,13 +233,13 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
     else                      this.avatar.setScaleType(ImageView.ScaleType.CENTER_CROP);
 
     this.avatar.setBackgroundColor(recipient.getColor().toActionBarColor(this));
-    this.toolbarLayout.setTitle(recipient.toShortString());
+    this.toolbarLayout.setTitle(recipient.toShortString(this));
     this.toolbarLayout.setContentScrimColor(recipient.getColor().toActionBarColor(this));
   }
 
   @Override
   public @NonNull Loader<Cursor> onCreateLoader(int id, Bundle args) {
-    return new ThreadMediaLoader(this, recipientId, true);
+    return new RecipientMediaLoader(this, recipientId, RecipientMediaLoader.MediaType.GALLERY, MediaDatabase.Sorting.Newest);
   }
 
   @Override
@@ -353,6 +361,14 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
       }
     }
 
+    @Override
+    public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) {
+      RecyclerView recyclerView = super.onCreateRecyclerView(inflater, parent, savedInstanceState);
+      recyclerView.setItemAnimator(null);
+      recyclerView.setLayoutAnimation(null);
+      return recyclerView;
+    }
+
     private void initializeRecipients() {
       this.recipient = Recipient.live(getArguments().getParcelable(RECIPIENT_ID));
       this.recipient.observe(this, this::setSummaries);
@@ -389,6 +405,10 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
       vibrateCallPreference.setSummary(vibrateCallSummary.first);
       vibrateCallPreference.setValueIndex(vibrateCallSummary.second);
 
+      blockPreference.setVisible(RecipientUtil.isBlockable(recipient));
+      if (recipient.isBlocked()) blockPreference.setTitle(R.string.RecipientPreferenceActivity_unblock);
+      else                       blockPreference.setTitle(R.string.RecipientPreferenceActivity_block);
+
       if (recipient.isLocalNumber()) {
         mutePreference.setVisible(false);
         customPreference.setVisible(false);
@@ -401,7 +421,9 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
         if (privacyCategory    != null) privacyCategory.setVisible(false);
         if (divider            != null) divider.setVisible(false);
         if (callCategory       != null) callCategory.setVisible(false);
-      } if (recipient.isGroup()) {
+      }
+
+      if (recipient.isGroup()) {
         if (colorPreference    != null) colorPreference.setVisible(false);
         if (identityPreference != null) identityPreference.setVisible(false);
         if (callCategory       != null) callCategory.setVisible(false);
@@ -409,16 +431,19 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
         if (aboutDivider       != null) aboutDivider.setVisible(false);
         if (divider            != null) divider.setVisible(false);
       } else {
-        colorPreference.setColors(MaterialColors.CONVERSATION_PALETTE.asConversationColorArray(getActivity()));
-        colorPreference.setColor(recipient.getColor().toActionBarColor(getActivity()));
+        colorPreference.setColors(MaterialColors.CONVERSATION_PALETTE.asConversationColorArray(requireActivity()));
+        colorPreference.setColor(recipient.getColor().toActionBarColor(requireActivity()));
+
+        if (FeatureFlags.PROFILE_DISPLAY) {
+          aboutPreference.setTitle(recipient.getDisplayName(requireContext()));
+          aboutPreference.setSummary(recipient.resolve().getE164().or(""));
+        } else {
+          aboutPreference.setTitle(formatRecipient(recipient));
+          aboutPreference.setSummary(recipient.getCustomLabel());
+        }
 
-        aboutPreference.setTitle(formatAddress(recipient.requireAddress()));
-        aboutPreference.setSummary(recipient.getCustomLabel());
         aboutPreference.setSecure(recipient.getRegistered() == RecipientDatabase.RegisteredState.REGISTERED);
 
-        if (recipient.isBlocked()) blockPreference.setTitle(R.string.RecipientPreferenceActivity_unblock);
-        else                       blockPreference.setTitle(R.string.RecipientPreferenceActivity_block);
-
         IdentityUtil.getRemoteIdentityKey(getActivity(), recipient).addListener(new ListenableFuture.Listener<Optional<IdentityRecord>>() {
           @Override
           public void onSuccess(Optional<IdentityRecord> result) {
@@ -439,12 +464,16 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
           }
         });
       }
+
+      if (recipient.isMmsGroup() && privacyCategory != null) {
+        privacyCategory.setVisible(false);
+      }
     }
 
-    private @NonNull String formatAddress(@NonNull Address address) {
-      if      (address.isPhone()) return PhoneNumberUtils.formatNumber(address.toPhoneString());
-      else if (address.isEmail()) return address.toEmailString();
-      else                        return "";
+    private @NonNull String formatRecipient(@NonNull Recipient recipient) {
+      if      (recipient.getE164().isPresent())  return PhoneNumberUtils.formatNumber(recipient.requireE164());
+      else if (recipient.getEmail().isPresent()) return recipient.requireEmail();
+      else                                       return "";
     }
 
     private @NonNull String getRingtoneSummary(@NonNull Context context, @Nullable Uri ringtone) {
@@ -685,7 +714,7 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
             if (recipient.get().isGroup()) {
               bodyRes = R.string.RecipientPreferenceActivity_block_and_leave_group_description;
 
-              if (recipient.get().isGroup() && DatabaseFactory.getGroupDatabase(context).isActive(recipient.get().requireAddress().toGroupString())) {
+              if (recipient.get().isGroup() && DatabaseFactory.getGroupDatabase(context).isActive(recipient.get().requireGroupId())) {
                 titleRes = R.string.RecipientPreferenceActivity_block_and_leave_group;
               } else {
                 titleRes = R.string.RecipientPreferenceActivity_block_group;
@@ -727,38 +756,13 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
       }
 
       private void setBlocked(@NonNull final Context context, final Recipient recipient, final boolean blocked) {
-        new AsyncTask<Void, Void, Void>() {
-          @Override
-          protected Void doInBackground(Void... params) {
-            DatabaseFactory.getRecipientDatabase(context)
-                           .setBlocked(recipient.getId(), blocked);
-
-            if (recipient.isGroup() && DatabaseFactory.getGroupDatabase(context).isActive(recipient.requireAddress().toGroupString())) {
-              long                                threadId     = DatabaseFactory.getThreadDatabase(context).getThreadIdFor(recipient);
-              Optional<OutgoingGroupMediaMessage> leaveMessage = GroupUtil.createGroupLeaveMessage(context, recipient);
-
-              if (threadId != -1 && leaveMessage.isPresent()) {
-                MessageSender.send(context, leaveMessage.get(), threadId, false, null);
-
-                GroupDatabase groupDatabase = DatabaseFactory.getGroupDatabase(context);
-                String        groupId       = recipient.requireAddress().toGroupString();
-                groupDatabase.setActive(groupId, false);
-                groupDatabase.remove(groupId, Recipient.self().getId());
-              } else {
-                Log.w(TAG, "Failed to leave group. Can't block.");
-                Toast.makeText(context, R.string.RecipientPreferenceActivity_error_leaving_group, Toast.LENGTH_LONG).show();
-              }
-            }
-
-            if (blocked && (recipient.resolve().isSystemContact() || recipient.resolve().isProfileSharing())) {
-              ApplicationDependencies.getJobManager().add(new RotateProfileKeyJob());
-            }
-
-            ApplicationDependencies.getJobManager().add(new MultiDeviceBlockedUpdateJob());
-
-            return null;
+        SignalExecutors.BOUNDED.execute(() -> {
+          if (blocked) {
+            RecipientUtil.block(context, recipient);
+          } else {
+            RecipientUtil.unblock(context, recipient);
           }
-        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+        });
       }
     }
 
@@ -774,11 +778,16 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
         CommunicationActions.startVoiceCall(getActivity(), recipient.get());
       }
 
+      @Override
+      public void onSecureVideoClicked() {
+        CommunicationActions.startVideoCall(getActivity(), recipient.get());
+      }
+
       @Override
       public void onInSecureCallClicked() {
         try {
           Intent dialIntent = new Intent(Intent.ACTION_DIAL,
-                                         Uri.parse("tel:" + recipient.get().requireAddress().serialize()));
+                                         Uri.parse("tel:" + recipient.get().requireE164()));
           startActivity(dialIntent);
         } catch (ActivityNotFoundException anfe) {
           Log.w(TAG, anfe);

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

@@ -56,6 +56,7 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
 import org.whispersystems.libsignal.util.Pair;
+import org.whispersystems.libsignal.util.guava.Optional;
 
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -96,10 +97,13 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
   @Override
   protected void onCreate(Bundle icicle, boolean ready) {
     if (!getIntent().hasExtra(ContactSelectionListFragment.DISPLAY_MODE)) {
-      getIntent().putExtra(ContactSelectionListFragment.DISPLAY_MODE,
-                           TextSecurePreferences.isSmsEnabled(this)
-                               ? DisplayMode.FLAG_ALL
-                               : DisplayMode.FLAG_PUSH | DisplayMode.FLAG_GROUPS);
+      int mode = DisplayMode.FLAG_PUSH | DisplayMode.FLAG_ACTIVE_GROUPS;
+
+      if (TextSecurePreferences.isSmsEnabled(this))  {
+        mode |= DisplayMode.FLAG_SMS;
+
+      }
+      getIntent().putExtra(ContactSelectionListFragment.DISPLAY_MODE, mode);
     }
 
     getIntent().putExtra(ContactSelectionListFragment.REFRESHABLE, false);
@@ -272,19 +276,25 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
   }
 
   @Override
-  public void onContactSelected(String number) {
+  public void onContactSelected(Optional<RecipientId> recipientId, String number) {
     SimpleTask.run(this.getLifecycle(), () -> {
-      Recipient recipient = Recipient.external(this, 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);
+      }
+
       long existingThread = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(recipient);
       return new Pair<>(existingThread, recipient);
     }, result -> {
       createConversation(result.first(), result.second().getId(), ThreadDatabase.DistributionTypes.DEFAULT);
     });
-
   }
 
   @Override
-  public void onContactDeselected(String number) {
+  public void onContactDeselected(@NonNull Optional<RecipientId> recipientId, String number) {
 
   }
 

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

@@ -33,14 +33,16 @@ public class ShortcutLauncherActivity extends AppCompatActivity {
 
     if (rawId == null) {
       Toast.makeText(this, R.string.ShortcutLauncherActivity_invalid_shortcut, Toast.LENGTH_SHORT).show();
-      startActivity(new Intent(this, ConversationListActivity.class));
+      // TODO [greyson] Navigation
+      startActivity(new Intent(this, MainActivity.class));
       finish();
       return;
     }
 
     Recipient        recipient = Recipient.live(RecipientId.from(rawId)).get();
+    // TODO [greyson] Navigation
     TaskStackBuilder backStack = TaskStackBuilder.create(this)
-                                                 .addNextIntent(new Intent(this, ConversationListActivity.class));
+                                                 .addNextIntent(new Intent(this, MainActivity.class));
 
     CommunicationActions.startConversation(this, recipient, null, backStack);
     finish();

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

@@ -12,7 +12,6 @@ import org.thoughtcrime.securesms.conversation.ConversationActivity;
 import org.thoughtcrime.securesms.logging.Log;
 import android.widget.Toast;
 
-import org.thoughtcrime.securesms.database.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.Rfc5724Uri;