Bump version to 4.65.0

This helps fast phones process messages faster by reducing contention on
the database while processing a large batch of messages.

.github/workflows/android.yml

@@ -14,11 +14,17 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
+
     - name: set up JDK 1.8
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
+
+    - name: Install NDK
+      run: echo "y" | sudo /usr/local/lib/android/sdk/tools/bin/sdkmanager --install "ndk;20.0.5594570" --sdk_root=${ANDROID_SDK_ROOT}
+
     - name: Validate Gradle Wrapper
       uses: gradle/wrapper-validation-action@v1
+
     - name: Build with Gradle
       run: ./gradlew qa

README.md

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

app/build.gradle

@@ -15,7 +15,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.6.3'
         classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.1.0'
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.10'
     }
@@ -80,8 +80,8 @@ protobuf {
     }
 }
 
-def canonicalVersionCode = 616
-def canonicalVersionName = "4.58.2"
+def canonicalVersionCode = 665
+def canonicalVersionName = "4.65.0"
 
 def postFixSize = 10
 def abiPostFix = ['universal'   : 0,
@@ -115,17 +115,18 @@ android {
         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_CDN2_URL", "\"https://cdn2.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", "SIGNAL_AGENT", "\"OWA\""
-        buildConfigField "String", "MRENCLAVE", "\"cd6cfc342937b23b1bdd3bbf9721aa5615ac9ff50a75c5527d441cd3276826c9\""
-        buildConfigField "String", "KEY_BACKUP_ENCLAVE_NAME", "\"fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe\""
-        buildConfigField "String", "KEY_BACKUP_MRENCLAVE", "\"a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87\""
+        buildConfigField "String", "CDS_MRENCLAVE", "\"cd6cfc342937b23b1bdd3bbf9721aa5615ac9ff50a75c5527d441cd3276826c9\""
+        buildConfigField "String", "KBS_ENCLAVE_NAME", "\"fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe\""
+        buildConfigField "String", "KBS_MRENCLAVE", "\"a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87\""
         buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF\""
-        buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"\""
+        buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"AMhf5ywVwITZMsff/eCyudZx9JDmkkkbV6PInzG4p8x3VqVJSFiMvnvlEKWuRob/1eaIetR31IYeAbm0NdOuHH8Qi+Rexi1wLlpzIo1gstHWBfZzy1+qHRV5A4TqPp15YzBPm0WSggW6PbSn+F4lf57VCnHF7p8SvzAA2ZZJPYJURt8X7bbg+H3i+PEjH9DXItNEqs2sNcug37xZQDLm7X0=\""
         buildConfigField "String[]", "LANGUAGES", "new String[]{\"" + autoResConfig().collect { s -> s.replace('-r', '_') }.join('", "') + '"}'
         buildConfigField "int", "CANONICAL_VERSION_CODE", "$canonicalVersionCode"
 
@@ -160,7 +161,6 @@ android {
         exclude 'META-INF/LICENSE'
         exclude 'META-INF/NOTICE'
         exclude 'META-INF/proguard/androidx-annotations.pro'
-        exclude 'lib/*/libzkgroup.so' // TODO: GV2 Remove line to include .so when used
     }
 
     buildTypes {
@@ -194,12 +194,13 @@ android {
             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_CDN2_URL", "\"https://cdn2-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", "\"a1e9c1d3f352b5c4f0fc7a421b98119e60e5ff703c28fbea85c66bfa7306deab\""
+            buildConfigField "String", "CDS_MRENCLAVE", "\"ba4ebb438bc07713819ee6c98d94037747006d7df63fc9e44d2d6f1fec962a79\""
+            buildConfigField "String", "KBS_ENCLAVE_NAME", "\"823a3b2c037ff0cbe305cc48928cfcc97c9ed4a8ca6d49af6f7d6981fb60a4e9\""
             buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx\""
-            buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"\""
+            buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdls=\""
         }
         flipper {
             initWith debug
@@ -253,9 +254,13 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.1.0-beta01'
+    lintChecks project(':lintchecks')
+
+    implementation('androidx.appcompat:appcompat:1.1.0-beta01') {
+        force = true
+    }
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.google.android.material:material:1.1.0'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.preference:preference:1.0.0'
@@ -273,8 +278,13 @@ dependencies {
     implementation "androidx.camera:camera-camera2:1.0.0-beta01"
     implementation "androidx.camera:camera-lifecycle:1.0.0-beta01"
     implementation "androidx.concurrent:concurrent-futures:1.0.0"
+    implementation "androidx.autofill:autofill:1.0.0"
+    implementation "androidx.paging:paging-common:2.1.2"
+    implementation "androidx.paging:paging-runtime:2.1.2"
+    implementation 'com.google.firebase:firebase-ml-vision:24.0.3'
+    implementation 'com.google.firebase:firebase-ml-vision-face-model:20.0.1'
 
-    implementation('com.google.firebase:firebase-messaging:17.3.4') {
+    implementation ('com.google.firebase:firebase-messaging:20.2.0') {
         exclude group: 'com.google.firebase', module: 'firebase-core'
         exclude group: 'com.google.firebase', module: 'firebase-analytics'
         exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
@@ -290,11 +300,11 @@ dependencies {
     implementation 'org.signal:aesgcmprovider:0.0.3'
 
     implementation project(':libsignal-service')
-    implementation 'org.signal:zkgroup-android:0.4.1'
+    implementation 'org.signal:zkgroup-android:0.7.0'
 
     implementation 'org.signal:argon2:13.1@aar'
 
-    implementation 'org.signal:ringrtc-android:1.2.0'
+    implementation 'org.signal:ringrtc-android:2.2.0'
 
     implementation "me.leolin:ShortcutBadger:1.1.16"
     implementation 'se.emilsjolander:stickylistheaders:2.7.0'
@@ -341,6 +351,7 @@ dependencies {
         exclude group: 'com.fasterxml.jackson.core'
         exclude group: 'org.freemarker'
     }
+    implementation 'dnsjava:dnsjava:2.1.9'
 
     flipperImplementation 'com.facebook.flipper:flipper:0.32.2'
     flipperImplementation 'com.facebook.soloader:soloader:0.8.2'

app/lint.xml

@@ -6,10 +6,13 @@
     <issue id="StringFormatMatches" severity="error" />
 
     <!-- L10N warnings -->
-    <issue id="MissingTranslation" severity="warning" />
+    <issue id="MissingTranslation" severity="ignore" />
     <issue id="MissingQuantity" severity="warning" />
     <issue id="ExtraTranslation" severity="warning" />
     <issue id="ImpliedQuantity" severity="warning" />
+    <issue id="TypographyDashes" severity="error" >
+        <ignore path="*/res/values-*" /> <!-- Ignore for non-English -->
+    </issue>
 
     <issue id="CanvasSize" severity="error" />
     <issue id="HardcodedText" severity="error" />
@@ -17,9 +20,17 @@
     <issue id="ButtonOrder" severity="error" />
     <issue id="ExtraTranslation" severity="warning" />
 
+    <!-- Custom lints -->
+    <issue id="LogNotSignal" severity="error" />
+    <issue id="LogNotAppSignal" severity="error" />
+    <issue id="LogTagInlined" severity="error" />
+
     <issue id="RestrictedApi" severity="error">
         <ignore path="*/org/thoughtcrime/securesms/mediasend/camerax/VideoCapture.java" />
         <ignore path="*/org/thoughtcrime/securesms/mediasend/camerax/CameraXModule.java" />
+        <ignore path="*/org/thoughtcrime/securesms/conversation/*.java" />
+        <ignore path="*/org/thoughtcrime/securesms/lock/v2/CreateKbsPinViewModel.java" />
+        <ignore path="*/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java" />
     </issue>
 
 </lint>

app/sampledata/contacts.json

@@ -0,0 +1,29 @@
+{
+  "data": [
+    {
+      "name": "Ottttooooooooo Ocataaaaaaaavius",
+      "number": "+1 (555) 555-5555",
+      "label": "Mobile"
+    },
+    {
+      "name": "Victor Von Doom Phd",
+      "number": "+1 (555) 123-4567",
+      "label": "Home"
+    },
+    {
+      "name": "Flash Thompson",
+      "number": "+1 (555) 435-1261",
+      "label": "Work"
+    },
+    {
+      "name": "Dr. Curtis Connors",
+      "number": "+1 (555) 992-1567",
+      "label": "Mobile"
+    },
+    {
+      "name": "Billy Russo",
+      "number": "+1 (555) 234-1516",
+      "label": "Mobile"
+    }
+  ]
+}

app/src/main/AndroidManifest.xml

@@ -117,7 +117,9 @@
               android:theme="@style/TextSecure.LightTheme.WebRTCCall"
               android:excludeFromRecents="true"
               android:screenOrientation="portrait"
-              android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|screenSize|fontScale"
+              android:supportsPictureInPicture="true"
+              android:windowSoftInputMode="stateAlwaysHidden"
+              android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
               android:launchMode="singleTask"/>
 
     <activity android:name=".InviteActivity"
@@ -149,7 +151,7 @@
                android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".sharing.ShareActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:excludeFromRecents="true"
               android:launchMode="singleTask"
               android:taskAffinity=""
@@ -182,7 +184,7 @@
     </activity>
 
     <activity android:name=".stickers.StickerPackPreviewActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:launchMode="singleTask"
               android:noHistory="true"
               android:windowSoftInputMode="stateHidden"
@@ -241,15 +243,23 @@
               android:theme="@style/TextSecure.LightTheme.Popup"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
 
-    <activity android:name=".MessageDetailsActivity"
+    <activity android:name=".messagedetails.MessageDetailsActivity"
               android:label="@string/AndroidManifest__message_details"
               android:windowSoftInputMode="stateHidden"
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".GroupCreateActivity"
-          android:windowSoftInputMode="stateVisible"
-          android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+    <activity android:name=".groups.ui.pendingmemberinvites.PendingMemberInvitesActivity"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
+
+    <activity android:name=".groups.ui.managegroup.ManageGroupActivity"
+              android:windowSoftInputMode="stateAlwaysHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
+    <activity android:name=".recipients.ui.managerecipient.ManageRecipientActivity"
+              android:windowSoftInputMode="stateAlwaysHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".DatabaseMigrationActivity"
               android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar"
@@ -264,7 +274,7 @@
       <activity android:name=".PassphraseCreateActivity"
               android:label="@string/AndroidManifest__create_passphrase"
               android:windowSoftInputMode="stateUnchanged"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -274,7 +284,7 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".NewConversationActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:windowSoftInputMode="stateAlwaysVisible"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -284,7 +294,7 @@
           android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".giph.ui.GiphyActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:windowSoftInputMode="stateHidden"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -337,14 +347,19 @@
               android:windowSoftInputMode="stateHidden"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-        <activity android:name=".MediaPreviewActivity"
+    <activity android:name=".MediaPreviewActivity"
               android:label="@string/AndroidManifest__media_preview"
               android:windowSoftInputMode="stateHidden"
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
+    <activity android:name=".AvatarPreviewActivity"
+              android:label="@string/AndroidManifest__media_preview"
+              android:windowSoftInputMode="stateHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
     <activity android:name=".mediaoverview.MediaOverviewActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:windowSoftInputMode="stateHidden"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -395,10 +410,6 @@
 
     </activity>
 
-    <activity android:name=".RecipientPreferenceActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
     <activity android:name=".mediasend.AvatarSelectionActivity"
               android:theme="@style/TextSecure.FullScreenMedia"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
@@ -412,9 +423,8 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".profiles.edit.EditProfileActivity"
-            android:theme="@style/TextSecure.LightRegistrationTheme"
-            android:windowSoftInputMode="stateVisible"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+              android:theme="@style/TextSecure.LightRegistrationTheme"
+              android:windowSoftInputMode="stateVisible|adjustResize" />
 
     <activity android:name=".lock.v2.CreateKbsPinActivity"
             android:theme="@style/TextSecure.LightRegistrationTheme"
@@ -448,33 +458,49 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".contactshare.ContactNameEditActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".contactshare.SharedContactDetailsActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".ShortcutLauncherActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:exported="true"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity
             android:name=".maps.PlacePickerActivity"
             android:label="@string/PlacePickerActivity_title"
-            android:theme="@style/TextSecure.LightNoActionBar"
+            android:theme="@style/Theme.Signal.DayNight.NoActionBar"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".MainActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
 
+    <activity android:name=".pin.PinRestoreActivity"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
+
+    <activity android:name=".groups.ui.creategroup.CreateGroupActivity"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
+
+    <activity android:name=".groups.ui.addtogroup.AddToGroupsActivity"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
+
+    <activity android:name=".groups.ui.addmembers.AddMembersActivity"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
+
+    <activity android:name=".groups.ui.creategroup.details.AddGroupDetailsActivity"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
+
     <service android:enabled="true" android:name="org.thoughtcrime.securesms.service.WebRtcCallService"/>
     <service android:enabled="true" android:name=".service.ApplicationMigrationService"/>
     <service android:enabled="true" android:exported="false" android:name=".service.KeyCachingService"/>
-    <service android:enabled="true" android:name=".service.IncomingMessageObserver$ForegroundService"/>
+    <service android:enabled="true" android:name=".messages.IncomingMessageObserver$ForegroundService"/>
 
     <service android:name=".service.QuickResponseService"
              android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
@@ -513,7 +539,9 @@
 
     <service android:name=".service.GenericForegroundService"/>
 
-    <service android:name=".gcm.FcmService">
+    <service android:name=".gcm.FcmFetchService" />
+
+    <service android:name=".gcm.FcmReceiveService">
         <intent-filter>
             <action android:name="com.google.firebase.MESSAGING_EVENT" />
         </intent-filter>
@@ -668,11 +696,7 @@
         </intent-filter>
     </receiver>
 
-    <receiver android:name=".notifications.MessageNotifier$ReminderReceiver">
-        <intent-filter>
-            <action android:name="org.thoughtcrime.securesms.MessageNotifier.REMINDER_ACTION"/>
-        </intent-filter>
-    </receiver>
+    <receiver android:name=".notifications.MessageNotifier$ReminderReceiver"/>
 
     <receiver android:name=".notifications.DeleteNotificationReceiver">
         <intent-filter>

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

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

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

@@ -45,21 +45,23 @@ import org.thoughtcrime.securesms.jobs.FcmRefreshJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
 import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
 import org.thoughtcrime.securesms.jobs.RefreshPreKeysJob;
+import org.thoughtcrime.securesms.jobs.RetrieveProfileJob;
 import org.thoughtcrime.securesms.logging.AndroidLogger;
 import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.logging.PersistentLogger;
 import org.thoughtcrime.securesms.logging.SignalUncaughtExceptionHandler;
+import org.thoughtcrime.securesms.messages.InitialMessageRetriever;
 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.registration.RegistrationUtil;
 import org.thoughtcrime.securesms.revealable.ViewOnceMessageManager;
 import org.thoughtcrime.securesms.ringrtc.RingRtcLogger;
 import org.thoughtcrime.securesms.service.DirectoryRefreshListener;
 import org.thoughtcrime.securesms.service.ExpiringMessageManager;
-import org.thoughtcrime.securesms.service.IncomingMessageObserver;
+import org.thoughtcrime.securesms.messages.IncomingMessageObserver;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.service.LocalBackupListener;
 import org.thoughtcrime.securesms.service.RotateSenderCertificateListener;
@@ -106,10 +108,11 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
 
   @Override
   public void onCreate() {
+    long startTime = System.currentTimeMillis();
     super.onCreate();
-    Log.i(TAG, "onCreate()");
     initializeSecurityProvider();
     initializeLogging();
+    Log.i(TAG, "onCreate()");
     initializeCrashHandling();
     initializeAppDependencies();
     initializeFirstEverAppLaunch();
@@ -132,6 +135,8 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     NotificationChannels.create(this);
     RefreshPreKeysJob.scheduleIfNecessary();
     StorageSyncHelper.scheduleRoutineSync();
+    RetrieveProfileJob.enqueueRoutineFetchIfNeccessary(this);
+    RegistrationUtil.markRegistrationPossiblyComplete();
     ProcessLifecycleOwner.get().getLifecycle().addObserver(this);
 
     if (Build.VERSION.SDK_INT < 21) {
@@ -139,6 +144,7 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     }
 
     ApplicationDependencies.getJobManager().beginJobLoop();
+    Log.d(TAG, "onCreate() took " + (System.currentTimeMillis() - startTime) + " ms");
   }
 
   @Override
@@ -151,6 +157,7 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     KeyCachingService.onAppForegrounded(this);
     ApplicationDependencies.getFrameRateTracker().begin();
     ApplicationDependencies.getMegaphoneRepository().onAppForegrounded();
+    catchUpOnMessages();
   }
 
   @Override
@@ -158,7 +165,7 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     isAppVisible = false;
     Log.i(TAG, "App is no longer visible.");
     KeyCachingService.onAppBackgrounded(this);
-    MessageNotifier.setVisibleThread(-1);
+    ApplicationDependencies.getMessageNotifier().clearVisibleThread();
     ApplicationDependencies.getFrameRateTracker().end();
   }
 
@@ -375,6 +382,36 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     });
   }
 
+  private void catchUpOnMessages() {
+    InitialMessageRetriever retriever = ApplicationDependencies.getInitialMessageRetriever();
+
+    if (retriever.isCaughtUp()) {
+      return;
+    }
+
+    SignalExecutors.UNBOUNDED.execute(() -> {
+      long startTime = System.currentTimeMillis();
+
+      switch (retriever.begin(TimeUnit.SECONDS.toMillis(60))) {
+        case SUCCESS:
+          Log.i(TAG, "Successfully caught up on messages. " + (System.currentTimeMillis() - startTime) + " ms");
+          break;
+        case FAILURE_TIMEOUT:
+          Log.w(TAG, "Did not finish catching up due to a timeout. " + (System.currentTimeMillis() - startTime) + " ms");
+          break;
+        case FAILURE_ERROR:
+          Log.w(TAG, "Did not finish catching up due to an error. " + (System.currentTimeMillis() - startTime) + " ms");
+          break;
+        case SKIPPED_ALREADY_CAUGHT_UP:
+          Log.i(TAG, "Already caught up. " + (System.currentTimeMillis() - startTime) + " ms");
+          break;
+        case SKIPPED_ALREADY_RUNNING:
+          Log.i(TAG, "Already in the process of catching up. " + (System.currentTimeMillis() - startTime) + " ms");
+          break;
+      }
+    });
+  }
+
   @Override
   protected void attachBaseContext(Context base) {
     super.attachBaseContext(DynamicLanguageContextWrapper.updateContext(base, TextSecurePreferences.getLanguage(base)));

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

@@ -53,7 +53,7 @@ import org.thoughtcrime.securesms.util.ThemeUtil;
  *
  */
 
-public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarActivity
+public class ApplicationPreferencesActivity extends PassphraseRequiredActivity
     implements SharedPreferences.OnSharedPreferenceChangeListener
 {
   @SuppressWarnings("unused")
@@ -272,12 +272,7 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
     private class ProfileClickListener implements Preference.OnPreferenceClickListener {
       @Override
       public boolean onPreferenceClick(Preference preference) {
-        Intent intent = new Intent(preference.getContext(), EditProfileActivity.class);
-        intent.putExtra(EditProfileActivity.EXCLUDE_SYSTEM, true);
-        intent.putExtra(EditProfileActivity.DISPLAY_USERNAME, true);
-        intent.putExtra(EditProfileActivity.NEXT_BUTTON_TEXT, R.string.save);
-
-        requireActivity().startActivity(intent);
+        requireActivity().startActivity(EditProfileActivity.getIntentForUserProfileEdit(preference.getContext()));
         return true;
       }
     }

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

@@ -0,0 +1,183 @@
+package org.thoughtcrime.securesms;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.os.Bundle;
+import android.transition.TransitionInflater;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
+
+import com.bumptech.glide.load.DataSource;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.load.engine.GlideException;
+import com.bumptech.glide.request.RequestListener;
+import com.bumptech.glide.request.target.CustomTarget;
+import com.bumptech.glide.request.target.Target;
+import com.bumptech.glide.request.transition.Transition;
+
+import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
+import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto;
+import org.thoughtcrime.securesms.contacts.avatars.ProfileContactPhoto;
+import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.mms.GlideApp;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+
+/**
+ * Activity for displaying avatars full screen.
+ */
+public final class AvatarPreviewActivity extends PassphraseRequiredActivity {
+
+  private static final String TAG = Log.tag(AvatarPreviewActivity.class);
+
+  private static final String RECIPIENT_ID_EXTRA = "recipient_id";
+
+  public static @NonNull Intent intentFromRecipientId(@NonNull Context context,
+                                                      @NonNull RecipientId recipientId)
+  {
+    Intent intent = new Intent(context, AvatarPreviewActivity.class);
+    intent.putExtra(RECIPIENT_ID_EXTRA, recipientId.serialize());
+    return intent;
+  }
+
+  public static Bundle createTransitionBundle(@NonNull Activity activity, @NonNull View from) {
+    return ActivityOptionsCompat.makeSceneTransitionAnimation(activity, from, "avatar").toBundle();
+  }
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState, boolean ready) {
+    super.onCreate(savedInstanceState, ready);
+
+    setTheme(R.style.TextSecure_MediaPreview);
+    setContentView(R.layout.contact_photo_preview_activity);
+
+    if (Build.VERSION.SDK_INT >= 21) {
+      postponeEnterTransition();
+      TransitionInflater inflater = TransitionInflater.from(this);
+      getWindow().setSharedElementEnterTransition(inflater.inflateTransition(R.transition.full_screen_avatar_image_enter_transition_set));
+      getWindow().setSharedElementReturnTransition(inflater.inflateTransition(R.transition.full_screen_avatar_image_return_transition_set));
+    }
+
+   Toolbar toolbar = findViewById(R.id.toolbar);
+
+    ImageView avatar = findViewById(R.id.avatar);
+
+    setSupportActionBar(toolbar);
+
+    getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+                         WindowManager.LayoutParams.FLAG_FULLSCREEN);
+
+    showSystemUI();
+
+    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+    Context     context     = getApplicationContext();
+    RecipientId recipientId = RecipientId.from(getIntent().getStringExtra(RECIPIENT_ID_EXTRA));
+
+    Recipient.live(recipientId).observe(this, recipient -> {
+      ContactPhoto contactPhoto  = recipient.isLocalNumber() ? new ProfileContactPhoto(recipient, recipient.getProfileAvatar())
+                                                                   : recipient.getContactPhoto();
+      FallbackContactPhoto fallbackPhoto = recipient.isLocalNumber() ? new ResourceContactPhoto(R.drawable.ic_profile_outline_40, R.drawable.ic_profile_outline_20, R.drawable.ic_person_large)
+                                                                     : recipient.getFallbackContactPhoto();
+
+      Resources resources = this.getResources();
+
+      GlideApp.with(this)
+              .asBitmap()
+              .load(contactPhoto)
+              .fallback(fallbackPhoto.asCallCard(this))
+              .error(fallbackPhoto.asCallCard(this))
+              .diskCacheStrategy(DiskCacheStrategy.ALL)
+              .addListener(new RequestListener<Bitmap>() {
+                @Override
+                public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Bitmap> target, boolean isFirstResource) {
+                  Log.w(TAG, "Unable to load avatar, or avatar removed, closing");
+                  finish();
+                  return false;
+                }
+
+                @Override
+                public boolean onResourceReady(Bitmap resource, Object model, Target<Bitmap> target, DataSource dataSource, boolean isFirstResource) {
+                  return false;
+                }
+              })
+              .into(new CustomTarget<Bitmap>() {
+                @Override
+                public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition<? super Bitmap> transition) {
+                  avatar.setImageDrawable(RoundedBitmapDrawableFactory.create(resources, resource));
+                  if (Build.VERSION.SDK_INT >= 21) {
+                    startPostponedEnterTransition();
+                  }
+                }
+
+                @Override
+                public void onLoadCleared(@Nullable Drawable placeholder) {
+                }
+              });
+
+      toolbar.setTitle(recipient.getDisplayName(context));
+    });
+
+    avatar.setOnClickListener(v -> toggleUiVisibility());
+
+    showAndHideWithSystemUI(getWindow(), findViewById(R.id.toolbar_layout));
+  }
+
+  private static void showAndHideWithSystemUI(@NonNull Window window, @NonNull View... views) {
+    window.getDecorView().setOnSystemUiVisibilityChangeListener(visibility -> {
+      boolean hide = (visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) != 0;
+
+      for (View view : views) {
+        view.animate()
+            .alpha(hide ? 0 : 1)
+            .start();
+      }
+    });
+  }
+
+  private void toggleUiVisibility() {
+    int systemUiVisibility = getWindow().getDecorView().getSystemUiVisibility();
+    if ((systemUiVisibility & View.SYSTEM_UI_FLAG_FULLSCREEN) != 0) {
+      showSystemUI();
+    } else {
+      hideSystemUI();
+    }
+  }
+
+  private void hideSystemUI() {
+    getWindow().getDecorView().setSystemUiVisibility(
+        View.SYSTEM_UI_FLAG_IMMERSIVE              |
+        View.SYSTEM_UI_FLAG_LAYOUT_STABLE          |
+        View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+        View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN      |
+        View.SYSTEM_UI_FLAG_HIDE_NAVIGATION        |
+        View.SYSTEM_UI_FLAG_FULLSCREEN              );
+  }
+
+  private void showSystemUI() {
+    getWindow().getDecorView().setSystemUiVisibility(
+        View.SYSTEM_UI_FLAG_LAYOUT_STABLE          |
+        View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+        View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN       );
+  }
+
+  @Override
+  public boolean onSupportNavigateUp() {
+    onBackPressed();
+    return true;
+  }
+}

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

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

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

@@ -1,46 +1,90 @@
 package org.thoughtcrime.securesms;
 
+import android.annotation.TargetApi;
 import android.content.Context;
+import android.content.Intent;
 import android.os.Build;
-import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.FragmentActivity;
-import android.view.KeyEvent;
+import android.os.Bundle;
 
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.appcompat.app.AppCompatActivity;
+import android.view.View;
+import android.view.WindowManager;
+
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageActivityHelper;
 import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
 
-public abstract class BaseActivity extends FragmentActivity {
-  @Override
-  public boolean onKeyDown(int keyCode, KeyEvent event) {
-    return (keyCode == KeyEvent.KEYCODE_MENU && isMenuWorkaroundRequired()) || super.onKeyDown(keyCode, event);
-  }
+/**
+ * Base class for all activities. The vast majority of activities shouldn't extend this directly.
+ * Instead, they should extend {@link PassphraseRequiredActivity} so they're protected by
+ * screen lock.
+ */
+public abstract class BaseActivity extends AppCompatActivity {
+  private static final String TAG = Log.tag(BaseActivity.class);
 
   @Override
-  public boolean onKeyUp(int keyCode, @NonNull KeyEvent event) {
-    if (keyCode == KeyEvent.KEYCODE_MENU && isMenuWorkaroundRequired()) {
-      openOptionsMenu();
-      return true;
-    }
-    return super.onKeyUp(keyCode, event);
-  }
-
-  public static boolean isMenuWorkaroundRequired() {
-    return VERSION.SDK_INT < VERSION_CODES.KITKAT          &&
-           VERSION.SDK_INT > VERSION_CODES.GINGERBREAD_MR1 &&
-           ("LGE".equalsIgnoreCase(Build.MANUFACTURER) || "E6710".equalsIgnoreCase(Build.DEVICE));
+  protected void onCreate(Bundle savedInstanceState) {
+    logEvent("onCreate()");
+    super.onCreate(savedInstanceState);
   }
 
   @Override
   protected void onResume() {
     super.onResume();
+    initializeScreenshotSecurity();
     DynamicLanguageActivityHelper.recreateIfNotInCorrectLanguage(this, TextSecurePreferences.getLanguage(this));
   }
 
+  @Override
+  protected void onStart() {
+    logEvent("onStart()");
+    super.onStart();
+  }
+
+  @Override
+  protected void onStop() {
+    logEvent("onStop()");
+    super.onStop();
+  }
+
+  @Override
+  protected void onDestroy() {
+    logEvent("onDestroy()");
+    super.onDestroy();
+  }
+
+  private void initializeScreenshotSecurity() {
+    if (TextSecurePreferences.isScreenSecurityEnabled(this)) {
+      getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
+    } else {
+      getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
+    }
+  }
+
+  protected void startActivitySceneTransition(Intent intent, View sharedView, String transitionName) {
+    Bundle bundle = ActivityOptionsCompat.makeSceneTransitionAnimation(this, sharedView, transitionName)
+                                         .toBundle();
+    ActivityCompat.startActivity(this, intent, bundle);
+  }
+
+  @TargetApi(VERSION_CODES.LOLLIPOP)
+  protected void setStatusBarColor(int color) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+      getWindow().setStatusBarColor(color);
+    }
+  }
+
   @Override
   protected void attachBaseContext(Context newBase) {
     super.attachBaseContext(DynamicLanguageContextWrapper.updateContext(newBase, TextSecurePreferences.getLanguage(newBase)));
   }
+
+  private void logEvent(@NonNull String event) {
+    Log.d(TAG, "[" + Log.tag(getClass()) + "] " + event);
+  }
 }

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

@@ -8,6 +8,7 @@ import org.thoughtcrime.securesms.contactshare.Contact;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
 import org.thoughtcrime.securesms.database.model.ReactionRecord;
+import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.linkpreview.LinkPreview;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.Recipient;
@@ -45,5 +46,6 @@ public interface BindableConversationItem extends Unbindable {
     void onMessageSharedContactClicked(@NonNull List<Recipient> choices);
     void onInviteSharedContactClicked(@NonNull List<Recipient> choices);
     void onReactionClicked(long messageId, boolean isMms);
+    void onGroupMemberAvatarClicked(@NonNull RecipientId recipientId, @NonNull GroupId groupId);
   }
 }

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

@@ -10,8 +10,11 @@ import java.util.Set;
 
 public interface BindableConversationListItem extends Unbindable {
 
-  public void bind(@NonNull ThreadRecord thread,
-                   @NonNull GlideRequests glideRequests, @NonNull Locale locale,
-                   @NonNull Set<Long> typingThreads,
-                   @NonNull Set<Long> selectedThreads, boolean batchMode);
+  void bind(@NonNull ThreadRecord thread,
+            @NonNull GlideRequests glideRequests, @NonNull Locale locale,
+            @NonNull Set<Long> typingThreads,
+            @NonNull Set<Long> selectedThreads, boolean batchMode);
+
+  void setBatchMode(boolean batchMode);
+  void updateTypingIndicator(@NonNull Set<Long> typingThreads);
 }

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

@@ -0,0 +1,128 @@
+package org.thoughtcrime.securesms;
+
+import android.content.Context;
+import android.content.res.Resources;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
+import androidx.appcompat.app.AlertDialog;
+import androidx.lifecycle.Lifecycle;
+
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.recipients.RecipientUtil;
+import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
+import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+
+/**
+ * This should be used whenever we want to prompt the user to block/unblock a recipient.
+ */
+public final class BlockUnblockDialog {
+
+  private BlockUnblockDialog() { }
+
+  public static void showBlockFor(@NonNull Context context,
+                                  @NonNull Lifecycle lifecycle,
+                                  @NonNull Recipient recipient,
+                                  @NonNull Runnable onBlock)
+  {
+    SimpleTask.run(lifecycle,
+                   () -> buildBlockFor(context, recipient, onBlock, null),
+                   AlertDialog.Builder::show);
+  }
+
+  public static void showBlockAndDeleteFor(@NonNull Context context,
+                                           @NonNull Lifecycle lifecycle,
+                                           @NonNull Recipient recipient,
+                                           @NonNull Runnable onBlock,
+                                           @NonNull Runnable onBlockAndDelete)
+  {
+    SimpleTask.run(lifecycle,
+        () -> buildBlockFor(context, recipient, onBlock, onBlockAndDelete),
+        AlertDialog.Builder::show);
+  }
+
+  public static void showUnblockFor(@NonNull Context context,
+                                    @NonNull Lifecycle lifecycle,
+                                    @NonNull Recipient recipient,
+                                    @NonNull Runnable onUnblock)
+  {
+    SimpleTask.run(lifecycle,
+                   () -> buildUnblockFor(context, recipient, onUnblock),
+                   AlertDialog.Builder::show);
+  }
+
+  @WorkerThread
+  private static AlertDialog.Builder buildBlockFor(@NonNull Context context,
+                                                   @NonNull Recipient recipient,
+                                                   @NonNull Runnable onBlock,
+                                                   @Nullable Runnable onBlockAndDelete)
+  {
+    recipient = recipient.resolve();
+
+    AlertDialog.Builder builder   = new AlertDialog.Builder(context);
+    Resources           resources = context.getResources();
+
+    if (recipient.isGroup()) {
+      if (DatabaseFactory.getGroupDatabase(context).isActive(recipient.requireGroupId())) {
+        builder.setTitle(resources.getString(R.string.BlockUnblockDialog_block_and_leave_s, recipient.getDisplayName(context)));
+        builder.setMessage(R.string.BlockUnblockDialog_you_will_no_longer_receive_messages_or_updates);
+        builder.setPositiveButton(R.string.BlockUnblockDialog_block_and_leave, ((dialog, which) -> onBlock.run()));
+        builder.setNegativeButton(android.R.string.cancel, null);
+      } else {
+        builder.setTitle(resources.getString(R.string.BlockUnblockDialog_block_s, recipient.getDisplayName(context)));
+        builder.setMessage(R.string.BlockUnblockDialog_group_members_wont_be_able_to_add_you);
+        builder.setPositiveButton(R.string.RecipientPreferenceActivity_block, ((dialog, which) -> onBlock.run()));
+        builder.setNegativeButton(android.R.string.cancel, null);
+      }
+    } else {
+      builder.setTitle(resources.getString(R.string.BlockUnblockDialog_block_s, recipient.getDisplayName(context)));
+      builder.setMessage(R.string.BlockUnblockDialog_blocked_people_wont_be_able_to_call_you_or_send_you_messages);
+
+      if (onBlockAndDelete != null) {
+        builder.setNeutralButton(android.R.string.cancel, null);
+        builder.setPositiveButton(R.string.BlockUnblockDialog_block_and_delete, (d, w) -> onBlockAndDelete.run());
+        builder.setNegativeButton(R.string.BlockUnblockDialog_block, (d, w) -> onBlock.run());
+      } else {
+        builder.setPositiveButton(R.string.BlockUnblockDialog_block, ((dialog, which) -> onBlock.run()));
+        builder.setNegativeButton(android.R.string.cancel, null);
+      }
+    }
+
+    return builder;
+  }
+
+  @WorkerThread
+  private static AlertDialog.Builder buildUnblockFor(@NonNull Context context,
+                                                     @NonNull Recipient recipient,
+                                                     @NonNull Runnable onUnblock)
+  {
+    recipient = recipient.resolve();
+
+    AlertDialog.Builder builder   = new AlertDialog.Builder(context);
+    Resources           resources = context.getResources();
+
+    if (recipient.isGroup()) {
+      if (DatabaseFactory.getGroupDatabase(context).isActive(recipient.requireGroupId())) {
+        builder.setTitle(resources.getString(R.string.BlockUnblockDialog_unblock_s, recipient.getDisplayName(context)));
+        builder.setMessage(R.string.BlockUnblockDialog_group_members_will_be_able_to_add_you);
+        builder.setPositiveButton(R.string.RecipientPreferenceActivity_unblock, ((dialog, which) -> onUnblock.run()));
+        builder.setNegativeButton(android.R.string.cancel, null);
+      } else {
+        builder.setTitle(resources.getString(R.string.BlockUnblockDialog_unblock_s, recipient.getDisplayName(context)));
+        builder.setMessage(R.string.BlockUnblockDialog_group_members_will_be_able_to_add_you);
+        builder.setPositiveButton(R.string.RecipientPreferenceActivity_unblock, ((dialog, which) -> onUnblock.run()));
+        builder.setNegativeButton(android.R.string.cancel, null);
+      }
+    } else {
+      builder.setTitle(resources.getString(R.string.BlockUnblockDialog_unblock_s, recipient.getDisplayName(context)));
+      builder.setMessage(R.string.BlockUnblockDialog_you_will_be_able_to_call_and_message_each_other);
+      builder.setPositiveButton(R.string.RecipientPreferenceActivity_unblock, ((dialog, which) -> onUnblock.run()));
+      builder.setNegativeButton(android.R.string.cancel, null);
+    }
+
+    return builder;
+  }
+}

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

@@ -1,22 +1,21 @@
 package org.thoughtcrime.securesms;
 
 import android.content.Context;
-import android.content.Intent;
 import android.database.Cursor;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.ListFragment;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.Loader;
-import androidx.cursoradapter.widget.CursorAdapter;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ListView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.cursoradapter.widget.CursorAdapter;
+import androidx.fragment.app.ListFragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+
 import org.thoughtcrime.securesms.database.RecipientDatabase;
 import org.thoughtcrime.securesms.database.loaders.BlockedContactsLoader;
 import org.thoughtcrime.securesms.mms.GlideApp;
@@ -25,21 +24,18 @@ import org.thoughtcrime.securesms.preferences.BlockedContactListItem;
 import org.thoughtcrime.securesms.recipients.LiveRecipient;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.DynamicLanguage;
+import org.thoughtcrime.securesms.recipients.RecipientUtil;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 
-public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity {
+public class BlockedContactsActivity extends PassphraseRequiredActivity {
 
-  private final DynamicTheme    dynamicTheme    = new DynamicTheme();
-  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
+  private final DynamicTheme dynamicTheme = new DynamicTheme();
 
   @Override
   public void onPreCreate() {
     dynamicTheme.onCreate(this);
-    dynamicLanguage.onCreate(this);
   }
 
-
   @Override
   public void onCreate(Bundle bundle, boolean ready) {
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -51,16 +47,12 @@ public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity
   public void onResume() {
     super.onResume();
     dynamicTheme.onResume(this);
-    dynamicLanguage.onResume(this);
   }
 
   @Override
-  public boolean onOptionsItemSelected(MenuItem item) {
-    switch (item.getItemId()) {
-      case android.R.id.home: finish(); return true;
-    }
-
-    return false;
+  public boolean onSupportNavigateUp() {
+    onBackPressed();
+    return true;
   }
 
   public static class BlockedContactsFragment
@@ -76,14 +68,14 @@ public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity
     @Override
     public void onCreate(Bundle bundle) {
       super.onCreate(bundle);
-      setListAdapter(new BlockedContactAdapter(getActivity(), GlideApp.with(this), null));
-      getLoaderManager().initLoader(0, null, this);
+      setListAdapter(new BlockedContactAdapter(requireActivity(), GlideApp.with(this), null));
+      LoaderManager.getInstance(this).initLoader(0, null, this);
     }
 
     @Override
     public void onStart() {
       super.onStart();
-      getLoaderManager().restartLoader(0, null, this);
+      LoaderManager.getInstance(this).restartLoader(0, null, this);
     }
 
     @Override
@@ -114,10 +106,10 @@ public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
       Recipient recipient = ((BlockedContactListItem)view).getRecipient();
-      Intent    intent    = new Intent(getActivity(), RecipientPreferenceActivity.class);
-      intent.putExtra(RecipientPreferenceActivity.RECIPIENT_ID, recipient.getId());
-
-      startActivity(intent);
+      BlockUnblockDialog.showUnblockFor(requireContext(), getLifecycle(), recipient, () -> {
+        RecipientUtil.unblock(requireContext(), recipient);
+        LoaderManager.getInstance(this).restartLoader(0, null, this);
+      });
     }
 
     private static class BlockedContactAdapter extends CursorAdapter {
@@ -143,7 +135,5 @@ public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity
         ((BlockedContactListItem) view).set(glideRequests, recipient);
       }
     }
-
   }
-
 }

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

@@ -3,24 +3,47 @@ package org.thoughtcrime.securesms;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.os.Bundle;
+import android.view.ContextThemeWrapper;
+
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 
+import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
+import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.ThemeUtil;
+
 public class ClearProfileAvatarActivity extends Activity {
 
+  private static final String ARG_TITLE = "arg_title";
+
+  public static Intent createForUserProfilePhoto() {
+    return new Intent("org.thoughtcrime.securesms.action.CLEAR_PROFILE_PHOTO");
+  }
+
+  public static Intent createForGroupProfilePhoto() {
+    Intent intent = new Intent("org.thoughtcrime.securesms.action.CLEAR_PROFILE_PHOTO");
+    intent.putExtra(ARG_TITLE, R.string.ClearProfileActivity_remove_group_photo);
+    return intent;
+  }
+
   @Override
   public void onResume() {
     super.onResume();
 
-    new AlertDialog.Builder(this)
-        .setTitle(R.string.ClearProfileActivity_remove_profile_photo)
-        .setNegativeButton(android.R.string.cancel, (dialog, which) -> finish())
-        .setPositiveButton(R.string.ClearProfileActivity_remove, (dialog, which) -> {
-          Intent result = new Intent();
-          result.putExtra("delete", true);
-          setResult(Activity.RESULT_OK, result);
-          finish();
-        })
-        .show();
+    int titleId = getIntent().getIntExtra(ARG_TITLE, R.string.ClearProfileActivity_remove_profile_photo);
+
+    new AlertDialog.Builder(new ContextThemeWrapper(this, DynamicTheme.isDarkTheme(this) ? R.style.TextSecure_DarkTheme : R.style.TextSecure_LightTheme))
+                   .setMessage(titleId)
+                   .setNegativeButton(android.R.string.cancel, (dialog, which) -> finish())
+                   .setPositiveButton(R.string.ClearProfileActivity_remove, (dialog, which) -> {
+                     Intent result = new Intent();
+                     result.putExtra("delete", true);
+                     setResult(Activity.RESULT_OK, result);
+                     finish();
+                   })
+                   .setOnCancelListener(dialog -> finish())
+                   .show();
   }
 
 }

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

@@ -51,7 +51,7 @@ public class ConfirmIdentityDialog extends AlertDialog {
     super(context);
 
       Recipient       recipient       = Recipient.resolved(mismatch.getRecipientId(context));
-      String          name            = recipient.toShortString(context);
+      String          name            = recipient.getDisplayName(context);
       String          introduction    = context.getString(R.string.ConfirmIdentityDialog_your_safety_number_with_s_has_changed, name, name);
       SpannableString spannableString = new SpannableString(introduction + " " +
                                                             context.getString(R.string.ConfirmIdentityDialog_you_may_wish_to_verify_your_safety_number_with_this_contact));
@@ -175,7 +175,9 @@ public class ConfirmIdentityDialog extends AlertDialog {
                                                                        messageRecord.getDateSent(),
                                                                        legacy ? Base64.decode(messageRecord.getBody()) : null,
                                                                        !legacy ? Base64.decode(messageRecord.getBody()) : null,
-                                                                       0, null);
+                                                                       0,
+                                                                       0,
+                                                                       null);
 
             long pushId = pushDatabase.insert(envelope);
 

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

@@ -19,20 +19,18 @@ package org.thoughtcrime.securesms;
 import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
-import org.thoughtcrime.securesms.logging.Log;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import org.thoughtcrime.securesms.components.ContactFilterToolbar;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
 import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper;
-import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.logging.Log;
 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.ServiceUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.thoughtcrime.securesms.util.ViewUtil;
 import org.whispersystems.libsignal.util.guava.Optional;
 
 import java.io.IOException;
@@ -44,14 +42,16 @@ import java.lang.ref.WeakReference;
  * @author Moxie Marlinspike
  *
  */
-public abstract class ContactSelectionActivity extends PassphraseRequiredActionBarActivity
+public abstract class ContactSelectionActivity extends PassphraseRequiredActivity
                                                implements SwipeRefreshLayout.OnRefreshListener,
-                                                          ContactSelectionListFragment.OnContactSelectedListener
+                                                          ContactSelectionListFragment.OnContactSelectedListener,
+                                                          ContactSelectionListFragment.ScrollCallback
 {
   private static final String TAG = ContactSelectionActivity.class.getSimpleName();
 
-  private final DynamicTheme    dynamicTheme    = new DynamicNoActionBarTheme();
-  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
+  public static final String EXTRA_LAYOUT_RES_ID = "layout_res_id";
+
+  private final DynamicTheme dynamicTheme = new DynamicNoActionBarTheme();
 
   protected ContactSelectionListFragment contactsFragment;
 
@@ -60,18 +60,17 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActionB
   @Override
   protected void onPreCreate() {
     dynamicTheme.onCreate(this);
-    dynamicLanguage.onCreate(this);
   }
 
   @Override
   protected void onCreate(Bundle icicle, boolean ready) {
     if (!getIntent().hasExtra(ContactSelectionListFragment.DISPLAY_MODE)) {
       int displayMode = TextSecurePreferences.isSmsEnabled(this) ? DisplayMode.FLAG_ALL
-                                                                 : DisplayMode.FLAG_PUSH | DisplayMode.FLAG_ACTIVE_GROUPS | DisplayMode.FLAG_INACTIVE_GROUPS;
+                                                                 : DisplayMode.FLAG_PUSH | DisplayMode.FLAG_ACTIVE_GROUPS | DisplayMode.FLAG_INACTIVE_GROUPS | DisplayMode.FLAG_SELF;
       getIntent().putExtra(ContactSelectionListFragment.DISPLAY_MODE, displayMode);
     }
 
-    setContentView(R.layout.contact_selection_activity);
+    setContentView(getIntent().getIntExtra(EXTRA_LAYOUT_RES_ID, R.layout.contact_selection_activity));
 
     initializeToolbar();
     initializeResources();
@@ -82,7 +81,6 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActionB
   public void onResume() {
     super.onResume();
     dynamicTheme.onResume(this);
-    dynamicLanguage.onResume(this);
   }
 
   protected ContactFilterToolbar getToolbar() {
@@ -90,10 +88,9 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActionB
   }
 
   private void initializeToolbar() {
-    this.toolbar = ViewUtil.findById(this, R.id.toolbar);
+    this.toolbar = findViewById(R.id.toolbar);
     setSupportActionBar(toolbar);
 
-    assert  getSupportActionBar() != null;
     getSupportActionBar().setDisplayHomeAsUpEnabled(false);
     getSupportActionBar().setDisplayShowTitleEnabled(false);
     getSupportActionBar().setIcon(null);
@@ -121,6 +118,17 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActionB
   @Override
   public void onContactDeselected(Optional<RecipientId> recipientId, String number) {}
 
+  @Override
+  public void onBeginScroll() {
+    hideKeyboard();
+  }
+
+  private void hideKeyboard() {
+    ServiceUtil.getInputMethodManager(this)
+               .hideSoftInputFromWindow(toolbar.getWindowToken(), 0);
+    toolbar.clearFocus();
+  }
+
   private static class RefreshDirectoryTask extends AsyncTask<Context, Void, Void> {
 
     private final WeakReference<ContactSelectionActivity> activity;

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

@@ -18,47 +18,62 @@ package org.thoughtcrime.securesms;
 
 
 import android.Manifest;
+import android.animation.LayoutTransition;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.database.Cursor;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
+import android.view.animation.CycleInterpolator;
 import android.widget.Button;
+import android.widget.HorizontalScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.ConstraintSet;
+import androidx.fragment.app.FragmentActivity;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
+import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.transition.AutoTransition;
+import androidx.transition.TransitionManager;
 
+import com.annimon.stream.Collectors;
+import com.annimon.stream.Stream;
+import com.google.android.material.chip.ChipGroup;
 import com.pnikosis.materialishprogress.ProgressWheel;
 
 import org.thoughtcrime.securesms.components.RecyclerViewFastScroller;
+import org.thoughtcrime.securesms.contacts.ContactChip;
 import org.thoughtcrime.securesms.contacts.ContactSelectionListAdapter;
 import org.thoughtcrime.securesms.contacts.ContactSelectionListItem;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
 import org.thoughtcrime.securesms.contacts.SelectedContact;
+import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.GlideApp;
+import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.permissions.Permissions;
-import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper;
+import org.thoughtcrime.securesms.recipients.LiveRecipient;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.util.FeatureFlags;
 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;
@@ -66,8 +81,9 @@ import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
 import org.whispersystems.libsignal.util.guava.Optional;
 
 import java.io.IOException;
-import java.util.LinkedList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 
 /**
@@ -76,19 +92,26 @@ import java.util.Set;
  * @author Moxie Marlinspike
  *
  */
-public final class ContactSelectionListFragment extends    Fragment
+public final class ContactSelectionListFragment extends LoggingFragment
                                                 implements LoaderManager.LoaderCallbacks<Cursor>
 {
   @SuppressWarnings("unused")
   private static final String TAG = Log.tag(ContactSelectionListFragment.class);
 
-  public static final String DISPLAY_MODE = "display_mode";
-  public static final String MULTI_SELECT = "multi_select";
-  public static final String REFRESHABLE  = "refreshable";
-  public static final String RECENTS      = "recents";
+  private static final int CHIP_GROUP_EMPTY_CHILD_COUNT  = 1;
+  private static final int CHIP_GROUP_REVEAL_DURATION_MS = 150;
 
+  public static final int NO_LIMIT = Integer.MAX_VALUE;
+
+  public static final String DISPLAY_MODE      = "display_mode";
+  public static final String MULTI_SELECT      = "multi_select";
+  public static final String REFRESHABLE       = "refreshable";
+  public static final String RECENTS           = "recents";
+  public static final String TOTAL_CAPACITY    = "total_capacity";
+  public static final String CURRENT_SELECTION = "current_selection";
+
+  private ConstraintLayout            constraintLayout;
   private TextView                    emptyText;
-  private Set<SelectedContact>        selectedContacts;
   private OnContactSelectedListener   onContactSelectedListener;
   private SwipeRefreshLayout          swipeRefresh;
   private View                        showContactsLayout;
@@ -99,16 +122,28 @@ public final class ContactSelectionListFragment extends    Fragment
   private RecyclerView                recyclerView;
   private RecyclerViewFastScroller    fastScroller;
   private ContactSelectionListAdapter cursorRecyclerViewAdapter;
+  private ChipGroup                   chipGroup;
+  private HorizontalScrollView        chipGroupScrollContainer;
+  private TextView                    groupLimit;
 
+  @Nullable private FixedViewsAdapter headerAdapter;
   @Nullable private FixedViewsAdapter footerAdapter;
-  @Nullable private InviteCallback    inviteCallback;
+  @Nullable private ListCallback      listCallback;
+  @Nullable private ScrollCallback    scrollCallback;
+            private GlideRequests     glideRequests;
+            private int               selectionLimit;
+            private Set<RecipientId>  currentSelection;
 
   @Override
   public void onAttach(@NonNull Context context) {
     super.onAttach(context);
 
-    if (context instanceof InviteCallback) {
-      inviteCallback = (InviteCallback) context;
+    if (context instanceof ListCallback) {
+      listCallback = (ListCallback) context;
+    }
+
+    if (context instanceof ScrollCallback) {
+      scrollCallback = (ScrollCallback) context;
     }
   }
 
@@ -130,14 +165,16 @@ public final class ContactSelectionListFragment extends    Fragment
                  if (!TextSecurePreferences.hasSuccessfullyRetrievedDirectory(getActivity())) {
                    handleContactPermissionGranted();
                  } else {
-                   this.getLoaderManager().initLoader(0, null, this);
+                   LoaderManager.getInstance(this).initLoader(0, null, this);
                  }
                })
                .onAnyDenied(() -> {
-                 getActivity().getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
+                 FragmentActivity activity = requireActivity();
 
-                 if (getActivity().getIntent().getBooleanExtra(RECENTS, false)) {
-                   getLoaderManager().initLoader(0, null, ContactSelectionListFragment.this);
+                 activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
+
+                 if (activity.getIntent().getBooleanExtra(RECENTS, false)) {
+                   LoaderManager.getInstance(this).initLoader(0, null, ContactSelectionListFragment.this);
                  } else {
                    initializeNoContactsPermission();
                  }
@@ -149,64 +186,140 @@ public final class ContactSelectionListFragment extends    Fragment
   public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
     View view = inflater.inflate(R.layout.contact_selection_list_fragment, container, false);
 
-    emptyText               = ViewUtil.findById(view, android.R.id.empty);
-    recyclerView            = ViewUtil.findById(view, R.id.recycler_view);
-    swipeRefresh            = ViewUtil.findById(view, R.id.swipe_refresh);
-    fastScroller            = ViewUtil.findById(view, R.id.fast_scroller);
-    showContactsLayout      = view.findViewById(R.id.show_contacts_container);
-    showContactsButton      = view.findViewById(R.id.show_contacts_button);
-    showContactsDescription = view.findViewById(R.id.show_contacts_description);
-    showContactsProgress    = view.findViewById(R.id.progress);
-    recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
+    emptyText                = view.findViewById(android.R.id.empty);
+    recyclerView             = view.findViewById(R.id.recycler_view);
+    swipeRefresh             = view.findViewById(R.id.swipe_refresh);
+    fastScroller             = view.findViewById(R.id.fast_scroller);
+    showContactsLayout       = view.findViewById(R.id.show_contacts_container);
+    showContactsButton       = view.findViewById(R.id.show_contacts_button);
+    showContactsDescription  = view.findViewById(R.id.show_contacts_description);
+    showContactsProgress     = view.findViewById(R.id.progress);
+    chipGroup                = view.findViewById(R.id.chipGroup);
+    chipGroupScrollContainer = view.findViewById(R.id.chipGroupScrollContainer);
+    groupLimit               = view.findViewById(R.id.group_limit);
+    constraintLayout         = view.findViewById(R.id.container);
 
-    swipeRefresh.setEnabled(getActivity().getIntent().getBooleanExtra(REFRESHABLE, true));
+    recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
+    recyclerView.setItemAnimator(new DefaultItemAnimator() {
+      @Override
+      public boolean canReuseUpdatedViewHolder(@NonNull RecyclerView.ViewHolder viewHolder) {
+        return true;
+      }
+    });
+
+    swipeRefresh.setEnabled(requireActivity().getIntent().getBooleanExtra(REFRESHABLE, true));
+
+    selectionLimit   = requireActivity().getIntent().getIntExtra(TOTAL_CAPACITY, NO_LIMIT);
+    currentSelection = getCurrentSelection();
+
+    updateGroupLimit(getChipCount());
 
     return view;
   }
 
+  private void updateGroupLimit(int chipCount) {
+    if (selectionLimit != NO_LIMIT) {
+      groupLimit.setText(String.format(Locale.getDefault(), "%d/%d", currentSelection.size() + chipCount, selectionLimit));
+      groupLimit.setVisibility(View.VISIBLE);
+    } else {
+      groupLimit.setVisibility(View.GONE);
+    }
+  }
+
   @Override
   public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
     Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
   }
 
   public @NonNull List<SelectedContact> getSelectedContacts() {
-    List<SelectedContact> selected = new LinkedList<>();
-    if (selectedContacts != null) {
-      selected.addAll(selectedContacts);
+    if (cursorRecyclerViewAdapter == null) {
+      return Collections.emptyList();
     }
 
-    return selected;
+    return cursorRecyclerViewAdapter.getSelectedContacts();
   }
 
-  private boolean isMulti() {
-    return getActivity().getIntent().getBooleanExtra(MULTI_SELECT, false);
+  public int getSelectedContactsCount() {
+    if (cursorRecyclerViewAdapter == null) {
+      return 0;
+    }
+
+    return cursorRecyclerViewAdapter.getSelectedContactsCount();
+  }
+
+  private Set<RecipientId> getCurrentSelection() {
+    List<RecipientId> currentSelection = requireActivity().getIntent().getParcelableArrayListExtra(CURRENT_SELECTION);
+
+    return currentSelection == null ? Collections.emptySet()
+                                    : Collections.unmodifiableSet(Stream.of(currentSelection).collect(Collectors.toSet()));
+  }
+
+  public boolean isMulti() {
+    return requireActivity().getIntent().getBooleanExtra(MULTI_SELECT, false);
   }
 
   private void initializeCursor() {
+    glideRequests = GlideApp.with(this);
+
     cursorRecyclerViewAdapter = new ContactSelectionListAdapter(requireContext(),
-                                                                GlideApp.with(this),
+                                                                glideRequests,
                                                                 null,
                                                                 new ListClickListener(),
-                                                                isMulti());
-    selectedContacts = cursorRecyclerViewAdapter.getSelectedContacts();
+                                                                isMulti(),
+                                                                currentSelection);
 
     RecyclerViewConcatenateAdapterStickyHeader concatenateAdapter = new RecyclerViewConcatenateAdapterStickyHeader();
 
+    if (listCallback != null) {
+      if (FeatureFlags.groupsV2create() && FeatureFlags.groupsV2internalTest()) {
+        headerAdapter = new FixedViewsAdapter(createNewGroupItem(listCallback), createNewGroupsV1GroupItem(listCallback));
+      } else {
+        headerAdapter = new FixedViewsAdapter(createNewGroupItem(listCallback));
+      }
+      headerAdapter.hide();
+      concatenateAdapter.addAdapter(headerAdapter);
+    }
+
     concatenateAdapter.addAdapter(cursorRecyclerViewAdapter);
-    if (inviteCallback != null) {
-      footerAdapter = new FixedViewsAdapter(createInviteActionView(inviteCallback));
+
+    if (listCallback != null) {
+      footerAdapter = new FixedViewsAdapter(createInviteActionView(listCallback));
       footerAdapter.hide();
       concatenateAdapter.addAdapter(footerAdapter);
     }
 
     recyclerView.setAdapter(concatenateAdapter);
     recyclerView.addItemDecoration(new StickyHeaderDecoration(concatenateAdapter, true, true));
+    recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+      @Override
+      public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
+        if (newState == RecyclerView.SCROLL_STATE_DRAGGING) {
+          if (scrollCallback != null) {
+            scrollCallback.onBeginScroll();
+          }
+        }
+      }
+    });
   }
 
-  private View createInviteActionView(@NonNull InviteCallback inviteCallback) {
+  private View createInviteActionView(@NonNull ListCallback listCallback) {
     View view = LayoutInflater.from(requireContext())
                               .inflate(R.layout.contact_selection_invite_action_item, (ViewGroup) requireView(), false);
-    view.setOnClickListener(v -> inviteCallback.onInvite());
+    view.setOnClickListener(v -> listCallback.onInvite());
+    return view;
+  }
+
+  private View createNewGroupItem(@NonNull ListCallback listCallback) {
+    View view = LayoutInflater.from(requireContext())
+                              .inflate(R.layout.contact_selection_new_group_item, (ViewGroup) requireView(), false);
+    view.setOnClickListener(v -> listCallback.onNewGroup(false));
+    return view;
+  }
+
+  private View createNewGroupsV1GroupItem(@NonNull ListCallback listCallback) {
+    View view = LayoutInflater.from(requireContext())
+                              .inflate(R.layout.contact_selection_new_group_v1_item, (ViewGroup) requireView(), false);
+    view.setOnClickListener(v -> listCallback.onNewGroup(true));
     return view;
   }
 
@@ -242,23 +355,28 @@ public final class ContactSelectionListFragment extends    Fragment
     swipeRefresh.setRefreshing(false);
   }
 
+  public boolean hasQueryFilter() {
+    return !TextUtils.isEmpty(cursorFilter);
+  }
+
   public void setRefreshing(boolean refreshing) {
     swipeRefresh.setRefreshing(refreshing);
   }
 
   public void reset() {
-    selectedContacts.clear();
+    cursorRecyclerViewAdapter.clearSelectedContacts();
 
     if (!isDetached() && !isRemoving() && getActivity() != null && !getActivity().isFinishing()) {
-      getLoaderManager().restartLoader(0, null, this);
+      LoaderManager.getInstance(this).restartLoader(0, null, this);
     }
   }
 
   @Override
   public @NonNull Loader<Cursor> onCreateLoader(int id, Bundle args) {
-    return new ContactsCursorLoader(getActivity(),
-                                    getActivity().getIntent().getIntExtra(DISPLAY_MODE, DisplayMode.FLAG_ALL),
-                                    cursorFilter, getActivity().getIntent().getBooleanExtra(RECENTS, false));
+    FragmentActivity activity = requireActivity();
+    return new ContactsCursorLoader(activity,
+                                    activity.getIntent().getIntExtra(DISPLAY_MODE, DisplayMode.FLAG_ALL),
+                                    cursorFilter, activity.getIntent().getBooleanExtra(RECENTS, false));
   }
 
   @Override
@@ -272,6 +390,14 @@ public final class ContactSelectionListFragment extends    Fragment
       footerAdapter.show();
     }
 
+    if (headerAdapter != null) {
+      if (TextUtils.isEmpty(cursorFilter)) {
+        headerAdapter.show();
+      } else {
+        headerAdapter.hide();
+      }
+    }
+
     emptyText.setText(R.string.contact_selection_group_activity__no_contacts);
     boolean useFastScroller = data != null && data.getCount() > 20;
     recyclerView.setVerticalScrollBarEnabled(!useFastScroller);
@@ -336,7 +462,13 @@ public final class ContactSelectionListFragment extends    Fragment
       SelectedContact selectedContact = contact.isUsernameType() ? SelectedContact.forUsername(contact.getRecipientId().orNull(), contact.getNumber())
                                                                  : SelectedContact.forPhone(contact.getRecipientId().orNull(), contact.getNumber());
 
-      if (!isMulti() || !selectedContacts.contains(selectedContact)) {
+      if (!isMulti() || !cursorRecyclerViewAdapter.isSelectedContact(selectedContact)) {
+        if (selectionLimitReached()) {
+          Toast.makeText(requireContext(), R.string.ContactSelectionListFragment_the_group_is_full, Toast.LENGTH_SHORT).show();
+          groupLimit.animate().scaleX(1.3f).scaleY(1.3f).setInterpolator(new CycleInterpolator(0.5f)).start();
+          return;
+        }
+
         if (contact.isUsernameType()) {
           AlertDialog loadingDialog = SimpleProgressDialog.show(requireContext());
 
@@ -346,8 +478,9 @@ public final class ContactSelectionListFragment extends    Fragment
             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);
+              SelectedContact selected = SelectedContact.forUsername(recipient.getId(), contact.getNumber());
+              markContactSelected(selected);
+              cursorRecyclerViewAdapter.notifyItemChanged(recyclerView.getChildAdapterPosition(contact), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
 
               if (onContactSelectedListener != null) {
                 onContactSelectedListener.onContactSelected(Optional.of(recipient.getId()), null);
@@ -361,22 +494,126 @@ public final class ContactSelectionListFragment extends    Fragment
             }
           });
         } else {
-          selectedContacts.add(selectedContact);
-          contact.setChecked(true);
+          markContactSelected(selectedContact);
+          cursorRecyclerViewAdapter.notifyItemChanged(recyclerView.getChildAdapterPosition(contact), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
 
           if (onContactSelectedListener != null) {
             onContactSelectedListener.onContactSelected(contact.getRecipientId(), contact.getNumber());
           }
         }
       } else {
-        selectedContacts.remove(selectedContact);
-        contact.setChecked(false);
+        markContactUnselected(selectedContact);
+        cursorRecyclerViewAdapter.notifyItemChanged(recyclerView.getChildAdapterPosition(contact), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
 
         if (onContactSelectedListener != null) {
           onContactSelectedListener.onContactDeselected(contact.getRecipientId(), contact.getNumber());
         }
+      }}
+  }
+
+  private boolean selectionLimitReached() {
+    return getChipCount() >= selectionLimit;
+  }
+
+  private void markContactSelected(@NonNull SelectedContact selectedContact) {
+    cursorRecyclerViewAdapter.addSelectedContact(selectedContact);
+    if (isMulti()) {
+      addChipForSelectedContact(selectedContact);
+    }
+  }
+
+  private void markContactUnselected(@NonNull SelectedContact selectedContact) {
+    cursorRecyclerViewAdapter.removeFromSelectedContacts(selectedContact);
+    cursorRecyclerViewAdapter.notifyItemRangeChanged(0, cursorRecyclerViewAdapter.getItemCount(), ContactSelectionListAdapter.PAYLOAD_SELECTION_CHANGE);
+    removeChipForContact(selectedContact);
+  }
+
+  private void removeChipForContact(@NonNull SelectedContact contact) {
+    for (int i = chipGroup.getChildCount() - 1; i >= 0; i--) {
+      View v = chipGroup.getChildAt(i);
+      if (v instanceof ContactChip && contact.matches(((ContactChip) v).getContact())) {
+        chipGroup.removeView(v);
       }
     }
+
+    updateGroupLimit(getChipCount());
+
+    if (getChipCount() == 0) {
+      setChipGroupVisibility(ConstraintSet.GONE);
+    }
+  }
+
+  private void addChipForSelectedContact(@NonNull SelectedContact selectedContact) {
+    SimpleTask.run(getViewLifecycleOwner().getLifecycle(),
+                   ()       -> Recipient.resolved(selectedContact.getOrCreateRecipientId(requireContext())),
+                   resolved -> addChipForRecipient(resolved, selectedContact));
+  }
+
+  private void addChipForRecipient(@NonNull Recipient recipient, @NonNull SelectedContact selectedContact) {
+    final ContactChip chip = new ContactChip(requireContext());
+
+    if (getChipCount() == 0) {
+      setChipGroupVisibility(ConstraintSet.VISIBLE);
+    }
+
+    chip.setText(recipient.getShortDisplayName(requireContext()));
+    chip.setContact(selectedContact);
+    chip.setCloseIconVisible(true);
+    chip.setOnCloseIconClickListener(view -> {
+      markContactUnselected(selectedContact);
+
+      if (onContactSelectedListener != null) {
+        onContactSelectedListener.onContactDeselected(Optional.of(recipient.getId()), recipient.getE164().orNull());
+      }
+    });
+
+    chipGroup.getLayoutTransition().addTransitionListener(new LayoutTransition.TransitionListener() {
+      @Override
+      public void startTransition(LayoutTransition transition, ViewGroup container, View view, int transitionType) {
+      }
+
+      @Override
+      public void endTransition(LayoutTransition transition, ViewGroup container, View view, int transitionType) {
+        if (view == chip && transitionType == LayoutTransition.APPEARING) {
+          chipGroup.getLayoutTransition().removeTransitionListener(this);
+          registerChipRecipientObserver(chip, recipient.live());
+          chipGroup.post(ContactSelectionListFragment.this::smoothScrollChipsToEnd);
+        }
+      }
+    });
+
+    chip.setAvatar(glideRequests, recipient, () -> addChip(chip));
+  }
+
+  private void addChip(@NonNull ContactChip chip) {
+    chipGroup.addView(chip);
+    updateGroupLimit(getChipCount());
+  }
+
+  private int getChipCount() {
+    int count = chipGroup.getChildCount() - CHIP_GROUP_EMPTY_CHILD_COUNT;
+    if (count < 0) throw new AssertionError();
+    return count;
+  }
+
+  private void registerChipRecipientObserver(@NonNull ContactChip chip, @Nullable LiveRecipient recipient) {
+    if (recipient != null) {
+      recipient.observe(getViewLifecycleOwner(), resolved -> {
+        if (chip.isAttachedToWindow()) {
+          chip.setAvatar(glideRequests, resolved, null);
+          chip.setText(resolved.getShortDisplayName(chip.getContext()));
+        }
+      });
+    }
+  }
+
+  private void setChipGroupVisibility(int visibility) {
+    TransitionManager.beginDelayedTransition(constraintLayout, new AutoTransition().setDuration(CHIP_GROUP_REVEAL_DURATION_MS));
+
+    ConstraintSet constraintSet = new ConstraintSet();
+    constraintSet.clone(constraintLayout);
+    constraintSet.setVisibility(R.id.chipGroupScrollContainer, visibility);
+    constraintSet.applyTo(constraintLayout);
   }
 
   public void setOnContactSelectedListener(OnContactSelectedListener onContactSelectedListener) {
@@ -387,12 +624,22 @@ public final class ContactSelectionListFragment extends    Fragment
     this.swipeRefresh.setOnRefreshListener(onRefreshListener);
   }
 
+  private void smoothScrollChipsToEnd() {
+    int x = chipGroupScrollContainer.getLayoutDirection() == View.LAYOUT_DIRECTION_LTR ? chipGroup.getWidth() : 0;
+    chipGroupScrollContainer.smoothScrollTo(x, 0);
+  }
+
   public interface OnContactSelectedListener {
     void onContactSelected(Optional<RecipientId> recipientId, String number);
     void onContactDeselected(Optional<RecipientId> recipientId, String number);
   }
 
-  public interface InviteCallback {
+  public interface ListCallback {
     void onInvite();
+    void onNewGroup(boolean forceV1);
+  }
+
+  public interface ScrollCallback {
+    void onBeginScroll();
   }
 }

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

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

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

@@ -21,7 +21,7 @@ import org.thoughtcrime.securesms.database.SmsMigrator.ProgressDescription;
 import org.thoughtcrime.securesms.service.ApplicationMigrationService;
 import org.thoughtcrime.securesms.service.ApplicationMigrationService.ImportState;
 
-public class DatabaseMigrationActivity extends PassphraseRequiredActionBarActivity {
+public class DatabaseMigrationActivity extends PassphraseRequiredActivity {
 
   private final ImportServiceConnection serviceConnection  = new ImportServiceConnection();
   private final ImportStateHandler      importStateHandler = new ImportStateHandler();

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

@@ -23,7 +23,6 @@ import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.permissions.Permissions;
-import org.thoughtcrime.securesms.push.AccountManagerFactory;
 import org.thoughtcrime.securesms.qr.ScanListener;
 import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
@@ -42,7 +41,7 @@ import org.whispersystems.signalservice.internal.push.DeviceLimitExceededExcepti
 
 import java.io.IOException;
 
-public class DeviceActivity extends PassphraseRequiredActionBarActivity
+public class DeviceActivity extends PassphraseRequiredActivity
     implements Button.OnClickListener, ScanListener, DeviceLinkFragment.LinkClickedListener
 {
 

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

@@ -6,7 +6,7 @@ import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewAnimationUtils;
@@ -20,7 +20,7 @@ import org.thoughtcrime.securesms.qr.ScanListener;
 import org.thoughtcrime.securesms.qr.ScanningThread;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
-public class DeviceAddFragment extends Fragment {
+public class DeviceAddFragment extends LoggingFragment {
 
   private ViewGroup      container;
   private LinearLayout   overlay;

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

@@ -53,7 +53,7 @@ public class DeviceListFragment extends ListFragment
   @Override
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    this.locale = (Locale) getArguments().getSerializable(PassphraseRequiredActionBarActivity.LOCALE_EXTRA);
+    this.locale = (Locale) getArguments().getSerializable(PassphraseRequiredActivity.LOCALE_EXTRA);
   }
 
   @Override
@@ -164,25 +164,29 @@ public class DeviceListFragment extends ListFragment
 
   @SuppressLint("StaticFieldLeak")
   private void handleDisconnectDevice(final long deviceId) {
-    new ProgressDialogAsyncTask<Void, Void, Void>(getActivity(),
-                                                  R.string.DeviceListActivity_unlinking_device_no_ellipsis,
-                                                  R.string.DeviceListActivity_unlinking_device)
+    new ProgressDialogAsyncTask<Void, Void, Boolean>(getActivity(),
+                                                     R.string.DeviceListActivity_unlinking_device_no_ellipsis,
+                                                     R.string.DeviceListActivity_unlinking_device)
     {
       @Override
-      protected Void doInBackground(Void... params) {
+      protected Boolean doInBackground(Void... params) {
         try {
           accountManager.removeDevice(deviceId);
+          return true;
         } catch (IOException e) {
           Log.w(TAG, e);
-          Toast.makeText(getActivity(), R.string.DeviceListActivity_network_failed, Toast.LENGTH_LONG).show();
+          return false;
         }
-        return null;
       }
 
       @Override
-      protected void onPostExecute(Void result) {
+      protected void onPostExecute(Boolean result) {
         super.onPostExecute(result);
-        getLoaderManager().restartLoader(0, null, DeviceListFragment.this);
+        if (result) {
+          getLoaderManager().restartLoader(0, null, DeviceListFragment.this);
+        } else {
+          Toast.makeText(getActivity(), R.string.DeviceListActivity_network_failed, Toast.LENGTH_LONG).show();
+        }
       }
     }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
   }

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

@@ -5,7 +5,7 @@ import android.os.Bundle;
 import androidx.appcompat.app.AlertDialog;
 import android.view.Window;
 
-public class DeviceProvisioningActivity extends PassphraseRequiredActionBarActivity {
+public class DeviceProvisioningActivity extends PassphraseRequiredActivity {
 
   @SuppressWarnings("unused")
   private static final String TAG = DeviceProvisioningActivity.class.getSimpleName();
@@ -17,9 +17,6 @@ public class DeviceProvisioningActivity extends PassphraseRequiredActionBarActiv
 
   @Override
   protected void onCreate(Bundle bundle, boolean ready) {
-    assert  getSupportActionBar() != null;
-    getSupportActionBar().hide();
-
     AlertDialog dialog = new AlertDialog.Builder(this)
         .setTitle(getString(R.string.DeviceProvisioningActivity_link_a_signal_device))
         .setMessage(getString(R.string.DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner))
@@ -29,7 +26,7 @@ public class DeviceProvisioningActivity extends PassphraseRequiredActionBarActiv
           startActivity(intent);
           finish();
         })
-        .setNegativeButton(R.string.DeviceProvisioningActivity_cancel, (dialog12, which) -> {
+        .setNegativeButton(android.R.string.cancel, (dialog12, which) -> {
           dialog12.dismiss();
           finish();
         })

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

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

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

@@ -1,79 +1,57 @@
 package org.thoughtcrime.securesms;
 
-import android.content.Context;
-import android.content.Intent;
-
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
-import androidx.lifecycle.Lifecycle;
+import androidx.fragment.app.FragmentActivity;
+import androidx.lifecycle.LiveData;
 
-import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.database.GroupDatabase;
+import org.thoughtcrime.securesms.groups.LiveGroup;
 import org.thoughtcrime.securesms.groups.ui.GroupMemberEntry;
 import org.thoughtcrime.securesms.groups.ui.GroupMemberListView;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientExporter;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.thoughtcrime.securesms.recipients.ui.bottomsheet.RecipientBottomSheetDialogFragment;
 
-import java.util.ArrayList;
+import java.util.List;
 
 public final class GroupMembersDialog {
 
-  private final Context   context;
-  private final Recipient groupRecipient;
-  private final Lifecycle lifecycle;
+  private final FragmentActivity fragmentActivity;
+  private final Recipient        groupRecipient;
 
-  public GroupMembersDialog(@NonNull Context context,
-                            @NonNull Recipient groupRecipient,
-                            @NonNull Lifecycle lifecycle)
+  public GroupMembersDialog(@NonNull FragmentActivity activity,
+                            @NonNull Recipient groupRecipient)
   {
-    this.context        = context;
-    this.groupRecipient = groupRecipient;
-    this.lifecycle      = lifecycle;
+    this.fragmentActivity = activity;
+    this.groupRecipient   = groupRecipient;
   }
 
   public void display() {
-    SimpleTask.run(
-      lifecycle,
-      () -> DatabaseFactory.getGroupDatabase(context).getGroupMembers(groupRecipient.requireGroupId(), GroupDatabase.MemberSet.FULL_MEMBERS_INCLUDING_SELF),
-      members -> {
-        AlertDialog dialog = new AlertDialog.Builder(context)
-                                            .setTitle(R.string.ConversationActivity_group_members)
-                                            .setIconAttribute(R.attr.group_members_dialog_icon)
-                                            .setCancelable(true)
-                                            .setView(R.layout.dialog_group_members)
-                                            .setPositiveButton(android.R.string.ok, null)
-                                            .show();
+    AlertDialog dialog = new AlertDialog.Builder(fragmentActivity)
+                                        .setTitle(R.string.ConversationActivity_group_members)
+                                        .setIconAttribute(R.attr.group_members_dialog_icon)
+                                        .setCancelable(true)
+                                        .setView(R.layout.dialog_group_members)
+                                        .setPositiveButton(android.R.string.ok, null)
+                                        .show();
 
-        GroupMemberListView memberListView = dialog.findViewById(R.id.list_members);
+    GroupMemberListView memberListView = dialog.findViewById(R.id.list_members);
 
-        ArrayList<GroupMemberEntry.FullMember> pendingMembers = new ArrayList<>(members.size());
-        for (Recipient member : members) {
-          GroupMemberEntry.FullMember entry = new GroupMemberEntry.FullMember(member);
+    LiveGroup                                   liveGroup   = new LiveGroup(groupRecipient.requireGroupId());
+    LiveData<List<GroupMemberEntry.FullMember>> fullMembers = liveGroup.getFullMembers();
 
-          entry.setOnClick(() -> contactClick(member));
+    //noinspection ConstantConditions
+    fullMembers.observe(fragmentActivity, memberListView::setMembers);
 
-          if (member.isLocalNumber()) {
-            pendingMembers.add(0, entry);
-          } else {
-            pendingMembers.add(entry);
-          }
-        }
+    dialog.setOnDismissListener(d -> fullMembers.removeObservers(fragmentActivity));
 
-        //noinspection ConstantConditions
-        memberListView.setMembers(pendingMembers);
-      }
-    );
+    memberListView.setRecipientClickListener(recipient -> {
+      dialog.dismiss();
+      contactClick(recipient);
+    });
   }
 
   private void contactClick(@NonNull Recipient recipient) {
-    if (recipient.getContactUri() != null) {
-      Intent intent = new Intent(context, RecipientPreferenceActivity.class);
-      intent.putExtra(RecipientPreferenceActivity.RECIPIENT_ID, recipient.getId());
-
-      context.startActivity(intent);
-    } else {
-      context.startActivity(RecipientExporter.export(recipient).asAddContactIntent());
-    }
+    RecipientBottomSheetDialogFragment.create(recipient.getId(), groupRecipient.requireGroupId())
+                                      .show(fragmentActivity.getSupportFragmentManager(), "BOTTOM");
   }
 }

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

@@ -22,8 +22,6 @@ 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;
@@ -42,9 +40,10 @@ 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.List;
 import java.util.concurrent.ExecutionException;
 
-public class InviteActivity extends PassphraseRequiredActionBarActivity implements ContactSelectionListFragment.OnContactSelectedListener {
+public class InviteActivity extends PassphraseRequiredActivity implements ContactSelectionListFragment.OnContactSelectedListener {
 
   private ContactSelectionListFragment contactsFragment;
   private EditText                     inviteText;
@@ -135,14 +134,15 @@ public class InviteActivity extends PassphraseRequiredActionBarActivity implemen
     new SendSmsInvitesAsyncTask(this, inviteText.getText().toString())
         .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR,
                            contactsFragment.getSelectedContacts()
-                                           .toArray(new SelectedContact[contactsFragment.getSelectedContacts().size()]));
+                                           .toArray(new SelectedContact[0]));
   }
 
   private void updateSmsButtonText() {
+    List<SelectedContact> selectedContacts = contactsFragment.getSelectedContacts();
     smsSendButton.setText(getResources().getQuantityString(R.plurals.InviteActivity_send_sms_to_friends,
-                                                           contactsFragment.getSelectedContacts().size(),
-                                                           contactsFragment.getSelectedContacts().size()));
-    smsSendButton.setEnabled(!contactsFragment.getSelectedContacts().isEmpty());
+                                                           selectedContacts.size(),
+                                                           selectedContacts.size()));
+    smsSendButton.setEnabled(!selectedContacts.isEmpty());
   }
 
   @Override public void onBackPressed() {

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

@@ -0,0 +1,45 @@
+package org.thoughtcrime.securesms;
+
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import org.thoughtcrime.securesms.logging.Log;
+
+/**
+ * Simply logs out lifecycle events.
+ */
+public abstract class LoggingFragment extends Fragment {
+
+  private static final String TAG = Log.tag(LoggingFragment.class);
+
+  @Override
+  public void onCreate(@Nullable Bundle savedInstanceState) {
+    logEvent("onCreate()");
+    super.onCreate(savedInstanceState);
+  }
+
+  @Override
+  public void onStart() {
+    logEvent("onStart()");
+    super.onStart();
+  }
+
+  @Override
+  public void onStop() {
+    logEvent("onStop()");
+    super.onStop();
+  }
+
+  @Override
+  public void onDestroy() {
+    logEvent("onDestroy()");
+    super.onDestroy();
+  }
+
+  private void logEvent(@NonNull String event) {
+    Log.d(TAG, "[" + Log.tag(getClass()) + "] " + event);
+  }
+}

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

@@ -7,7 +7,7 @@ import androidx.annotation.NonNull;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 
-public class MainActivity extends PassphraseRequiredActionBarActivity {
+public class MainActivity extends PassphraseRequiredActivity {
 
   private final DynamicTheme  dynamicTheme = new DynamicNoActionBarTheme();
   private final MainNavigator navigator    = new MainNavigator(this);

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

@@ -3,9 +3,8 @@ package org.thoughtcrime.securesms;
 import android.content.Context;
 
 import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
 
-public class MainFragment extends Fragment {
+public class MainFragment extends LoggingFragment {
 
   @Override
   public void onAttach(@NonNull Context context) {

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

@@ -12,6 +12,7 @@ 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.groups.ui.creategroup.CreateGroupActivity;
 import org.thoughtcrime.securesms.insights.InsightsLauncher;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 
@@ -55,8 +56,8 @@ public class MainNavigator {
     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);
+  public void goToConversation(@NonNull RecipientId recipientId, long threadId, int distributionType, int startingPosition) {
+    Intent intent = ConversationActivity.buildIntent(activity, recipientId, threadId, distributionType, startingPosition);
 
     activity.startActivity(intent);
     activity.overridePendingTransition(R.anim.slide_from_end, R.anim.fade_scale_out);
@@ -77,8 +78,7 @@ public class MainNavigator {
   }
 
   public void goToGroupCreation() {
-    Intent intent = new Intent(activity, GroupCreateActivity.class);
-    activity.startActivity(intent);
+    activity.startActivity(CreateGroupActivity.newIntent(activity));
   }
 
   public void goToInvite() {

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

@@ -77,7 +77,7 @@ import java.util.Map;
 /**
  * Activity for displaying media attachments in-app
  */
-public final class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
+public final class MediaPreviewActivity extends PassphraseRequiredActivity
   implements LoaderManager.LoaderCallbacks<Pair<Cursor, Integer>>,
              MediaRailAdapter.RailItemListener,
              MediaPreviewFragment.Events
@@ -117,6 +117,20 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
   private boolean               showThread;
   private MediaDatabase.Sorting sorting;
 
+  public static @NonNull Intent intentFromMediaRecord(@NonNull Context context,
+                                                      @NonNull MediaRecord mediaRecord,
+                                                      boolean leftIsRecent)
+  {
+    Intent intent = new Intent(context, MediaPreviewActivity.class);
+    intent.putExtra(MediaPreviewActivity.THREAD_ID_EXTRA, mediaRecord.getThreadId());
+    intent.putExtra(MediaPreviewActivity.DATE_EXTRA, mediaRecord.getDate());
+    intent.putExtra(MediaPreviewActivity.SIZE_EXTRA, mediaRecord.getAttachment().getSize());
+    intent.putExtra(MediaPreviewActivity.CAPTION_EXTRA, mediaRecord.getAttachment().getCaption());
+    intent.putExtra(MediaPreviewActivity.LEFT_IS_RECENT_EXTRA, leftIsRecent);
+    intent.setDataAndType(mediaRecord.getAttachment().getDataUri(), mediaRecord.getContentType());
+    return intent;
+  }
+
   @SuppressWarnings("ConstantConditions")
   @Override
   protected void onCreate(Bundle bundle, boolean ready) {
@@ -167,7 +181,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
   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 if (mediaItem.recipient != null) from = mediaItem.recipient.getDisplayName(this);
     else                                  from = "";
 
     if (showThread) {
@@ -179,7 +193,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
           if (threadRecipient.isLocalNumber()) {
             from = getString(R.string.note_to_self);
           } else {
-            to = threadRecipient.toShortString(this);
+            to = threadRecipient.getDisplayName(this);
           }
         } else {
           to = getString(R.string.MediaPreviewActivity_you);

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

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

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

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

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

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

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

@@ -1,8 +1,10 @@
 package org.thoughtcrime.securesms;
 
+import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 
 import java.util.concurrent.TimeUnit;
@@ -23,6 +25,10 @@ public class MuteDialog extends AlertDialog {
   }
 
   public static void show(final Context context, final @NonNull MuteSelectionListener listener) {
+    show(context, listener, null);
+  }
+
+  public static void show(final Context context, final @NonNull MuteSelectionListener listener, @Nullable Runnable cancelListener) {
     AlertDialog.Builder builder = new AlertDialog.Builder(context);
     builder.setTitle(R.string.MuteDialog_mute_notifications);
     builder.setItems(R.array.mute_durations, new DialogInterface.OnClickListener() {
@@ -43,6 +49,13 @@ public class MuteDialog extends AlertDialog {
       }
     });
 
+    if (cancelListener != null) {
+      builder.setOnCancelListener(dialog -> {
+        cancelListener.run();
+        dialog.dismiss();
+      });
+    }
+
     builder.show();
 
   }

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

@@ -19,32 +19,16 @@ package org.thoughtcrime.securesms;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.View;
-import android.widget.Toast;
 
 import org.thoughtcrime.securesms.conversation.ConversationActivity;
-import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
+import org.thoughtcrime.securesms.groups.ui.creategroup.CreateGroupActivity;
 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.
@@ -53,7 +37,7 @@ import java.util.UUID;
  *
  */
 public class NewConversationActivity extends ContactSelectionActivity
-                                    implements ContactSelectionListFragment.InviteCallback
+                                    implements ContactSelectionListFragment.ListCallback
 {
 
   @SuppressWarnings("unused")
@@ -112,7 +96,7 @@ public class NewConversationActivity extends ContactSelectionActivity
   }
 
   private void handleCreateGroup() {
-    startActivity(new Intent(this, GroupCreateActivity.class));
+    startActivity(CreateGroupActivity.newIntent(this));
   }
 
   private void handleInvite() {
@@ -120,10 +104,10 @@ public class NewConversationActivity extends ContactSelectionActivity
   }
 
   @Override
-  protected boolean onPrepareOptionsPanel(View view, Menu menu) {
-    MenuInflater inflater = this.getMenuInflater();
+  public boolean onPrepareOptionsMenu(Menu menu) {
     menu.clear();
-    inflater.inflate(R.menu.new_conversation_activity, menu);
+    getMenuInflater().inflate(R.menu.new_conversation_activity, menu);
+
     super.onPrepareOptionsMenu(menu);
     return true;
   }
@@ -131,5 +115,12 @@ public class NewConversationActivity extends ContactSelectionActivity
   @Override
   public void onInvite() {
     handleInvite();
+    finish();
+  }
+
+  @Override
+  public void onNewGroup(boolean forceV1) {
+    handleCreateGroup();
+    finish();
   }
 }

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

@@ -32,7 +32,7 @@ import org.thoughtcrime.securesms.service.KeyCachingService;
  *
  * @author Moxie Marlinspike
  */
-public abstract class PassphraseActivity extends BaseActionBarActivity {
+public abstract class PassphraseActivity extends BaseActivity {
 
   private static final String TAG = PassphraseActivity.class.getSimpleName();
 

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

@@ -41,6 +41,8 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 public class PassphraseChangeActivity extends PassphraseActivity {
 
+  private static final String TAG = Log.tag(PassphraseChangeActivity.class);
+
   private DynamicTheme    dynamicTheme    = new DynamicTheme();
   private DynamicLanguage dynamicLanguage = new DynamicLanguage();
 
@@ -145,7 +147,7 @@ public class PassphraseChangeActivity extends PassphraseActivity {
         return masterSecret;
 
       } catch (InvalidPassphraseException e) {
-        Log.w(PassphraseChangeActivity.class.getSimpleName(), e);
+        Log.w(TAG, e);
         return null;
       }
     }

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

@@ -16,40 +16,39 @@ import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.lock.v2.CreateKbsPinActivity;
-import org.thoughtcrime.securesms.lock.v2.PinUtil;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrationActivity;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
-import org.thoughtcrime.securesms.profiles.ProfileName;
+import org.thoughtcrime.securesms.pin.PinRestoreActivity;
 import org.thoughtcrime.securesms.profiles.edit.EditProfileActivity;
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity;
 import org.thoughtcrime.securesms.service.KeyCachingService;
-import org.thoughtcrime.securesms.util.CensorshipUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 import java.util.Locale;
 
-public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarActivity implements MasterSecretListener {
-  private static final String TAG = PassphraseRequiredActionBarActivity.class.getSimpleName();
+public abstract class PassphraseRequiredActivity extends BaseActivity implements MasterSecretListener {
+  private static final String TAG = PassphraseRequiredActivity.class.getSimpleName();
 
-  public static final String LOCALE_EXTRA = "locale_extra";
+  public static final String LOCALE_EXTRA      = "locale_extra";
+  public static final String NEXT_INTENT_EXTRA = "next_intent";
 
   private static final int STATE_NORMAL              = 0;
   private static final int STATE_CREATE_PASSPHRASE   = 1;
   private static final int STATE_PROMPT_PASSPHRASE   = 2;
   private static final int STATE_UI_BLOCKING_UPGRADE = 3;
   private static final int STATE_WELCOME_PUSH_SCREEN = 4;
-  private static final int STATE_CREATE_PROFILE_NAME = 5;
-  private static final int STATE_CREATE_KBS_PIN      = 6;
+  private static final int STATE_ENTER_SIGNAL_PIN    = 5;
+  private static final int STATE_CREATE_PROFILE_NAME = 6;
+  private static final int STATE_CREATE_SIGNAL_PIN   = 7;
 
   private SignalServiceNetworkAccess networkAccess;
   private BroadcastReceiver          clearKeyReceiver;
 
   @Override
   protected final void onCreate(Bundle savedInstanceState) {
-    Log.d(TAG, "[" + Log.tag(getClass()) + "] onCreate()");
     this.networkAccess = new SignalServiceNetworkAccess(this);
     onPreCreate();
 
@@ -69,7 +68,6 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
 
   @Override
   protected void onResume() {
-    Log.d(TAG, "[" + Log.tag(getClass()) + "] onResume()");
     super.onResume();
 
     if (networkAccess.isCensored(this)) {
@@ -77,27 +75,8 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
     }
   }
 
-  @Override
-  protected void onStart() {
-    Log.d(TAG, "[" + Log.tag(getClass()) + "] onStart()");
-    super.onStart();
-  }
-
-  @Override
-  protected void onPause() {
-    Log.d(TAG, "[" + Log.tag(getClass()) + "] onPause()");
-    super.onPause();
-  }
-
-  @Override
-  protected void onStop() {
-    Log.d(TAG, "[" + Log.tag(getClass()) + "] onStop()");
-    super.onStop();
-  }
-
   @Override
   protected void onDestroy() {
-    Log.d(TAG, "[" + Log.tag(getClass()) + "] onDestroy()");
     super.onDestroy();
     removeClearKeyReceiver(this);
   }
@@ -157,7 +136,8 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
       case STATE_PROMPT_PASSPHRASE:   return getPromptPassphraseIntent();
       case STATE_UI_BLOCKING_UPGRADE: return getUiBlockingUpgradeIntent();
       case STATE_WELCOME_PUSH_SCREEN: return getPushRegistrationIntent();
-      case STATE_CREATE_KBS_PIN:      return getCreateKbsPinIntent();
+      case STATE_ENTER_SIGNAL_PIN:    return getEnterSignalPinIntent();
+      case STATE_CREATE_SIGNAL_PIN:   return getCreateSignalPinIntent();
       case STATE_CREATE_PROFILE_NAME: return getCreateProfileNameIntent();
       default:                        return null;
     }
@@ -172,23 +152,23 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
       return STATE_UI_BLOCKING_UPGRADE;
     } else if (!TextSecurePreferences.hasPromptedPushRegistration(this)) {
       return STATE_WELCOME_PUSH_SCREEN;
+    } else if (SignalStore.storageServiceValues().needsAccountRestore()) {
+      return STATE_ENTER_SIGNAL_PIN;
     } else if (userMustSetProfileName()) {
       return STATE_CREATE_PROFILE_NAME;
-    } else if (userMustSetKbsPin()) {
-      return STATE_CREATE_KBS_PIN;
+    } else if (userMustCreateSignalPin()) {
+      return STATE_CREATE_SIGNAL_PIN;
     } else {
       return STATE_NORMAL;
     }
   }
 
-  private boolean userMustSetKbsPin() {
-    // TODO [greyson] [pins] Maybe re-enable in the future
-//    return !SignalStore.registrationValues().isRegistrationComplete() && !PinUtil.userHasPin(this);
-    return false;
+  private boolean userMustCreateSignalPin() {
+    return !SignalStore.registrationValues().isRegistrationComplete() && !SignalStore.kbsValues().hasPin() && !SignalStore.kbsValues().lastPinCreateFailed();
   }
 
   private boolean userMustSetProfileName() {
-    return !SignalStore.registrationValues().isRegistrationComplete() && Recipient.self().getProfileName() == ProfileName.EMPTY;
+    return !SignalStore.registrationValues().isRegistrationComplete() && Recipient.self().getProfileName().isEmpty();
   }
 
   private Intent getCreatePassphraseIntent() {
@@ -210,7 +190,11 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
     return RegistrationNavigationActivity.newIntentForNewRegistration(this);
   }
 
-  private Intent getCreateKbsPinIntent() {
+  private Intent getEnterSignalPinIntent() {
+    return getRoutedIntent(PinRestoreActivity.class, getIntent());
+  }
+
+  private Intent getCreateSignalPinIntent() {
 
     final Intent intent;
     if (userMustSetProfileName()) {
@@ -256,4 +240,12 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
       clearKeyReceiver = null;
     }
   }
+
+  /**
+   * Puts an extra in {@code intent} so that {@code nextIntent} will be shown after it.
+   */
+  public static @NonNull Intent chainIntent(@NonNull Intent intent, @NonNull Intent nextIntent) {
+    intent.putExtra(NEXT_INTENT_EXTRA, nextIntent);
+    return intent;
+  }
 }

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

@@ -6,7 +6,7 @@ import android.widget.Button;
 
 import org.thoughtcrime.securesms.preferences.MmsPreferencesActivity;
 
-public class PromptMmsActivity extends PassphraseRequiredActionBarActivity {
+public class PromptMmsActivity extends PassphraseRequiredActivity {
 
   @Override
   protected void onCreate(Bundle bundle, boolean ready) {

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

@@ -45,16 +45,24 @@ public class PushContactSelectionActivity extends ContactSelectionActivity {
     getIntent().putExtra(ContactSelectionListFragment.MULTI_SELECT, true);
     super.onCreate(icicle, ready);
 
+    initializeToolbar();
+  }
+
+  protected void initializeToolbar() {
     getToolbar().setNavigationIcon(R.drawable.ic_check_24);
     getToolbar().setNavigationOnClickListener(v -> {
-      Intent                resultIntent     = getIntent();
-      List<SelectedContact> selectedContacts = contactsFragment.getSelectedContacts();
-      List<RecipientId>     recipients       = Stream.of(selectedContacts).map(sc -> sc.getOrCreateRecipientId(this)).toList();
-
-      resultIntent.putParcelableArrayListExtra(KEY_SELECTED_RECIPIENTS, new ArrayList<>(recipients));
-
-      setResult(RESULT_OK, resultIntent);
-      finish();
+      onFinishedSelection();
     });
   }
+
+  protected final void onFinishedSelection() {
+    Intent                resultIntent     = getIntent();
+    List<SelectedContact> selectedContacts = contactsFragment.getSelectedContacts();
+    List<RecipientId>     recipients       = Stream.of(selectedContacts).map(sc -> sc.getOrCreateRecipientId(this)).toList();
+
+    resultIntent.putParcelableArrayListExtra(KEY_SELECTED_RECIPIENTS, new ArrayList<>(recipients));
+
+    setResult(RESULT_OK, resultIntent);
+    finish();
+  }
 }

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

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

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

@@ -34,18 +34,9 @@ import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Vibrator;
-import androidx.annotation.DrawableRes;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.appcompat.widget.SwitchCompat;
 import android.text.Html;
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
-
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobs.StorageSyncJob;
-import org.thoughtcrime.securesms.logging.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.LayoutInflater;
@@ -63,13 +54,22 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.SwitchCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+
 import org.thoughtcrime.securesms.color.MaterialColor;
 import org.thoughtcrime.securesms.components.camera.CameraView;
 import org.thoughtcrime.securesms.crypto.IdentityKeyParcelable;
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.IdentityDatabase;
 import org.thoughtcrime.securesms.database.IdentityDatabase.VerifiedStatus;
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.jobs.MultiDeviceVerifiedUpdateJob;
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.qr.QrCode;
 import org.thoughtcrime.securesms.qr.ScanListener;
@@ -79,7 +79,6 @@ import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
 import org.thoughtcrime.securesms.util.DynamicDarkActionBarTheme;
-import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.IdentityUtil;
@@ -105,24 +104,55 @@ import static org.whispersystems.libsignal.SessionCipher.SESSION_LOCK;
  * @author Moxie Marlinspike
  */
 @SuppressLint("StaticFieldLeak")
-public class VerifyIdentityActivity extends PassphraseRequiredActionBarActivity implements ScanListener, View.OnClickListener {
+public class VerifyIdentityActivity extends PassphraseRequiredActivity implements ScanListener, View.OnClickListener {
 
-  private static final String TAG = VerifyIdentityActivity.class.getSimpleName();
+  private static final String TAG = Log.tag(VerifyIdentityActivity.class);
 
-  public static final String RECIPIENT_EXTRA = "recipient_id";
-  public static final String IDENTITY_EXTRA  = "recipient_identity";
-  public static final String VERIFIED_EXTRA  = "verified_state";
+  private static final String RECIPIENT_EXTRA = "recipient_id";
+  private static final String IDENTITY_EXTRA  = "recipient_identity";
+  private static final String VERIFIED_EXTRA  = "verified_state";
 
-  private final DynamicTheme    dynamicTheme    = new DynamicDarkActionBarTheme();
-  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
+  private final DynamicTheme dynamicTheme = new DynamicDarkActionBarTheme();
 
-  private VerifyDisplayFragment displayFragment = new VerifyDisplayFragment();
-  private VerifyScanFragment    scanFragment    = new VerifyScanFragment();
+  private final VerifyDisplayFragment displayFragment = new VerifyDisplayFragment();
+  private final VerifyScanFragment    scanFragment    = new VerifyScanFragment();
+
+  public static Intent newIntent(@NonNull Context context,
+                                 @NonNull IdentityDatabase.IdentityRecord identityRecord)
+  {
+    return newIntent(context,
+                     identityRecord.getRecipientId(),
+                     identityRecord.getIdentityKey(),
+                     identityRecord.getVerifiedStatus() == IdentityDatabase.VerifiedStatus.VERIFIED);
+  }
+
+  public static Intent newIntent(@NonNull Context context,
+                                 @NonNull IdentityDatabase.IdentityRecord identityRecord,
+                                 boolean verified)
+  {
+    return newIntent(context,
+                     identityRecord.getRecipientId(),
+                     identityRecord.getIdentityKey(),
+                     verified);
+  }
+
+  public static Intent newIntent(@NonNull Context context,
+                                 @NonNull RecipientId recipientId,
+                                 @NonNull IdentityKey identityKey,
+                                 boolean verified)
+  {
+    Intent intent = new Intent(context, VerifyIdentityActivity.class);
+
+    intent.putExtra(RECIPIENT_EXTRA, recipientId);
+    intent.putExtra(IDENTITY_EXTRA, new IdentityKeyParcelable(identityKey));
+    intent.putExtra(VERIFIED_EXTRA, verified);
+
+    return intent;
+  }
 
   @Override
   public void onPreCreate() {
     dynamicTheme.onCreate(this);
-    dynamicLanguage.onCreate(this);
   }
 
   @Override
@@ -145,7 +175,7 @@ public class VerifyIdentityActivity extends PassphraseRequiredActionBarActivity
     scanFragment.setScanListener(this);
     displayFragment.setClickListener(this);
 
-    initFragment(android.R.id.content, displayFragment, dynamicLanguage.getCurrentLocale(), extras);
+    initFragment(android.R.id.content, displayFragment, Locale.getDefault(), extras);
   }
 
   @Override
@@ -456,7 +486,7 @@ public class VerifyIdentityActivity extends PassphraseRequiredActionBarActivity
     }
 
     private void setRecipientText(Recipient recipient) {
-      description.setText(Html.fromHtml(String.format(getActivity().getString(R.string.verify_display_fragment__if_you_wish_to_verify_the_security_of_your_end_to_end_encryption_with_s), recipient.toShortString(getContext()))));
+      description.setText(Html.fromHtml(String.format(getActivity().getString(R.string.verify_display_fragment__if_you_wish_to_verify_the_security_of_your_end_to_end_encryption_with_s), recipient.getDisplayName(getContext()))));
       description.setMovementMethod(LinkMovementMethod.getInstance());
     }
 

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

@@ -18,43 +18,56 @@
 package org.thoughtcrime.securesms;
 
 import android.Manifest;
-import android.app.Activity;
+import android.app.PictureInPictureParams;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.media.AudioManager;
+import android.os.Build;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-
-import org.thoughtcrime.securesms.logging.Log;
-import android.view.View;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.method.LinkMovementMethod;
+import android.util.Rational;
 import android.view.Window;
 import android.view.WindowManager;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.core.content.ContextCompat;
+import androidx.lifecycle.ViewModelProviders;
+
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
-import org.thoughtcrime.securesms.components.webrtc.WebRtcAnswerDeclineButton;
-import org.thoughtcrime.securesms.components.webrtc.WebRtcCallControls;
-import org.thoughtcrime.securesms.components.webrtc.WebRtcCallScreen;
+import org.thoughtcrime.securesms.components.TooltipPopup;
+import org.thoughtcrime.securesms.components.webrtc.WebRtcAudioOutput;
+import org.thoughtcrime.securesms.components.webrtc.WebRtcCallView;
+import org.thoughtcrime.securesms.components.webrtc.WebRtcCallViewModel;
 import org.thoughtcrime.securesms.crypto.storage.TextSecureIdentityKeyStore;
 import org.thoughtcrime.securesms.events.WebRtcViewModel;
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.ringrtc.RemotePeer;
 import org.thoughtcrime.securesms.service.WebRtcCallService;
-import org.thoughtcrime.securesms.util.ServiceUtil;
+import org.thoughtcrime.securesms.util.EllapsedTimeFormatter;
+import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.VerifySpan;
 import org.thoughtcrime.securesms.util.ViewUtil;
-import org.webrtc.SurfaceViewRenderer;
 import org.whispersystems.libsignal.IdentityKey;
 import org.whispersystems.libsignal.SignalProtocolAddress;
+import org.whispersystems.signalservice.api.messages.calls.HangupMessage;
 
 import static org.whispersystems.libsignal.SessionCipher.SESSION_LOCK;
 
-public class WebRtcCallActivity extends Activity {
+public class WebRtcCallActivity extends AppCompatActivity {
+
 
   private static final String TAG = WebRtcCallActivity.class.getSimpleName();
 
@@ -67,8 +80,10 @@ public class WebRtcCallActivity extends Activity {
 
   public static final String EXTRA_ENABLE_VIDEO_IF_AVAILABLE = WebRtcCallActivity.class.getCanonicalName() + ".ENABLE_VIDEO_IF_AVAILABLE";
 
-  private WebRtcCallScreen callScreen;
-  private boolean          enableVideoIfAvailable;
+  private WebRtcCallView      callScreen;
+  private TooltipPopup        videoTooltip;
+  private WebRtcCallViewModel viewModel;
+  private boolean             enableVideoIfAvailable;
 
   @Override
   public void onCreate(Bundle savedInstanceState) {
@@ -79,10 +94,12 @@ public class WebRtcCallActivity extends Activity {
 
     requestWindowFeature(Window.FEATURE_NO_TITLE);
     setContentView(R.layout.webrtc_call_activity);
+    getSupportActionBar().hide();
 
     setVolumeControlStream(AudioManager.STREAM_VOICE_CALL);
 
     initializeResources();
+    initializeViewModel();
 
     processIntent(getIntent());
 
@@ -90,18 +107,21 @@ public class WebRtcCallActivity extends Activity {
     getIntent().removeExtra(EXTRA_ENABLE_VIDEO_IF_AVAILABLE);
   }
 
-
   @Override
   public void onResume() {
     Log.i(TAG, "onResume()");
     super.onResume();
     initializeScreenshotSecurity();
-    EventBus.getDefault().register(this);
+
+    if (!EventBus.getDefault().isRegistered(this)) {
+      EventBus.getDefault().register(this);
+    }
   }
 
   @Override
   public void onNewIntent(Intent intent){
     Log.i(TAG, "onNewIntent");
+    super.onNewIntent(intent);
     processIntent(intent);
   }
 
@@ -109,6 +129,17 @@ public class WebRtcCallActivity extends Activity {
   public void onPause() {
     Log.i(TAG, "onPause");
     super.onPause();
+
+    if (!isInPipMode()) {
+      EventBus.getDefault().unregister(this);
+    }
+  }
+
+  @Override
+  protected void onStop() {
+    Log.i(TAG, "onStop");
+    super.onStop();
+
     EventBus.getDefault().unregister(this);
   }
 
@@ -122,9 +153,32 @@ public class WebRtcCallActivity extends Activity {
     Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
   }
 
+  @Override
+  protected void onUserLeaveHint() {
+    if (deviceSupportsPipMode()) {
+      PictureInPictureParams params = new PictureInPictureParams.Builder()
+                                                                .setAspectRatio(new Rational(16, 9))
+                                                                .build();
+      setPictureInPictureParams(params);
+
+      //noinspection deprecation
+      enterPictureInPictureMode();
+    }
+  }
+
+  @Override
+  public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode, Configuration newConfig) {
+    viewModel.setIsInPipMode(isInPictureInPictureMode);
+  }
+
+  private boolean isInPipMode() {
+    return deviceSupportsPipMode() && isInPictureInPictureMode();
+  }
+
   private void processIntent(@NonNull Intent intent) {
     if (ANSWER_ACTION.equals(intent.getAction())) {
-      handleAnswerCall();
+      viewModel.setRecipient(EventBus.getDefault().getStickyEvent(WebRtcViewModel.class).getRecipient());
+      handleAnswerWithAudio();
     } else if (DENY_ACTION.equals(intent.getAction())) {
       handleDenyCall();
     } else if (END_CALL_ACTION.equals(intent.getAction())) {
@@ -142,26 +196,77 @@ public class WebRtcCallActivity extends Activity {
 
   private void initializeResources() {
     callScreen = ViewUtil.findById(this, R.id.callScreen);
-    callScreen.setHangupButtonListener(new HangupButtonListener());
-    callScreen.setIncomingCallActionListener(new IncomingCallActionListener());
-    callScreen.setAudioMuteButtonListener(new AudioMuteButtonListener());
-    callScreen.setVideoMuteButtonListener(new VideoMuteButtonListener());
-    callScreen.setCameraFlipButtonListener(new CameraFlipButtonListener());
-    callScreen.setSpeakerButtonListener(new SpeakerButtonListener());
-    callScreen.setBluetoothButtonListener(new BluetoothButtonListener());
+    callScreen.setControlsListener(new ControlsListener());
   }
 
-  private void handleSetAudioSpeaker(boolean enabled) {
+  private void initializeViewModel() {
+    viewModel = ViewModelProviders.of(this).get(WebRtcCallViewModel.class);
+    viewModel.setIsInPipMode(isInPipMode());
+    viewModel.getRemoteVideoEnabled().observe(this,callScreen::setRemoteVideoEnabled);
+    viewModel.getMicrophoneEnabled().observe(this, callScreen::setMicEnabled);
+    viewModel.getCameraDirection().observe(this, callScreen::setCameraDirection);
+    viewModel.getLocalRenderState().observe(this, callScreen::setLocalRenderState);
+    viewModel.getWebRtcControls().observe(this, callScreen::setWebRtcControls);
+    viewModel.getEvents().observe(this, this::handleViewModelEvent);
+    viewModel.getCallTime().observe(this, this::handleCallTime);
+    viewModel.displaySquareCallCard().observe(this, callScreen::showCallCard);
+  }
+
+  private void handleViewModelEvent(@NonNull WebRtcCallViewModel.Event event) {
+    if (isInPipMode()) {
+      return;
+    }
+
+    switch (event) {
+      case SHOW_VIDEO_TOOLTIP:
+        if (videoTooltip == null) {
+          videoTooltip = TooltipPopup.forTarget(callScreen.getVideoTooltipTarget())
+                                     .setBackgroundTint(ContextCompat.getColor(this, R.color.core_ultramarine))
+                                     .setTextColor(ContextCompat.getColor(this, R.color.core_white))
+                                     .setText(R.string.WebRtcCallActivity__tap_here_to_turn_on_your_video)
+                                     .setOnDismissListener(() -> viewModel.onDismissedVideoTooltip())
+                                     .show(TooltipPopup.POSITION_ABOVE);
+          return;
+        }
+        break;
+      case DISMISS_VIDEO_TOOLTIP:
+        if (videoTooltip != null) {
+          videoTooltip.dismiss();
+          videoTooltip = null;
+        }
+        break;
+      default:
+        throw new IllegalArgumentException("Unknown event: " + event);
+    }
+  }
+
+  private void handleCallTime(long callTime) {
+    EllapsedTimeFormatter ellapsedTimeFormatter = EllapsedTimeFormatter.fromDurationMillis(callTime);
+
+    if (ellapsedTimeFormatter == null) {
+      return;
+    }
+
+    callScreen.setStatus(getString(R.string.WebRtcCallActivity__signal_s, ellapsedTimeFormatter.toString()));
+  }
+
+  private void handleSetAudioHandset() {
     Intent intent = new Intent(this, WebRtcCallService.class);
     intent.setAction(WebRtcCallService.ACTION_SET_AUDIO_SPEAKER);
-    intent.putExtra(WebRtcCallService.EXTRA_SPEAKER, enabled);
     startService(intent);
   }
 
-  private void handleSetAudioBluetooth(boolean enabled) {
+  private void handleSetAudioSpeaker() {
+    Intent intent = new Intent(this, WebRtcCallService.class);
+    intent.setAction(WebRtcCallService.ACTION_SET_AUDIO_SPEAKER);
+    intent.putExtra(WebRtcCallService.EXTRA_SPEAKER, true);
+    startService(intent);
+  }
+
+  private void handleSetAudioBluetooth() {
     Intent intent = new Intent(this, WebRtcCallService.class);
     intent.setAction(WebRtcCallService.ACTION_SET_AUDIO_BLUETOOTH);
-    intent.putExtra(WebRtcCallService.EXTRA_BLUETOOTH, enabled);
+    intent.putExtra(WebRtcCallService.EXTRA_BLUETOOTH, true);
     startService(intent);
   }
 
@@ -173,10 +278,24 @@ public class WebRtcCallActivity extends Activity {
   }
 
   private void handleSetMuteVideo(boolean muted) {
-    Intent intent = new Intent(this, WebRtcCallService.class);
-    intent.setAction(WebRtcCallService.ACTION_SET_ENABLE_VIDEO);
-    intent.putExtra(WebRtcCallService.EXTRA_ENABLE, !muted);
-    startService(intent);
+    Recipient recipient = viewModel.getRecipient().get();
+
+    if (!recipient.equals(Recipient.UNKNOWN)) {
+      String recipientDisplayName = recipient.getDisplayName(this);
+
+      Permissions.with(this)
+                 .request(Manifest.permission.CAMERA)
+                 .ifNecessary()
+                 .withRationaleDialog(getString(R.string.WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera, recipientDisplayName), R.drawable.ic_video_solid_24_tinted)
+                 .withPermanentDenialDialog(getString(R.string.WebRtcCallActivity__to_call_s_signal_needs_access_to_your_camera, recipientDisplayName))
+                 .onAllGranted(() -> {
+                   Intent intent = new Intent(this, WebRtcCallService.class);
+                   intent.setAction(WebRtcCallService.ACTION_SET_ENABLE_VIDEO);
+                   intent.putExtra(WebRtcCallService.EXTRA_ENABLE, !muted);
+                   startService(intent);
+                 })
+                 .execute();
+    }
   }
 
   private void handleFlipCamera() {
@@ -185,18 +304,19 @@ public class WebRtcCallActivity extends Activity {
     startService(intent);
   }
 
-  private void handleAnswerCall() {
-    WebRtcViewModel event = EventBus.getDefault().getStickyEvent(WebRtcViewModel.class);
+  private void handleAnswerWithAudio() {
+    Recipient recipient = viewModel.getRecipient().get();
 
-    if (event != null) {
+    if (!recipient.equals(Recipient.UNKNOWN)) {
       Permissions.with(this)
-                 .request(Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA)
+                 .request(Manifest.permission.RECORD_AUDIO)
                  .ifNecessary()
-                 .withRationaleDialog(getString(R.string.WebRtcCallActivity_to_answer_the_call_from_s_give_signal_access_to_your_microphone, event.getRecipient().toShortString(this)),
-                                      R.drawable.ic_mic_solid_24, R.drawable.ic_video_solid_24_tinted)
+                 .withRationaleDialog(getString(R.string.WebRtcCallActivity_to_answer_the_call_from_s_give_signal_access_to_your_microphone, recipient.getDisplayName(this)),
+                                      R.drawable.ic_mic_solid_24)
                  .withPermanentDenialDialog(getString(R.string.WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls))
                  .onAllGranted(() -> {
-                   callScreen.setActiveCall(event.getRecipient(), getString(R.string.RedPhone_answering), event.getLocalRenderer());
+                   callScreen.setRecipient(recipient);
+                   callScreen.setStatus(getString(R.string.RedPhone_answering));
 
                    Intent intent = new Intent(this, WebRtcCallService.class);
                    intent.setAction(WebRtcCallService.ACTION_ACCEPT_CALL);
@@ -207,15 +327,42 @@ public class WebRtcCallActivity extends Activity {
     }
   }
 
-  private void handleDenyCall() {
-    WebRtcViewModel event = EventBus.getDefault().getStickyEvent(WebRtcViewModel.class);
+  private void handleAnswerWithVideo() {
+    Recipient recipient = viewModel.getRecipient().get();
 
-    if (event != null) {
+    if (!recipient.equals(Recipient.UNKNOWN)) {
+      Permissions.with(this)
+                 .request(Manifest.permission.RECORD_AUDIO, Manifest.permission.CAMERA)
+                 .ifNecessary()
+                 .withRationaleDialog(getString(R.string.WebRtcCallActivity_to_answer_the_call_from_s_give_signal_access_to_your_microphone, recipient.getDisplayName(this)),
+                     R.drawable.ic_mic_solid_24, R.drawable.ic_video_solid_24_tinted)
+                 .withPermanentDenialDialog(getString(R.string.WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls))
+                 .onAllGranted(() -> {
+                   callScreen.setRecipient(recipient);
+                   callScreen.setStatus(getString(R.string.RedPhone_answering));
+
+                   Intent intent = new Intent(this, WebRtcCallService.class);
+                   intent.setAction(WebRtcCallService.ACTION_ACCEPT_CALL);
+                   intent.putExtra(WebRtcCallService.EXTRA_ANSWER_WITH_VIDEO, true);
+                   startService(intent);
+
+                   handleSetMuteVideo(false);
+                 })
+                 .onAnyDenied(this::handleDenyCall)
+                 .execute();
+    }
+  }
+
+  private void handleDenyCall() {
+    Recipient recipient = viewModel.getRecipient().get();
+
+    if (!recipient.equals(Recipient.UNKNOWN)) {
       Intent intent = new Intent(this, WebRtcCallService.class);
       intent.setAction(WebRtcCallService.ACTION_DENY_CALL);
       startService(intent);
 
-      callScreen.setActiveCall(event.getRecipient(), getString(R.string.RedPhone_ending_call), event.getLocalRenderer());
+      callScreen.setRecipient(recipient);
+      callScreen.setStatus(getString(R.string.RedPhone_ending_call));
       delayedFinish();
     }
   }
@@ -228,46 +375,54 @@ public class WebRtcCallActivity extends Activity {
   }
 
   private void handleIncomingCall(@NonNull WebRtcViewModel event) {
-    callScreen.setIncomingCall(event.getRecipient());
+    callScreen.setRecipient(event.getRecipient());
   }
 
   private void handleOutgoingCall(@NonNull WebRtcViewModel event) {
-    callScreen.setActiveCall(event.getRecipient(), getString(R.string.RedPhone_dialing), event.getLocalRenderer());
+    callScreen.setRecipient(event.getRecipient());
+    callScreen.setStatus(getString(R.string.WebRtcCallActivity__calling));
   }
 
-  private void handleTerminate(@NonNull Recipient recipient, @NonNull SurfaceViewRenderer localRenderer /*, int terminationType */) {
-    Log.i(TAG, "handleTerminate called");
+  private void handleTerminate(@NonNull Recipient recipient, @NonNull HangupMessage.Type hangupType) {
+    Log.i(TAG, "handleTerminate called: " + hangupType.name());
+
+    callScreen.setRecipient(recipient);
+    callScreen.setStatusFromHangupType(hangupType);
 
-    callScreen.setActiveCall(recipient, getString(R.string.RedPhone_ending_call), localRenderer);
     EventBus.getDefault().removeStickyEvent(WebRtcViewModel.class);
 
     delayedFinish();
   }
 
   private void handleCallRinging(@NonNull WebRtcViewModel event) {
-    callScreen.setActiveCall(event.getRecipient(), getString(R.string.RedPhone_ringing), event.getLocalRenderer());
+    callScreen.setRecipient(event.getRecipient());
+    callScreen.setStatus(getString(R.string.RedPhone_ringing));
   }
 
   private void handleCallBusy(@NonNull WebRtcViewModel event) {
-    callScreen.setActiveCall(event.getRecipient(), getString(R.string.RedPhone_busy), event.getLocalRenderer());
     EventBus.getDefault().removeStickyEvent(WebRtcViewModel.class);
+    callScreen.setRecipient(event.getRecipient());
+    callScreen.setStatus(getString(R.string.RedPhone_busy));
+
     delayedFinish(BUSY_SIGNAL_DELAY_FINISH);
   }
 
   private void handleCallConnected(@NonNull WebRtcViewModel event) {
     getWindow().addFlags(WindowManager.LayoutParams.FLAG_IGNORE_CHEEK_PRESSES);
-    callScreen.setActiveCall(event.getRecipient(), getString(R.string.RedPhone_connected), "", event.getLocalRenderer(), event.getRemoteRenderer());
+    callScreen.setRecipient(event.getRecipient());
   }
 
   private void handleRecipientUnavailable(@NonNull WebRtcViewModel event) {
-    callScreen.setActiveCall(event.getRecipient(), getString(R.string.RedPhone_recipient_unavailable), event.getLocalRenderer());
     EventBus.getDefault().removeStickyEvent(WebRtcViewModel.class);
+    callScreen.setRecipient(event.getRecipient());
+    callScreen.setStatus(getString(R.string.RedPhone_recipient_unavailable));
     delayedFinish();
   }
 
   private void handleServerFailure(@NonNull WebRtcViewModel event) {
-    callScreen.setActiveCall(event.getRecipient(), getString(R.string.RedPhone_network_failed), event.getLocalRenderer());
     EventBus.getDefault().removeStickyEvent(WebRtcViewModel.class);
+    callScreen.setRecipient(event.getRecipient());
+    callScreen.setStatus(getString(R.string.RedPhone_network_failed));
     delayedFinish();
   }
 
@@ -281,44 +436,63 @@ public class WebRtcCallActivity extends Activity {
     dialog.setPositiveButton(R.string.RedPhone_got_it, new OnClickListener() {
       @Override
       public void onClick(DialogInterface dialog, int which) {
-        WebRtcCallActivity.this.handleTerminate(event.getRecipient(), event.getLocalRenderer());
+        WebRtcCallActivity.this.handleTerminate(event.getRecipient(), HangupMessage.Type.NORMAL);
       }
     });
     dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
       @Override
       public void onCancel(DialogInterface dialog) {
-        WebRtcCallActivity.this.handleTerminate(event.getRecipient(), event.getLocalRenderer());
+        WebRtcCallActivity.this.handleTerminate(event.getRecipient(), HangupMessage.Type.NORMAL);
       }
     });
     dialog.show();
   }
 
   private void handleUntrustedIdentity(@NonNull WebRtcViewModel event) {
-    final IdentityKey theirIdentity = event.getIdentityKey();
-    final Recipient   recipient     = event.getRecipient();
+    final IdentityKey theirKey  = event.getIdentityKey();
+    final Recipient   recipient = event.getRecipient();
 
-    callScreen.setUntrustedIdentity(recipient, theirIdentity);
-    callScreen.setAcceptIdentityListener(new View.OnClickListener() {
-      @Override
-      public void onClick(View v) {
-        synchronized (SESSION_LOCK) {
-          TextSecureIdentityKeyStore identityKeyStore = new TextSecureIdentityKeyStore(WebRtcCallActivity.this);
-          identityKeyStore.saveIdentity(new SignalProtocolAddress(recipient.requireServiceId(), 1), theirIdentity, true);
-        }
+    if (theirKey == null) {
+      handleTerminate(recipient, HangupMessage.Type.NORMAL);
+    }
 
-        Intent intent = new Intent(WebRtcCallActivity.this, WebRtcCallService.class);
-        intent.setAction(WebRtcCallService.ACTION_OUTGOING_CALL)
-              .putExtra(WebRtcCallService.EXTRA_REMOTE_PEER, new RemotePeer(recipient.getId()));
-        startService(intent);
-      }
-    });
+    String          name            = recipient.getDisplayName(this);
+    String          introduction    = getString(R.string.WebRtcCallScreen_new_safety_numbers, name, name);
+    SpannableString spannableString = new SpannableString(introduction + " " + getString(R.string.WebRtcCallScreen_you_may_wish_to_verify_this_contact));
 
-    callScreen.setCancelIdentityButton(new View.OnClickListener() {
-      @Override
-      public void onClick(View v) {
-        handleTerminate(recipient, event.getLocalRenderer());
-      }
-    });
+    spannableString.setSpan(new VerifySpan(this, recipient.getId(), theirKey), introduction.length() + 1, spannableString.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+    AppCompatTextView untrustedIdentityExplanation = new AppCompatTextView(this);
+    untrustedIdentityExplanation.setText(spannableString);
+    untrustedIdentityExplanation.setMovementMethod(LinkMovementMethod.getInstance());
+
+    new AlertDialog.Builder(this)
+                   .setView(untrustedIdentityExplanation)
+                   .setPositiveButton(R.string.WebRtcCallScreen_accept, (d, w) -> {
+                     synchronized (SESSION_LOCK) {
+                       TextSecureIdentityKeyStore identityKeyStore = new TextSecureIdentityKeyStore(WebRtcCallActivity.this);
+                       identityKeyStore.saveIdentity(new SignalProtocolAddress(recipient.requireServiceId(), 1), theirKey, true);
+                     }
+
+                     d.dismiss();
+
+                     Intent intent = new Intent(WebRtcCallActivity.this, WebRtcCallService.class);
+                     intent.setAction(WebRtcCallService.ACTION_OUTGOING_CALL)
+                           .putExtra(WebRtcCallService.EXTRA_REMOTE_PEER, new RemotePeer(recipient.getId()));
+
+                     startService(intent);
+                   })
+                   .setNegativeButton(R.string.WebRtcCallScreen_end_call, (d, w) -> {
+                     d.dismiss();
+                     handleTerminate(recipient, HangupMessage.Type.NORMAL);
+                   })
+                   .show();
+  }
+
+  private boolean deviceSupportsPipMode() {
+    return Build.VERSION.SDK_INT >= 26 &&
+           FeatureFlags.callingPip()   &&
+           getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE);
   }
 
   private void delayedFinish() {
@@ -326,91 +500,112 @@ public class WebRtcCallActivity extends Activity {
   }
 
   private void delayedFinish(int delayMillis) {
-    callScreen.postDelayed(new Runnable() {
-      public void run() {
-        WebRtcCallActivity.this.finish();
-      }
-    }, delayMillis);
+    callScreen.postDelayed(WebRtcCallActivity.this::finish, delayMillis);
   }
 
   @Subscribe(sticky = true, threadMode = ThreadMode.MAIN)
   public void onEventMainThread(final WebRtcViewModel event) {
     Log.i(TAG, "Got message from service: " + event);
 
+    viewModel.setRecipient(event.getRecipient());
+
     switch (event.getState()) {
-      case CALL_CONNECTED:          handleCallConnected(event);                                      break;
-      case NETWORK_FAILURE:         handleServerFailure(event);                                      break;
-      case CALL_RINGING:            handleCallRinging(event);                                        break;
-      case CALL_DISCONNECTED:       handleTerminate(event.getRecipient(), event.getLocalRenderer()); break;
-      case NO_SUCH_USER:            handleNoSuchUser(event);                                         break;
-      case RECIPIENT_UNAVAILABLE:   handleRecipientUnavailable(event);                               break;
-      case CALL_INCOMING:           handleIncomingCall(event);                                       break;
-      case CALL_OUTGOING:           handleOutgoingCall(event);                                       break;
-      case CALL_BUSY:               handleCallBusy(event);                                           break;
-      case UNTRUSTED_IDENTITY:      handleUntrustedIdentity(event);                                  break;
+      case CALL_CONNECTED:          handleCallConnected(event);                                         break;
+      case NETWORK_FAILURE:         handleServerFailure(event);                                         break;
+      case CALL_RINGING:            handleCallRinging(event);                                           break;
+      case CALL_DISCONNECTED:       handleTerminate(event.getRecipient(), HangupMessage.Type.NORMAL);   break;
+      case CALL_ACCEPTED_ELSEWHERE: handleTerminate(event.getRecipient(), HangupMessage.Type.ACCEPTED); break;
+      case CALL_DECLINED_ELSEWHERE: handleTerminate(event.getRecipient(), HangupMessage.Type.DECLINED); break;
+      case CALL_ONGOING_ELSEWHERE:  handleTerminate(event.getRecipient(), HangupMessage.Type.BUSY);     break;
+      case NO_SUCH_USER:            handleNoSuchUser(event);                                            break;
+      case RECIPIENT_UNAVAILABLE:   handleRecipientUnavailable(event);                                  break;
+      case CALL_INCOMING:           handleIncomingCall(event);                                          break;
+      case CALL_OUTGOING:           handleOutgoingCall(event);                                          break;
+      case CALL_BUSY:               handleCallBusy(event);                                              break;
+      case UNTRUSTED_IDENTITY:      handleUntrustedIdentity(event);                                     break;
     }
 
-    callScreen.setRemoteVideoEnabled(event.isRemoteVideoEnabled());
-    callScreen.updateAudioState(event.isBluetoothAvailable(), event.isMicrophoneEnabled());
-    callScreen.setControlsEnabled(event.getState() != WebRtcViewModel.State.CALL_INCOMING);
-    callScreen.setLocalVideoState(event.getLocalCameraState(), event.getLocalRenderer());
+    callScreen.setLocalRenderer(event.getLocalRenderer());
+    callScreen.setRemoteRenderer(event.getRemoteRenderer());
 
-    if (event.getLocalCameraState().getCameraCount() > 0 && enableVideoIfAvailable) {
+    boolean enableVideo = event.getLocalCameraState().getCameraCount() > 0 && enableVideoIfAvailable;
+
+    viewModel.updateFromWebRtcViewModel(event, enableVideo);
+
+    if (enableVideo) {
       enableVideoIfAvailable = false;
       handleSetMuteVideo(false);
     }
   }
 
-  private class HangupButtonListener implements WebRtcCallScreen.HangupButtonListener {
-    public void onClick() {
+  private final class ControlsListener implements WebRtcCallView.ControlsListener {
+
+    @Override
+    public void onControlsFadeOut() {
+      if (videoTooltip != null) {
+        videoTooltip.dismiss();
+      }
+    }
+
+    @Override
+    public void onAudioOutputChanged(@NonNull WebRtcAudioOutput audioOutput) {
+      switch (audioOutput) {
+        case HANDSET:
+          handleSetAudioHandset();
+          break;
+        case HEADSET:
+          handleSetAudioBluetooth();
+          break;
+        case SPEAKER:
+          handleSetAudioSpeaker();
+          break;
+        default:
+          throw new IllegalStateException("Unknown output: " + audioOutput);
+      }
+    }
+
+    @Override
+    public void onVideoChanged(boolean isVideoEnabled) {
+      handleSetMuteVideo(!isVideoEnabled);
+    }
+
+    @Override
+    public void onMicChanged(boolean isMicEnabled) {
+      handleSetMuteAudio(!isMicEnabled);
+    }
+
+    @Override
+    public void onCameraDirectionChanged() {
+      handleFlipCamera();
+    }
+
+    @Override
+    public void onEndCallPressed() {
       handleEndCall();
     }
-  }
 
-  private class AudioMuteButtonListener implements WebRtcCallControls.MuteButtonListener {
     @Override
-    public void onToggle(boolean isMuted) {
-      WebRtcCallActivity.this.handleSetMuteAudio(isMuted);
-    }
-  }
-
-  private class VideoMuteButtonListener implements WebRtcCallControls.MuteButtonListener {
-    @Override
-    public void onToggle(boolean isMuted) {
-      WebRtcCallActivity.this.handleSetMuteVideo(isMuted);
-    }
-  }
-
-  private class CameraFlipButtonListener implements WebRtcCallControls.CameraFlipButtonListener {
-    @Override
-    public void onToggle() {
-      WebRtcCallActivity.this.handleFlipCamera();
-    }
-  }
-
-  private class SpeakerButtonListener implements WebRtcCallControls.SpeakerButtonListener {
-    @Override
-    public void onSpeakerChange(boolean isSpeaker) {
-      WebRtcCallActivity.this.handleSetAudioSpeaker(isSpeaker);
-    }
-  }
-
-  private class BluetoothButtonListener implements WebRtcCallControls.BluetoothButtonListener {
-    @Override
-    public void onBluetoothChange(boolean isBluetooth) {
-      WebRtcCallActivity.this.handleSetAudioBluetooth(isBluetooth);
-    }
-  }
-
-  private class IncomingCallActionListener implements WebRtcAnswerDeclineButton.AnswerDeclineListener {
-    @Override
-    public void onAnswered() {
-      WebRtcCallActivity.this.handleAnswerCall();
+    public void onDenyCallPressed() {
+      handleDenyCall();
     }
 
     @Override
-    public void onDeclined() {
-      WebRtcCallActivity.this.handleDenyCall();
+    public void onAcceptCallWithVoiceOnlyPressed() {
+      handleAnswerWithAudio();
+    }
+
+    @Override
+    public void onAcceptCallPressed() {
+      if (viewModel.isAnswerWithVideoAvailable()) {
+        handleAnswerWithVideo();
+      } else {
+        handleAnswerWithAudio();
+      }
+    }
+
+    @Override
+    public void onDownCaretPressed() {
+
     }
   }
 

app/src/main/java/org/thoughtcrime/securesms/animation/transitions/CircleSquareImageViewTransition.java

@@ -0,0 +1,83 @@
+package org.thoughtcrime.securesms.animation.transitions;
+
+import android.animation.Animator;
+import android.animation.ObjectAnimator;
+import android.annotation.TargetApi;
+import android.graphics.drawable.Drawable;
+import android.transition.Transition;
+import android.transition.TransitionValues;
+import android.util.Property;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import androidx.core.graphics.drawable.RoundedBitmapDrawable;
+
+@TargetApi(21)
+abstract class CircleSquareImageViewTransition extends Transition {
+
+  private static final String CIRCLE_RATIO = "CIRCLE_RATIO";
+
+  private final boolean toCircle;
+
+  CircleSquareImageViewTransition(boolean toCircle) {
+    this.toCircle = toCircle;
+  }
+
+  @Override
+  public void captureStartValues(TransitionValues transitionValues) {
+    View view = transitionValues.view;
+    if (view instanceof ImageView) {
+      transitionValues.values.put(CIRCLE_RATIO, toCircle ? 0f : 1f);
+    }
+  }
+
+  @Override
+  public void captureEndValues(TransitionValues transitionValues) {
+    View view = transitionValues.view;
+    if (view instanceof ImageView) {
+      transitionValues.values.put(CIRCLE_RATIO, toCircle ? 1f : 0f);
+    }
+  }
+
+  @Override
+  public Animator createAnimator(ViewGroup sceneRoot, TransitionValues startValues, TransitionValues endValues) {
+    if (startValues == null || endValues == null) {
+      return null;
+    }
+
+    ImageView endImageView = (ImageView) endValues.view;
+    float     start        = (float) startValues.values.get(CIRCLE_RATIO);
+    float     end          = (float) endValues.values.get(CIRCLE_RATIO);
+
+    return ObjectAnimator.ofFloat(endImageView, new RadiusRatioProperty(), start, end);
+  }
+
+  static final class RadiusRatioProperty extends Property<ImageView, Float> {
+
+    private float ratio;
+
+    RadiusRatioProperty() {
+      super(Float.class, "circle_ratio");
+    }
+
+    @Override
+    final public void set(ImageView imageView, Float ratio) {
+      this.ratio = ratio;
+      Drawable imageViewDrawable = imageView.getDrawable();
+      if (imageViewDrawable instanceof RoundedBitmapDrawable) {
+        RoundedBitmapDrawable drawable = (RoundedBitmapDrawable) imageViewDrawable;
+        if (ratio > 0.95) {
+          drawable.setCircular(true);
+        } else {
+          drawable.setCornerRadius(Math.min(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight()) * ratio * 0.5f);
+        }
+      }
+    }
+
+    @Override
+    public Float get(ImageView object) {
+      return ratio;
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/animation/transitions/CircleToSquareImageViewTransition.java

@@ -0,0 +1,15 @@
+package org.thoughtcrime.securesms.animation.transitions;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.util.AttributeSet;
+
+/**
+ * Will only transition {@link android.widget.ImageView}s that contain a {@link androidx.core.graphics.drawable.RoundedBitmapDrawable}.
+ */
+@TargetApi(21)
+public final class CircleToSquareImageViewTransition extends CircleSquareImageViewTransition {
+  public CircleToSquareImageViewTransition(Context context, AttributeSet attrs) {
+    super(false);
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/animation/transitions/SquareToCircleImageViewTransition.java

@@ -0,0 +1,15 @@
+package org.thoughtcrime.securesms.animation.transitions;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.util.AttributeSet;
+
+/**
+ * Will only transition {@link android.widget.ImageView}s that contain a {@link androidx.core.graphics.drawable.RoundedBitmapDrawable}.
+ */
+@TargetApi(21)
+public final class SquareToCircleImageViewTransition extends CircleSquareImageViewTransition {
+  public SquareToCircleImageViewTransition(Context context, AttributeSet attrs) {
+    super(true);
+  }
+}

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

@@ -1,9 +1,11 @@
 package org.thoughtcrime.securesms.attachments;
 
 import android.net.Uri;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.thoughtcrime.securesms.audio.AudioHash;
 import org.thoughtcrime.securesms.blurhash.BlurHash;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.database.AttachmentDatabase.TransformProperties;
@@ -19,6 +21,8 @@ public abstract class Attachment {
   @Nullable
   private final String fileName;
 
+  private final int    cdnNumber;
+
   @Nullable
   private final String  location;
 
@@ -35,10 +39,10 @@ public abstract class Attachment {
   private final String fastPreflightId;
 
   private final boolean voiceNote;
-  private final int width;
-  private final int height;
-
+  private final int     width;
+  private final int     height;
   private final boolean quote;
+  private final long    uploadTimestamp;
 
   @Nullable
   private final String caption;
@@ -49,19 +53,24 @@ public abstract class Attachment {
   @Nullable
   private final BlurHash blurHash;
 
+  @Nullable
+  private final AudioHash audioHash;
+
   @NonNull
   private final TransformProperties transformProperties;
 
   public Attachment(@NonNull String contentType, int transferState, long size, @Nullable String fileName,
-                    @Nullable String location, @Nullable String key, @Nullable String relay,
+                    int cdnNumber, @Nullable String location, @Nullable String key, @Nullable String relay,
                     @Nullable byte[] digest, @Nullable String fastPreflightId, boolean voiceNote,
-                    int width, int height, boolean quote, @Nullable String caption, @Nullable StickerLocator stickerLocator,
-                    @Nullable BlurHash blurHash, @Nullable TransformProperties transformProperties)
+                    int width, int height, boolean quote, long uploadTimestamp, @Nullable String caption,
+                    @Nullable StickerLocator stickerLocator, @Nullable BlurHash blurHash, @Nullable AudioHash audioHash,
+                    @Nullable TransformProperties transformProperties)
   {
     this.contentType         = contentType;
     this.transferState       = transferState;
     this.size                = size;
     this.fileName            = fileName;
+    this.cdnNumber           = cdnNumber;
     this.location            = location;
     this.key                 = key;
     this.relay               = relay;
@@ -71,9 +80,11 @@ public abstract class Attachment {
     this.width               = width;
     this.height              = height;
     this.quote               = quote;
+    this.uploadTimestamp     = uploadTimestamp;
     this.stickerLocator      = stickerLocator;
     this.caption             = caption;
     this.blurHash            = blurHash;
+    this.audioHash           = audioHash;
     this.transformProperties = transformProperties != null ? transformProperties : TransformProperties.empty();
   }
 
@@ -106,6 +117,10 @@ public abstract class Attachment {
     return contentType;
   }
 
+  public int getCdnNumber() {
+    return cdnNumber;
+  }
+
   @Nullable
   public String getLocation() {
     return location;
@@ -147,6 +162,10 @@ public abstract class Attachment {
     return quote;
   }
 
+  public long getUploadTimestamp() {
+    return uploadTimestamp;
+  }
+
   public boolean isSticker() {
     return stickerLocator != null;
   }
@@ -159,6 +178,10 @@ public abstract class Attachment {
     return blurHash;
   }
 
+  public @Nullable AudioHash getAudioHash() {
+    return audioHash;
+  }
+
   public @Nullable String getCaption() {
     return caption;
   }

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

@@ -2,11 +2,10 @@ package org.thoughtcrime.securesms.attachments;
 
 import android.net.Uri;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.thoughtcrime.securesms.audio.AudioHash;
 import org.thoughtcrime.securesms.blurhash.BlurHash;
-import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.database.AttachmentDatabase.TransformProperties;
 import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.stickers.StickerLocator;
@@ -24,13 +23,14 @@ public class DatabaseAttachment extends Attachment {
   public DatabaseAttachment(AttachmentId attachmentId, long mmsId,
                             boolean hasData, boolean hasThumbnail,
                             String contentType, int transferProgress, long size,
-                            String fileName, String location, String key, String relay,
+                            String fileName, int cdnNumber, String location, String key, String relay,
                             byte[] digest, String fastPreflightId, boolean voiceNote,
                             int width, int height, boolean quote, @Nullable String caption,
-                            @Nullable StickerLocator stickerLocator, @Nullable BlurHash blurHash,
-                            @Nullable TransformProperties transformProperties, int displayOrder)
+                            @Nullable StickerLocator stickerLocator, @Nullable BlurHash blurHash, @Nullable AudioHash audioHash,
+                            @Nullable TransformProperties transformProperties, int displayOrder,
+                            long uploadTimestamp)
   {
-    super(contentType, transferProgress, size, fileName, location, key, relay, digest, fastPreflightId, voiceNote, width, height, quote, caption, stickerLocator, blurHash, transformProperties);
+    super(contentType, transferProgress, size, fileName, cdnNumber, location, key, relay, digest, fastPreflightId, voiceNote, width, height, quote, uploadTimestamp, caption, stickerLocator, blurHash, audioHash, transformProperties);
     this.attachmentId = attachmentId;
     this.hasData      = hasData;
     this.hasThumbnail = hasThumbnail;

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

@@ -10,7 +10,7 @@ import org.thoughtcrime.securesms.database.MmsDatabase;
 public class MmsNotificationAttachment extends Attachment {
 
   public MmsNotificationAttachment(int status, long size) {
-    super("application/mms", getTransferStateFromStatus(status), size, null, null, null, null, null, null, false, 0, 0, false, null, null, null, null);
+    super("application/mms", getTransferStateFromStatus(status), size, null, 0, null, null, null, null, null, false, 0, 0, false, 0, null, null, null, null, null);
   }
 
   @Nullable

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

@@ -4,6 +4,7 @@ import android.net.Uri;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.thoughtcrime.securesms.audio.AudioHash;
 import org.thoughtcrime.securesms.blurhash.BlurHash;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.stickers.StickerLocator;
@@ -18,13 +19,13 @@ import java.util.List;
 public class PointerAttachment extends Attachment {
 
   private PointerAttachment(@NonNull String contentType, int transferState, long size,
-                            @Nullable String fileName,  @NonNull String location,
+                            @Nullable String fileName, int cdnNumber, @NonNull String location,
                             @Nullable String key, @Nullable String relay,
                             @Nullable byte[] digest, @Nullable String fastPreflightId, boolean voiceNote,
-                            int width, int height, @Nullable String caption, @Nullable StickerLocator stickerLocator,
+                            int width, int height, long uploadTimestamp, @Nullable String caption, @Nullable StickerLocator stickerLocator,
                             @Nullable BlurHash blurHash)
   {
-    super(contentType, transferState, size, fileName, location, key, relay, digest, fastPreflightId, voiceNote, width, height, false, caption, stickerLocator, blurHash, null);
+    super(contentType, transferState, size, fileName, cdnNumber, location, key, relay, digest, fastPreflightId, voiceNote, width, height, false, uploadTimestamp, caption, stickerLocator, blurHash, null, null);
   }
 
   @Nullable
@@ -93,13 +94,15 @@ public class PointerAttachment extends Attachment {
                                       AttachmentDatabase.TRANSFER_PROGRESS_PENDING,
                                       pointer.get().asPointer().getSize().or(0),
                                       pointer.get().asPointer().getFileName().orNull(),
-                                      String.valueOf(pointer.get().asPointer().getId()),
+                                      pointer.get().asPointer().getCdnNumber(),
+                                      pointer.get().asPointer().getRemoteId().toString(),
                                       encodedKey, null,
                                       pointer.get().asPointer().getDigest().orNull(),
                                       fastPreflightId,
                                       pointer.get().asPointer().getVoiceNote(),
                                       pointer.get().asPointer().getWidth(),
                                       pointer.get().asPointer().getHeight(),
+                                      pointer.get().asPointer().getUploadTimestamp(),
                                       pointer.get().asPointer().getCaption().orNull(),
                                       stickerLocator,
                                       BlurHash.parseOrNull(pointer.get().asPointer().getBlurHash().orNull())));
@@ -113,7 +116,8 @@ public class PointerAttachment extends Attachment {
                                              AttachmentDatabase.TRANSFER_PROGRESS_PENDING,
                                              thumbnail != null ? thumbnail.asPointer().getSize().or(0) : 0,
                                              pointer.getFileName(),
-                                             String.valueOf(thumbnail != null ? thumbnail.asPointer().getId() : 0),
+                                             thumbnail != null ? thumbnail.asPointer().getCdnNumber() : 0,
+                                             thumbnail != null ? thumbnail.asPointer().getRemoteId().toString() : "0",
                                              thumbnail != null && thumbnail.asPointer().getKey() != null ? Base64.encodeBytes(thumbnail.asPointer().getKey()) : null,
                                              null,
                                              thumbnail != null ? thumbnail.asPointer().getDigest().orNull() : null,
@@ -121,6 +125,7 @@ public class PointerAttachment extends Attachment {
                                              false,
                                              thumbnail != null ? thumbnail.asPointer().getWidth() : 0,
                                              thumbnail != null ? thumbnail.asPointer().getHeight() : 0,
+                                             thumbnail != null ? thumbnail.asPointer().getUploadTimestamp() : 0,
                                              thumbnail != null ? thumbnail.asPointer().getCaption().orNull() : null,
                                              null,
                                              null));

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

@@ -16,7 +16,7 @@ import org.thoughtcrime.securesms.database.AttachmentDatabase;
 public class TombstoneAttachment extends Attachment {
 
   public TombstoneAttachment(@NonNull String contentType, boolean quote) {
-    super(contentType, AttachmentDatabase.TRANSFER_PROGRESS_DONE, 0, null, null, null, null, null, null, false, 0, 0, quote, null, null, null, null);
+    super(contentType, AttachmentDatabase.TRANSFER_PROGRESS_DONE, 0, null, 0, null, null, null, null, null, false, 0, 0, quote, 0, null, null, null, null, null);
   }
 
   @Override

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

@@ -1,11 +1,12 @@
 package org.thoughtcrime.securesms.attachments;
 
 import android.net.Uri;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.thoughtcrime.securesms.audio.AudioHash;
 import org.thoughtcrime.securesms.blurhash.BlurHash;
-import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.database.AttachmentDatabase.TransformProperties;
 import org.thoughtcrime.securesms.stickers.StickerLocator;
 
@@ -16,18 +17,18 @@ public class UriAttachment extends Attachment {
 
   public UriAttachment(@NonNull Uri uri, @NonNull String contentType, int transferState, long size,
                        @Nullable String fileName, boolean voiceNote, boolean quote, @Nullable String caption,
-                       @Nullable StickerLocator stickerLocator, @Nullable BlurHash blurHash, @Nullable TransformProperties transformProperties)
+                       @Nullable StickerLocator stickerLocator, @Nullable BlurHash blurHash, @Nullable AudioHash audioHash, @Nullable TransformProperties transformProperties)
   {
-    this(uri, uri, contentType, transferState, size, 0, 0, fileName, null, voiceNote, quote, caption, stickerLocator, blurHash, transformProperties);
+    this(uri, uri, contentType, transferState, size, 0, 0, fileName, null, voiceNote, quote, caption, stickerLocator, blurHash, audioHash, transformProperties);
   }
 
   public UriAttachment(@NonNull Uri dataUri, @Nullable Uri thumbnailUri,
                        @NonNull String contentType, int transferState, long size, int width, int height,
                        @Nullable String fileName, @Nullable String fastPreflightId,
                        boolean voiceNote, boolean quote, @Nullable String caption, @Nullable StickerLocator stickerLocator,
-                       @Nullable BlurHash blurHash, @Nullable TransformProperties transformProperties)
+                       @Nullable BlurHash blurHash, @Nullable AudioHash audioHash, @Nullable TransformProperties transformProperties)
   {
-    super(contentType, transferState, size, fileName, null, null, null, null, fastPreflightId, voiceNote, width, height, quote, caption, stickerLocator, blurHash, transformProperties);
+    super(contentType, transferState, size, fileName, 0, null, null, null, null, fastPreflightId, voiceNote, width, height, quote, 0, caption, stickerLocator, blurHash, audioHash, transformProperties);
     this.dataUri      = dataUri;
     this.thumbnailUri = thumbnailUri;
   }

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

@@ -0,0 +1,57 @@
+package org.thoughtcrime.securesms.audio;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.thoughtcrime.securesms.database.model.databaseprotos.AudioWaveFormData;
+import org.whispersystems.util.Base64;
+
+import java.io.IOException;
+
+/**
+ * An AudioHash is a compact string representation of the wave form and duration for an audio file.
+ */
+public final class AudioHash {
+
+  @NonNull private final String            hash;
+  @NonNull private final AudioWaveFormData audioWaveForm;
+
+  private AudioHash(@NonNull String hash, @NonNull AudioWaveFormData audioWaveForm) {
+    this.hash          = hash;
+    this.audioWaveForm = audioWaveForm;
+  }
+
+  public AudioHash(@NonNull AudioWaveFormData audioWaveForm) {
+    this(Base64.encodeBytes(audioWaveForm.toByteArray()), audioWaveForm);
+  }
+
+  public static @Nullable AudioHash parseOrNull(@Nullable String hash) {
+    if (hash == null) return null;
+    try {
+      return new AudioHash(hash, AudioWaveFormData.parseFrom(Base64.decode(hash)));
+    } catch (IOException e) {
+      return null;
+    }
+  }
+
+  @NonNull AudioWaveFormData getAudioWaveForm() {
+    return audioWaveForm;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    AudioHash other = (AudioHash) o;
+    return hash.equals(other.hash);
+  }
+
+  @Override
+  public int hashCode() {
+    return hash.hashCode();
+  }
+
+  public @NonNull String getHash() {
+    return hash;
+  }
+}

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

@@ -0,0 +1,300 @@
+package org.thoughtcrime.securesms.audio;
+
+import android.content.Context;
+import android.media.MediaCodec;
+import android.media.MediaExtractor;
+import android.media.MediaFormat;
+import android.net.Uri;
+import android.os.Build;
+import android.util.LruCache;
+
+import androidx.annotation.AnyThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.WorkerThread;
+import androidx.core.util.Consumer;
+
+import com.google.protobuf.ByteString;
+
+import org.thoughtcrime.securesms.attachments.Attachment;
+import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.model.databaseprotos.AudioWaveFormData;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.media.DecryptableUriMediaInput;
+import org.thoughtcrime.securesms.media.MediaInput;
+import org.thoughtcrime.securesms.mms.AudioSlide;
+import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.util.concurrent.SerialExecutor;
+import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Locale;
+import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
+
+@RequiresApi(api = Build.VERSION_CODES.M)
+public final class AudioWaveForm {
+
+  private static final String TAG = Log.tag(AudioWaveForm.class);
+
+  private static final int BAR_COUNT       = 46;
+  private static final int SAMPLES_PER_BAR =  4;
+
+  private final Context    context;
+  private final AudioSlide slide;
+
+  public AudioWaveForm(@NonNull Context context, @NonNull AudioSlide slide) {
+    this.context = context.getApplicationContext();
+    this.slide   = slide;
+  }
+
+  private static final LruCache<String, AudioFileInfo> WAVE_FORM_CACHE        = new LruCache<>(200);
+  private static final Executor                        AUDIO_DECODER_EXECUTOR = new SerialExecutor(SignalExecutors.BOUNDED);
+
+  @AnyThread
+  public void getWaveForm(@NonNull Consumer<AudioFileInfo> onSuccess, @NonNull Runnable onFailure) {
+    Uri        uri        = slide.getUri();
+    Attachment attachment = slide.asAttachment();
+
+    if (uri == null) {
+      Log.w(TAG, "No uri");
+      Util.runOnMain(onFailure);
+      return;
+    }
+
+    if (!(attachment instanceof DatabaseAttachment)) {
+      Log.i(TAG, "Not yet in database");
+      Util.runOnMain(onFailure);
+      return;
+    }
+
+    String        cacheKey = uri.toString();
+    AudioFileInfo cached   = WAVE_FORM_CACHE.get(cacheKey);
+    if (cached != null) {
+      Log.i(TAG, "Loaded wave form from cache " + cacheKey);
+      Util.runOnMain(() -> onSuccess.accept(cached));
+      return;
+    }
+
+    AUDIO_DECODER_EXECUTOR.execute(() -> {
+      AudioFileInfo cachedInExecutor = WAVE_FORM_CACHE.get(cacheKey);
+      if (cachedInExecutor != null) {
+        Log.i(TAG, "Loaded wave form from cache inside executor" + cacheKey);
+        Util.runOnMain(() -> onSuccess.accept(cachedInExecutor));
+        return;
+      }
+
+      AudioHash audioHash = attachment.getAudioHash();
+      if (audioHash != null) {
+        AudioFileInfo audioFileInfo = AudioFileInfo.fromDatabaseProtobuf(audioHash.getAudioWaveForm());
+        if (audioFileInfo.waveForm.length != BAR_COUNT) {
+          Log.w(TAG, "Wave form from database does not match bar count, regenerating " + cacheKey);
+        } else {
+          WAVE_FORM_CACHE.put(cacheKey, audioFileInfo);
+          Log.i(TAG, "Loaded wave form from DB " + cacheKey);
+          Util.runOnMain(() -> onSuccess.accept(audioFileInfo));
+          return;
+        }
+      }
+
+      try {
+        DatabaseAttachment dbAttachment = (DatabaseAttachment) attachment;
+        long               startTime    = System.currentTimeMillis();
+        AudioFileInfo      fileInfo     = generateWaveForm(uri);
+
+        Log.i(TAG, String.format(Locale.US, "Audio wave form generation time %d ms (%s)", System.currentTimeMillis() - startTime, cacheKey));
+
+        DatabaseFactory.getAttachmentDatabase(context).writeAudioHash(dbAttachment.getAttachmentId(), fileInfo.toDatabaseProtobuf());
+
+        WAVE_FORM_CACHE.put(cacheKey, fileInfo);
+        Util.runOnMain(() -> onSuccess.accept(fileInfo));
+      } catch (Throwable e) {
+        Log.w(TAG, "Failed to create audio wave form for " + cacheKey, e);
+        Util.runOnMain(onFailure);
+      }
+    });
+  }
+
+  /**
+   * Based on decode sample from:
+   * <p>
+   * https://android.googlesource.com/platform/cts/+/jb-mr2-release/tests/tests/media/src/android/media/cts/DecoderTest.java
+   */
+  @WorkerThread
+  @RequiresApi(api = 23)
+  private @NonNull AudioFileInfo generateWaveForm(@NonNull Uri uri) throws IOException {
+    try (MediaInput dataSource = DecryptableUriMediaInput.createForUri(context, uri)) {
+      long[] wave        = new long[BAR_COUNT];
+      int[]  waveSamples = new int[BAR_COUNT];
+
+      MediaExtractor extractor = dataSource.createExtractor();
+
+      if (extractor.getTrackCount() == 0) {
+        throw new IOException("No audio track");
+      }
+
+      MediaFormat format = extractor.getTrackFormat(0);
+
+      if (!format.containsKey(MediaFormat.KEY_DURATION)) {
+        throw new IOException("Unknown duration");
+      }
+
+      long   totalDurationUs = format.getLong(MediaFormat.KEY_DURATION);
+      String mime            = format.getString(MediaFormat.KEY_MIME);
+
+      if (!mime.startsWith("audio/")) {
+        throw new IOException("Mime not audio");
+      }
+
+      MediaCodec codec = MediaCodec.createDecoderByType(mime);
+
+      if (totalDurationUs == 0) {
+        throw new IOException("Zero duration");
+      }
+
+      codec.configure(format, null, null, 0);
+      codec.start();
+
+      ByteBuffer[] codecInputBuffers  = codec.getInputBuffers();
+      ByteBuffer[] codecOutputBuffers = codec.getOutputBuffers();
+
+      extractor.selectTrack(0);
+
+      long                  kTimeOutUs      = 5000;
+      MediaCodec.BufferInfo info            = new MediaCodec.BufferInfo();
+      boolean               sawInputEOS     = false;
+      boolean               sawOutputEOS    = false;
+      int                   noOutputCounter = 0;
+
+      while (!sawOutputEOS && noOutputCounter < 50) {
+        noOutputCounter++;
+        if (!sawInputEOS) {
+          int inputBufIndex = codec.dequeueInputBuffer(kTimeOutUs);
+          if (inputBufIndex >= 0) {
+            ByteBuffer dstBuf             = codecInputBuffers[inputBufIndex];
+            int        sampleSize         = extractor.readSampleData(dstBuf, 0);
+            long       presentationTimeUs = 0;
+
+            if (sampleSize < 0) {
+              sawInputEOS = true;
+              sampleSize  = 0;
+            } else {
+              presentationTimeUs = extractor.getSampleTime();
+            }
+
+            codec.queueInputBuffer(
+              inputBufIndex,
+              0,
+              sampleSize,
+              presentationTimeUs,
+              sawInputEOS ? MediaCodec.BUFFER_FLAG_END_OF_STREAM : 0);
+
+            if (!sawInputEOS) {
+              int barSampleIndex = (int) (SAMPLES_PER_BAR * (wave.length * extractor.getSampleTime()) / totalDurationUs);
+              sawInputEOS = !extractor.advance();
+              int nextBarSampleIndex = (int) (SAMPLES_PER_BAR * (wave.length * extractor.getSampleTime()) / totalDurationUs);
+              while (!sawInputEOS && nextBarSampleIndex == barSampleIndex) {
+                sawInputEOS = !extractor.advance();
+                if (!sawInputEOS) {
+                  nextBarSampleIndex = (int) (SAMPLES_PER_BAR * (wave.length * extractor.getSampleTime()) / totalDurationUs);
+                }
+              }
+            }
+          }
+        }
+
+        int outputBufferIndex;
+        do {
+          outputBufferIndex = codec.dequeueOutputBuffer(info, kTimeOutUs);
+          if (outputBufferIndex >= 0) {
+            if (info.size > 0) {
+              noOutputCounter = 0;
+            }
+
+            ByteBuffer buf = codecOutputBuffers[outputBufferIndex];
+            int barIndex = (int) ((wave.length * info.presentationTimeUs) / totalDurationUs);
+            long total = 0;
+            for (int i = 0; i < info.size; i += 2 * 4) {
+              short aShort = buf.getShort(i);
+              total += Math.abs(aShort);
+            }
+            if (barIndex >= 0 && barIndex < wave.length) {
+              wave[barIndex] += total;
+              waveSamples[barIndex] += info.size / 2;
+            }
+            codec.releaseOutputBuffer(outputBufferIndex, false);
+            if ((info.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0) {
+              sawOutputEOS = true;
+            }
+          } else if (outputBufferIndex == MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED) {
+            codecOutputBuffers = codec.getOutputBuffers();
+          } else if (outputBufferIndex == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
+            Log.d(TAG, "output format has changed to " + codec.getOutputFormat());
+          }
+        } while (outputBufferIndex >= 0);
+      }
+
+      codec.stop();
+      codec.release();
+      extractor.release();
+
+      float[] floats = new float[BAR_COUNT];
+      byte[]  bytes  = new byte[BAR_COUNT];
+      float   max    = 0;
+
+      for (int i = 0; i < BAR_COUNT; i++) {
+        if (waveSamples[i] == 0) continue;
+
+        floats[i] = wave[i] / (float) waveSamples[i];
+        if (floats[i] > max) {
+          max = floats[i];
+        }
+      }
+
+      for (int i = 0; i < BAR_COUNT; i++) {
+        float normalized = floats[i] / max;
+        bytes[i] = (byte) (255 * normalized);
+      }
+
+      return new AudioFileInfo(totalDurationUs, bytes);
+    }
+  }
+
+  public static class AudioFileInfo {
+    private final long    durationUs;
+    private final byte[]  waveFormBytes;
+    private final float[] waveForm;
+
+    private static @NonNull AudioFileInfo fromDatabaseProtobuf(@NonNull AudioWaveFormData audioWaveForm) {
+      return new AudioFileInfo(audioWaveForm.getDurationUs(), audioWaveForm.getWaveForm().toByteArray());
+    }
+
+    private AudioFileInfo(long durationUs, byte[] waveFormBytes) {
+      this.durationUs    = durationUs;
+      this.waveFormBytes = waveFormBytes;
+      this.waveForm      = new float[waveFormBytes.length];
+
+      for (int i = 0; i < waveFormBytes.length; i++) {
+        int unsigned = waveFormBytes[i] & 0xff;
+        this.waveForm[i] = unsigned / 255f;
+      }
+    }
+
+    public long getDuration(@NonNull TimeUnit timeUnit) {
+      return timeUnit.convert(durationUs, TimeUnit.MICROSECONDS);
+    }
+
+    public float[] getWaveForm() {
+      return waveForm;
+    }
+
+    private @NonNull AudioWaveFormData toDatabaseProtobuf() {
+      return AudioWaveFormData.newBuilder()
+                              .setDurationUs(durationUs)
+                              .setWaveForm(ByteString.copyFrom(waveFormBytes))
+                              .build();
+    }
+  }
+}

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

@@ -30,6 +30,7 @@ import org.thoughtcrime.securesms.database.OneTimePreKeyDatabase;
 import org.thoughtcrime.securesms.database.SearchDatabase;
 import org.thoughtcrime.securesms.database.SessionDatabase;
 import org.thoughtcrime.securesms.database.SignedPreKeyDatabase;
+import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.thoughtcrime.securesms.database.StickerDatabase;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
@@ -40,7 +41,6 @@ import org.whispersystems.libsignal.kdf.HKDFv3;
 import org.whispersystems.libsignal.util.ByteUtil;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -96,7 +96,9 @@ public class FullBackupExporter extends FullBackupBase {
 
       for (String table : tables) {
         if (table.equals(MmsDatabase.TABLE_NAME)) {
-          count = exportTable(table, input, outputStream, FullBackupExporter::isNonExpiringMessage, null, count);
+          count = exportTable(table, input, outputStream, FullBackupExporter::isNonExpiringMmsMessage, null, count);
+        } else if (table.equals(SmsDatabase.TABLE_NAME)) {
+          count = exportTable(table, input, outputStream, FullBackupExporter::isNonExpiringSmsMessage, null, count);
         } else if (table.equals(GroupReceiptDatabase.TABLE_NAME)) {
           count = exportTable(table, input, outputStream, cursor -> isForNonExpiringMessage(input, cursor.getLong(cursor.getColumnIndexOrThrow(GroupReceiptDatabase.MMS_ID))), null, count);
         } else if (table.equals(AttachmentDatabase.TABLE_NAME)) {
@@ -283,11 +285,15 @@ public class FullBackupExporter extends FullBackupBase {
     return result;
   }
 
-  private static boolean isNonExpiringMessage(@NonNull Cursor cursor) {
+  private static boolean isNonExpiringMmsMessage(@NonNull Cursor cursor) {
     return cursor.getInt(cursor.getColumnIndexOrThrow(MmsSmsColumns.EXPIRES_IN)) <= 0 &&
            cursor.getInt(cursor.getColumnIndexOrThrow(MmsDatabase.VIEW_ONCE))    <= 0;
   }
 
+  private static boolean isNonExpiringSmsMessage(@NonNull Cursor cursor) {
+    return cursor.getInt(cursor.getColumnIndexOrThrow(MmsSmsColumns.EXPIRES_IN)) <= 0;
+  }
+
   private static boolean isForNonExpiringMessage(@NonNull SQLiteDatabase db, long mmsId) {
     String[] columns = new String[] { MmsDatabase.EXPIRES_IN, MmsDatabase.VIEW_ONCE};
     String   where   = MmsDatabase.ID + " = ?";

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

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.color;
 
 import android.content.Context;
 import android.graphics.Color;
+
 import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
 import androidx.annotation.NonNull;
@@ -26,6 +27,7 @@ public enum MaterialColor {
   PLUM       (R.color.conversation_plumb,       R.color.conversation_plumb_tint,       R.color.conversation_plumb_shade,       "pink"),
   TAUPE      (R.color.conversation_taupe,       R.color.conversation_taupe_tint,       R.color.conversation_taupe_shade,       "blue_grey"),
   STEEL      (R.color.conversation_steel,       R.color.conversation_steel_tint,       R.color.conversation_steel_shade,       "grey"),
+  ULTRAMARINE(R.color.conversation_ultramarine, R.color.conversation_ultramarine_tint, R.color.conversation_ultramarine_shade, "ultramarine"),
   GROUP      (R.color.conversation_group,       R.color.conversation_group_tint,       R.color.conversation_group_shade,       "blue");
 
   private static final Map<String, MaterialColor> COLOR_MATCHES = new HashMap<String, MaterialColor>() {{
@@ -48,6 +50,7 @@ public enum MaterialColor {
     put("lime",        WINTERGREEN);
     put("blue_grey",   TAUPE);
     put("grey",        STEEL);
+    put("ultramarine", ULTRAMARINE);
     put("group_color", GROUP);
   }};
 

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

@@ -1,6 +1,8 @@
 package org.thoughtcrime.securesms.color;
 
 import android.content.Context;
+
+import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -11,18 +13,19 @@ import java.util.List;
 public class MaterialColors {
 
   public static final MaterialColorList CONVERSATION_PALETTE = new MaterialColorList(new ArrayList<>(Arrays.asList(
-    MaterialColor.PLUM,
-    MaterialColor.CRIMSON,
-    MaterialColor.VERMILLION,
-    MaterialColor.VIOLET,
-    MaterialColor.BLUE,
-    MaterialColor.INDIGO,
-    MaterialColor.FOREST,
-    MaterialColor.WINTERGREEN,
-    MaterialColor.TEAL,
-    MaterialColor.BURLAP,
-    MaterialColor.TAUPE,
-    MaterialColor.STEEL
+      MaterialColor.PLUM,
+      MaterialColor.CRIMSON,
+      MaterialColor.VERMILLION,
+      MaterialColor.VIOLET,
+      MaterialColor.INDIGO,
+      MaterialColor.TAUPE,
+      MaterialColor.ULTRAMARINE,
+      MaterialColor.BLUE,
+      MaterialColor.TEAL,
+      MaterialColor.FOREST,
+      MaterialColor.WINTERGREEN,
+      MaterialColor.BURLAP,
+      MaterialColor.STEEL
   )));
 
   public static class MaterialColorList {
@@ -51,7 +54,7 @@ public class MaterialColors {
       return null;
     }
 
-    public int[] asConversationColorArray(@NonNull Context context) {
+    public @ColorInt int[] asConversationColorArray(@NonNull Context context) {
       int[] results = new int[colors.size()];
       int   index   = 0;
 
@@ -61,9 +64,6 @@ public class MaterialColors {
 
       return results;
     }
-
   }
-
-
 }
 

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

@@ -2,20 +2,14 @@ package org.thoughtcrime.securesms.components;
 
 
 import android.content.Context;
-import android.os.Build;
-import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
-import android.widget.ToggleButton;
 
-public class AccessibleToggleButton extends ToggleButton {
+import androidx.appcompat.widget.AppCompatToggleButton;
+
+public class AccessibleToggleButton extends AppCompatToggleButton {
 
   private OnCheckedChangeListener listener;
 
-  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-  public AccessibleToggleButton(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-    super(context, attrs, defStyleAttr, defStyleRes);
-  }
-
   public AccessibleToggleButton(Context context, AttributeSet attrs, int defStyleAttr) {
     super(context, attrs, defStyleAttr);
   }

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

@@ -8,12 +8,12 @@ import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
+import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -29,6 +29,7 @@ import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.audio.AudioSlidePlayer;
+import org.thoughtcrime.securesms.audio.AudioWaveForm;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.events.PartProgressEvent;
 import org.thoughtcrime.securesms.logging.Log;
@@ -36,7 +37,7 @@ import org.thoughtcrime.securesms.mms.AudioSlide;
 import org.thoughtcrime.securesms.mms.SlideClickListener;
 
 import java.io.IOException;
-import java.util.Locale;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 public final class AudioView extends FrameLayout implements AudioSlidePlayer.Listener {
@@ -47,7 +48,6 @@ public final class AudioView extends FrameLayout implements AudioSlidePlayer.Lis
   private static final int REVERSE  = -1;
 
   @NonNull private final AnimatingToggle     controlToggle;
-  @NonNull private final ViewGroup           container;
   @NonNull private final View                progressAndPlay;
   @NonNull private final LottieAnimationView playPauseButton;
   @NonNull private final ImageView           downloadButton;
@@ -56,13 +56,17 @@ public final class AudioView extends FrameLayout implements AudioSlidePlayer.Lis
            private final boolean             smallView;
            private final boolean             autoRewind;
 
-  @Nullable private final TextView timestamp;
+  @Nullable private final TextView duration;
+
+  @ColorInt private final int waveFormPlayedBarsColor;
+  @ColorInt private final int waveFormUnplayedBarsColor;
 
   @Nullable private SlideClickListener downloadListener;
   @Nullable private AudioSlidePlayer   audioSlidePlayer;
             private int                backwardsCounter;
             private int                lottieDirection;
             private boolean            isPlaying;
+            private long               durationMillis;
 
   public AudioView(Context context) {
     this(context, null);
@@ -83,22 +87,22 @@ public final class AudioView extends FrameLayout implements AudioSlidePlayer.Lis
 
       inflate(context, smallView ? R.layout.audio_view_small : R.layout.audio_view, this);
 
-      this.container       = findViewById(R.id.audio_widget_container);
       this.controlToggle   = findViewById(R.id.control_toggle);
       this.playPauseButton = findViewById(R.id.play);
       this.progressAndPlay = findViewById(R.id.progress_and_play);
       this.downloadButton  = findViewById(R.id.download);
       this.circleProgress  = findViewById(R.id.circle_progress);
       this.seekBar         = findViewById(R.id.seek);
-      this.timestamp       = findViewById(R.id.timestamp);
+      this.duration        = findViewById(R.id.duration);
 
       lottieDirection = REVERSE;
       this.playPauseButton.setOnClickListener(new PlayPauseClickedListener());
       this.seekBar.setOnSeekBarChangeListener(new SeekBarModifiedListener());
 
-      setTint(typedArray.getColor(R.styleable.AudioView_foregroundTintColor, Color.WHITE),
-              typedArray.getColor(R.styleable.AudioView_backgroundTintColor, Color.WHITE));
-      container.setBackgroundColor(typedArray.getColor(R.styleable.AudioView_widgetBackground, Color.TRANSPARENT));
+      setTint(typedArray.getColor(R.styleable.AudioView_foregroundTintColor, Color.WHITE));
+
+      this.waveFormPlayedBarsColor   = typedArray.getColor(R.styleable.AudioView_waveformPlayedBarsColor, Color.WHITE);
+      this.waveFormUnplayedBarsColor = typedArray.getColor(R.styleable.AudioView_waveformUnplayedBarsColor, Color.WHITE);
     } finally {
       if (typedArray != null) {
         typedArray.recycle();
@@ -121,6 +125,14 @@ public final class AudioView extends FrameLayout implements AudioSlidePlayer.Lis
   public void setAudio(final @NonNull AudioSlide audio,
                        final boolean showControls)
   {
+    if (seekBar instanceof WaveFormSeekBarView) {
+      if (audioSlidePlayer != null && !Objects.equals(audioSlidePlayer.getAudioSlide().getUri(), audio.getUri())) {
+       WaveFormSeekBarView waveFormView = (WaveFormSeekBarView) seekBar;
+       waveFormView.setWaveMode(false);
+       seekBar.setProgress(0);
+       durationMillis = 0;
+      }
+    }
 
     if (showControls && audio.isPendingDownload()) {
       controlToggle.displayQuick(downloadButton);
@@ -141,6 +153,28 @@ public final class AudioView extends FrameLayout implements AudioSlidePlayer.Lis
     }
 
     this.audioSlidePlayer = AudioSlidePlayer.createFor(getContext(), audio, this);
+
+    if (seekBar instanceof WaveFormSeekBarView) {
+      WaveFormSeekBarView waveFormView = (WaveFormSeekBarView) seekBar;
+      waveFormView.setColors(waveFormPlayedBarsColor, waveFormUnplayedBarsColor);
+      if (android.os.Build.VERSION.SDK_INT >= 23) {
+        new AudioWaveForm(getContext(), audio).getWaveForm(
+          data -> {
+            if (duration != null) {
+              durationMillis = data.getDuration(TimeUnit.MILLISECONDS);
+              updateProgress(0, 0);
+              duration.setVisibility(VISIBLE);
+            }
+            waveFormView.setWaveData(data.getWaveForm());
+          },
+          () -> waveFormView.setWaveMode(false));
+      } else {
+        waveFormView.setWaveMode(false);
+        if (duration != null) {
+          duration.setVisibility(GONE);
+        }
+      }
+    }
   }
 
   public void cleanup() {
@@ -210,10 +244,9 @@ public final class AudioView extends FrameLayout implements AudioSlidePlayer.Lis
   }
 
   private void updateProgress(float progress, long millis) {
-    if (timestamp != null) {
-      timestamp.setText(String.format(Locale.getDefault(), "%02d:%02d",
-                                      TimeUnit.MILLISECONDS.toMinutes(millis),
-                                      TimeUnit.MILLISECONDS.toSeconds(millis)));
+    if (duration != null && durationMillis > 0) {
+      long remainingSecs = TimeUnit.MILLISECONDS.toSeconds(durationMillis - millis);
+      duration.setText(getResources().getString(R.string.AudioView_duration, remainingSecs / 60, remainingSecs % 60));
     }
 
     if (smallView) {
@@ -221,7 +254,7 @@ public final class AudioView extends FrameLayout implements AudioSlidePlayer.Lis
     }
   }
 
-  public void setTint(int foregroundTint, int backgroundTint) {
+  public void setTint(int foregroundTint) {
     post(()-> this.playPauseButton.addValueCallback(new KeyPath("**"),
                                                     LottieProperty.COLOR_FILTER,
                                                     new LottieValueCallback<>(new SimpleColorFilter(foregroundTint))));
@@ -229,8 +262,8 @@ public final class AudioView extends FrameLayout implements AudioSlidePlayer.Lis
     this.downloadButton.setColorFilter(foregroundTint, PorterDuff.Mode.SRC_IN);
     this.circleProgress.setBarColor(foregroundTint);
 
-    if (this.timestamp != null) {
-      this.timestamp.setTextColor(foregroundTint);
+    if (this.duration != null) {
+      this.duration.setTextColor(foregroundTint);
     }
     this.seekBar.getProgressDrawable().setColorFilter(foregroundTint, PorterDuff.Mode.SRC_IN);
     this.seekBar.getThumb().setColorFilter(foregroundTint, PorterDuff.Mode.SRC_IN);
@@ -336,7 +369,12 @@ public final class AudioView extends FrameLayout implements AudioSlidePlayer.Lis
     private boolean wasPlaying;
 
     @Override
-    public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {}
+    public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+      if (fromUser && durationMillis > 0) {
+        float progressFloat = progress / (float) seekBar.getMax();
+        updateProgress(progressFloat, (long) (durationMillis * progressFloat));
+      }
+    }
 
     @Override
     public synchronized void onStartTrackingTouch(SeekBar seekBar) {

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

@@ -6,25 +6,26 @@ import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.drawable.Drawable;
-import android.provider.ContactsContract;
 import android.util.AttributeSet;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatImageView;
+import androidx.fragment.app.FragmentActivity;
 
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.RecipientPreferenceActivity;
 import org.thoughtcrime.securesms.color.MaterialColor;
 import org.thoughtcrime.securesms.contacts.avatars.ContactColors;
 import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
+import org.thoughtcrime.securesms.groups.ui.managegroup.ManageGroupActivity;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientExporter;
+import org.thoughtcrime.securesms.recipients.ui.bottomsheet.RecipientBottomSheetDialogFragment;
+import org.thoughtcrime.securesms.recipients.ui.managerecipient.ManageRecipientActivity;
 import org.thoughtcrime.securesms.util.AvatarUtil;
 import org.thoughtcrime.securesms.util.ThemeUtil;
 
@@ -111,6 +112,9 @@ public final class AvatarImageView extends AppCompatImageView {
     this.fallbackPhotoProvider = fallbackPhotoProvider;
   }
 
+  /**
+   * Shows self as the actual profile picture.
+   */
   public void setRecipient(@NonNull Recipient recipient) {
     if (recipient.isLocalNumber()) {
       setAvatar(GlideApp.with(this), null, false);
@@ -120,6 +124,13 @@ public final class AvatarImageView extends AppCompatImageView {
     }
   }
 
+  /**
+   * Shows self as the note to self icon.
+   */
+  public void setAvatar(@Nullable Recipient recipient) {
+    setAvatar(GlideApp.with(this), recipient, false);
+  }
+
   public void setAvatar(@NonNull GlideRequests requestManager, @Nullable Recipient recipient, boolean quickContactEnabled) {
     if (recipient != null) {
       RecipientContactPhoto photo = new RecipientContactPhoto(recipient);
@@ -159,14 +170,27 @@ public final class AvatarImageView extends AppCompatImageView {
     }
   }
 
-  private void setAvatarClickHandler(final Recipient recipient, boolean quickContactEnabled) {
-    super.setOnClickListener(v -> {
-      if (quickContactEnabled) {
-        getContext().startActivity(RecipientPreferenceActivity.getLaunchIntent(getContext(), recipient.getId()));
-      } else if (listener != null) {
-        listener.onClick(v);
-      }
-    });
+  private void setAvatarClickHandler(@NonNull final Recipient recipient, boolean quickContactEnabled) {
+    if (quickContactEnabled) {
+      super.setOnClickListener(v -> {
+        Context context = getContext();
+        if (recipient.isPushGroup()) {
+          context.startActivity(ManageGroupActivity.newIntent(context, recipient.requireGroupId().requirePush()),
+                                ManageGroupActivity.createTransitionBundle(context, this));
+        } else {
+          if (context instanceof FragmentActivity) {
+            RecipientBottomSheetDialogFragment.create(recipient.getId(), null)
+                                              .show(((FragmentActivity) context).getSupportFragmentManager(), "BOTTOM");
+          } else {
+            context.startActivity(ManageRecipientActivity.newIntent(context, recipient.getId()),
+                                  ManageRecipientActivity.createTransitionBundle(context, this));
+          }
+        }
+      });
+    } else {
+      super.setOnClickListener(listener);
+      setClickable(listener != null);
+    }
   }
 
   private static class RecipientContactPhoto {

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

@@ -3,11 +3,6 @@ package org.thoughtcrime.securesms.components;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Rect;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.widget.TextViewCompat;
-
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
@@ -18,19 +13,23 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.core.widget.TextViewCompat;
+
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.util.ServiceUtil;
-import org.thoughtcrime.securesms.util.ViewUtil;
+import org.thoughtcrime.securesms.util.views.DarkOverflowToolbar;
 
-public class ContactFilterToolbar extends Toolbar {
+public final class ContactFilterToolbar extends DarkOverflowToolbar {
   private   OnFilterChangedListener listener;
 
-  private EditText        searchText;
-  private AnimatingToggle toggle;
-  private ImageView       keyboardToggle;
-  private ImageView       dialpadToggle;
-  private ImageView       clearToggle;
-  private LinearLayout    toggleContainer;
+  private final EditText        searchText;
+  private final AnimatingToggle toggle;
+  private final ImageView       keyboardToggle;
+  private final ImageView       dialpadToggle;
+  private final ImageView       clearToggle;
+  private final LinearLayout    toggleContainer;
 
   public ContactFilterToolbar(Context context) {
     this(context, null);
@@ -44,12 +43,12 @@ public class ContactFilterToolbar extends Toolbar {
     super(context, attrs, defStyleAttr);
     inflate(context, R.layout.contact_filter_toolbar, this);
 
-    this.searchText      = ViewUtil.findById(this, R.id.search_view);
-    this.toggle          = ViewUtil.findById(this, R.id.button_toggle);
-    this.keyboardToggle  = ViewUtil.findById(this, R.id.search_keyboard);
-    this.dialpadToggle   = ViewUtil.findById(this, R.id.search_dialpad);
-    this.clearToggle     = ViewUtil.findById(this, R.id.search_clear);
-    this.toggleContainer = ViewUtil.findById(this, R.id.toggle_container);
+    this.searchText      = findViewById(R.id.search_view);
+    this.toggle          = findViewById(R.id.button_toggle);
+    this.keyboardToggle  = findViewById(R.id.search_keyboard);
+    this.dialpadToggle   = findViewById(R.id.search_dialpad);
+    this.clearToggle     = findViewById(R.id.search_clear);
+    this.toggleContainer = findViewById(R.id.toggle_container);
 
     this.keyboardToggle.setOnClickListener(new View.OnClickListener() {
       @Override
@@ -102,11 +101,11 @@ public class ContactFilterToolbar extends Toolbar {
     setLogo(null);
     setContentInsetStartWithNavigation(0);
     expandTapArea(toggleContainer, dialpadToggle);
-    styleSearchText(searchText, context, attrs, defStyleAttr);
+    applyAttributes(searchText, context, attrs, defStyleAttr);
     searchText.requestFocus();
   }
 
-  private void styleSearchText(@NonNull EditText searchText,
+  private void applyAttributes(@NonNull EditText searchText,
                                @NonNull Context context,
                                @NonNull AttributeSet attrs,
                                int defStyle)
@@ -120,6 +119,9 @@ public class ContactFilterToolbar extends Toolbar {
     if (styleResource != -1) {
       TextViewCompat.setTextAppearance(searchText, styleResource);
     }
+    if (!attributes.getBoolean(R.styleable.ContactFilterToolbar_showDialpad, true)) {
+      dialpadToggle.setVisibility(GONE);
+    }
     attributes.recycle();
   }
 
@@ -132,6 +134,10 @@ public class ContactFilterToolbar extends Toolbar {
     this.listener = listener;
   }
 
+  public void setHint(@StringRes int hint) {
+    searchText.setHint(hint);
+  }
+
   private void notifyListener() {
     if (listener != null) listener.onFilterChanged(searchText.getText().toString());
   }

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

@@ -42,7 +42,7 @@ public class FromTextView extends EmojiTextView {
   }
 
   public void setText(Recipient recipient, boolean read, @Nullable String suffix) {
-    String fromString = recipient.toShortString(getContext());
+    String fromString = recipient.getDisplayName(getContext());
 
     int typeface;
 
@@ -61,19 +61,6 @@ public class FromTextView extends EmojiTextView {
 
     if (recipient.isLocalNumber()) {
       builder.append(getContext().getString(R.string.note_to_self));
-    } else if (!FeatureFlags.profileDisplay() && recipient.getName(getContext()) == null && !recipient.getProfileName().isEmpty()) {
-      SpannableString profileName = new SpannableString(" (~" + recipient.getProfileName().toString() + ") ");
-      profileName.setSpan(new CenterAlignedRelativeSizeSpan(0.75f), 0, profileName.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-      profileName.setSpan(new TypefaceSpan("sans-serif-light"), 0, profileName.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-      profileName.setSpan(new ForegroundColorSpan(ResUtil.getColor(getContext(), R.attr.conversation_list_item_subject_color)), 0, profileName.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-
-      if (ViewCompat.getLayoutDirection(this) == ViewCompat.LAYOUT_DIRECTION_RTL){
-        builder.append(profileName);
-        builder.append(fromSpan);
-      } else {
-        builder.append(fromSpan);
-        builder.append(profileName);
-      }
     } else {
       builder.append(fromSpan);
     }

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

@@ -1,20 +1,16 @@
 package org.thoughtcrime.securesms.components;
 
+import android.animation.Animator;
+import android.animation.ValueAnimator;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.net.Uri;
 import android.os.Build;
-import androidx.annotation.DimenRes;
-import androidx.annotation.MainThread;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.view.ViewCompat;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import android.text.format.DateUtils;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.animation.AlphaAnimation;
 import android.view.animation.Animation;
 import android.view.animation.AnimationSet;
@@ -24,7 +20,16 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.DimenRes;
+import androidx.annotation.MainThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
 import org.thoughtcrime.securesms.components.emoji.EmojiKeyboardProvider;
 import org.thoughtcrime.securesms.components.emoji.EmojiToggle;
 import org.thoughtcrime.securesms.components.emoji.MediaKeyboard;
@@ -57,7 +62,8 @@ public class InputPanel extends LinearLayout
 
   private static final String TAG = InputPanel.class.getSimpleName();
 
-  private static final int FADE_TIME = 150;
+  private static final long QUOTE_REVEAL_DURATION_MILLIS = 150;
+  private static final int  FADE_TIME                    = 150;
 
   private RecyclerView    stickerSuggestion;
   private QuoteView       quoteView;
@@ -73,6 +79,7 @@ public class InputPanel extends LinearLayout
   private MicrophoneRecorderView microphoneRecorderView;
   private SlideToCancel          slideToCancel;
   private RecordTime             recordTime;
+  private ValueAnimator          quoteAnimator;
 
   private @Nullable Listener listener;
   private           boolean  emojiVisible;
@@ -157,7 +164,20 @@ public class InputPanel extends LinearLayout
                        @NonNull SlideDeck attachments)
   {
     this.quoteView.setQuote(glideRequests, id, author, body, false, attachments);
-    this.quoteView.setVisibility(View.VISIBLE);
+
+    int originalHeight = this.quoteView.getVisibility() == VISIBLE ? this.quoteView.getMeasuredHeight()
+                                                                   : 0;
+
+    this.quoteView.setVisibility(VISIBLE);
+    this.quoteView.measure(0, 0);
+
+    if (quoteAnimator != null) {
+      quoteAnimator.cancel();
+    }
+
+    quoteAnimator = createHeightAnimator(quoteView, originalHeight, this.quoteView.getMeasuredHeight(), null);
+
+    quoteAnimator.start();
 
     if (this.linkPreview.getVisibility() == View.VISIBLE) {
       int cornerRadius = readDimen(R.dimen.message_corner_collapse_radius);
@@ -166,12 +186,44 @@ public class InputPanel extends LinearLayout
   }
 
   public void clearQuote() {
-    this.quoteView.dismiss();
-
-    if (this.linkPreview.getVisibility() == View.VISIBLE) {
-      int cornerRadius = readDimen(R.dimen.message_corner_radius);
-      this.linkPreview.setCorners(cornerRadius, cornerRadius);
+    if (quoteAnimator != null) {
+      quoteAnimator.cancel();
     }
+
+    quoteAnimator = createHeightAnimator(quoteView, quoteView.getMeasuredHeight(), 0, new AnimationCompleteListener() {
+      @Override
+      public void onAnimationEnd(Animator animation) {
+        quoteView.dismiss();
+
+        if (linkPreview.getVisibility() == View.VISIBLE) {
+          int cornerRadius = readDimen(R.dimen.message_corner_radius);
+          linkPreview.setCorners(cornerRadius, cornerRadius);
+        }
+      }
+    });
+
+    quoteAnimator.start();
+  }
+
+  private static ValueAnimator createHeightAnimator(@NonNull View view,
+                                                    int originalHeight,
+                                                    int finalHeight,
+                                                    @Nullable AnimationCompleteListener onAnimationComplete)
+  {
+    ValueAnimator animator = ValueAnimator.ofInt(originalHeight, finalHeight)
+                                          .setDuration(QUOTE_REVEAL_DURATION_MILLIS);
+
+    animator.addUpdateListener(animation -> {
+      ViewGroup.LayoutParams params = view.getLayoutParams();
+      params.height = (int) animation.getAnimatedValue();
+      view.setLayoutParams(params);
+    });
+
+    if (onAnimationComplete != null) {
+      animator.addListener(onAnimationComplete);
+    }
+
+    return animator;
   }
 
   public Optional<QuoteModel> getQuote() {

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

@@ -6,9 +6,6 @@ import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.os.Build;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
@@ -17,6 +14,10 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
 import com.annimon.stream.Stream;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 
@@ -188,7 +189,7 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
     boolean outgoing = messageType != MESSAGE_TYPE_INCOMING;
 
     authorView.setText(author.isLocalNumber() ? getContext().getString(R.string.QuoteView_you)
-                                              : author.toShortString(getContext()));
+                                              : author.getDisplayName(getContext()));
 
     // We use the raw color resource because Android 4.x was struggling with tints here
     quoteBarView.setImageResource(author.getColor().toQuoteBarColorResource(getContext(), outgoing));
@@ -248,6 +249,7 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
       }
       glideRequests.load(new DecryptableUri(imageVideoSlides.get(0).getThumbnailUri()))
                    .centerCrop()
+                   .override(getContext().getResources().getDimensionPixelSize(R.dimen.quote_thumb_size))
                    .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
                    .into(thumbnailView);
     } else if (!documentSlides.isEmpty()){

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

@@ -90,9 +90,9 @@ public final class RecyclerViewFastScroller extends LinearLayout {
     final int action = event.getAction();
     switch (action) {
     case MotionEvent.ACTION_DOWN:
-      if (event.getX() < ViewUtil.getX(handle) - handle.getPaddingLeft() ||
-          event.getY() < ViewUtil.getY(handle) - handle.getPaddingTop() ||
-          event.getY() > ViewUtil.getY(handle) + handle.getHeight() + handle.getPaddingBottom())
+      if (event.getX() < handle.getX() - handle.getPaddingLeft() ||
+          event.getY() < handle.getY() - handle.getPaddingTop() ||
+          event.getY() > handle.getY() + handle.getHeight() + handle.getPaddingBottom())
       {
         return false;
       }
@@ -150,9 +150,9 @@ public final class RecyclerViewFastScroller extends LinearLayout {
     if (recyclerView != null) {
       final int itemCount = recyclerView.getAdapter().getItemCount();
       float proportion;
-      if (ViewUtil.getY(handle) == 0) {
+      if (handle.getY() == 0) {
         proportion = 0f;
-      } else if (ViewUtil.getY(handle) + handle.getHeight() >= height - TRACK_SNAP_RANGE) {
+      } else if (handle.getY() + handle.getHeight() >= height - TRACK_SNAP_RANGE) {
         proportion = 1f;
       } else {
         proportion = y / (float)height;
@@ -169,10 +169,10 @@ public final class RecyclerViewFastScroller extends LinearLayout {
     final int handleHeight = handle.getHeight();
     final int bubbleHeight = bubble.getHeight();
     final int handleY = Util.clamp((int)((height - handleHeight) * y), 0, height - handleHeight);
-    ViewUtil.setY(handle, handleY);
-    ViewUtil.setY(bubble, Util.clamp(handleY - bubbleHeight - bubble.getPaddingBottom() + handleHeight,
-                                     0,
-                                     height - bubbleHeight));
+    handle.setY(handleY);
+    bubble.setY(Util.clamp(handleY - bubbleHeight - bubble.getPaddingBottom() + handleHeight,
+                           0,
+                           height - bubbleHeight));
   }
 
   private void showBubble() {

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

@@ -0,0 +1,156 @@
+package org.thoughtcrime.securesms.components;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.view.animation.Interpolator;
+import android.view.animation.OvershootInterpolator;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.Px;
+import androidx.appcompat.widget.AppCompatSeekBar;
+
+import org.thoughtcrime.securesms.R;
+
+import java.util.Arrays;
+
+public final class WaveFormSeekBarView extends AppCompatSeekBar {
+
+  private static final int ANIM_DURATION             = 450;
+  private static final int ANIM_BAR_OFF_SET_DURATION =  12;
+
+  private final Interpolator overshoot        = new OvershootInterpolator();
+  private final Paint        paint            = new Paint();
+  private       float[]      data             = new float[0];
+  private       long         dataSetTime;
+  private       Drawable     progressDrawable;
+  private       boolean      waveMode;
+  
+  @ColorInt private int playedBarColor   = 0xffffffff;
+  @ColorInt private int unplayedBarColor = 0x7fffffff;
+  @Px       private int barWidth;
+
+  public WaveFormSeekBarView(Context context) {
+    super(context);
+    init();
+  }
+
+  public WaveFormSeekBarView(Context context, @Nullable AttributeSet attrs) {
+    super(context, attrs);
+    init();
+  }
+
+  public WaveFormSeekBarView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+    super(context, attrs, defStyleAttr);
+    init();
+  }
+
+  private void init() {
+    setWillNotDraw(false);
+    
+    paint.setStrokeCap(Paint.Cap.ROUND);
+    paint.setAntiAlias(true);
+
+    progressDrawable = super.getProgressDrawable();
+
+    if (isInEditMode()) {
+      setWaveData(sinusoidalExampleData());
+      dataSetTime = 0;
+    }
+
+    barWidth = getResources().getDimensionPixelSize(R.dimen.wave_form_bar_width);
+  }
+
+  public void setColors(@ColorInt int playedBarColor, @ColorInt int unplayedBarColor) {
+    this.playedBarColor   = playedBarColor;
+    this.unplayedBarColor = unplayedBarColor;
+    invalidate();
+  }
+
+  @Override
+  public void setProgressDrawable(Drawable progressDrawable) {
+    this.progressDrawable = progressDrawable;
+    if (!waveMode) {
+      super.setProgressDrawable(progressDrawable);
+    }
+  }
+
+  @Override
+  public Drawable getProgressDrawable() {
+    return progressDrawable;
+  }
+
+  public void setWaveData(@NonNull float[] data) {
+    if (!Arrays.equals(data, this.data)) {
+      this.data        = data;
+      this.dataSetTime = System.currentTimeMillis();
+    }
+    setWaveMode(data.length > 0);
+  }
+
+  public void setWaveMode(boolean waveMode) {
+    this.waveMode = waveMode;
+    super.setProgressDrawable(this.waveMode ? null : progressDrawable);
+    invalidate();
+  }
+
+  @Override
+  protected void onDraw(Canvas canvas) {
+    if (waveMode) {
+      drawWave(canvas);
+    }
+    super.onDraw(canvas);
+  }
+
+  private void drawWave(Canvas canvas) {
+    paint.setStrokeWidth(barWidth);
+
+    int   usableHeight = getHeight() - getPaddingTop() - getPaddingBottom();
+    int   usableWidth  = getWidth() - getPaddingLeft() - getPaddingRight();
+    float midpoint     = usableHeight / 2f;
+    float maxHeight    = usableHeight / 2f - barWidth;
+    float barGap       = (usableWidth - data.length * barWidth) / (float) (data.length - 1);
+
+    boolean hasMoreFrames = false;
+
+    canvas.save();
+    canvas.translate(getPaddingLeft(), getPaddingTop());
+
+    for (int bar = 0; bar < data.length; bar++) {
+      float x        = bar * (barWidth + barGap) + barWidth / 2f;
+      float y        = data[bar] * maxHeight;
+      float progress = x / usableWidth;
+
+      paint.setColor(progress * getMax() < getProgress() ? playedBarColor : unplayedBarColor);
+
+      long  time             = System.currentTimeMillis() - bar * ANIM_BAR_OFF_SET_DURATION - dataSetTime;
+      float timeX            = Math.max(0, Math.min(1, time / (float) ANIM_DURATION));
+      float interpolatedTime = overshoot.getInterpolation(timeX);
+      float interpolatedY    = y * interpolatedTime;
+
+      canvas.drawLine(x, midpoint - interpolatedY, x, midpoint + interpolatedY, paint);
+
+      if (time < ANIM_DURATION) {
+        hasMoreFrames = true;
+      }
+    }
+
+    canvas.restore();
+
+    if (hasMoreFrames) {
+      invalidate();
+    }
+  }
+
+  private static float[] sinusoidalExampleData() {
+    float[] data = new float[21];
+    for (int i = 0; i < data.length; i++) {
+      data[i] = (float) Math.sin(i / (float) (data.length - 1) * 2 * Math.PI);
+    }
+    return data;
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java

@@ -29,6 +29,8 @@ public class EmojiKeyboardProvider implements MediaKeyboardProvider,
 {
   private static final KeyEvent DELETE_KEY_EVENT = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL);
 
+  private static final String RECENT_STORAGE_KEY = "pref_recent_emoji2";
+
   private final Context              context;
   private final List<EmojiPageModel> models;
   private final RecentEmojiPageModel recentModel;
@@ -41,7 +43,7 @@ public class EmojiKeyboardProvider implements MediaKeyboardProvider,
     this.context            = context;
     this.emojiEventListener = emojiEventListener;
     this.models             = new LinkedList<>();
-    this.recentModel        = new RecentEmojiPageModel(context);
+    this.recentModel        = new RecentEmojiPageModel(context, RECENT_STORAGE_KEY);
     this.emojiPagerAdapter  = new EmojiPagerAdapter(context, models, new EmojiEventListener() {
       @Override
       public void onEmojiSelected(String emoji) {
@@ -133,7 +135,7 @@ public class EmojiKeyboardProvider implements MediaKeyboardProvider,
 
     @Override
     public @NonNull Object instantiateItem(@NonNull ViewGroup container, int position) {
-      EmojiPageView page = new EmojiPageView(context, emojiSelectionListener, variationSelectorListener);
+      EmojiPageView page = new EmojiPageView(context, emojiSelectionListener, variationSelectorListener, true);
       page.setModel(pages.get(position));
       container.addView(page);
       return page;

app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java

@@ -26,7 +26,8 @@ public class EmojiPageView extends FrameLayout implements VariationSelectorListe
 
   public EmojiPageView(@NonNull Context context,
                        @NonNull EmojiEventListener emojiSelectionListener,
-                       @NonNull VariationSelectorListener variationSelectorListener)
+                       @NonNull VariationSelectorListener variationSelectorListener,
+                       boolean allowVariations)
   {
     super(context);
     final View view = LayoutInflater.from(getContext()).inflate(R.layout.emoji_grid_layout, this, true);
@@ -40,7 +41,8 @@ public class EmojiPageView extends FrameLayout implements VariationSelectorListe
     adapter        = new EmojiPageViewGridAdapter(EmojiProvider.getInstance(context),
                                                   popup,
                                                   emojiSelectionListener,
-                                                  this);
+                                                  this,
+                                                  allowVariations);
 
     recyclerView.setLayoutManager(layoutManager);
     recyclerView.setAdapter(adapter);
@@ -83,6 +85,10 @@ public class EmojiPageView extends FrameLayout implements VariationSelectorListe
     }
   }
 
+  public void setRecyclerNestedScrollingEnabled(boolean enabled) {
+    recyclerView.setNestedScrollingEnabled(enabled);
+  }
+
   private static class ScrollDisabler implements RecyclerView.OnItemTouchListener {
     @Override
     public boolean onInterceptTouchEvent(@NonNull RecyclerView recyclerView, @NonNull MotionEvent motionEvent) {

app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageViewGridAdapter.java

@@ -22,17 +22,20 @@ public class EmojiPageViewGridAdapter extends RecyclerView.Adapter<EmojiPageView
   private final EmojiVariationSelectorPopup popup;
   private final VariationSelectorListener   variationSelectorListener;
   private final EmojiEventListener          emojiEventListener;
+  private final boolean                     allowVariations;
 
   public EmojiPageViewGridAdapter(@NonNull EmojiProvider emojiProvider,
                                   @NonNull EmojiVariationSelectorPopup popup,
                                   @NonNull EmojiEventListener emojiEventListener,
-                                  @NonNull VariationSelectorListener variationSelectorListener)
+                                  @NonNull VariationSelectorListener variationSelectorListener,
+                                  boolean allowVariations)
   {
     this.emojiList                 = new ArrayList<>();
     this.emojiProvider             = emojiProvider;
     this.popup                     = popup;
     this.emojiEventListener        = emojiEventListener;
     this.variationSelectorListener = variationSelectorListener;
+    this.allowVariations           = allowVariations;
 
     popup.setOnDismissListener(this);
   }
@@ -65,7 +68,7 @@ public class EmojiPageViewGridAdapter extends RecyclerView.Adapter<EmojiPageView
       emojiEventListener.onEmojiSelected(emoji.getValue());
     });
 
-    if (emoji.getVariations().size() > 1) {
+    if (allowVariations && emoji.getVariations().size() > 1) {
       viewHolder.itemView.setOnLongClickListener(v -> {
         popup.dismiss();
         popup.setVariations(emoji.getVariations());

app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiStrings.java

@@ -2,4 +2,10 @@ package org.thoughtcrime.securesms.components.emoji;
 
 public final class EmojiStrings {
   public static final String BUST_IN_SILHOUETTE = "\uD83D\uDC64";
+  public static final String PHOTO              = "\uD83D\uDCF7";
+  public static final String VIDEO              = "\uD83C\uDFA5";
+  public static final String GIF                = "\uD83C\uDFA1";
+  public static final String AUDIO              = "\uD83C\uDFA4";
+  public static final String FILE               = "\uD83D\uDCCE";
+  public static final String STICKER            = "\u2B50";
 }

app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiUtil.java

@@ -6,6 +6,7 @@ import org.whispersystems.libsignal.util.Pair;
 
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -36,6 +37,10 @@ public final class EmojiUtil {
 
   private EmojiUtil() {}
 
+  public static List<EmojiPageModel> getDisplayPages() {
+    return EmojiPages.DISPLAY_PAGES;
+  }
+
   /**
    * This will return all ways we know of expressing a singular emoji. This is to aid in search,
    * where some platforms may send an emoji we've locally marked as 'obsolete'.

app/src/main/java/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java

@@ -22,20 +22,21 @@ import java.util.LinkedHashSet;
 import java.util.List;
 
 public class RecentEmojiPageModel implements EmojiPageModel {
-  private static final String TAG                  = RecentEmojiPageModel.class.getSimpleName();
-  private static final String EMOJI_LRU_PREFERENCE = "pref_recent_emoji2";
-  private static final int    EMOJI_LRU_SIZE       = 50;
+  private static final String TAG            = RecentEmojiPageModel.class.getSimpleName();
+  private static final int    EMOJI_LRU_SIZE = 50;
 
   private final SharedPreferences     prefs;
+  private final String                preferenceName;
   private final LinkedHashSet<String> recentlyUsed;
 
-  public RecentEmojiPageModel(Context context) {
-    this.prefs        = PreferenceManager.getDefaultSharedPreferences(context);
-    this.recentlyUsed = getPersistedCache();
+  public RecentEmojiPageModel(Context context, @NonNull String preferenceName) {
+    this.prefs          = PreferenceManager.getDefaultSharedPreferences(context);
+    this.preferenceName = preferenceName;
+    this.recentlyUsed   = getPersistedCache();
   }
 
   private LinkedHashSet<String> getPersistedCache() {
-    String serialized = prefs.getString(EMOJI_LRU_PREFERENCE, "[]");
+    String serialized = prefs.getString(preferenceName, "[]");
     try {
       CollectionType collectionType = TypeFactory.defaultInstance()
                                                  .constructCollectionType(LinkedHashSet.class, String.class);
@@ -90,7 +91,7 @@ public class RecentEmojiPageModel implements EmojiPageModel {
         try {
           String serialized = JsonUtils.toJson(latestRecentlyUsed);
           prefs.edit()
-               .putString(EMOJI_LRU_PREFERENCE, serialized)
+               .putString(preferenceName, serialized)
                .apply();
         } catch (IOException e) {
           Log.w(TAG, e);

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/AudioOutputAdapter.java

@@ -0,0 +1,99 @@
+package org.thoughtcrime.securesms.components.webrtc;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CompoundButton;
+import android.widget.RadioButton;
+import android.widget.Switch;
+import android.widget.TextView;
+
+import androidx.annotation.CallSuper;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.util.Consumer;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.thoughtcrime.securesms.R;
+
+import java.util.List;
+
+final class AudioOutputAdapter extends RecyclerView.Adapter<AudioOutputAdapter.ViewHolder> {
+
+  private final OnAudioOutputChangedListener onAudioOutputChangedListener;
+  private final List<WebRtcAudioOutput> audioOutputs;
+
+  private WebRtcAudioOutput selected;
+
+  AudioOutputAdapter(@NonNull OnAudioOutputChangedListener onAudioOutputChangedListener,
+                     @NonNull List<WebRtcAudioOutput> audioOutputs) {
+    this.audioOutputs                 = audioOutputs;
+    this.onAudioOutputChangedListener = onAudioOutputChangedListener;
+  }
+
+  public void setSelectedOutput(@NonNull WebRtcAudioOutput selected) {
+    this.selected = selected;
+
+    notifyDataSetChanged();
+  }
+
+  @Override
+  public @NonNull ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+    View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.audio_output_adapter_radio_item, parent, false);
+
+    return new ViewHolder(view, this::handlePositionSelected);
+  }
+
+  @Override
+  public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
+    holder.bind(audioOutputs.get(position), selected);
+  }
+
+  @Override
+  public int getItemCount() {
+    return audioOutputs.size();
+  }
+
+  private void handlePositionSelected(int position) {
+    WebRtcAudioOutput mode = audioOutputs.get(position);
+
+    if (mode != selected) {
+      setSelectedOutput(mode);
+      onAudioOutputChangedListener.audioOutputChanged(selected);
+    }
+  }
+
+  static class ViewHolder extends RecyclerView.ViewHolder implements CompoundButton.OnCheckedChangeListener {
+
+    private final TextView          textView;
+    private final RadioButton       radioButton;
+    private final Consumer<Integer> onPressed;
+
+
+    public ViewHolder(@NonNull View itemView, @NonNull Consumer<Integer> onPressed) {
+      super(itemView);
+
+      this.textView    = itemView.findViewById(R.id.text);
+      this.radioButton = itemView.findViewById(R.id.radio);
+      this.onPressed   = onPressed;
+    }
+
+    @CallSuper
+    void bind(@NonNull WebRtcAudioOutput audioOutput, @Nullable WebRtcAudioOutput selected) {
+      textView.setText(audioOutput.getLabelRes());
+      textView.setCompoundDrawablesRelativeWithIntrinsicBounds(audioOutput.getIconRes(), 0, 0, 0);
+
+      radioButton.setOnCheckedChangeListener(null);
+      radioButton.setChecked(audioOutput == selected);
+      radioButton.setOnCheckedChangeListener(this);
+    }
+
+    @Override
+    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+      int adapterPosition = getAdapterPosition();
+      if (adapterPosition != RecyclerView.NO_POSITION) {
+        onPressed.accept(adapterPosition);
+      }
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/OnAudioOutputChangedListener.java

@@ -0,0 +1,5 @@
+package org.thoughtcrime.securesms.components.webrtc;
+
+public interface OnAudioOutputChangedListener {
+  void audioOutputChanged(WebRtcAudioOutput audioOutput);
+}

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/PictureInPictureGestureHelper.java

@@ -0,0 +1,284 @@
+package org.thoughtcrime.securesms.components.webrtc;
+
+import android.animation.Animator;
+import android.annotation.SuppressLint;
+import android.graphics.Point;
+import android.view.GestureDetector;
+import android.view.MotionEvent;
+import android.view.VelocityTracker;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+import android.view.animation.Interpolator;
+
+import androidx.annotation.NonNull;
+import androidx.core.view.GestureDetectorCompat;
+
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.util.views.TouchInterceptingFrameLayout;
+
+import java.util.Arrays;
+
+public class PictureInPictureGestureHelper extends GestureDetector.SimpleOnGestureListener {
+
+  private static final float DECELERATION_RATE = 0.99f;
+
+  private final ViewGroup parent;
+  private final View      child;
+  private final int       framePadding;
+  private final int       pipWidth;
+  private final int       pipHeight;
+
+  private int             activePointerId = MotionEvent.INVALID_POINTER_ID;
+  private float           lastTouchX;
+  private float           lastTouchY;
+  private boolean         isDragging;
+  private boolean         isAnimating;
+  private int             extraPaddingTop;
+  private int             extraPaddingBottom;
+  private double          projectionX;
+  private double          projectionY;
+  private VelocityTracker velocityTracker;
+  private int             maximumFlingVelocity;
+
+  @SuppressLint("ClickableViewAccessibility")
+  public static PictureInPictureGestureHelper applyTo(@NonNull View child) {
+    TouchInterceptingFrameLayout  parent          = (TouchInterceptingFrameLayout) child.getParent();
+    PictureInPictureGestureHelper helper          = new PictureInPictureGestureHelper(parent, child);
+    GestureDetectorCompat         gestureDetector = new GestureDetectorCompat(child.getContext(), helper);
+
+    parent.setOnInterceptTouchEventListener((event) -> {
+      if (helper.velocityTracker == null) {
+        helper.velocityTracker = VelocityTracker.obtain();
+      }
+
+      helper.velocityTracker.addMovement(event);
+
+      return false;
+    });
+
+    parent.setOnTouchListener((v, event) -> {
+      if (helper.velocityTracker != null) {
+        helper.velocityTracker.recycle();
+        helper.velocityTracker = null;
+      }
+
+      return false;
+    });
+
+    child.setOnTouchListener((v, event) -> {
+      boolean handled = gestureDetector.onTouchEvent(event);
+
+      if (event.getActionMasked() == MotionEvent.ACTION_UP || event.getActionMasked() == MotionEvent.ACTION_CANCEL) {
+        if (!handled) {
+          handled = helper.onGestureFinished(event);
+        }
+
+        if (helper.velocityTracker != null) {
+          helper.velocityTracker.recycle();
+          helper.velocityTracker = null;
+        }
+      }
+
+      return handled;
+    });
+
+    return helper;
+  }
+
+  private PictureInPictureGestureHelper(@NonNull ViewGroup parent, @NonNull View child) {
+    this.parent               = parent;
+    this.child                = child;
+    this.framePadding         = child.getResources().getDimensionPixelSize(R.dimen.picture_in_picture_gesture_helper_frame_padding);
+    this.pipWidth             = child.getResources().getDimensionPixelSize(R.dimen.picture_in_picture_gesture_helper_pip_width);
+    this.pipHeight            = child.getResources().getDimensionPixelSize(R.dimen.picture_in_picture_gesture_helper_pip_height);
+    this.maximumFlingVelocity = ViewConfiguration.get(child.getContext()).getScaledMaximumFlingVelocity();
+  }
+
+  public void clearVerticalBoundaries() {
+    setVerticalBoundaries(0, parent.getMeasuredHeight());
+  }
+
+  public void setVerticalBoundaries(int topBoundary, int bottomBoundary) {
+    extraPaddingTop    = topBoundary;
+    extraPaddingBottom = parent.getMeasuredHeight() - bottomBoundary;
+
+    if (isAnimating) {
+      fling();
+    } else if (!isDragging) {
+      onFling(null, null, 0, 0);
+    }
+  }
+
+  private boolean onGestureFinished(MotionEvent e) {
+    final int pointerIndex = e.findPointerIndex(activePointerId);
+
+    if (e.getActionIndex() == pointerIndex) {
+      onFling(e, e, 0, 0);
+      return true;
+    }
+
+    return false;
+  }
+
+  @Override
+  public boolean onDown(MotionEvent e) {
+    activePointerId = e.getPointerId(0);
+    lastTouchX      = e.getX(activePointerId) + child.getX();
+    lastTouchY      = e.getY(activePointerId) + child.getY();
+    isDragging      = true;
+
+    return true;
+  }
+
+  @Override
+  public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
+    int   pointerIndex = e2.findPointerIndex(activePointerId);
+    float x            = e2.getX(pointerIndex) + child.getX();
+    float y            = e2.getY(pointerIndex) + child.getY();
+    float dx           = x - lastTouchX;
+    float dy           = y - lastTouchY;
+
+    child.setTranslationX(child.getTranslationX() + dx);
+    child.setTranslationY(child.getTranslationY() + dy);
+
+    lastTouchX = x;
+    lastTouchY = y;
+
+    return true;
+  }
+
+  @Override
+  public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
+    if (velocityTracker != null) {
+      velocityTracker.computeCurrentVelocity(1000, maximumFlingVelocity);
+
+      projectionX = child.getX() + project(velocityTracker.getXVelocity());
+      projectionY = child.getY() + project(velocityTracker.getYVelocity());
+    } else {
+      projectionX = child.getX();
+      projectionY = child.getY();
+    }
+
+    fling();
+
+    return true;
+  }
+
+  private void fling() {
+    Point  projection            = new Point((int) projectionX, (int) projectionY);
+    Point  nearestCornerPosition = findNearestCornerPosition(projection);
+
+    isAnimating = true;
+    isDragging  = false;
+
+    child.animate()
+         .translationX(getTranslationXForPoint(nearestCornerPosition))
+         .translationY(getTranslationYForPoint(nearestCornerPosition))
+         .setDuration(250)
+         .setInterpolator(new ViscousFluidInterpolator())
+         .setListener(new AnimationCompleteListener() {
+           @Override
+           public void onAnimationEnd(Animator animation) {
+             isAnimating = false;
+           }
+         })
+         .start();
+  }
+
+  private Point findNearestCornerPosition(Point projection) {
+    Point  maxPoint     = null;
+    double maxDistance  = Double.MAX_VALUE;
+
+    for (Point point : Arrays.asList(calculateTopLeftCoordinates(),
+                                     calculateTopRightCoordinates(parent),
+                                     calculateBottomLeftCoordinates(parent),
+                                     calculateBottomRightCoordinates(parent)))
+    {
+      double distance = distance(point, projection);
+
+      if (distance < maxDistance) {
+        maxDistance = distance;
+        maxPoint    = point;
+      }
+    }
+
+    return maxPoint;
+  }
+
+  private float getTranslationXForPoint(Point destination) {
+    return destination.x - child.getLeft();
+  }
+
+  private float getTranslationYForPoint(Point destination) {
+    return destination.y - child.getTop();
+  }
+
+  private Point calculateTopLeftCoordinates() {
+    return new Point(framePadding,
+                     framePadding + extraPaddingTop);
+  }
+
+  private Point calculateTopRightCoordinates(@NonNull ViewGroup parent) {
+    return new Point(parent.getMeasuredWidth() - pipWidth - framePadding,
+                     framePadding + extraPaddingTop);
+  }
+
+  private Point calculateBottomLeftCoordinates(@NonNull ViewGroup parent) {
+    return new Point(framePadding,
+                     parent.getMeasuredHeight() - pipHeight - framePadding - extraPaddingBottom);
+  }
+
+  private Point calculateBottomRightCoordinates(@NonNull ViewGroup parent) {
+    return new Point(parent.getMeasuredWidth() - pipWidth - framePadding,
+                     parent.getMeasuredHeight() - pipHeight - framePadding - extraPaddingBottom);
+  }
+
+  private static float project(float initialVelocity) {
+    return (initialVelocity / 1000f) * DECELERATION_RATE / (1f - DECELERATION_RATE);
+  }
+
+  private static double distance(Point a, Point b) {
+    return Math.sqrt(Math.pow(a.x - b.x, 2) + Math.pow(a.y - b.y, 2));
+  }
+
+  /** Borrowed from ScrollView */
+  private static class ViscousFluidInterpolator implements Interpolator {
+    /** Controls the viscous fluid effect (how much of it). */
+    private static final float VISCOUS_FLUID_SCALE = 8.0f;
+
+    private static final float VISCOUS_FLUID_NORMALIZE;
+    private static final float VISCOUS_FLUID_OFFSET;
+
+    static {
+
+      // must be set to 1.0 (used in viscousFluid())
+      VISCOUS_FLUID_NORMALIZE = 1.0f / viscousFluid(1.0f);
+      // account for very small floating-point error
+      VISCOUS_FLUID_OFFSET = 1.0f - VISCOUS_FLUID_NORMALIZE * viscousFluid(1.0f);
+    }
+
+    private static float viscousFluid(float x) {
+      x *= VISCOUS_FLUID_SCALE;
+      if (x < 1.0f) {
+        x -= (1.0f - (float)Math.exp(-x));
+      } else {
+        float start = 0.36787944117f;   // 1/e == exp(-1)
+        x = 1.0f - (float)Math.exp(1.0f - x);
+        x = start + x * (1.0f - start);
+      }
+      return x;
+    }
+
+    @Override
+    public float getInterpolation(float input) {
+      final float interpolated = VISCOUS_FLUID_NORMALIZE * viscousFluid(input);
+      if (interpolated > 0) {
+        return interpolated + VISCOUS_FLUID_OFFSET;
+      }
+      return interpolated;
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/SurfaceTextureEglRenderer.java

@@ -0,0 +1,142 @@
+package org.thoughtcrime.securesms.components.webrtc;
+
+import android.graphics.SurfaceTexture;
+import android.view.TextureView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.thoughtcrime.securesms.logging.Log;
+import org.webrtc.EglBase;
+import org.webrtc.EglRenderer;
+import org.webrtc.RendererCommon;
+import org.webrtc.ThreadUtils;
+import org.webrtc.VideoFrame;
+
+import java.util.concurrent.CountDownLatch;
+
+/**
+ * This class is a modified copy of {@link org.webrtc.SurfaceViewRenderer} designed to work with a
+ * {@link SurfaceTexture} to facilitate easier animation, rounding, elevation, etc.
+ */
+public class SurfaceTextureEglRenderer extends EglRenderer implements TextureView.SurfaceTextureListener {
+
+  private static final String TAG = Log.tag(SurfaceTextureEglRenderer.class);
+
+  private final Object layoutLock = new Object();
+
+  private RendererCommon.RendererEvents rendererEvents;
+  private boolean                       isFirstFrameRendered;
+  private boolean                       isRenderingPaused;
+  private int                           rotatedFrameWidth;
+  private int                           rotatedFrameHeight;
+  private int                           frameRotation;
+
+  public SurfaceTextureEglRenderer(@NonNull String name) {
+    super(name);
+  }
+
+  public void init(@Nullable EglBase.Context sharedContext, @Nullable RendererCommon.RendererEvents rendererEvents, @NonNull int[] configAttributes, @NonNull RendererCommon.GlDrawer drawer) {
+    ThreadUtils.checkIsOnMainThread();
+    this.rendererEvents = rendererEvents;
+    synchronized (this.layoutLock) {
+      this.isFirstFrameRendered = false;
+      this.rotatedFrameWidth    = 0;
+      this.rotatedFrameHeight   = 0;
+      this.frameRotation        = 0;
+    }
+
+    super.init(sharedContext, configAttributes, drawer);
+  }
+
+  @Override
+  public void init(@Nullable EglBase.Context sharedContext, @NonNull int[] configAttributes, @NonNull RendererCommon.GlDrawer drawer) {
+    this.init(sharedContext, null, configAttributes, drawer);
+  }
+
+  @Override
+  public void setFpsReduction(float fps) {
+    synchronized(this.layoutLock) {
+      this.isRenderingPaused = fps == 0.0F;
+    }
+
+    super.setFpsReduction(fps);
+  }
+
+  @Override
+  public void disableFpsReduction() {
+    synchronized(this.layoutLock) {
+      this.isRenderingPaused = false;
+    }
+
+    super.disableFpsReduction();
+  }
+
+  @Override
+  public void pauseVideo() {
+    synchronized(this.layoutLock) {
+      this.isRenderingPaused = true;
+    }
+
+    super.pauseVideo();
+  }
+
+  @Override
+  public void onFrame(@NonNull VideoFrame frame) {
+    this.updateFrameDimensionsAndReportEvents(frame);
+    super.onFrame(frame);
+  }
+
+  @Override
+  public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
+    ThreadUtils.checkIsOnMainThread();
+    createEglSurface(surface);
+  }
+
+  @Override
+  public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
+    ThreadUtils.checkIsOnMainThread();
+    Log.d(TAG, "onSurfaceTextureSizeChanged: size: " + width + "x" + height);
+  }
+
+  @Override
+  public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
+    ThreadUtils.checkIsOnMainThread();
+
+    CountDownLatch completionLatch = new CountDownLatch(1);
+
+    releaseEglSurface(completionLatch::countDown);
+    ThreadUtils.awaitUninterruptibly(completionLatch);
+
+    return true;
+  }
+
+  @Override
+  public void onSurfaceTextureUpdated(SurfaceTexture surface) {
+  }
+
+  private void updateFrameDimensionsAndReportEvents(VideoFrame frame) {
+    synchronized(this.layoutLock) {
+      if (!this.isRenderingPaused) {
+        if (!this.isFirstFrameRendered) {
+          this.isFirstFrameRendered = true;
+          Log.d(TAG, "Reporting first rendered frame.");
+          if (this.rendererEvents != null) {
+            this.rendererEvents.onFirstFrameRendered();
+          }
+        }
+
+        if (this.rotatedFrameWidth != frame.getRotatedWidth() || this.rotatedFrameHeight != frame.getRotatedHeight() || this.frameRotation != frame.getRotation()) {
+          Log.d(TAG, "Reporting frame resolution changed to " + frame.getBuffer().getWidth() + "x" + frame.getBuffer().getHeight() + " with rotation " + frame.getRotation());
+          if (this.rendererEvents != null) {
+            this.rendererEvents.onFrameResolutionChanged(frame.getBuffer().getWidth(), frame.getBuffer().getHeight(), frame.getRotation());
+          }
+
+          this.rotatedFrameWidth  = frame.getRotatedWidth();
+          this.rotatedFrameHeight = frame.getRotatedHeight();
+          this.frameRotation      = frame.getRotation();
+        }
+      }
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/TextureViewRenderer.java

@@ -0,0 +1,257 @@
+package org.thoughtcrime.securesms.components.webrtc;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Point;
+import android.graphics.SurfaceTexture;
+import android.os.Looper;
+import android.util.AttributeSet;
+import android.view.TextureView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.thoughtcrime.securesms.logging.Log;
+import org.webrtc.EglBase;
+import org.webrtc.EglRenderer;
+import org.webrtc.GlRectDrawer;
+import org.webrtc.RendererCommon;
+import org.webrtc.ThreadUtils;
+import org.webrtc.VideoFrame;
+import org.webrtc.VideoSink;
+
+/**
+ * This class is a modified version of {@link org.webrtc.SurfaceViewRenderer} which is based on {@link TextureView}
+ */
+public class TextureViewRenderer extends TextureView implements TextureView.SurfaceTextureListener, VideoSink, RendererCommon.RendererEvents {
+
+  private static final String TAG = Log.tag(TextureViewRenderer.class);
+
+  private final SurfaceTextureEglRenderer         eglRenderer;
+  private final RendererCommon.VideoLayoutMeasure videoLayoutMeasure = new RendererCommon.VideoLayoutMeasure();
+
+  private RendererCommon.RendererEvents rendererEvents;
+  private int                           rotatedFrameWidth;
+  private int                           rotatedFrameHeight;
+  private boolean                       enableFixedSize;
+  private int                           surfaceWidth;
+  private int                           surfaceHeight;
+
+  public TextureViewRenderer(@NonNull Context context) {
+    super(context);
+    this.eglRenderer = new SurfaceTextureEglRenderer(getResourceName());
+    this.setSurfaceTextureListener(this);
+  }
+
+  public TextureViewRenderer(@NonNull Context context, @Nullable AttributeSet attrs) {
+    super(context, attrs);
+    this.eglRenderer = new SurfaceTextureEglRenderer(getResourceName());
+    this.setSurfaceTextureListener(this);
+  }
+
+  public void init(@NonNull EglBase.Context sharedContext, @NonNull RendererCommon.RendererEvents rendererEvents) {
+    this.init(sharedContext, rendererEvents, EglBase.CONFIG_PLAIN, new GlRectDrawer());
+  }
+
+  public void init(@NonNull EglBase.Context sharedContext, @NonNull RendererCommon.RendererEvents rendererEvents, @NonNull int[] configAttributes, @NonNull RendererCommon.GlDrawer drawer) {
+    ThreadUtils.checkIsOnMainThread();
+
+    this.rendererEvents     = rendererEvents;
+    this.rotatedFrameWidth  = 0;
+    this.rotatedFrameHeight = 0;
+
+    this.eglRenderer.init(sharedContext, this, configAttributes, drawer);
+  }
+
+  public void release() {
+    eglRenderer.release();
+  }
+
+  public void addFrameListener(@NonNull EglRenderer.FrameListener listener, float scale, @NonNull RendererCommon.GlDrawer drawerParam) {
+    eglRenderer.addFrameListener(listener, scale, drawerParam);
+  }
+
+  public void addFrameListener(@NonNull EglRenderer.FrameListener listener, float scale) {
+    eglRenderer.addFrameListener(listener, scale);
+  }
+
+  public void removeFrameListener(@NonNull EglRenderer.FrameListener listener) {
+    eglRenderer.removeFrameListener(listener);
+  }
+
+  public void setEnableHardwareScaler(boolean enabled) {
+    ThreadUtils.checkIsOnMainThread();
+
+    enableFixedSize = enabled;
+
+    updateSurfaceSize();
+  }
+
+  public void setMirror(boolean mirror) {
+    eglRenderer.setMirror(mirror);
+  }
+
+  public void setScalingType(@NonNull RendererCommon.ScalingType scalingType) {
+    ThreadUtils.checkIsOnMainThread();
+
+    videoLayoutMeasure.setScalingType(scalingType);
+
+    requestLayout();
+  }
+
+  public void setScalingType(@NonNull RendererCommon.ScalingType scalingTypeMatchOrientation,
+                             @NonNull RendererCommon.ScalingType scalingTypeMismatchOrientation)
+  {
+    ThreadUtils.checkIsOnMainThread();
+
+    videoLayoutMeasure.setScalingType(scalingTypeMatchOrientation, scalingTypeMismatchOrientation);
+
+    requestLayout();
+  }
+
+  public void setFpsReduction(float fps) {
+    eglRenderer.setFpsReduction(fps);
+  }
+
+  public void disableFpsReduction() {
+    eglRenderer.disableFpsReduction();
+  }
+
+  public void pauseVideo() {
+    eglRenderer.pauseVideo();
+  }
+
+  @Override
+  protected void onMeasure(int widthSpec, int heightSpec) {
+    ThreadUtils.checkIsOnMainThread();
+
+    Point size = videoLayoutMeasure.measure(widthSpec, heightSpec, this.rotatedFrameWidth, this.rotatedFrameHeight);
+
+    setMeasuredDimension(size.x, size.y);
+
+    Log.d(TAG, "onMeasure(). New size: " + size.x + "x" + size.y);
+  }
+
+  @Override
+  protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+    ThreadUtils.checkIsOnMainThread();
+
+    eglRenderer.setLayoutAspectRatio((float)(right - left) / (float)(bottom - top));
+
+    updateSurfaceSize();
+  }
+
+  private void updateSurfaceSize() {
+    ThreadUtils.checkIsOnMainThread();
+
+    if (!isAvailable()) {
+      return;
+    }
+
+    if (this.enableFixedSize && this.rotatedFrameWidth != 0 && this.rotatedFrameHeight != 0 && this.getWidth() != 0 && this.getHeight() != 0) {
+
+      float layoutAspectRatio = (float)this.getWidth() / (float)this.getHeight();
+      float frameAspectRatio  = (float)this.rotatedFrameWidth / (float)this.rotatedFrameHeight;
+
+      int drawnFrameWidth;
+      int drawnFrameHeight;
+
+      if (frameAspectRatio > layoutAspectRatio) {
+        drawnFrameWidth  = (int)((float)this.rotatedFrameHeight * layoutAspectRatio);
+        drawnFrameHeight = this.rotatedFrameHeight;
+      } else {
+        drawnFrameWidth  = this.rotatedFrameWidth;
+        drawnFrameHeight = (int)((float)this.rotatedFrameWidth / layoutAspectRatio);
+      }
+
+      int width  = Math.min(this.getWidth(), drawnFrameWidth);
+      int height = Math.min(this.getHeight(), drawnFrameHeight);
+
+      Log.d(TAG, "updateSurfaceSize. Layout size: " + this.getWidth() + "x" + this.getHeight() + ", frame size: " + this.rotatedFrameWidth + "x" + this.rotatedFrameHeight + ", requested surface size: " + width + "x" + height + ", old surface size: " + this.surfaceWidth + "x" + this.surfaceHeight);
+
+      if (width != this.surfaceWidth || height != this.surfaceHeight) {
+        this.surfaceWidth  = width;
+        this.surfaceHeight = height;
+        getSurfaceTexture().setDefaultBufferSize(width, height);
+      }
+    } else {
+      this.surfaceWidth = this.surfaceHeight = 0;
+      this.getSurfaceTexture().setDefaultBufferSize(getMeasuredWidth(), getMeasuredHeight());
+    }
+  }
+
+  @Override
+  public void onFirstFrameRendered() {
+    if (this.rendererEvents != null) {
+      this.rendererEvents.onFirstFrameRendered();
+    }
+  }
+
+  @Override
+  public void onFrameResolutionChanged(int videoWidth, int videoHeight, int rotation) {
+    if (this.rendererEvents != null) {
+      this.rendererEvents.onFrameResolutionChanged(videoWidth, videoHeight, rotation);
+    }
+
+    int rotatedWidth = rotation != 0 && rotation != 180 ? videoHeight : videoWidth;
+    int rotatedHeight = rotation != 0 && rotation != 180 ? videoWidth : videoHeight;
+    this.postOrRun(() -> {
+      this.rotatedFrameWidth = rotatedWidth;
+      this.rotatedFrameHeight = rotatedHeight;
+      this.updateSurfaceSize();
+      this.requestLayout();
+    });
+  }
+
+  @Override
+  public void onFrame(VideoFrame videoFrame) {
+    eglRenderer.onFrame(videoFrame);
+  }
+
+  @Override
+  public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
+    ThreadUtils.checkIsOnMainThread();
+
+    surfaceWidth  = 0;
+    surfaceHeight = 0;
+
+    updateSurfaceSize();
+
+    eglRenderer.onSurfaceTextureAvailable(surface, width, height);
+  }
+
+  @Override
+  public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
+    eglRenderer.onSurfaceTextureSizeChanged(surface, width, height);
+  }
+
+  @Override
+  public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
+    return eglRenderer.onSurfaceTextureDestroyed(surface);
+  }
+
+  @Override
+  public void onSurfaceTextureUpdated(SurfaceTexture surface) {
+  }
+
+  private String getResourceName() {
+    try {
+      return this.getResources().getResourceEntryName(this.getId());
+    } catch (Resources.NotFoundException var2) {
+      return "";
+    }
+  }
+
+  public void clearImage() {
+    this.eglRenderer.clearImage();
+  }
+
+  private void postOrRun(Runnable r) {
+    if (Thread.currentThread() == Looper.getMainLooper().getThread()) {
+      r.run();
+    } else {
+      this.post(r);
+    }
+
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAudioOutput.java

@@ -0,0 +1,28 @@
+package org.thoughtcrime.securesms.components.webrtc;
+
+import androidx.annotation.DrawableRes;
+import androidx.annotation.StringRes;
+
+import org.thoughtcrime.securesms.R;
+
+public enum WebRtcAudioOutput {
+  HANDSET(R.string.WebRtcAudioOutputToggle__phone_earpiece, R.drawable.ic_handset_solid_24),
+  SPEAKER(R.string.WebRtcAudioOutputToggle__speaker, R.drawable.ic_speaker_solid_24),
+  HEADSET(R.string.WebRtcAudioOutputToggle__bluetooth, R.drawable.ic_speaker_bt_solid_24);
+
+  private final @StringRes int labelRes;
+  private final @DrawableRes int iconRes;
+
+  WebRtcAudioOutput(@StringRes int labelRes, @DrawableRes int iconRes) {
+    this.labelRes = labelRes;
+    this.iconRes = iconRes;
+  }
+
+  public int getIconRes() {
+    return iconRes;
+  }
+
+  public int getLabelRes() {
+    return labelRes;
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAudioOutputToggleButton.java

@@ -0,0 +1,210 @@
+package org.thoughtcrime.securesms.components.webrtc;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.util.AttributeSet;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.AppCompatImageView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.thoughtcrime.securesms.R;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class WebRtcAudioOutputToggleButton extends AppCompatImageView {
+
+  private static final String STATE_OUTPUT_INDEX      = "audio.output.toggle.state.output.index";
+  private static final String STATE_HEADSET_ENABLED   = "audio.output.toggle.state.headset.enabled";
+  private static final String STATE_HANDSET_ENABLED   = "audio.output.toggle.state.handset.enabled";
+  private static final String STATE_PARENT            = "audio.output.toggle.state.parent";
+
+  private static final int[]                   SPEAKER_OFF    = { R.attr.state_speaker_off };
+  private static final int[]                   SPEAKER_ON     = { R.attr.state_speaker_on };
+  private static final int[]                   OUTPUT_HANDSET = { R.attr.state_handset_selected };
+  private static final int[]                   OUTPUT_SPEAKER = { R.attr.state_speaker_selected };
+  private static final int[]                   OUTPUT_HEADSET = { R.attr.state_headset_selected };
+  private static final int[][]                 OUTPUT_ENUM    = { SPEAKER_OFF, SPEAKER_ON, OUTPUT_HANDSET, OUTPUT_SPEAKER, OUTPUT_HEADSET };
+  private static final List<WebRtcAudioOutput> OUTPUT_MODES   = Arrays.asList(WebRtcAudioOutput.HANDSET, WebRtcAudioOutput.SPEAKER, WebRtcAudioOutput.HANDSET, WebRtcAudioOutput.SPEAKER, WebRtcAudioOutput.HEADSET);
+
+  private boolean                      isHeadsetAvailable;
+  private boolean                      isHandsetAvailable;
+  private int                          outputIndex;
+  private OnAudioOutputChangedListener audioOutputChangedListener;
+  private DialogInterface              picker;
+
+  public WebRtcAudioOutputToggleButton(@NonNull Context context) {
+    this(context, null);
+  }
+
+  public WebRtcAudioOutputToggleButton(@NonNull Context context, @Nullable AttributeSet attrs) {
+    this(context, attrs, 0);
+  }
+
+  public WebRtcAudioOutputToggleButton(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+    super(context, attrs, defStyleAttr);
+
+    super.setOnClickListener((v) -> {
+      List<WebRtcAudioOutput> availableModes = buildOutputModeList(isHeadsetAvailable, isHandsetAvailable);
+
+      if (availableModes.size() > 2 || !isHandsetAvailable) showPicker(availableModes);
+      else                                                  setAudioOutput(OUTPUT_MODES.get((outputIndex + 1) % OUTPUT_MODES.size()), true);
+    });
+  }
+
+  @Override
+  protected void onDetachedFromWindow() {
+    super.onDetachedFromWindow();
+    hidePicker();
+  }
+
+  @Override
+  public int[] onCreateDrawableState(int extraSpace) {
+    final int[] extra         = OUTPUT_ENUM[outputIndex];
+    final int[] drawableState = super.onCreateDrawableState(extraSpace + extra.length);
+    mergeDrawableStates(drawableState, extra);
+    return drawableState;
+  }
+
+  @Override
+  public void setOnClickListener(@Nullable OnClickListener l) {
+    throw new UnsupportedOperationException("This View does not support custom click listeners.");
+  }
+
+  public void setControlAvailability(boolean isHandsetAvailable, boolean isHeadsetAvailable) {
+    this.isHandsetAvailable = isHandsetAvailable;
+    this.isHeadsetAvailable = isHeadsetAvailable;
+  }
+
+  public void setAudioOutput(@NonNull WebRtcAudioOutput audioOutput, boolean notifyListener) {
+    int oldIndex = outputIndex;
+    outputIndex = resolveAudioOutputIndex(OUTPUT_MODES.lastIndexOf(audioOutput));
+
+    if (oldIndex != outputIndex) {
+      refreshDrawableState();
+
+      if (notifyListener) {
+        notifyListener();
+      }
+    }
+  }
+
+  public void setOnAudioOutputChangedListener(@Nullable OnAudioOutputChangedListener listener) {
+    this.audioOutputChangedListener = listener;
+  }
+
+  private void showPicker(@NonNull List<WebRtcAudioOutput> availableModes) {
+    RecyclerView       rv      = new RecyclerView(getContext());
+    AudioOutputAdapter adapter = new AudioOutputAdapter(audioOutput -> {
+                                                          setAudioOutput(audioOutput, true);
+                                                          hidePicker();
+                                                        },
+                                                        availableModes);
+
+    adapter.setSelectedOutput(OUTPUT_MODES.get(outputIndex));
+
+    rv.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false));
+    rv.setAdapter(adapter);
+
+    picker = new AlertDialog.Builder(getContext())
+                            .setTitle(R.string.WebRtcAudioOutputToggle__audio_output)
+                            .setView(rv)
+                            .setCancelable(true)
+                            .show();
+  }
+
+  @Override
+  protected Parcelable onSaveInstanceState() {
+    Parcelable parentState = super.onSaveInstanceState();
+    Bundle     bundle      = new Bundle();
+
+    bundle.putParcelable(STATE_PARENT, parentState);
+    bundle.putInt(STATE_OUTPUT_INDEX, outputIndex);
+    bundle.putBoolean(STATE_HEADSET_ENABLED, isHeadsetAvailable);
+    bundle.putBoolean(STATE_HANDSET_ENABLED, isHandsetAvailable);
+    return bundle;
+  }
+
+  @Override
+  protected void onRestoreInstanceState(Parcelable state) {
+    if (state instanceof Bundle) {
+      Bundle savedState = (Bundle) state;
+
+      isHeadsetAvailable = savedState.getBoolean(STATE_HEADSET_ENABLED);
+      isHandsetAvailable = savedState.getBoolean(STATE_HANDSET_ENABLED);
+
+      setAudioOutput(OUTPUT_MODES.get(
+          resolveAudioOutputIndex(savedState.getInt(STATE_OUTPUT_INDEX))),
+          false
+      );
+
+      super.onRestoreInstanceState(savedState.getParcelable(STATE_PARENT));
+    } else {
+      super.onRestoreInstanceState(state);
+    }
+  }
+
+  private void hidePicker() {
+    if (picker != null) {
+      picker.dismiss();
+      picker = null;
+    }
+  }
+
+  private void notifyListener() {
+    if (audioOutputChangedListener == null) return;
+
+    audioOutputChangedListener.audioOutputChanged(OUTPUT_MODES.get(outputIndex));
+  }
+
+  private static List<WebRtcAudioOutput> buildOutputModeList(boolean isHeadsetAvailable, boolean isHandsetAvailable) {
+    List<WebRtcAudioOutput> modes = new ArrayList(3);
+
+    modes.add(WebRtcAudioOutput.SPEAKER);
+
+    if (isHeadsetAvailable) {
+      modes.add(WebRtcAudioOutput.HEADSET);
+    }
+
+    if (isHandsetAvailable) {
+      modes.add(WebRtcAudioOutput.HANDSET);
+    }
+
+    return modes;
+  };
+
+  private int resolveAudioOutputIndex(int desiredAudioOutputIndex) {
+    if (isIllegalAudioOutputIndex(desiredAudioOutputIndex)) {
+      throw new IllegalArgumentException("Unsupported index: " + desiredAudioOutputIndex);
+    }
+    if (isUnsupportedAudioOutput(desiredAudioOutputIndex, isHeadsetAvailable, isHandsetAvailable)) {
+      if (!isHandsetAvailable) {
+        return OUTPUT_MODES.lastIndexOf(WebRtcAudioOutput.SPEAKER);
+      } else {
+        return OUTPUT_MODES.indexOf(WebRtcAudioOutput.HANDSET);
+      }
+    }
+
+    if (!isHeadsetAvailable) {
+      return desiredAudioOutputIndex % 2;
+    }
+
+    return desiredAudioOutputIndex;
+  }
+
+  private static boolean isIllegalAudioOutputIndex(int desiredAudioOutputIndex) {
+    return desiredAudioOutputIndex < 0 || desiredAudioOutputIndex > OUTPUT_MODES.size();
+  }
+
+  private static boolean isUnsupportedAudioOutput(int desiredAudioOutputIndex, boolean isHeadsetAvailable, boolean isHandsetAvailable) {
+    return (OUTPUT_MODES.get(desiredAudioOutputIndex) == WebRtcAudioOutput.HEADSET && !isHeadsetAvailable) ||
+           (OUTPUT_MODES.get(desiredAudioOutputIndex) == WebRtcAudioOutput.HANDSET && !isHandsetAvailable);
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallControls.java

@@ -1,217 +0,0 @@
-package org.thoughtcrime.securesms.components.webrtc;
-
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.media.AudioManager;
-import android.os.Build;
-import androidx.annotation.NonNull;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CompoundButton;
-import android.widget.LinearLayout;
-
-import com.tomergoldst.tooltips.ToolTip;
-import com.tomergoldst.tooltips.ToolTipsManager;
-
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.components.AccessibleToggleButton;
-import org.thoughtcrime.securesms.util.ServiceUtil;
-import org.thoughtcrime.securesms.util.ViewUtil;
-
-public class WebRtcCallControls extends LinearLayout {
-
-  private static final String TAG = WebRtcCallControls.class.getSimpleName();
-
-  private AccessibleToggleButton audioMuteButton;
-  private AccessibleToggleButton videoMuteButton;
-  private AccessibleToggleButton speakerButton;
-  private AccessibleToggleButton bluetoothButton;
-  private AccessibleToggleButton cameraFlipButton;
-  private boolean                cameraFlipAvailable;
-
-  @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-  public WebRtcCallControls(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-    super(context, attrs, defStyleAttr, defStyleRes);
-    initialize();
-  }
-
-  @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-  public WebRtcCallControls(Context context, AttributeSet attrs, int defStyleAttr) {
-    super(context, attrs, defStyleAttr);
-    initialize();
-  }
-
-  public WebRtcCallControls(Context context, AttributeSet attrs) {
-    super(context, attrs);
-    initialize();
-  }
-
-  public WebRtcCallControls(Context context) {
-    super(context);
-    initialize();
-  }
-
-  private void initialize() {
-    LayoutInflater inflater = (LayoutInflater)getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-    inflater.inflate(R.layout.webrtc_call_controls, this, true);
-
-    this.speakerButton   = ViewUtil.findById(this, R.id.speakerButton);
-    this.bluetoothButton = ViewUtil.findById(this, R.id.bluetoothButton);
-    this.audioMuteButton = ViewUtil.findById(this, R.id.muteButton);
-    this.videoMuteButton = ViewUtil.findById(this, R.id.video_mute_button);
-    this.cameraFlipButton = ViewUtil.findById(this, R.id.camera_flip_button);
-  }
-
-  public void setAudioMuteButtonListener(final MuteButtonListener listener) {
-    audioMuteButton.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-      @Override
-      public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
-        listener.onToggle(b);
-      }
-    });
-  }
-
-  public void setVideoMuteButtonListener(final MuteButtonListener listener) {
-    videoMuteButton.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-      @Override
-      public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-        boolean videoMuted = !isChecked;
-        listener.onToggle(videoMuted);
-        cameraFlipButton.setVisibility(!videoMuted && cameraFlipAvailable ? View.VISIBLE : View.GONE);
-      }
-    });
-  }
-
-  public void setCameraFlipButtonListener(final CameraFlipButtonListener listener) {
-    cameraFlipButton.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-      @Override
-      public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-        listener.onToggle();
-        cameraFlipButton.setEnabled(false);
-      }
-    });
-  }
-
-  public void setSpeakerButtonListener(final SpeakerButtonListener listener) {
-    speakerButton.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-      @Override
-      public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-        listener.onSpeakerChange(isChecked);
-      }
-    });
-  }
-
-  public void setBluetoothButtonListener(final BluetoothButtonListener listener) {
-    bluetoothButton.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-      @Override
-      public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-        listener.onBluetoothChange(isChecked);
-      }
-    });
-  }
-
-  public void updateAudioState(boolean isBluetoothAvailable) {
-    AudioManager audioManager = ServiceUtil.getAudioManager(getContext());
-
-    if (!isBluetoothAvailable) {
-      bluetoothButton.setVisibility(View.GONE);
-    } else {
-      bluetoothButton.setVisibility(View.VISIBLE);
-    }
-
-    if (audioManager.isBluetoothScoOn()) {
-      bluetoothButton.setChecked(true, false);
-      speakerButton.setChecked(false, false);
-    } else if (audioManager.isSpeakerphoneOn()) {
-      speakerButton.setChecked(true, false);
-      bluetoothButton.setChecked(false, false);
-    } else {
-      speakerButton.setChecked(false, false);
-      bluetoothButton.setChecked(false, false);
-    }
-  }
-
-  public boolean isVideoEnabled() {
-    return videoMuteButton.isChecked();
-  }
-
-  public void setVideoEnabled(boolean enabled) {
-    videoMuteButton.setChecked(enabled, false);
-  }
-
-  public void setVideoAvailable(boolean available) {
-    videoMuteButton.setVisibility(available ? VISIBLE : GONE);
-  }
-
-  public void setCameraFlipButtonEnabled(boolean enabled) {
-    cameraFlipButton.setChecked(enabled, false);
-  }
-
-  public void setCameraFlipAvailable(boolean available) {
-    cameraFlipAvailable = available;
-    cameraFlipButton.setVisibility(cameraFlipAvailable && isVideoEnabled() ? View.VISIBLE : View.GONE);
-  }
-
-  public void setCameraFlipClickable(boolean clickable) {
-    setControlEnabled(cameraFlipButton, clickable);
-  }
-
-  public void setMicrophoneEnabled(boolean enabled) {
-    audioMuteButton.setChecked(!enabled, false);
-  }
-
-  public void setControlsEnabled(boolean enabled) {
-    setControlEnabled(speakerButton, enabled);
-    setControlEnabled(bluetoothButton, enabled);
-    setControlEnabled(videoMuteButton, enabled);
-    setControlEnabled(cameraFlipButton, enabled);
-    setControlEnabled(audioMuteButton, enabled);
-  }
-
-  private void setControlEnabled(@NonNull View view, boolean enabled) {
-    if (enabled) {
-      view.setAlpha(1.0f);
-      view.setEnabled(true);
-    } else {
-      view.setAlpha(0.3f);
-      view.setEnabled(false);
-    }
-  }
-
-  public void displayVideoTooltip(ViewGroup viewGroup) {
-    if (videoMuteButton.getVisibility() == VISIBLE) {
-      final ToolTipsManager toolTipsManager = new ToolTipsManager();
-
-      ToolTip toolTip = new ToolTip.Builder(getContext(), videoMuteButton, viewGroup,
-                                            getContext().getString(R.string.WebRtcCallControls_tap_to_enable_your_video),
-                                            ToolTip.POSITION_BELOW).build();
-      toolTipsManager.show(toolTip);
-
-      videoMuteButton.postDelayed(() -> toolTipsManager.findAndDismiss(videoMuteButton), 4000);
-    }
-  }
-
-  public static interface MuteButtonListener {
-    public void onToggle(boolean isMuted);
-  }
-
-  public static interface CameraFlipButtonListener {
-    public void onToggle();
-  }
-
-  public static interface SpeakerButtonListener {
-    public void onSpeakerChange(boolean isSpeaker);
-  }
-
-  public static interface BluetoothButtonListener {
-    public void onBluetoothChange(boolean isBluetooth);
-  }
-
-
-
-
-
-}

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallRepository.java

@@ -0,0 +1,25 @@
+package org.thoughtcrime.securesms.components.webrtc;
+
+import android.media.AudioManager;
+
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.util.ServiceUtil;
+
+class WebRtcCallRepository {
+
+  private final AudioManager audioManager;
+
+  WebRtcCallRepository() {
+    this.audioManager = ServiceUtil.getAudioManager(ApplicationDependencies.getApplication());
+  }
+
+  WebRtcAudioOutput getAudioOutput() {
+    if (audioManager.isBluetoothScoOn()) {
+      return WebRtcAudioOutput.HEADSET;
+    } else if (audioManager.isSpeakerphoneOn()) {
+      return WebRtcAudioOutput.SPEAKER;
+    } else {
+      return WebRtcAudioOutput.HANDSET;
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java

@@ -1,433 +0,0 @@
-/*
- * Copyright (C) 2016 Open Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.thoughtcrime.securesms.components.webrtc;
-
-import android.content.Context;
-import android.text.SpannableString;
-import android.text.Spanned;
-import android.text.method.LinkMovementMethod;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.view.ViewCompat;
-
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.mms.GlideApp;
-import org.thoughtcrime.securesms.recipients.LiveRecipient;
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientForeverObserver;
-import org.thoughtcrime.securesms.ringrtc.CameraState;
-import org.thoughtcrime.securesms.util.FeatureFlags;
-import org.thoughtcrime.securesms.util.VerifySpan;
-import org.thoughtcrime.securesms.util.ViewUtil;
-import org.webrtc.RendererCommon;
-import org.webrtc.SurfaceViewRenderer;
-import org.whispersystems.libsignal.IdentityKey;
-
-/**
- * A UI widget that encapsulates the entire in-call screen
- * for both initiators and responders.
- *
- * @author Moxie Marlinspike
- *
- */
-public class WebRtcCallScreen extends FrameLayout implements RecipientForeverObserver {
-
-  @SuppressWarnings("unused")
-  private static final String TAG = WebRtcCallScreen.class.getSimpleName();
-
-  private ImageView            photo;
-  private SurfaceViewRenderer  localRenderer;
-  private PercentFrameLayout   localRenderLayout;
-  private PercentFrameLayout   remoteRenderLayout;
-  private PercentFrameLayout   localLargeRenderLayout;
-  private TextView             name;
-  private TextView             phoneNumber;
-  private TextView             label;
-  private TextView             elapsedTime;
-  private View                 untrustedIdentityContainer;
-  private TextView             untrustedIdentityExplanation;
-  private Button               acceptIdentityButton;
-  private Button               cancelIdentityButton;
-  private TextView             status;
-  private FloatingActionButton endCallButton;
-  private WebRtcCallControls   controls;
-  private RelativeLayout       expandedInfo;
-  private ViewGroup            callHeader;
-
-  private WebRtcAnswerDeclineButton incomingCallButton;
-
-  private LiveRecipient      recipient;
-  private boolean            minimized;
-
-  public WebRtcCallScreen(Context context) {
-    super(context);
-    initialize();
-  }
-
-  public WebRtcCallScreen(Context context, AttributeSet attrs) {
-    super(context, attrs);
-    initialize();
-  }
-
-  public WebRtcCallScreen(Context context, AttributeSet attrs, int defStyle) {
-    super(context, attrs, defStyle);
-    initialize();
-  }
-
-  public void setActiveCall(@NonNull Recipient personInfo, @NonNull String message, @Nullable String sas, SurfaceViewRenderer localRenderer, SurfaceViewRenderer remoteRenderer) {
-    setCard(personInfo, message);
-    setConnected(localRenderer, remoteRenderer);
-    incomingCallButton.stopRingingAnimation();
-    incomingCallButton.setVisibility(View.GONE);
-    endCallButton.show();
-  }
-
-  public void setActiveCall(@NonNull Recipient personInfo, @NonNull String message, @NonNull SurfaceViewRenderer localRenderer) {
-    setCard(personInfo, message);
-    setRinging(localRenderer);
-    incomingCallButton.stopRingingAnimation();
-    incomingCallButton.setVisibility(View.GONE);
-    endCallButton.show();
-  }
-
-  public void setIncomingCall(Recipient personInfo) {
-    setCard(personInfo, getContext().getString(R.string.CallScreen_Incoming_call));
-    endCallButton.hide();
-    incomingCallButton.setVisibility(View.VISIBLE);
-    incomingCallButton.startRingingAnimation();
-  }
-
-  public void setUntrustedIdentity(Recipient personInfo, IdentityKey untrustedIdentity) {
-    String          name            = recipient.get().toShortString(getContext());
-    String          introduction    = String.format(getContext().getString(R.string.WebRtcCallScreen_new_safety_numbers), name, name);
-    SpannableString spannableString = new SpannableString(introduction + " " + getContext().getString(R.string.WebRtcCallScreen_you_may_wish_to_verify_this_contact));
-
-    spannableString.setSpan(new VerifySpan(getContext(), personInfo.getId(), untrustedIdentity),
-                            introduction.length()+1, spannableString.length(),
-                            Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-
-    if (this.recipient != null) this.recipient.removeForeverObserver(this);
-    this.recipient = personInfo.live();
-    this.recipient.observeForever(this);
-
-    setPersonInfo(personInfo);
-
-    incomingCallButton.stopRingingAnimation();
-    incomingCallButton.setVisibility(View.GONE);
-    this.status.setText(R.string.WebRtcCallScreen_new_safety_number_title);
-    this.untrustedIdentityContainer.setVisibility(View.VISIBLE);
-    this.untrustedIdentityExplanation.setText(spannableString);
-    this.untrustedIdentityExplanation.setMovementMethod(LinkMovementMethod.getInstance());
-
-    this.endCallButton.hide();
-  }
-
-  public void setIncomingCallActionListener(WebRtcAnswerDeclineButton.AnswerDeclineListener listener) {
-    incomingCallButton.setAnswerDeclineListener(listener);
-  }
-
-  public void setAudioMuteButtonListener(WebRtcCallControls.MuteButtonListener listener) {
-    this.controls.setAudioMuteButtonListener(listener);
-  }
-
-  public void setVideoMuteButtonListener(WebRtcCallControls.MuteButtonListener listener) {
-    this.controls.setVideoMuteButtonListener(listener);
-  }
-
-  public void setCameraFlipButtonListener(WebRtcCallControls.CameraFlipButtonListener listener) {
-    this.controls.setCameraFlipButtonListener(listener);
-  }
-
-  public void setSpeakerButtonListener(WebRtcCallControls.SpeakerButtonListener listener) {
-    this.controls.setSpeakerButtonListener(listener);
-  }
-
-  public void setBluetoothButtonListener(WebRtcCallControls.BluetoothButtonListener listener) {
-    this.controls.setBluetoothButtonListener(listener);
-  }
-
-  public void setHangupButtonListener(final HangupButtonListener listener) {
-    endCallButton.setOnClickListener(v -> listener.onClick());
-  }
-
-  public void setAcceptIdentityListener(OnClickListener listener) {
-    this.acceptIdentityButton.setOnClickListener(listener);
-  }
-
-  public void setCancelIdentityButton(OnClickListener listener) {
-    this.cancelIdentityButton.setOnClickListener(listener);
-  }
-
-  public void updateAudioState(boolean isBluetoothAvailable, boolean isMicrophoneEnabled) {
-    this.controls.updateAudioState(isBluetoothAvailable);
-    this.controls.setMicrophoneEnabled(isMicrophoneEnabled);
-  }
-
-  public void setControlsEnabled(boolean enabled) {
-    this.controls.setControlsEnabled(enabled);
-  }
-
-  public void setLocalVideoState(@NonNull CameraState cameraState, @NonNull SurfaceViewRenderer localRenderer) {
-    this.controls.setVideoAvailable(cameraState.getCameraCount() > 0);
-    this.controls.setVideoEnabled(cameraState.isEnabled());
-    this.controls.setCameraFlipAvailable(cameraState.getCameraCount() > 1);
-    this.controls.setCameraFlipClickable(cameraState.getActiveDirection() != CameraState.Direction.PENDING);
-    this.controls.setCameraFlipButtonEnabled(cameraState.getActiveDirection() == CameraState.Direction.BACK);
-
-    localRenderer.setMirror(cameraState.getActiveDirection() == CameraState.Direction.FRONT);
-    localRenderer.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FIT);
-
-    this.localRenderer = localRenderer;
-
-    if (localRenderLayout.getChildCount() != 0) {
-      displayLocalRendererInSmallLayout(!cameraState.isEnabled());
-    } else {
-      displayLocalRendererInLargeLayout(!cameraState.isEnabled());
-    }
-
-    localRenderer.setVisibility(cameraState.isEnabled() ? VISIBLE : INVISIBLE);
-  }
-
-  public void setRemoteVideoEnabled(boolean enabled) {
-    if (enabled && this.remoteRenderLayout.isHidden()) {
-      this.photo.setVisibility(View.INVISIBLE);
-      setMinimized(true);
-
-      this.remoteRenderLayout.setHidden(false);
-      this.remoteRenderLayout.requestLayout();
-
-      if (localRenderLayout.isHidden()) this.controls.displayVideoTooltip(callHeader);
-    } else if (!enabled && !this.remoteRenderLayout.isHidden()){
-      setMinimized(false);
-      this.photo.setVisibility(View.VISIBLE);
-      this.remoteRenderLayout.setHidden(true);
-      this.remoteRenderLayout.requestLayout();
-    }
-  }
-
-  public boolean isVideoEnabled() {
-    return controls.isVideoEnabled();
-  }
-
-  private void displayLocalRendererInLargeLayout(boolean hide) {
-    if (localLargeRenderLayout.getChildCount() == 0) {
-      localRenderLayout.removeAllViews();
-
-      if (localRenderer != null) {
-        localLargeRenderLayout.addView(localRenderer);
-      }
-    }
-
-    localRenderLayout.setHidden(true);
-    localRenderLayout.requestLayout();
-
-    localLargeRenderLayout.setHidden(hide);
-    localLargeRenderLayout.requestLayout();
-
-    if (hide) {
-      photo.setVisibility(View.VISIBLE);
-    } else {
-      photo.setVisibility(View.INVISIBLE);
-    }
-  }
-
-  private void displayLocalRendererInSmallLayout(boolean hide) {
-    if (localRenderLayout.getChildCount() == 0) {
-      localLargeRenderLayout.removeAllViews();
-
-      if (localRenderer != null) {
-        localRenderLayout.addView(localRenderer);
-      }
-    }
-
-    localLargeRenderLayout.setHidden(true);
-    localLargeRenderLayout.requestLayout();
-
-    localRenderLayout.setHidden(hide);
-    localRenderLayout.requestLayout();
-
-    if (remoteRenderLayout.isHidden()) {
-      photo.setVisibility(View.VISIBLE);
-    }
-  }
-
-  private void initialize() {
-    LayoutInflater inflater = (LayoutInflater)getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-    inflater.inflate(R.layout.webrtc_call_screen, this, true);
-
-    this.elapsedTime                  = findViewById(R.id.elapsedTime);
-    this.photo                        = findViewById(R.id.photo);
-    this.localRenderLayout            = findViewById(R.id.local_render_layout);
-    this.remoteRenderLayout           = findViewById(R.id.remote_render_layout);
-    this.localLargeRenderLayout       = findViewById(R.id.local_large_render_layout);
-    this.phoneNumber                  = findViewById(R.id.phoneNumber);
-    this.name                         = findViewById(R.id.name);
-    this.label                        = findViewById(R.id.label);
-    this.status                       = findViewById(R.id.callStateLabel);
-    this.controls                     = findViewById(R.id.inCallControls);
-    this.endCallButton                = findViewById(R.id.hangup_fab);
-    this.incomingCallButton           = findViewById(R.id.answer_decline_button);
-    this.untrustedIdentityContainer   = findViewById(R.id.untrusted_layout);
-    this.untrustedIdentityExplanation = findViewById(R.id.untrusted_explanation);
-    this.acceptIdentityButton         = findViewById(R.id.accept_safety_numbers);
-    this.cancelIdentityButton         = findViewById(R.id.cancel_safety_numbers);
-    this.expandedInfo                 = findViewById(R.id.expanded_info);
-    this.callHeader                   = findViewById(R.id.call_info_1);
-
-    this.localRenderLayout.setHidden(true);
-    this.remoteRenderLayout.setHidden(true);
-    this.minimized = false;
-
-    this.remoteRenderLayout.setOnClickListener(v -> {
-      if (!this.remoteRenderLayout.isHidden()) {
-        setMinimized(!minimized);
-      }
-    });
-  }
-
-  private void setRinging(SurfaceViewRenderer localRenderer) {
-    if (localLargeRenderLayout.getChildCount() == 0) {
-      if (localRenderer.getParent() != null) {
-        ((ViewGroup)localRenderer.getParent()).removeView(localRenderer);
-      }
-
-      localLargeRenderLayout.setPosition(0, 0, 100, 100);
-
-      localRenderer.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                                                                 ViewGroup.LayoutParams.MATCH_PARENT));
-
-      localRenderer.setMirror(true);
-      localRenderer.setZOrderMediaOverlay(true);
-
-      localLargeRenderLayout.addView(localRenderer);
-
-      this.localRenderer = localRenderer;
-    }
-  }
-
-  private void setConnected(SurfaceViewRenderer localRenderer, SurfaceViewRenderer remoteRenderer) {
-    if (localRenderLayout.getChildCount() == 0) {
-      if (localRenderer.getParent() != null) {
-        ((ViewGroup)localRenderer.getParent()).removeView(localRenderer);
-      }
-
-      if (remoteRenderer.getParent() != null) {
-        ((ViewGroup)remoteRenderer.getParent()).removeView(remoteRenderer);
-      }
-
-      localRenderLayout.setPosition(7, 70, 25, 25);
-      remoteRenderLayout.setPosition(0, 0, 100, 100);
-
-      localRenderer.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                                                                 ViewGroup.LayoutParams.MATCH_PARENT));
-
-      remoteRenderer.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                                                                  ViewGroup.LayoutParams.MATCH_PARENT));
-
-      localRenderer.setMirror(true);
-      localRenderer.setZOrderMediaOverlay(true);
-
-      localRenderLayout.addView(localRenderer);
-      remoteRenderLayout.addView(remoteRenderer);
-
-      this.localRenderer = localRenderer;
-    }
-  }
-
-  private void setPersonInfo(final @NonNull Recipient recipient) {
-    GlideApp.with(getContext().getApplicationContext())
-            .load(recipient.getContactPhoto())
-            .fallback(recipient.getFallbackContactPhoto().asCallCard(getContext()))
-            .error(recipient.getFallbackContactPhoto().asCallCard(getContext()))
-            .diskCacheStrategy(DiskCacheStrategy.ALL)
-            .into(this.photo);
-
-    if (FeatureFlags.profileDisplay()) {
-      this.name.setText(recipient.getDisplayName(getContext()));
-
-      if (recipient.getE164().isPresent()) {
-        this.phoneNumber.setText(recipient.requireE164());
-        this.phoneNumber.setVisibility(View.VISIBLE);
-      } else {
-        this.phoneNumber.setVisibility(View.GONE);
-      }
-    } else {
-      this.name.setText(recipient.getName(getContext()));
-
-      if (recipient.getName(getContext()) == null && !recipient.getProfileName().isEmpty()) {
-        this.phoneNumber.setText(recipient.requireE164() + " (~" + recipient.getProfileName().toString() + ")");
-      } else {
-        this.phoneNumber.setText(recipient.requireE164());
-      }
-    }
-  }
-
-  private void setCard(Recipient recipient, String status) {
-    if (this.recipient != null) this.recipient.removeForeverObserver(this);
-    this.recipient = recipient.live();
-    this.recipient.observeForever(this);
-
-    setPersonInfo(recipient);
-
-    this.status.setText(status);
-    this.untrustedIdentityContainer.setVisibility(View.GONE);
-  }
-
-  private void setMinimized(boolean minimized) {
-    if (minimized) {
-      ViewCompat.animate(callHeader).translationY(-1 * expandedInfo.getHeight());
-      ViewCompat.animate(status).alpha(0);
-      ViewCompat.animate(endCallButton).translationY(endCallButton.getHeight() + ViewUtil.dpToPx(getContext(), 40));
-      ViewCompat.animate(endCallButton).alpha(0);
-
-      this.minimized = true;
-    } else {
-      ViewCompat.animate(callHeader).translationY(0);
-      ViewCompat.animate(status).alpha(1);
-      ViewCompat.animate(endCallButton).translationY(0);
-      ViewCompat.animate(endCallButton).alpha(1).withEndAction(() -> {
-        // Note: This is to work around an Android bug, see #6225
-        endCallButton.requestLayout();
-      });
-
-      this.minimized = false;
-    }
-  }
-
-  @Override
-  public void onRecipientChanged(@NonNull Recipient recipient) {
-    setPersonInfo(recipient);
-  }
-
-  public interface HangupButtonListener {
-    void onClick();
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallView.java

@@ -0,0 +1,527 @@
+package org.thoughtcrime.securesms.components.webrtc;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.ConstraintSet;
+import androidx.core.util.Consumer;
+import androidx.transition.AutoTransition;
+import androidx.transition.Transition;
+import androidx.transition.TransitionManager;
+
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.components.AccessibleToggleButton;
+import org.thoughtcrime.securesms.components.AvatarImageView;
+import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
+import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto;
+import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
+import org.thoughtcrime.securesms.mms.GlideApp;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.ringrtc.CameraState;
+import org.thoughtcrime.securesms.util.AvatarUtil;
+import org.thoughtcrime.securesms.util.SetUtil;
+import org.thoughtcrime.securesms.util.ViewUtil;
+import org.webrtc.RendererCommon;
+import org.whispersystems.signalservice.api.messages.calls.HangupMessage;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public class WebRtcCallView extends FrameLayout {
+
+  private static final long                  TRANSITION_DURATION_MILLIS          = 250;
+  private static final int                   SMALL_ONGOING_CALL_BUTTON_MARGIN_DP = 8;
+  private static final int                   LARGE_ONGOING_CALL_BUTTON_MARGIN_DP = 16;
+  private static final FallbackPhotoProvider FALLBACK_PHOTO_PROVIDER    = new FallbackPhotoProvider();
+
+  public static final int FADE_OUT_DELAY = 5000;
+
+  private TextureViewRenderer           localRenderer;
+  private WebRtcAudioOutputToggleButton audioToggle;
+  private AccessibleToggleButton        videoToggle;
+  private AccessibleToggleButton        micToggle;
+  private ViewGroup                     largeLocalRenderContainer;
+  private ViewGroup                     localRenderPipFrame;
+  private ViewGroup                     smallLocalRenderContainer;
+  private ViewGroup                     remoteRenderContainer;
+  private TextView                      recipientName;
+  private TextView                      status;
+  private ConstraintLayout              parent;
+  private AvatarImageView               avatar;
+  private ImageView                     avatarCard;
+  private ControlsListener              controlsListener;
+  private RecipientId                   recipientId;
+  private CameraState.Direction         cameraDirection;
+  private ImageView                     answer;
+  private ImageView                     cameraDirectionToggle;
+  private PictureInPictureGestureHelper pictureInPictureGestureHelper;
+  private ImageView                     hangup;
+  private View                          answerWithAudio;
+  private View                          answerWithAudioLabel;
+  private View                          ongoingFooterGradient;
+
+  private final Set<View> incomingCallViews    = new HashSet<>();
+  private final Set<View> topViews             = new HashSet<>();
+  private final Set<View> visibleViewSet       = new HashSet<>();
+  private final Set<View> adjustableMarginsSet = new HashSet<>();
+
+  private       WebRtcControls controls        = WebRtcControls.NONE;
+  private final Runnable       fadeOutRunnable = () -> {
+    if (isAttachedToWindow() && controls.isFadeOutEnabled()) fadeOutControls(); };
+
+  public WebRtcCallView(@NonNull Context context) {
+    this(context, null);
+  }
+
+  public WebRtcCallView(@NonNull Context context, @Nullable AttributeSet attrs) {
+    super(context, attrs);
+
+    LayoutInflater.from(context).inflate(R.layout.webrtc_call_view, this, true);
+  }
+
+  @SuppressWarnings("CodeBlock2Expr")
+  @Override
+  protected void onFinishInflate() {
+    super.onFinishInflate();
+
+    audioToggle               = findViewById(R.id.call_screen_speaker_toggle);
+    videoToggle               = findViewById(R.id.call_screen_video_toggle);
+    micToggle                 = findViewById(R.id.call_screen_audio_mic_toggle);
+    localRenderPipFrame       = findViewById(R.id.call_screen_pip);
+    largeLocalRenderContainer = findViewById(R.id.call_screen_large_local_renderer_holder);
+    smallLocalRenderContainer = findViewById(R.id.call_screen_small_local_renderer_holder);
+    remoteRenderContainer     = findViewById(R.id.call_screen_remote_renderer_holder);
+    recipientName             = findViewById(R.id.call_screen_recipient_name);
+    status                    = findViewById(R.id.call_screen_status);
+    parent                    = findViewById(R.id.call_screen);
+    avatar                    = findViewById(R.id.call_screen_recipient_avatar);
+    avatarCard                = findViewById(R.id.call_screen_recipient_avatar_call_card);
+    answer                    = findViewById(R.id.call_screen_answer_call);
+    cameraDirectionToggle     = findViewById(R.id.call_screen_camera_direction_toggle);
+    hangup                    = findViewById(R.id.call_screen_end_call);
+    answerWithAudio           = findViewById(R.id.call_screen_answer_with_audio);
+    answerWithAudioLabel      = findViewById(R.id.call_screen_answer_with_audio_label);
+    ongoingFooterGradient     = findViewById(R.id.call_screen_ongoing_footer_gradient);
+
+    View topGradient            = findViewById(R.id.call_screen_header_gradient);
+    View downCaret              = findViewById(R.id.call_screen_down_arrow);
+    View decline                = findViewById(R.id.call_screen_decline_call);
+    View answerLabel            = findViewById(R.id.call_screen_answer_call_label);
+    View declineLabel           = findViewById(R.id.call_screen_decline_call_label);
+    View incomingFooterGradient = findViewById(R.id.call_screen_incoming_footer_gradient);
+
+    topViews.add(status);
+    topViews.add(topGradient);
+    topViews.add(recipientName);
+
+    incomingCallViews.add(answer);
+    incomingCallViews.add(answerLabel);
+    incomingCallViews.add(decline);
+    incomingCallViews.add(declineLabel);
+    incomingCallViews.add(incomingFooterGradient);
+
+    adjustableMarginsSet.add(micToggle);
+    adjustableMarginsSet.add(cameraDirectionToggle);
+    adjustableMarginsSet.add(videoToggle);
+    adjustableMarginsSet.add(audioToggle);
+
+    audioToggle.setOnAudioOutputChangedListener(outputMode -> {
+      runIfNonNull(controlsListener, listener -> listener.onAudioOutputChanged(outputMode));
+    });
+
+    videoToggle.setOnCheckedChangeListener((v, isOn) -> {
+      runIfNonNull(controlsListener, listener -> listener.onVideoChanged(isOn));
+    });
+
+    micToggle.setOnCheckedChangeListener((v, isOn) -> {
+      runIfNonNull(controlsListener, listener -> listener.onMicChanged(isOn));
+    });
+
+    cameraDirectionToggle.setOnClickListener(v -> runIfNonNull(controlsListener, ControlsListener::onCameraDirectionChanged));
+
+    hangup.setOnClickListener(v -> runIfNonNull(controlsListener, ControlsListener::onEndCallPressed));
+    decline.setOnClickListener(v -> runIfNonNull(controlsListener, ControlsListener::onDenyCallPressed));
+
+    downCaret.setOnClickListener(v -> runIfNonNull(controlsListener, ControlsListener::onDownCaretPressed));
+
+    answer.setOnClickListener(v -> runIfNonNull(controlsListener, ControlsListener::onAcceptCallPressed));
+    answerWithAudio.setOnClickListener(v -> runIfNonNull(controlsListener, ControlsListener::onAcceptCallWithVoiceOnlyPressed));
+
+    setOnClickListener(v -> toggleControls());
+    avatar.setOnClickListener(v -> toggleControls());
+
+    pictureInPictureGestureHelper = PictureInPictureGestureHelper.applyTo(localRenderPipFrame);
+
+    int                statusBarHeight = ViewUtil.getStatusBarHeight(this);
+    MarginLayoutParams params          = (MarginLayoutParams) parent.getLayoutParams();
+
+    params.topMargin = statusBarHeight;
+    parent.setLayoutParams(params);
+  }
+
+  @Override
+  protected void onAttachedToWindow() {
+    super.onAttachedToWindow();
+
+    if (controls.isFadeOutEnabled()) {
+      scheduleFadeOut();
+    }
+  }
+
+  @Override
+  protected void onDetachedFromWindow() {
+    super.onDetachedFromWindow();
+    cancelFadeOut();
+  }
+
+  public void setControlsListener(@Nullable ControlsListener controlsListener) {
+    this.controlsListener = controlsListener;
+  }
+
+  public void setMicEnabled(boolean isMicEnabled) {
+    micToggle.setChecked(isMicEnabled, false);
+  }
+
+  public void setRemoteVideoEnabled(boolean isRemoteVideoEnabled) {
+    if (isRemoteVideoEnabled) {
+      remoteRenderContainer.setVisibility(View.VISIBLE);
+    } else {
+      remoteRenderContainer.setVisibility(View.GONE);
+    }
+  }
+
+  public void setLocalRenderer(@Nullable TextureViewRenderer surfaceViewRenderer) {
+    if (localRenderer == surfaceViewRenderer) {
+      return;
+    }
+
+    localRenderer = surfaceViewRenderer;
+
+    if (surfaceViewRenderer == null) {
+      setRenderer(largeLocalRenderContainer, null);
+      setRenderer(smallLocalRenderContainer, null);
+    } else {
+      localRenderer.setMirror(cameraDirection == CameraState.Direction.FRONT);
+      localRenderer.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FIT);
+    }
+  }
+
+  public void setRemoteRenderer(@Nullable TextureViewRenderer remoteRenderer) {
+    setRenderer(remoteRenderContainer, remoteRenderer);
+  }
+
+  public void setLocalRenderState(WebRtcLocalRenderState localRenderState) {
+
+    videoToggle.setChecked(localRenderState != WebRtcLocalRenderState.GONE, false);
+
+    switch (localRenderState) {
+      case GONE:
+        localRenderPipFrame.setVisibility(View.GONE);
+        largeLocalRenderContainer.setVisibility(View.GONE);
+        setRenderer(largeLocalRenderContainer, null);
+        setRenderer(smallLocalRenderContainer, null);
+        break;
+      case LARGE:
+        localRenderPipFrame.setVisibility(View.GONE);
+        largeLocalRenderContainer.setVisibility(View.VISIBLE);
+        if (largeLocalRenderContainer.getChildCount() == 0) {
+          setRenderer(largeLocalRenderContainer, localRenderer);
+        }
+        break;
+      case SMALL:
+        localRenderPipFrame.setVisibility(View.VISIBLE);
+        largeLocalRenderContainer.setVisibility(View.GONE);
+
+        if (smallLocalRenderContainer.getChildCount() == 0) {
+          setRenderer(smallLocalRenderContainer, localRenderer);
+        }
+    }
+  }
+
+  public void setCameraDirection(@NonNull CameraState.Direction cameraDirection) {
+    this.cameraDirection = cameraDirection;
+
+    if (localRenderer != null) {
+      localRenderer.setMirror(cameraDirection == CameraState.Direction.FRONT);
+    }
+  }
+
+  public void setRecipient(@NonNull Recipient recipient) {
+    if (recipient.getId() == recipientId) {
+      return;
+    }
+
+    recipientId = recipient.getId();
+    recipientName.setText(recipient.getDisplayName(getContext()));
+    avatar.setFallbackPhotoProvider(FALLBACK_PHOTO_PROVIDER);
+    avatar.setAvatar(GlideApp.with(this), recipient, false);
+    AvatarUtil.loadBlurredIconIntoViewBackground(recipient, this);
+
+    setRecipientCallCard(recipient);
+  }
+
+  public void showCallCard(boolean showCallCard) {
+    avatarCard.setVisibility(showCallCard ? VISIBLE : GONE);
+    avatar.setVisibility(showCallCard ? GONE : VISIBLE);
+  }
+
+  public void setStatus(@NonNull String status) {
+    this.status.setText(status);
+  }
+
+  public void setStatusFromHangupType(@NonNull HangupMessage.Type hangupType) {
+    switch (hangupType) {
+      case NORMAL:
+        status.setText(R.string.RedPhone_ending_call);
+        break;
+      case ACCEPTED:
+        status.setText(R.string.WebRtcCallActivity__answered_on_a_linked_device);
+        break;
+      case DECLINED:
+        status.setText(R.string.WebRtcCallActivity__declined_on_a_linked_device);
+        break;
+      case BUSY:
+        status.setText(R.string.WebRtcCallActivity__busy_on_a_linked_device);
+        break;
+      default:
+        throw new IllegalStateException("Unknown hangup type: " + hangupType);
+    }
+  }
+
+  public void setWebRtcControls(WebRtcControls webRtcControls) {
+    Set<View> lastVisibleSet = new HashSet<>(visibleViewSet);
+
+    visibleViewSet.clear();
+    visibleViewSet.addAll(topViews);
+
+    if (webRtcControls.displayIncomingCallButtons()) {
+      visibleViewSet.addAll(incomingCallViews);
+
+      status.setText(R.string.WebRtcCallView__signal_voice_call);
+      answer.setImageDrawable(AppCompatResources.getDrawable(getContext(), R.drawable.webrtc_call_screen_answer));
+    }
+
+    if (webRtcControls.displayAnswerWithAudio()) {
+      visibleViewSet.add(answerWithAudio);
+      visibleViewSet.add(answerWithAudioLabel);
+
+      status.setText(R.string.WebRtcCallView__signal_video_call);
+      answer.setImageDrawable(AppCompatResources.getDrawable(getContext(), R.drawable.webrtc_call_screen_answer_with_video));
+    }
+
+    if (webRtcControls.displayAudioToggle()) {
+      visibleViewSet.add(audioToggle);
+
+      audioToggle.setControlAvailability(webRtcControls.enableHandsetInAudioToggle(),
+                                         webRtcControls.enableHeadsetInAudioToggle());
+
+      audioToggle.setAudioOutput(webRtcControls.getAudioOutput(), false);
+    }
+
+    if (webRtcControls.displayCameraToggle()) {
+      visibleViewSet.add(cameraDirectionToggle);
+    }
+
+    if (webRtcControls.displayEndCall()) {
+      visibleViewSet.add(hangup);
+      visibleViewSet.add(ongoingFooterGradient);
+    }
+
+    if (webRtcControls.displayMuteAudio()) {
+      visibleViewSet.add(micToggle);
+    }
+
+    if (webRtcControls.displayVideoToggle()) {
+      visibleViewSet.add(videoToggle);
+    }
+
+    if (webRtcControls.displaySmallOngoingCallButtons()) {
+      updateButtonStateForSmallButtons();
+    } else if (webRtcControls.displayLargeOngoingCallButtons()) {
+      updateButtonStateForLargeButtons();
+    }
+
+    if (webRtcControls.isFadeOutEnabled()) {
+      if (!controls.isFadeOutEnabled()) {
+        scheduleFadeOut();
+      }
+    } else {
+      cancelFadeOut();
+    }
+
+    controls = webRtcControls;
+
+    if (!visibleViewSet.equals(lastVisibleSet) || !controls.isFadeOutEnabled()) {
+      fadeInNewUiState(lastVisibleSet, webRtcControls.displaySmallOngoingCallButtons());
+      post(() -> pictureInPictureGestureHelper.setVerticalBoundaries(status.getBottom(), videoToggle.getTop()));
+    }
+  }
+
+  public @NonNull View getVideoTooltipTarget() {
+    return videoToggle;
+  }
+
+  private void toggleControls() {
+    if (controls.isFadeOutEnabled() && status.getVisibility() == VISIBLE) {
+      fadeOutControls();
+    } else {
+      fadeInControls();
+    }
+  }
+
+  private void fadeOutControls() {
+    fadeControls(ConstraintSet.GONE);
+    controlsListener.onControlsFadeOut();
+    pictureInPictureGestureHelper.clearVerticalBoundaries();
+  }
+
+  private void fadeInControls() {
+    fadeControls(ConstraintSet.VISIBLE);
+    pictureInPictureGestureHelper.setVerticalBoundaries(status.getBottom(), videoToggle.getTop());
+
+    scheduleFadeOut();
+  }
+
+  private void fadeControls(int visibility) {
+    Transition transition = new AutoTransition().setDuration(TRANSITION_DURATION_MILLIS);
+
+    TransitionManager.beginDelayedTransition(parent, transition);
+
+    ConstraintSet constraintSet = new ConstraintSet();
+    constraintSet.clone(parent);
+
+    for (View view : visibleViewSet) {
+      constraintSet.setVisibility(view.getId(), visibility);
+    }
+
+    constraintSet.applyTo(parent);
+  }
+
+  private void fadeInNewUiState(@NonNull Set<View> previouslyVisibleViewSet, boolean useSmallMargins) {
+    Transition transition = new AutoTransition().setDuration(TRANSITION_DURATION_MILLIS);
+
+    TransitionManager.beginDelayedTransition(parent, transition);
+
+    ConstraintSet constraintSet = new ConstraintSet();
+    constraintSet.clone(parent);
+
+    for (View view : SetUtil.difference(previouslyVisibleViewSet, visibleViewSet)) {
+      constraintSet.setVisibility(view.getId(), ConstraintSet.GONE);
+    }
+
+    for (View view : visibleViewSet) {
+      constraintSet.setVisibility(view.getId(), ConstraintSet.VISIBLE);
+
+      if (adjustableMarginsSet.contains(view)) {
+        constraintSet.setMargin(view.getId(),
+                                ConstraintSet.END,
+                                ViewUtil.dpToPx(useSmallMargins ? SMALL_ONGOING_CALL_BUTTON_MARGIN_DP
+                                                                : LARGE_ONGOING_CALL_BUTTON_MARGIN_DP));
+      }
+    }
+
+    constraintSet.applyTo(parent);
+  }
+
+  private void scheduleFadeOut() {
+    cancelFadeOut();
+
+    if (getHandler() == null) return;
+    getHandler().postDelayed(fadeOutRunnable, FADE_OUT_DELAY);
+  }
+
+  private void cancelFadeOut() {
+    if (getHandler() == null) return;
+    getHandler().removeCallbacks(fadeOutRunnable);
+  }
+
+  private static void runIfNonNull(@Nullable ControlsListener controlsListener, @NonNull Consumer<ControlsListener> controlsListenerConsumer) {
+    if (controlsListener != null) {
+      controlsListenerConsumer.accept(controlsListener);
+    }
+  }
+
+  private static void setRenderer(@NonNull ViewGroup container, @Nullable View renderer) {
+    if (renderer == null) {
+      container.removeAllViews();
+      return;
+    }
+
+    ViewParent parent = renderer.getParent();
+    if (parent != null && parent != container) {
+      ((ViewGroup) parent).removeAllViews();
+    }
+
+    if (parent == container) {
+      return;
+    }
+
+    container.addView(renderer);
+  }
+
+  private void setRecipientCallCard(@NonNull Recipient recipient) {
+    ContactPhoto         contactPhoto  = recipient.getContactPhoto();
+    FallbackContactPhoto fallbackPhoto = recipient.getFallbackContactPhoto(FALLBACK_PHOTO_PROVIDER);
+
+    GlideApp.with(this).load(contactPhoto)
+                       .fallback(fallbackPhoto.asCallCard(getContext()))
+                       .error(fallbackPhoto.asCallCard(getContext()))
+                       .diskCacheStrategy(DiskCacheStrategy.ALL)
+                       .into(this.avatarCard);
+
+    if (contactPhoto == null) this.avatarCard.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
+    else                      this.avatarCard.setScaleType(ImageView.ScaleType.CENTER_CROP);
+
+    this.avatarCard.setBackgroundColor(recipient.getColor().toActionBarColor(getContext()));
+  }
+
+  private void updateButtonStateForLargeButtons() {
+    cameraDirectionToggle.setImageResource(R.drawable.webrtc_call_screen_camera_toggle);
+    hangup.setImageResource(R.drawable.webrtc_call_screen_hangup);
+    micToggle.setBackgroundResource(R.drawable.webrtc_call_screen_mic_toggle);
+    videoToggle.setBackgroundResource(R.drawable.webrtc_call_screen_video_toggle);
+    audioToggle.setImageResource(R.drawable.webrtc_call_screen_speaker_toggle);
+  }
+
+  private void updateButtonStateForSmallButtons() {
+    cameraDirectionToggle.setImageResource(R.drawable.webrtc_call_screen_camera_toggle_small);
+    hangup.setImageResource(R.drawable.webrtc_call_screen_hangup_small);
+    micToggle.setBackgroundResource(R.drawable.webrtc_call_screen_mic_toggle_small);
+    videoToggle.setBackgroundResource(R.drawable.webrtc_call_screen_video_toggle_small);
+    audioToggle.setImageResource(R.drawable.webrtc_call_screen_speaker_toggle_small);
+  }
+
+  private static final class FallbackPhotoProvider extends Recipient.FallbackPhotoProvider {
+    @Override
+    public @NonNull FallbackContactPhoto getPhotoForRecipientWithoutName() {
+      return new ResourceContactPhoto(R.drawable.ic_profile_outline_120);
+    }
+  }
+
+  public interface ControlsListener {
+    void onControlsFadeOut();
+    void onAudioOutputChanged(@NonNull WebRtcAudioOutput audioOutput);
+    void onVideoChanged(boolean isVideoEnabled);
+    void onMicChanged(boolean isMicEnabled);
+    void onCameraDirectionChanged();
+    void onEndCallPressed();
+    void onDenyCallPressed();
+    void onAcceptCallWithVoiceOnlyPressed();
+    void onAcceptCallPressed();
+    void onDownCaretPressed();
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallViewModel.java

@@ -0,0 +1,229 @@
+package org.thoughtcrime.securesms.components.webrtc;
+
+import android.os.Handler;
+import android.os.Looper;
+
+import androidx.annotation.MainThread;
+import androidx.annotation.NonNull;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.Transformations;
+import androidx.lifecycle.ViewModel;
+
+import org.thoughtcrime.securesms.events.WebRtcViewModel;
+import org.thoughtcrime.securesms.recipients.LiveRecipient;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.ringrtc.CameraState;
+import org.thoughtcrime.securesms.util.SingleLiveEvent;
+import org.thoughtcrime.securesms.util.livedata.LiveDataUtil;
+
+public class WebRtcCallViewModel extends ViewModel {
+
+  private final MutableLiveData<Boolean>                remoteVideoEnabled   = new MutableLiveData<>(false);
+  private final MutableLiveData<Boolean>                microphoneEnabled    = new MutableLiveData<>(true);
+  private final MutableLiveData<WebRtcLocalRenderState> localRenderState     = new MutableLiveData<>(WebRtcLocalRenderState.GONE);
+  private final MutableLiveData<Boolean>                isInPipMode          = new MutableLiveData<>(false);
+  private final MutableLiveData<Boolean>                localVideoEnabled    = new MutableLiveData<>(false);
+  private final MutableLiveData<CameraState.Direction>  cameraDirection      = new MutableLiveData<>(CameraState.Direction.FRONT);
+  private final LiveData<Boolean>                       shouldDisplayLocal   = LiveDataUtil.combineLatest(isInPipMode, localVideoEnabled, (a, b) -> !a && b);
+  private final LiveData<WebRtcLocalRenderState>        realLocalRenderState = LiveDataUtil.combineLatest(shouldDisplayLocal, localRenderState, this::getRealLocalRenderState);
+  private final MutableLiveData<WebRtcControls>         webRtcControls       = new MutableLiveData<>(WebRtcControls.NONE);
+  private final LiveData<WebRtcControls>                realWebRtcControls   = LiveDataUtil.combineLatest(isInPipMode, webRtcControls, this::getRealWebRtcControls);
+  private final SingleLiveEvent<Event>                  events               = new SingleLiveEvent<Event>();
+  private final MutableLiveData<Long>                   ellapsed             = new MutableLiveData<>(-1L);
+  private final MutableLiveData<LiveRecipient>          liveRecipient        = new MutableLiveData<>(Recipient.UNKNOWN.live());
+
+  private boolean       canDisplayTooltipIfNeeded = true;
+  private boolean       hasEnabledLocalVideo      = false;
+  private boolean       showVideoForOutgoing      = false;
+  private long          callConnectedTime         = -1;
+  private Handler       ellapsedTimeHandler       = new Handler(Looper.getMainLooper());
+  private boolean       answerWithVideoAvailable  = false;
+  private Runnable      ellapsedTimeRunnable      = this::handleTick;
+
+
+  private final WebRtcCallRepository repository = new WebRtcCallRepository();
+
+  public LiveData<Boolean> getRemoteVideoEnabled() {
+    return Transformations.distinctUntilChanged(remoteVideoEnabled);
+  }
+
+  public LiveData<Boolean> getMicrophoneEnabled() {
+    return Transformations.distinctUntilChanged(microphoneEnabled);
+  }
+
+  public LiveData<CameraState.Direction> getCameraDirection() {
+    return Transformations.distinctUntilChanged(cameraDirection);
+  }
+
+  public LiveData<Boolean> displaySquareCallCard() {
+    return isInPipMode;
+  }
+
+  public LiveData<WebRtcLocalRenderState> getLocalRenderState() {
+    return realLocalRenderState;
+  }
+
+  public LiveData<WebRtcControls> getWebRtcControls() {
+    return realWebRtcControls;
+  }
+
+  public LiveRecipient getRecipient() {
+    return liveRecipient.getValue();
+  }
+
+  public void setRecipient(@NonNull Recipient recipient) {
+    liveRecipient.setValue(recipient.live());
+  }
+
+  public LiveData<Event> getEvents() {
+    return events;
+  }
+
+  public LiveData<Long> getCallTime() {
+    return Transformations.map(ellapsed, timeInCall -> callConnectedTime == -1 ? -1 : timeInCall);
+  }
+
+  public boolean isAnswerWithVideoAvailable() {
+    return answerWithVideoAvailable;
+  }
+
+  @MainThread
+  public void setIsInPipMode(boolean isInPipMode) {
+    this.isInPipMode.setValue(isInPipMode);
+  }
+
+  public void onDismissedVideoTooltip() {
+    canDisplayTooltipIfNeeded = false;
+  }
+
+  @MainThread
+  public void updateFromWebRtcViewModel(@NonNull WebRtcViewModel webRtcViewModel, boolean enableVideo) {
+    remoteVideoEnabled.setValue(webRtcViewModel.isRemoteVideoEnabled());
+    microphoneEnabled.setValue(webRtcViewModel.isMicrophoneEnabled());
+
+    if (isValidCameraDirectionForUi(webRtcViewModel.getLocalCameraState().getActiveDirection())) {
+      cameraDirection.setValue(webRtcViewModel.getLocalCameraState().getActiveDirection());
+    }
+
+    localVideoEnabled.setValue(webRtcViewModel.getLocalCameraState().isEnabled());
+
+    if (enableVideo) {
+      showVideoForOutgoing = webRtcViewModel.getState() == WebRtcViewModel.State.CALL_OUTGOING;
+    } else if (webRtcViewModel.getState() != WebRtcViewModel.State.CALL_OUTGOING) {
+      showVideoForOutgoing = false;
+    }
+
+    updateLocalRenderState(webRtcViewModel.getState());
+    updateWebRtcControls(webRtcViewModel.getState(),
+                         webRtcViewModel.getLocalCameraState().isEnabled(),
+                         webRtcViewModel.isRemoteVideoEnabled(),
+                         webRtcViewModel.isRemoteVideoOffer(),
+                         webRtcViewModel.getLocalCameraState().getCameraCount() > 1,
+                         webRtcViewModel.isBluetoothAvailable(),
+                         repository.getAudioOutput());
+
+    if (webRtcViewModel.getState() == WebRtcViewModel.State.CALL_CONNECTED && callConnectedTime == -1) {
+      callConnectedTime = webRtcViewModel.getCallConnectedTime();
+      startTimer();
+    } else if (webRtcViewModel.getState() != WebRtcViewModel.State.CALL_CONNECTED) {
+      cancelTimer();
+      callConnectedTime = -1;
+    }
+
+    if (webRtcViewModel.getLocalCameraState().isEnabled()) {
+      canDisplayTooltipIfNeeded = false;
+      hasEnabledLocalVideo = true;
+      events.setValue(Event.DISMISS_VIDEO_TOOLTIP);
+    }
+
+    // If remote video is enabled and we a) haven't shown our video and b) have not dismissed the popup
+    if (canDisplayTooltipIfNeeded && webRtcViewModel.isRemoteVideoEnabled() && !hasEnabledLocalVideo) {
+      canDisplayTooltipIfNeeded = false;
+      events.setValue(Event.SHOW_VIDEO_TOOLTIP);
+    }
+  }
+
+  private boolean isValidCameraDirectionForUi(CameraState.Direction direction) {
+    return direction == CameraState.Direction.FRONT || direction == CameraState.Direction.BACK;
+  }
+
+  private void updateLocalRenderState(WebRtcViewModel.State state) {
+    if (state == WebRtcViewModel.State.CALL_CONNECTED) {
+      localRenderState.setValue(WebRtcLocalRenderState.SMALL);
+    } else {
+      localRenderState.setValue(WebRtcLocalRenderState.LARGE);
+    }
+  }
+
+  private void updateWebRtcControls(WebRtcViewModel.State state,
+                                    boolean isLocalVideoEnabled,
+                                    boolean isRemoteVideoEnabled,
+                                    boolean isRemoteVideoOffer,
+                                    boolean isMoreThanOneCameraAvailable,
+                                    boolean isBluetoothAvailable,
+                                    WebRtcAudioOutput audioOutput)
+  {
+
+    final WebRtcControls.CallState callState;
+
+    switch (state) {
+      case CALL_INCOMING:
+        callState = WebRtcControls.CallState.INCOMING;
+        answerWithVideoAvailable = isRemoteVideoOffer;
+        break;
+      default:
+        callState = WebRtcControls.CallState.ONGOING;
+    }
+
+    webRtcControls.setValue(new WebRtcControls(isLocalVideoEnabled,
+                                               isRemoteVideoEnabled || isRemoteVideoOffer,
+                                               isMoreThanOneCameraAvailable,
+                                               isBluetoothAvailable,
+                                               callState,
+                                               audioOutput));
+  }
+
+  private @NonNull WebRtcLocalRenderState getRealLocalRenderState(boolean shouldDisplayLocalVideo, @NonNull WebRtcLocalRenderState state) {
+    if (shouldDisplayLocalVideo || showVideoForOutgoing) return state;
+    else                                                 return WebRtcLocalRenderState.GONE;
+  }
+
+  private @NonNull WebRtcControls getRealWebRtcControls(boolean neverDisplayControls, @NonNull WebRtcControls controls) {
+    if (neverDisplayControls) return WebRtcControls.NONE;
+    else                      return controls;
+  }
+
+  private void startTimer() {
+    cancelTimer();
+
+    ellapsedTimeHandler.post(ellapsedTimeRunnable);
+  }
+
+  private void handleTick() {
+    if (callConnectedTime == -1) {
+      return;
+    }
+
+    long newValue = (System.currentTimeMillis() - callConnectedTime) / 1000;
+
+    ellapsed.postValue(newValue);
+
+    ellapsedTimeHandler.postDelayed(ellapsedTimeRunnable, 1000);
+  }
+
+  private void cancelTimer() {
+    ellapsedTimeHandler.removeCallbacks(ellapsedTimeRunnable);
+  }
+
+  @Override
+  protected void onCleared() {
+    super.onCleared();
+    cancelTimer();
+  }
+
+  public enum Event {
+    SHOW_VIDEO_TOOLTIP,
+    DISMISS_VIDEO_TOOLTIP
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcControls.java

@@ -0,0 +1,100 @@
+package org.thoughtcrime.securesms.components.webrtc;
+
+import androidx.annotation.NonNull;
+
+public final class WebRtcControls {
+
+  public static final WebRtcControls NONE = new WebRtcControls();
+
+  private final boolean           isRemoteVideoEnabled;
+  private final boolean           isLocalVideoEnabled;
+  private final boolean           isMoreThanOneCameraAvailable;
+  private final boolean           isBluetoothAvailable;
+  private final CallState         callState;
+  private final WebRtcAudioOutput audioOutput;
+
+  private WebRtcControls() {
+    this(false, false, false, false, CallState.NONE, WebRtcAudioOutput.HANDSET);
+  }
+
+  WebRtcControls(boolean isLocalVideoEnabled,
+                 boolean isRemoteVideoEnabled,
+                 boolean isMoreThanOneCameraAvailable,
+                 boolean isBluetoothAvailable,
+                 @NonNull CallState callState,
+                 @NonNull WebRtcAudioOutput audioOutput)
+  {
+    this.isLocalVideoEnabled          = isLocalVideoEnabled;
+    this.isRemoteVideoEnabled         = isRemoteVideoEnabled;
+    this.isBluetoothAvailable         = isBluetoothAvailable;
+    this.isMoreThanOneCameraAvailable = isMoreThanOneCameraAvailable;
+    this.callState                    = callState;
+    this.audioOutput                  = audioOutput;
+  }
+
+  boolean displayEndCall() {
+    return isOngoing();
+  }
+
+  boolean displayMuteAudio() {
+    return isOngoing();
+  }
+
+  boolean displayVideoToggle() {
+    return isOngoing();
+  }
+
+  boolean displayAudioToggle() {
+    return isOngoing() && (!isLocalVideoEnabled || isBluetoothAvailable);
+  }
+
+  boolean displayCameraToggle() {
+    return isOngoing() && isLocalVideoEnabled && isMoreThanOneCameraAvailable;
+  }
+
+  boolean displayAnswerWithAudio() {
+    return isIncoming() && isRemoteVideoEnabled;
+  }
+
+  boolean displayIncomingCallButtons() {
+    return isIncoming();
+  }
+
+  boolean enableHandsetInAudioToggle() {
+    return !isLocalVideoEnabled;
+  }
+
+  boolean enableHeadsetInAudioToggle() {
+    return isBluetoothAvailable;
+  }
+
+  boolean isFadeOutEnabled() {
+    return isOngoing() && isRemoteVideoEnabled;
+  }
+
+  boolean displaySmallOngoingCallButtons() {
+    return isOngoing() && displayAudioToggle() && displayCameraToggle();
+  }
+
+  boolean displayLargeOngoingCallButtons() {
+    return isOngoing() && !(displayAudioToggle() && displayCameraToggle());
+  }
+
+  WebRtcAudioOutput getAudioOutput() {
+    return audioOutput;
+  }
+
+  private boolean isOngoing() {
+    return callState == CallState.ONGOING;
+  }
+
+  private boolean isIncoming() {
+    return callState == CallState.INCOMING;
+  }
+
+  public enum CallState {
+    NONE,
+    INCOMING,
+    ONGOING
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcLocalRenderState.java

@@ -0,0 +1,7 @@
+package org.thoughtcrime.securesms.components.webrtc;
+
+public enum WebRtcLocalRenderState {
+  GONE,
+  SMALL,
+  LARGE
+}

app/src/main/java/org/thoughtcrime/securesms/contacts/ContactChip.java

@@ -0,0 +1,124 @@
+package org.thoughtcrime.securesms.contacts;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.ColorFilter;
+import android.graphics.PixelFormat;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.request.target.CustomTarget;
+import com.bumptech.glide.request.transition.Transition;
+import com.google.android.material.chip.Chip;
+
+import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
+import org.thoughtcrime.securesms.mms.GlideRequests;
+import org.thoughtcrime.securesms.recipients.Recipient;
+
+public final class ContactChip extends Chip {
+
+  @Nullable private SelectedContact contact;
+
+  public ContactChip(Context context) {
+    super(context);
+  }
+
+  public ContactChip(Context context, AttributeSet attrs) {
+    super(context, attrs);
+  }
+
+  public ContactChip(Context context, AttributeSet attrs, int defStyleAttr) {
+    super(context, attrs, defStyleAttr);
+  }
+
+  public void setContact(@NonNull SelectedContact contact) {
+    this.contact = contact;
+  }
+
+  public @Nullable SelectedContact getContact() {
+    return contact;
+  }
+
+  public void setAvatar(@NonNull GlideRequests requestManager, @Nullable Recipient recipient, @Nullable Runnable onAvatarSet) {
+    if (recipient != null) {
+      requestManager.clear(this);
+
+      Drawable     fallbackContactPhotoDrawable = new HalfScaleDrawable(recipient.getFallbackContactPhotoDrawable(getContext(), false));
+      ContactPhoto contactPhoto                 = recipient.getContactPhoto();
+
+      if (contactPhoto == null) {
+        setChipIcon(fallbackContactPhotoDrawable);
+        if (onAvatarSet != null) {
+          onAvatarSet.run();
+        }
+      } else {
+        requestManager.load(contactPhoto)
+                      .placeholder(fallbackContactPhotoDrawable)
+                      .fallback(fallbackContactPhotoDrawable)
+                      .error(fallbackContactPhotoDrawable)
+                      .diskCacheStrategy(DiskCacheStrategy.ALL)
+                      .circleCrop()
+                      .into(new CustomTarget<Drawable>() {
+                        @Override
+                        public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) {
+                          setChipIcon(resource);
+                          if (onAvatarSet != null) {
+                            onAvatarSet.run();
+                          }
+                        }
+
+                        @Override
+                        public void onLoadCleared(@Nullable Drawable placeholder) {
+                          setChipIcon(placeholder);
+                        }
+                      });
+      }
+    }
+  }
+
+  private static class HalfScaleDrawable extends Drawable {
+
+    private final Drawable fallbackContactPhotoDrawable;
+
+    HalfScaleDrawable(Drawable fallbackContactPhotoDrawable) {
+      this.fallbackContactPhotoDrawable = fallbackContactPhotoDrawable;
+    }
+
+    @Override
+    public void setBounds(int left, int top, int right, int bottom) {
+      super.setBounds(left, top, right, bottom);
+      fallbackContactPhotoDrawable.setBounds(left, top, 2 * right - left, 2 * bottom - top);
+    }
+
+    @Override
+    public void setBounds(@NonNull Rect bounds) {
+      super.setBounds(bounds);
+    }
+
+    @Override
+    public void draw(@NonNull Canvas canvas) {
+      canvas.save();
+      canvas.scale(0.5f, 0.5f);
+      fallbackContactPhotoDrawable.draw(canvas);
+      canvas.restore();
+    }
+
+    @Override
+    public void setAlpha(int alpha) {
+    }
+
+    @Override
+    public void setColorFilter(@Nullable ColorFilter colorFilter) {
+    }
+
+    @Override
+    public int getOpacity() {
+      return PixelFormat.OPAQUE;
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/contacts/ContactRepository.java

@@ -85,11 +85,15 @@ public class ContactRepository {
 
   @WorkerThread
   public Cursor querySignalContacts(@NonNull String query) {
-    Cursor cursor = TextUtils.isEmpty(query) ? recipientDatabase.getSignalContacts()
-                                             : recipientDatabase.querySignalContacts(query);
+    return querySignalContacts(query, true);
+  }
 
+  @WorkerThread
+  public Cursor querySignalContacts(@NonNull String query, boolean includeSelf) {
+    Cursor cursor =  TextUtils.isEmpty(query) ? recipientDatabase.getSignalContacts(includeSelf)
+                                              : recipientDatabase.querySignalContacts(query, includeSelf);
 
-    if (noteToSelfTitle.toLowerCase().contains(query.toLowerCase())) {
+    if (includeSelf && noteToSelfTitle.toLowerCase().contains(query.toLowerCase())) {
       Recipient self        = Recipient.self();
       boolean   nameMatch   = self.getDisplayName(context).toLowerCase().contains(query.toLowerCase());
       boolean   numberMatch = self.getE164().isPresent() && self.requireE164().contains(query);

app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java

@@ -43,7 +43,8 @@ import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.StickyHeaderDecoration.StickyHeaderAdapter;
 import org.thoughtcrime.securesms.util.Util;
 
-import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 
 /**
@@ -64,13 +65,35 @@ public class ContactSelectionListAdapter extends CursorRecyclerViewAdapter<ViewH
   private final static int STYLE_ATTRIBUTES[] = new int[]{R.attr.contact_selection_push_user,
                                                           R.attr.contact_selection_lay_user};
 
+  public static final int PAYLOAD_SELECTION_CHANGE = 1;
+
   private final boolean           multiSelect;
-  private final LayoutInflater    li;
+  private final LayoutInflater    layoutInflater;
   private final TypedArray        drawables;
   private final ItemClickListener clickListener;
   private final GlideRequests     glideRequests;
+  private final Set<RecipientId>  currentContacts;
 
-  private final Set<SelectedContact> selectedContacts = new HashSet<>();
+  private final SelectedContactSet selectedContacts = new SelectedContactSet();
+
+  public void clearSelectedContacts() {
+    selectedContacts.clear();
+  }
+
+  public boolean isSelectedContact(@NonNull SelectedContact contact) {
+    return selectedContacts.contains(contact);
+  }
+
+  public void addSelectedContact(@NonNull SelectedContact contact) {
+    if (!selectedContacts.add(contact)) {
+      Log.i(TAG, "Contact was already selected, possibly by another identifier");
+    }
+  }
+
+  public void removeFromSelectedContacts(@NonNull SelectedContact selectedContact) {
+    int removed = selectedContacts.remove(selectedContact);
+    Log.i(TAG, String.format(Locale.US, "Removed %d selected contacts that matched", removed));
+  }
 
   public abstract static class ViewHolder extends RecyclerView.ViewHolder {
 
@@ -78,9 +101,10 @@ public class ContactSelectionListAdapter extends CursorRecyclerViewAdapter<ViewH
       super(itemView);
     }
 
-    public abstract void bind(@NonNull GlideRequests glideRequests, @Nullable RecipientId recipientId, int type, String name, String number, String label, int color, boolean multiSelect);
+    public abstract void bind(@NonNull GlideRequests glideRequests, @Nullable RecipientId recipientId, int type, String name, String number, String label, int color, boolean checkboxVisible);
     public abstract void unbind(@NonNull GlideRequests glideRequests);
     public abstract void setChecked(boolean checked);
+    public abstract void setEnabled(boolean enabled);
   }
 
   public static class ContactViewHolder extends ViewHolder {
@@ -97,8 +121,8 @@ public class ContactSelectionListAdapter extends CursorRecyclerViewAdapter<ViewH
       return (ContactSelectionListItem) itemView;
     }
 
-    public void bind(@NonNull GlideRequests glideRequests, @Nullable RecipientId recipientId, int type, String name, String number, String label, int color, boolean multiSelect) {
-      getView().set(glideRequests, recipientId, type, name, number, label, color, multiSelect);
+    public void bind(@NonNull GlideRequests glideRequests, @Nullable RecipientId recipientId, int type, String name, String number, String label, int color, boolean checkBoxVisible) {
+      getView().set(glideRequests, recipientId, type, name, number, label, color, checkBoxVisible);
     }
 
     @Override
@@ -110,6 +134,11 @@ public class ContactSelectionListAdapter extends CursorRecyclerViewAdapter<ViewH
     public void setChecked(boolean checked) {
       getView().setChecked(checked);
     }
+
+    @Override
+    public void setEnabled(boolean enabled) {
+      getView().setEnabled(enabled);
+    }
   }
 
   public static class DividerViewHolder extends ViewHolder {
@@ -122,7 +151,7 @@ public class ContactSelectionListAdapter extends CursorRecyclerViewAdapter<ViewH
     }
 
     @Override
-    public void bind(@NonNull GlideRequests glideRequests, @Nullable RecipientId recipientId, int type, String name, String number, String label, int color, boolean multiSelect) {
+    public void bind(@NonNull GlideRequests glideRequests, @Nullable RecipientId recipientId, int type, String name, String number, String label, int color, boolean checkboxVisible) {
       this.label.setText(name);
     }
 
@@ -131,6 +160,9 @@ public class ContactSelectionListAdapter extends CursorRecyclerViewAdapter<ViewH
 
     @Override
     public void setChecked(boolean checked) {}
+
+    @Override
+    public void setEnabled(boolean enabled) {}
   }
 
   static class HeaderViewHolder extends RecyclerView.ViewHolder {
@@ -143,19 +175,22 @@ public class ContactSelectionListAdapter extends CursorRecyclerViewAdapter<ViewH
                                      @NonNull  GlideRequests glideRequests,
                                      @Nullable Cursor cursor,
                                      @Nullable ItemClickListener clickListener,
-                                     boolean multiSelect)
+                                     boolean multiSelect,
+                                     @NonNull Set<RecipientId> currentContacts)
   {
     super(context, cursor);
-    this.li            = LayoutInflater.from(context);
-    this.glideRequests = glideRequests;
-    this.drawables     = context.obtainStyledAttributes(STYLE_ATTRIBUTES);
-    this.multiSelect   = multiSelect;
-    this.clickListener = clickListener;
+    this.layoutInflater = LayoutInflater.from(context);
+    this.glideRequests   = glideRequests;
+    this.drawables       = context.obtainStyledAttributes(STYLE_ATTRIBUTES);
+    this.multiSelect     = multiSelect;
+    this.clickListener   = clickListener;
+    this.currentContacts = currentContacts;
   }
 
   @Override
   public long getHeaderId(int i) {
     if (!isActiveCursor()) return -1;
+    else if (i == -1)      return -1;
 
     int contactType = getContactType(i);
 
@@ -166,9 +201,9 @@ public class ContactSelectionListAdapter extends CursorRecyclerViewAdapter<ViewH
   @Override
   public ViewHolder onCreateItemViewHolder(ViewGroup parent, int viewType) {
     if (viewType == VIEW_TYPE_CONTACT) {
-      return new ContactViewHolder(li.inflate(R.layout.contact_selection_list_item, parent, false), clickListener);
+      return new ContactViewHolder(layoutInflater.inflate(R.layout.contact_selection_list_item, parent, false), clickListener);
     } else {
-      return new DividerViewHolder(li.inflate(R.layout.contact_selection_list_divider, parent, false));
+      return new DividerViewHolder(layoutInflater.inflate(R.layout.contact_selection_list_divider, parent, false));
     }
   }
 
@@ -187,10 +222,39 @@ public class ContactSelectionListAdapter extends CursorRecyclerViewAdapter<ViewH
     int color = (contactType == ContactRepository.PUSH_TYPE) ? drawables.getColor(0, 0xa0000000) :
                 drawables.getColor(1, 0xff000000);
 
-    viewHolder.unbind(glideRequests);
-    viewHolder.bind(glideRequests, id, contactType, name, number, labelText, color, multiSelect);
+    boolean currentContact = currentContacts.contains(id);
 
-    if (numberType == ContactRepository.NEW_USERNAME_TYPE) {
+    viewHolder.unbind(glideRequests);
+    viewHolder.bind(glideRequests, id, contactType, name, number, labelText, color, multiSelect || currentContact);
+    viewHolder.setEnabled(true);
+
+    if (currentContact) {
+      viewHolder.setChecked(true);
+      viewHolder.setEnabled(false);
+    } else if (numberType == ContactRepository.NEW_USERNAME_TYPE) {
+      viewHolder.setChecked(selectedContacts.contains(SelectedContact.forUsername(id, number)));
+    } else {
+      viewHolder.setChecked(selectedContacts.contains(SelectedContact.forPhone(id, number)));
+    }
+  }
+
+  @Override
+  protected void onBindItemViewHolder(ViewHolder viewHolder, @NonNull Cursor cursor, @NonNull List<Object> payloads) {
+    if (!arePayloadsValid(payloads)) {
+      throw new AssertionError();
+    }
+
+    String      rawId      = cursor.getString(cursor.getColumnIndexOrThrow(ContactRepository.ID_COLUMN));
+    RecipientId id         = rawId != null ? RecipientId.from(rawId) : null;
+    int         numberType = cursor.getInt(cursor.getColumnIndexOrThrow(ContactRepository.NUMBER_TYPE_COLUMN));
+    String      number     = cursor.getString(cursor.getColumnIndexOrThrow(ContactRepository.NUMBER_COLUMN));
+
+    viewHolder.setEnabled(true);
+
+    if (currentContacts.contains(id)) {
+      viewHolder.setChecked(true);
+      viewHolder.setEnabled(false);
+    } else if (numberType == ContactRepository.NEW_USERNAME_TYPE) {
       viewHolder.setChecked(selectedContacts.contains(SelectedContact.forUsername(id, number)));
     } else {
       viewHolder.setChecked(selectedContacts.contains(SelectedContact.forPhone(id, number)));
@@ -206,7 +270,6 @@ public class ContactSelectionListAdapter extends CursorRecyclerViewAdapter<ViewH
     }
   }
 
-
   @Override
   public HeaderViewHolder onCreateHeaderViewHolder(ViewGroup parent, int position) {
     return new HeaderViewHolder(LayoutInflater.from(getContext()).inflate(R.layout.contact_selection_recyclerview_header, parent, false));
@@ -217,6 +280,11 @@ public class ContactSelectionListAdapter extends CursorRecyclerViewAdapter<ViewH
     ((TextView)viewHolder.itemView).setText(getSpannedHeaderString(position));
   }
 
+  @Override
+  protected boolean arePayloadsValid(@NonNull List<Object> payloads) {
+    return payloads.size() == 1 && payloads.get(0).equals(PAYLOAD_SELECTION_CHANGE);
+  }
+
   @Override
   public void onItemViewRecycled(ViewHolder holder) {
     holder.unbind(glideRequests);
@@ -227,8 +295,12 @@ public class ContactSelectionListAdapter extends CursorRecyclerViewAdapter<ViewH
     return getHeaderString(position);
   }
 
-  public Set<SelectedContact> getSelectedContacts() {
-    return selectedContacts;
+  public List<SelectedContact> getSelectedContacts() {
+    return selectedContacts.getContacts();
+  }
+
+  public int getSelectedContactsCount() {
+    return selectedContacts.size();
   }
 
   private CharSequence getSpannedHeaderString(int position) {

app/src/main/java/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java

@@ -35,6 +35,7 @@ public class ContactSelectionListItem extends LinearLayout implements RecipientF
   private CheckBox        checkBox;
 
   private String        number;
+  private String        chipName;
   private int           contactType;
   private LiveRecipient recipient;
   private GlideRequests glideRequests;
@@ -66,7 +67,7 @@ public class ContactSelectionListItem extends LinearLayout implements RecipientF
                   String number,
                   String label,
                   int color,
-                  boolean multiSelect)
+                  boolean checkboxVisible)
   {
     this.glideRequests = glideRequests;
     this.number        = number;
@@ -89,14 +90,19 @@ public class ContactSelectionListItem extends LinearLayout implements RecipientF
 
     setText(recipientSnapshot, type, name, number, label);
 
-    if (multiSelect) this.checkBox.setVisibility(View.VISIBLE);
-    else             this.checkBox.setVisibility(View.GONE);
+    this.checkBox.setVisibility(checkboxVisible ? View.VISIBLE : View.GONE);
   }
 
   public void setChecked(boolean selected) {
     this.checkBox.setChecked(selected);
   }
 
+  @Override
+  public void setEnabled(boolean enabled) {
+    super.setEnabled(enabled);
+    this.checkBox.setEnabled(enabled);
+  }
+
   public void unbind(GlideRequests glideRequests) {
     if (recipient != null) {
       recipient.removeForeverObserver(this);
@@ -106,10 +112,14 @@ public class ContactSelectionListItem extends LinearLayout implements RecipientF
 
   @SuppressLint("SetTextI18n")
   private void setText(@Nullable Recipient recipient, int type, String name, String number, String label) {
-    if (number == null || number.isEmpty() || GroupId.isEncodedGroup(number)) {
+    if (number == null || number.isEmpty()) {
       this.nameView.setEnabled(false);
       this.numberView.setText("");
       this.labelView.setVisibility(View.GONE);
+    } else if (recipient != null && recipient.isGroup()) {
+      this.nameView.setEnabled(false);
+      this.numberView.setText(getGroupMemberCount(recipient));
+      this.labelView.setVisibility(View.GONE);
     } else if (type == ContactRepository.PUSH_TYPE) {
       this.numberView.setText(number);
       this.nameView.setEnabled(true);
@@ -128,8 +138,10 @@ public class ContactSelectionListItem extends LinearLayout implements RecipientF
 
     if (recipient != null) {
       this.nameView.setText(recipient);
+      chipName = recipient.getShortDisplayName(getContext());
     } else {
       this.nameView.setText(name);
+      chipName = name;
     }
   }
 
@@ -137,6 +149,22 @@ public class ContactSelectionListItem extends LinearLayout implements RecipientF
     return number;
   }
 
+  public String getChipName() {
+    return chipName;
+  }
+
+  private String getGroupMemberCount(@NonNull Recipient recipient) {
+    if (!recipient.isGroup()) {
+      throw new AssertionError();
+    }
+    int memberCount = recipient.getParticipants().size();
+    return getContext().getResources().getQuantityString(R.plurals.contact_selection_list_item__number_of_members, memberCount, memberCount);
+  }
+
+  public @Nullable LiveRecipient getRecipient() {
+    return recipient;
+  }
+
   public boolean isUsernameType() {
     return contactType == ContactRepository.NEW_USERNAME_TYPE;
   }
@@ -149,5 +177,8 @@ public class ContactSelectionListItem extends LinearLayout implements RecipientF
   public void onRecipientChanged(@NonNull Recipient recipient) {
     contactPhotoImage.setAvatar(glideRequests, recipient, false);
     nameView.setText(recipient);
+    if (recipient.isGroup()) {
+      numberView.setText(getGroupMemberCount(recipient));
+    }
   }
 }

app/src/main/java/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java

@@ -59,7 +59,8 @@ public class ContactsCursorLoader extends CursorLoader {
     public static final int FLAG_SMS             = 1 << 1;
     public static final int FLAG_ACTIVE_GROUPS   = 1 << 2;
     public static final int FLAG_INACTIVE_GROUPS = 1 << 3;
-    public static final int FLAG_ALL             = FLAG_PUSH |  FLAG_SMS | FLAG_ACTIVE_GROUPS | FLAG_INACTIVE_GROUPS;
+    public static final int FLAG_SELF            = 1 << 4;
+    public static final int FLAG_ALL             = FLAG_PUSH |  FLAG_SMS | FLAG_ACTIVE_GROUPS | FLAG_INACTIVE_GROUPS | FLAG_SELF;
   }
 
   private static final String[] CONTACT_PROJECTION = new String[]{ContactRepository.ID_COLUMN,
@@ -114,52 +115,91 @@ public class ContactsCursorLoader extends CursorLoader {
   private List<Cursor> getUnfilteredResults() {
     ArrayList<Cursor> cursorList = new ArrayList<>();
 
-    if (recents) {
-      Cursor recentConversations = getRecentConversationsCursor();
-      if (recentConversations.getCount() > 0) {
-        cursorList.add(getRecentsHeaderCursor());
-        cursorList.add(recentConversations);
-        cursorList.add(getContactsHeaderCursor());
-      }
+    if (groupsOnly(mode)) {
+      addRecentGroupsSection(cursorList);
+      addGroupsSection(cursorList);
+    } else {
+      addRecentsSection(cursorList);
+      addContactsSection(cursorList);
     }
-    cursorList.addAll(getContactsCursors());
+
     return cursorList;
   }
 
   private List<Cursor> getFilteredResults() {
     ArrayList<Cursor> cursorList = new ArrayList<>();
 
-    if (groupsEnabled(mode)) {
-      Cursor groups = getGroupsCursor();
-      if (groups.getCount() > 0) {
-        List<Cursor> contacts = getContactsCursors();
-        if (!isCursorListEmpty(contacts)) {
-          cursorList.add(getContactsHeaderCursor());
-          cursorList.addAll(contacts);
-          cursorList.add(getGroupsHeaderCursor());
-        }
-        cursorList.add(groups);
-      } else {
-        cursorList.addAll(getContactsCursors());
-      }
-    } else {
-      cursorList.addAll(getContactsCursors());
+    addContactsSection(cursorList);
+    addGroupsSection(cursorList);
+    addNewNumberSection(cursorList);
+    addUsernameSearchSection(cursorList);
+
+    return cursorList;
+  }
+
+  private void addRecentsSection(@NonNull List<Cursor> cursorList) {
+    if (!recents) {
+      return;
     }
 
+    Cursor recentConversations = getRecentConversationsCursor();
+
+    if (recentConversations.getCount() > 0) {
+      cursorList.add(getRecentsHeaderCursor());
+      cursorList.add(recentConversations);
+    }
+  }
+
+  private void addContactsSection(@NonNull List<Cursor> cursorList) {
+    List<Cursor> contacts = getContactsCursors();
+
+    if (!isCursorListEmpty(contacts)) {
+      cursorList.add(getContactsHeaderCursor());
+      cursorList.addAll(getContactsCursors());
+    }
+  }
+
+  private void addRecentGroupsSection(@NonNull List<Cursor> cursorList) {
+    if (!groupsEnabled(mode) || !recents) {
+      return;
+    }
+
+    Cursor groups = getRecentConversationsCursor(true);
+
+    if (groups.getCount() > 0) {
+      cursorList.add(getRecentsHeaderCursor());
+      cursorList.add(groups);
+    }
+  }
+
+  private void addGroupsSection(@NonNull List<Cursor> cursorList) {
+    if (!groupsEnabled(mode)) {
+      return;
+    }
+
+    Cursor groups = getGroupsCursor();
+
+    if (groups.getCount() > 0) {
+      cursorList.add(getGroupsHeaderCursor());
+      cursorList.add(groups);
+    }
+  }
+
+  private void addNewNumberSection(@NonNull List<Cursor> cursorList) {
     if (FeatureFlags.usernames() && NumberUtil.isVisuallyValidNumberOrEmail(filter)) {
       cursorList.add(getPhoneNumberSearchHeaderCursor());
       cursorList.add(getNewNumberCursor());
     } else if (!FeatureFlags.usernames() && NumberUtil.isValidSmsOrEmail(filter)){
-      cursorList.add(getContactsHeaderCursor());
+      cursorList.add(getPhoneNumberSearchHeaderCursor());
       cursorList.add(getNewNumberCursor());
     }
+  }
 
+  private void addUsernameSearchSection(@NonNull List<Cursor> cursorList) {
     if (FeatureFlags.usernames() && UsernameUtil.isValidUsernameForSearch(filter)) {
       cursorList.add(getUsernameSearchHeaderCursor());
       cursorList.add(getUsernameSearchCursor());
     }
-
-    return cursorList;
   }
 
   private Cursor getRecentsHeaderCursor() {
@@ -219,10 +259,14 @@ public class ContactsCursorLoader extends CursorLoader {
 
 
   private Cursor getRecentConversationsCursor() {
+    return getRecentConversationsCursor(false);
+  }
+
+  private Cursor getRecentConversationsCursor(boolean groupsOnly) {
     ThreadDatabase threadDatabase = DatabaseFactory.getThreadDatabase(getContext());
 
     MatrixCursor recentConversations = new MatrixCursor(CONTACT_PROJECTION, RECENT_CONVERSATION_MAX);
-    try (Cursor rawConversations = threadDatabase.getRecentConversationList(RECENT_CONVERSATION_MAX, flagSet(mode, DisplayMode.FLAG_INACTIVE_GROUPS))) {
+    try (Cursor rawConversations = threadDatabase.getRecentConversationList(RECENT_CONVERSATION_MAX, flagSet(mode, DisplayMode.FLAG_INACTIVE_GROUPS), groupsOnly)) {
       ThreadDatabase.Reader reader = threadDatabase.readerFor(rawConversations);
       ThreadRecord threadRecord;
       while ((threadRecord = reader.getNext()) != null) {
@@ -230,7 +274,7 @@ public class ContactsCursorLoader extends CursorLoader {
         String    stringId  = recipient.isGroup() ? recipient.requireGroupId().toString() : recipient.getE164().or(recipient.getEmail()).or("");
 
         recentConversations.addRow(new Object[] { recipient.getId().serialize(),
-                                                  recipient.toShortString(getContext()),
+                                                  recipient.getDisplayName(getContext()),
                                                   stringId,
                                                   ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE,
                                                   "",
@@ -248,7 +292,7 @@ public class ContactsCursorLoader extends CursorLoader {
     }
 
     if (pushEnabled(mode)) {
-      cursorList.add(contactRepository.querySignalContacts(filter));
+      cursorList.add(contactRepository.querySignalContacts(filter, selfEnabled(mode)));
     }
 
     if (pushEnabled(mode) && smsEnabled(mode)) {
@@ -278,7 +322,7 @@ public class ContactsCursorLoader extends CursorLoader {
   private Cursor getNewNumberCursor() {
     MatrixCursor newNumberCursor = new MatrixCursor(CONTACT_PROJECTION, 1);
     newNumberCursor.addRow(new Object[] { null,
-                                          getContext().getString(R.string.contact_selection_list__unknown_contact),
+                                          getUnknownContactTitle(),
                                           filter,
                                           ContactsContract.CommonDataKinds.Phone.TYPE_CUSTOM,
                                           "\u21e2",
@@ -289,7 +333,7 @@ public class ContactsCursorLoader extends CursorLoader {
   private Cursor getUsernameSearchCursor() {
     MatrixCursor cursor = new MatrixCursor(CONTACT_PROJECTION, 1);
     cursor.addRow(new Object[] { null,
-                                 getContext().getString(R.string.contact_selection_list__unknown_contact),
+                                 getUnknownContactTitle(),
                                  filter,
                                  ContactsContract.CommonDataKinds.Phone.TYPE_CUSTOM,
                                  "\u21e2",
@@ -297,6 +341,11 @@ public class ContactsCursorLoader extends CursorLoader {
     return cursor;
   }
 
+  private String getUnknownContactTitle() {
+    return getContext().getString(newConversation(mode) ? R.string.contact_selection_list__unknown_contact
+                                                        : R.string.contact_selection_list__unknown_contact_add_to_group);
+  }
+
   private @NonNull Cursor filterNonPushContacts(@NonNull Cursor cursor) {
     try {
       final long startMillis = System.currentTimeMillis();
@@ -329,6 +378,14 @@ public class ContactsCursorLoader extends CursorLoader {
     return sum == 0;
   }
 
+  private static boolean selfEnabled(int mode) {
+    return flagSet(mode, DisplayMode.FLAG_SELF);
+  }
+
+  private static boolean newConversation(int mode) {
+    return groupsEnabled(mode);
+  }
+
   private static boolean pushEnabled(int mode) {
     return flagSet(mode, DisplayMode.FLAG_PUSH);
   }
@@ -341,6 +398,10 @@ public class ContactsCursorLoader extends CursorLoader {
     return flagSet(mode, DisplayMode.FLAG_ACTIVE_GROUPS);
   }
 
+  private static boolean groupsOnly(int mode) {
+    return mode == DisplayMode.FLAG_ACTIVE_GROUPS;
+  }
+
   private static boolean flagSet(int mode, int flag) {
     return (mode & flag) > 0;
   }

app/src/main/java/org/thoughtcrime/securesms/contacts/SelectedContact.java

@@ -8,16 +8,12 @@ import androidx.annotation.Nullable;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 
-import java.util.Objects;
-
 /**
  * Model for a contact and the various ways it could be represented. Used in situations where we
  * don't want to create Recipients for the wrapped data (like a custom-entered phone number for
  * someone you don't yet have a conversation with).
- *
- * Designed so that two instances will be equal if *any* of its properties match.
  */
-public class SelectedContact {
+public final class SelectedContact {
   private final RecipientId recipientId;
   private final String      number;
   private final String      username;
@@ -46,19 +42,20 @@ public class SelectedContact {
     }
   }
 
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-    SelectedContact that = (SelectedContact) o;
+  /**
+   * Returns true when non-null recipient ids match, and false if not.
+   * <p>
+   * If one or more recipient id is not set, then it returns true iff any other non-null property
+   * matches one on the other contact.
+   */
+  public boolean matches(@Nullable SelectedContact other) {
+    if (other == null) return false;
 
-    return Objects.equals(recipientId, that.recipientId) ||
-           Objects.equals(number, that.number)           ||
-           Objects.equals(username, that.username);
-  }
+    if (recipientId != null && other.recipientId != null) {
+      return recipientId.equals(other.recipientId);
+    }
 
-  @Override
-  public int hashCode() {
-    return Objects.hash(recipientId, number, username);
+    return number   != null && number  .equals(other.number)   ||
+           username != null && username.equals(other.username);
   }
 }

app/src/main/java/org/thoughtcrime/securesms/contacts/SelectedContactSet.java

@@ -0,0 +1,62 @@
+package org.thoughtcrime.securesms.contacts;
+
+import androidx.annotation.NonNull;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * Specialised set for {@link SelectedContact} that will not allow more than one entry that
+ * {@link SelectedContact#matches(SelectedContact)} any other.
+ */
+public final class SelectedContactSet {
+
+  private final List<SelectedContact> contacts = new LinkedList<>();
+
+  public boolean add(@NonNull SelectedContact contact) {
+    if (contains(contact)) {
+      return false;
+    }
+
+    contacts.add(contact);
+    return true;
+  }
+
+  public boolean contains(@NonNull SelectedContact otherContact) {
+    for (SelectedContact contact : contacts) {
+      if (otherContact.matches(contact)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  public List<SelectedContact> getContacts() {
+    return new ArrayList<>(contacts);
+  }
+
+  public int size() {
+    return contacts.size();
+  }
+
+  public void clear() {
+    contacts.clear();
+  }
+
+  public int remove(@NonNull SelectedContact otherContact) {
+    int                       removeCount = 0;
+    Iterator<SelectedContact> iterator    = contacts.iterator();
+
+    while (iterator.hasNext()) {
+      SelectedContact next = iterator.next();
+      if (next.matches(otherContact)) {
+        iterator.remove();
+        removeCount++;
+      }
+    }
+
+    return removeCount;
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ContactColors.java

@@ -8,6 +8,9 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+/**
+ * Colors that can be randomly assigned to a contact.
+ */
 public class ContactColors {
 
   public static final MaterialColor UNKNOWN_COLOR = MaterialColor.STEEL;
@@ -23,7 +26,8 @@ public class ContactColors {
       MaterialColor.WINTERGREEN,
       MaterialColor.TEAL,
       MaterialColor.BURLAP,
-      MaterialColor.TAUPE
+      MaterialColor.TAUPE,
+      MaterialColor.ULTRAMARINE
   ));
 
   public static MaterialColor generateFor(@NonNull String name) {

app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/ContactColorsLegacy.java

@@ -2,8 +2,12 @@ package org.thoughtcrime.securesms.contacts.avatars;
 
 import androidx.annotation.NonNull;
 
+import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.color.MaterialColor;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+
 /**
  * Used for migrating legacy colors to modern colors. For normal color generation, use
  * {@link ContactColors}.
@@ -28,6 +32,21 @@ public class ContactColorsLegacy {
       "blue_grey"
   };
 
+  private static final String[] LEGACY_PALETTE_2 = new String[]{
+      "pink",
+      "red",
+      "orange",
+      "purple",
+      "blue",
+      "indigo",
+      "green",
+      "light_green",
+      "teal",
+      "brown",
+      "blue_grey"
+  };
+
+
   public static MaterialColor generateFor(@NonNull String name) {
     String serialized = LEGACY_PALETTE[Math.abs(name.hashCode()) % LEGACY_PALETTE.length];
     try {
@@ -36,4 +55,13 @@ public class ContactColorsLegacy {
       return ContactColors.generateFor(name);
     }
   }
+
+  public static MaterialColor generateForV2(@NonNull String name) {
+    String serialized = LEGACY_PALETTE_2[Math.abs(name.hashCode()) % LEGACY_PALETTE_2.length];
+    try {
+      return MaterialColor.fromSerialized(serialized);
+    } catch (MaterialColor.UnknownColorException e) {
+      return ContactColors.generateFor(name);
+    }
+  }
 }

app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/FallbackPhoto80dp.java

@@ -0,0 +1,62 @@
+package org.thoughtcrime.securesms.contacts.avatars;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
+
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.appcompat.content.res.AppCompatResources;
+import androidx.core.graphics.drawable.DrawableCompat;
+
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.color.MaterialColor;
+import org.thoughtcrime.securesms.util.ThemeUtil;
+import org.thoughtcrime.securesms.util.ViewUtil;
+
+import java.util.Objects;
+
+public final class FallbackPhoto80dp implements FallbackContactPhoto {
+
+  @DrawableRes private final int           drawable80dp;
+               private final MaterialColor backgroundColor;
+
+  public FallbackPhoto80dp(@DrawableRes int drawable80dp, @NonNull MaterialColor backgroundColor) {
+    this.drawable80dp    = drawable80dp;
+    this.backgroundColor = backgroundColor;
+  }
+
+  @Override
+  public Drawable asDrawable(Context context, int color) {
+    return buildDrawable(context);
+  }
+
+  @Override
+  public Drawable asDrawable(Context context, int color, boolean inverted) {
+    return buildDrawable(context);
+  }
+
+  @Override
+  public Drawable asSmallDrawable(Context context, int color, boolean inverted) {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public Drawable asCallCard(Context context) {
+    throw new UnsupportedOperationException();
+  }
+
+  private @NonNull Drawable buildDrawable(@NonNull Context context) {
+    Drawable      background      = DrawableCompat.wrap(Objects.requireNonNull(AppCompatResources.getDrawable(context, R.drawable.circle_tintable))).mutate();
+    Drawable      foreground      = AppCompatResources.getDrawable(context, drawable80dp);
+    Drawable      gradient        = ThemeUtil.getThemedDrawable(context, R.attr.resource_placeholder_gradient);
+    LayerDrawable drawable        = new LayerDrawable(new Drawable[]{background, foreground, gradient});
+    int           foregroundInset = ViewUtil.dpToPx(24);
+
+    DrawableCompat.setTint(background, backgroundColor.toAvatarColor(context));
+
+    drawable.setLayerInset(1, foregroundInset, foregroundInset, foregroundInset, foregroundInset);
+
+    return drawable;
+  }
+}