Bump version to 4.73.1

We were doing this for MmsDatabase, but not SmsDatabase. Includes a
migration to cleanup any existing bad state.

.gitignore

@@ -25,3 +25,4 @@ obj/
 jni/libspeex/.deps/
 *.sh
 pkcs11.password
+dev.keystore

app/build.gradle

@@ -80,8 +80,8 @@ protobuf {
     }
 }
 
-def canonicalVersionCode = 704
-def canonicalVersionName = "4.71.1"
+def canonicalVersionCode = 717
+def canonicalVersionName = "4.73.1"
 
 def postFixSize = 10
 def abiPostFix = ['universal'   : 0,
@@ -100,6 +100,15 @@ android {
         javaMaxHeapSize "4g"
     }
 
+    signingConfigs {
+        staging {
+            storeFile file("${project.rootDir}/dev.keystore")
+            storePassword 'android'
+            keyAlias 'staging'
+            keyPassword 'android'
+        }
+    }
+
     defaultConfig {
         versionCode canonicalVersionCode * postFixSize
         versionName canonicalVersionName
@@ -122,10 +131,11 @@ android {
         buildConfigField "String", "CONTENT_PROXY_HOST", "\"contentproxy.signal.org\""
         buildConfigField "int", "CONTENT_PROXY_PORT", "443"
         buildConfigField "String", "SIGNAL_AGENT", "\"OWA\""
-        buildConfigField "String", "CDS_MRENCLAVE", "\"a3bfdf9717e35ce4f6fd3888133d65a71a880cd6a26c41d1e47647ed3e7704fa\""
-        buildConfigField "String", "KBS_ENCLAVE_NAME", "\"fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe\""
-        buildConfigField "String", "KBS_SERVICE_ID", "\"fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe\""
-        buildConfigField "String", "KBS_MRENCLAVE", "\"a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87\""
+        buildConfigField "String", "CDS_MRENCLAVE", "\"c98e00a4e3ff977a56afefe7362a27e4961e4f19e211febfbb19b897e6b80b15\""
+        buildConfigField "KbsEnclave", "KBS_ENCLAVE", "new KbsEnclave(\"fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe\"," +
+                                                                     "\"fe7c1bfae98f9b073d220366ea31163ee82f6d04bead774f71ca8e5c40847bfe\", " +
+                                                                     "\"a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87\")";
+        buildConfigField "KbsEnclave[]", "KBS_FALLBACKS", "new KbsEnclave[0]"
         buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BXu6QIKVz5MA8gstzfOgRQGqyLqOwNKHL6INkv3IHWMF\""
         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('", "') + '"}'
@@ -165,7 +175,7 @@ android {
     }
 
     aaptOptions {
-        ignoreAssetsPattern '!contours.tfl:!LMprec_600.emd:!fssd_25_8bit_gray_v1.tflite:!fssd_25_8bit_v1.tflite:!blazeface.tfl'
+        ignoreAssetsPattern '!contours.tfl:!LMprec_600.emd:!blazeface.tfl'
     }
 
     buildTypes {
@@ -195,6 +205,8 @@ android {
         }
         staging {
             initWith debug
+            applicationIdSuffix ".staging"
+            signingConfig signingConfigs.staging
 
             buildConfigField "String", "SIGNAL_URL", "\"https://textsecure-service-staging.whispersystems.org\""
             buildConfigField "String", "STORAGE_URL", "\"https://storage-staging.signal.org\""
@@ -203,8 +215,10 @@ android {
             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", "CDS_MRENCLAVE", "\"bd123560b01c8fa92935bc5ae15cd2064e5c45215f23f0bd40364d521329d2ad\""
-            buildConfigField "String", "KBS_ENCLAVE_NAME", "\"823a3b2c037ff0cbe305cc48928cfcc97c9ed4a8ca6d49af6f7d6981fb60a4e9\""
-            buildConfigField "String", "KBS_SERVICE_ID", "\"038c40bbbacdc873caa81ac793bb75afde6dfe436a99ab1f15e3f0cbb7434ced\""
+            buildConfigField "KbsEnclave", "KBS_ENCLAVE", "new KbsEnclave(\"823a3b2c037ff0cbe305cc48928cfcc97c9ed4a8ca6d49af6f7d6981fb60a4e9\", " +
+                                                                         "\"038c40bbbacdc873caa81ac793bb75afde6dfe436a99ab1f15e3f0cbb7434ced\", " +
+                                                                         "\"a3baab19ef6ce6f34ab9ebb25ba722725ae44a8872dc0ff08ad6d83a9489de87\")"
+            buildConfigField "KbsEnclave[]", "KBS_FALLBACKS", "new KbsEnclave[0]"
             buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx\""
             buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdls=\""
         }
@@ -310,7 +324,7 @@ dependencies {
 
     implementation 'org.signal:argon2:13.1@aar'
 
-    implementation 'org.signal:ringrtc-android:2.5.1'
+    implementation 'org.signal:ringrtc-android:2.7.0'
 
     implementation "me.leolin:ShortcutBadger:1.1.16"
     implementation 'se.emilsjolander:stickylistheaders:2.7.0'

app/src/flipper/AndroidManifest.xml

@@ -5,5 +5,12 @@
 
     <application
         android:name=".FlipperApplicationContext"
-        tools:replace="android:name"/>
+        tools:replace="android:name">
+
+        <activity
+            android:name="com.facebook.flipper.android.diagnostics.FlipperDiagnosticActivity"
+            android:exported="true" />
+
+    </application>
+
 </manifest>

app/src/main/AndroidManifest.xml

@@ -5,7 +5,7 @@
 
     <uses-sdk tools:overrideLibrary="androidx.camera.core,androidx.camera.camera2,androidx.camera.lifecycle" />
 
-    <permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"
+    <permission android:name="${applicationId}.ACCESS_SECRETS"
                 android:label="Access to TextSecure Secrets"
                 android:protectionLevel="signature" />
 
@@ -113,7 +113,7 @@
     <meta-data android:name="google_analytics_adid_collection_enabled" android:value="false" />
     <meta-data android:name="firebase_messaging_auto_init_enabled" android:value="false" />
 
-    <activity android:name="org.thoughtcrime.securesms.WebRtcCallActivity"
+    <activity android:name=".WebRtcCallActivity"
               android:theme="@style/TextSecure.LightTheme.WebRTCCall"
               android:excludeFromRecents="true"
               android:screenOrientation="portrait"
@@ -127,25 +127,25 @@
               android:theme="@style/TextSecure.DarkNoActionBar"
               android:screenOrientation="portrait"
               android:noHistory="true"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".InviteActivity"
               android:theme="@style/Signal.Light.NoActionBar.Invite"
               android:windowSoftInputMode="stateHidden"
               android:parentActivityName=".MainActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode">
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
         <meta-data
             android:name="android.support.PARENT_ACTIVITY"
-            android:value="org.thoughtcrime.securesms.MainActivity" />
+            android:value=".MainActivity" />
     </activity>
 
     <activity android:name=".PromptMmsActivity"
               android:label="Configure MMS Settings"
               android:windowSoftInputMode="stateUnchanged"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".DeviceProvisioningActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode">
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
         <intent-filter>
             <action android:name="android.intent.action.VIEW" />
             <category android:name="android.intent.category.DEFAULT" />
@@ -155,7 +155,7 @@
     </activity>
 
     <activity android:name=".preferences.MmsPreferencesActivity"
-               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".sharing.ShareActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
@@ -164,7 +164,7 @@
               android:taskAffinity=""
               android:noHistory="true"
               android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode">
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
         <intent-filter>
             <action android:name="android.intent.action.SEND" />
             <category android:name="android.intent.category.DEFAULT"/>
@@ -195,7 +195,7 @@
               android:launchMode="singleTask"
               android:noHistory="true"
               android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode">
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
         <intent-filter>
             <action android:name="android.intent.action.VIEW" />
             <category android:name="android.intent.category.DEFAULT" />
@@ -223,6 +223,14 @@
             <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
         </intent-filter>
 
+        <intent-filter>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="sgnl"
+                  android:host="signal.group" />
+        </intent-filter>
+
         <intent-filter android:autoVerify="true"
                        tools:targetApi="23">
             <action android:name="android.intent.action.VIEW" />
@@ -242,7 +250,7 @@
     <activity android:name=".conversation.ConversationActivity"
               android:windowSoftInputMode="stateUnchanged"
               android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
               android:parentActivityName=".MainActivity">
         <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
@@ -257,16 +265,16 @@
               android:taskAffinity=""
               android:excludeFromRecents="true"
               android:theme="@style/TextSecure.LightTheme.Popup"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode" />
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
 
     <activity android:name=".messagedetails.MessageDetailsActivity"
               android:label="@string/AndroidManifest__message_details"
               android:windowSoftInputMode="stateHidden"
               android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".groups.ui.pendingmemberinvites.PendingMemberInvitesActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
 
     <activity android:name=".groups.ui.invitesandrequests.ManagePendingAndRequestingMembersActivity"
@@ -275,64 +283,64 @@
 
     <activity android:name=".groups.ui.managegroup.ManageGroupActivity"
               android:windowSoftInputMode="stateAlwaysHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              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|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".DatabaseMigrationActivity"
               android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar"
               android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".migrations.ApplicationMigrationActivity"
               android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar"
               android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
       <activity android:name=".PassphraseCreateActivity"
               android:label="@string/AndroidManifest__create_passphrase"
               android:windowSoftInputMode="stateUnchanged"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".PassphrasePromptActivity"
               android:launchMode="singleTask"
               android:theme="@style/TextSecure.LightIntroTheme"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".NewConversationActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:windowSoftInputMode="stateAlwaysVisible"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".PushContactSelectionActivity"
           android:label="@string/AndroidManifest__select_contacts"
           android:windowSoftInputMode="stateHidden"
-          android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+          android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".giph.ui.GiphyActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".mediasend.MediaSendActivity"
               android:theme="@style/TextSecure.FullScreenMedia"
               android:windowSoftInputMode="stateHidden"
               android:launchMode="singleTop"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".PassphraseChangeActivity"
               android:label="@string/AndroidManifest__change_passphrase"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".VerifyIdentityActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".ApplicationPreferencesActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode">
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />
             <category android:name="android.intent.category.NOTIFICATION_PREFERENCES" />
@@ -343,45 +351,45 @@
               android:launchMode="singleTask"
               android:theme="@style/TextSecure.LightRegistrationTheme"
               android:windowSoftInputMode="stateUnchanged"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".revealable.ViewOnceMessageActivity"
               android:launchMode="singleTask"
               android:theme="@style/TextSecure.FullScreenMedia"
               android:windowSoftInputMode="stateHidden"
               android:excludeFromRecents="true"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".stickers.StickerManagementActivity"
               android:launchMode="singleTask"
               android:theme="@style/TextSecure.LightTheme"
               android:windowSoftInputMode="stateUnchanged"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
      <activity android:name=".DeviceActivity"
                android:label="@string/AndroidManifest__linked_devices"
-               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".logsubmit.SubmitDebugLogActivity"
               android:label="@string/AndroidManifest__log_submit"
               android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".MediaPreviewActivity"
               android:label="@string/AndroidManifest__media_preview"
               android:windowSoftInputMode="stateHidden"
               android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              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|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".mediaoverview.MediaOverviewActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:windowSoftInputMode="stateHidden"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".DummyActivity"
               android:theme="@android:style/Theme.NoDisplay"
@@ -396,7 +404,7 @@
 
     <activity android:name=".PlayServicesProblemActivity"
               android:theme="@style/TextSecure.DialogActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".SmsSendtoActivity">
         <intent-filter>
@@ -420,7 +428,7 @@
               android:excludeFromRecents="true"
               android:theme="@style/NoAnimation.Theme.BlackScreen"
               android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode">
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
 
         <intent-filter>
             <action android:name="android.intent.action.VIEW" />
@@ -432,15 +440,15 @@
 
     <activity android:name=".mediasend.AvatarSelectionActivity"
               android:theme="@style/TextSecure.FullScreenMedia"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".BlockedContactsActivity"
               android:theme="@style/TextSecure.LightTheme"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".scribbles.ImageEditorStickerSelectActivity"
               android:theme="@style/TextSecure.DarkTheme"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".profiles.edit.EditProfileActivity"
               android:theme="@style/TextSecure.LightRegistrationTheme"
@@ -449,16 +457,16 @@
     <activity android:name=".lock.v2.CreateKbsPinActivity"
             android:theme="@style/TextSecure.LightRegistrationTheme"
             android:windowSoftInputMode="adjustResize"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".lock.v2.KbsMigrationActivity"
             android:theme="@style/TextSecure.LightRegistrationTheme"
             android:windowSoftInputMode="adjustResize"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".ClearProfileAvatarActivity"
             android:theme="@style/Theme.AppCompat.Dialog.Alert"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
             android:icon="@drawable/clear_profile_avatar"
             android:label="@string/AndroidManifest_remove_photo">
 
@@ -474,39 +482,39 @@
     <activity android:name=".messagerequests.MessageRequestMegaphoneActivity"
               android:theme="@style/TextSecure.LightRegistrationTheme"
               android:windowSoftInputMode="adjustResize"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".contactshare.ContactShareEditActivity"
               android:theme="@style/TextSecure.LightTheme"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".contactshare.ContactNameEditActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".contactshare.SharedContactDetailsActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".ShortcutLauncherActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:exported="true"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity
             android:name=".maps.PlacePickerActivity"
             android:label="@string/PlacePickerActivity_title"
             android:theme="@style/Theme.Signal.DayNight.NoActionBar"
-            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+            android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".MainActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:launchMode="singleTask"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              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|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
 
     <activity android:name=".groups.ui.creategroup.CreateGroupActivity"
               android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
@@ -521,9 +529,14 @@
               android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
 
     <activity android:name=".groups.ui.chooseadmin.ChooseNewAdminActivity"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"/>
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
 
-    <service android:enabled="true" android:name="org.thoughtcrime.securesms.service.WebRtcCallService"/>
+    <activity android:name=".megaphone.ClientDeprecatedActivity"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize|uiMode"
+              android:launchMode="singleTask" />
+
+    <service android:enabled="true" android:name=".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=".messages.IncomingMessageObserver$ForegroundService"/>
@@ -645,15 +658,15 @@
     <provider android:name=".providers.PartProvider"
               android:grantUriPermissions="true"
               android:exported="false"
-              android:authorities="org.thoughtcrime.provider.securesms" />
+              android:authorities="${applicationId}.part" />
 
     <provider android:name=".providers.MmsBodyProvider"
               android:grantUriPermissions="true"
               android:exported="false"
-              android:authorities="org.thoughtcrime.provider.securesms.mms" />
+              android:authorities="${applicationId}.mms" />
 
     <provider android:name="androidx.core.content.FileProvider"
-              android:authorities="org.thoughtcrime.securesms.fileprovider"
+              android:authorities="${applicationId}.fileprovider"
               android:exported="false"
               android:grantUriPermissions="true">
 
@@ -662,23 +675,23 @@
     </provider>
 
     <provider android:name=".database.DatabaseContentProviders$Conversation"
-              android:authorities="org.thoughtcrime.securesms.database.conversation"
+              android:authorities="${applicationId}.database.conversation"
               android:exported="false" />
 
     <provider android:name=".database.DatabaseContentProviders$ConversationList"
-              android:authorities="org.thoughtcrime.securesms.database.conversationlist"
+              android:authorities="${applicationId}.database.conversationlist"
               android:exported="false" />
 
     <provider android:name=".database.DatabaseContentProviders$Attachment"
-              android:authorities="org.thoughtcrime.securesms.database.attachment"
+              android:authorities="${applicationId}.database.attachment"
               android:exported="false" />
 
     <provider android:name=".database.DatabaseContentProviders$Sticker"
-              android:authorities="org.thoughtcrime.securesms.database.sticker"
+              android:authorities="${applicationId}.database.sticker"
               android:exported="false" />
 
     <provider android:name=".database.DatabaseContentProviders$StickerPack"
-              android:authorities="org.thoughtcrime.securesms.database.stickerpack"
+              android:authorities="${applicationId}.database.stickerpack"
               android:exported="false" />
 
     <receiver android:name=".service.BootReceiver">

app/src/main/java/org/signal/glide/apng/decode/APNGParser.java

@@ -96,9 +96,7 @@ public class APNGParser {
                 }
             }
         } catch (IOException e) {
-            if (!(e instanceof FormatException)) {
-                e.printStackTrace();
-            }
+            return false;
         }
         return false;
     }

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

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

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

@@ -48,6 +48,7 @@ import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
 import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
 import org.thoughtcrime.securesms.jobs.RefreshPreKeysJob;
 import org.thoughtcrime.securesms.jobs.RetrieveProfileJob;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.logging.AndroidLogger;
 import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger;
 import org.thoughtcrime.securesms.logging.Log;
@@ -70,6 +71,7 @@ import org.thoughtcrime.securesms.service.UpdateApkRefreshListener;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
 import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
 import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
 import org.webrtc.voiceengine.WebRtcAudioManager;
@@ -135,7 +137,6 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     NotificationChannels.create(this);
     RefreshPreKeysJob.scheduleIfNecessary();
     StorageSyncHelper.scheduleRoutineSync();
-    RetrieveProfileJob.enqueueRoutineFetchIfNecessary(this);
     RegistrationUtil.maybeMarkRegistrationComplete(this);
     ProcessLifecycleOwner.get().getLifecycle().addObserver(this);
 
@@ -153,10 +154,12 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     Log.i(TAG, "App is now visible.");
     FeatureFlags.refreshIfNecessary();
     ApplicationDependencies.getRecipientCache().warmUp();
+    RetrieveProfileJob.enqueueRoutineFetchIfNecessary(this);
     executePendingContactSync();
     KeyCachingService.onAppForegrounded(this);
     ApplicationDependencies.getFrameRateTracker().begin();
     ApplicationDependencies.getMegaphoneRepository().onAppForegrounded();
+    checkBuildExpiration();
   }
 
   @Override
@@ -192,6 +195,13 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     return persistentLogger;
   }
 
+  public void checkBuildExpiration() {
+    if (Util.getTimeUntilBuildExpiry() <= 0 && !SignalStore.misc().isClientDeprecated()) {
+      Log.w(TAG, "Build expired!");
+      SignalStore.misc().markClientDeprecated();
+    }
+  }
+
   private void initializeSecurityProvider() {
     try {
       Class.forName("org.signal.aesgcmprovider.AesGcmCipher");

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

@@ -1,6 +1,5 @@
 package org.thoughtcrime.securesms;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -10,12 +9,7 @@ import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.transition.TransitionInflater;
-import android.view.DisplayCutout;
 import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-import android.view.Window;
-import android.view.WindowManager;
 import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
@@ -40,6 +34,7 @@ import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.util.FullscreenHelper;
 
 /**
  * Activity for displaying avatars full screen.
@@ -81,17 +76,7 @@ public final class AvatarPreviewActivity extends PassphraseRequiredActivity {
 
     setSupportActionBar(toolbar);
 
-    getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-                         WindowManager.LayoutParams.FLAG_FULLSCREEN);
-
-    if (Build.VERSION.SDK_INT >= 28) {
-      getWindow().getAttributes().layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
-      toolbar.getViewTreeObserver().addOnGlobalLayoutListener(new DisplayCutoutAdjuster(toolbar, findViewById(R.id.toolbar_cutout_spacer)));
-    }
-
-    showSystemUI();
-
-    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+    requireSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
     Context     context     = getApplicationContext();
     RecipientId recipientId = RecipientId.from(getIntent().getStringExtra(RECIPIENT_ID_EXTRA));
@@ -140,47 +125,13 @@ public final class AvatarPreviewActivity extends PassphraseRequiredActivity {
       toolbar.setTitle(recipient.getDisplayName(context));
     });
 
-    avatar.setOnClickListener(v -> toggleUiVisibility());
+    FullscreenHelper fullscreenHelper = new FullscreenHelper(this);
 
-    showAndHideWithSystemUI(getWindow(), findViewById(R.id.toolbar_layout));
-  }
+    findViewById(android.R.id.content).setOnClickListener(v -> fullscreenHelper.toggleUiVisibility());
 
-  private static void showAndHideWithSystemUI(@NonNull Window window, @NonNull View... views) {
-    window.getDecorView().setOnSystemUiVisibilityChangeListener(visibility -> {
-      boolean hide = (visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) != 0;
+    fullscreenHelper.configureToolbarSpacer(findViewById(R.id.toolbar_cutout_spacer));
 
-      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       );
+    fullscreenHelper.showAndHideWithSystemUI(getWindow(), findViewById(R.id.toolbar_layout));
   }
 
   @Override
@@ -188,36 +139,4 @@ public final class AvatarPreviewActivity extends PassphraseRequiredActivity {
     onBackPressed();
     return true;
   }
-
-  /**
-   * Adjust a spacer for the toolbar when a display cutout is detected. Runs within
-   * a layout listener because the activity delays view attachment due to the transitions
-   * and needs to update on device rotation.
-   */
-  @TargetApi(28)
-  private static class DisplayCutoutAdjuster implements ViewTreeObserver.OnGlobalLayoutListener {
-
-    private final View view;
-    private final View spacer;
-
-    private DisplayCutoutAdjuster(@NonNull View view, @NonNull View spacer) {
-      this.view   = view;
-      this.spacer = spacer;
-    }
-
-    @Override
-    public void onGlobalLayout() {
-      if (view.getRootWindowInsets() == null) {
-        return;
-      }
-
-      DisplayCutout cutout = view.getRootWindowInsets().getDisplayCutout();
-      if (cutout != null) {
-        ViewGroup.LayoutParams params = spacer.getLayoutParams();
-        params.height = cutout.getSafeInsetTop();
-        spacer.setLayoutParams(params);
-        spacer.setVisibility(View.VISIBLE);
-      }
-    }
-  }
 }

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

@@ -4,6 +4,7 @@ import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.lifecycle.LifecycleOwner;
 
 import org.thoughtcrime.securesms.contactshare.Contact;
 import org.thoughtcrime.securesms.conversation.ConversationMessage;
@@ -22,7 +23,8 @@ import java.util.Locale;
 import java.util.Set;
 
 public interface BindableConversationItem extends Unbindable {
-  void bind(@NonNull ConversationMessage messageRecord,
+  void bind(@NonNull LifecycleOwner lifecycleOwner,
+            @NonNull ConversationMessage messageRecord,
             @NonNull Optional<MessageRecord> previousMessageRecord,
             @NonNull Optional<MessageRecord> nextMessageRecord,
             @NonNull GlideRequests glideRequests,

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

@@ -106,7 +106,7 @@ public final class ContactSelectionListFragment extends LoggingFragment
   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 SELECTION_LIMIT   = "selection_limit";
   public static final String CURRENT_SELECTION = "current_selection";
 
   private ConstraintLayout            constraintLayout;
@@ -208,7 +208,7 @@ public final class ContactSelectionListFragment extends LoggingFragment
 
     swipeRefresh.setEnabled(requireActivity().getIntent().getBooleanExtra(REFRESHABLE, true));
 
-    selectionLimit   = requireActivity().getIntent().getIntExtra(TOTAL_CAPACITY, NO_LIMIT);
+    selectionLimit   = requireActivity().getIntent().getIntExtra(SELECTION_LIMIT, NO_LIMIT);
     currentSelection = getCurrentSelection();
 
     updateGroupLimit(getChipCount());

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

@@ -0,0 +1,49 @@
+package org.thoughtcrime.securesms;
+
+import androidx.annotation.NonNull;
+
+import java.util.Objects;
+
+/**
+ * Used in our {@link BuildConfig} to tie together the various attributes of a KBS instance. This
+ * is sitting in the root directory so it can be accessed by the build config.
+ */
+public final class KbsEnclave {
+
+  private final String enclaveName;
+  private final String serviceId;
+  private final String mrEnclave;
+
+  public KbsEnclave(@NonNull String enclaveName, @NonNull String serviceId, @NonNull String mrEnclave) {
+    this.enclaveName = enclaveName;
+    this.serviceId   = serviceId;
+    this.mrEnclave   = mrEnclave;
+  }
+
+  public @NonNull String getMrEnclave() {
+    return mrEnclave;
+  }
+
+  public @NonNull String getEnclaveName() {
+    return enclaveName;
+  }
+
+  public @NonNull String getServiceId() {
+    return serviceId;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    KbsEnclave enclave = (KbsEnclave) o;
+    return enclaveName.equals(enclave.enclaveName) &&
+           serviceId.equals(enclave.serviceId)     &&
+           mrEnclave.equals(enclave.mrEnclave);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(enclaveName, serviceId, mrEnclave);
+  }
+}

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

@@ -31,8 +31,6 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -69,6 +67,7 @@ import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.sharing.ShareActivity;
 import org.thoughtcrime.securesms.util.AttachmentUtil;
 import org.thoughtcrime.securesms.util.DateUtils;
+import org.thoughtcrime.securesms.util.FullscreenHelper;
 import org.thoughtcrime.securesms.util.SaveAttachmentTask;
 import org.thoughtcrime.securesms.util.SaveAttachmentTask.Attachment;
 
@@ -119,6 +118,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
   private boolean               cameFromAllMedia;
   private boolean               showThread;
   private MediaDatabase.Sorting sorting;
+  private FullscreenHelper      fullscreenHelper;
 
   private @Nullable Cursor cursor = null;
 
@@ -133,7 +133,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
     intent.putExtra(MediaPreviewActivity.SIZE_EXTRA, attachment.getSize());
     intent.putExtra(MediaPreviewActivity.CAPTION_EXTRA, attachment.getCaption());
     intent.putExtra(MediaPreviewActivity.LEFT_IS_RECENT_EXTRA, leftIsRecent);
-    intent.setDataAndType(attachment.getDataUri(), mediaRecord.getContentType());
+    intent.setDataAndType(attachment.getUri(), mediaRecord.getContentType());
     return intent;
   }
 
@@ -147,10 +147,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
 
     viewModel = ViewModelProviders.of(this).get(MediaPreviewViewModel.class);
 
-    getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-                         WindowManager.LayoutParams.FLAG_FULLSCREEN);
-
-    showSystemUI();
+    fullscreenHelper = new FullscreenHelper(this);
 
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
@@ -261,6 +258,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
     albumRail        = findViewById(R.id.media_preview_album_rail);
     albumRailAdapter = new MediaRailAdapter(GlideApp.with(this), this, false);
 
+    albumRail.setItemAnimator(null); // Or can crash when set to INVISIBLE while animating by FullscreenHelper https://issuetracker.google.com/issues/148720682
     albumRail.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false));
     albumRail.setAdapter(albumRailAdapter);
 
@@ -273,9 +271,9 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
 
     anchorMarginsToBottomInsets(detailsContainer);
 
-    anchorMarginsToTopInsets(toolbarLayout);
+    fullscreenHelper.configureToolbarSpacer(findViewById(R.id.toolbar_cutout_spacer));
 
-    showAndHideWithSystemUI(getWindow(), detailsContainer, toolbarLayout);
+    fullscreenHelper.showAndHideWithSystemUI(getWindow(), detailsContainer, toolbarLayout);
   }
 
   private void initializeResources() {
@@ -546,7 +544,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
 
   @Override
   public boolean singleTapOnMedia() {
-    toggleUiVisibility();
+    fullscreenHelper.toggleUiVisibility();
     return true;
   }
 
@@ -556,32 +554,6 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
     finish();
   }
 
-  private void toggleUiVisibility() {
-    int systemUiVisibility = getWindow().getDecorView().getSystemUiVisibility();
-    if ((systemUiVisibility & View.SYSTEM_UI_FLAG_FULLSCREEN) != 0) {
-      showSystemUI();
-    } else {
-      hideSystemUI();
-    }
-  }
-
-  private void hideSystemUI() {
-    getWindow().getDecorView().setSystemUiVisibility(
-        View.SYSTEM_UI_FLAG_IMMERSIVE              |
-        View.SYSTEM_UI_FLAG_LAYOUT_STABLE          |
-        View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
-        View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN      |
-        View.SYSTEM_UI_FLAG_HIDE_NAVIGATION        |
-        View.SYSTEM_UI_FLAG_FULLSCREEN              );
-  }
-
-  private void showSystemUI() {
-    getWindow().getDecorView().setSystemUiVisibility(
-        View.SYSTEM_UI_FLAG_LAYOUT_STABLE          |
-        View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
-        View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN       );
-  }
-
   private class ViewPagerListener extends ExtendedOnPageChangedListener {
 
     @Override
@@ -697,33 +669,6 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
     });
   }
 
-  private static void anchorMarginsToTopInsets(@NonNull View viewToAnchor) {
-    ViewCompat.setOnApplyWindowInsetsListener(viewToAnchor, (view, insets) -> {
-      ViewGroup.MarginLayoutParams layoutParams = (ViewGroup.MarginLayoutParams) view.getLayoutParams();
-
-      layoutParams.setMargins(insets.getSystemWindowInsetLeft(),
-                              insets.getSystemWindowInsetTop(),
-                              insets.getSystemWindowInsetRight(),
-                              layoutParams.bottomMargin);
-
-      view.setLayoutParams(layoutParams);
-
-      return insets;
-    });
-  }
-
-  private static void showAndHideWithSystemUI(@NonNull Window window, @NonNull View... views) {
-    window.getDecorView().setOnSystemUiVisibilityChangeListener(visibility -> {
-      boolean hide = (visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) != 0;
-
-      for (View view : views) {
-        view.animate()
-            .alpha(hide ? 0 : 1)
-            .start();
-      }
-    });
-  }
-
   private static class CursorPagerAdapter extends FragmentStatePagerAdapter implements MediaItemAdapter {
 
     @SuppressLint("UseSparseArrays")
@@ -801,7 +746,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActivity
       return new MediaItem(Recipient.live(recipientId).get(),
                            Recipient.live(threadRecipientId).get(),
                            attachment,
-                           Objects.requireNonNull(attachment.getDataUri()),
+                           Objects.requireNonNull(attachment.getUri()),
                            mediaRecord.getContentType(),
                            mediaRecord.getDate(),
                            mediaRecord.isOutgoing());

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

@@ -33,6 +33,7 @@ import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
 import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
 import org.whispersystems.libsignal.util.guava.Optional;
@@ -65,16 +66,17 @@ public class NewConversationActivity extends ContactSelectionActivity
       launch(Recipient.resolved(recipientId.get()));
     } else {
       Log.i(TAG, "[onContactSelected] Maybe creating a new recipient.");
-      if (FeatureFlags.cds() && NetworkConstraint.isMet(this)) {
-        Log.i(TAG, "[onContactSelected] CDS enabled. Doing contact refresh.");
+
+      if (TextSecurePreferences.isPushRegistered(this) && NetworkConstraint.isMet(this)) {
+        Log.i(TAG, "[onContactSelected] Doing contact refresh.");
 
         AlertDialog progress = SimpleProgressDialog.show(this);
 
         SimpleTask.run(getLifecycle(), () -> {
           Recipient resolved = Recipient.external(this, number);
 
-          if (!resolved.isRegistered()) {
-            Log.i(TAG, "[onContactSelected] Not registered. Doing a directory refresh.");
+          if (!resolved.isRegistered() || !resolved.hasUuid()) {
+            Log.i(TAG, "[onContactSelected] Not registered or no UUID. Doing a directory refresh.");
             try {
               DirectoryHelper.refreshDirectoryFor(this, resolved, false);
               resolved = Recipient.resolved(resolved.getId());
@@ -102,7 +104,7 @@ public class NewConversationActivity extends ContactSelectionActivity
     intent.putExtra(ConversationActivity.TEXT_EXTRA, getIntent().getStringExtra(ConversationActivity.TEXT_EXTRA));
     intent.setDataAndType(getIntent().getData(), getIntent().getType());
 
-    long existingThread = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(recipient);
+    long existingThread = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(recipient.getId());
 
     intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, existingThread);
     intent.putExtra(ConversationActivity.DISTRIBUTION_TYPE_EXTRA, ThreadDatabase.DistributionTypes.DEFAULT);

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

@@ -48,7 +48,7 @@ public class SmsSendtoActivity extends Activity {
       Toast.makeText(this, R.string.ConversationActivity_specify_recipient, Toast.LENGTH_LONG).show();
     } else {
       Recipient recipient = Recipient.external(this, destination.getDestination());
-      long      threadId  = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(recipient);
+      long      threadId  = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(recipient.getId());
 
       nextIntent = new Intent(this, ConversationActivity.class);
       nextIntent.putExtra(ConversationActivity.TEXT_EXTRA, destination.getBody());

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

@@ -19,8 +19,6 @@ package org.thoughtcrime.securesms;
 
 import android.Manifest;
 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;
@@ -41,9 +39,11 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 import org.thoughtcrime.securesms.components.TooltipPopup;
+import org.thoughtcrime.securesms.components.webrtc.CallParticipantsState;
 import org.thoughtcrime.securesms.components.webrtc.WebRtcAudioOutput;
 import org.thoughtcrime.securesms.components.webrtc.WebRtcCallView;
 import org.thoughtcrime.securesms.components.webrtc.WebRtcCallViewModel;
+import org.thoughtcrime.securesms.components.webrtc.participantslist.CallParticipantsListDialog;
 import org.thoughtcrime.securesms.conversation.ui.error.SafetyNumberChangeDialog;
 import org.thoughtcrime.securesms.events.WebRtcViewModel;
 import org.thoughtcrime.securesms.logging.Log;
@@ -52,11 +52,12 @@ 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.sms.MessageSender;
 import org.thoughtcrime.securesms.util.EllapsedTimeFormatter;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.thoughtcrime.securesms.util.ViewUtil;
 import org.whispersystems.libsignal.IdentityKey;
 import org.whispersystems.signalservice.api.messages.calls.HangupMessage;
+import org.whispersystems.signalservice.api.messages.calls.OfferMessage;
 
 public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumberChangeDialog.Callback {
 
@@ -85,6 +86,7 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
 
     requestWindowFeature(Window.FEATURE_NO_TITLE);
     setContentView(R.layout.webrtc_call_activity);
+    //noinspection ConstantConditions
     getSupportActionBar().hide();
 
     setVolumeControlStream(AudioManager.STREAM_VOICE_CALL);
@@ -124,6 +126,11 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
     if (!isInPipMode()) {
       EventBus.getDefault().unregister(this);
     }
+
+    CallParticipantsState state = viewModel.getCallParticipantsState().getValue();
+    if (state != null && state.getCallState() == WebRtcViewModel.State.CALL_PRE_JOIN) {
+      finish();
+    }
   }
 
   @Override
@@ -132,11 +139,13 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
     super.onStop();
 
     EventBus.getDefault().unregister(this);
-  }
 
-  @Override
-  public void onConfigurationChanged(Configuration newConfiguration) {
-    super.onConfigurationChanged(newConfiguration);
+    CallParticipantsState state = viewModel.getCallParticipantsState().getValue();
+    if (state != null && state.getCallState() == WebRtcViewModel.State.CALL_PRE_JOIN) {
+      Intent intent = new Intent(this, WebRtcCallService.class);
+      intent.setAction(WebRtcCallService.ACTION_CANCEL_PRE_JOIN_CALL);
+      startService(intent);
+    }
   }
 
   @Override
@@ -162,7 +171,7 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
   }
 
   private boolean enterPipModeIfPossible() {
-    if (isSystemPipEnabledAndAvailable()) {
+    if (viewModel.canEnterPipMode() && isSystemPipEnabledAndAvailable()) {
       PictureInPictureParams params = new PictureInPictureParams.Builder()
               .setAspectRatio(new Rational(9, 16))
               .build();
@@ -196,21 +205,18 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
   }
 
   private void initializeResources() {
-    callScreen = ViewUtil.findById(this, R.id.callScreen);
+    callScreen = findViewById(R.id.callScreen);
     callScreen.setControlsListener(new ControlsListener());
   }
 
   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);
+    viewModel.getCallParticipantsState().observe(this, callScreen::updateCallParticipants);
   }
 
   private void handleViewModelEvent(@NonNull WebRtcCallViewModel.Event event) {
@@ -375,19 +381,13 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
     startService(intent);
   }
 
-  private void handleIncomingCall(@NonNull WebRtcViewModel event) {
-    callScreen.setRecipient(event.getRecipient());
-  }
-
-  private void handleOutgoingCall(@NonNull WebRtcViewModel event) {
-    callScreen.setRecipient(event.getRecipient());
+  private void handleOutgoingCall() {
     callScreen.setStatus(getString(R.string.WebRtcCallActivity__calling));
   }
 
   private void handleTerminate(@NonNull Recipient recipient, @NonNull HangupMessage.Type hangupType) {
     Log.i(TAG, "handleTerminate called: " + hangupType.name());
 
-    callScreen.setRecipient(recipient);
     callScreen.setStatusFromHangupType(hangupType);
 
     EventBus.getDefault().removeStickyEvent(WebRtcViewModel.class);
@@ -398,62 +398,47 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
     delayedFinish();
   }
 
-  private void handleCallRinging(@NonNull WebRtcViewModel event) {
-    callScreen.setRecipient(event.getRecipient());
+  private void handleCallRinging() {
     callScreen.setStatus(getString(R.string.RedPhone_ringing));
   }
 
-  private void handleCallBusy(@NonNull WebRtcViewModel event) {
+  private void handleCallBusy() {
     EventBus.getDefault().removeStickyEvent(WebRtcViewModel.class);
-    callScreen.setRecipient(event.getRecipient());
     callScreen.setStatus(getString(R.string.RedPhone_busy));
     delayedFinish(WebRtcCallService.BUSY_TONE_LENGTH);
   }
 
-  private void handleCallConnected(@NonNull WebRtcViewModel event) {
+  private void handleCallConnected() {
     getWindow().addFlags(WindowManager.LayoutParams.FLAG_IGNORE_CHEEK_PRESSES);
-    callScreen.setRecipient(event.getRecipient());
   }
 
-  private void handleRecipientUnavailable(@NonNull WebRtcViewModel event) {
+  private void handleRecipientUnavailable() {
     EventBus.getDefault().removeStickyEvent(WebRtcViewModel.class);
-    callScreen.setRecipient(event.getRecipient());
     callScreen.setStatus(getString(R.string.RedPhone_recipient_unavailable));
     delayedFinish();
   }
 
-  private void handleServerFailure(@NonNull WebRtcViewModel event) {
+  private void handleServerFailure() {
     EventBus.getDefault().removeStickyEvent(WebRtcViewModel.class);
-    callScreen.setRecipient(event.getRecipient());
     callScreen.setStatus(getString(R.string.RedPhone_network_failed));
     delayedFinish();
   }
 
   private void handleNoSuchUser(final @NonNull WebRtcViewModel event) {
     if (isFinishing()) return; // XXX Stuart added this check above, not sure why, so I'm repeating in ignorance. - moxie
-    AlertDialog.Builder dialog = new AlertDialog.Builder(this);
-    dialog.setTitle(R.string.RedPhone_number_not_registered);
-    dialog.setIconAttribute(R.attr.dialog_alert_icon);
-    dialog.setMessage(R.string.RedPhone_the_number_you_dialed_does_not_support_secure_voice);
-    dialog.setCancelable(true);
-    dialog.setPositiveButton(R.string.RedPhone_got_it, new OnClickListener() {
-      @Override
-      public void onClick(DialogInterface dialog, int which) {
-        WebRtcCallActivity.this.handleTerminate(event.getRecipient(), HangupMessage.Type.NORMAL);
-      }
-    });
-    dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
-      @Override
-      public void onCancel(DialogInterface dialog) {
-        WebRtcCallActivity.this.handleTerminate(event.getRecipient(), HangupMessage.Type.NORMAL);
-      }
-    });
-    dialog.show();
+    new AlertDialog.Builder(this)
+                   .setTitle(R.string.RedPhone_number_not_registered)
+                   .setIconAttribute(R.attr.dialog_alert_icon)
+                   .setMessage(R.string.RedPhone_the_number_you_dialed_does_not_support_secure_voice)
+                   .setCancelable(true)
+                   .setPositiveButton(R.string.RedPhone_got_it, (d, w) -> handleTerminate(event.getRecipient(), HangupMessage.Type.NORMAL))
+                   .setOnCancelListener(d -> handleTerminate(event.getRecipient(), HangupMessage.Type.NORMAL))
+                   .show();
   }
 
   private void handleUntrustedIdentity(@NonNull WebRtcViewModel event) {
-    final IdentityKey theirKey  = event.getIdentityKey();
-    final Recipient   recipient = event.getRecipient();
+    final IdentityKey theirKey  = event.getRemoteParticipants().get(0).getIdentityKey();
+    final Recipient   recipient = event.getRemoteParticipants().get(0).getRecipient();
 
     if (theirKey == null) {
       handleTerminate(recipient, HangupMessage.Type.NORMAL);
@@ -493,32 +478,29 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
   }
 
   @Subscribe(sticky = true, threadMode = ThreadMode.MAIN)
-  public void onEventMainThread(final WebRtcViewModel event) {
+  public void onEventMainThread(@NonNull WebRtcViewModel event) {
     Log.i(TAG, "Got message from service: " + event);
 
     viewModel.setRecipient(event.getRecipient());
+    callScreen.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_CONNECTED:          handleCallConnected();                                                     break;
+      case NETWORK_FAILURE:         handleServerFailure();                                                     break;
+      case CALL_RINGING:            handleCallRinging();                                                       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 CALL_NEEDS_PERMISSION:   handleTerminate(event.getRecipient(), HangupMessage.Type.NEED_PERMISSION); 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 RECIPIENT_UNAVAILABLE:   handleRecipientUnavailable();                                              break;
+      case CALL_OUTGOING:           handleOutgoingCall();                                                      break;
+      case CALL_BUSY:               handleCallBusy();                                                          break;
       case UNTRUSTED_IDENTITY:      handleUntrustedIdentity(event);                                            break;
     }
 
-    callScreen.setLocalRenderer(event.getLocalRenderer());
-    callScreen.setRemoteRenderer(event.getRemoteRenderer());
-
-    boolean enableVideo = event.getLocalCameraState().getCameraCount() > 0 && enableVideoIfAvailable;
+    boolean enableVideo = event.getLocalParticipant().getCameraState().getCameraCount() > 0 && enableVideoIfAvailable;
 
     viewModel.updateFromWebRtcViewModel(event, enableVideo);
 
@@ -530,6 +512,24 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
 
   private final class ControlsListener implements WebRtcCallView.ControlsListener {
 
+    @Override
+    public void onStartCall(boolean isVideoCall) {
+      enableVideoIfAvailable = isVideoCall;
+
+      Intent intent = new Intent(WebRtcCallActivity.this, WebRtcCallService.class);
+      intent.setAction(WebRtcCallService.ACTION_OUTGOING_CALL)
+            .putExtra(WebRtcCallService.EXTRA_REMOTE_PEER, new RemotePeer(viewModel.getRecipient().getId()))
+            .putExtra(WebRtcCallService.EXTRA_OFFER_TYPE, (isVideoCall ? OfferMessage.Type.VIDEO_CALL : OfferMessage.Type.AUDIO_CALL).getCode());
+      startService(intent);
+
+      MessageSender.onMessageSent();
+    }
+
+    @Override
+    public void onCancelStartCall() {
+      finish();
+    }
+
     @Override
     public void onControlsFadeOut() {
       if (videoTooltip != null) {
@@ -594,8 +594,13 @@ public class WebRtcCallActivity extends AppCompatActivity implements SafetyNumbe
     }
 
     @Override
-    public void onDownCaretPressed() {
+    public void onShowParticipantsList() {
+      CallParticipantsListDialog.show(getSupportFragmentManager());
+    }
 
+    @Override
+    public void onPageChanged(@NonNull CallParticipantsState.SelectedPage page) {
+      viewModel.setIsViewingFocusedParticipant(page);
     }
   }
 

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

@@ -0,0 +1,50 @@
+package org.thoughtcrime.securesms.animation;
+
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.view.animation.Transformation;
+
+import androidx.annotation.NonNull;
+
+public class ResizeAnimation extends Animation {
+
+  private final View target;
+  private final int  targetWidthPx;
+  private final int  targetHeightPx;
+
+  private int startWidth;
+  private int startHeight;
+
+  public ResizeAnimation(@NonNull View target, int targetWidthPx, int targetHeightPx) {
+    this.target         = target;
+    this.targetWidthPx  = targetWidthPx;
+    this.targetHeightPx = targetHeightPx;
+  }
+
+  @Override
+  protected void applyTransformation(float interpolatedTime, Transformation t) {
+    int newWidth  = (int) (startWidth + (targetWidthPx - startWidth) * interpolatedTime);
+    int newHeight = (int) (startHeight + (targetHeightPx - startHeight) * interpolatedTime);
+
+    ViewGroup.LayoutParams params = target.getLayoutParams();
+
+    params.width  = newWidth;
+    params.height = newHeight;
+
+    target.setLayoutParams(params);
+  }
+
+  @Override
+  public void initialize(int width, int height, int parentWidth, int parentHeight) {
+    super.initialize(width, height, parentWidth, parentHeight);
+
+    this.startWidth  = width;
+    this.startHeight = height;
+  }
+
+  @Override
+  public boolean willChangeBounds() {
+    return true;
+  }
+}

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

@@ -106,10 +106,7 @@ public abstract class Attachment {
   }
 
   @Nullable
-  public abstract Uri getDataUri();
-
-  @Nullable
-  public abstract Uri getThumbnailUri();
+  public abstract Uri getUri();
 
   public int getTransferState() {
     return transferState;

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

@@ -57,7 +57,7 @@ public class DatabaseAttachment extends Attachment {
 
   @Override
   @Nullable
-  public Uri getDataUri() {
+  public Uri getUri() {
     if (hasData) {
       return PartAuthority.getAttachmentDataUri(attachmentId);
     } else {
@@ -65,16 +65,6 @@ public class DatabaseAttachment extends Attachment {
     }
   }
 
-  @Override
-  @Nullable
-  public Uri getThumbnailUri() {
-    if (hasThumbnail) {
-      return PartAuthority.getAttachmentThumbnailUri(attachmentId);
-    } else {
-      return null;
-    }
-  }
-
   public AttachmentId getAttachmentId() {
     return attachmentId;
   }

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

@@ -15,13 +15,7 @@ public class MmsNotificationAttachment extends Attachment {
 
   @Nullable
   @Override
-  public Uri getDataUri() {
-    return null;
-  }
-
-  @Nullable
-  @Override
-  public Uri getThumbnailUri() {
+  public Uri getUri() {
     return null;
   }
 

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

@@ -42,17 +42,10 @@ public class PointerAttachment extends Attachment {
 
   @Nullable
   @Override
-  public Uri getDataUri() {
+  public Uri getUri() {
     return null;
   }
 
-  @Nullable
-  @Override
-  public Uri getThumbnailUri() {
-    return null;
-  }
-
-
   public static List<Attachment> forPointers(Optional<List<SignalServiceAttachment>> pointers) {
     List<Attachment> results = new LinkedList<>();
 

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

@@ -20,12 +20,7 @@ public class TombstoneAttachment extends Attachment {
   }
 
   @Override
-  public @Nullable Uri getDataUri() {
-    return null;
-  }
-
-  @Override
-  public @Nullable Uri getThumbnailUri() {
+  public @Nullable Uri getUri() {
     return null;
   }
 }

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

@@ -13,7 +13,6 @@ import org.thoughtcrime.securesms.stickers.StickerLocator;
 public class UriAttachment extends Attachment {
 
   private final @NonNull  Uri dataUri;
-  private final @Nullable Uri thumbnailUri;
 
   public UriAttachment(@NonNull Uri uri,
                        @NonNull String contentType,
@@ -29,11 +28,10 @@ public class UriAttachment extends Attachment {
                        @Nullable AudioHash audioHash,
                        @Nullable TransformProperties transformProperties)
   {
-    this(uri, uri, contentType, transferState, size, 0, 0, fileName, null, voiceNote, borderless, quote, caption, stickerLocator, blurHash, audioHash, transformProperties);
+    this(uri, contentType, transferState, size, 0, 0, fileName, null, voiceNote, borderless, quote, caption, stickerLocator, blurHash, audioHash, transformProperties);
   }
 
   public UriAttachment(@NonNull Uri dataUri,
-                       @Nullable Uri thumbnailUri,
                        @NonNull String contentType,
                        int transferState,
                        long size,
@@ -51,22 +49,15 @@ public class UriAttachment extends Attachment {
                        @Nullable TransformProperties transformProperties)
   {
     super(contentType, transferState, size, fileName, 0, null, null, null, null, fastPreflightId, voiceNote, borderless, width, height, quote, 0, caption, stickerLocator, blurHash, audioHash, transformProperties);
-    this.dataUri      = dataUri;
-    this.thumbnailUri = thumbnailUri;
+    this.dataUri = dataUri;
   }
 
   @Override
   @NonNull
-  public Uri getDataUri() {
+  public Uri getUri() {
     return dataUri;
   }
 
-  @Override
-  @Nullable
-  public Uri getThumbnailUri() {
-    return thumbnailUri;
-  }
-
   @Override
   public boolean equals(Object other) {
     return other != null && other instanceof UriAttachment && ((UriAttachment) other).dataUri.equals(this.dataUri);

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

@@ -41,6 +41,7 @@ public class BackupDialog {
         CheckBox confirmationCheckBox = dialog.findViewById(R.id.confirmation_check);
         if (confirmationCheckBox.isChecked()) {
           BackupPassphrase.set(context, Util.join(password, " "));
+          TextSecurePreferences.setNextBackupTime(context, 0);
           TextSecurePreferences.setBackupEnabled(context, true);
           LocalBackupListener.schedule(context);
 

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

@@ -138,13 +138,11 @@ public class FullBackupImporter extends FullBackupBase {
       inputStream.readAttachmentTo(output.second, attachment.getLength());
 
       contentValues.put(AttachmentDatabase.DATA, dataFile.getAbsolutePath());
-      contentValues.put(AttachmentDatabase.THUMBNAIL, (String)null);
       contentValues.put(AttachmentDatabase.DATA_RANDOM, output.first);
     } catch (BadMacException e) {
       Log.w(TAG, "Bad MAC for attachment " + attachment.getAttachmentId() + "! Can't restore it.", e);
       dataFile.delete();
       contentValues.put(AttachmentDatabase.DATA, (String) null);
-      contentValues.put(AttachmentDatabase.THUMBNAIL, (String) null);
       contentValues.put(AttachmentDatabase.DATA_RANDOM, (String) null);
     }
 

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

@@ -54,7 +54,7 @@ public class BorderlessImageView extends FrameLayout {
   }
 
   public void setSlide(@NonNull GlideRequests glideRequests, @NonNull Slide slide) {
-    boolean showControls = slide.asAttachment().getDataUri() == null;
+    boolean showControls = slide.asAttachment().getUri() == null;
 
     if (slide.hasSticker()) {
       image.setFit(new CenterInside());

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

@@ -46,7 +46,8 @@ import static org.thoughtcrime.securesms.database.MentionUtil.MENTION_STARTER;
 
 public class ComposeText extends EmojiEditText {
 
-  private CharSequence            combinedHint;
+  private CharSequence            hint;
+  private SpannableString         subHint;
   private MentionRendererDelegate mentionRendererDelegate;
   private MentionValidatorWatcher mentionValidatorWatcher;
 
@@ -84,8 +85,14 @@ public class ComposeText extends EmojiEditText {
   protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
     super.onLayout(changed, left, top, right, bottom);
 
-    if (!TextUtils.isEmpty(combinedHint)) {
-      setHint(combinedHint);
+    if (!TextUtils.isEmpty(hint)) {
+      if (!TextUtils.isEmpty(subHint)) {
+        setHint(new SpannableStringBuilder().append(ellipsizeToWidth(hint))
+                                            .append("\n")
+                                            .append(ellipsizeToWidth(subHint)));
+      } else {
+        setHint(ellipsizeToWidth(hint));
+      }
     }
   }
 
@@ -143,18 +150,24 @@ public class ComposeText extends EmojiEditText {
   }
 
   public void setHint(@NonNull String hint, @Nullable CharSequence subHint) {
-    if (subHint != null) {
-      Spannable subHintSpannable = new SpannableString(subHint);
-      subHintSpannable.setSpan(new RelativeSizeSpan(0.5f), 0, subHintSpannable.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+    this.hint = hint;
 
-      combinedHint = new SpannableStringBuilder().append(ellipsizeToWidth(hint))
-                                                 .append("\n")
-                                                 .append(ellipsizeToWidth(subHintSpannable));
+    if (subHint != null) {
+      this.subHint = new SpannableString(subHint);
+      this.subHint.setSpan(new RelativeSizeSpan(0.5f), 0, subHint.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
     } else {
-      combinedHint = ellipsizeToWidth(hint);
+      this.subHint = null;
     }
 
-    super.setHint(combinedHint);
+    if (this.subHint != null) {
+      super.setHint(new SpannableStringBuilder().append(ellipsizeToWidth(this.hint))
+                                                .append("\n")
+                                                .append(ellipsizeToWidth(this.subHint)));
+    } else {
+      super.setHint(ellipsizeToWidth(this.hint));
+    }
+
+    super.setHint(hint);
   }
 
   public void appendInvite(String invite) {

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

@@ -0,0 +1,51 @@
+package org.thoughtcrime.securesms.components;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.DialogFragment;
+
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.util.ThemeUtil;
+
+/**
+ * Base dialog fragment for rendering as a full screen dialog with animation
+ * transitions.
+ */
+public abstract class FullScreenDialogFragment extends DialogFragment {
+
+  protected Toolbar toolbar;
+
+  @Override
+  public void onCreate(@Nullable Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    
+    setStyle(STYLE_NO_FRAME, ThemeUtil.isDarkTheme(requireActivity()) ? R.style.TextSecure_DarkTheme_FullScreenDialog
+                                                                      : R.style.TextSecure_LightTheme_FullScreenDialog);
+  }
+
+  @Override
+  public @NonNull View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    View view = inflater.inflate(R.layout.full_screen_dialog_fragment, container, false);
+    inflater.inflate(getDialogLayoutResource(), view.findViewById(R.id.full_screen_dialog_content), true);
+    toolbar = view.findViewById(R.id.full_screen_dialog_toolbar);
+    toolbar.setTitle(getTitle());
+    toolbar.setNavigationOnClickListener(v -> onNavigateUp());
+    return view;
+  }
+
+  protected void onNavigateUp() {
+    dismissAllowingStateLoss();
+  }
+
+  protected abstract @StringRes int getTitle();
+
+  protected abstract @LayoutRes int getDialogLayoutResource();
+}

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

@@ -242,14 +242,14 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
     if (!viewOnceSlides.isEmpty()) {
       thumbnailView.setVisibility(GONE);
       attachmentContainerView.setVisibility(GONE);
-    } else if (!imageVideoSlides.isEmpty() && imageVideoSlides.get(0).getThumbnailUri() != null) {
+    } else if (!imageVideoSlides.isEmpty() && imageVideoSlides.get(0).getUri() != null) {
       thumbnailView.setVisibility(VISIBLE);
       attachmentContainerView.setVisibility(GONE);
       dismissView.setBackgroundResource(R.drawable.dismiss_background);
       if (imageVideoSlides.get(0).hasVideo()) {
         attachmentVideoOverlayView.setVisibility(VISIBLE);
       }
-      glideRequests.load(new DecryptableUri(imageVideoSlides.get(0).getThumbnailUri()))
+      glideRequests.load(new DecryptableUri(imageVideoSlides.get(0).getUri()))
                    .centerCrop()
                    .override(getContext().getResources().getDimensionPixelSize(R.dimen.quote_thumb_size))
                    .diskCacheStrategy(DiskCacheStrategy.RESOURCE)

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

@@ -119,7 +119,7 @@ public class SharedContactView extends LinearLayout implements RecipientForeverO
     this.activeRecipients.clear();
 
     presentContact(contact);
-    presentAvatar(contact.getAvatarAttachment() != null ? contact.getAvatarAttachment().getDataUri() : null);
+    presentAvatar(contact.getAvatarAttachment() != null ? contact.getAvatarAttachment().getUri() : null);
     presentActionButtons(ContactUtil.getRecipients(getContext(), contact));
 
     for (LiveRecipient recipient : activeRecipients.values()) {

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

@@ -279,7 +279,7 @@ public class ThumbnailView extends FrameLayout {
       getTransferControls().setVisibility(View.GONE);
     }
 
-    if (slide.getThumbnailUri() != null && slide.hasPlayOverlay() &&
+    if (slide.getUri() != null && slide.hasPlayOverlay() &&
         (slide.getTransferState() == AttachmentDatabase.TRANSFER_PROGRESS_DONE || isPreview))
     {
       this.playOverlay.setVisibility(View.VISIBLE);
@@ -288,12 +288,12 @@ public class ThumbnailView extends FrameLayout {
     }
 
     if (Util.equals(slide, this.slide)) {
-      Log.i(TAG, "Not re-loading slide " + slide.asAttachment().getDataUri());
+      Log.i(TAG, "Not re-loading slide " + slide.asAttachment().getUri());
       return new SettableFuture<>(false);
     }
 
     if (this.slide != null && this.slide.getFastPreflightId() != null      &&
-        (!slide.hasVideo() || Util.equals(this.slide.getThumbnailUri(), slide.getThumbnailUri())) &&
+        (!slide.hasVideo() || Util.equals(this.slide.getUri(), slide.getUri())) &&
         Util.equals(this.slide.getFastPreflightId(), slide.getFastPreflightId()))
     {
       Log.i(TAG, "Not re-loading slide for fast preflight: " + slide.getFastPreflightId());
@@ -301,7 +301,7 @@ public class ThumbnailView extends FrameLayout {
       return new SettableFuture<>(false);
     }
 
-    Log.i(TAG, "loading part with id " + slide.asAttachment().getDataUri()
+    Log.i(TAG, "loading part with id " + slide.asAttachment().getUri()
                + ", progress " + slide.getTransferState() + ", fast preflight id: " +
                slide.asAttachment().getFastPreflightId());
 
@@ -327,7 +327,7 @@ public class ThumbnailView extends FrameLayout {
       blurhash.setImageDrawable(null);
     }
 
-    if (slide.getThumbnailUri() != null) {
+    if (slide.getUri() != null) {
       if (!MediaUtil.isJpegType(slide.getContentType()) && !MediaUtil.isVideoType(slide.getContentType())) {
         SettableFuture<Boolean> thumbnailFuture = new SettableFuture<>();
         thumbnailFuture.deferTo(result);
@@ -412,7 +412,7 @@ public class ThumbnailView extends FrameLayout {
   }
 
   private GlideRequest buildThumbnailGlideRequest(@NonNull GlideRequests glideRequests, @NonNull Slide slide) {
-    GlideRequest request = applySizing(glideRequests.load(new DecryptableUri(slide.getThumbnailUri()))
+    GlideRequest request = applySizing(glideRequests.load(new DecryptableUri(slide.getUri()))
                                           .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
                                           .transition(withCrossFade()), fit);
 
@@ -469,10 +469,10 @@ public class ThumbnailView extends FrameLayout {
   private class ThumbnailClickDispatcher implements View.OnClickListener {
     @Override
     public void onClick(View view) {
-      if (thumbnailClickListener            != null &&
-          slide                             != null &&
-          slide.asAttachment().getDataUri() != null &&
-          slide.getTransferState()          == AttachmentDatabase.TRANSFER_PROGRESS_DONE)
+      if (thumbnailClickListener        != null &&
+          slide                         != null &&
+          slide.asAttachment().getUri() != null &&
+          slide.getTransferState()      == AttachmentDatabase.TRANSFER_PROGRESS_DONE)
       {
         thumbnailClickListener.onClick(view, slide);
       } else if (parentClickListener != null) {

app/src/main/java/org/thoughtcrime/securesms/components/reminder/ExpiredBuildReminder.java

@@ -2,16 +2,25 @@ package org.thoughtcrime.securesms.components.reminder;
 
 import android.content.Context;
 
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.util.PlayStoreUtil;
-import org.thoughtcrime.securesms.util.Util;
+import androidx.annotation.NonNull;
 
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
+import org.thoughtcrime.securesms.util.PlayStoreUtil;
+
+import java.util.List;
+
+/**
+ * Showed when a build has fully expired (either via the compile-time constant, or remote
+ * deprecation).
+ */
 public class ExpiredBuildReminder extends Reminder {
 
   public ExpiredBuildReminder(final Context context) {
-    super(context.getString(R.string.reminder_header_expired_build),
-          context.getString(R.string.reminder_header_expired_build_details));
+    super(null, context.getString(R.string.ExpiredBuildReminder_this_version_of_signal_has_expired));
+
     setOkListener(v -> PlayStoreUtil.openPlayStoreOrOurApkDownloadPage(context));
+    addAction(new Action(context.getString(R.string.ExpiredBuildReminder_update_now), R.id.reminder_action_update_now));
   }
 
   @Override
@@ -19,8 +28,17 @@ public class ExpiredBuildReminder extends Reminder {
     return false;
   }
 
-  public static boolean isEligible() {
-    return Util.getDaysTillBuildExpiry() <= 0;
+  @Override
+  public List<Action> getActions() {
+    return super.getActions();
   }
 
+  @Override
+  public @NonNull Importance getImportance() {
+    return Importance.TERMINAL;
+  }
+
+  public static boolean isEligible() {
+    return SignalStore.misc().isClientDeprecated();
+  }
 }

app/src/main/java/org/thoughtcrime/securesms/components/reminder/OutdatedBuildReminder.java

@@ -6,20 +6,29 @@ import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.util.PlayStoreUtil;
 import org.thoughtcrime.securesms.util.Util;
 
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Reminder that is shown when a build is getting close to expiry (either because of the
+ * compile-time constant, or remote deprecation).
+ */
 public class OutdatedBuildReminder extends Reminder {
 
   public OutdatedBuildReminder(final Context context) {
-    super(context.getString(R.string.reminder_header_outdated_build),
-          getPluralsText(context));
+    super(null, getPluralsText(context));
+
     setOkListener(v -> PlayStoreUtil.openPlayStoreOrOurApkDownloadPage(context));
+    addAction(new Action(context.getString(R.string.OutdatedBuildReminder_update_now), R.id.reminder_action_update_now));
   }
 
   private static CharSequence getPluralsText(final Context context) {
-    int days = Util.getDaysTillBuildExpiry() - 1;
+    int days = getDaysUntilExpiry() - 1;
+
     if (days == 0) {
-      return context.getString(R.string.reminder_header_outdated_build_details_today);
+      return context.getString(R.string.OutdatedBuildReminder_your_version_of_signal_will_expire_today);
+    } else {
+      return context.getResources().getQuantityString(R.plurals.OutdatedBuildReminder_your_version_of_signal_will_expire_in_n_days, days, days);
     }
-    return context.getResources().getQuantityString(R.plurals.reminder_header_outdated_build_details, days, days);
   }
 
   @Override
@@ -28,7 +37,10 @@ public class OutdatedBuildReminder extends Reminder {
   }
 
   public static boolean isEligible() {
-    return Util.getDaysTillBuildExpiry() <= 10;
+    return getDaysUntilExpiry() <= 10;
   }
 
+  private static int getDaysUntilExpiry() {
+    return (int) TimeUnit.MILLISECONDS.toDays(Util.getTimeUntilBuildExpiry());
+  }
 }

app/src/main/java/org/thoughtcrime/securesms/components/reminder/Reminder.java

@@ -58,7 +58,7 @@ public abstract class Reminder {
     return Importance.NORMAL;
   }
 
-  public void addAction(@NonNull Action action) {
+  protected void addAction(@NonNull Action action) {
     actions.add(action);
   }
 
@@ -71,7 +71,7 @@ public abstract class Reminder {
   }
 
   public enum Importance {
-    NORMAL, ERROR
+    NORMAL, ERROR, TERMINAL
   }
 
   public final class Action {

app/src/main/java/org/thoughtcrime/securesms/components/reminder/ReminderView.java

@@ -1,8 +1,6 @@
 package org.thoughtcrime.securesms.components.reminder;
 
-import android.annotation.TargetApi;
 import android.content.Context;
-import android.os.Build.VERSION_CODES;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
@@ -19,7 +17,6 @@ import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.util.ViewUtil;
 
 import java.util.List;
 
@@ -48,7 +45,6 @@ public final class ReminderView extends FrameLayout {
     initialize();
   }
 
-  @TargetApi(VERSION_CODES.HONEYCOMB)
   public ReminderView(Context context, AttributeSet attrs, int defStyleAttr) {
     super(context, attrs, defStyleAttr);
     initialize();
@@ -56,14 +52,14 @@ public final class ReminderView extends FrameLayout {
 
   private void initialize() {
     LayoutInflater.from(getContext()).inflate(R.layout.reminder_header, this, true);
-    progressBar     = ViewUtil.findById(this, R.id.reminder_progress);
-    progressText    = ViewUtil.findById(this, R.id.reminder_progress_text);
-    container       = ViewUtil.findById(this, R.id.container);
-    closeButton     = ViewUtil.findById(this, R.id.cancel);
-    title           = ViewUtil.findById(this, R.id.reminder_title);
-    text            = ViewUtil.findById(this, R.id.reminder_text);
-    space           = ViewUtil.findById(this, R.id.reminder_space);
-    actionsRecycler = ViewUtil.findById(this, R.id.reminder_actions);
+    progressBar     = findViewById(R.id.reminder_progress);
+    progressText    = findViewById(R.id.reminder_progress_text);
+    container       = findViewById(R.id.container);
+    closeButton     = findViewById(R.id.cancel);
+    title           = findViewById(R.id.reminder_title);
+    text            = findViewById(R.id.reminder_text);
+    space           = findViewById(R.id.reminder_space);
+    actionsRecycler = findViewById(R.id.reminder_actions);
   }
 
   public void showReminder(final Reminder reminder) {
@@ -76,9 +72,26 @@ public final class ReminderView extends FrameLayout {
       title.setVisibility(GONE);
       space.setVisibility(VISIBLE);
     }
+
+    if (!reminder.isDismissable()) {
+      space.setVisibility(GONE);
+    }
+
     text.setText(reminder.getText());
-    container.setBackgroundResource(reminder.getImportance() == Reminder.Importance.ERROR ? R.drawable.reminder_background_error
-                                                                                          : R.drawable.reminder_background_normal);
+
+    switch (reminder.getImportance()) {
+      case NORMAL:
+        container.setBackgroundResource(R.drawable.reminder_background_normal);
+        break;
+      case ERROR:
+        container.setBackgroundResource(R.drawable.reminder_background_error);
+        break;
+      case TERMINAL:
+        container.setBackgroundResource(R.drawable.reminder_background_terminal);
+        break;
+      default:
+        throw new IllegalStateException();
+    }
 
     setOnClickListener(reminder.getOkListener());
 

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

@@ -0,0 +1,43 @@
+package org.thoughtcrime.securesms.components.webrtc;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.webrtc.EglBase;
+import org.webrtc.VideoFrame;
+import org.webrtc.VideoSink;
+
+import java.lang.ref.WeakReference;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.WeakHashMap;
+
+public class BroadcastVideoSink implements VideoSink {
+
+  private final EglBase                         eglBase;
+  private final WeakHashMap<VideoSink, Boolean> sinks;
+
+  public BroadcastVideoSink(@Nullable EglBase eglBase) {
+    this.eglBase = eglBase;
+    this.sinks   = new WeakHashMap<>();
+  }
+
+  public @Nullable EglBase getEglBase() {
+    return eglBase;
+  }
+
+  public void addSink(@NonNull VideoSink sink) {
+    sinks.put(sink, true);
+  }
+
+  public void removeSink(@NonNull VideoSink sink) {
+    sinks.remove(sink);
+  }
+
+  @Override
+  public void onFrame(@NonNull VideoFrame videoFrame) {
+    for (VideoSink sink : sinks.keySet()) {
+      sink.onFrame(videoFrame);
+    }
+  }
+}

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

@@ -0,0 +1,115 @@
+package org.thoughtcrime.securesms.components.webrtc;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;
+
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+
+import org.thoughtcrime.securesms.R;
+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.events.CallParticipant;
+import org.thoughtcrime.securesms.mms.GlideApp;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.util.AvatarUtil;
+
+import java.util.Objects;
+
+/**
+ * Encapsulates views needed to show a call participant including their
+ * avatar in full screen or pip mode, and their video feed.
+ */
+public class CallParticipantView extends ConstraintLayout {
+
+  private static final FallbackPhotoProvider FALLBACK_PHOTO_PROVIDER = new FallbackPhotoProvider();
+
+  private RecipientId         recipientId;
+  private AvatarImageView     avatar;
+  private TextureViewRenderer renderer;
+  private ImageView           pipAvatar;
+  private ContactPhoto        contactPhoto;
+
+  public CallParticipantView(@NonNull Context context) {
+    super(context);
+    onFinishInflate();
+  }
+
+  public CallParticipantView(@NonNull Context context, @Nullable AttributeSet attrs) {
+    super(context, attrs);
+  }
+
+  public CallParticipantView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+    super(context, attrs, defStyleAttr);
+  }
+
+  @Override
+  protected void onFinishInflate() {
+    super.onFinishInflate();
+    avatar    = findViewById(R.id.call_participant_item_avatar);
+    pipAvatar = findViewById(R.id.call_participant_item_pip_avatar);
+    renderer  = findViewById(R.id.call_participant_renderer);
+
+    avatar.setFallbackPhotoProvider(FALLBACK_PHOTO_PROVIDER);
+  }
+
+  void setCallParticipant(@NonNull CallParticipant participant) {
+    boolean participantChanged = recipientId == null || !recipientId.equals(participant.getRecipient().getId());
+    recipientId = participant.getRecipient().getId();
+
+    renderer.setVisibility(participant.isVideoEnabled() ? View.VISIBLE : View.GONE);
+
+    if (participant.isVideoEnabled()) {
+      if (participant.getVideoSink().getEglBase() != null) {
+        renderer.init(participant.getVideoSink().getEglBase());
+      }
+      renderer.attachBroadcastVideoSink(participant.getVideoSink());
+    } else {
+      renderer.attachBroadcastVideoSink(null);
+    }
+
+    if (participantChanged || !Objects.equals(contactPhoto, participant.getRecipient().getContactPhoto())) {
+      avatar.setAvatar(participant.getRecipient());
+      AvatarUtil.loadBlurredIconIntoViewBackground(participant.getRecipient(), this);
+      setPipAvatar(participant.getRecipient());
+      contactPhoto = participant.getRecipient().getContactPhoto();
+    }
+  }
+
+  void setRenderInPip(boolean shouldRenderInPip) {
+    avatar.setVisibility(shouldRenderInPip ? View.GONE : View.VISIBLE);
+    pipAvatar.setVisibility(shouldRenderInPip ? View.VISIBLE : View.GONE);
+  }
+
+  private void setPipAvatar(@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(pipAvatar);
+
+    pipAvatar.setScaleType(contactPhoto == null ? ImageView.ScaleType.CENTER_INSIDE : ImageView.ScaleType.CENTER_CROP);
+    pipAvatar.setBackgroundColor(recipient.getColor().toActionBarColor(getContext()));
+  }
+
+  private static final class FallbackPhotoProvider extends Recipient.FallbackPhotoProvider {
+    @Override
+    public @NonNull FallbackContactPhoto getPhotoForRecipientWithoutName() {
+      ResourceContactPhoto photo = new ResourceContactPhoto(R.drawable.ic_profile_outline_120);
+      photo.setScaleType(ImageView.ScaleType.CENTER_CROP);
+      return photo;
+    }
+  }
+}

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

@@ -0,0 +1,104 @@
+package org.thoughtcrime.securesms.components.webrtc;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.google.android.flexbox.AlignItems;
+import com.google.android.flexbox.FlexboxLayout;
+
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.events.CallParticipant;
+import org.thoughtcrime.securesms.util.Util;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Can dynamically render a collection of call participants, adjusting their
+ * sizing and layout depending on the total number of participants.
+ */
+public class CallParticipantsLayout extends FlexboxLayout {
+
+  private List<CallParticipant> callParticipants = Collections.emptyList();
+  private boolean               shouldRenderInPip;
+
+  public CallParticipantsLayout(@NonNull Context context) {
+    super(context);
+  }
+
+  public CallParticipantsLayout(@NonNull Context context, @Nullable AttributeSet attrs) {
+    super(context, attrs);
+  }
+
+  public CallParticipantsLayout(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+    super(context, attrs, defStyleAttr);
+  }
+
+  void update(@NonNull List<CallParticipant> callParticipants, boolean shouldRenderInPip) {
+    this.callParticipants  = callParticipants;
+    this.shouldRenderInPip = shouldRenderInPip;
+    updateLayout();
+  }
+
+  private void updateLayout() {
+    if (shouldRenderInPip && Util.hasItems(callParticipants)) {
+      updateChildrenCount(1);
+      update(0, callParticipants.get(0));
+    } else {
+      int count = callParticipants.size();
+      updateChildrenCount(count);
+
+      for (int i = 0; i < callParticipants.size(); i++) {
+        update(i, callParticipants.get(i));
+      }
+    }
+  }
+
+  private void updateChildrenCount(int count) {
+    int childCount = getChildCount();
+    if (childCount < count) {
+      for (int i = childCount; i < count; i++) {
+        addCallParticipantView();
+      }
+    } else if (childCount > count) {
+      for (int i = count; i < childCount; i++) {
+        removeViewAt(count);
+      }
+    }
+  }
+
+  private void update(int index, @NonNull CallParticipant participant) {
+    CallParticipantView callParticipantView = (CallParticipantView) getChildAt(index);
+    callParticipantView.setCallParticipant(participant);
+    callParticipantView.setRenderInPip(shouldRenderInPip);
+    setChildLayoutParams(callParticipantView, index, getChildCount());
+  }
+
+  private void addCallParticipantView() {
+    View                       view   = LayoutInflater.from(getContext()).inflate(R.layout.call_participant_item, this, false);
+    FlexboxLayout.LayoutParams params = (FlexboxLayout.LayoutParams) view.getLayoutParams();
+
+    params.setAlignSelf(AlignItems.STRETCH);
+    view.setLayoutParams(params);
+    addView(view);
+  }
+
+  private void setChildLayoutParams(@NonNull View child, int childPosition, int childCount) {
+    FlexboxLayout.LayoutParams params = (FlexboxLayout.LayoutParams) child.getLayoutParams();
+    if (childCount < 3) {
+      params.setFlexBasisPercent(1f);
+    } else {
+      if ((childCount % 2) != 0 && childPosition == childCount - 1) {
+        params.setFlexBasisPercent(1f);
+      } else {
+        params.setFlexBasisPercent(0.5f);
+      }
+    }
+    child.setLayoutParams(params);
+  }
+}

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

@@ -0,0 +1,215 @@
+package org.thoughtcrime.securesms.components.webrtc;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.thoughtcrime.securesms.events.CallParticipant;
+import org.thoughtcrime.securesms.events.WebRtcViewModel;
+import org.thoughtcrime.securesms.ringrtc.CameraState;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Represents the state of all participants, remote and local, combined with view state
+ * needed to properly render the participants. The view state primarily consists of
+ * if we are in System PIP mode and if we should show our video for an outgoing call.
+ */
+public final class CallParticipantsState {
+
+  private static final int SMALL_GROUP_MAX = 6;
+
+  public static final CallParticipantsState STARTING_STATE  = new CallParticipantsState(WebRtcViewModel.State.CALL_DISCONNECTED,
+                                                                                       Collections.emptyList(),
+                                                                                       CallParticipant.createLocal(CameraState.UNKNOWN, new BroadcastVideoSink(null), false),
+                                                                                       null,
+                                                                                       WebRtcLocalRenderState.GONE,
+                                                                                       false,
+                                                                                       false,
+                                                                                       false);
+
+  private final WebRtcViewModel.State  callState;
+  private final List<CallParticipant>  remoteParticipants;
+  private final CallParticipant        localParticipant;
+  private final CallParticipant        focusedParticipant;
+  private final WebRtcLocalRenderState localRenderState;
+  private final boolean                isInPipMode;
+  private final boolean                showVideoForOutgoing;
+  private final boolean                isViewingFocusedParticipant;
+
+  public CallParticipantsState(@NonNull WebRtcViewModel.State callState,
+                               @NonNull List<CallParticipant> remoteParticipants,
+                               @NonNull CallParticipant localParticipant,
+                               @Nullable CallParticipant focusedParticipant,
+                               @NonNull WebRtcLocalRenderState localRenderState,
+                               boolean isInPipMode,
+                               boolean showVideoForOutgoing,
+                               boolean isViewingFocusedParticipant)
+  {
+    this.callState                   = callState;
+    this.remoteParticipants          = remoteParticipants;
+    this.localParticipant            = localParticipant;
+    this.localRenderState            = localRenderState;
+    this.focusedParticipant          = focusedParticipant;
+    this.isInPipMode                 = isInPipMode;
+    this.showVideoForOutgoing        = showVideoForOutgoing;
+    this.isViewingFocusedParticipant = isViewingFocusedParticipant;
+  }
+
+  public @NonNull WebRtcViewModel.State getCallState() {
+    return callState;
+  }
+
+  public @NonNull List<CallParticipant> getGridParticipants() {
+    if (getAllRemoteParticipants().size() > SMALL_GROUP_MAX) {
+      return getAllRemoteParticipants().subList(0, SMALL_GROUP_MAX);
+    } else {
+      return getAllRemoteParticipants();
+    }
+  }
+
+  public @NonNull List<CallParticipant> getListParticipants() {
+    List<CallParticipant> listParticipants = new ArrayList<>();
+
+    if (isViewingFocusedParticipant && getAllRemoteParticipants().size() > 1) {
+      listParticipants.addAll(getAllRemoteParticipants().subList(1, getAllRemoteParticipants().size()));
+    } else if (getAllRemoteParticipants().size() > SMALL_GROUP_MAX) {
+      listParticipants.addAll(getAllRemoteParticipants().subList(SMALL_GROUP_MAX, getAllRemoteParticipants().size()));
+    } else {
+      return Collections.emptyList();
+    }
+
+    listParticipants.add(CallParticipant.EMPTY);
+
+    Collections.reverse(listParticipants);
+
+    return listParticipants;
+  }
+
+  public @NonNull List<CallParticipant> getAllRemoteParticipants() {
+    return remoteParticipants;
+  }
+
+  public @NonNull CallParticipant getLocalParticipant() {
+    return localParticipant;
+  }
+
+  public @Nullable CallParticipant getFocusedParticipant() {
+    return focusedParticipant;
+  }
+
+  public @NonNull WebRtcLocalRenderState getLocalRenderState() {
+    return localRenderState;
+  }
+
+  public boolean isLargeVideoGroup() {
+    return getAllRemoteParticipants().size() > SMALL_GROUP_MAX;
+  }
+
+  public boolean isInPipMode() {
+    return isInPipMode;
+  }
+
+  public static @NonNull CallParticipantsState update(@NonNull CallParticipantsState oldState,
+                                                      @NonNull WebRtcViewModel webRtcViewModel,
+                                                      boolean enableVideo)
+  {
+    boolean newShowVideoForOutgoing = oldState.showVideoForOutgoing;
+    if (enableVideo) {
+      newShowVideoForOutgoing = webRtcViewModel.getState() == WebRtcViewModel.State.CALL_OUTGOING;
+    } else if (webRtcViewModel.getState() != WebRtcViewModel.State.CALL_OUTGOING) {
+      newShowVideoForOutgoing = false;
+    }
+
+    WebRtcLocalRenderState localRenderState = determineLocalRenderMode(webRtcViewModel.getLocalParticipant(),
+                                                                       oldState.isInPipMode,
+                                                                       newShowVideoForOutgoing,
+                                                                       webRtcViewModel.getState(),
+                                                                       oldState.getAllRemoteParticipants().size(),
+                                                                       oldState.isViewingFocusedParticipant);
+
+    CallParticipant focused = oldState.remoteParticipants.isEmpty() ? null : oldState.remoteParticipants.get(0);
+
+    return new CallParticipantsState(webRtcViewModel.getState(),
+                                     webRtcViewModel.getRemoteParticipants(),
+                                     webRtcViewModel.getLocalParticipant(),
+                                     focused,
+                                     localRenderState,
+                                     oldState.isInPipMode,
+                                     newShowVideoForOutgoing,
+                                     oldState.isViewingFocusedParticipant);
+  }
+
+  public static @NonNull CallParticipantsState update(@NonNull CallParticipantsState oldState, boolean isInPip) {
+    WebRtcLocalRenderState localRenderState = determineLocalRenderMode(oldState.localParticipant,
+                                                                       isInPip,
+                                                                       oldState.showVideoForOutgoing,
+                                                                       oldState.callState,
+                                                                       oldState.getAllRemoteParticipants().size(),
+                                                                       oldState.isViewingFocusedParticipant);
+
+    CallParticipant focused = oldState.remoteParticipants.isEmpty() ? null : oldState.remoteParticipants.get(0);
+
+    return new CallParticipantsState(oldState.callState,
+                                     oldState.remoteParticipants,
+                                     oldState.localParticipant,
+                                     focused,
+                                     localRenderState,
+                                     isInPip,
+                                     oldState.showVideoForOutgoing,
+                                     oldState.isViewingFocusedParticipant);
+  }
+
+  public static @NonNull CallParticipantsState update(@NonNull CallParticipantsState oldState, @NonNull SelectedPage selectedPage) {
+    CallParticipant focused = oldState.remoteParticipants.isEmpty() ? null : oldState.remoteParticipants.get(0);
+
+    WebRtcLocalRenderState localRenderState = determineLocalRenderMode(oldState.localParticipant,
+                                                                       oldState.isInPipMode,
+                                                                       oldState.showVideoForOutgoing,
+                                                                       oldState.callState,
+                                                                       oldState.getAllRemoteParticipants().size(),
+                                                                       selectedPage == SelectedPage.FOCUSED);
+
+    return new CallParticipantsState(oldState.callState,
+                                     oldState.remoteParticipants,
+                                     oldState.localParticipant,
+                                     focused,
+                                     localRenderState,
+                                     oldState.isInPipMode,
+                                     oldState.showVideoForOutgoing,
+                                     selectedPage == SelectedPage.FOCUSED);
+  }
+
+  private static @NonNull WebRtcLocalRenderState determineLocalRenderMode(@NonNull CallParticipant localParticipant,
+                                                                          boolean isInPip,
+                                                                          boolean showVideoForOutgoing,
+                                                                          @NonNull WebRtcViewModel.State callState,
+                                                                          int numberOfRemoteParticipants,
+                                                                          boolean isViewingFocusedParticipant)
+  {
+    boolean                displayLocal     = !isInPip && localParticipant.isVideoEnabled();
+    WebRtcLocalRenderState localRenderState = WebRtcLocalRenderState.GONE;
+
+    if (displayLocal || showVideoForOutgoing) {
+      if (callState == WebRtcViewModel.State.CALL_CONNECTED) {
+        if (isViewingFocusedParticipant || numberOfRemoteParticipants > 3) {
+          localRenderState = WebRtcLocalRenderState.SMALL_SQUARE;
+        } else {
+          localRenderState = WebRtcLocalRenderState.SMALL_RECTANGLE;
+        }
+      } else if (callState != WebRtcViewModel.State.CALL_DISCONNECTED) {
+        localRenderState = WebRtcLocalRenderState.LARGE;
+      }
+    } else if (callState == WebRtcViewModel.State.CALL_PRE_JOIN) {
+      localRenderState = WebRtcLocalRenderState.LARGE_NO_VIDEO;
+    }
+
+    return localRenderState;
+  }
+
+  public enum SelectedPage {
+    GRID,
+    FOCUSED
+  }
+}

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

@@ -9,6 +9,7 @@ import android.view.VelocityTracker;
 import android.view.View;
 import android.view.ViewConfiguration;
 import android.view.ViewGroup;
+import android.view.animation.AccelerateDecelerateInterpolator;
 import android.view.animation.Interpolator;
 
 import androidx.annotation.NonNull;
@@ -16,21 +17,26 @@ 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;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Queue;
 
 public class PictureInPictureGestureHelper extends GestureDetector.SimpleOnGestureListener {
 
-  private static final float DECELERATION_RATE = 0.99f;
+  private static final float        DECELERATION_RATE   = 0.99f;
+  private static final Interpolator FLING_INTERPOLATOR  = new ViscousFluidInterpolator();
+  private static final Interpolator ADJUST_INTERPOLATOR = new AccelerateDecelerateInterpolator();
 
-  private final ViewGroup parent;
-  private final View      child;
-  private final int       framePadding;
-  private final int       pipWidth;
-  private final int       pipHeight;
+  private final ViewGroup       parent;
+  private final View            child;
+  private final int             framePadding;
+  private final Queue<Runnable> runAfterFling;
 
+  private int             pipWidth;
+  private int             pipHeight;
   private int             activePointerId = MotionEvent.INVALID_POINTER_ID;
   private float           lastTouchX;
   private float           lastTouchY;
@@ -42,6 +48,8 @@ public class PictureInPictureGestureHelper extends GestureDetector.SimpleOnGestu
   private double          projectionY;
   private VelocityTracker velocityTracker;
   private int             maximumFlingVelocity;
+  private boolean         isLockedToBottomEnd;
+  private Interpolator    interpolator;
 
   @SuppressLint("ClickableViewAccessibility")
   public static PictureInPictureGestureHelper applyTo(@NonNull View child) {
@@ -95,21 +103,19 @@ public class PictureInPictureGestureHelper extends GestureDetector.SimpleOnGestu
     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();
+    this.runAfterFling        = new LinkedList<>();
+    this.interpolator         = ADJUST_INTERPOLATOR;
   }
 
   public void clearVerticalBoundaries() {
-    setVerticalBoundaries(0, parent.getMeasuredHeight());
+    setVerticalBoundaries(parent.getTop(), parent.getMeasuredHeight() + parent.getTop());
   }
 
   public void setVerticalBoundaries(int topBoundary, int bottomBoundary) {
-    extraPaddingTop    = topBoundary;
-    extraPaddingBottom = parent.getMeasuredHeight() - bottomBoundary;
+    extraPaddingTop    = topBoundary - parent.getTop();
+    extraPaddingBottom = parent.getMeasuredHeight() + parent.getTop() - bottomBoundary;
 
-    if (isAnimating) {
-      fling();
-    } else if (!isDragging) {
-      onFling(null, null, 0, 0);
-    }
+    adjustPip();
   }
 
   private boolean onGestureFinished(MotionEvent e) {
@@ -123,12 +129,46 @@ public class PictureInPictureGestureHelper extends GestureDetector.SimpleOnGestu
     return false;
   }
 
+  public void adjustPip() {
+    pipWidth  = child.getMeasuredWidth();
+    pipHeight = child.getMeasuredHeight();
+
+    if (isAnimating) {
+      interpolator = ADJUST_INTERPOLATOR;
+
+      fling();
+    } else if (!isDragging) {
+      interpolator = ADJUST_INTERPOLATOR;
+
+      onFling(null, null, 0, 0);
+    }
+  }
+
+  public void lockToBottomEnd() {
+    isLockedToBottomEnd = true;
+  }
+
+  public void enableCorners() {
+    isLockedToBottomEnd = false;
+  }
+
+  public void performAfterFling(@NonNull Runnable runnable) {
+    if (isAnimating) {
+      runAfterFling.add(runnable);
+    } else {
+      runnable.run();
+    }
+  }
+
   @Override
   public boolean onDown(MotionEvent e) {
     activePointerId = e.getPointerId(0);
     lastTouchX      = e.getX(activePointerId) + child.getX();
     lastTouchY      = e.getY(activePointerId) + child.getY();
     isDragging      = true;
+    pipWidth        = child.getMeasuredWidth();
+    pipHeight       = child.getMeasuredHeight();
+    interpolator    = FLING_INTERPOLATOR;
 
     return true;
   }
@@ -167,6 +207,13 @@ public class PictureInPictureGestureHelper extends GestureDetector.SimpleOnGestu
     return true;
   }
 
+  @Override
+  public boolean onSingleTapUp(MotionEvent e) {
+    child.performClick();
+
+    return true;
+  }
+
   private void fling() {
     Point  projection            = new Point((int) projectionX, (int) projectionY);
     Point  nearestCornerPosition = findNearestCornerPosition(projection);
@@ -178,17 +225,30 @@ public class PictureInPictureGestureHelper extends GestureDetector.SimpleOnGestu
          .translationX(getTranslationXForPoint(nearestCornerPosition))
          .translationY(getTranslationYForPoint(nearestCornerPosition))
          .setDuration(250)
-         .setInterpolator(new ViscousFluidInterpolator())
+         .setInterpolator(interpolator)
          .setListener(new AnimationCompleteListener() {
            @Override
            public void onAnimationEnd(Animator animation) {
              isAnimating = false;
+
+             Iterator<Runnable> afterFlingRunnables = runAfterFling.iterator();
+             while (afterFlingRunnables.hasNext()) {
+               Runnable runnable = afterFlingRunnables.next();
+
+               runnable.run();
+               afterFlingRunnables.remove();
+             }
            }
          })
          .start();
   }
 
   private Point findNearestCornerPosition(Point projection) {
+    if (isLockedToBottomEnd) {
+      return parent.getLayoutDirection() == View.LAYOUT_DIRECTION_LTR ? calculateBottomRightCoordinates(parent)
+                                                                      : calculateBottomLeftCoordinates(parent);
+    }
+
     Point  maxPoint     = null;
     double maxDistance  = Double.MAX_VALUE;
 

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

@@ -36,6 +36,8 @@ public class TextureViewRenderer extends TextureView implements TextureView.Surf
   private boolean                       enableFixedSize;
   private int                           surfaceWidth;
   private int                           surfaceHeight;
+  private boolean                       isInitialized;
+  private BroadcastVideoSink            attachedVideoSink;
 
   public TextureViewRenderer(@NonNull Context context) {
     super(context);
@@ -49,8 +51,12 @@ public class TextureViewRenderer extends TextureView implements TextureView.Surf
     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 eglBase) {
+    if (isInitialized) return;
+
+    isInitialized = true;
+
+    this.init(eglBase.getEglBaseContext(), null, EglBase.CONFIG_PLAIN, new GlRectDrawer());
   }
 
   public void init(@NonNull EglBase.Context sharedContext, @NonNull RendererCommon.RendererEvents rendererEvents, @NonNull int[] configAttributes, @NonNull RendererCommon.GlDrawer drawer) {
@@ -63,6 +69,30 @@ public class TextureViewRenderer extends TextureView implements TextureView.Surf
     this.eglRenderer.init(sharedContext, this, configAttributes, drawer);
   }
 
+  public void attachBroadcastVideoSink(@Nullable BroadcastVideoSink videoSink) {
+    if (attachedVideoSink == videoSink) {
+      return;
+    }
+
+    if (attachedVideoSink != null) {
+      attachedVideoSink.removeSink(this);
+    }
+
+    if (videoSink != null) {
+      videoSink.addSink(this);
+    } else {
+      clearImage();
+    }
+
+    attachedVideoSink = videoSink;
+  }
+
+  @Override
+  protected void onDetachedFromWindow() {
+    super.onDetachedFromWindow();
+    release();
+  }
+
   public void release() {
     eglRenderer.release();
   }
@@ -125,6 +155,9 @@ public class TextureViewRenderer extends TextureView implements TextureView.Surf
   protected void onMeasure(int widthSpec, int heightSpec) {
     ThreadUtils.checkIsOnMainThread();
 
+    widthSpec  = MeasureSpec.makeMeasureSpec(resolveSizeAndState(0, widthSpec, 0), MeasureSpec.AT_MOST);
+    heightSpec = MeasureSpec.makeMeasureSpec(resolveSizeAndState(0, heightSpec, 0), MeasureSpec.AT_MOST);
+
     Point size = videoLayoutMeasure.measure(widthSpec, heightSpec, this.rotatedFrameWidth, this.rotatedFrameHeight);
 
     setMeasuredDimension(size.x, size.y);

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

@@ -0,0 +1,64 @@
+package org.thoughtcrime.securesms.components.webrtc;
+
+import androidx.annotation.NonNull;
+
+import org.thoughtcrime.securesms.events.CallParticipant;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+class WebRtcCallParticipantsPage {
+
+  private final List<CallParticipant> callParticipants;
+  private final boolean               isSpeaker;
+  private final boolean               isRenderInPip;
+  
+  static WebRtcCallParticipantsPage forMultipleParticipants(@NonNull List<CallParticipant> callParticipants,
+                                                            boolean isRenderInPip) 
+  {
+    return new WebRtcCallParticipantsPage(callParticipants, false, isRenderInPip);
+  }
+  
+  static WebRtcCallParticipantsPage forSingleParticipant(@NonNull CallParticipant singleParticipant,
+                                                         boolean isRenderInPip)
+  {
+    return new WebRtcCallParticipantsPage(Collections.singletonList(singleParticipant), true, isRenderInPip);
+  }
+
+  private WebRtcCallParticipantsPage(@NonNull List<CallParticipant> callParticipants,
+                                     boolean isSpeaker,
+                                     boolean isRenderInPip) 
+  {
+    this.callParticipants = callParticipants;
+    this.isSpeaker        = isSpeaker;
+    this.isRenderInPip    = isRenderInPip;
+  }
+
+  public @NonNull List<CallParticipant> getCallParticipants() {
+    return callParticipants;
+  }
+
+  public boolean isRenderInPip() {
+    return isRenderInPip;
+  }
+
+  public boolean isSpeaker() {
+    return isSpeaker;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    WebRtcCallParticipantsPage that = (WebRtcCallParticipantsPage) o;
+    return isSpeaker == that.isSpeaker &&
+        isRenderInPip == that.isRenderInPip &&
+        callParticipants.equals(that.callParticipants);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(callParticipants, isSpeaker);
+  }
+}

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

@@ -0,0 +1,127 @@
+package org.thoughtcrime.securesms.components.webrtc;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.ListAdapter;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.thoughtcrime.securesms.R;
+
+class WebRtcCallParticipantsPagerAdapter extends ListAdapter<WebRtcCallParticipantsPage, WebRtcCallParticipantsPagerAdapter.ViewHolder> {
+
+  private static final int VIEW_TYPE_MULTI  = 0;
+  private static final int VIEW_TYPE_SINGLE = 1;
+
+  private final Runnable onPageClicked;
+
+  WebRtcCallParticipantsPagerAdapter(@NonNull Runnable onPageClicked) {
+    super(new DiffCallback());
+    this.onPageClicked = onPageClicked;
+  }
+
+  @Override
+  public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
+    super.onAttachedToRecyclerView(recyclerView);
+    recyclerView.setOverScrollMode(View.OVER_SCROLL_NEVER);
+  }
+
+  @Override
+  public @NonNull ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+    final ViewHolder viewHolder;
+
+    switch (viewType) {
+      case VIEW_TYPE_SINGLE:
+        viewHolder = new SingleParticipantViewHolder((CallParticipantView) LayoutInflater.from(parent.getContext())
+            .inflate(R.layout.call_participant_item,
+                parent,
+                false));
+        break;
+      case VIEW_TYPE_MULTI:
+        viewHolder = new MultipleParticipantViewHolder((CallParticipantsLayout) LayoutInflater.from(parent.getContext())
+            .inflate(R.layout.webrtc_call_participants_layout,
+                parent,
+                false));
+        break;
+      default:
+        throw new IllegalArgumentException("Unsupported viewType: " + viewType);
+    }
+
+    viewHolder.itemView.setOnClickListener(unused -> onPageClicked.run());
+
+    return viewHolder;
+  }
+
+  @Override
+  public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
+    holder.bind(getItem(position));
+  }
+
+  @Override
+  public int getItemViewType(int position) {
+    return getItem(position).isSpeaker() ? VIEW_TYPE_SINGLE : VIEW_TYPE_MULTI;
+  }
+
+  static abstract class ViewHolder extends RecyclerView.ViewHolder {
+    public ViewHolder(@NonNull View itemView) {
+      super(itemView);
+    }
+
+    abstract void bind(WebRtcCallParticipantsPage page);
+  }
+
+  private static class MultipleParticipantViewHolder extends ViewHolder {
+
+    private final CallParticipantsLayout callParticipantsLayout;
+
+    private MultipleParticipantViewHolder(@NonNull CallParticipantsLayout callParticipantsLayout) {
+      super(callParticipantsLayout);
+      this.callParticipantsLayout = callParticipantsLayout;
+    }
+
+    @Override
+    void bind(WebRtcCallParticipantsPage page) {
+      callParticipantsLayout.update(page.getCallParticipants(), page.isRenderInPip());
+    }
+  }
+
+  private static class SingleParticipantViewHolder extends ViewHolder {
+
+    private final CallParticipantView callParticipantView;
+
+    private SingleParticipantViewHolder(CallParticipantView callParticipantView) {
+      super(callParticipantView);
+      this.callParticipantView = callParticipantView;
+
+      ViewGroup.LayoutParams params = callParticipantView.getLayoutParams();
+
+      params.height = ViewGroup.LayoutParams.MATCH_PARENT;
+      params.width  = ViewGroup.LayoutParams.MATCH_PARENT;
+
+      callParticipantView.setLayoutParams(params);
+    }
+
+
+    @Override
+    void bind(WebRtcCallParticipantsPage page) {
+      callParticipantView.setCallParticipant(page.getCallParticipants().get(0));
+      callParticipantView.setRenderInPip(page.isRenderInPip());
+    }
+  }
+
+  private static final class DiffCallback extends DiffUtil.ItemCallback<WebRtcCallParticipantsPage> {
+    @Override
+    public boolean areItemsTheSame(@NonNull WebRtcCallParticipantsPage oldItem, @NonNull WebRtcCallParticipantsPage newItem) {
+      return oldItem.isSpeaker() == newItem.isSpeaker();
+    }
+
+    @Override
+    public boolean areContentsTheSame(@NonNull WebRtcCallParticipantsPage oldItem, @NonNull WebRtcCallParticipantsPage newItem) {
+      return oldItem.equals(newItem);
+    }
+  }
+
+}

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

@@ -0,0 +1,79 @@
+package org.thoughtcrime.securesms.components.webrtc;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.ListAdapter;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.events.CallParticipant;
+
+class WebRtcCallParticipantsRecyclerAdapter extends ListAdapter<CallParticipant, WebRtcCallParticipantsRecyclerAdapter.ViewHolder> {
+
+  private static final int PARTICIPANT = 0;
+  private static final int EMPTY       = 1;
+
+  protected WebRtcCallParticipantsRecyclerAdapter() {
+    super(new DiffCallback());
+  }
+
+  @Override
+  public @NonNull ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+    if (viewType == PARTICIPANT) {
+      return new ParticipantViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.webrtc_call_participant_recycler_item, parent, false));
+    } else {
+      return new ViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.webrtc_call_participant_recycler_empty_item, parent, false));
+    }
+  }
+
+  @Override
+  public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
+    holder.bind(getItem(position));
+  }
+
+  @Override
+  public int getItemViewType(int position) {
+    return getItem(position) == CallParticipant.EMPTY ? EMPTY : PARTICIPANT;
+  }
+
+  static class ViewHolder extends RecyclerView.ViewHolder {
+    ViewHolder(@NonNull View itemView) {
+      super(itemView);
+    }
+
+    void bind(@NonNull CallParticipant callParticipant) {}
+  }
+
+  private static class ParticipantViewHolder extends ViewHolder {
+
+    private final CallParticipantView callParticipantView;
+
+    ParticipantViewHolder(@NonNull View itemView) {
+      super(itemView);
+      callParticipantView = itemView.findViewById(R.id.call_participant);
+    }
+
+    @Override
+    void bind(@NonNull CallParticipant callParticipant) {
+      callParticipantView.setCallParticipant(callParticipant);
+    }
+  }
+
+  private static class DiffCallback extends DiffUtil.ItemCallback<CallParticipant> {
+
+    @Override
+    public boolean areItemsTheSame(@NonNull CallParticipant oldItem, @NonNull CallParticipant newItem) {
+      return oldItem.getRecipient().equals(newItem.getRecipient());
+    }
+
+    @Override
+    public boolean areContentsTheSame(@NonNull CallParticipant oldItem, @NonNull CallParticipant newItem) {
+      return oldItem.equals(newItem);
+    }
+  }
+
+}

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

@@ -1,11 +1,13 @@
 package org.thoughtcrime.securesms.components.webrtc;
 
 import android.content.Context;
+import android.graphics.ColorMatrix;
+import android.graphics.ColorMatrixColorFilter;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewParent;
+import android.view.animation.Animation;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -13,67 +15,85 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.content.res.AppCompatResources;
+import androidx.appcompat.widget.Toolbar;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.ConstraintSet;
 import androidx.constraintlayout.widget.Guideline;
 import androidx.core.util.Consumer;
+import androidx.recyclerview.widget.RecyclerView;
 import androidx.transition.AutoTransition;
+import androidx.transition.ChangeBounds;
 import androidx.transition.Transition;
 import androidx.transition.TransitionManager;
+import androidx.transition.TransitionSet;
+import androidx.viewpager2.widget.MarginPageTransformer;
+import androidx.viewpager2.widget.ViewPager2;
 
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.load.resource.bitmap.CenterCrop;
 
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.animation.ResizeAnimation;
 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.contacts.avatars.ProfileContactPhoto;
+import org.thoughtcrime.securesms.events.CallParticipant;
+import org.thoughtcrime.securesms.mediasend.SimpleAnimationListener;
 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.BlurTransformation;
 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.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 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();
+  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;
 
-  public static final int FADE_OUT_DELAY = 5000;
+  public static final int FADE_OUT_DELAY      = 5000;
+  public static final int PIP_RESIZE_DURATION = 300;
+  public static final int CONTROLS_HEIGHT     = 98;
 
-  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 ViewGroup                     smallLocalRenderFrame;
+  private TextureViewRenderer           smallLocalRender;
+  private View                          largeLocalRenderFrame;
+  private TextureViewRenderer           largeLocalRender;
+  private View                          largeLocalRenderNoVideo;
+  private ImageView                     largeLocalRenderNoVideoAvatar;
   private TextView                      recipientName;
   private TextView                      status;
   private ConstraintLayout              parent;
-  private AvatarImageView               avatar;
-  private ImageView                     avatarCard;
+  private ConstraintLayout              participantsParent;
   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 View                          footerGradient;
+  private View                          startCallControls;
+  private ViewPager2                    callParticipantsPager;
+  private RecyclerView                  callParticipantsRecycler;
+  private Toolbar                       toolbar;
+  private int                           pagerBottomMarginDp;
+  private boolean                       controlsVisible = true;
+
+  private WebRtcCallParticipantsPagerAdapter    pagerAdapter;
+  private WebRtcCallParticipantsRecyclerAdapter recyclerAdapter;
 
   private final Set<View> incomingCallViews    = new HashSet<>();
   private final Set<View> topViews             = new HashSet<>();
@@ -82,7 +102,8 @@ public class WebRtcCallView extends FrameLayout {
 
   private       WebRtcControls controls        = WebRtcControls.NONE;
   private final Runnable       fadeOutRunnable = () -> {
-    if (isAttachedToWindow() && controls.isFadeOutEnabled()) fadeOutControls(); };
+    if (isAttachedToWindow() && controls.isFadeOutEnabled()) fadeOutControls();
+  };
 
   public WebRtcCallView(@NonNull Context context) {
     this(context, null);
@@ -99,42 +120,61 @@ public class WebRtcCallView extends FrameLayout {
   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);
+    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);
+    smallLocalRenderFrame         = findViewById(R.id.call_screen_pip);
+    smallLocalRender              = findViewById(R.id.call_screen_small_local_renderer);
+    largeLocalRenderFrame         = findViewById(R.id.call_screen_large_local_renderer_frame);
+    largeLocalRender              = findViewById(R.id.call_screen_large_local_renderer);
+    largeLocalRenderNoVideo       = findViewById(R.id.call_screen_large_local_video_off);
+    largeLocalRenderNoVideoAvatar = findViewById(R.id.call_screen_large_local_video_off_avatar);
+    recipientName                 = findViewById(R.id.call_screen_recipient_name);
+    status                        = findViewById(R.id.call_screen_status);
+    parent                        = findViewById(R.id.call_screen);
+    participantsParent            = findViewById(R.id.call_screen_participants_parent);
+    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);
+    footerGradient                = findViewById(R.id.call_screen_footer_gradient);
+    startCallControls             = findViewById(R.id.call_screen_start_call_controls);
+    callParticipantsPager         = findViewById(R.id.call_screen_participants_pager);
+    callParticipantsRecycler      = findViewById(R.id.call_screen_participants_recycler);
+    toolbar                       = findViewById(R.id.call_screen_toolbar);
 
     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);
     Guideline statusBarGuideline     = findViewById(R.id.call_screen_status_bar_guideline);
+    View      startCall              = findViewById(R.id.call_screen_start_call_start_call);
+    View      cancelStartCall        = findViewById(R.id.call_screen_start_call_cancel);
 
-    topViews.add(status);
+    callParticipantsPager.setPageTransformer(new MarginPageTransformer(ViewUtil.dpToPx(4)));
+
+    pagerAdapter    = new WebRtcCallParticipantsPagerAdapter(this::toggleControls);
+    recyclerAdapter = new WebRtcCallParticipantsRecyclerAdapter();
+
+    callParticipantsPager.setAdapter(pagerAdapter);
+    callParticipantsRecycler.setAdapter(recyclerAdapter);
+
+    callParticipantsPager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
+      @Override
+      public void onPageSelected(int position) {
+        runIfNonNull(controlsListener, listener -> listener.onPageChanged(position == 0 ? CallParticipantsState.SelectedPage.GRID : CallParticipantsState.SelectedPage.FOCUSED));
+      }
+    });
+
+    topViews.add(toolbar);
     topViews.add(topGradient);
-    topViews.add(recipientName);
 
     incomingCallViews.add(answer);
     incomingCallViews.add(answerLabel);
     incomingCallViews.add(decline);
     incomingCallViews.add(declineLabel);
-    incomingCallViews.add(incomingFooterGradient);
+    incomingCallViews.add(footerGradient);
 
     adjustableMarginsSet.add(micToggle);
     adjustableMarginsSet.add(cameraDirectionToggle);
@@ -158,15 +198,18 @@ public class WebRtcCallView extends FrameLayout {
     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(smallLocalRenderFrame);
 
-    pictureInPictureGestureHelper = PictureInPictureGestureHelper.applyTo(localRenderPipFrame);
+    startCall.setOnClickListener(v -> runIfNonNull(controlsListener, listener -> listener.onStartCall(videoToggle.isChecked())));
+    cancelStartCall.setOnClickListener(v -> runIfNonNull(controlsListener, ControlsListener::onCancelStartCall));
+
+    ColorMatrix greyScaleMatrix = new ColorMatrix();
+    greyScaleMatrix.setSaturation(0);
+    largeLocalRenderNoVideoAvatar.setAlpha(0.6f);
+    largeLocalRenderNoVideoAvatar.setColorFilter(new ColorMatrixColorFilter(greyScaleMatrix));
 
     int statusBarHeight = ViewUtil.getStatusBarHeight(this);
     statusBarGuideline.setGuidelineBegin(statusBarHeight);
@@ -195,67 +238,99 @@ public class WebRtcCallView extends FrameLayout {
     micToggle.setChecked(isMicEnabled, false);
   }
 
-  public void setRemoteVideoEnabled(boolean isRemoteVideoEnabled) {
-    if (isRemoteVideoEnabled) {
-      remoteRenderContainer.setVisibility(View.VISIBLE);
+  public void updateCallParticipants(@NonNull CallParticipantsState state) {
+    List<WebRtcCallParticipantsPage> pages = new ArrayList<>(2);
+
+    if (!state.getGridParticipants().isEmpty()) {
+      pages.add(WebRtcCallParticipantsPage.forMultipleParticipants(state.getGridParticipants(), state.isInPipMode()));
+    }
+
+    if (state.getFocusedParticipant() != null && state.getAllRemoteParticipants().size() > 1) {
+      pages.add(WebRtcCallParticipantsPage.forSingleParticipant(state.getFocusedParticipant(), state.isInPipMode()));
+    }
+
+    pagerAdapter.submitList(pages);
+    recyclerAdapter.submitList(state.getListParticipants());
+    updateLocalCallParticipant(state.getLocalRenderState(), state.getLocalParticipant());
+
+    if (state.isLargeVideoGroup()) {
+      layoutParticipantsForLargeCount();
     } else {
-      remoteRenderContainer.setVisibility(View.GONE);
+      layoutParticipantsForSmallCount();
     }
   }
 
-  public void setLocalRenderer(@Nullable TextureViewRenderer surfaceViewRenderer) {
-    if (localRenderer == surfaceViewRenderer) {
-      return;
+  public void updateLocalCallParticipant(@NonNull WebRtcLocalRenderState state, @NonNull CallParticipant localCallParticipant) {
+    smallLocalRender.setMirror(localCallParticipant.getCameraDirection() == CameraState.Direction.FRONT);
+    largeLocalRender.setMirror(localCallParticipant.getCameraDirection() == CameraState.Direction.FRONT);
+
+    smallLocalRender.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FILL);
+    largeLocalRender.setScalingType(RendererCommon.ScalingType.SCALE_ASPECT_FILL);
+
+    if (localCallParticipant.getVideoSink().getEglBase() != null) {
+      smallLocalRender.init(localCallParticipant.getVideoSink().getEglBase());
+      largeLocalRender.init(localCallParticipant.getVideoSink().getEglBase());
     }
 
-    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) {
+    switch (state) {
       case GONE:
-        localRenderPipFrame.setVisibility(View.GONE);
-        largeLocalRenderContainer.setVisibility(View.GONE);
-        setRenderer(largeLocalRenderContainer, null);
-        setRenderer(smallLocalRenderContainer, null);
+        largeLocalRender.attachBroadcastVideoSink(null);
+        largeLocalRenderFrame.setVisibility(View.GONE);
+        smallLocalRender.attachBroadcastVideoSink(null);
+        smallLocalRenderFrame.setVisibility(View.GONE);
+
+        videoToggle.setChecked(false, false);
+        break;
+      case SMALL_RECTANGLE:
+        smallLocalRenderFrame.setVisibility(View.VISIBLE);
+        smallLocalRender.attachBroadcastVideoSink(localCallParticipant.getVideoSink());
+        animatePipToRectangle();
+
+        largeLocalRender.attachBroadcastVideoSink(null);
+        largeLocalRenderFrame.setVisibility(View.GONE);
+
+        videoToggle.setChecked(true, false);
+        break;
+      case SMALL_SQUARE:
+        smallLocalRenderFrame.setVisibility(View.VISIBLE);
+        smallLocalRender.attachBroadcastVideoSink(localCallParticipant.getVideoSink());
+        animatePipToSquare();
+
+        largeLocalRender.attachBroadcastVideoSink(null);
+        largeLocalRenderFrame.setVisibility(View.GONE);
+
+        videoToggle.setChecked(true, false);
         break;
       case LARGE:
-        localRenderPipFrame.setVisibility(View.GONE);
-        largeLocalRenderContainer.setVisibility(View.VISIBLE);
-        if (largeLocalRenderContainer.getChildCount() == 0) {
-          setRenderer(largeLocalRenderContainer, localRenderer);
-        }
+        largeLocalRender.attachBroadcastVideoSink(localCallParticipant.getVideoSink());
+        largeLocalRenderFrame.setVisibility(View.VISIBLE);
+
+        largeLocalRenderNoVideo.setVisibility(View.GONE);
+        largeLocalRenderNoVideoAvatar.setVisibility(View.GONE);
+
+        smallLocalRender.attachBroadcastVideoSink(null);
+        smallLocalRenderFrame.setVisibility(View.GONE);
+
+        videoToggle.setChecked(true, false);
         break;
-      case SMALL:
-        localRenderPipFrame.setVisibility(View.VISIBLE);
-        largeLocalRenderContainer.setVisibility(View.GONE);
+      case LARGE_NO_VIDEO:
+        largeLocalRender.attachBroadcastVideoSink(null);
+        largeLocalRenderFrame.setVisibility(View.VISIBLE);
 
-        if (smallLocalRenderContainer.getChildCount() == 0) {
-          setRenderer(smallLocalRenderContainer, localRenderer);
-        }
-    }
-  }
+        largeLocalRenderNoVideo.setVisibility(View.VISIBLE);
+        largeLocalRenderNoVideoAvatar.setVisibility(View.VISIBLE);
 
-  public void setCameraDirection(@NonNull CameraState.Direction cameraDirection) {
-    this.cameraDirection = cameraDirection;
+        GlideApp.with(getContext().getApplicationContext())
+                .load(new ProfileContactPhoto(localCallParticipant.getRecipient(), localCallParticipant.getRecipient().getProfileAvatar()))
+                .transform(new CenterCrop(), new BlurTransformation(getContext(), 0.25f, BlurTransformation.MAX_RADIUS))
+                .diskCacheStrategy(DiskCacheStrategy.ALL)
+                .into(largeLocalRenderNoVideoAvatar);
 
-    if (localRenderer != null) {
-      localRenderer.setMirror(cameraDirection == CameraState.Direction.FRONT);
+        smallLocalRender.attachBroadcastVideoSink(null);
+        smallLocalRenderFrame.setVisibility(View.GONE);
+
+        videoToggle.setChecked(false, false);
+        break;
     }
   }
 
@@ -265,17 +340,16 @@ public class WebRtcCallView extends FrameLayout {
     }
 
     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);
+    if (recipient.isGroup()) {
+      recipientName.setText(R.string.WebRtcCallView__group_call);
+      if (toolbar.getMenu().findItem(R.id.menu_group_call_participants_list) == null) {
+        toolbar.inflateMenu(R.menu.group_call);
+        toolbar.setOnMenuItemClickListener(unused -> showParticipantsList());
+      }
+    } else {
+      recipientName.setText(recipient.getDisplayName(getContext()));
+    }
   }
 
   public void setStatus(@NonNull String status) {
@@ -302,11 +376,16 @@ public class WebRtcCallView extends FrameLayout {
     }
   }
 
-  public void setWebRtcControls(WebRtcControls webRtcControls) {
+  public void setWebRtcControls(@NonNull WebRtcControls webRtcControls) {
     Set<View> lastVisibleSet = new HashSet<>(visibleViewSet);
 
     visibleViewSet.clear();
 
+    if (webRtcControls.displayStartCallControls()) {
+      visibleViewSet.add(footerGradient);
+      visibleViewSet.add(startCallControls);
+    }
+
     if (webRtcControls.displayTopViews()) {
       visibleViewSet.addAll(topViews);
     }
@@ -341,7 +420,7 @@ public class WebRtcCallView extends FrameLayout {
 
     if (webRtcControls.displayEndCall()) {
       visibleViewSet.add(hangup);
-      visibleViewSet.add(ongoingFooterGradient);
+      visibleViewSet.add(footerGradient);
     }
 
     if (webRtcControls.displayMuteAudio()) {
@@ -358,6 +437,12 @@ public class WebRtcCallView extends FrameLayout {
       updateButtonStateForLargeButtons();
     }
 
+    if (webRtcControls.displayRemoteVideoRecycler()) {
+      callParticipantsRecycler.setVisibility(View.VISIBLE);
+    } else {
+      callParticipantsRecycler.setVisibility(View.GONE);
+    }
+
     if (webRtcControls.isFadeOutEnabled()) {
       if (!controls.isFadeOutEnabled()) {
         scheduleFadeOut();
@@ -370,7 +455,7 @@ public class WebRtcCallView extends FrameLayout {
 
     if (!visibleViewSet.equals(lastVisibleSet) || !controls.isFadeOutEnabled()) {
       fadeInNewUiState(lastVisibleSet, webRtcControls.displaySmallOngoingCallButtons());
-      post(() -> pictureInPictureGestureHelper.setVerticalBoundaries(status.getBottom(), videoToggle.getTop()));
+      post(() -> pictureInPictureGestureHelper.setVerticalBoundaries(toolbar.getBottom(), videoToggle.getTop()));
     }
   }
 
@@ -378,8 +463,39 @@ public class WebRtcCallView extends FrameLayout {
     return videoToggle;
   }
 
+  private void animatePipToRectangle() {
+    ResizeAnimation animation = new ResizeAnimation(smallLocalRenderFrame, ViewUtil.dpToPx(90), ViewUtil.dpToPx(160));
+    animation.setDuration(PIP_RESIZE_DURATION);
+    animation.setAnimationListener(new SimpleAnimationListener() {
+      @Override
+      public void onAnimationEnd(Animation animation) {
+        pictureInPictureGestureHelper.enableCorners();
+        pictureInPictureGestureHelper.adjustPip();
+      }
+    });
+
+    smallLocalRenderFrame.startAnimation(animation);
+  }
+
+  private void animatePipToSquare() {
+    pictureInPictureGestureHelper.lockToBottomEnd();
+
+    pictureInPictureGestureHelper.performAfterFling(() -> {
+      ResizeAnimation animation = new ResizeAnimation(smallLocalRenderFrame, ViewUtil.dpToPx(72), ViewUtil.dpToPx(72));
+      animation.setDuration(PIP_RESIZE_DURATION);
+      animation.setAnimationListener(new SimpleAnimationListener() {
+        @Override
+        public void onAnimationEnd(Animation animation) {
+          pictureInPictureGestureHelper.adjustPip();
+        }
+      });
+
+      smallLocalRenderFrame.startAnimation(animation);
+    });
+  }
+
   private void toggleControls() {
-    if (controls.isFadeOutEnabled() && status.getVisibility() == VISIBLE) {
+    if (controls.isFadeOutEnabled() && toolbar.getVisibility() == VISIBLE) {
       fadeOutControls();
     } else {
       fadeInControls();
@@ -394,14 +510,49 @@ public class WebRtcCallView extends FrameLayout {
 
   private void fadeInControls() {
     fadeControls(ConstraintSet.VISIBLE);
-    pictureInPictureGestureHelper.setVerticalBoundaries(status.getBottom(), videoToggle.getTop());
+    pictureInPictureGestureHelper.setVerticalBoundaries(toolbar.getBottom(), videoToggle.getTop());
 
     scheduleFadeOut();
   }
 
-  private void fadeControls(int visibility) {
+  private void layoutParticipantsForSmallCount() {
+    pagerBottomMarginDp = 0;
+
+    layoutParticipants();
+  }
+
+  private void layoutParticipantsForLargeCount() {
+    pagerBottomMarginDp = 104;
+
+    layoutParticipants();
+  }
+
+  private int withControlsHeight(int margin) {
+    if (margin == 0) {
+      return 0;
+    }
+
+    return controlsVisible ? margin + CONTROLS_HEIGHT : margin;
+  }
+
+  private void layoutParticipants() {
     Transition transition = new AutoTransition().setDuration(TRANSITION_DURATION_MILLIS);
 
+    TransitionManager.beginDelayedTransition(participantsParent, transition);
+
+    ConstraintSet constraintSet = new ConstraintSet();
+    constraintSet.clone(participantsParent);
+
+    constraintSet.setMargin(R.id.call_screen_participants_pager, ConstraintSet.BOTTOM, ViewUtil.dpToPx(withControlsHeight(pagerBottomMarginDp)));
+    constraintSet.applyTo(participantsParent);
+  }
+
+  private void fadeControls(int visibility) {
+    controlsVisible = visibility == VISIBLE;
+
+    Transition transition = new AutoTransition().setOrdering(TransitionSet.ORDERING_TOGETHER)
+                                                .setDuration(TRANSITION_DURATION_MILLIS);
+
     TransitionManager.beginDelayedTransition(parent, transition);
 
     ConstraintSet constraintSet = new ConstraintSet();
@@ -412,6 +563,8 @@ public class WebRtcCallView extends FrameLayout {
     }
 
     constraintSet.applyTo(parent);
+
+    layoutParticipants();
   }
 
   private void fadeInNewUiState(@NonNull Set<View> previouslyVisibleViewSet, boolean useSmallMargins) {
@@ -458,40 +611,6 @@ public class WebRtcCallView extends FrameLayout {
     }
   }
 
-  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);
@@ -508,14 +627,14 @@ public class WebRtcCallView extends FrameLayout {
     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);
-    }
+  private boolean showParticipantsList() {
+    controlsListener.onShowParticipantsList();
+    return true;
   }
 
   public interface ControlsListener {
+    void onStartCall(boolean isVideoCall);
+    void onCancelStartCall();
     void onControlsFadeOut();
     void onAudioOutputChanged(@NonNull WebRtcAudioOutput audioOutput);
     void onVideoChanged(boolean isVideoEnabled);
@@ -525,6 +644,7 @@ public class WebRtcCallView extends FrameLayout {
     void onDenyCallPressed();
     void onAcceptCallWithVoiceOnlyPressed();
     void onAcceptCallPressed();
-    void onDownCaretPressed();
+    void onShowParticipantsList();
+    void onPageChanged(@NonNull CallParticipantsState.SelectedPage page);
   }
 }

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

@@ -10,60 +10,38 @@ import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.Transformations;
 import androidx.lifecycle.ViewModel;
 
+import org.thoughtcrime.securesms.events.CallParticipant;
 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 MutableLiveData<Boolean>               microphoneEnabled  = new MutableLiveData<>(true);
+  private final MutableLiveData<Boolean>               isInPipMode        = new MutableLiveData<>(false);
+  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>                  elapsed            = new MutableLiveData<>(-1L);
+  private final MutableLiveData<LiveRecipient>         liveRecipient      = new MutableLiveData<>(Recipient.UNKNOWN.live());
+  private final MutableLiveData<CallParticipantsState> participantsState  = new MutableLiveData<>(CallParticipantsState.STARTING_STATE);
 
+  private boolean  canDisplayTooltipIfNeeded = true;
+  private boolean  hasEnabledLocalVideo      = false;
+  private long     callConnectedTime         = -1;
+  private Handler  elapsedTimeHandler        = new Handler(Looper.getMainLooper());
+  private boolean  answerWithVideoAvailable  = false;
+  private Runnable elapsedTimeRunnable       = this::handleTick;
+  private boolean  canEnterPipMode           = false;
 
   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;
   }
@@ -81,7 +59,15 @@ public class WebRtcCallViewModel extends ViewModel {
   }
 
   public LiveData<Long> getCallTime() {
-    return Transformations.map(ellapsed, timeInCall -> callConnectedTime == -1 ? -1 : timeInCall);
+    return Transformations.map(elapsed, timeInCall -> callConnectedTime == -1 ? -1 : timeInCall);
+  }
+
+  public LiveData<CallParticipantsState> getCallParticipantsState() {
+    return participantsState;
+  }
+
+  public boolean canEnterPipMode() {
+    return canEnterPipMode;
   }
 
   public boolean isAnswerWithVideoAvailable() {
@@ -91,6 +77,15 @@ public class WebRtcCallViewModel extends ViewModel {
   @MainThread
   public void setIsInPipMode(boolean isInPipMode) {
     this.isInPipMode.setValue(isInPipMode);
+
+    //noinspection ConstantConditions
+    participantsState.setValue(CallParticipantsState.update(participantsState.getValue(), isInPipMode));
+  }
+
+  @MainThread
+  public void setIsViewingFocusedParticipant(@NonNull CallParticipantsState.SelectedPage page) {
+    //noinspection ConstantConditions
+    participantsState.setValue(CallParticipantsState.update(participantsState.getValue(), page));
   }
 
   public void onDismissedVideoTooltip() {
@@ -99,27 +94,20 @@ public class WebRtcCallViewModel extends ViewModel {
 
   @MainThread
   public void updateFromWebRtcViewModel(@NonNull WebRtcViewModel webRtcViewModel, boolean enableVideo) {
-    remoteVideoEnabled.setValue(webRtcViewModel.isRemoteVideoEnabled());
-    microphoneEnabled.setValue(webRtcViewModel.isMicrophoneEnabled());
+    canEnterPipMode = webRtcViewModel.getState() != WebRtcViewModel.State.CALL_PRE_JOIN;
 
-    if (isValidCameraDirectionForUi(webRtcViewModel.getLocalCameraState().getActiveDirection())) {
-      cameraDirection.setValue(webRtcViewModel.getLocalCameraState().getActiveDirection());
-    }
+    CallParticipant localParticipant = webRtcViewModel.getLocalParticipant();
 
-    localVideoEnabled.setValue(webRtcViewModel.getLocalCameraState().isEnabled());
+    microphoneEnabled.setValue(localParticipant.isMicrophoneEnabled());
 
-    if (enableVideo) {
-      showVideoForOutgoing = webRtcViewModel.getState() == WebRtcViewModel.State.CALL_OUTGOING;
-    } else if (webRtcViewModel.getState() != WebRtcViewModel.State.CALL_OUTGOING) {
-      showVideoForOutgoing = false;
-    }
+    //noinspection ConstantConditions
+    participantsState.setValue(CallParticipantsState.update(participantsState.getValue(), webRtcViewModel, enableVideo));
 
-    updateLocalRenderState(webRtcViewModel.getState());
     updateWebRtcControls(webRtcViewModel.getState(),
-                         webRtcViewModel.getLocalCameraState().isEnabled(),
+                         localParticipant.getCameraState().isEnabled(),
                          webRtcViewModel.isRemoteVideoEnabled(),
                          webRtcViewModel.isRemoteVideoOffer(),
-                         webRtcViewModel.getLocalCameraState().getCameraCount() > 1,
+                         localParticipant.isMoreThanOneCameraAvailable(),
                          webRtcViewModel.isBluetoothAvailable(),
                          repository.getAudioOutput());
 
@@ -131,9 +119,9 @@ public class WebRtcCallViewModel extends ViewModel {
       callConnectedTime = -1;
     }
 
-    if (webRtcViewModel.getLocalCameraState().isEnabled()) {
+    if (localParticipant.getCameraState().isEnabled()) {
       canDisplayTooltipIfNeeded = false;
-      hasEnabledLocalVideo = true;
+      hasEnabledLocalVideo      = true;
       events.setValue(Event.DISMISS_VIDEO_TOOLTIP);
     }
 
@@ -144,34 +132,36 @@ public class WebRtcCallViewModel extends ViewModel {
     }
   }
 
-  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,
+  private void updateWebRtcControls(@NonNull WebRtcViewModel.State state,
                                     boolean isLocalVideoEnabled,
                                     boolean isRemoteVideoEnabled,
                                     boolean isRemoteVideoOffer,
                                     boolean isMoreThanOneCameraAvailable,
                                     boolean isBluetoothAvailable,
-                                    WebRtcAudioOutput audioOutput)
+                                    @NonNull WebRtcAudioOutput audioOutput)
   {
-
     final WebRtcControls.CallState callState;
 
     switch (state) {
+      case CALL_PRE_JOIN:
+        callState = WebRtcControls.CallState.PRE_JOIN;
+        break;
       case CALL_INCOMING:
         callState = WebRtcControls.CallState.INCOMING;
         answerWithVideoAvailable = isRemoteVideoOffer;
         break;
+      case CALL_OUTGOING:
+      case CALL_RINGING:
+        callState = WebRtcControls.CallState.OUTGOING;
+        break;
+      case CALL_ACCEPTED_ELSEWHERE:
+      case CALL_DECLINED_ELSEWHERE:
+      case CALL_ONGOING_ELSEWHERE:
+      case CALL_NEEDS_PERMISSION:
+      case CALL_BUSY:
+      case CALL_DISCONNECTED:
+        callState = WebRtcControls.CallState.ENDING;
+        break;
       default:
         callState = WebRtcControls.CallState.ONGOING;
     }
@@ -180,25 +170,19 @@ public class WebRtcCallViewModel extends ViewModel {
                                                isRemoteVideoEnabled || isRemoteVideoOffer,
                                                isMoreThanOneCameraAvailable,
                                                isBluetoothAvailable,
-                                               isInPipMode.getValue() == Boolean.TRUE,
+                                               Boolean.TRUE.equals(isInPipMode.getValue()),
                                                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 isInPipMode, @NonNull WebRtcControls controls) {
-    if (isInPipMode) return WebRtcControls.PIP;
-    else             return controls;
+    return isInPipMode ? WebRtcControls.PIP : controls;
   }
 
   private void startTimer() {
     cancelTimer();
 
-    ellapsedTimeHandler.post(ellapsedTimeRunnable);
+    elapsedTimeHandler.post(elapsedTimeRunnable);
   }
 
   private void handleTick() {
@@ -208,13 +192,13 @@ public class WebRtcCallViewModel extends ViewModel {
 
     long newValue = (System.currentTimeMillis() - callConnectedTime) / 1000;
 
-    ellapsed.postValue(newValue);
+    elapsed.postValue(newValue);
 
-    ellapsedTimeHandler.postDelayed(ellapsedTimeRunnable, 1000);
+    elapsedTimeHandler.postDelayed(elapsedTimeRunnable, 1000);
   }
 
   private void cancelTimer() {
-    ellapsedTimeHandler.removeCallbacks(ellapsedTimeRunnable);
+    elapsedTimeHandler.removeCallbacks(elapsedTimeRunnable);
   }
 
   @Override

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

@@ -36,24 +36,32 @@ public final class WebRtcControls {
     this.audioOutput                  = audioOutput;
   }
 
+  boolean displayStartCallControls() {
+    return isPreJoin();
+  }
+
   boolean displayEndCall() {
-    return isOngoing();
+    return isAtLeastOutgoing();
   }
 
   boolean displayMuteAudio() {
-    return isOngoing();
+    return isPreJoin() || isAtLeastOutgoing();
   }
 
   boolean displayVideoToggle() {
-    return isOngoing();
+    return isPreJoin() || isAtLeastOutgoing();
   }
 
   boolean displayAudioToggle() {
-    return isOngoing() && (!isLocalVideoEnabled || isBluetoothAvailable);
+    return (isPreJoin() || isAtLeastOutgoing()) && (!isLocalVideoEnabled || isBluetoothAvailable);
   }
 
   boolean displayCameraToggle() {
-    return isOngoing() && isLocalVideoEnabled && isMoreThanOneCameraAvailable;
+    return (isPreJoin() || isAtLeastOutgoing()) && isLocalVideoEnabled && isMoreThanOneCameraAvailable;
+  }
+
+  boolean displayRemoteVideoRecycler() {
+    return isOngoing();
   }
 
   boolean displayAnswerWithAudio() {
@@ -73,25 +81,29 @@ public final class WebRtcControls {
   }
 
   boolean isFadeOutEnabled() {
-    return isOngoing() && isRemoteVideoEnabled;
+    return isAtLeastOutgoing() && isRemoteVideoEnabled;
   }
 
   boolean displaySmallOngoingCallButtons() {
-    return isOngoing() && displayAudioToggle() && displayCameraToggle();
+    return isAtLeastOutgoing() && displayAudioToggle() && displayCameraToggle();
   }
 
   boolean displayLargeOngoingCallButtons() {
-    return isOngoing() && !(displayAudioToggle() && displayCameraToggle());
+    return isAtLeastOutgoing() && !(displayAudioToggle() && displayCameraToggle());
   }
 
   boolean displayTopViews() {
     return !isInPipMode;
   }
 
-  WebRtcAudioOutput getAudioOutput() {
+  @NonNull WebRtcAudioOutput getAudioOutput() {
     return audioOutput;
   }
 
+  private boolean isPreJoin() {
+    return callState == CallState.PRE_JOIN;
+  }
+
   private boolean isOngoing() {
     return callState == CallState.ONGOING;
   }
@@ -100,9 +112,20 @@ public final class WebRtcControls {
     return callState == CallState.INCOMING;
   }
 
+  private boolean isAtLeastOutgoing() {
+    return callState.isAtLeast(CallState.OUTGOING);
+  }
+
   public enum CallState {
     NONE,
+    PRE_JOIN,
     INCOMING,
-    ONGOING
+    OUTGOING,
+    ONGOING,
+    ENDING;
+
+    boolean isAtLeast(@NonNull CallState other) {
+      return compareTo(other) >= 0;
+    }
   }
 }

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

@@ -2,6 +2,8 @@ package org.thoughtcrime.securesms.components.webrtc;
 
 public enum WebRtcLocalRenderState {
   GONE,
-  SMALL,
-  LARGE
+  SMALL_RECTANGLE,
+  SMALL_SQUARE,
+  LARGE,
+  LARGE_NO_VIDEO
 }

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/participantslist/CallParticipantViewHolder.java

@@ -0,0 +1,18 @@
+package org.thoughtcrime.securesms.components.webrtc.participantslist;
+
+import android.view.View;
+
+import androidx.annotation.NonNull;
+
+import org.thoughtcrime.securesms.util.viewholders.RecipientViewHolder;
+
+public class CallParticipantViewHolder extends RecipientViewHolder<CallParticipantViewState> {
+  public CallParticipantViewHolder(@NonNull View itemView) {
+    super(itemView, null);
+  }
+
+  @Override
+  public void bind(@NonNull CallParticipantViewState model) {
+    super.bind(model);
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/participantslist/CallParticipantViewState.java

@@ -0,0 +1,21 @@
+package org.thoughtcrime.securesms.components.webrtc.participantslist;
+
+import androidx.annotation.NonNull;
+
+import org.thoughtcrime.securesms.events.CallParticipant;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.util.viewholders.RecipientMappingModel;
+
+public final class CallParticipantViewState extends RecipientMappingModel<CallParticipantViewState> {
+
+  private final CallParticipant callParticipant;
+
+  CallParticipantViewState(@NonNull CallParticipant callParticipant) {
+    this.callParticipant = callParticipant;
+  }
+
+  @Override
+  public @NonNull Recipient getRecipient() {
+    return callParticipant.getRecipient();
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/participantslist/CallParticipantsListAdapter.java

@@ -0,0 +1,13 @@
+package org.thoughtcrime.securesms.components.webrtc.participantslist;
+
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.util.MappingAdapter;
+
+public class CallParticipantsListAdapter extends MappingAdapter {
+
+  CallParticipantsListAdapter() {
+    registerFactory(CallParticipantsListHeader.class, new LayoutFactory<>(CallParticipantsListHeaderViewHolder::new, R.layout.call_participants_list_header));
+    registerFactory(CallParticipantViewState.class, new LayoutFactory<>(CallParticipantViewHolder::new, R.layout.call_participants_list_item));
+  }
+
+}

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/participantslist/CallParticipantsListDialog.java

@@ -0,0 +1,92 @@
+package org.thoughtcrime.securesms.components.webrtc.participantslist;
+
+import android.os.Bundle;
+import android.view.ContextThemeWrapper;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.lifecycle.ViewModelProviders;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.components.webrtc.CallParticipantsState;
+import org.thoughtcrime.securesms.components.webrtc.WebRtcCallViewModel;
+import org.thoughtcrime.securesms.events.CallParticipant;
+import org.thoughtcrime.securesms.util.BottomSheetUtil;
+import org.thoughtcrime.securesms.util.MappingModel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CallParticipantsListDialog extends BottomSheetDialogFragment {
+
+  private RecyclerView                participantList;
+  private CallParticipantsListAdapter adapter;
+
+  public static void show(@NonNull FragmentManager manager) {
+    CallParticipantsListDialog fragment = new CallParticipantsListDialog();
+
+    fragment.show(manager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG);
+  }
+
+  @Override
+  public void show(@NonNull FragmentManager manager, @Nullable String tag) {
+    BottomSheetUtil.show(manager, tag, this);
+  }
+
+  @Override
+  public void onCreate(@Nullable Bundle savedInstanceState) {
+    setStyle(DialogFragment.STYLE_NORMAL, R.style.Theme_Signal_RoundedBottomSheet);
+    super.onCreate(savedInstanceState);
+  }
+
+  @Override
+  public @NonNull View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    ContextThemeWrapper contextThemeWrapper = new ContextThemeWrapper(inflater.getContext(), R.style.TextSecure_DarkTheme);
+    LayoutInflater      themedInflater      = LayoutInflater.from(contextThemeWrapper);
+
+    participantList = (RecyclerView) themedInflater.inflate(R.layout.call_participants_list_dialog, container, false);
+
+    return participantList;
+  }
+
+  @Override
+  public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+    super.onActivityCreated(savedInstanceState);
+
+    final WebRtcCallViewModel viewModel = ViewModelProviders.of(requireActivity()).get(WebRtcCallViewModel.class);
+
+    initializeList();
+
+    viewModel.getCallParticipantsState().observe(getViewLifecycleOwner(), this::updateList);
+  }
+
+  private void initializeList() {
+    adapter = new CallParticipantsListAdapter();
+
+    participantList.setLayoutManager(new LinearLayoutManager(requireContext()));
+    participantList.setAdapter(adapter);
+  }
+
+  private void updateList(@NonNull CallParticipantsState callParticipantsState) {
+    List<MappingModel<?>> items = new ArrayList<>();
+
+    items.add(new CallParticipantsListHeader(callParticipantsState.getAllRemoteParticipants().size() + 1));
+
+    items.add(new CallParticipantViewState(callParticipantsState.getLocalParticipant()));
+    for (CallParticipant callParticipant : callParticipantsState.getAllRemoteParticipants()) {
+      items.add(new CallParticipantViewState(callParticipant));
+    }
+
+    adapter.submitList(items);
+  }
+
+}

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/participantslist/CallParticipantsListHeader.java

@@ -0,0 +1,31 @@
+package org.thoughtcrime.securesms.components.webrtc.participantslist;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.util.MappingModel;
+
+public class CallParticipantsListHeader implements MappingModel<CallParticipantsListHeader> {
+
+  private int participantCount;
+
+  public CallParticipantsListHeader(int participantCount) {
+    this.participantCount = participantCount;
+  }
+
+  @NonNull String getHeader(@NonNull Context context) {
+    return context.getResources().getQuantityString(R.plurals.CallParticipantsListDialog_in_this_call_d_people, participantCount, participantCount);
+  }
+
+  @Override
+  public boolean areItemsTheSame(@NonNull CallParticipantsListHeader newItem) {
+    return true;
+  }
+
+  @Override
+  public boolean areContentsTheSame(@NonNull CallParticipantsListHeader newItem) {
+    return participantCount == newItem.participantCount;
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/participantslist/CallParticipantsListHeaderViewHolder.java

@@ -0,0 +1,24 @@
+package org.thoughtcrime.securesms.components.webrtc.participantslist;
+
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.util.MappingViewHolder;
+
+public class CallParticipantsListHeaderViewHolder extends MappingViewHolder<CallParticipantsListHeader> {
+
+  private final TextView headerText;
+
+  public CallParticipantsListHeaderViewHolder(@NonNull View itemView) {
+    super(itemView);
+    headerText = findViewById(R.id.call_participants_list_header);
+  }
+
+  @Override
+  public void bind(@NonNull CallParticipantsListHeader model) {
+    headerText.setText(model.getHeader(getContext()));
+  }
+}

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

@@ -8,6 +8,8 @@ import android.graphics.drawable.LayerDrawable;
 import android.widget.ImageView;
 
 import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.content.res.AppCompatResources;
 
 import com.amulyakhare.textdrawable.TextDrawable;
@@ -22,6 +24,8 @@ public class ResourceContactPhoto implements FallbackContactPhoto {
   private final int smallResourceId;
   private final int callCardResourceId;
 
+  private ImageView.ScaleType scaleType = ImageView.ScaleType.CENTER;
+
   public ResourceContactPhoto(@DrawableRes int resourceId) {
     this(resourceId, resourceId, resourceId);
   }
@@ -36,26 +40,31 @@ public class ResourceContactPhoto implements FallbackContactPhoto {
     this.smallResourceId    = smallResourceId;
   }
 
+  public void setScaleType(@NonNull ImageView.ScaleType scaleType) {
+    this.scaleType = scaleType;
+  }
+
   @Override
-  public Drawable asDrawable(Context context, int color) {
+  public @NonNull Drawable asDrawable(@NonNull Context context, int color) {
     return asDrawable(context, color, false);
   }
 
   @Override
-  public Drawable asDrawable(Context context, int color, boolean inverted) {
+  public @NonNull Drawable asDrawable(@NonNull Context context, int color, boolean inverted) {
     return buildDrawable(context, resourceId, color, inverted);
   }
 
   @Override
-  public Drawable asSmallDrawable(Context context, int color, boolean inverted) {
+  public @NonNull Drawable asSmallDrawable(@NonNull Context context, int color, boolean inverted) {
     return buildDrawable(context, smallResourceId, color, inverted);
   }
 
-  private Drawable buildDrawable(Context context, int resourceId, int color, boolean inverted) {
+  private @NonNull Drawable buildDrawable(@NonNull Context context, int resourceId, int color, boolean inverted) {
     Drawable        background = TextDrawable.builder().buildRound(" ", inverted ? Color.WHITE : color);
     RoundedDrawable foreground = (RoundedDrawable) RoundedDrawable.fromDrawable(AppCompatResources.getDrawable(context, resourceId));
 
-    foreground.setScaleType(ImageView.ScaleType.CENTER);
+    //noinspection ConstantConditions
+    foreground.setScaleType(scaleType);
 
     if (inverted) {
       foreground.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
@@ -68,12 +77,12 @@ public class ResourceContactPhoto implements FallbackContactPhoto {
   }
 
   @Override
-  public Drawable asCallCard(Context context) {
+  public @Nullable Drawable asCallCard(@NonNull Context context) {
     return AppCompatResources.getDrawable(context, callCardResourceId);
   }
 
   private static class ExpandingLayerDrawable extends LayerDrawable {
-    public ExpandingLayerDrawable(Drawable[] layers) {
+    public ExpandingLayerDrawable(@NonNull Drawable[] layers) {
       super(layers);
     }
 

app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryV1.java

@@ -1,58 +0,0 @@
-package org.thoughtcrime.securesms.contacts.sync;
-
-import androidx.annotation.NonNull;
-
-import com.annimon.stream.Collectors;
-import com.annimon.stream.Stream;
-
-import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper.DirectoryResult;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.util.SetUtil;
-import org.whispersystems.libsignal.util.guava.Optional;
-import org.whispersystems.signalservice.api.SignalServiceAccountManager;
-import org.whispersystems.signalservice.api.push.ContactTokenDetails;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
-class ContactDiscoveryV1 {
-
-  private static final String TAG = ContactDiscoveryV1.class.getSimpleName();
-
-  static @NonNull DirectoryResult getDirectoryResult(@NonNull Set<String> databaseNumbers,
-                                                     @NonNull Set<String> systemNumbers)
-      throws IOException
-  {
-    Set<String>                         allNumbers    = SetUtil.union(databaseNumbers, systemNumbers);
-    FuzzyPhoneNumberHelper.InputResult  inputResult   = FuzzyPhoneNumberHelper.generateInput(allNumbers, databaseNumbers);
-    List<ContactTokenDetails>           activeTokens  = getTokens(inputResult.getNumbers());
-    Set<String>                         activeNumbers = Stream.of(activeTokens).map(ContactTokenDetails::getNumber).collect(Collectors.toSet());
-    FuzzyPhoneNumberHelper.OutputResult outputResult  = FuzzyPhoneNumberHelper.generateOutput(activeNumbers, inputResult);
-    HashMap<String, UUID>               uuids         = new HashMap<>();
-
-    for (String number : outputResult.getNumbers()) {
-      uuids.put(number, null);
-    }
-
-    return new DirectoryResult(uuids, outputResult.getRewrites());
-  }
-
-  static @NonNull DirectoryResult getDirectoryResult(@NonNull String number) throws  IOException {
-    return getDirectoryResult(Collections.singleton(number), Collections.singleton(number));
-  }
-
-  private static @NonNull List<ContactTokenDetails> getTokens(@NonNull Set<String> numbers) throws IOException {
-    SignalServiceAccountManager accountManager = ApplicationDependencies.getSignalServiceAccountManager();
-
-    if (numbers.size() == 1) {
-      Optional<ContactTokenDetails> details = accountManager.getContact(numbers.iterator().next());
-      return details.isPresent() ? Collections.singletonList(details.get()) : Collections.emptyList();
-    } else {
-      return accountManager.getContacts(numbers);
-    }
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscoveryV2.java

@@ -31,6 +31,9 @@ import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 
+/**
+ * Uses CDS to map E164's to UUIDs.
+ */
 class ContactDiscoveryV2 {
 
   private static final String TAG = Log.tag(ContactDiscoveryV2.class);

app/src/main/java/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java

@@ -25,20 +25,21 @@ import org.thoughtcrime.securesms.contacts.ContactAccessor;
 import org.thoughtcrime.securesms.contacts.ContactsDatabase;
 import org.thoughtcrime.securesms.crypto.SessionUtil;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.database.MessageDatabase;
 import org.thoughtcrime.securesms.database.MessageDatabase.InsertResult;
 import org.thoughtcrime.securesms.database.RecipientDatabase;
 import org.thoughtcrime.securesms.database.RecipientDatabase.BulkOperationsHandle;
 import org.thoughtcrime.securesms.database.RecipientDatabase.RegisteredState;
+import org.thoughtcrime.securesms.database.SessionDatabase;
+import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
+import org.thoughtcrime.securesms.jobs.RetrieveProfileJob;
 import org.thoughtcrime.securesms.jobs.StorageSyncJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter;
-import org.thoughtcrime.securesms.recipients.RecipientDetails;
 import org.thoughtcrime.securesms.registration.RegistrationUtil;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
 import org.thoughtcrime.securesms.recipients.Recipient;
@@ -50,10 +51,13 @@ import org.thoughtcrime.securesms.util.SetUtil;
 import org.thoughtcrime.securesms.util.Stopwatch;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
+import org.whispersystems.libsignal.util.Pair;
 import org.whispersystems.libsignal.util.guava.Optional;
+import org.whispersystems.signalservice.api.profiles.ProfileAndCredential;
 import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
 import org.whispersystems.signalservice.api.push.exceptions.NotFoundException;
 import org.whispersystems.signalservice.api.util.UuidUtil;
+import org.whispersystems.signalservice.internal.util.concurrent.ListenableFuture;
 
 import java.io.IOException;
 import java.util.Calendar;
@@ -154,13 +158,7 @@ public class DirectoryHelper {
       return RegisteredState.NOT_REGISTERED;
     }
 
-    DirectoryResult result;
-
-    if (FeatureFlags.cds()) {
-      result = ContactDiscoveryV2.getDirectoryResult(context, recipient.getE164().get());
-    } else {
-      result = ContactDiscoveryV1.getDirectoryResult(recipient.getE164().get());
-    }
+    DirectoryResult result = ContactDiscoveryV2.getDirectoryResult(context, recipient.getE164().get());
 
     stopwatch.split("e164-network");
 
@@ -179,6 +177,13 @@ public class DirectoryHelper {
       } else {
         recipientDatabase.markRegistered(recipient.getId());
       }
+    } else if (recipient.hasUuid() && recipient.isRegistered() && hasCommunicatedWith(context, recipient)) {
+      if (isUuidRegistered(context, recipient)) {
+        recipientDatabase.markRegistered(recipient.getId(), recipient.requireUuid());
+      } else {
+        recipientDatabase.markUnregistered(recipient.getId());
+      }
+      stopwatch.split("e164-unlisted-network");
     } else {
       recipientDatabase.markUnregistered(recipient.getId());
     }
@@ -216,13 +221,11 @@ public class DirectoryHelper {
       return;
     }
 
-    DirectoryResult result;
+    Stopwatch stopwatch = new Stopwatch("refresh");
 
-    if (FeatureFlags.cds()) {
-      result = ContactDiscoveryV2.getDirectoryResult(context, databaseNumbers, systemNumbers);
-    } else {
-      result = ContactDiscoveryV1.getDirectoryResult(databaseNumbers, systemNumbers);
-    }
+    DirectoryResult result = ContactDiscoveryV2.getDirectoryResult(context, databaseNumbers, systemNumbers);
+
+    stopwatch.split("network");
 
     if (result.getNumberRewrites().size() > 0) {
       Log.i(TAG, "[getDirectoryResult] Need to rewrite some numbers.");
@@ -238,10 +241,27 @@ public class DirectoryHelper {
                                                    .map(recipientDatabase::getOrInsertFromE164)
                                                    .collect(Collectors.toSet());
 
+    stopwatch.split("process-cds");
+
+    UnlistedResult unlistedResult = filterForUnlistedUsers(context, inactiveIds);
+
+    inactiveIds.removeAll(unlistedResult.getPossiblyActive());
+
+    if (unlistedResult.getRetries().size() > 0) {
+      Log.i(TAG, "Some profile fetches failed to resolve. Assuming not-inactive for now and scheduling a retry.");
+      RetrieveProfileJob.enqueue(unlistedResult.getRetries());
+    }
+
+    stopwatch.split("handle-unlisted");
+
     recipientDatabase.bulkUpdatedRegisteredStatus(uuidMap, inactiveIds);
 
+    stopwatch.split("update-registered");
+
     updateContactsDatabase(context, activeIds, true, result.getNumberRewrites());
 
+    stopwatch.split("contacts-db");
+
     if (TextSecurePreferences.isMultiDevice(context)) {
       ApplicationDependencies.getJobManager().add(new MultiDeviceContactUpdateJob());
     }
@@ -258,21 +278,17 @@ public class DirectoryHelper {
     } else {
       TextSecurePreferences.setHasSuccessfullyRetrievedDirectory(context, true);
     }
+
+    stopwatch.stop(TAG);
   }
 
 
   private static boolean isUuidRegistered(@NonNull Context context, @NonNull Recipient recipient) throws IOException {
     try {
-      ProfileUtil.retrieveProfile(context, recipient, SignalServiceProfile.RequestType.PROFILE).get(10, TimeUnit.SECONDS);
+      ProfileUtil.retrieveProfileSync(context, recipient, SignalServiceProfile.RequestType.PROFILE);
       return true;
-    } catch (ExecutionException e) {
-      if (e.getCause() instanceof NotFoundException) {
-        return false;
-      } else {
-        throw new IOException(e);
-      }
-    } catch (InterruptedException | TimeoutException e) {
-      throw new IOException(e);
+    } catch (NotFoundException e) {
+      return false;
     }
   }
 
@@ -408,6 +424,50 @@ public class DirectoryHelper {
     }).collect(Collectors.toSet());
   }
 
+  /**
+   * Users can mark themselves as 'unlisted' in CDS, meaning that even if CDS says they're
+   * unregistered, they might actually be registered. We need to double-check users who we already
+   * have UUIDs for. Also, we only want to bother doing this for users we have conversations for,
+   * so we will also only check for users that have a thread.
+   */
+  private static UnlistedResult filterForUnlistedUsers(@NonNull Context context, @NonNull Set<RecipientId> inactiveIds) {
+    List<Recipient> possiblyUnlisted = Stream.of(inactiveIds)
+                                             .map(Recipient::resolved)
+                                             .filter(Recipient::isRegistered)
+                                             .filter(Recipient::hasUuid)
+                                             .filter(r -> hasCommunicatedWith(context, r))
+                                             .toList();
+
+    List<Pair<Recipient, ListenableFuture<ProfileAndCredential>>> futures = Stream.of(possiblyUnlisted)
+                                                                                  .map(r -> new Pair<>(r, ProfileUtil.retrieveProfile(context, r, SignalServiceProfile.RequestType.PROFILE)))
+                                                                                  .toList();
+    Set<RecipientId> potentiallyActiveIds = new HashSet<>();
+    Set<RecipientId> retries              = new HashSet<>();
+
+    Stream.of(futures)
+          .forEach(pair -> {
+            try {
+              pair.second().get(5, TimeUnit.SECONDS);
+              potentiallyActiveIds.add(pair.first().getId());
+            } catch (InterruptedException | TimeoutException e) {
+              retries.add(pair.first().getId());
+              potentiallyActiveIds.add(pair.first().getId());
+            } catch (ExecutionException e) {
+              if (!(e.getCause() instanceof NotFoundException)) {
+                retries.add(pair.first().getId());
+                potentiallyActiveIds.add(pair.first().getId());
+              }
+            }
+          });
+
+    return new UnlistedResult(potentiallyActiveIds, retries);
+  }
+
+  private static boolean hasCommunicatedWith(@NonNull Context context, @NonNull Recipient recipient) {
+    return DatabaseFactory.getThreadDatabase(context).hasThread(recipient.getId()) ||
+           DatabaseFactory.getSessionDatabase(context).hasSessionFor(recipient.getId());
+  }
+
   static class DirectoryResult {
     private final Map<String, UUID>   registeredNumbers;
     private final Map<String, String> numberRewrites;
@@ -429,6 +489,24 @@ public class DirectoryHelper {
     }
   }
 
+  private static class UnlistedResult {
+    private final Set<RecipientId> possiblyActive;
+    private final Set<RecipientId> retries;
+
+    private UnlistedResult(@NonNull Set<RecipientId> possiblyActive, @NonNull Set<RecipientId> retries) {
+      this.possiblyActive = possiblyActive;
+      this.retries        = retries;
+    }
+
+    @NonNull Set<RecipientId> getPossiblyActive() {
+      return possiblyActive;
+    }
+
+    @NonNull Set<RecipientId> getRetries() {
+      return retries;
+    }
+  }
+
   private static class AccountHolder {
     private final boolean fresh;
     private final Account account;

app/src/main/java/org/thoughtcrime/securesms/contactshare/Contact.java

@@ -14,7 +14,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.attachments.AttachmentId;
 import org.thoughtcrime.securesms.attachments.UriAttachment;
-import org.thoughtcrime.securesms.blurhash.BlurHash;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.util.JsonUtils;
 import org.thoughtcrime.securesms.util.MediaUtil;
@@ -648,7 +647,7 @@ public class Contact implements Parcelable {
 
     @Override
     public void writeToParcel(Parcel dest, int flags) {
-      dest.writeParcelable(attachment != null ? attachment.getDataUri() : null, flags);
+      dest.writeParcelable(attachment != null ? attachment.getUri() : null, flags);
       dest.writeByte((byte) (isProfile ? 1 : 0));
     }
 

app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java

@@ -215,7 +215,7 @@ class ContactFieldAdapter extends RecyclerView.Adapter<ContactFieldAdapter.Conta
     Field(@NonNull Avatar avatar) {
       this.value      = "";
       this.iconResId  = R.drawable.baseline_account_circle_white_24;
-      this.iconUri    = avatar.getAttachment() != null ? avatar.getAttachment().getDataUri() : null;
+      this.iconUri    = avatar.getAttachment() != null ? avatar.getAttachment().getUri() : null;
       this.maxLines   = 1;
       this.selectable = avatar;
       this.label      = "";

app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactUtil.java

@@ -186,11 +186,11 @@ public final class ContactUtil {
       intent.putExtra(ContactsContract.Intents.Insert.POSTAL_TYPE, getSystemType(contact.getPostalAddresses().get(0).getType()));
     }
 
-    if (contact.getAvatarAttachment() != null && contact.getAvatarAttachment().getDataUri() != null) {
+    if (contact.getAvatarAttachment() != null && contact.getAvatarAttachment().getUri() != null) {
       try {
         ContentValues values = new ContentValues();
         values.put(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Photo.CONTENT_ITEM_TYPE);
-        values.put(ContactsContract.CommonDataKinds.Photo.PHOTO, Util.readFully(PartAuthority.getAttachmentStream(context, contact.getAvatarAttachment().getDataUri())));
+        values.put(ContactsContract.CommonDataKinds.Photo.PHOTO, Util.readFully(PartAuthority.getAttachmentStream(context, contact.getAvatarAttachment().getUri())));
 
         ArrayList<ContentValues> valuesArray = new ArrayList<>(1);
         valuesArray.add(values);

app/src/main/java/org/thoughtcrime/securesms/contactshare/SharedContactDetailsActivity.java

@@ -96,7 +96,7 @@ public class SharedContactDetailsActivity extends PassphraseRequiredActivity {
 
     presentContact(contact);
     presentActionButtons(ContactUtil.getRecipients(this, contact));
-    presentAvatar(contact.getAvatarAttachment() != null ? contact.getAvatarAttachment().getDataUri() : null);
+    presentAvatar(contact.getAvatarAttachment() != null ? contact.getAvatarAttachment().getUri() : null);
 
     for (LiveRecipient recipient : activeRecipients.values()) {
       recipient.observe(this, r -> presentActionButtons(Collections.singletonList(r.getId())));

app/src/main/java/org/thoughtcrime/securesms/contactshare/SharedContactRepository.java

@@ -93,66 +93,7 @@ public class SharedContactRepository {
 
     try (InputStream stream = PartAuthority.getAttachmentStream(context, uri)) {
       VCard vcard = Ezvcard.parse(stream).first();
-
-      ezvcard.property.StructuredName  vName            = vcard.getStructuredName();
-      List<ezvcard.property.Telephone> vPhones          = vcard.getTelephoneNumbers();
-      List<ezvcard.property.Email>     vEmails          = vcard.getEmails();
-      List<ezvcard.property.Address>   vPostalAddresses = vcard.getAddresses();
-
-      String organization = vcard.getOrganization() != null && !vcard.getOrganization().getValues().isEmpty() ? vcard.getOrganization().getValues().get(0) : null;
-      String displayName  = vcard.getFormattedName() != null ? vcard.getFormattedName().getValue() : null;
-
-      if (displayName == null && vName != null) {
-        displayName = vName.getGiven();
-      }
-
-      if (displayName == null && vcard.getOrganization() != null) {
-        displayName = organization;
-      }
-
-      if (displayName == null) {
-        throw new IOException("No valid name.");
-      }
-
-      Name name = new Name(displayName,
-                           vName != null ? vName.getGiven() : null,
-                           vName != null ? vName.getFamily() : null,
-                           vName != null && !vName.getPrefixes().isEmpty() ? vName.getPrefixes().get(0) : null,
-                           vName != null && !vName.getSuffixes().isEmpty() ? vName.getSuffixes().get(0) : null,
-                           null);
-
-
-      List<Phone> phoneNumbers = new ArrayList<>(vPhones.size());
-      for (ezvcard.property.Telephone vEmail : vPhones) {
-        String label = !vEmail.getTypes().isEmpty() ? getCleanedVcardType(vEmail.getTypes().get(0).getValue()) : null;
-
-        // Phone number is stored in the uri field in v4.0 only. In other versions, it is in the text field.
-        String phoneNumberFromText  = vEmail.getText();
-        String extractedPhoneNumber = phoneNumberFromText == null ? vEmail.getUri().getNumber() : phoneNumberFromText;
-        phoneNumbers.add(new Phone(extractedPhoneNumber, phoneTypeFromVcardType(label), label));
-      }
-
-      List<Email> emails = new ArrayList<>(vEmails.size());
-      for (ezvcard.property.Email vEmail : vEmails) {
-        String label = !vEmail.getTypes().isEmpty() ? getCleanedVcardType(vEmail.getTypes().get(0).getValue()) : null;
-        emails.add(new Email(vEmail.getValue(), emailTypeFromVcardType(label), label));
-      }
-
-      List<PostalAddress> postalAddresses = new ArrayList<>(vPostalAddresses.size());
-      for (ezvcard.property.Address vPostalAddress : vPostalAddresses) {
-        String label = !vPostalAddress.getTypes().isEmpty() ? getCleanedVcardType(vPostalAddress.getTypes().get(0).getValue()) : null;
-        postalAddresses.add(new PostalAddress(postalAddressTypeFromVcardType(label),
-                                              label,
-                                              vPostalAddress.getStreetAddress(),
-                                              vPostalAddress.getPoBox(),
-                                              null,
-                                              vPostalAddress.getLocality(),
-                                              vPostalAddress.getRegion(),
-                                              vPostalAddress.getPostalCode(),
-                                              vPostalAddress.getCountry()));
-      }
-
-      contact = new Contact(name, organization, phoneNumbers, emails, postalAddresses, null);
+      contact = VCardUtil.getContactFromVcard(vcard);
     } catch (IOException e) {
       Log.w(TAG, "Failed to parse the vcard.", e);
     }
@@ -201,7 +142,7 @@ public class SharedContactRepository {
 
         String number    = ContactUtil.getNormalizedPhoneNumber(context, cursorNumber);
         Phone  existing  = numberMap.get(number);
-        Phone  candidate = new Phone(number, phoneTypeFromContactType(cursorType), cursorLabel);
+        Phone  candidate = new Phone(number, VCardUtil.phoneTypeFromContactType(cursorType), cursorLabel);
 
         if (existing == null || (existing.getType() == Phone.Type.CUSTOM && existing.getLabel() == null)) {
           numberMap.put(number, candidate);
@@ -224,7 +165,7 @@ public class SharedContactRepository {
         int    cursorType  = cursor.getInt(cursor.getColumnIndexOrThrow(ContactsContract.CommonDataKinds.Email.TYPE));
         String cursorLabel = cursor.getString(cursor.getColumnIndexOrThrow(ContactsContract.CommonDataKinds.Email.LABEL));
 
-        emails.add(new Email(cursorEmail, emailTypeFromContactType(cursorType), cursorLabel));
+        emails.add(new Email(cursorEmail, VCardUtil.emailTypeFromContactType(cursorType), cursorLabel));
       }
     }
 
@@ -247,7 +188,7 @@ public class SharedContactRepository {
         String cursorPostal       = cursor.getString(cursor.getColumnIndexOrThrow(ContactsContract.CommonDataKinds.StructuredPostal.POSTCODE));
         String cursorCountry      = cursor.getString(cursor.getColumnIndexOrThrow(ContactsContract.CommonDataKinds.StructuredPostal.COUNTRY));
 
-        postalAddresses.add(new PostalAddress(postalAddressTypeFromContactType(cursorType),
+        postalAddresses.add(new PostalAddress(VCardUtil.postalAddressTypeFromContactType(cursorType),
                                               cursorLabel,
                                               cursorStreet,
                                               cursorPoBox,
@@ -304,70 +245,6 @@ public class SharedContactRepository {
     return null;
   }
 
-  private Phone.Type phoneTypeFromContactType(int type) {
-    switch (type) {
-      case ContactsContract.CommonDataKinds.Phone.TYPE_HOME:
-        return Phone.Type.HOME;
-      case ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE:
-        return Phone.Type.MOBILE;
-      case ContactsContract.CommonDataKinds.Phone.TYPE_WORK:
-        return Phone.Type.WORK;
-    }
-    return Phone.Type.CUSTOM;
-  }
-
-  private Phone.Type phoneTypeFromVcardType(@Nullable String type) {
-    if      ("home".equalsIgnoreCase(type)) return Phone.Type.HOME;
-    else if ("cell".equalsIgnoreCase(type)) return Phone.Type.MOBILE;
-    else if ("work".equalsIgnoreCase(type)) return Phone.Type.WORK;
-    else                                    return Phone.Type.CUSTOM;
-  }
-
-  private Email.Type emailTypeFromContactType(int type) {
-    switch (type) {
-      case ContactsContract.CommonDataKinds.Email.TYPE_HOME:
-        return Email.Type.HOME;
-      case ContactsContract.CommonDataKinds.Email.TYPE_MOBILE:
-        return Email.Type.MOBILE;
-      case ContactsContract.CommonDataKinds.Email.TYPE_WORK:
-        return Email.Type.WORK;
-    }
-    return Email.Type.CUSTOM;
-  }
-
-  private Email.Type emailTypeFromVcardType(@Nullable String type) {
-    if      ("home".equalsIgnoreCase(type)) return Email.Type.HOME;
-    else if ("cell".equalsIgnoreCase(type)) return Email.Type.MOBILE;
-    else if ("work".equalsIgnoreCase(type)) return Email.Type.WORK;
-    else                                    return Email.Type.CUSTOM;
-  }
-
-  private PostalAddress.Type postalAddressTypeFromContactType(int type) {
-    switch (type) {
-      case ContactsContract.CommonDataKinds.StructuredPostal.TYPE_HOME:
-        return PostalAddress.Type.HOME;
-      case ContactsContract.CommonDataKinds.StructuredPostal.TYPE_WORK:
-        return PostalAddress.Type.WORK;
-    }
-    return PostalAddress.Type.CUSTOM;
-  }
-
-  private PostalAddress.Type postalAddressTypeFromVcardType(@Nullable String type) {
-    if      ("home".equalsIgnoreCase(type)) return PostalAddress.Type.HOME;
-    else if ("work".equalsIgnoreCase(type)) return PostalAddress.Type.WORK;
-    else                                    return PostalAddress.Type.CUSTOM;
-  }
-
-  private String getCleanedVcardType(@Nullable String type) {
-    if (TextUtils.isEmpty(type)) return "";
-
-    if (type.startsWith("x-") && type.length() > 2) {
-      return type.substring(2);
-    }
-
-    return type;
-  }
-
   interface ValueCallback<T> {
     void onComplete(@NonNull T value);
   }

app/src/main/java/org/thoughtcrime/securesms/contactshare/VCardUtil.java

@@ -0,0 +1,160 @@
+package org.thoughtcrime.securesms.contactshare;
+
+import android.provider.ContactsContract;
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import org.thoughtcrime.securesms.logging.Log;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+import ezvcard.Ezvcard;
+import ezvcard.VCard;
+
+public final class VCardUtil {
+
+    private VCardUtil(){}
+
+    private static final String TAG = VCardUtil.class.getSimpleName();
+
+    public static List<Contact> parseContacts(@NonNull String vCardData) {
+        List<VCard> vContacts = Ezvcard.parse(vCardData).all();
+        List<Contact> contacts = new LinkedList<>();
+        for (VCard vCard: vContacts){
+            contacts.add(getContactFromVcard(vCard));
+        }
+        return contacts;
+    }
+
+    static @Nullable Contact getContactFromVcard(@NonNull VCard vcard) {
+        ezvcard.property.StructuredName  vName            = vcard.getStructuredName();
+        List<ezvcard.property.Telephone> vPhones          = vcard.getTelephoneNumbers();
+        List<ezvcard.property.Email>     vEmails          = vcard.getEmails();
+        List<ezvcard.property.Address>   vPostalAddresses = vcard.getAddresses();
+
+        String organization = vcard.getOrganization() != null && !vcard.getOrganization().getValues().isEmpty() ? vcard.getOrganization().getValues().get(0) : null;
+        String displayName  = vcard.getFormattedName() != null ? vcard.getFormattedName().getValue() : null;
+
+        if (displayName == null && vName != null) {
+            displayName = vName.getGiven();
+        }
+
+        if (displayName == null && vcard.getOrganization() != null) {
+            displayName = organization;
+        }
+
+        if (displayName == null) {
+            Log.w(TAG, "Failed to parse the vcard: No valid name.");
+            return null;
+        }
+
+        Contact.Name name = new Contact.Name(displayName,
+                vName != null ? vName.getGiven() : null,
+                vName != null ? vName.getFamily() : null,
+                vName != null && !vName.getPrefixes().isEmpty() ? vName.getPrefixes().get(0) : null,
+                vName != null && !vName.getSuffixes().isEmpty() ? vName.getSuffixes().get(0) : null,
+                null);
+
+
+        List<Contact.Phone> phoneNumbers = new ArrayList<>(vPhones.size());
+        for (ezvcard.property.Telephone vEmail : vPhones) {
+            String label = !vEmail.getTypes().isEmpty() ? getCleanedVcardType(vEmail.getTypes().get(0).getValue()) : null;
+
+            // Phone number is stored in the uri field in v4.0 only. In other versions, it is in the text field.
+            String phoneNumberFromText  = vEmail.getText();
+            String extractedPhoneNumber = phoneNumberFromText == null ? vEmail.getUri().getNumber() : phoneNumberFromText;
+            phoneNumbers.add(new Contact.Phone(extractedPhoneNumber, phoneTypeFromVcardType(label), label));
+        }
+
+        List<Contact.Email> emails = new ArrayList<>(vEmails.size());
+        for (ezvcard.property.Email vEmail : vEmails) {
+            String label = !vEmail.getTypes().isEmpty() ? getCleanedVcardType(vEmail.getTypes().get(0).getValue()) : null;
+            emails.add(new Contact.Email(vEmail.getValue(), emailTypeFromVcardType(label), label));
+        }
+
+        List<Contact.PostalAddress> postalAddresses = new ArrayList<>(vPostalAddresses.size());
+        for (ezvcard.property.Address vPostalAddress : vPostalAddresses) {
+            String label = !vPostalAddress.getTypes().isEmpty() ? getCleanedVcardType(vPostalAddress.getTypes().get(0).getValue()) : null;
+            postalAddresses.add(new Contact.PostalAddress(postalAddressTypeFromVcardType(label),
+                    label,
+                    vPostalAddress.getStreetAddress(),
+                    vPostalAddress.getPoBox(),
+                    null,
+                    vPostalAddress.getLocality(),
+                    vPostalAddress.getRegion(),
+                    vPostalAddress.getPostalCode(),
+                    vPostalAddress.getCountry()));
+        }
+
+        return new Contact(name, organization, phoneNumbers, emails, postalAddresses, null);
+    }
+
+    static Contact.Phone.Type phoneTypeFromContactType(int type) {
+        switch (type) {
+            case ContactsContract.CommonDataKinds.Phone.TYPE_HOME:
+                return Contact.Phone.Type.HOME;
+            case ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE:
+                return Contact.Phone.Type.MOBILE;
+            case ContactsContract.CommonDataKinds.Phone.TYPE_WORK:
+                return Contact.Phone.Type.WORK;
+        }
+        return Contact.Phone.Type.CUSTOM;
+    }
+
+    private static Contact.Phone.Type phoneTypeFromVcardType(@Nullable String type) {
+        if      ("home".equalsIgnoreCase(type)) return Contact.Phone.Type.HOME;
+        else if ("cell".equalsIgnoreCase(type)) return Contact.Phone.Type.MOBILE;
+        else if ("work".equalsIgnoreCase(type)) return Contact.Phone.Type.WORK;
+        else                                    return Contact.Phone.Type.CUSTOM;
+    }
+
+    static Contact.Email.Type emailTypeFromContactType(int type) {
+        switch (type) {
+            case ContactsContract.CommonDataKinds.Email.TYPE_HOME:
+                return Contact.Email.Type.HOME;
+            case ContactsContract.CommonDataKinds.Email.TYPE_MOBILE:
+                return Contact.Email.Type.MOBILE;
+            case ContactsContract.CommonDataKinds.Email.TYPE_WORK:
+                return Contact.Email.Type.WORK;
+        }
+        return Contact.Email.Type.CUSTOM;
+    }
+
+    private static Contact.Email.Type emailTypeFromVcardType(@Nullable String type) {
+        if      ("home".equalsIgnoreCase(type)) return Contact.Email.Type.HOME;
+        else if ("cell".equalsIgnoreCase(type)) return Contact.Email.Type.MOBILE;
+        else if ("work".equalsIgnoreCase(type)) return Contact.Email.Type.WORK;
+        else                                    return Contact.Email.Type.CUSTOM;
+    }
+
+    static Contact.PostalAddress.Type postalAddressTypeFromContactType(int type) {
+        switch (type) {
+            case ContactsContract.CommonDataKinds.StructuredPostal.TYPE_HOME:
+                return Contact.PostalAddress.Type.HOME;
+            case ContactsContract.CommonDataKinds.StructuredPostal.TYPE_WORK:
+                return Contact.PostalAddress.Type.WORK;
+        }
+        return Contact.PostalAddress.Type.CUSTOM;
+    }
+
+    private static Contact.PostalAddress.Type postalAddressTypeFromVcardType(@Nullable String type) {
+        if      ("home".equalsIgnoreCase(type)) return Contact.PostalAddress.Type.HOME;
+        else if ("work".equalsIgnoreCase(type)) return Contact.PostalAddress.Type.WORK;
+        else                                    return Contact.PostalAddress.Type.CUSTOM;
+    }
+
+    private static String getCleanedVcardType(@Nullable String type) {
+        if (TextUtils.isEmpty(type)) return "";
+
+        if (type.startsWith("x-") && type.length() > 2) {
+            return type.substring(2);
+        }
+
+        return type;
+    }
+
+}

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java

@@ -240,6 +240,7 @@ import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.IdentityUtil;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.MessageUtil;
+import org.thoughtcrime.securesms.util.PlayStoreUtil;
 import org.thoughtcrime.securesms.util.ServiceUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.TextSecurePreferences.MediaKeyboardMode;
@@ -675,11 +676,11 @@ public class ConversationActivity extends PassphraseRequiredActivity
 
       for (Media mediaItem : result.getNonUploadedMedia()) {
         if (MediaUtil.isVideoType(mediaItem.getMimeType())) {
-          slideDeck.addSlide(new VideoSlide(this, mediaItem.getUri(), 0, mediaItem.getCaption().orNull(), mediaItem.getTransformProperties().orNull()));
+          slideDeck.addSlide(new VideoSlide(this, mediaItem.getUri(), mediaItem.getSize(), mediaItem.getWidth(), mediaItem.getHeight(), mediaItem.getCaption().orNull(), mediaItem.getTransformProperties().orNull()));
         } else if (MediaUtil.isGif(mediaItem.getMimeType())) {
-          slideDeck.addSlide(new GifSlide(this, mediaItem.getUri(), 0, mediaItem.getWidth(), mediaItem.getHeight(), mediaItem.isBorderless(), mediaItem.getCaption().orNull()));
+          slideDeck.addSlide(new GifSlide(this, mediaItem.getUri(), mediaItem.getSize(), mediaItem.getWidth(), mediaItem.getHeight(), mediaItem.isBorderless(), mediaItem.getCaption().orNull()));
         } else if (MediaUtil.isImageType(mediaItem.getMimeType())) {
-          slideDeck.addSlide(new ImageSlide(this, mediaItem.getUri(), mediaItem.getMimeType(), 0, mediaItem.getWidth(), mediaItem.getHeight(), mediaItem.isBorderless(), mediaItem.getCaption().orNull(), null));
+          slideDeck.addSlide(new ImageSlide(this, mediaItem.getUri(), mediaItem.getMimeType(), mediaItem.getSize(), mediaItem.getWidth(), mediaItem.getHeight(), mediaItem.isBorderless(), mediaItem.getCaption().orNull(), null));
         } else {
           Log.w(TAG, "Asked to send an unexpected mimeType: '" + mediaItem.getMimeType() + "'. Skipping.");
         }
@@ -814,10 +815,9 @@ public class ConversationActivity extends PassphraseRequiredActivity
         } else {
           menu.findItem(R.id.menu_distribution_conversation).setChecked(true);
         }
-        inflater.inflate(R.menu.conversation_active_group_options, menu);
-      } else if (isActiveV2Group || isActiveGroup) {
-        inflater.inflate(R.menu.conversation_active_group_options, menu);
       }
+
+      inflater.inflate(R.menu.conversation_active_group_options, menu);
     }
 
     inflater.inflate(R.menu.conversation, menu);
@@ -864,7 +864,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
     if (isActiveV2Group) {
       hideMenuItem(menu, R.id.menu_mute_notifications);
       hideMenuItem(menu, R.id.menu_conversation_settings);
-    } else if (isActiveGroup) {
+    } else if (isGroupConversation()) {
       hideMenuItem(menu, R.id.menu_conversation_settings);
     }
 
@@ -1685,6 +1685,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
       reminderView.get().showReminder(new UnauthorizedReminder(this));
     } else if (ExpiredBuildReminder.isEligible()) {
       reminderView.get().showReminder(new ExpiredBuildReminder(this));
+      reminderView.get().setOnActionClickListener(this::handleReminderAction);
     } else if (ServiceOutageReminder.isEligible(this)) {
       ApplicationDependencies.getJobManager().add(new ServiceOutageDetectionJob());
       reminderView.get().showReminder(new ServiceOutageReminder(this));
@@ -1710,6 +1711,9 @@ public class ConversationActivity extends PassphraseRequiredActivity
       case R.id.reminder_action_view_insights:
         InsightsLauncher.showInsightsDashboard(getSupportFragmentManager());
         break;
+      case R.id.reminder_action_update_now:
+        PlayStoreUtil.openPlayStoreOrOurApkDownloadPage(this);
+        break;
       default:
         throw new IllegalArgumentException("Unknown ID: " + reminderActionId);
     }
@@ -1908,13 +1912,10 @@ public class ConversationActivity extends PassphraseRequiredActivity
       if (previewState == null) return;
 
       if (previewState.isLoading()) {
-        Log.d(TAG, "Loading link preview.");
         inputPanel.setLinkPreviewLoading();
       } else if (previewState.hasLinks() && !previewState.getLinkPreview().isPresent()) {
-        Log.d(TAG, "No preview found.");
         inputPanel.setLinkPreviewNoPreview(previewState.getError());
       } else {
-        Log.d(TAG, "Setting link preview: " + previewState.getLinkPreview().isPresent());
         inputPanel.setLinkPreview(glideRequests, previewState.getLinkPreview());
       }
 
@@ -1989,7 +1990,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
     });
 
     composeText.setMentionQueryChangedListener(query -> {
-      if (getRecipient().isPushV2Group()) {
+      if (getRecipient().isPushV2Group() && getRecipient().isActiveGroup()) {
         if (!mentionsSuggestions.resolved()) {
           mentionsSuggestions.get();
         }
@@ -1998,7 +1999,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
     });
 
     composeText.setMentionValidator(annotations -> {
-      if (!getRecipient().isPushV2Group()) {
+      if (!getRecipient().isPushV2Group() || !getRecipient().isActiveGroup()) {
         return annotations;
       }
 
@@ -2225,6 +2226,10 @@ public class ConversationActivity extends PassphraseRequiredActivity
   private Drafts getDraftsForCurrentState() {
     Drafts drafts = new Drafts();
 
+    if (recipient.get().isGroup() && !recipient.get().isActiveGroup()) {
+      return drafts;
+    }
+
     if (!Util.isEmpty(composeText)) {
       drafts.add(new Draft(Draft.TEXT, composeText.getTextTrimmed().toString()));
       List<Mention> draftMentions = composeText.getMentions();
@@ -3034,7 +3039,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
     messageRequestBottomView.setBlockOnClickListener(v -> onMessageRequestBlockClicked(viewModel));
     messageRequestBottomView.setUnblockOnClickListener(v -> onMessageRequestUnblockClicked(viewModel));
 
-    viewModel.getRecipient().observe(this, this::presentMessageRequestBottomViewTo);
+    viewModel.getMessageData().observe(this, this::presentMessageRequestBottomViewTo);
     viewModel.getMessageRequestDisplayState().observe(this, this::presentMessageRequestDisplayState);
     viewModel.getFailures().observe(this, this::showGroupChangeErrorToast);
     viewModel.getMessageRequestStatus().observe(this, status -> {
@@ -3079,7 +3084,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
   {
     reactionOverlay.setOnToolbarItemClickedListener(toolbarListener);
     reactionOverlay.setOnHideListener(onHideListener);
-    reactionOverlay.show(this, maskTarget, messageRecord, inputAreaHeight());
+    reactionOverlay.show(this, maskTarget, recipient.get(), messageRecord, inputAreaHeight());
   }
 
   @Override
@@ -3332,7 +3337,6 @@ public class ConversationActivity extends PassphraseRequiredActivity
     long       expiresIn      = recipient.get().getExpireMessages() * 1000L;
     int        subscriptionId = sendButton.getSelectedTransport().getSimSubscriptionId().or(-1);
     boolean    initiating     = threadId == -1;
-    QuoteModel quote          = inputPanel.getQuote().orNull();
     SlideDeck  slideDeck      = new SlideDeck();
 
     if (MediaUtil.isGif(contentType)) {
@@ -3346,7 +3350,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
     sendMediaMessage(isSmsForced(),
                      "",
                      slideDeck,
-                     quote,
+                     null,
                      Collections.emptyList(),
                      Collections.emptyList(),
                      composeText.getMentions(),
@@ -3354,7 +3358,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
                      false,
                      subscriptionId,
                      initiating,
-                     true);
+                     false);
   }
 
   private class UnverifiedDismissedListener implements UnverifiedBannerView.DismissListener {
@@ -3448,10 +3452,10 @@ public class ConversationActivity extends PassphraseRequiredActivity
     }
   }
 
-  private void presentMessageRequestBottomViewTo(@Nullable Recipient recipient) {
-    if (recipient == null) return;
+  private void presentMessageRequestBottomViewTo(@Nullable MessageRequestViewModel.MessageData messageData) {
+    if (messageData == null) return;
 
-    messageRequestBottomView.setRecipient(recipient);
+    messageRequestBottomView.setMessageData(messageData);
   }
 
   private static class KeyboardImageDetails {

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java

@@ -27,6 +27,7 @@ import androidx.annotation.LayoutRes;
 import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.lifecycle.LifecycleOwner;
 import androidx.paging.PagedList;
 import androidx.paging.PagedListAdapter;
 import androidx.recyclerview.widget.DiffUtil;
@@ -84,6 +85,7 @@ public class ConversationAdapter
   private static final long FOOTER_ID = Long.MIN_VALUE + 1;
 
   private final ItemClickListener clickListener;
+  private final LifecycleOwner    lifecycleOwner;
   private final GlideRequests     glideRequests;
   private final Locale            locale;
   private final Recipient         recipient;
@@ -99,12 +101,14 @@ public class ConversationAdapter
   private View                headerView;
   private View                footerView;
 
-  ConversationAdapter(@NonNull GlideRequests glideRequests,
+  ConversationAdapter(@NonNull LifecycleOwner lifecycleOwner,
+                      @NonNull GlideRequests glideRequests,
                       @NonNull Locale locale,
                       @Nullable ItemClickListener clickListener,
                       @NonNull Recipient recipient)
   {
     super(new DiffCallback());
+    this.lifecycleOwner = lifecycleOwner;
 
     this.glideRequests       = glideRequests;
     this.locale              = locale;
@@ -170,8 +174,6 @@ public class ConversationAdapter
       case MESSAGE_TYPE_OUTGOING_TEXT:
       case MESSAGE_TYPE_OUTGOING_MULTIMEDIA:
       case MESSAGE_TYPE_UPDATE:
-        long start = System.currentTimeMillis();
-
         View                     itemView = CachedInflater.from(parent.getContext()).inflate(getLayoutForViewType(viewType), parent, false);
         BindableConversationItem bindable = (BindableConversationItem) itemView;
 
@@ -190,7 +192,6 @@ public class ConversationAdapter
 
         bindable.setEventListener(clickListener);
 
-        Log.d(TAG, String.format(Locale.US, "Inflate time: %d ms for View type: %d", System.currentTimeMillis() - start, viewType));
         return new ConversationViewHolder(itemView);
       case MESSAGE_TYPE_PLACEHOLDER:
         View v = new FrameLayout(parent.getContext());
@@ -219,7 +220,8 @@ public class ConversationAdapter
         ConversationMessage previousMessage = adapterPosition < getItemCount() - 1  && !isFooterPosition(adapterPosition + 1) ? getItem(adapterPosition + 1) : null;
         ConversationMessage nextMessage     = adapterPosition > 0                   && !isHeaderPosition(adapterPosition - 1) ? getItem(adapterPosition - 1) : null;
 
-        conversationViewHolder.getBindable().bind(conversationMessage,
+        conversationViewHolder.getBindable().bind(lifecycleOwner,
+                                                  conversationMessage,
                                                   Optional.fromNullable(previousMessage != null ? previousMessage.getMessageRecord() : null),
                                                   Optional.fromNullable(nextMessage != null ? nextMessage.getMessageRecord() : null),
                                                   glideRequests,

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationDataSource.java

@@ -84,6 +84,8 @@ class ConversationDataSource extends PositionalDataSource<ConversationMessage> {
       }
     }
 
+    long mentionStart = System.currentTimeMillis();
+
     mentionHelper.fetchMentions(context);
 
     if (!isInvalid()) {
@@ -94,7 +96,7 @@ class ConversationDataSource extends PositionalDataSource<ConversationMessage> {
                                               .toList();
 
       callback.onResult(items, params.requestedStartPosition, result.getTotal());
-      Log.d(TAG, "[Initial Load] " + (System.currentTimeMillis() - start) + " ms | thread: " + threadId + ", start: " + params.requestedStartPosition + ", requestedSize: " + params.requestedLoadSize + ", actualSize: " + result.getItems().size() + ", totalCount: " + result.getTotal());
+      Log.d(TAG, "[Initial Load] " + (System.currentTimeMillis() - start) + " ms (mentions: " + (System.currentTimeMillis() - mentionStart) + " ms) | thread: " + threadId + ", start: " + params.requestedStartPosition + ", requestedSize: " + params.requestedLoadSize + ", actualSize: " + result.getItems().size() + ", totalCount: " + result.getTotal());
     } else {
       Log.d(TAG, "[Initial Load] " + (System.currentTimeMillis() - start) + " ms | thread: " + threadId + ", start: " + params.requestedStartPosition + ", requestedSize: " + params.requestedLoadSize + ", totalCount: " + totalCount + " -- invalidated");
     }
@@ -116,6 +118,8 @@ class ConversationDataSource extends PositionalDataSource<ConversationMessage> {
       }
     }
 
+    long mentionStart = System.currentTimeMillis();
+
     mentionHelper.fetchMentions(context);
 
     List<ConversationMessage> items = Stream.of(records)
@@ -123,7 +127,7 @@ class ConversationDataSource extends PositionalDataSource<ConversationMessage> {
                                             .toList();
     callback.onResult(items);
 
-    Log.d(TAG, "[Update] " + (System.currentTimeMillis() - start) + " ms | thread: " + threadId + ", start: " + params.startPosition + ", size: " + params.loadSize + (isInvalid() ? " -- invalidated" : ""));
+    Log.d(TAG, "[Update] " + (System.currentTimeMillis() - start) + " ms (mentions: " + (System.currentTimeMillis() - mentionStart) + " ms) | thread: " + threadId + ", start: " + params.startPosition + ", size: " + params.loadSize + (isInvalid() ? " -- invalidated" : ""));
   }
 
   private static class MentionHelper {

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java

@@ -226,7 +226,10 @@ public class ConversationFragment extends LoggingFragment {
 
     new ConversationItemSwipeCallback(
             conversationMessage -> actionMode == null &&
-                                   MenuState.canReplyToMessage(MenuState.isActionMessage(conversationMessage.getMessageRecord()), conversationMessage.getMessageRecord(), messageRequestViewModel.shouldShowMessageRequest()),
+                                   MenuState.canReplyToMessage(recipient.get(),
+                                                               MenuState.isActionMessage(conversationMessage.getMessageRecord()),
+                                                               conversationMessage.getMessageRecord(),
+                                                               messageRequestViewModel.shouldShowMessageRequest()),
             this::handleReplyMessage
     ).attachToRecyclerView(list);
 
@@ -479,7 +482,7 @@ public class ConversationFragment extends LoggingFragment {
   private void initializeListAdapter() {
     if (this.recipient != null && this.threadId != -1) {
       Log.d(TAG, "Initializing adapter for " + recipient.getId());
-      ConversationAdapter adapter = new ConversationAdapter(GlideApp.with(this), locale, selectionClickListener, this.recipient.get());
+      ConversationAdapter adapter = new ConversationAdapter(this, GlideApp.with(this), locale, selectionClickListener, this.recipient.get());
       list.setAdapter(adapter);
       setStickyHeaderDecoration(adapter);
       ConversationAdapter.initializePool(list.getRecycledViewPool());
@@ -573,7 +576,7 @@ public class ConversationFragment extends LoggingFragment {
       return;
     }
 
-    MenuState menuState = MenuState.getMenuState(Stream.of(messages).map(ConversationMessage::getMessageRecord).collect(Collectors.toSet()), messageRequestViewModel.shouldShowMessageRequest());
+    MenuState menuState = MenuState.getMenuState(recipient.get(), Stream.of(messages).map(ConversationMessage::getMessageRecord).collect(Collectors.toSet()), messageRequestViewModel.shouldShowMessageRequest());
 
     menu.findItem(R.id.menu_context_forward).setVisible(menuState.shouldShowForwardAction());
     menu.findItem(R.id.menu_context_reply).setVisible(menuState.shouldShowReplyAction());
@@ -662,53 +665,7 @@ public class ConversationFragment extends LoggingFragment {
 
   private void handleDeleteMessages(final Set<ConversationMessage> conversationMessages) {
     Set<MessageRecord> messageRecords = Stream.of(conversationMessages).map(ConversationMessage::getMessageRecord).collect(Collectors.toSet());
-    if (FeatureFlags.remoteDelete()) {
-      buildRemoteDeleteConfirmationDialog(messageRecords).show();
-    } else {
-      buildLegacyDeleteConfirmationDialog(messageRecords).show();
-    }
-  }
-
-  private AlertDialog.Builder buildLegacyDeleteConfirmationDialog(Set<MessageRecord> messageRecords) {
-    int                 messagesCount = messageRecords.size();
-    AlertDialog.Builder builder       = new AlertDialog.Builder(getActivity());
-
-    builder.setIconAttribute(R.attr.dialog_alert_icon);
-    builder.setTitle(getActivity().getResources().getQuantityString(R.plurals.ConversationFragment_delete_selected_messages, messagesCount, messagesCount));
-    builder.setMessage(getActivity().getResources().getQuantityString(R.plurals.ConversationFragment_this_will_permanently_delete_all_n_selected_messages, messagesCount, messagesCount));
-    builder.setCancelable(true);
-
-    builder.setPositiveButton(R.string.delete, (dialog, which) -> {
-      new ProgressDialogAsyncTask<Void, Void, Void>(getActivity(),
-                                                    R.string.ConversationFragment_deleting,
-                                                    R.string.ConversationFragment_deleting_messages)
-      {
-        @Override
-        protected Void doInBackground(Void... voids) {
-          for (MessageRecord messageRecord : messageRecords) {
-            boolean threadDeleted;
-
-            if (messageRecord.isMms()) {
-              threadDeleted = DatabaseFactory.getMmsDatabase(getActivity()).deleteMessage(messageRecord.getId());
-            } else {
-              threadDeleted = DatabaseFactory.getSmsDatabase(getActivity()).deleteMessage(messageRecord.getId());
-            }
-
-            if (threadDeleted) {
-              threadId = -1;
-              conversationViewModel.clearThreadId();
-              messageCountsViewModel.clearThreadId();
-              listener.setThreadId(threadId);
-            }
-          }
-
-          return null;
-        }
-      }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-    });
-
-    builder.setNegativeButton(android.R.string.cancel, null);
-    return builder;
+    buildRemoteDeleteConfirmationDialog(messageRecords).show();
   }
 
   private AlertDialog.Builder buildRemoteDeleteConfirmationDialog(Set<MessageRecord> messageRecords) {
@@ -769,7 +726,7 @@ public class ConversationFragment extends LoggingFragment {
       deleteForEveryone.run();
     } else {
       new AlertDialog.Builder(requireActivity())
-                     .setMessage(R.string.ConversationFragment_this_message_will_be_permanently_deleted_for_everyone)
+                     .setMessage(R.string.ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation)
                      .setPositiveButton(R.string.ConversationFragment_delete_for_everyone, (dialog, which) -> {
                        SignalStore.uiHints().markHasConfirmedDeleteForEveryoneOnce();
                        deleteForEveryone.run();
@@ -810,7 +767,7 @@ public class ConversationFragment extends LoggingFragment {
                                                .toList();
 
           for (Attachment attachment : attachments) {
-            Uri uri = attachment.getDataUri() != null ? attachment.getDataUri() : attachment.getThumbnailUri();
+            Uri uri = attachment.getUri();
 
             if (uri != null) {
               mediaList.add(new Media(uri,
@@ -1223,11 +1180,12 @@ public class ConversationFragment extends LoggingFragment {
 
       MessageRecord messageRecord = conversationMessage.getMessageRecord();
 
-      if (messageRecord.isSecure()                            &&
-          !messageRecord.isRemoteDelete()                     &&
-          !messageRecord.isUpdate()                           &&
-          !recipient.get().isBlocked()                        &&
-          !messageRequestViewModel.shouldShowMessageRequest() &&
+      if (messageRecord.isSecure()                                        &&
+          !messageRecord.isRemoteDelete()                                 &&
+          !messageRecord.isUpdate()                                       &&
+          !recipient.get().isBlocked()                                    &&
+          !messageRequestViewModel.shouldShowMessageRequest()             &&
+          (!recipient.get().isGroup() || recipient.get().isActiveGroup()) &&
           ((ConversationAdapter) list.getAdapter()).getSelectedItems().isEmpty())
       {
         isReacting = true;
@@ -1424,7 +1382,10 @@ public class ConversationFragment extends LoggingFragment {
     public ConversationSnapToTopDataObserver(@NonNull RecyclerView recyclerView,
                                              @Nullable ScrollRequestValidator scrollRequestValidator)
     {
-      super(recyclerView, scrollRequestValidator);
+      super(recyclerView, scrollRequestValidator, () -> {
+        list.scrollToPosition(0);
+        list.post(ConversationFragment.this::postMarkAsReadRequest);
+      });
     }
 
     @Override

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java

@@ -54,6 +54,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
+import androidx.lifecycle.LifecycleOwner;
 
 import com.annimon.stream.Stream;
 
@@ -79,8 +80,6 @@ import org.thoughtcrime.securesms.contactshare.Contact;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MessageDatabase;
-import org.thoughtcrime.securesms.database.MmsDatabase;
-import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
 import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
@@ -116,9 +115,9 @@ import org.thoughtcrime.securesms.util.LongClickMovementMethod;
 import org.thoughtcrime.securesms.util.SearchUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.ThemeUtil;
+import org.thoughtcrime.securesms.util.UrlClickHandler;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.VibrateUtil;
-import org.thoughtcrime.securesms.util.UrlClickHandler;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.views.Stub;
 import org.whispersystems.libsignal.util.guava.Optional;
@@ -250,7 +249,8 @@ public class ConversationItem extends LinearLayout implements BindableConversati
   }
 
   @Override
-  public void bind(@NonNull ConversationMessage conversationMessage,
+  public void bind(@NonNull LifecycleOwner lifecycleOwner,
+                   @NonNull ConversationMessage conversationMessage,
                    @NonNull Optional<MessageRecord> previousMessageRecord,
                    @NonNull Optional<MessageRecord> nextMessageRecord,
                    @NonNull GlideRequests glideRequests,
@@ -336,6 +336,16 @@ public class ConversationItem extends LinearLayout implements BindableConversati
       }
     }
 
+    if (hasSharedContact(messageRecord)) {
+      int contactWidth   = sharedContactStub.get().getMeasuredWidth();
+      int availableWidth = getAvailableMessageBubbleWidth(sharedContactStub.get());
+
+      if (contactWidth != availableWidth) {
+        sharedContactStub.get().getLayoutParams().width = availableWidth;
+        needsMeasure = true;
+      }
+    }
+
     ConversationItemFooter activeFooter   = getActiveFooter(messageRecord);
     int                    availableWidth = getAvailableMessageBubbleWidth(footer);
 
@@ -892,12 +902,14 @@ public class ConversationItem extends LinearLayout implements BindableConversati
   }
 
   private void setSharedContactCorners(@NonNull MessageRecord current, @NonNull Optional<MessageRecord> previous, @NonNull Optional<MessageRecord> next, boolean isGroupThread) {
-    if (isSingularMessage(current, previous, next, isGroupThread) || isEndOfMessageCluster(current, next, isGroupThread)) {
-      sharedContactStub.get().setSingularStyle();
-    } else if (current.isOutgoing()) {
-      sharedContactStub.get().setClusteredOutgoingStyle();
-    } else {
-      sharedContactStub.get().setClusteredIncomingStyle();
+    if (TextUtils.isEmpty(messageRecord.getDisplayBody(getContext()))){
+      if (isSingularMessage(current, previous, next, isGroupThread) || isEndOfMessageCluster(current, next, isGroupThread)) {
+          sharedContactStub.get().setSingularStyle();
+      } else if (current.isOutgoing()) {
+          sharedContactStub.get().setClusteredOutgoingStyle();
+      } else {
+          sharedContactStub.get().setClusteredIncomingStyle();
+      }
     }
   }
 
@@ -1075,7 +1087,7 @@ public class ConversationItem extends LinearLayout implements BindableConversati
   private ConversationItemFooter getActiveFooter(@NonNull MessageRecord messageRecord) {
     if (hasSticker(messageRecord) || isBorderless(messageRecord)) {
       return stickerFooter;
-    } else if (hasSharedContact(messageRecord)) {
+    } else if (hasSharedContact(messageRecord) && TextUtils.isEmpty(messageRecord.getDisplayBody(getContext()))) {
       return sharedContactStub.get().getFooter();
     } else if (hasOnlyThumbnail(messageRecord) && TextUtils.isEmpty(messageRecord.getDisplayBody(getContext()))) {
       return mediaThumbnailStub.get().getFooter();
@@ -1442,7 +1454,7 @@ public class ConversationItem extends LinearLayout implements BindableConversati
         Log.i(TAG, "Public URI: " + publicUri);
         Intent intent = new Intent(Intent.ACTION_VIEW);
         intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-        intent.setDataAndType(PartAuthority.getAttachmentPublicUri(slide.getUri()), slide.getContentType());
+        intent.setDataAndType(PartAuthority.getAttachmentPublicUri(slide.getUri()), Intent.normalizeMimeType(slide.getContentType()));
         try {
           context.startActivity(intent);
         } catch (ActivityNotFoundException anfe) {
@@ -1509,7 +1521,7 @@ public class ConversationItem extends LinearLayout implements BindableConversati
 
     @Override
     public void onClick(@NonNull View widget) {
-      if (eventListener != null && !Recipient.resolved(mentionedRecipientId).isLocalNumber()) {
+      if (eventListener != null) {
         VibrateUtil.vibrateTick(context);
         eventListener.onGroupMemberClicked(mentionedRecipientId, conversationRecipient.get().requireGroupId());
       }

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java

@@ -5,9 +5,7 @@ import android.animation.AnimatorSet;
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.PointF;
-import android.graphics.PorterDuff;
 import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.util.AttributeSet;
 import android.view.HapticFeedbackConstants;
@@ -24,7 +22,6 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.widget.Toolbar;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.ConstraintSet;
-import androidx.core.content.ContextCompat;
 import androidx.vectordrawable.graphics.drawable.AnimatorInflaterCompat;
 
 import com.annimon.stream.Stream;
@@ -60,6 +57,7 @@ public final class ConversationReactionOverlay extends RelativeLayout {
   private final PointF   lastSeenDownPoint       = new PointF();
 
   private Activity      activity;
+  private Recipient     conversationRecipient;
   private MessageRecord messageRecord;
   private OverlayState  overlayState = OverlayState.HIDDEN;
 
@@ -145,15 +143,21 @@ public final class ConversationReactionOverlay extends RelativeLayout {
     maskView.setTargetParentTranslationY(translationY);
   }
 
-  public void show(@NonNull Activity activity, @NonNull View maskTarget, @NonNull MessageRecord messageRecord, int maskPaddingBottom) {
+  public void show(@NonNull Activity activity,
+                   @NonNull View maskTarget,
+                   @NonNull Recipient conversationRecipient,
+                   @NonNull MessageRecord messageRecord,
+                   int maskPaddingBottom)
+  {
 
     if (overlayState != OverlayState.HIDDEN) {
       return;
     }
 
-    this.messageRecord = messageRecord;
-    overlayState       = OverlayState.UNINITAILIZED;
-    selected           = -1;
+    this.messageRecord         = messageRecord;
+    this.conversationRecipient = conversationRecipient;
+    overlayState               = OverlayState.UNINITAILIZED;
+    selected                   = -1;
 
     setupToolbarMenuItems();
     setupSelectedEmoji();
@@ -498,7 +502,7 @@ public final class ConversationReactionOverlay extends RelativeLayout {
   }
 
   private void setupToolbarMenuItems() {
-    MenuState menuState = MenuState.getMenuState(Collections.singleton(messageRecord), false);
+    MenuState menuState = MenuState.getMenuState(conversationRecipient, Collections.singleton(messageRecord), false);
 
     toolbar.getMenu().findItem(R.id.action_copy).setVisible(menuState.shouldShowCopyAction());
     toolbar.getMenu().findItem(R.id.action_download).setVisible(menuState.shouldShowSaveAttachmentAction());

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java

@@ -14,6 +14,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
+import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.Transformations;
@@ -29,13 +30,12 @@ import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.LiveRecipient;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientForeverObserver;
 import org.thoughtcrime.securesms.util.DateUtils;
-import org.thoughtcrime.securesms.util.Debouncer;
 import org.thoughtcrime.securesms.util.ExpirationUtil;
 import org.thoughtcrime.securesms.util.IdentityUtil;
 import org.thoughtcrime.securesms.util.ThemeUtil;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
+import org.thoughtcrime.securesms.util.livedata.LiveDataUtil;
 import org.whispersystems.libsignal.util.guava.Optional;
 
 import java.util.Locale;
@@ -44,9 +44,7 @@ import java.util.Set;
 import java.util.concurrent.ExecutionException;
 
 public final class ConversationUpdateItem extends LinearLayout
-                                          implements RecipientForeverObserver,
-                                                     BindableConversationItem,
-                                                     Observer<SpannableString>
+                                          implements BindableConversationItem
 {
   private static final String TAG = ConversationUpdateItem.class.getSimpleName();
 
@@ -62,7 +60,8 @@ public final class ConversationUpdateItem extends LinearLayout
   private Locale                    locale;
   private LiveData<SpannableString> displayBody;
 
-  private final Debouncer bodyClearDebouncer = new Debouncer(150);
+  private final UpdateObserver updateObserver = new UpdateObserver();
+  private final SenderObserver senderObserver = new SenderObserver();
 
   public ConversationUpdateItem(Context context) {
     super(context);
@@ -85,7 +84,8 @@ public final class ConversationUpdateItem extends LinearLayout
   }
 
   @Override
-  public void bind(@NonNull ConversationMessage conversationMessage,
+  public void bind(@NonNull LifecycleOwner lifecycleOwner,
+                   @NonNull ConversationMessage conversationMessage,
                    @NonNull Optional<MessageRecord> previousMessageRecord,
                    @NonNull Optional<MessageRecord> nextMessageRecord,
                    @NonNull GlideRequests glideRequests,
@@ -97,13 +97,7 @@ public final class ConversationUpdateItem extends LinearLayout
   {
     this.batchSelected = batchSelected;
 
-    bind(conversationMessage, locale);
-  }
-
-  @Override
-  protected void onDetachedFromWindow() {
-    unbind();
-    super.onDetachedFromWindow();
+    bind(lifecycleOwner, conversationMessage, locale);
   }
 
   @Override
@@ -116,49 +110,66 @@ public final class ConversationUpdateItem extends LinearLayout
     return conversationMessage;
   }
 
-  private void bind(@NonNull ConversationMessage conversationMessage, @NonNull Locale locale) {
-    if (this.sender != null) {
-      this.sender.removeForeverObserver(this);
-    }
-
-    observeDisplayBody(null);
-    setBodyText(null);
-
+  private void bind(@NonNull LifecycleOwner lifecycleOwner, @NonNull ConversationMessage conversationMessage, @NonNull Locale locale) {
     this.conversationMessage = conversationMessage;
     this.messageRecord       = conversationMessage.getMessageRecord();
-    this.sender              = messageRecord.getIndividualRecipient().live();
     this.locale              = locale;
 
-    this.sender.observeForever(this);
+    observeSender(lifecycleOwner, messageRecord.getIndividualRecipient());
 
     UpdateDescription         updateDescription      = Objects.requireNonNull(messageRecord.getUpdateDisplayBody(getContext()));
     LiveData<String>          liveUpdateMessage      = LiveUpdateMessage.fromMessageDescription(updateDescription);
-    LiveData<SpannableString> spannableStringMessage = Transformations.map(liveUpdateMessage, SpannableString::new);
+    LiveData<SpannableString> spannableStringMessage = toSpannable(loading(liveUpdateMessage));
 
     present(conversationMessage);
 
-    observeDisplayBody(spannableStringMessage);
+    observeDisplayBody(lifecycleOwner, spannableStringMessage);
   }
 
-  private void observeDisplayBody(@Nullable LiveData<SpannableString> displayBody) {
+  /** After a short delay, if the main data hasn't shown yet, then a loading message is displayed. */
+  private @NonNull LiveData<String> loading(@NonNull LiveData<String> string) {
+    return LiveDataUtil.until(string, LiveDataUtil.delay(250, getContext().getString(R.string.ConversationUpdateItem_loading)));
+  }
+
+  private static LiveData<SpannableString> toSpannable(LiveData<String> loading) {
+    return Transformations.map(loading, source -> source == null ? null : new SpannableString(source));
+  }
+
+  @Override
+  public void unbind() {
+  }
+
+  private void observeSender(@NonNull LifecycleOwner lifecycleOwner, @Nullable Recipient recipient) {
+    if (sender != null) {
+      sender.getLiveData().removeObserver(senderObserver);
+    }
+
+    if (recipient != null) {
+      sender = recipient.live();
+      sender.getLiveData().observe(lifecycleOwner, senderObserver);
+    } else {
+      sender = null;
+    }
+  }
+
+  private void observeDisplayBody(@NonNull LifecycleOwner lifecycleOwner, @Nullable LiveData<SpannableString> displayBody) {
     if (this.displayBody != displayBody) {
       if (this.displayBody != null) {
-        this.displayBody.removeObserver(this);
+        this.displayBody.removeObserver(updateObserver);
       }
 
       this.displayBody = displayBody;
 
       if (this.displayBody != null) {
-        this.displayBody.observeForever(this);
+        this.displayBody.observe(lifecycleOwner, updateObserver);
       }
     }
   }
 
   private void setBodyText(@Nullable CharSequence text) {
     if (text == null) {
-      bodyClearDebouncer.publish(() -> body.setText(null));
+      body.setVisibility(INVISIBLE);
     } else {
-      bodyClearDebouncer.clear();
       body.setText(text);
       body.setVisibility(VISIBLE);
     }
@@ -186,7 +197,7 @@ public final class ConversationUpdateItem extends LinearLayout
     else if (messageRecord.isOutgoingCall()) icon.setImageResource(R.drawable.ic_call_made_grey600_24dp);
     else                                     icon.setImageResource(R.drawable.ic_call_missed_grey600_24dp);
 
-    date.setText(DateUtils.getExtendedRelativeTimeSpanString(getContext(), locale, messageRecord.getDateReceived()));
+    date.setText(DateUtils.getExtendedRelativeTimeSpanString(getContext(), locale, messageRecord.getDateSent()));
 
     title.setVisibility(GONE);
     date.setVisibility(View.VISIBLE);
@@ -257,28 +268,25 @@ public final class ConversationUpdateItem extends LinearLayout
     icon.setColorFilter(getIconTintFilter());
   }
 
-  @Override
-  public void onRecipientChanged(@NonNull Recipient recipient) {
-    present(conversationMessage);
-  }
-
   @Override
   public void setOnClickListener(View.OnClickListener l) {
     super.setOnClickListener(new InternalClickListener(l));
   }
 
-  @Override
-  public void unbind() {
-    if (sender != null) {
-      sender.removeForeverObserver(this);
-    }
+  private final class SenderObserver implements Observer<Recipient> {
 
-    observeDisplayBody(null);
+    @Override
+    public void onChanged(Recipient recipient) {
+      present(conversationMessage);
+    }
   }
 
-  @Override
-  public void onChanged(SpannableString update) {
-    setBodyText(update);
+  private final class UpdateObserver implements Observer<SpannableString> {
+
+    @Override
+    public void onChanged(SpannableString update) {
+      setBodyText(update);
+    }
   }
 
   private class InternalClickListener implements View.OnClickListener {

app/src/main/java/org/thoughtcrime/securesms/conversation/MenuState.java

@@ -5,6 +5,7 @@ import androidx.annotation.NonNull;
 import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
+import org.thoughtcrime.securesms.recipients.Recipient;
 
 import java.util.Set;
 
@@ -50,7 +51,8 @@ final class MenuState {
     return copy;
   }
 
-  static MenuState getMenuState(@NonNull Set<MessageRecord> messageRecords,
+  static MenuState getMenuState(@NonNull Recipient conversationRecipient,
+                                @NonNull Set<MessageRecord> messageRecords,
                                 boolean shouldShowMessageRequest)
   {
     
@@ -102,20 +104,21 @@ final class MenuState {
                                              ((MediaMmsMessageRecord)messageRecord).getSlideDeck().getStickerSlide() == null)
              .shouldShowForwardAction(!actionMessage && !sharedContact && !viewOnce && !remoteDelete)
              .shouldShowDetailsAction(!actionMessage)
-             .shouldShowReplyAction(canReplyToMessage(actionMessage, messageRecord, shouldShowMessageRequest));
+             .shouldShowReplyAction(canReplyToMessage(conversationRecipient, actionMessage, messageRecord, shouldShowMessageRequest));
     }
 
     return builder.shouldShowCopyAction(!actionMessage && !remoteDelete && hasText)
                   .build();
   }
 
-  static boolean canReplyToMessage(boolean actionMessage, @NonNull MessageRecord messageRecord, boolean isDisplayingMessageRequest) {
-    return !actionMessage                  &&
-           !messageRecord.isRemoteDelete() &&
-           !messageRecord.isPending()      &&
-           !messageRecord.isFailed()       &&
-           !isDisplayingMessageRequest     &&
-           messageRecord.isSecure()        &&
+  static boolean canReplyToMessage(@NonNull Recipient conversationRecipient, boolean actionMessage, @NonNull MessageRecord messageRecord, boolean isDisplayingMessageRequest) {
+    return !actionMessage                                                              &&
+           !messageRecord.isRemoteDelete()                                             &&
+           !messageRecord.isPending()                                                  &&
+           !messageRecord.isFailed()                                                   &&
+           !isDisplayingMessageRequest                                                 &&
+           messageRecord.isSecure()                                                    &&
+           (!conversationRecipient.isGroup() || conversationRecipient.isActiveGroup()) &&
            !messageRecord.getRecipient().isBlocked();
   }
 

app/src/main/java/org/thoughtcrime/securesms/conversation/ui/mentions/MentionViewHolder.java

@@ -1,48 +0,0 @@
-package org.thoughtcrime.securesms.conversation.ui.mentions;
-
-import android.view.View;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.components.AvatarImageView;
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.util.MappingAdapter;
-import org.thoughtcrime.securesms.util.MappingViewHolder;
-
-public class MentionViewHolder extends MappingViewHolder<MentionViewState> {
-
-  private final AvatarImageView avatar;
-  private final TextView        name;
-
-  @Nullable private final MentionEventsListener mentionEventsListener;
-
-  public MentionViewHolder(@NonNull View itemView, @Nullable MentionEventsListener mentionEventsListener) {
-    super(itemView);
-    this.mentionEventsListener = mentionEventsListener;
-
-    avatar   = findViewById(R.id.mention_recipient_avatar);
-    name     = findViewById(R.id.mention_recipient_name);
-  }
-
-  @Override
-  public void bind(@NonNull MentionViewState model) {
-    avatar.setRecipient(model.getRecipient());
-    name.setText(model.getName(context));
-    itemView.setOnClickListener(v -> {
-      if (mentionEventsListener != null) {
-        mentionEventsListener.onMentionClicked(model.getRecipient());
-      }
-    });
-  }
-
-  public interface MentionEventsListener {
-    void onMentionClicked(@NonNull Recipient recipient);
-  }
-
-  public static MappingAdapter.Factory<MentionViewState> createFactory(@Nullable MentionEventsListener mentionEventsListener) {
-    return new MappingAdapter.LayoutFactory<>(view -> new MentionViewHolder(view, mentionEventsListener), R.layout.mentions_picker_recipient_list_item);
-  }
-}

app/src/main/java/org/thoughtcrime/securesms/conversation/ui/mentions/MentionViewState.java

@@ -1,17 +1,11 @@
 package org.thoughtcrime.securesms.conversation.ui.mentions;
 
-import android.content.Context;
-
 import androidx.annotation.NonNull;
 
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.util.MappingModel;
-import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.util.viewholders.RecipientMappingModel;
 
-import java.util.Objects;
-
-public final class MentionViewState implements MappingModel<MentionViewState> {
+public final class MentionViewState extends RecipientMappingModel<MentionViewState> {
 
   private final Recipient recipient;
 
@@ -19,23 +13,8 @@ public final class MentionViewState implements MappingModel<MentionViewState> {
     this.recipient = recipient;
   }
 
-  @NonNull String getName(@NonNull Context context) {
-    return recipient.getDisplayName(context);
-  }
-
-  @NonNull Recipient getRecipient() {
+  @Override
+  public @NonNull Recipient getRecipient() {
     return recipient;
   }
-
-  @Override
-  public boolean areItemsTheSame(@NonNull MentionViewState newItem) {
-    return recipient.getId().equals(newItem.recipient.getId());
-  }
-
-  @Override
-  public boolean areContentsTheSame(@NonNull MentionViewState newItem) {
-    Context context = ApplicationDependencies.getApplication();
-    return recipient.getDisplayName(context).equals(newItem.recipient.getDisplayName(context)) &&
-           Objects.equals(recipient.getProfileAvatar(), newItem.recipient.getProfileAvatar());
-  }
 }

app/src/main/java/org/thoughtcrime/securesms/conversation/ui/mentions/MentionsPickerAdapter.java

@@ -3,18 +3,20 @@ package org.thoughtcrime.securesms.conversation.ui.mentions;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.thoughtcrime.securesms.conversation.ui.mentions.MentionViewHolder.MentionEventsListener;
+import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.util.MappingAdapter;
 import org.thoughtcrime.securesms.util.MappingModel;
+import org.thoughtcrime.securesms.util.viewholders.RecipientViewHolder;
+import org.thoughtcrime.securesms.util.viewholders.RecipientViewHolder.EventListener;
 
 import java.util.List;
 
 public class MentionsPickerAdapter extends MappingAdapter {
   private final Runnable currentListChangedListener;
 
-  public MentionsPickerAdapter(@Nullable MentionEventsListener mentionEventsListener, @NonNull Runnable currentListChangedListener) {
+  public MentionsPickerAdapter(@Nullable EventListener<MentionViewState> listener, @NonNull Runnable currentListChangedListener) {
     this.currentListChangedListener = currentListChangedListener;
-    registerFactory(MentionViewState.class, MentionViewHolder.createFactory(mentionEventsListener));
+    registerFactory(MentionViewState.class, RecipientViewHolder.createFactory(R.layout.mentions_picker_recipient_list_item, listener));
   }
 
   @Override

app/src/main/java/org/thoughtcrime/securesms/conversation/ui/mentions/MentionsPickerFragment.java

@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.conversation.ui.mentions;
 
 import android.os.Bundle;
+import android.os.Handler;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -24,12 +25,14 @@ import java.util.List;
 
 public class MentionsPickerFragment extends LoggingFragment {
 
-  private MentionsPickerAdapter     adapter;
-  private RecyclerView              list;
-  private View                      topDivider;
-  private View                      bottomDivider;
-  private BottomSheetBehavior<View> behavior;
-  private MentionsPickerViewModel   viewModel;
+  private       MentionsPickerAdapter     adapter;
+  private       RecyclerView              list;
+  private       View                      topDivider;
+  private       View                      bottomDivider;
+  private       BottomSheetBehavior<View> behavior;
+  private       MentionsPickerViewModel   viewModel;
+  private final Runnable                  lockSheetAfterListUpdate = () -> behavior.setHideable(false);
+  private final Handler                   handler                  = new Handler();
 
   @Override
   public @Nullable View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -62,6 +65,7 @@ public class MentionsPickerFragment extends LoggingFragment {
   }
 
   private void initializeBehavior() {
+    behavior.setHideable(true);
     behavior.setState(BottomSheetBehavior.STATE_HIDDEN);
 
     behavior.addBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
@@ -69,6 +73,7 @@ public class MentionsPickerFragment extends LoggingFragment {
       public void onStateChanged(@NonNull View bottomSheet, int newState) {
         if (newState == BottomSheetBehavior.STATE_HIDDEN) {
           adapter.submitList(Collections.emptyList());
+          showDividers(false);
         } else {
           showDividers(true);
         }
@@ -109,9 +114,10 @@ public class MentionsPickerFragment extends LoggingFragment {
     if (isShowing) {
       list.scrollToPosition(0);
       behavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
-      list.post(() -> behavior.setHideable(false));
+      handler.post(lockSheetAfterListUpdate);
       showDividers(true);
     } else {
+      handler.removeCallbacks(lockSheetAfterListUpdate);
       behavior.setHideable(true);
       behavior.setState(BottomSheetBehavior.STATE_HIDDEN);
     }

app/src/main/java/org/thoughtcrime/securesms/conversation/ui/mentions/MentionsPickerViewModel.java

@@ -12,8 +12,6 @@ import com.annimon.stream.Stream;
 
 import org.thoughtcrime.securesms.conversation.ui.mentions.MentionsPickerRepository.MentionQuery;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.megaphone.MegaphoneRepository;
-import org.thoughtcrime.securesms.megaphone.Megaphones;
 import org.thoughtcrime.securesms.recipients.LiveRecipient;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
@@ -31,12 +29,8 @@ public class MentionsPickerViewModel extends ViewModel {
   private final MutableLiveData<LiveRecipient>  liveRecipient;
   private final MutableLiveData<Query>          liveQuery;
   private final MutableLiveData<Boolean>        isShowing;
-  private final MegaphoneRepository             megaphoneRepository;
 
-  MentionsPickerViewModel(@NonNull MentionsPickerRepository mentionsPickerRepository,
-                          @NonNull MegaphoneRepository megaphoneRepository)
-  {
-    this.megaphoneRepository = megaphoneRepository;
+  MentionsPickerViewModel(@NonNull MentionsPickerRepository mentionsPickerRepository) {
     this.liveRecipient       = new MutableLiveData<>();
     this.liveQuery           = new MutableLiveData<>();
     this.selectedRecipient   = new SingleLiveEvent<>();
@@ -44,8 +38,8 @@ public class MentionsPickerViewModel extends ViewModel {
 
     LiveData<Recipient>         recipient    = Transformations.switchMap(liveRecipient, LiveRecipient::getLiveData);
     LiveData<List<RecipientId>> fullMembers  = Transformations.distinctUntilChanged(LiveDataUtil.mapAsync(recipient, mentionsPickerRepository::getMembers));
-    LiveData<Query>             query        = Transformations.distinctUntilChanged(liveQuery);
-    LiveData<MentionQuery>      mentionQuery = LiveDataUtil.combineLatest(query, fullMembers, (q, m) -> new MentionQuery(q.query, m));
+
+    LiveData<MentionQuery>      mentionQuery = LiveDataUtil.combineLatest(liveQuery, fullMembers, (q, m) -> new MentionQuery(q.query, m));
 
     this.mentionList = LiveDataUtil.mapAsync(mentionQuery, q -> Stream.of(mentionsPickerRepository.search(q)).<MappingModel<?>>map(MentionViewState::new).toList());
   }
@@ -56,7 +50,6 @@ public class MentionsPickerViewModel extends ViewModel {
 
   void onSelectionChange(@NonNull Recipient recipient) {
     selectedRecipient.setValue(recipient);
-    megaphoneRepository.markFinished(Megaphones.Event.MENTIONS);
   }
 
   void setIsShowing(boolean isShowing) {
@@ -119,8 +112,7 @@ public class MentionsPickerViewModel extends ViewModel {
     @Override
     public @NonNull <T extends ViewModel> T create(@NonNull Class<T> modelClass) {
       //noinspection ConstantConditions
-      return modelClass.cast(new MentionsPickerViewModel(new MentionsPickerRepository(ApplicationDependencies.getApplication()),
-                                                         ApplicationDependencies.getMegaphoneRepository()));
+      return modelClass.cast(new MentionsPickerViewModel(new MentionsPickerRepository(ApplicationDependencies.getApplication())));
     }
   }
 }

app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListArchiveFragment.java

@@ -111,23 +111,25 @@ public class ConversationListArchiveFragment extends ConversationListFragment im
   @Override
   @WorkerThread
   protected void archiveThreads(Set<Long> threadIds) {
-    DatabaseFactory.getThreadDatabase(getActivity()).setArchived(threadIds, true);
+    DatabaseFactory.getThreadDatabase(getActivity()).setArchived(threadIds, false);
   }
 
   @Override
   @WorkerThread
   protected void reverseArchiveThreads(Set<Long> threadIds) {
-    DatabaseFactory.getThreadDatabase(getActivity()).setArchived(threadIds, false);
+    DatabaseFactory.getThreadDatabase(getActivity()).setArchived(threadIds, true);
   }
 
   @SuppressLint("StaticFieldLeak")
   @Override
   protected void onItemSwiped(long threadId, int unreadCount) {
-    new SnackbarAsyncTask<Long>(getView(),
-        getResources().getQuantityString(R.plurals.ConversationListFragment_moved_conversations_to_inbox, 1, 1),
-        getString(R.string.ConversationListFragment_undo),
-        getResources().getColor(R.color.amber_500),
-        Snackbar.LENGTH_LONG, false)
+    new SnackbarAsyncTask<Long>(getViewLifecycleOwner().getLifecycle(),
+                                requireView(),
+                                getResources().getQuantityString(R.plurals.ConversationListFragment_moved_conversations_to_inbox, 1, 1),
+                                getString(R.string.ConversationListFragment_undo),
+                                getResources().getColor(R.color.amber_500),
+                                Snackbar.LENGTH_LONG,
+                                false)
     {
       @Override
       protected void executeAction(@Nullable Long parameter) {

app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java

@@ -55,7 +55,9 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.appcompat.widget.TooltipCompat;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.core.view.ViewCompat;
+import androidx.fragment.app.DialogFragment;
 import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.ProcessLifecycleOwner;
 import androidx.lifecycle.ViewModelProviders;
@@ -117,6 +119,7 @@ import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
 import org.thoughtcrime.securesms.util.AvatarUtil;
+import org.thoughtcrime.securesms.util.PlayStoreUtil;
 import org.thoughtcrime.securesms.util.ServiceUtil;
 import org.thoughtcrime.securesms.util.SnapToTopDataObserver;
 import org.thoughtcrime.securesms.util.StickyHeaderDecoration;
@@ -176,6 +179,7 @@ public class ConversationListFragment extends MainFragment implements ActionMode
   private ViewGroup                         megaphoneContainer;
   private SnapToTopDataObserver             snapToTopDataObserver;
   private Drawable                          archiveDrawable;
+  private LifecycleObserver                 visibilityLifecycleObserver;
 
   public static ConversationListFragment newInstance() {
     return new ConversationListFragment();
@@ -214,12 +218,13 @@ public class ConversationListFragment extends MainFragment implements ActionMode
     cameraFab.show();
 
     reminderView.setOnDismissListener(this::updateReminders);
+    reminderView.setOnActionClickListener(this::onReminderAction);
 
     list.setLayoutManager(new LinearLayoutManager(requireActivity()));
     list.setItemAnimator(new DeleteItemAnimator());
     list.addOnScrollListener(new ScrollListener());
 
-    snapToTopDataObserver = new SnapToTopDataObserver(list, null);
+    snapToTopDataObserver = new SnapToTopDataObserver(list);
 
     new ItemTouchHelper(new ArchiveListenerCallback()).attachToRecyclerView(list);
 
@@ -256,7 +261,7 @@ public class ConversationListFragment extends MainFragment implements ActionMode
       InsightsLauncher.showInsightsModal(requireContext(), requireFragmentManager());
     }
 
-    SimpleTask.run(getLifecycle(), Recipient::self, this::initializeProfileIcon);
+    SimpleTask.run(getViewLifecycleOwner().getLifecycle(), Recipient::self, this::initializeProfileIcon);
 
     if (!searchToolbar.isVisible() && list.getAdapter() != defaultAdapter) {
       list.removeItemDecoration(searchAdapterDecoration);
@@ -272,6 +277,7 @@ public class ConversationListFragment extends MainFragment implements ActionMode
   public void onStart() {
     super.onStart();
     ConversationFragment.prepare(requireContext());
+    ProcessLifecycleOwner.get().getLifecycle().addObserver(visibilityLifecycleObserver);
   }
 
   @Override
@@ -283,6 +289,12 @@ public class ConversationListFragment extends MainFragment implements ActionMode
     EventBus.getDefault().unregister(this);
   }
 
+  @Override
+  public void onStop() {
+    super.onStop();
+    ProcessLifecycleOwner.get().getLifecycle().removeObserver(visibilityLifecycleObserver);
+  }
+
   @Override
   public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
     menu.clear();
@@ -356,7 +368,7 @@ public class ConversationListFragment extends MainFragment implements ActionMode
   @Override
   public void onContactClicked(@NonNull Recipient contact) {
     SimpleTask.run(getViewLifecycleOwner().getLifecycle(), () -> {
-      return DatabaseFactory.getThreadDatabase(getContext()).getThreadIdIfExistsFor(contact);
+      return DatabaseFactory.getThreadDatabase(getContext()).getThreadIdIfExistsFor(contact.getId());
     }, threadId -> {
       hideKeyboard();
       getNavigator().goToConversation(contact.getId(),
@@ -412,6 +424,17 @@ public class ConversationListFragment extends MainFragment implements ActionMode
     viewModel.onMegaphoneCompleted(event);
   }
 
+  @Override
+  public void onMegaphoneDialogFragmentRequested(@NonNull DialogFragment dialogFragment) {
+    dialogFragment.show(getChildFragmentManager(), "megaphone_dialog");
+  }
+
+  private void onReminderAction(@IdRes int reminderActionId) {
+    if (reminderActionId == R.id.reminder_action_update_now) {
+      PlayStoreUtil.openPlayStoreOrOurApkDownloadPage(requireContext());
+    }
+  }
+
   private void hideKeyboard() {
     InputMethodManager imm = ServiceUtil.getInputMethodManager(requireContext());
     imm.hideSoftInputFromWindow(requireView().getWindowToken(), 0);
@@ -508,12 +531,12 @@ public class ConversationListFragment extends MainFragment implements ActionMode
     viewModel.getConversationList().observe(getViewLifecycleOwner(), this::onSubmitList);
     viewModel.hasNoConversations().observe(getViewLifecycleOwner(), this::updateEmptyState);
 
-    ProcessLifecycleOwner.get().getLifecycle().addObserver(new DefaultLifecycleObserver() {
+    visibilityLifecycleObserver = new DefaultLifecycleObserver() {
       @Override
       public void onStart(@NonNull LifecycleOwner owner) {
         viewModel.onVisible();
       }
-    });
+    };
   }
 
   private void onSearchResultChanged(@Nullable SearchResult result) {
@@ -662,7 +685,8 @@ public class ConversationListFragment extends MainFragment implements ActionMode
     int       count                 = selectedConversations.size();
     String    snackBarTitle         = getResources().getQuantityString(getArchivedSnackbarTitleRes(), count, count);
 
-    new SnackbarAsyncTask<Void>(getView(),
+    new SnackbarAsyncTask<Void>(getViewLifecycleOwner().getLifecycle(),
+                                requireView(),
                                 snackBarTitle,
                                 getString(R.string.ConversationListFragment_undo),
                                 getResources().getColor(R.color.amber_500),
@@ -985,11 +1009,13 @@ public class ConversationListFragment extends MainFragment implements ActionMode
 
   @SuppressLint("StaticFieldLeak")
   protected void onItemSwiped(long threadId, int unreadCount) {
-    new SnackbarAsyncTask<Long>(getView(),
-        getResources().getQuantityString(R.plurals.ConversationListFragment_conversations_archived, 1, 1),
-        getString(R.string.ConversationListFragment_undo),
-        getResources().getColor(R.color.amber_500),
-        Snackbar.LENGTH_LONG, false)
+    new SnackbarAsyncTask<Long>(getViewLifecycleOwner().getLifecycle(),
+                                requireView(),
+                                getResources().getQuantityString(R.plurals.ConversationListFragment_conversations_archived, 1, 1),
+                                getString(R.string.ConversationListFragment_undo),
+                                getResources().getColor(R.color.amber_500),
+                                Snackbar.LENGTH_LONG,
+                                false)
     {
       @Override
       protected void executeAction(@Nullable Long parameter) {

app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java

@@ -409,12 +409,7 @@ public final class ConversationListItem extends RelativeLayout
   }
 
   private static @NonNull LiveData<SpannableString> getThreadDisplayBody(@NonNull Context context, @NonNull ThreadRecord thread) {
-    if (thread.getGroupAddedBy() != null) {
-      return emphasisAdded(recipientToStringAsync(thread.getGroupAddedBy(),
-                                                  r -> context.getString(thread.isGv2Invite() ? R.string.ThreadRecord_s_invited_you_to_the_group
-                                                                                              : R.string.ThreadRecord_s_added_you_to_the_group,
-                                                                         r.getDisplayName(context))));
-    } else if (!thread.isMessageRequestAccepted()) {
+    if (!thread.isMessageRequestAccepted()) {
       return emphasisAdded(context.getString(R.string.ThreadRecord_message_request));
     } else if (SmsDatabase.Types.isGroupUpdate(thread.getType())) {
       if (thread.getRecipient().isPushV2Group()) {
@@ -453,11 +448,13 @@ public final class ConversationListItem extends RelativeLayout
       String time = ExpirationUtil.getExpirationDisplayValue(context, seconds);
       return emphasisAdded(context.getString(R.string.ThreadRecord_disappearing_message_time_updated_to_s, time));
     } else if (SmsDatabase.Types.isIdentityUpdate(thread.getType())) {
-      if (thread.getRecipient().isGroup()) {
-        return emphasisAdded(context.getString(R.string.ThreadRecord_safety_number_changed));
-      } else {
-        return emphasisAdded(recipientToStringAsync(thread.getRecipient().getId(), r -> context.getString(R.string.ThreadRecord_your_safety_number_with_s_has_changed, r.getDisplayName(context))));
-      }
+      return emphasisAdded(recipientToStringAsync(thread.getRecipient().getId(), r -> {
+        if (r.isGroup()) {
+          return context.getString(R.string.ThreadRecord_safety_number_changed);
+        } else {
+          return context.getString(R.string.ThreadRecord_your_safety_number_with_s_has_changed, r.getDisplayName(context));
+        }
+      }));
     } else if (SmsDatabase.Types.isIdentityVerified(thread.getType())) {
       return emphasisAdded(context.getString(R.string.ThreadRecord_you_marked_verified));
     } else if (SmsDatabase.Types.isIdentityDefault(thread.getType())) {

app/src/main/java/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java

@@ -7,6 +7,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
 
+import com.annimon.stream.Stream;
+
 import org.signal.libsignal.metadata.certificate.CertificateValidator;
 import org.signal.libsignal.metadata.certificate.InvalidCertificateException;
 import org.signal.zkgroup.profiles.ProfileKey;
@@ -27,6 +29,11 @@ import org.whispersystems.signalservice.api.crypto.UnidentifiedAccess;
 import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class UnidentifiedAccessUtil {
 
@@ -42,34 +49,64 @@ public class UnidentifiedAccessUtil {
   }
 
   @WorkerThread
-  public static Optional<UnidentifiedAccessPair> getAccessFor(@NonNull Context context,
-                                                              @NonNull Recipient recipient)
-  {
-    try {
-      byte[] theirUnidentifiedAccessKey       = getTargetUnidentifiedAccessKey(recipient);
-      byte[] ourUnidentifiedAccessKey         = UnidentifiedAccess.deriveAccessKeyFrom(ProfileKeyUtil.getSelfProfileKey());
-      byte[] ourUnidentifiedAccessCertificate = getUnidentifiedAccessCertificate(recipient);
+  public static Optional<UnidentifiedAccessPair> getAccessFor(@NonNull Context context, @NonNull Recipient recipient) {
+    return getAccessFor(context, recipient, true);
+  }
 
-      if (TextSecurePreferences.isUniversalUnidentifiedAccess(context)) {
-        ourUnidentifiedAccessKey = Util.getSecretBytes(16);
-      }
+  @WorkerThread
+  public static Optional<UnidentifiedAccessPair> getAccessFor(@NonNull Context context, @NonNull Recipient recipient, boolean log) {
+    return getAccessFor(context, Collections.singletonList(recipient), log).get(0);
+  }
 
-      Log.i(TAG, "Their access key present? " + (theirUnidentifiedAccessKey != null) +
-                 " | Our certificate present? " + (ourUnidentifiedAccessCertificate != null) +
-                 " | UUID certificate supported? " + recipient.isUuidSupported());
+  @WorkerThread
+  public static List<Optional<UnidentifiedAccessPair>> getAccessFor(@NonNull Context context, @NonNull List<Recipient> recipients) {
+    return getAccessFor(context, recipients, true);
+  }
+
+  @WorkerThread
+  public static List<Optional<UnidentifiedAccessPair>> getAccessFor(@NonNull Context context, @NonNull List<Recipient> recipients, boolean log) {
+    byte[] ourUnidentifiedAccessKey = UnidentifiedAccess.deriveAccessKeyFrom(ProfileKeyUtil.getSelfProfileKey());
+
+    if (TextSecurePreferences.isUniversalUnidentifiedAccess(context)) {
+      ourUnidentifiedAccessKey = Util.getSecretBytes(16);
+    }
+
+    List<Optional<UnidentifiedAccessPair>> access = new ArrayList<>(recipients.size());
+
+    Map<CertificateType, Integer> typeCounts = new HashMap<>();
+
+    for (Recipient recipient : recipients) {
+      byte[]          theirUnidentifiedAccessKey       = getTargetUnidentifiedAccessKey(recipient);
+      CertificateType certificateType                  = getUnidentifiedAccessCertificateType(recipient);
+      byte[]          ourUnidentifiedAccessCertificate = SignalStore.certificateValues().getUnidentifiedAccessCertificate(certificateType);
+
+      int typeCount = Util.getOrDefault(typeCounts, certificateType, 0);
+      typeCount++;
+      typeCounts.put(certificateType, typeCount);
 
       if (theirUnidentifiedAccessKey != null && ourUnidentifiedAccessCertificate != null) {
-        return Optional.of(new UnidentifiedAccessPair(new UnidentifiedAccess(theirUnidentifiedAccessKey,
-                                                                             ourUnidentifiedAccessCertificate),
-                                                      new UnidentifiedAccess(ourUnidentifiedAccessKey,
-                                                                             ourUnidentifiedAccessCertificate)));
+        try {
+          access.add(Optional.of(new UnidentifiedAccessPair(new UnidentifiedAccess(theirUnidentifiedAccessKey,
+                                                                                   ourUnidentifiedAccessCertificate),
+                                                            new UnidentifiedAccess(ourUnidentifiedAccessKey,
+                                                                                   ourUnidentifiedAccessCertificate))));
+        } catch (InvalidCertificateException e) {
+          Log.w(TAG, e);
+          access.add(Optional.absent());
+        }
+      } else {
+        access.add(Optional.absent());
       }
-
-      return Optional.absent();
-    } catch (InvalidCertificateException e) {
-      Log.w(TAG, e);
-      return Optional.absent();
     }
+
+    int unidentifiedCount = Stream.of(access).filter(Optional::isPresent).toList().size();
+    int otherCount        = access.size() - unidentifiedCount;
+
+    if (log) {
+      Log.i(TAG, "Unidentified: " + unidentifiedCount + ", Other: " + otherCount + ". Types: " + typeCounts);
+    }
+
+    return access;
   }
 
   public static Optional<UnidentifiedAccessPair> getAccessForSync(@NonNull Context context) {
@@ -95,21 +132,20 @@ public class UnidentifiedAccessUtil {
     }
   }
 
-  private static byte[] getUnidentifiedAccessCertificate(@NonNull Recipient recipient) {
-    CertificateType                                 certificateType;
+  private static @NonNull CertificateType getUnidentifiedAccessCertificateType(@NonNull Recipient recipient) {
     PhoneNumberPrivacyValues.PhoneNumberSharingMode sendPhoneNumberTo = SignalStore.phoneNumberPrivacy().getPhoneNumberSharingMode();
 
     switch (sendPhoneNumberTo) {
-      case EVERYONE: certificateType = CertificateType.UUID_AND_E164; break;
-      case CONTACTS: certificateType = recipient.isSystemContact() ? CertificateType.UUID_AND_E164 : CertificateType.UUID_ONLY; break;
-      case NOBODY  : certificateType = CertificateType.UUID_ONLY; break;
+      case EVERYONE: return CertificateType.UUID_AND_E164;
+      case CONTACTS: return recipient.isSystemContact() ? CertificateType.UUID_AND_E164 : CertificateType.UUID_ONLY;
+      case NOBODY  : return CertificateType.UUID_ONLY;
       default      : throw new AssertionError();
     }
+  }
 
-    Log.i(TAG, String.format("Certificate type for %s with setting %s -> %s", recipient.getId(), sendPhoneNumberTo, certificateType));
-
+  private static byte[] getUnidentifiedAccessCertificate(@NonNull Recipient recipient) {
     return SignalStore.certificateValues()
-                      .getUnidentifiedAccessCertificate(certificateType);
+                      .getUnidentifiedAccessCertificate(getUnidentifiedAccessCertificateType(recipient));
   }
 
   private static @Nullable byte[] getTargetUnidentifiedAccessKey(@NonNull Recipient recipient) {

app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java

@@ -19,11 +19,8 @@ package org.thoughtcrime.securesms.database;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
-import android.graphics.Bitmap;
 import android.media.MediaDataSource;
-import android.media.MediaMetadataRetriever;
 import android.net.Uri;
-import android.os.Build;
 import android.text.TextUtils;
 import android.util.Pair;
 
@@ -58,14 +55,10 @@ import org.thoughtcrime.securesms.mms.MmsException;
 import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.stickers.StickerLocator;
 import org.thoughtcrime.securesms.util.Base64;
-import org.thoughtcrime.securesms.util.BitmapDecodingException;
-import org.thoughtcrime.securesms.util.BitmapUtil;
 import org.thoughtcrime.securesms.util.CursorUtil;
 import org.thoughtcrime.securesms.util.FileUtils;
 import org.thoughtcrime.securesms.util.JsonUtils;
-import org.thoughtcrime.securesms.util.MediaMetadataRetrieverUtil;
 import org.thoughtcrime.securesms.util.MediaUtil;
-import org.thoughtcrime.securesms.util.MediaUtil.ThumbnailData;
 import org.thoughtcrime.securesms.util.SetUtil;
 import org.thoughtcrime.securesms.util.StorageUtil;
 import org.thoughtcrime.securesms.util.Util;
@@ -74,7 +67,6 @@ import org.whispersystems.libsignal.util.guava.Optional;
 import org.whispersystems.signalservice.internal.util.JsonUtil;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -90,9 +82,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
 
 public class AttachmentDatabase extends Database {
   
@@ -111,8 +100,6 @@ public class AttachmentDatabase extends Database {
   private static final String TRANSFER_FILE          = "transfer_file";
   public  static final String SIZE                   = "data_size";
           static final String FILE_NAME              = "file_name";
-  public  static final String THUMBNAIL              = "thumbnail";
-          static final String THUMBNAIL_ASPECT_RATIO = "aspect_ratio";
   public  static final String UNIQUE_ID              = "unique_id";
           static final String DIGEST                 = "digest";
           static final String VOICE_NOTE             = "voice_note";
@@ -124,7 +111,6 @@ public class AttachmentDatabase extends Database {
           static final String STICKER_EMOJI          = "sticker_emoji";
           static final String FAST_PREFLIGHT_ID      = "fast_preflight_id";
   public  static final String DATA_RANDOM            = "data_random";
-  private static final String THUMBNAIL_RANDOM       = "thumbnail_random";
           static final String WIDTH                  = "width";
           static final String HEIGHT                 = "height";
           static final String CAPTION                = "caption";
@@ -149,11 +135,10 @@ public class AttachmentDatabase extends Database {
 
   private static final String[] PROJECTION = new String[] {ROW_ID,
                                                            MMS_ID, CONTENT_TYPE, NAME, CONTENT_DISPOSITION,
-                                                           CDN_NUMBER, CONTENT_LOCATION, DATA, THUMBNAIL,
-                                                           TRANSFER_STATE, SIZE, FILE_NAME, THUMBNAIL,
-                                                           THUMBNAIL_ASPECT_RATIO, UNIQUE_ID, DIGEST,
+                                                           CDN_NUMBER, CONTENT_LOCATION, DATA,
+                                                           TRANSFER_STATE, SIZE, FILE_NAME, UNIQUE_ID, DIGEST,
                                                            FAST_PREFLIGHT_ID, VOICE_NOTE, BORDERLESS, QUOTE, DATA_RANDOM,
-                                                           THUMBNAIL_RANDOM, WIDTH, HEIGHT, CAPTION, STICKER_PACK_ID,
+                                                           WIDTH, HEIGHT, CAPTION, STICKER_PACK_ID,
                                                            STICKER_PACK_KEY, STICKER_ID, STICKER_EMOJI, DATA_HASH, VISUAL_HASH,
                                                            TRANSFORM_PROPERTIES, TRANSFER_FILE, DISPLAY_ORDER,
                                                            UPLOAD_TIMESTAMP };
@@ -175,15 +160,12 @@ public class AttachmentDatabase extends Database {
                                                                                   DATA                   + " TEXT, " +
                                                                                   SIZE                   + " INTEGER, " +
                                                                                   FILE_NAME              + " TEXT, " +
-                                                                                  THUMBNAIL              + " TEXT, " +
-                                                                                  THUMBNAIL_ASPECT_RATIO + " REAL, " +
                                                                                   UNIQUE_ID              + " INTEGER NOT NULL, " +
                                                                                   DIGEST                 + " BLOB, " +
                                                                                   FAST_PREFLIGHT_ID      + " TEXT, " +
                                                                                   VOICE_NOTE             + " INTEGER DEFAULT 0, " +
                                                                                   BORDERLESS             + " INTEGER DEFAULT 0, " +
                                                                                   DATA_RANDOM            + " BLOB, " +
-                                                                                  THUMBNAIL_RANDOM       + " BLOB, " +
                                                                                   QUOTE                  + " INTEGER DEFAULT 0, " +
                                                                                   WIDTH                  + " INTEGER DEFAULT 0, " +
                                                                                   HEIGHT                 + " INTEGER DEFAULT 0, " +
@@ -208,10 +190,6 @@ public class AttachmentDatabase extends Database {
     "CREATE INDEX IF NOT EXISTS part_data_index ON " + TABLE_NAME + " (" + DATA + ");"
   };
 
-  private static final long STANDARD_THUMB_TIME = 1000;
-
-  private final ExecutorService thumbnailExecutor = Util.newSingleThreadedLifoExecutor();
-
   private final AttachmentSecret attachmentSecret;
 
   public AttachmentDatabase(Context context, SQLCipherOpenHelper databaseHelper, AttachmentSecret attachmentSecret) {
@@ -228,29 +206,6 @@ public class AttachmentDatabase extends Database {
     else                    return dataStream;
   }
 
-  public @NonNull InputStream getThumbnailStream(@NonNull AttachmentId attachmentId)
-      throws IOException
-  {
-    Log.d(TAG, "getThumbnailStream(" + attachmentId + ")");
-    InputStream dataStream = getDataStream(attachmentId, THUMBNAIL, 0);
-
-    if (dataStream != null) {
-      return dataStream;
-    }
-
-    try {
-      InputStream generatedStream = thumbnailExecutor.submit(new ThumbnailFetchCallable(attachmentId, STANDARD_THUMB_TIME)).get();
-
-      if (generatedStream == null) throw new FileNotFoundException("No thumbnail stream available: " + attachmentId);
-      else                         return generatedStream;
-    } catch (InterruptedException ie) {
-      throw new AssertionError("interrupted");
-    } catch (ExecutionException ee) {
-      Log.w(TAG, ee);
-      throw new IOException(ee);
-    }
-  }
-
   public boolean containsStickerPackId(@NonNull String stickerPackId) {
     String   selection = STICKER_PACK_ID + " = ?";
     String[] args      = new String[] { stickerPackId };
@@ -365,12 +320,11 @@ public class AttachmentDatabase extends Database {
     Cursor cursor           = null;
 
     try {
-      cursor = database.query(TABLE_NAME, new String[] {DATA, THUMBNAIL, CONTENT_TYPE, ROW_ID, UNIQUE_ID}, MMS_ID + " = ?",
+      cursor = database.query(TABLE_NAME, new String[] {DATA, CONTENT_TYPE, ROW_ID, UNIQUE_ID}, MMS_ID + " = ?",
                               new String[] {mmsId+""}, null, null, null);
 
       while (cursor != null && cursor.moveToNext()) {
         deleteAttachmentOnDisk(cursor.getString(cursor.getColumnIndex(DATA)),
-                               cursor.getString(cursor.getColumnIndex(THUMBNAIL)),
                                cursor.getString(cursor.getColumnIndex(CONTENT_TYPE)),
                                new AttachmentId(cursor.getLong(cursor.getColumnIndex(ROW_ID)),
                                                 cursor.getLong(cursor.getColumnIndex(UNIQUE_ID))));
@@ -418,12 +372,11 @@ public class AttachmentDatabase extends Database {
     Cursor cursor           = null;
 
     try {
-      cursor = database.query(TABLE_NAME, new String[] {DATA, THUMBNAIL, CONTENT_TYPE, ROW_ID, UNIQUE_ID}, MMS_ID + " = ?",
+      cursor = database.query(TABLE_NAME, new String[] {DATA, CONTENT_TYPE, ROW_ID, UNIQUE_ID}, MMS_ID + " = ?",
           new String[] {mmsId+""}, null, null, null);
 
       while (cursor != null && cursor.moveToNext()) {
         deleteAttachmentOnDisk(cursor.getString(cursor.getColumnIndex(DATA)),
-                               cursor.getString(cursor.getColumnIndex(THUMBNAIL)),
                                cursor.getString(cursor.getColumnIndex(CONTENT_TYPE)),
                                new AttachmentId(cursor.getLong(cursor.getColumnIndex(ROW_ID)),
                                                 cursor.getLong(cursor.getColumnIndex(UNIQUE_ID))));
@@ -437,8 +390,6 @@ public class AttachmentDatabase extends Database {
     values.put(DATA, (String) null);
     values.put(DATA_RANDOM, (byte[]) null);
     values.put(DATA_HASH, (String) null);
-    values.put(THUMBNAIL, (String) null);
-    values.put(THUMBNAIL_RANDOM, (byte[]) null);
     values.put(FILE_NAME, (String) null);
     values.put(CAPTION, (String) null);
     values.put(SIZE, 0);
@@ -463,7 +414,7 @@ public class AttachmentDatabase extends Database {
     SQLiteDatabase database = databaseHelper.getWritableDatabase();
 
     try (Cursor cursor = database.query(TABLE_NAME,
-                                        new String[]{DATA, THUMBNAIL, CONTENT_TYPE},
+                                        new String[]{DATA, CONTENT_TYPE},
                                         PART_ID_WHERE,
                                         id.toStrings(),
                                         null,
@@ -475,11 +426,10 @@ public class AttachmentDatabase extends Database {
         return;
       }
       String data        = cursor.getString(cursor.getColumnIndex(DATA));
-      String thumbnail   = cursor.getString(cursor.getColumnIndex(THUMBNAIL));
       String contentType = cursor.getString(cursor.getColumnIndex(CONTENT_TYPE));
 
       database.delete(TABLE_NAME, PART_ID_WHERE, id.toStrings());
-      deleteAttachmentOnDisk(data, thumbnail, contentType, id);
+      deleteAttachmentOnDisk(data, contentType, id);
       notifyAttachmentListeners();
     }
   }
@@ -487,7 +437,7 @@ public class AttachmentDatabase extends Database {
   public void trimAllAbandonedAttachments() {
     SQLiteDatabase db              = databaseHelper.getWritableDatabase();
     String         selectAllMmsIds = "SELECT " + MmsDatabase.ID + " FROM " + MmsDatabase.TABLE_NAME;
-    String         selectDataInUse = "SELECT DISTINCT " + DATA + " FROM " + TABLE_NAME + " WHERE " + QUOTE + " = 0 AND " + MMS_ID + " IN (" + selectAllMmsIds + ")";
+    String         selectDataInUse = "SELECT DISTINCT " + DATA + " FROM " + TABLE_NAME + " WHERE " + QUOTE + " = 0 AND (" + MMS_ID + " IN (" + selectAllMmsIds + ") OR " + MMS_ID + " = " + PREUPLOAD_MESSAGE_ID + ")";
     String         where           = MMS_ID + " NOT IN (" + selectAllMmsIds + ") AND " + DATA + " NOT IN (" + selectDataInUse + ")";
 
     db.delete(TABLE_NAME, where, null);
@@ -502,10 +452,9 @@ public class AttachmentDatabase extends Database {
       filesOnDisk.add(file.getAbsolutePath());
     }
 
-    try (Cursor cursor = databaseHelper.getReadableDatabase().query(true, TABLE_NAME, new String[] { DATA, THUMBNAIL }, null, null, null, null, null, null)) {
+    try (Cursor cursor = databaseHelper.getReadableDatabase().query(true, TABLE_NAME, new String[] { DATA }, null, null, null, null, null, null)) {
       while (cursor != null && cursor.moveToNext()) {
         filesInDb.add(CursorUtil.requireString(cursor, DATA));
-        filesInDb.add(CursorUtil.requireString(cursor, THUMBNAIL));
       }
     }
 
@@ -530,7 +479,6 @@ public class AttachmentDatabase extends Database {
   }
 
   private void deleteAttachmentOnDisk(@Nullable String data,
-                                      @Nullable String thumbnail,
                                       @Nullable String contentType,
                                       @NonNull AttachmentId attachmentId)
   {
@@ -561,8 +509,6 @@ public class AttachmentDatabase extends Database {
               values.putNull(DATA);
               values.putNull(DATA_RANDOM);
               values.putNull(DATA_HASH);
-              values.putNull(THUMBNAIL);
-              values.putNull(THUMBNAIL_RANDOM);
               deletedCount += database.update(TABLE_NAME, values, PART_ID_WHERE, weakReference.toStrings());
             }
             database.setTransactionSuccessful();
@@ -581,15 +527,7 @@ public class AttachmentDatabase extends Database {
       }
     }
 
-    if (!TextUtils.isEmpty(thumbnail)) {
-      if (new File(thumbnail).delete()) {
-        Log.i(TAG, "[deleteAttachmentOnDisk] Deleted thumbnail. " + data + " " + attachmentId);
-      } else {
-        Log.w(TAG, "[deleteAttachmentOnDisk] Failed to delete attachment. " + data + " " + attachmentId);
-      }
-    }
-
-    if (MediaUtil.isImageType(contentType) || thumbnail != null) {
+    if (MediaUtil.isImageType(contentType) || MediaUtil.isVideoType(contentType)) {
       Glide.get(context).clearDiskCache();
     }
   }
@@ -623,22 +561,17 @@ public class AttachmentDatabase extends Database {
     SQLiteDatabase     database     = databaseHelper.getWritableDatabase();
     ContentValues      values       = new ContentValues();
     DataInfo           oldInfo      = getAttachmentDataFileInfo(attachmentId, DATA);
-    DataInfo           dataInfo     = setAttachmentData(inputStream, false, attachmentId);
+    DataInfo           dataInfo     = setAttachmentData(inputStream, attachmentId);
     File               transferFile = getTransferFile(databaseHelper.getReadableDatabase(), attachmentId);
 
     if (oldInfo != null) {
       updateAttachmentDataHash(database, oldInfo.hash, dataInfo);
     }
 
-    if (placeholder != null && placeholder.isQuote() && !placeholder.getContentType().startsWith("image")) {
-      values.put(THUMBNAIL, dataInfo.file.getAbsolutePath());
-      values.put(THUMBNAIL_RANDOM, dataInfo.random);
-    } else {
-      values.put(DATA, dataInfo.file.getAbsolutePath());
-      values.put(SIZE, dataInfo.length);
-      values.put(DATA_RANDOM, dataInfo.random);
-      values.put(DATA_HASH, dataInfo.hash);
-    }
+    values.put(DATA, dataInfo.file.getAbsolutePath());
+    values.put(SIZE, dataInfo.length);
+    values.put(DATA_RANDOM, dataInfo.random);
+    values.put(DATA_HASH, dataInfo.hash);
 
     String visualHashString = getVisualHashStringOrNull(placeholder);
     if (visualHashString != null) {
@@ -662,8 +595,6 @@ public class AttachmentDatabase extends Database {
       //noinspection ResultOfMethodCallIgnored
       transferFile.delete();
     }
-
-    thumbnailExecutor.submit(new ThumbnailFetchCallable(attachmentId, STANDARD_THUMB_TIME));
   }
 
   private static @Nullable String getVisualHashStringOrNull(@Nullable Attachment attachment) {
@@ -846,7 +777,6 @@ public class AttachmentDatabase extends Database {
 
     DataInfo dataInfo = setAttachmentData(destination,
                                           mediaStream.getStream(),
-                                          false,
                                           databaseAttachment.getAttachmentId());
 
     ContentValues contentValues = new ContentValues();
@@ -1055,16 +985,8 @@ public class AttachmentDatabase extends Database {
     SQLiteDatabase database = databaseHelper.getReadableDatabase();
     Cursor         cursor   = null;
 
-    String randomColumn;
-
-    switch (dataType) {
-      case DATA:      randomColumn = DATA_RANDOM;      break;
-      case THUMBNAIL: randomColumn = THUMBNAIL_RANDOM; break;
-      default:throw   new AssertionError("Unknown data type: " + dataType);
-    }
-
     try {
-      cursor = database.query(TABLE_NAME, new String[]{dataType, SIZE, randomColumn, DATA_HASH}, PART_ID_WHERE, attachmentId.toStrings(),
+      cursor = database.query(TABLE_NAME, new String[]{dataType, SIZE, DATA_RANDOM, DATA_HASH}, PART_ID_WHERE, attachmentId.toStrings(),
                               null, null, null);
 
       if (cursor != null && cursor.moveToFirst()) {
@@ -1074,7 +996,7 @@ public class AttachmentDatabase extends Database {
 
         return new DataInfo(new File(cursor.getString(cursor.getColumnIndexOrThrow(dataType))),
                             cursor.getLong(cursor.getColumnIndexOrThrow(SIZE)),
-                            cursor.getBlob(cursor.getColumnIndexOrThrow(randomColumn)),
+                            cursor.getBlob(cursor.getColumnIndexOrThrow(DATA_RANDOM)),
                             cursor.getString(cursor.getColumnIndexOrThrow(DATA_HASH)));
       } else {
         return null;
@@ -1087,26 +1009,24 @@ public class AttachmentDatabase extends Database {
   }
 
   private @NonNull DataInfo setAttachmentData(@NonNull Uri uri,
-                                              boolean isThumbnail,
                                               @Nullable AttachmentId attachmentId)
       throws MmsException
   {
     try {
       InputStream inputStream = PartAuthority.getAttachmentStream(context, uri);
-      return setAttachmentData(inputStream, isThumbnail, attachmentId);
+      return setAttachmentData(inputStream, attachmentId);
     } catch (IOException e) {
       throw new MmsException(e);
     }
   }
 
   private @NonNull DataInfo setAttachmentData(@NonNull InputStream in,
-                                              boolean isThumbnail,
                                               @Nullable AttachmentId attachmentId)
       throws MmsException
   {
     try {
       File dataFile = newFile();
-      return setAttachmentData(dataFile, in, isThumbnail, attachmentId);
+      return setAttachmentData(dataFile, in, attachmentId);
     } catch (IOException e) {
       throw new MmsException(e);
     }
@@ -1119,7 +1039,6 @@ public class AttachmentDatabase extends Database {
 
   private @NonNull DataInfo setAttachmentData(@NonNull File destination,
                                               @NonNull InputStream in,
-                                              boolean isThumbnail,
                                               @Nullable AttachmentId attachmentId)
       throws MmsException
   {
@@ -1130,18 +1049,16 @@ public class AttachmentDatabase extends Database {
       long                       length            = Util.copy(digestInputStream, out.second);
       String                     hash              = Base64.encodeBytes(digestInputStream.getMessageDigest().digest());
 
-      if (!isThumbnail) {
-        SQLiteDatabase     database       = databaseHelper.getWritableDatabase();
-        Optional<DataInfo> sharedDataInfo = findDuplicateDataFileInfo(database, hash, attachmentId);
-        if (sharedDataInfo.isPresent()) {
-          Log.i(TAG, "[setAttachmentData] Duplicate data file found! " + sharedDataInfo.get().file.getAbsolutePath());
-          if (!destination.equals(sharedDataInfo.get().file) && destination.delete()) {
-            Log.i(TAG, "[setAttachmentData] Deleted original file. " + destination);
-          }
-          return sharedDataInfo.get();
-        } else {
-          Log.i(TAG, "[setAttachmentData] No matching attachment data found. " + destination.getAbsolutePath());
+      SQLiteDatabase     database       = databaseHelper.getWritableDatabase();
+      Optional<DataInfo> sharedDataInfo = findDuplicateDataFileInfo(database, hash, attachmentId);
+      if (sharedDataInfo.isPresent()) {
+        Log.i(TAG, "[setAttachmentData] Duplicate data file found! " + sharedDataInfo.get().file.getAbsolutePath());
+        if (!destination.equals(sharedDataInfo.get().file) && destination.delete()) {
+          Log.i(TAG, "[setAttachmentData] Deleted original file. " + destination);
         }
+        return sharedDataInfo.get();
+      } else {
+        Log.i(TAG, "[setAttachmentData] No matching attachment data found. " + destination.getAbsolutePath());
       }
 
       return new DataInfo(destination, length, out.first, hash);
@@ -1216,7 +1133,7 @@ public class AttachmentDatabase extends Database {
             result.add(new DatabaseAttachment(new AttachmentId(object.getLong(ROW_ID), object.getLong(UNIQUE_ID)),
                                               object.getLong(MMS_ID),
                                               !TextUtils.isEmpty(object.getString(DATA)),
-                                              !TextUtils.isEmpty(object.getString(THUMBNAIL)),
+                                              MediaUtil.isImageType(contentType) || MediaUtil.isVideoType(contentType),
                                               contentType,
                                               object.getInt(TRANSFER_STATE),
                                               object.getLong(SIZE),
@@ -1254,7 +1171,7 @@ public class AttachmentDatabase extends Database {
                                                                                  cursor.getLong(cursor.getColumnIndexOrThrow(UNIQUE_ID))),
                                                                 cursor.getLong(cursor.getColumnIndexOrThrow(MMS_ID)),
                                                                 !cursor.isNull(cursor.getColumnIndexOrThrow(DATA)),
-                                                                !cursor.isNull(cursor.getColumnIndexOrThrow(THUMBNAIL)),
+                                                                MediaUtil.isImageType(contentType) || MediaUtil.isVideoType(contentType),
                                                                 contentType,
                                                                 cursor.getInt(cursor.getColumnIndexOrThrow(TRANSFER_STATE)),
                                                                 cursor.getLong(cursor.getColumnIndexOrThrow(SIZE)),
@@ -1292,122 +1209,94 @@ public class AttachmentDatabase extends Database {
       throws MmsException
   {
     Log.d(TAG, "Inserting attachment for mms id: " + mmsId);
+    SQLiteDatabase database = databaseHelper.getWritableDatabase();
 
-    SQLiteDatabase database        = databaseHelper.getWritableDatabase();
-    DataInfo       dataInfo        = null;
-    long           uniqueId        = System.currentTimeMillis();
-    long           thumbnailTimeUs;
+    database.beginTransaction();
+    try {
+      DataInfo       dataInfo        = null;
+      long           uniqueId        = System.currentTimeMillis();
 
-    if (attachment.getDataUri() != null) {
-      dataInfo = setAttachmentData(attachment.getDataUri(), false, null);
-      Log.d(TAG, "Wrote part to file: " + dataInfo.file.getAbsolutePath());
-    }
-
-    Attachment template = attachment;
-
-    if (dataInfo != null && dataInfo.hash != null) {
-      Attachment possibleTemplate = findTemplateAttachment(dataInfo.hash);
-
-      if (possibleTemplate != null) {
-        Log.i(TAG, "Found a duplicate attachment upon insertion. Using it as a template.");
-        template = possibleTemplate;
+      if (attachment.getUri() != null) {
+        dataInfo = setAttachmentData(attachment.getUri(), null);
+        Log.d(TAG, "Wrote part to file: " + dataInfo.file.getAbsolutePath());
       }
-    }
 
-    boolean useTemplateUpload = template.getUploadTimestamp() > attachment.getUploadTimestamp() &&
-                                template.getTransferState() == TRANSFER_PROGRESS_DONE           &&
-                                template.getTransformProperties().shouldSkipTransform()         &&
-                                !attachment.getTransformProperties().isVideoEdited();
+      Attachment template = attachment;
 
-    ContentValues contentValues = new ContentValues();
-    contentValues.put(MMS_ID, mmsId);
-    contentValues.put(CONTENT_TYPE, template.getContentType());
-    contentValues.put(TRANSFER_STATE, attachment.getTransferState());
-    contentValues.put(UNIQUE_ID, uniqueId);
-    contentValues.put(CDN_NUMBER, useTemplateUpload ? template.getCdnNumber() : attachment.getCdnNumber());
-    contentValues.put(CONTENT_LOCATION, useTemplateUpload ? template.getLocation() : attachment.getLocation());
-    contentValues.put(DIGEST, useTemplateUpload ? template.getDigest() : attachment.getDigest());
-    contentValues.put(CONTENT_DISPOSITION, useTemplateUpload ? template.getKey() : attachment.getKey());
-    contentValues.put(NAME, useTemplateUpload ? template.getRelay() : attachment.getRelay());
-    contentValues.put(FILE_NAME, StorageUtil.getCleanFileName(attachment.getFileName()));
-    contentValues.put(SIZE, template.getSize());
-    contentValues.put(FAST_PREFLIGHT_ID, attachment.getFastPreflightId());
-    contentValues.put(VOICE_NOTE, attachment.isVoiceNote() ? 1 : 0);
-    contentValues.put(BORDERLESS, attachment.isBorderless() ? 1 : 0);
-    contentValues.put(WIDTH, template.getWidth());
-    contentValues.put(HEIGHT, template.getHeight());
-    contentValues.put(QUOTE, quote);
-    contentValues.put(CAPTION, attachment.getCaption());
-    contentValues.put(UPLOAD_TIMESTAMP, useTemplateUpload ? template.getUploadTimestamp() : attachment.getUploadTimestamp());
-    if (attachment.getTransformProperties().isVideoEdited()) {
-      contentValues.putNull(VISUAL_HASH);
-      contentValues.put(TRANSFORM_PROPERTIES, attachment.getTransformProperties().serialize());
-      thumbnailTimeUs = Math.max(STANDARD_THUMB_TIME, attachment.getTransformProperties().videoTrimStartTimeUs);
-    } else {
-      contentValues.put(VISUAL_HASH, getVisualHashStringOrNull(template));
-      contentValues.put(TRANSFORM_PROPERTIES, template.getTransformProperties().serialize());
-      thumbnailTimeUs = STANDARD_THUMB_TIME;
-    }
+      if (dataInfo != null && dataInfo.hash != null) {
+        Attachment possibleTemplate = findTemplateAttachment(dataInfo.hash);
 
-    if (attachment.isSticker()) {
-      contentValues.put(STICKER_PACK_ID, attachment.getSticker().getPackId());
-      contentValues.put(STICKER_PACK_KEY, attachment.getSticker().getPackKey());
-      contentValues.put(STICKER_ID, attachment.getSticker().getStickerId());
-      contentValues.put(STICKER_EMOJI, attachment.getSticker().getEmoji());
-    }
-
-    if (dataInfo != null) {
-      contentValues.put(DATA, dataInfo.file.getAbsolutePath());
-      contentValues.put(SIZE, dataInfo.length);
-      contentValues.put(DATA_RANDOM, dataInfo.random);
-      if (attachment.getTransformProperties().isVideoEdited()) {
-        contentValues.putNull(DATA_HASH);
-      } else {
-        contentValues.put(DATA_HASH, dataInfo.hash);
-      }
-    }
-
-    boolean      notifyPacks  = attachment.isSticker() && !hasStickerAttachments();
-    long         rowId        = database.insert(TABLE_NAME, null, contentValues);
-    AttachmentId attachmentId = new AttachmentId(rowId, uniqueId);
-    Uri          thumbnailUri = attachment.getThumbnailUri();
-    boolean      hasThumbnail = false;
-
-    if (thumbnailUri != null) {
-      try (InputStream attachmentStream = PartAuthority.getAttachmentStream(context, thumbnailUri)) {
-        Pair<Integer, Integer> dimens = BitmapUtil.getDimensions(attachmentStream);
-        updateAttachmentThumbnail(attachmentId,
-                                  PartAuthority.getAttachmentStream(context, thumbnailUri),
-                                  (float) dimens.first / (float) dimens.second);
-        hasThumbnail = true;
-      } catch (IOException | BitmapDecodingException e) {
-        Log.w(TAG, "Failed to save existing thumbnail.", e);
-      }
-    }
-
-    if (!hasThumbnail && dataInfo != null) {
-      if (MediaUtil.hasVideoThumbnail(attachment.getDataUri()) && thumbnailTimeUs == STANDARD_THUMB_TIME) {
-        Bitmap bitmap = MediaUtil.getVideoThumbnail(context, attachment.getDataUri(), thumbnailTimeUs);
-
-        if (bitmap != null) {
-          try (ThumbnailData thumbnailData = new ThumbnailData(bitmap)) {
-            updateAttachmentThumbnail(attachmentId, thumbnailData.toDataStream(), thumbnailData.getAspectRatio());
-          }
-        } else {
-          Log.w(TAG, "Retrieving video thumbnail failed, submitting thumbnail generation job...");
-          thumbnailExecutor.submit(new ThumbnailFetchCallable(attachmentId, thumbnailTimeUs));
+        if (possibleTemplate != null) {
+          Log.i(TAG, "Found a duplicate attachment upon insertion. Using it as a template.");
+          template = possibleTemplate;
         }
-      } else {
-        Log.i(TAG, "Submitting thumbnail generation job...");
-        thumbnailExecutor.submit(new ThumbnailFetchCallable(attachmentId, thumbnailTimeUs));
       }
-    }
 
-    if (notifyPacks) {
-      notifyStickerPackListeners();
-    }
+      boolean useTemplateUpload = template.getUploadTimestamp() > attachment.getUploadTimestamp() &&
+                                  template.getTransferState() == TRANSFER_PROGRESS_DONE           &&
+                                  template.getTransformProperties().shouldSkipTransform()         &&
+                                  !attachment.getTransformProperties().isVideoEdited();
 
-    return attachmentId;
+      ContentValues contentValues = new ContentValues();
+      contentValues.put(MMS_ID, mmsId);
+      contentValues.put(CONTENT_TYPE, template.getContentType());
+      contentValues.put(TRANSFER_STATE, attachment.getTransferState());
+      contentValues.put(UNIQUE_ID, uniqueId);
+      contentValues.put(CDN_NUMBER, useTemplateUpload ? template.getCdnNumber() : attachment.getCdnNumber());
+      contentValues.put(CONTENT_LOCATION, useTemplateUpload ? template.getLocation() : attachment.getLocation());
+      contentValues.put(DIGEST, useTemplateUpload ? template.getDigest() : attachment.getDigest());
+      contentValues.put(CONTENT_DISPOSITION, useTemplateUpload ? template.getKey() : attachment.getKey());
+      contentValues.put(NAME, useTemplateUpload ? template.getRelay() : attachment.getRelay());
+      contentValues.put(FILE_NAME, StorageUtil.getCleanFileName(attachment.getFileName()));
+      contentValues.put(SIZE, template.getSize());
+      contentValues.put(FAST_PREFLIGHT_ID, attachment.getFastPreflightId());
+      contentValues.put(VOICE_NOTE, attachment.isVoiceNote() ? 1 : 0);
+      contentValues.put(BORDERLESS, attachment.isBorderless() ? 1 : 0);
+      contentValues.put(WIDTH, template.getWidth());
+      contentValues.put(HEIGHT, template.getHeight());
+      contentValues.put(QUOTE, quote);
+      contentValues.put(CAPTION, attachment.getCaption());
+      contentValues.put(UPLOAD_TIMESTAMP, useTemplateUpload ? template.getUploadTimestamp() : attachment.getUploadTimestamp());
+      if (attachment.getTransformProperties().isVideoEdited()) {
+        contentValues.putNull(VISUAL_HASH);
+        contentValues.put(TRANSFORM_PROPERTIES, attachment.getTransformProperties().serialize());
+      } else {
+        contentValues.put(VISUAL_HASH, getVisualHashStringOrNull(template));
+        contentValues.put(TRANSFORM_PROPERTIES, template.getTransformProperties().serialize());
+      }
+
+      if (attachment.isSticker()) {
+        contentValues.put(STICKER_PACK_ID, attachment.getSticker().getPackId());
+        contentValues.put(STICKER_PACK_KEY, attachment.getSticker().getPackKey());
+        contentValues.put(STICKER_ID, attachment.getSticker().getStickerId());
+        contentValues.put(STICKER_EMOJI, attachment.getSticker().getEmoji());
+      }
+
+      if (dataInfo != null) {
+        contentValues.put(DATA, dataInfo.file.getAbsolutePath());
+        contentValues.put(SIZE, dataInfo.length);
+        contentValues.put(DATA_RANDOM, dataInfo.random);
+        if (attachment.getTransformProperties().isVideoEdited()) {
+          contentValues.putNull(DATA_HASH);
+        } else {
+          contentValues.put(DATA_HASH, dataInfo.hash);
+        }
+      }
+
+      boolean      notifyPacks  = attachment.isSticker() && !hasStickerAttachments();
+      long         rowId        = database.insert(TABLE_NAME, null, contentValues);
+      AttachmentId attachmentId = new AttachmentId(rowId, uniqueId);
+
+      if (notifyPacks) {
+        notifyStickerPackListeners();
+      }
+
+      database.setTransactionSuccessful();
+
+      return attachmentId;
+    } finally {
+      database.endTransaction();
+    }
   }
 
   private @Nullable DatabaseAttachment findTemplateAttachment(@NonNull String dataHash) {
@@ -1423,35 +1312,6 @@ public class AttachmentDatabase extends Database {
     return null;
   }
 
-  @SuppressWarnings("WeakerAccess")
-  @VisibleForTesting
-  protected void updateAttachmentThumbnail(AttachmentId attachmentId, InputStream in, float aspectRatio)
-      throws MmsException
-  {
-    Log.i(TAG, "updating part thumbnail for #" + attachmentId);
-
-    DataInfo thumbnailFile = setAttachmentData(in, true, attachmentId);
-
-    SQLiteDatabase database = databaseHelper.getWritableDatabase();
-    ContentValues  values   = new ContentValues(2);
-
-    values.put(THUMBNAIL, thumbnailFile.file.getAbsolutePath());
-    values.put(THUMBNAIL_ASPECT_RATIO, aspectRatio);
-    values.put(THUMBNAIL_RANDOM, thumbnailFile.random);
-
-    database.update(TABLE_NAME, values, PART_ID_WHERE, attachmentId.toStrings());
-
-    Cursor cursor = database.query(TABLE_NAME, new String[] {MMS_ID}, PART_ID_WHERE, attachmentId.toStrings(), null, null, null);
-
-    try {
-      if (cursor != null && cursor.moveToFirst()) {
-        notifyConversationListeners(DatabaseFactory.getMmsDatabase(context).getThreadIdForMessage(cursor.getLong(cursor.getColumnIndexOrThrow(MMS_ID))));
-      }
-    } finally {
-      if (cursor != null) cursor.close();
-    }
-  }
-
   @WorkerThread
   public void writeAudioHash(@NonNull AttachmentId attachmentId, @Nullable AudioWaveFormData audioWaveForm) {
     Log.i(TAG, "updating part audio wave form for #" + attachmentId);
@@ -1468,66 +1328,6 @@ public class AttachmentDatabase extends Database {
     database.update(TABLE_NAME, values, PART_ID_WHERE, attachmentId.toStrings());
   }
 
-  @VisibleForTesting
-  class ThumbnailFetchCallable implements Callable<InputStream> {
-
-    private final AttachmentId attachmentId;
-    private final long         timeUs;
-
-    ThumbnailFetchCallable(AttachmentId attachmentId, long timeUs) {
-      this.attachmentId = attachmentId;
-      this.timeUs       = timeUs;
-    }
-
-    @Override
-    public @Nullable InputStream call() throws Exception {
-      Log.d(TAG, "Executing thumbnail job...");
-      final InputStream stream = getDataStream(attachmentId, THUMBNAIL, 0);
-
-      if (stream != null) {
-        return stream;
-      }
-
-      DatabaseAttachment attachment = getAttachment(attachmentId);
-
-      if (attachment == null || !attachment.hasData()) {
-        return null;
-      }
-
-      if (MediaUtil.isVideoType(attachment.getContentType())) {
-
-        try (ThumbnailData data = generateVideoThumbnail(attachmentId, timeUs)) {
-
-          if (data != null) {
-            updateAttachmentThumbnail(attachmentId, data.toDataStream(), data.getAspectRatio());
-
-            return getDataStream(attachmentId, THUMBNAIL, 0);
-          }
-        }
-      }
-
-      return null;
-    }
-
-    private ThumbnailData generateVideoThumbnail(AttachmentId attachmentId, long timeUs) throws IOException {
-      if (Build.VERSION.SDK_INT < 23) {
-        Log.w(TAG, "Video thumbnails not supported...");
-        return null;
-      }
-
-      try (MediaDataSource dataSource = mediaDataSourceFor(attachmentId)) {
-        if (dataSource == null) return null;
-
-        MediaMetadataRetriever retriever = new MediaMetadataRetriever();
-        MediaMetadataRetrieverUtil.setDataSource(retriever, dataSource);
-
-        Bitmap bitmap = retriever.getFrameAtTime(timeUs);
-
-        Log.i(TAG, "Generated video thumbnail...");
-        return bitmap != null ? new ThumbnailData(bitmap) : null;
-      }
-    }
-  }
 
   @RequiresApi(23)
   public @Nullable MediaDataSource mediaDataSourceFor(@NonNull AttachmentId attachmentId) {

app/src/main/java/org/thoughtcrime/securesms/database/DatabaseContentProviders.java

@@ -4,9 +4,12 @@ import android.content.ContentProvider;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.net.Uri;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import org.thoughtcrime.securesms.BuildConfig;
+
 /**
  * Starting in API 26, a {@link ContentProvider} needs to be defined for each authority you wish to
  * observe changes on. These classes essentially do nothing except exist so Android doesn't complain.
@@ -14,11 +17,15 @@ import androidx.annotation.Nullable;
 public class DatabaseContentProviders {
 
   public static class ConversationList extends NoopContentProvider {
-    public static final Uri CONTENT_URI = Uri.parse("content://org.thoughtcrime.securesms.database.conversationlist");
+    private static final String CONTENT_AUTHORITY  = BuildConfig.APPLICATION_ID + ".database.conversationlist";
+    private static final String CONTENT_URI_STRING = "content://" + CONTENT_AUTHORITY;
+
+    public static final Uri CONTENT_URI = Uri.parse(CONTENT_URI_STRING);
   }
 
   public static class Conversation extends NoopContentProvider {
-    private static final String CONTENT_URI_STRING = "content://org.thoughtcrime.securesms.database.conversation/";
+    private static final String CONTENT_AUTHORITY  = BuildConfig.APPLICATION_ID + ".database.conversation";
+    private static final String CONTENT_URI_STRING = "content://" + CONTENT_AUTHORITY + "/";
 
     public static Uri getUriForThread(long threadId) {
       return Uri.parse(CONTENT_URI_STRING + threadId);
@@ -34,15 +41,24 @@ public class DatabaseContentProviders {
   }
 
   public static class Attachment extends NoopContentProvider {
-    public static final Uri CONTENT_URI = Uri.parse("content://org.thoughtcrime.securesms.database.attachment");
+    private static final String CONTENT_AUTHORITY  = BuildConfig.APPLICATION_ID + ".database.attachment";
+    private static final String CONTENT_URI_STRING = "content://" + CONTENT_AUTHORITY;
+
+    public static final Uri CONTENT_URI = Uri.parse(CONTENT_URI_STRING);
   }
 
   public static class Sticker extends NoopContentProvider {
-    public static final Uri CONTENT_URI = Uri.parse("content://org.thoughtcrime.securesms.database.sticker");
+    private static final String CONTENT_AUTHORITY  = BuildConfig.APPLICATION_ID + ".database.sticker";
+    private static final String CONTENT_URI_STRING = "content://" + CONTENT_AUTHORITY;
+
+    public static final Uri CONTENT_URI = Uri.parse(CONTENT_URI_STRING);
   }
 
   public static class StickerPack extends NoopContentProvider {
-    public static final Uri CONTENT_URI = Uri.parse("content://org.thoughtcrime.securesms.database.stickerpack");
+    private static final String CONTENT_AUTHORITY  = BuildConfig.APPLICATION_ID + ".database.stickerpack";
+    private static final String CONTENT_URI_STRING = "content://" + CONTENT_AUTHORITY;
+
+    public static final Uri CONTENT_URI = Uri.parse(CONTENT_URI_STRING);
   }
 
   private static abstract class NoopContentProvider extends ContentProvider {

app/src/main/java/org/thoughtcrime/securesms/database/EarlyReceiptCache.java

@@ -22,8 +22,6 @@ public class EarlyReceiptCache {
   }
 
   public synchronized void increment(long timestamp, @NonNull RecipientId origin) {
-    Log.i(TAG, String.format(Locale.US, "[%s] Timestamp: %d, Recipient: %s", name, timestamp, origin.serialize()));
-
     Map<RecipientId, Long> receipts = cache.get(timestamp);
 
     if (receipts == null) {
@@ -43,10 +41,6 @@ public class EarlyReceiptCache {
 
   public synchronized Map<RecipientId, Long> remove(long timestamp) {
     Map<RecipientId, Long> receipts = cache.remove(timestamp);
-
-    Log.i(TAG, this+"");
-    Log.i(TAG, String.format(Locale.US, "Checking early receipts (%d): %d", timestamp, receipts == null ? 0 : receipts.size()));
-
     return receipts != null ? receipts : new HashMap<>();
   }
 }

app/src/main/java/org/thoughtcrime/securesms/database/MediaDatabase.java

@@ -23,14 +23,12 @@ public class MediaDatabase extends Database {
 
     private static final String BASE_MEDIA_QUERY = "SELECT " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.ROW_ID + " AS " + AttachmentDatabase.ROW_ID + ", "
         + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.CONTENT_TYPE + ", "
-        + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.THUMBNAIL_ASPECT_RATIO + ", "
         + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.UNIQUE_ID + ", "
         + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.MMS_ID + ", "
         + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.TRANSFER_STATE + ", "
         + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.SIZE + ", "
         + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.FILE_NAME + ", "
         + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.DATA + ", "
-        + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.THUMBNAIL + ", "
         + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.CDN_NUMBER + ", "
         + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.CONTENT_LOCATION + ", "
         + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.CONTENT_DISPOSITION + ", "

app/src/main/java/org/thoughtcrime/securesms/database/MentionDatabase.java

@@ -125,6 +125,25 @@ public class MentionDatabase extends Database {
     }
   }
 
+  void deleteMentionsForMessage(long messageId) {
+    SQLiteDatabase db    = databaseHelper.getWritableDatabase();
+    String         where = MESSAGE_ID + " = ?";
+
+    db.delete(TABLE_NAME, where, SqlUtil.buildArgs(messageId));
+  }
+
+  void deleteAbandonedMentions() {
+    SQLiteDatabase db    = databaseHelper.getWritableDatabase();
+    String         where = MESSAGE_ID + " NOT IN (SELECT " + MmsDatabase.ID + " FROM " + MmsDatabase.TABLE_NAME + ") OR " + THREAD_ID + " NOT IN (SELECT " + ThreadDatabase.ID + " FROM " + ThreadDatabase.TABLE_NAME + ")";
+
+    db.delete(TABLE_NAME, where, null);
+  }
+
+  void deleteAllMentions() {
+    SQLiteDatabase db = databaseHelper.getWritableDatabase();
+    db.delete(TABLE_NAME, null, null);
+  }
+
   private @NonNull Map<Long, List<Mention>> readMentions(@Nullable Cursor cursor) {
     Map<Long, List<Mention>> mentions = new HashMap<>();
     while (cursor != null && cursor.moveToNext()) {

app/src/main/java/org/thoughtcrime/securesms/database/MentionUtil.java

@@ -16,7 +16,6 @@ import org.thoughtcrime.securesms.database.RecipientDatabase.MentionSetting;
 import org.thoughtcrime.securesms.database.model.Mention;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.databaseprotos.BodyRangeList;
-import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.whispersystems.signalservice.api.util.UuidUtil;
@@ -24,6 +23,8 @@ import org.whispersystems.signalservice.api.util.UuidUtil;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 public final class MentionUtil {
 
@@ -68,14 +69,13 @@ public final class MentionUtil {
       return new UpdatedBodyAndMentions(body, mentions);
     }
 
+    SortedSet<Mention>     sortedMentions  = new TreeSet<>(mentions);
     SpannableStringBuilder updatedBody     = new SpannableStringBuilder();
     List<Mention>          updatedMentions = new ArrayList<>();
 
-    Collections.sort(mentions);
-
     int bodyIndex = 0;
 
-    for (Mention mention : mentions) {
+    for (Mention mention : sortedMentions) {
       updatedBody.append(body.subSequence(bodyIndex, mention.getStart()));
       CharSequence replaceWith    = replacementTextGenerator.apply(mention);
       Mention      updatedMention = new Mention(mention.getRecipientId(), updatedBody.length(), replaceWith.length());

app/src/main/java/org/thoughtcrime/securesms/database/MessageDatabase.java

@@ -126,7 +126,7 @@ public abstract class MessageDatabase extends Database implements MmsSmsColumns
 
   public abstract @NonNull Pair<Long, Long> insertReceivedCall(@NonNull RecipientId address);
   public abstract @NonNull Pair<Long, Long> insertOutgoingCall(@NonNull RecipientId address);
-  public abstract @NonNull Pair<Long, Long> insertMissedCall(@NonNull RecipientId address);
+  public abstract @NonNull Pair<Long, Long> insertMissedCall(@NonNull RecipientId address, long timestamp);
 
   public abstract Optional<InsertResult> insertMessageInbox(IncomingTextMessage message, long type);
   public abstract Optional<InsertResult> insertMessageInbox(IncomingTextMessage message);

app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java

@@ -213,7 +213,6 @@ public class MmsDatabase extends MessageDatabase {
           "'" + AttachmentDatabase.SIZE + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.SIZE + ", " +
           "'" + AttachmentDatabase.FILE_NAME + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.FILE_NAME + ", " +
           "'" + AttachmentDatabase.DATA + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.DATA + ", " +
-          "'" + AttachmentDatabase.THUMBNAIL + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.THUMBNAIL + ", " +
           "'" + AttachmentDatabase.CONTENT_TYPE + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.CONTENT_TYPE + ", " +
           "'" + AttachmentDatabase.CDN_NUMBER + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.CDN_NUMBER + ", " +
           "'" + AttachmentDatabase.CONTENT_LOCATION + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.CONTENT_LOCATION + ", " +
@@ -390,7 +389,7 @@ public class MmsDatabase extends MessageDatabase {
   }
 
   @Override
-  public @NonNull Pair<Long, Long> insertMissedCall(@NonNull RecipientId address) {
+  public @NonNull Pair<Long, Long> insertMissedCall(@NonNull RecipientId address, long timestamp) {
     throw new UnsupportedOperationException();
   }
 
@@ -705,6 +704,7 @@ public class MmsDatabase extends MessageDatabase {
     db.update(TABLE_NAME, values, ID_WHERE, new String[] { String.valueOf(messageId) });
 
     DatabaseFactory.getAttachmentDatabase(context).deleteAttachmentsForMessage(messageId);
+    DatabaseFactory.getMentionDatabase(context).deleteMentionsForMessage(messageId);
 
     long threadId = getThreadIdForMessage(messageId);
     DatabaseFactory.getThreadDatabase(context).update(threadId, false);
@@ -935,6 +935,8 @@ public class MmsDatabase extends MessageDatabase {
       }
     }
 
+    DatabaseFactory.getMentionDatabase(context).deleteAbandonedMentions();
+
     try (Cursor cursor = database.query(ThreadDatabase.TABLE_NAME, new String[] { ThreadDatabase.ID }, ThreadDatabase.EXPIRES_IN + " > 0", null, null, null, null)) {
       while (cursor != null && cursor.moveToNext()) {
         DatabaseFactory.getThreadDatabase(context).update(cursor.getLong(0), false);
@@ -1468,6 +1470,9 @@ public class MmsDatabase extends MessageDatabase {
     GroupReceiptDatabase groupReceiptDatabase = DatabaseFactory.getGroupReceiptDatabase(context);
     groupReceiptDatabase.deleteRowsForMessage(messageId);
 
+    MentionDatabase mentionDatabase = DatabaseFactory.getMentionDatabase(context);
+    mentionDatabase.deleteMentionsForMessage(messageId);
+
     SQLiteDatabase database = databaseHelper.getWritableDatabase();
     database.delete(TABLE_NAME, ID_WHERE, new String[] {messageId+""});
     boolean threadDeleted = DatabaseFactory.getThreadDatabase(context).update(threadId, false);
@@ -1602,6 +1607,7 @@ public class MmsDatabase extends MessageDatabase {
   public void deleteAllThreads() {
     DatabaseFactory.getAttachmentDatabase(context).deleteAllAttachments();
     DatabaseFactory.getGroupReceiptDatabase(context).deleteAllRows();
+    DatabaseFactory.getMentionDatabase(context).deleteAllMentions();
 
     SQLiteDatabase database = databaseHelper.getWritableDatabase();
     database.delete(TABLE_NAME, null, null);

app/src/main/java/org/thoughtcrime/securesms/database/MmsSmsDatabase.java

@@ -314,7 +314,7 @@ public class MmsSmsDatabase extends Database {
 
   public int getQuotedMessagePosition(long threadId, long quoteId, @NonNull RecipientId recipientId) {
     String order     = MmsSmsColumns.NORMALIZED_DATE_RECEIVED + " DESC";
-    String selection = MmsSmsColumns.THREAD_ID + " = " + threadId;
+    String selection = MmsSmsColumns.THREAD_ID + " = " + threadId + " AND " + MmsSmsColumns.REMOTE_DELETED + " = 0";
 
     try (Cursor cursor = queryTables(new String[]{ MmsSmsColumns.NORMALIZED_DATE_SENT, MmsSmsColumns.RECIPIENT_ID}, selection, order, null)) {
       boolean isOwnNumber = Recipient.resolved(recipientId).isLocalNumber();
@@ -333,7 +333,7 @@ public class MmsSmsDatabase extends Database {
 
   public int getMessagePositionInConversation(long threadId, long receivedTimestamp, @NonNull RecipientId recipientId) {
     String order     = MmsSmsColumns.NORMALIZED_DATE_RECEIVED + " DESC";
-    String selection = MmsSmsColumns.THREAD_ID + " = " + threadId;
+    String selection = MmsSmsColumns.THREAD_ID + " = " + threadId + " AND " + MmsSmsColumns.REMOTE_DELETED + " = 0";
 
     try (Cursor cursor = queryTables(new String[]{ MmsSmsColumns.NORMALIZED_DATE_RECEIVED, MmsSmsColumns.RECIPIENT_ID}, selection, order, null)) {
       boolean isOwnNumber = Recipient.resolved(recipientId).isLocalNumber();
@@ -364,7 +364,9 @@ public class MmsSmsDatabase extends Database {
    */
   public int getMessagePositionInConversation(long threadId, long receivedTimestamp) {
     String order     = MmsSmsColumns.NORMALIZED_DATE_RECEIVED + " DESC";
-    String selection = MmsSmsColumns.THREAD_ID + " = " + threadId + " AND " + MmsSmsColumns.NORMALIZED_DATE_RECEIVED + " > " + receivedTimestamp;
+    String selection = MmsSmsColumns.THREAD_ID + " = " + threadId + " AND " +
+                       MmsSmsColumns.NORMALIZED_DATE_RECEIVED + " > " + receivedTimestamp + " AND " +
+                       MmsSmsColumns.REMOTE_DELETED + " = 0";
 
     try (Cursor cursor = queryTables(new String[]{ "COUNT(*)" }, selection, order, null)) {
       if (cursor != null && cursor.moveToFirst()) {
@@ -411,7 +413,6 @@ public class MmsSmsDatabase extends Database {
                                   "'" + AttachmentDatabase.SIZE + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.SIZE + ", " +
                                   "'" + AttachmentDatabase.FILE_NAME + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.FILE_NAME + ", " +
                                   "'" + AttachmentDatabase.DATA + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.DATA + ", " +
-                                  "'" + AttachmentDatabase.THUMBNAIL + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.THUMBNAIL + ", " +
                                   "'" + AttachmentDatabase.CONTENT_TYPE + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.CONTENT_TYPE + ", " +
                                   "'" + AttachmentDatabase.CDN_NUMBER + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.CDN_NUMBER + ", " +
                                   "'" + AttachmentDatabase.CONTENT_LOCATION + "', " + AttachmentDatabase.TABLE_NAME + "." + AttachmentDatabase.CONTENT_LOCATION + ", " +

app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java

@@ -10,12 +10,11 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.annimon.stream.Stream;
-import com.google.android.gms.common.util.ArrayUtils;
 
 import net.sqlcipher.database.SQLiteConstraintException;
 import net.sqlcipher.database.SQLiteDatabase;
 
-import org.signal.zkgroup.InvalidInputException;
+import org.signal.storageservice.protos.groups.local.DecryptedGroup;
 import org.signal.zkgroup.groups.GroupMasterKey;
 import org.signal.zkgroup.profiles.ProfileKey;
 import org.signal.zkgroup.profiles.ProfileKeyCredential;
@@ -23,13 +22,15 @@ import org.thoughtcrime.securesms.color.MaterialColor;
 import org.thoughtcrime.securesms.contacts.avatars.ContactColors;
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
 import org.thoughtcrime.securesms.database.IdentityDatabase.IdentityRecord;
+import org.thoughtcrime.securesms.database.IdentityDatabase.VerifiedStatus;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.database.model.ThreadRecord;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.groups.v2.ProfileKeySet;
+import org.thoughtcrime.securesms.groups.v2.processing.GroupsV2StateProcessor;
 import org.thoughtcrime.securesms.jobs.RefreshAttributesJob;
-import org.thoughtcrime.securesms.jobs.WakeGroupV2Job;
+import org.thoughtcrime.securesms.jobs.RequestGroupV2InfoJob;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
 import org.thoughtcrime.securesms.profiles.ProfileName;
@@ -40,7 +41,7 @@ import org.thoughtcrime.securesms.storage.StorageSyncHelper.RecordUpdate;
 import org.thoughtcrime.securesms.storage.StorageSyncModels;
 import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.CursorUtil;
-import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.GroupUtil;
 import org.thoughtcrime.securesms.util.IdentityUtil;
 import org.thoughtcrime.securesms.util.SqlUtil;
 import org.thoughtcrime.securesms.util.StringUtil;
@@ -61,6 +62,7 @@ import org.whispersystems.signalservice.api.util.UuidUtil;
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -128,7 +130,7 @@ public class RecipientDatabase extends Database {
   private static final String IDENTITY_KEY             = "identity_key";
 
   private static final String[] RECIPIENT_PROJECTION = new String[] {
-      UUID, USERNAME, PHONE, EMAIL, GROUP_ID, GROUP_TYPE,
+      ID, UUID, USERNAME, PHONE, EMAIL, GROUP_ID, GROUP_TYPE,
       BLOCKED, MESSAGE_RINGTONE, CALL_RINGTONE, MESSAGE_VIBRATE, CALL_VIBRATE, MUTE_UNTIL, COLOR, SEEN_INVITE_REMINDER, DEFAULT_SUBSCRIPTION_ID, MESSAGE_EXPIRATION_TIME, REGISTERED,
       PROFILE_KEY, PROFILE_KEY_CREDENTIAL,
       SYSTEM_DISPLAY_NAME, SYSTEM_PHOTO_URI, SYSTEM_PHONE_LABEL, SYSTEM_PHONE_TYPE, SYSTEM_CONTACT_URI,
@@ -144,20 +146,13 @@ public class RecipientDatabase extends Database {
   private static final String[] ID_PROJECTION              = new String[]{ID};
   private static final String[] SEARCH_PROJECTION          = new String[]{ID, SYSTEM_DISPLAY_NAME, PHONE, EMAIL, SYSTEM_PHONE_LABEL, SYSTEM_PHONE_TYPE, REGISTERED, "COALESCE(" + nullIfEmpty(PROFILE_JOINED_NAME) + ", " + nullIfEmpty(PROFILE_GIVEN_NAME) + ") AS " + SEARCH_PROFILE_NAME, "COALESCE(" + nullIfEmpty(SYSTEM_DISPLAY_NAME) + ", " + nullIfEmpty(PROFILE_JOINED_NAME) + ", " + nullIfEmpty(PROFILE_GIVEN_NAME) + ", " + nullIfEmpty(USERNAME) + ") AS " + SORT_NAME};
   public  static final String[] SEARCH_PROJECTION_NAMES    = new String[]{ID, SYSTEM_DISPLAY_NAME, PHONE, EMAIL, SYSTEM_PHONE_LABEL, SYSTEM_PHONE_TYPE, REGISTERED, SEARCH_PROFILE_NAME, SORT_NAME};
-          static final String[] TYPED_RECIPIENT_PROJECTION = Stream.of(RECIPIENT_PROJECTION)
+  private static final String[] TYPED_RECIPIENT_PROJECTION = Stream.of(RECIPIENT_PROJECTION)
                                                                    .map(columnName -> TABLE_NAME + "." + columnName)
                                                                    .toList().toArray(new String[0]);
 
-  private static final String[] MENTION_SEARCH_PROJECTION  = new String[]{ID, removeWhitespace("COALESCE(" + nullIfEmpty(SYSTEM_DISPLAY_NAME) + ", " + nullIfEmpty(PROFILE_JOINED_NAME) + ", " + nullIfEmpty(PROFILE_GIVEN_NAME) + ", " + nullIfEmpty(USERNAME) + ", " + nullIfEmpty(PHONE) + ")") + " AS " + SORT_NAME};
+  static final String[] TYPED_RECIPIENT_PROJECTION_NO_ID = Arrays.copyOfRange(TYPED_RECIPIENT_PROJECTION, 1, TYPED_RECIPIENT_PROJECTION.length);
 
-  private static final String[] RECIPIENT_FULL_PROJECTION = ArrayUtils.concat(
-      new String[] { TABLE_NAME + "." + ID,
-                     TABLE_NAME + "." + STORAGE_PROTO },
-      TYPED_RECIPIENT_PROJECTION,
-      new String[] {
-        IdentityDatabase.TABLE_NAME + "." + IdentityDatabase.VERIFIED + " AS " + IDENTITY_STATUS,
-        IdentityDatabase.TABLE_NAME + "." + IdentityDatabase.IDENTITY_KEY + " AS " + IDENTITY_KEY
-      });
+  private static final String[] MENTION_SEARCH_PROJECTION  = new String[]{ID, removeWhitespace("COALESCE(" + nullIfEmpty(SYSTEM_DISPLAY_NAME) + ", " + nullIfEmpty(PROFILE_JOINED_NAME) + ", " + nullIfEmpty(PROFILE_GIVEN_NAME) + ", " + nullIfEmpty(USERNAME) + ", " + nullIfEmpty(PHONE) + ")") + " AS " + SORT_NAME};
 
   public static final String[] CREATE_INDEXS = new String[] {
       "CREATE INDEX IF NOT EXISTS recipient_dirty_index ON " + TABLE_NAME + " (" + DIRTY + ");",
@@ -393,10 +388,6 @@ public class RecipientDatabase extends Database {
       throw new IllegalArgumentException("Must provide a UUID or E164!");
     }
 
-    if (!FeatureFlags.cds()) {
-      highTrust = true;
-    }
-
     RecipientId                    recipientNeedingRefresh = null;
     Pair<RecipientId, RecipientId> remapped                = null;
     boolean                        transactionSuccessful   = false;
@@ -599,11 +590,10 @@ public class RecipientDatabase extends Database {
 
   public @NonNull RecipientSettings getRecipientSettings(@NonNull RecipientId id) {
     SQLiteDatabase database = databaseHelper.getReadableDatabase();
-    String         table    = TABLE_NAME + " LEFT OUTER JOIN " + IdentityDatabase.TABLE_NAME + " ON " + TABLE_NAME + "." + ID + " = " + IdentityDatabase.TABLE_NAME + "." + IdentityDatabase.RECIPIENT_ID;
-    String         query    = TABLE_NAME + "." + ID + " = ?";
+    String         query    = ID + " = ?";
     String[]       args     = new String[] { id.serialize() };
 
-    try (Cursor cursor = database.query(table, RECIPIENT_FULL_PROJECTION, query, args, null, null, null)) {
+    try (Cursor cursor = database.query(TABLE_NAME, RECIPIENT_PROJECTION, query, args, null, null, null)) {
       if (cursor != null && cursor.moveToNext()) {
         return getRecipientSettings(context, cursor);
       } else {
@@ -678,6 +668,20 @@ public class RecipientDatabase extends Database {
     return null;
   }
 
+  public void markNeedsSync(@NonNull Collection<RecipientId> recipientIds) {
+    SQLiteDatabase db = databaseHelper.getWritableDatabase();
+
+    db.beginTransaction();
+    try {
+      for (RecipientId recipientId : recipientIds) {
+        markDirty(recipientId, DirtyState.UPDATE);
+      }
+      db.setTransactionSuccessful();
+    } finally {
+      db.endTransaction();
+    }
+  }
+
   public void markNeedsSync(@NonNull RecipientId recipientId) {
     markDirty(recipientId, DirtyState.UPDATE);
   }
@@ -700,6 +704,10 @@ public class RecipientDatabase extends Database {
     } finally {
       db.endTransaction();
     }
+
+    for (RecipientId id : storageIds.keySet()) {
+      Recipient.live(id).refresh();
+    }
   }
 
   public void applyStorageSyncUpdates(@NonNull Collection<SignalContactRecord>               contactInserts,
@@ -774,7 +782,7 @@ public class RecipientDatabase extends Database {
           }
         }
 
-        threadDatabase.setArchived(recipientId, insert.isArchived());
+        threadDatabase.applyStorageSyncUpdate(recipientId, insert);
         needsRefresh.add(recipientId);
       }
 
@@ -814,12 +822,12 @@ public class RecipientDatabase extends Database {
 
           Optional<IdentityRecord> newIdentityRecord = identityDatabase.getIdentity(recipientId);
 
-          if ((newIdentityRecord.isPresent() && newIdentityRecord.get().getVerifiedStatus() == IdentityDatabase.VerifiedStatus.VERIFIED) &&
-              (!oldIdentityRecord.isPresent() || oldIdentityRecord.get().getVerifiedStatus() != IdentityDatabase.VerifiedStatus.VERIFIED))
+          if ((newIdentityRecord.isPresent() && newIdentityRecord.get().getVerifiedStatus() == VerifiedStatus.VERIFIED) &&
+              (!oldIdentityRecord.isPresent() || oldIdentityRecord.get().getVerifiedStatus() != VerifiedStatus.VERIFIED))
           {
             IdentityUtil.markIdentityVerified(context, Recipient.resolved(recipientId), true, true);
-          } else if ((newIdentityRecord.isPresent() && newIdentityRecord.get().getVerifiedStatus() != IdentityDatabase.VerifiedStatus.VERIFIED) &&
-                     (oldIdentityRecord.isPresent() && oldIdentityRecord.get().getVerifiedStatus() == IdentityDatabase.VerifiedStatus.VERIFIED))
+          } else if ((newIdentityRecord.isPresent() && newIdentityRecord.get().getVerifiedStatus() != VerifiedStatus.VERIFIED) &&
+                     (oldIdentityRecord.isPresent() && oldIdentityRecord.get().getVerifiedStatus() == VerifiedStatus.VERIFIED))
           {
             IdentityUtil.markIdentityVerified(context, Recipient.resolved(recipientId), false, true);
           }
@@ -827,7 +835,7 @@ public class RecipientDatabase extends Database {
           Log.w(TAG, "Failed to process identity key during update! Skipping.", e);
         }
 
-        threadDatabase.setArchived(recipientId, update.getNew().isArchived());
+        threadDatabase.applyStorageSyncUpdate(recipientId, update.getNew());
         needsRefresh.add(recipientId);
       }
 
@@ -836,7 +844,7 @@ public class RecipientDatabase extends Database {
 
         Recipient recipient = Recipient.externalGroup(context, GroupId.v1orThrow(insert.getGroupId()));
 
-        threadDatabase.setArchived(recipient.getId(), insert.isArchived());
+        threadDatabase.applyStorageSyncUpdate(recipient.getId(), insert);
         needsRefresh.add(recipient.getId());
       }
 
@@ -850,19 +858,35 @@ public class RecipientDatabase extends Database {
 
         Recipient recipient = Recipient.externalGroup(context, GroupId.v1orThrow(update.getOld().getGroupId()));
 
-        threadDatabase.setArchived(recipient.getId(), update.getNew().isArchived());
+        threadDatabase.applyStorageSyncUpdate(recipient.getId(), update.getNew());
         needsRefresh.add(recipient.getId());
       }
       
       for (SignalGroupV2Record insert : groupV2Inserts) {
-        db.insertOrThrow(TABLE_NAME, null, getValuesForStorageGroupV2(insert));
+        GroupMasterKey masterKey = insert.getMasterKeyOrThrow();
+        GroupId.V2     groupId   = GroupId.v2(masterKey);
+        ContentValues  values    = getValuesForStorageGroupV2(insert);
+        long           id        = db.insertWithOnConflict(TABLE_NAME, null, values, SQLiteDatabase.CONFLICT_IGNORE);
+        Recipient      recipient = Recipient.externalGroup(context, groupId);
 
-        GroupId.V2 groupId   = GroupId.v2(insert.getMasterKey());
-        Recipient  recipient = Recipient.externalGroup(context, groupId);
+        if (id < 0) {
+          Log.w(TAG, String.format("Recipient %s is already linked to group %s", recipient.getId(), groupId));
+        } else {
+          Log.i(TAG, String.format("Inserted recipient %s for group %s", recipient.getId(), groupId));
+        }
 
-        ApplicationDependencies.getJobManager().add(new WakeGroupV2Job(insert.getMasterKey()));
+        Log.i(TAG, "Creating restore placeholder for " + groupId);
+        DatabaseFactory.getGroupDatabase(context)
+                       .create(masterKey,
+                               DecryptedGroup.newBuilder()
+                                             .setRevision(GroupsV2StateProcessor.RESTORE_PLACEHOLDER_REVISION)
+                                             .build());
 
-        threadDatabase.setArchived(recipient.getId(), insert.isArchived());
+        Log.i(TAG, "Scheduling request for latest group info for " + groupId);
+
+        ApplicationDependencies.getJobManager().add(new RequestGroupV2InfoJob(groupId));
+
+        threadDatabase.applyStorageSyncUpdate(recipient.getId(), insert);
         needsRefresh.add(recipient.getId());
       }
 
@@ -874,9 +898,10 @@ public class RecipientDatabase extends Database {
           throw new AssertionError("Had an update, but it didn't match any rows!");
         }
 
-        Recipient recipient = Recipient.externalGroup(context, GroupId.v2(update.getOld().getMasterKey()));
+        GroupMasterKey masterKey = update.getOld().getMasterKeyOrThrow();
+        Recipient      recipient = Recipient.externalGroup(context, GroupId.v2(masterKey));
 
-        threadDatabase.setArchived(recipient.getId(), update.getNew().isArchived());
+        threadDatabase.applyStorageSyncUpdate(recipient.getId(), update.getNew());
         needsRefresh.add(recipient.getId());
       }
 
@@ -925,6 +950,8 @@ public class RecipientDatabase extends Database {
       ApplicationDependencies.getJobManager().add(new RefreshAttributesJob());
     }
 
+    DatabaseFactory.getThreadDatabase(context).applyStorageSyncUpdate(Recipient.self().getId(), update);
+
     Recipient.self().live().refresh();
   }
 
@@ -986,7 +1013,7 @@ public class RecipientDatabase extends Database {
     values.put(STORAGE_SERVICE_ID, Base64.encodeBytes(contact.getId().getRaw()));
     values.put(DIRTY, DirtyState.CLEAN.getId());
 
-    if (contact.isProfileSharingEnabled() && isInsert) {
+    if (contact.isProfileSharingEnabled() && isInsert && !profileName.isEmpty()) {
       values.put(COLOR, ContactColors.generateFor(profileName.toString()).serialize());
     }
 
@@ -1019,7 +1046,7 @@ public class RecipientDatabase extends Database {
   
   private static @NonNull ContentValues getValuesForStorageGroupV2(@NonNull SignalGroupV2Record groupV2) {
     ContentValues values = new ContentValues();
-    values.put(GROUP_ID, GroupId.v2(groupV2.getMasterKey()).toString());
+    values.put(GROUP_ID, GroupId.v2(groupV2.getMasterKeyOrThrow()).toString());
     values.put(GROUP_TYPE, GroupType.SIGNAL_V2.getId());
     values.put(PROFILE_SHARING, groupV2.isProfileSharingEnabled() ? "1" : "0");
     values.put(BLOCKED, groupV2.isBlocked() ? "1" : "0");
@@ -1037,12 +1064,20 @@ public class RecipientDatabase extends Database {
 
   private List<RecipientSettings> getRecipientSettingsForSync(@Nullable String query, @Nullable String[] args) {
     SQLiteDatabase          db    = databaseHelper.getReadableDatabase();
-    String                  table = TABLE_NAME + " LEFT OUTER JOIN " + IdentityDatabase.TABLE_NAME + " ON " + TABLE_NAME + "." + ID + " = " + IdentityDatabase.TABLE_NAME + "." + IdentityDatabase.RECIPIENT_ID
-                                               + " LEFT OUTER JOIN " + GroupDatabase.TABLE_NAME + " ON " + TABLE_NAME + "." + GROUP_ID + " = " + GroupDatabase.TABLE_NAME + "." + GroupDatabase.GROUP_ID;
+    String                  table = TABLE_NAME + " LEFT OUTER JOIN " + IdentityDatabase.TABLE_NAME + " ON " + TABLE_NAME + "." + ID       + " = " + IdentityDatabase.TABLE_NAME + "." + IdentityDatabase.RECIPIENT_ID
+                                               + " LEFT OUTER JOIN " + GroupDatabase.TABLE_NAME    + " ON " + TABLE_NAME + "." + GROUP_ID + " = " + GroupDatabase.TABLE_NAME + "." + GroupDatabase.GROUP_ID
+                                               + " LEFT OUTER JOIN " + ThreadDatabase.TABLE_NAME   + " ON " + TABLE_NAME + "." + ID       + " = " + ThreadDatabase.TABLE_NAME + "." + ThreadDatabase.RECIPIENT_ID;
     List<RecipientSettings> out   = new ArrayList<>();
 
-    String[] columns = ArrayUtils.concat(RECIPIENT_FULL_PROJECTION,
-      new String[]{GroupDatabase.TABLE_NAME + "." + GroupDatabase.V2_MASTER_KEY });
+    String[] columns = Stream.of(TYPED_RECIPIENT_PROJECTION,
+                                 new String[]{ RecipientDatabase.TABLE_NAME + "." + STORAGE_PROTO,
+                                               GroupDatabase.TABLE_NAME     + "." + GroupDatabase.V2_MASTER_KEY,
+                                               ThreadDatabase.TABLE_NAME    + "." + ThreadDatabase.ARCHIVED,
+                                               ThreadDatabase.TABLE_NAME    + "." + ThreadDatabase.READ,
+                                               IdentityDatabase.TABLE_NAME  + "." + IdentityDatabase.VERIFIED + " AS " + IDENTITY_STATUS,
+                                               IdentityDatabase.TABLE_NAME  + "." + IdentityDatabase.IDENTITY_KEY + " AS " + IDENTITY_KEY })
+                             .flatMap(Stream::of)
+                             .toArray(String[]::new);
 
     try (Cursor cursor = db.query(table, columns, query, args, null, null, null)) {
       while (cursor != null && cursor.moveToNext()) {
@@ -1066,7 +1101,7 @@ public class RecipientDatabase extends Database {
   public @NonNull Map<RecipientId, StorageId> getContactStorageSyncIdsMap() {
     SQLiteDatabase              db    = databaseHelper.getReadableDatabase();
     String                      query = STORAGE_SERVICE_ID + " NOT NULL AND " + DIRTY + " != ? AND " + ID + " != ? AND " + GROUP_TYPE + " != ?";
-    String[]                    args  = { String.valueOf(DirtyState.DELETE), Recipient.self().getId().serialize(), String.valueOf(GroupType.SIGNAL_V2.getId()) };
+    String[]                    args  = { String.valueOf(DirtyState.DELETE.getId()), Recipient.self().getId().serialize(), String.valueOf(GroupType.SIGNAL_V2.getId()) };
     Map<RecipientId, StorageId> out   = new HashMap<>();
 
     try (Cursor cursor = db.query(TABLE_NAME, new String[] { ID, STORAGE_SERVICE_ID, GROUP_TYPE }, query, args, null, null, null)) {
@@ -1142,23 +1177,6 @@ public class RecipientDatabase extends Database {
     int     groupsV2CapabilityValue    = CursorUtil.requireInt(cursor, GROUPS_V2_CAPABILITY);
     String  storageKeyRaw              = CursorUtil.requireString(cursor, STORAGE_SERVICE_ID);
     int     mentionSettingId           = CursorUtil.requireInt(cursor, MENTION_SETTING);
-    String  storageProtoRaw            = CursorUtil.getString(cursor, STORAGE_PROTO).orNull();
-
-    Optional<String>  identityKeyRaw    = CursorUtil.getString(cursor, IDENTITY_KEY);
-    Optional<Integer> identityStatusRaw = CursorUtil.getInt(cursor, IDENTITY_STATUS);
-
-    int masterKeyIndex = cursor.getColumnIndex(GroupDatabase.V2_MASTER_KEY);
-    GroupMasterKey groupMasterKey = null;
-    try {
-      if (masterKeyIndex != -1) {
-        byte[] blob = cursor.getBlob(masterKeyIndex);
-        if (blob != null) {
-          groupMasterKey = new GroupMasterKey(blob);
-        }
-      }
-    } catch (InvalidInputException e) {
-      throw new AssertionError(e);
-    }
 
     MaterialColor color;
     byte[]        profileKey           = null;
@@ -1189,30 +1207,58 @@ public class RecipientDatabase extends Database {
       }
     }
 
-    byte[] storageKey   = storageKeyRaw != null ? Base64.decodeOrThrow(storageKeyRaw) : null;
-    byte[] identityKey  = identityKeyRaw.transform(Base64::decodeOrThrow).orNull();
-    byte[] storageProto = storageProtoRaw != null ? Base64.decodeOrThrow(storageProtoRaw) : null;
+    byte[] storageKey = storageKeyRaw != null ? Base64.decodeOrThrow(storageKeyRaw) : null;
 
-    IdentityDatabase.VerifiedStatus identityStatus = identityStatusRaw.transform(IdentityDatabase.VerifiedStatus::forState).or(IdentityDatabase.VerifiedStatus.DEFAULT);
-
-    return new RecipientSettings(RecipientId.from(id), uuid, username, e164, email, groupId, groupMasterKey, GroupType.fromId(groupType), blocked, muteUntil,
+    return new RecipientSettings(RecipientId.from(id),
+                                 uuid,
+                                 username,
+                                 e164,
+                                 email,
+                                 groupId,
+                                 GroupType.fromId(groupType),
+                                 blocked,
+                                 muteUntil,
                                  VibrateState.fromId(messageVibrateState),
                                  VibrateState.fromId(callVibrateState),
-                                 Util.uri(messageRingtone), Util.uri(callRingtone),
-                                 color, defaultSubscriptionId, expireMessages,
+                                 Util.uri(messageRingtone),
+                                 Util.uri(callRingtone),
+                                 color,
+                                 defaultSubscriptionId,
+                                 expireMessages,
                                  RegisteredState.fromId(registeredState),
-                                 profileKey, profileKeyCredential,
-                                 systemDisplayName, systemContactPhoto,
-                                 systemPhoneLabel, systemContactUri,
-                                 ProfileName.fromParts(profileGivenName, profileFamilyName), signalProfileAvatar,
-                                 AvatarHelper.hasAvatar(context, RecipientId.from(id)), profileSharing, lastProfileFetch,
-                                 notificationChannel, UnidentifiedAccessMode.fromMode(unidentifiedAccessMode),
+                                 profileKey,
+                                 profileKeyCredential,
+                                 systemDisplayName,
+                                 systemContactPhoto,
+                                 systemPhoneLabel,
+                                 systemContactUri,
+                                 ProfileName.fromParts(profileGivenName, profileFamilyName),
+                                 signalProfileAvatar,
+                                 AvatarHelper.hasAvatar(context, RecipientId.from(id)),
+                                 profileSharing,
+                                 lastProfileFetch,
+                                 notificationChannel,
+                                 UnidentifiedAccessMode.fromMode(unidentifiedAccessMode),
                                  forceSmsSelection,
                                  Recipient.Capability.deserialize(uuidCapabilityValue),
                                  Recipient.Capability.deserialize(groupsV2CapabilityValue),
                                  InsightsBannerTier.fromId(insightsBannerTier),
-                                 storageKey, identityKey, identityStatus, MentionSetting.fromId(mentionSettingId),
-                                 storageProto);
+                                 storageKey,
+                                 MentionSetting.fromId(mentionSettingId),
+                                 getSyncExtras(cursor));
+  }
+
+  private static @NonNull RecipientSettings.SyncExtras getSyncExtras(@NonNull Cursor cursor) {
+    String         storageProtoRaw = CursorUtil.getString(cursor, STORAGE_PROTO).orNull();
+    byte[]         storageProto    = storageProtoRaw != null ? Base64.decodeOrThrow(storageProtoRaw) : null;
+    boolean        archived        = CursorUtil.getBoolean(cursor, ThreadDatabase.ARCHIVED).or(false);
+    boolean        forcedUnread    = CursorUtil.getInt(cursor, ThreadDatabase.READ).transform(status -> status == ThreadDatabase.ReadStatus.FORCED_UNREAD.serialize()).or(false);
+    GroupMasterKey groupMasterKey  = CursorUtil.getBlob(cursor, GroupDatabase.V2_MASTER_KEY).transform(GroupUtil::requireMasterKey).orNull();
+    byte[]         identityKey     = CursorUtil.getString(cursor, IDENTITY_KEY).transform(Base64::decodeOrThrow).orNull();
+    VerifiedStatus identityStatus  = CursorUtil.getInt(cursor, IDENTITY_STATUS).transform(VerifiedStatus::forState).or(VerifiedStatus.DEFAULT);
+
+
+    return new RecipientSettings.SyncExtras(storageProto, groupMasterKey, identityKey, identityStatus, archived, forcedUnread);
   }
 
   public BulkOperationsHandle beginBulkSystemContactUpdate() {
@@ -1393,7 +1439,7 @@ public class RecipientDatabase extends Database {
     valuesToSet.putNull(PROFILE_KEY_CREDENTIAL);
     valuesToSet.put(UNIDENTIFIED_ACCESS_MODE, UnidentifiedAccessMode.UNKNOWN.getMode());
 
-    SqlUtil.UpdateQuery updateQuery = SqlUtil.buildTrueUpdateQuery(selection, args, valuesToCompare);
+    SqlUtil.Query updateQuery = SqlUtil.buildTrueUpdateQuery(selection, args, valuesToCompare);
 
     if (update(updateQuery, valuesToSet)) {
       markDirty(id, DirtyState.UPDATE);
@@ -1442,7 +1488,7 @@ public class RecipientDatabase extends Database {
 
     values.put(PROFILE_KEY_CREDENTIAL, Base64.encodeBytes(profileKeyCredential.serialize()));
 
-    SqlUtil.UpdateQuery updateQuery = SqlUtil.buildTrueUpdateQuery(selection, args, values);
+    SqlUtil.Query updateQuery = SqlUtil.buildTrueUpdateQuery(selection, args, values);
 
     if (update(updateQuery, values)) {
       // TODO [greyson] If we sync this in future, mark dirty
@@ -1788,6 +1834,12 @@ public class RecipientDatabase extends Database {
     }
   }
 
+  /**
+   * Handles inserts the (e164, UUID) pairs, which could result in merges. Does not mark users as
+   * registered.
+   *
+   * @return A mapping of (RecipientId, UUID)
+   */
   public @NonNull Map<RecipientId, String> bulkProcessCdsResult(@NonNull Map<String, UUID> mapping) {
     SQLiteDatabase               db      = databaseHelper.getWritableDatabase();
     HashMap<RecipientId, String> uuidMap = new HashMap<>();
@@ -2153,6 +2205,10 @@ public class RecipientDatabase extends Database {
     } finally {
       db.endTransaction();
     }
+
+    for (RecipientId id : keys.keySet()) {
+      Recipient.live(id).refresh();
+    }
   }
 
   public void clearDirtyState(@NonNull List<RecipientId> recipients) {
@@ -2211,9 +2267,7 @@ public class RecipientDatabase extends Database {
    * query such that this will only return true if a row was *actually* updated.
    */
   private boolean update(@NonNull RecipientId id, @NonNull ContentValues contentValues) {
-    String              selection   = ID + " = ?";
-    String[]            args        = new String[]{id.serialize()};
-    SqlUtil.UpdateQuery updateQuery = SqlUtil.buildTrueUpdateQuery(selection, args, contentValues);
+    SqlUtil.Query updateQuery = SqlUtil.buildTrueUpdateQuery(ID_WHERE, SqlUtil.buildArgs(id), contentValues);
 
     return update(updateQuery, contentValues);
   }
@@ -2223,7 +2277,7 @@ public class RecipientDatabase extends Database {
    * <p>
    * This will only return true if a row was *actually* updated with respect to the where clause of the {@param updateQuery}.
    */
-  private boolean update(@NonNull SqlUtil.UpdateQuery updateQuery, @NonNull ContentValues contentValues) {
+  private boolean update(@NonNull SqlUtil.Query updateQuery, @NonNull ContentValues contentValues) {
     SQLiteDatabase database = databaseHelper.getWritableDatabase();
 
     return database.update(TABLE_NAME, contentValues, updateQuery.getWhere(), updateQuery.getWhereArgs()) > 0;
@@ -2510,7 +2564,6 @@ public class RecipientDatabase extends Database {
     private final String                          e164;
     private final String                          email;
     private final GroupId                         groupId;
-    private final GroupMasterKey                  groupMasterKey;
     private final GroupType                       groupType;
     private final boolean                         blocked;
     private final long                            muteUntil;
@@ -2540,10 +2593,8 @@ public class RecipientDatabase extends Database {
     private final Recipient.Capability            groupsV2Capability;
     private final InsightsBannerTier              insightsBannerTier;
     private final byte[]                          storageId;
-    private final byte[]                          identityKey;
-    private final IdentityDatabase.VerifiedStatus identityStatus;
     private final MentionSetting                  mentionSetting;
-    private final byte[]                          storageProto;
+    private final SyncExtras                      syncExtras;
 
     RecipientSettings(@NonNull RecipientId id,
                       @Nullable UUID uuid,
@@ -2551,7 +2602,6 @@ public class RecipientDatabase extends Database {
                       @Nullable String e164,
                       @Nullable String email,
                       @Nullable GroupId groupId,
-                      @Nullable GroupMasterKey groupMasterKey,
                       @NonNull GroupType groupType,
                       boolean blocked,
                       long muteUntil,
@@ -2581,10 +2631,8 @@ public class RecipientDatabase extends Database {
                       Recipient.Capability groupsV2Capability,
                       @NonNull InsightsBannerTier insightsBannerTier,
                       @Nullable byte[] storageId,
-                      @Nullable byte[] identityKey,
-                      @NonNull IdentityDatabase.VerifiedStatus identityStatus,
                       @NonNull MentionSetting mentionSetting,
-                      @Nullable byte[] storageProto)
+                      @NonNull SyncExtras syncExtras)
     {
       this.id                     = id;
       this.uuid                   = uuid;
@@ -2592,7 +2640,6 @@ public class RecipientDatabase extends Database {
       this.e164                   = e164;
       this.email                  = email;
       this.groupId                = groupId;
-      this.groupMasterKey         = groupMasterKey;
       this.groupType              = groupType;
       this.blocked                = blocked;
       this.muteUntil              = muteUntil;
@@ -2622,10 +2669,8 @@ public class RecipientDatabase extends Database {
       this.groupsV2Capability     = groupsV2Capability;
       this.insightsBannerTier     = insightsBannerTier;
       this.storageId              = storageId;
-      this.identityKey            = identityKey;
-      this.identityStatus         = identityStatus;
       this.mentionSetting         = mentionSetting;
-      this.storageProto           = storageProto;
+      this.syncExtras             = syncExtras;
     }
 
     public RecipientId getId() {
@@ -2652,13 +2697,6 @@ public class RecipientDatabase extends Database {
       return groupId;
     }
 
-    /**
-     * Only read populated for sync.
-     */
-    public @Nullable GroupMasterKey getGroupMasterKey() {
-      return groupMasterKey;
-    }
-
     public @NonNull GroupType getGroupType() {
       return groupType;
     }
@@ -2775,20 +2813,64 @@ public class RecipientDatabase extends Database {
       return storageId;
     }
 
-    public @Nullable byte[] getIdentityKey() {
-      return identityKey;
-    }
-
-    public @NonNull IdentityDatabase.VerifiedStatus getIdentityStatus() {
-      return identityStatus;
-    }
-
     public @NonNull MentionSetting getMentionSetting() {
       return mentionSetting;
     }
 
-    public @Nullable byte[] getStorageProto() {
-      return storageProto;
+    public @NonNull SyncExtras getSyncExtras() {
+      return syncExtras;
+    }
+
+    /**
+     * A bundle of data that's only necessary when syncing to storage service, not for a
+     * {@link Recipient}.
+     */
+    public static class SyncExtras {
+      private final byte[]         storageProto;
+      private final GroupMasterKey groupMasterKey;
+      private final byte[]         identityKey;
+      private final VerifiedStatus identityStatus;
+      private final boolean        archived;
+      private final boolean        forcedUnread;
+
+      public SyncExtras(@Nullable byte[] storageProto,
+                        @Nullable GroupMasterKey groupMasterKey,
+                        @Nullable byte[] identityKey,
+                        @NonNull VerifiedStatus identityStatus,
+                        boolean archived,
+                        boolean forcedUnread)
+      {
+        this.storageProto   = storageProto;
+        this.groupMasterKey = groupMasterKey;
+        this.identityKey    = identityKey;
+        this.identityStatus = identityStatus;
+        this.archived       = archived;
+        this.forcedUnread   = forcedUnread;
+      }
+
+      public @Nullable byte[] getStorageProto() {
+        return storageProto;
+      }
+
+      public @Nullable GroupMasterKey getGroupMasterKey() {
+        return groupMasterKey;
+      }
+
+      public boolean isArchived() {
+        return archived;
+      }
+
+      public @Nullable byte[] getIdentityKey() {
+        return identityKey;
+      }
+
+      public @NonNull VerifiedStatus getIdentityStatus() {
+        return identityStatus;
+      }
+
+      public boolean isForcedUnread() {
+        return forcedUnread;
+      }
     }
   }
 

app/src/main/java/org/thoughtcrime/securesms/database/SessionDatabase.java

@@ -12,6 +12,7 @@ import net.sqlcipher.database.SQLiteDatabase;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.util.SqlUtil;
 import org.whispersystems.libsignal.state.SessionRecord;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
@@ -145,6 +146,16 @@ public class SessionDatabase extends Database {
     database.delete(TABLE_NAME, RECIPIENT_ID + " = ?", new String[] {recipientId.serialize()});
   }
 
+  public boolean hasSessionFor(@NonNull RecipientId recipientId) {
+    SQLiteDatabase database = databaseHelper.getReadableDatabase();
+    String         query    = RECIPIENT_ID + " = ?";
+    String[]       args     = SqlUtil.buildArgs(recipientId);
+
+    try (Cursor cursor = database.query(TABLE_NAME, new String[] { ID }, query, args, null, null, null, "1")) {
+      return cursor != null && cursor.moveToFirst();
+    }
+  }
+
   public static final class SessionRow {
     private final RecipientId   recipientId;
     private final int           deviceId;

app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java

@@ -373,6 +373,7 @@ public class SmsDatabase extends MessageDatabase {
     ContentValues values = new ContentValues();
     values.put(REMOTE_DELETED, 1);
     values.putNull(BODY);
+    values.putNull(REACTIONS);
     db.update(TABLE_NAME, values, ID_WHERE, new String[] { String.valueOf(id) });
 
     long threadId = getThreadIdForMessage(id);
@@ -644,20 +645,20 @@ public class SmsDatabase extends MessageDatabase {
 
   @Override
   public @NonNull Pair<Long, Long> insertReceivedCall(@NonNull RecipientId address) {
-    return insertCallLog(address, Types.INCOMING_CALL_TYPE, false);
+    return insertCallLog(address, Types.INCOMING_CALL_TYPE, false, System.currentTimeMillis());
   }
 
   @Override
   public @NonNull Pair<Long, Long> insertOutgoingCall(@NonNull RecipientId address) {
-    return insertCallLog(address, Types.OUTGOING_CALL_TYPE, false);
+    return insertCallLog(address, Types.OUTGOING_CALL_TYPE, false, System.currentTimeMillis());
   }
 
   @Override
-  public @NonNull Pair<Long, Long> insertMissedCall(@NonNull RecipientId address) {
-    return insertCallLog(address, Types.MISSED_CALL_TYPE, true);
+  public @NonNull Pair<Long, Long> insertMissedCall(@NonNull RecipientId address, long timestamp) {
+    return insertCallLog(address, Types.MISSED_CALL_TYPE, true, timestamp);
   }
 
-  private @NonNull Pair<Long, Long> insertCallLog(@NonNull RecipientId recipientId, long type, boolean unread) {
+  private @NonNull Pair<Long, Long> insertCallLog(@NonNull RecipientId recipientId, long type, boolean unread, long timestamp) {
     Recipient recipient = Recipient.resolved(recipientId);
     long      threadId  = DatabaseFactory.getThreadDatabase(context).getThreadIdFor(recipient);
 
@@ -665,7 +666,7 @@ public class SmsDatabase extends MessageDatabase {
     values.put(RECIPIENT_ID, recipientId.serialize());
     values.put(ADDRESS_DEVICE_ID,  1);
     values.put(DATE_RECEIVED, System.currentTimeMillis());
-    values.put(DATE_SENT, System.currentTimeMillis());
+    values.put(DATE_SENT, timestamp);
     values.put(READ, unread ? 0 : 1);
     values.put(TYPE, type);
     values.put(THREAD_ID, threadId);

app/src/main/java/org/thoughtcrime/securesms/database/StickerDatabase.java

@@ -24,6 +24,7 @@ import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
 import org.thoughtcrime.securesms.stickers.BlessedPacks;
 import org.thoughtcrime.securesms.stickers.StickerPackInstallEvent;
 import org.thoughtcrime.securesms.util.CursorUtil;
+import org.thoughtcrime.securesms.util.SqlUtil;
 import org.thoughtcrime.securesms.util.Util;
 
 import java.io.Closeable;
@@ -105,6 +106,12 @@ public class StickerDatabase extends Database {
     contentValues.put(FILE_RANDOM, fileInfo.getRandom());
 
     long id = databaseHelper.getWritableDatabase().insert(TABLE_NAME, null, contentValues);
+    if (id == -1) {
+      String   selection = PACK_ID + " = ? AND " + STICKER_ID + " = ? AND " + COVER + " = ?";
+      String[] args      = SqlUtil.buildArgs(sticker.getPackId(), sticker.getStickerId(), (sticker.isCover() ? 1 : 0));
+
+      id = databaseHelper.getWritableDatabase().update(TABLE_NAME, contentValues, selection, args);
+    }
 
     if (id > 0) {
       notifyStickerListeners();

app/src/main/java/org/thoughtcrime/securesms/database/ThreadBodyUtil.java

@@ -69,10 +69,8 @@ public final class ThreadBodyUtil {
     } else if (hasImage) {
       return format(context, record, EmojiStrings.PHOTO, R.string.ThreadRecord_photo);
     } else if (TextUtils.isEmpty(record.getBody())) {
-      Log.w(TAG, "Got a media message without a body of a type we were not able to process. [contains media slide]:" + record.containsMediaSlide());
       return context.getString(R.string.ThreadRecord_media_message);
     } else {
-      Log.w(TAG, "Got a media message with a body of a type we were not able to process. [contains media slide]:" + record.containsMediaSlide());
       return getBody(context, record);
     }
   }

app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java

@@ -32,8 +32,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import net.sqlcipher.database.SQLiteDatabase;
 
 import org.jsoup.helper.StringUtil;
-import org.signal.storageservice.protos.groups.local.DecryptedGroup;
-import org.signal.storageservice.protos.groups.local.DecryptedMember;
 import org.thoughtcrime.securesms.database.MessageDatabase.MarkedMessageInfo;
 import org.thoughtcrime.securesms.database.RecipientDatabase.RecipientSettings;
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
@@ -56,11 +54,15 @@ import org.thoughtcrime.securesms.util.SqlUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.libsignal.util.guava.Optional;
-import org.whispersystems.signalservice.api.groupsv2.DecryptedGroupUtil;
-import org.whispersystems.signalservice.api.util.UuidUtil;
+import org.whispersystems.signalservice.api.storage.SignalAccountRecord;
+import org.whispersystems.signalservice.api.storage.SignalContactRecord;
+import org.whispersystems.signalservice.api.storage.SignalGroupV1Record;
+import org.whispersystems.signalservice.api.storage.SignalGroupV2Record;
+import org.whispersystems.signalservice.api.storage.SignalStorageRecord;
 
 import java.io.Closeable;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -70,7 +72,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import java.util.UUID;
 
 public class ThreadDatabase extends Database {
 
@@ -102,7 +103,7 @@ public class ThreadDatabase extends Database {
   public  static final String LAST_SEEN              = "last_seen";
   public  static final String HAS_SENT               = "has_sent";
   private static final String LAST_SCROLLED          = "last_scrolled";
-  private static final String PINNED                 = "pinned";
+          static final String PINNED                 = "pinned";
 
   public static final String CREATE_TABLE = "CREATE TABLE " + TABLE_NAME + " (" + ID                     + " INTEGER PRIMARY KEY, " +
                                                                                   DATE                   + " INTEGER DEFAULT 0, " +
@@ -144,7 +145,7 @@ public class ThreadDatabase extends Database {
                                                                     .toList();
 
   private static final List<String> COMBINED_THREAD_RECIPIENT_GROUP_PROJECTION = Stream.concat(Stream.concat(Stream.of(TYPED_THREAD_PROJECTION),
-                                                                                                             Stream.of(RecipientDatabase.TYPED_RECIPIENT_PROJECTION)),
+                                                                                                             Stream.of(RecipientDatabase.TYPED_RECIPIENT_PROJECTION_NO_ID)),
                                                                                                Stream.of(GroupDatabase.TYPED_GROUP_PROJECTION))
                                                                                        .toList();
 
@@ -270,6 +271,7 @@ public class ThreadDatabase extends Database {
     AttachmentDatabase   attachmentDatabase   = DatabaseFactory.getAttachmentDatabase(context);
     GroupReceiptDatabase groupReceiptDatabase = DatabaseFactory.getGroupReceiptDatabase(context);
     MmsSmsDatabase       mmsSmsDatabase       = DatabaseFactory.getMmsSmsDatabase(context);
+    MentionDatabase      mentionDatabase      = DatabaseFactory.getMentionDatabase(context);
 
     try (Cursor cursor = databaseHelper.getReadableDatabase().query(TABLE_NAME, new String[] { ID }, null, null, null, null, null)) {
       while (cursor != null && cursor.moveToNext()) {
@@ -283,12 +285,13 @@ public class ThreadDatabase extends Database {
       mmsSmsDatabase.deleteAbandonedMessages();
       attachmentDatabase.trimAllAbandonedAttachments();
       groupReceiptDatabase.deleteAbandonedRows();
+      mentionDatabase.deleteAbandonedMentions();
+      attachmentDatabase.deleteAbandonedAttachmentFiles();
       db.setTransactionSuccessful();
     } finally {
       db.endTransaction();
     }
 
-    attachmentDatabase.deleteAbandonedAttachmentFiles();
 
     notifyAttachmentListeners();
     notifyStickerListeners();
@@ -304,6 +307,7 @@ public class ThreadDatabase extends Database {
     AttachmentDatabase   attachmentDatabase   = DatabaseFactory.getAttachmentDatabase(context);
     GroupReceiptDatabase groupReceiptDatabase = DatabaseFactory.getGroupReceiptDatabase(context);
     MmsSmsDatabase       mmsSmsDatabase       = DatabaseFactory.getMmsSmsDatabase(context);
+    MentionDatabase      mentionDatabase      = DatabaseFactory.getMentionDatabase(context);
 
     db.beginTransaction();
 
@@ -312,12 +316,13 @@ public class ThreadDatabase extends Database {
       mmsSmsDatabase.deleteAbandonedMessages();
       attachmentDatabase.trimAllAbandonedAttachments();
       groupReceiptDatabase.deleteAbandonedRows();
+      mentionDatabase.deleteAbandonedMentions();
+      attachmentDatabase.deleteAbandonedAttachmentFiles();
       db.setTransactionSuccessful();
     } finally {
       db.endTransaction();
     }
 
-    attachmentDatabase.deleteAbandonedAttachmentFiles();
 
     notifyAttachmentListeners();
     notifyStickerListeners();
@@ -329,18 +334,16 @@ public class ThreadDatabase extends Database {
       return;
     }
 
-    long trimDate = trimBeforeDate;
-
     if (length != NO_TRIM_MESSAGE_COUNT_SET) {
       try (Cursor cursor = DatabaseFactory.getMmsSmsDatabase(context).getConversation(threadId)) {
         if (cursor != null && length > 0 && cursor.getCount() > length) {
           cursor.moveToPosition(length - 1);
-          trimDate = Math.max(trimDate, cursor.getLong(cursor.getColumnIndexOrThrow(MmsSmsColumns.NORMALIZED_DATE_RECEIVED)));
+          trimBeforeDate = Math.max(trimBeforeDate, cursor.getLong(cursor.getColumnIndexOrThrow(MmsSmsColumns.NORMALIZED_DATE_RECEIVED)));
         }
       }
     }
 
-    if (trimDate != NO_TRIM_BEFORE_DATE_SET) {
+    if (trimBeforeDate != NO_TRIM_BEFORE_DATE_SET) {
       Log.i(TAG, "Trimming thread: " + threadId + " before: " + trimBeforeDate);
 
       DatabaseFactory.getMmsSmsDatabase(context).deleteMessagesInThreadBeforeDate(threadId, trimBeforeDate);
@@ -403,6 +406,7 @@ public class ThreadDatabase extends Database {
 
     List<MarkedMessageInfo> smsRecords = new LinkedList<>();
     List<MarkedMessageInfo> mmsRecords = new LinkedList<>();
+    boolean                 needsSync  = false;
 
     db.beginTransaction();
 
@@ -415,6 +419,8 @@ public class ThreadDatabase extends Database {
       }
 
       for (long threadId : threadIds) {
+        ThreadRecord previous = getThreadRecord(threadId);
+
         smsRecords.addAll(DatabaseFactory.getSmsDatabase(context).setMessagesReadSince(threadId, sinceTimestamp));
         mmsRecords.addAll(DatabaseFactory.getMmsDatabase(context).setMessagesReadSince(threadId, sinceTimestamp));
 
@@ -425,7 +431,12 @@ public class ThreadDatabase extends Database {
 
         contentValues.put(UNREAD_COUNT, unreadCount);
 
-        db.update(TABLE_NAME, contentValues, ID_WHERE, new String[]{threadId + ""});
+        db.update(TABLE_NAME, contentValues, ID_WHERE, SqlUtil.buildArgs(threadId));
+
+        if (previous != null && previous.isForcedUnread()) {
+          DatabaseFactory.getRecipientDatabase(context).markNeedsSync(previous.getRecipient().getId());
+          needsSync = true;
+        }
       }
 
       db.setTransactionSuccessful();
@@ -435,6 +446,11 @@ public class ThreadDatabase extends Database {
 
     notifyConversationListeners(new HashSet<>(threadIds));
     notifyConversationListListeners();
+
+    if (needsSync) {
+      StorageSyncHelper.scheduleSyncForDataChange();
+    }
+
     return Util.concatenatedList(smsRecords, mmsRecords);
   }
 
@@ -443,19 +459,22 @@ public class ThreadDatabase extends Database {
 
     db.beginTransaction();
     try {
-      ContentValues contentValues = new ContentValues();
+      List<RecipientId> recipientIds  = getRecipientIdsForThreadIds(threadIds);
+      SqlUtil.Query     query         = SqlUtil.buildCollectionQuery(ID, threadIds);
+      ContentValues     contentValues = new ContentValues();
+
       contentValues.put(READ, ReadStatus.FORCED_UNREAD.serialize());
 
-      for (long threadId : threadIds) {
-        db.update(TABLE_NAME, contentValues, ID_WHERE, new String[] { String.valueOf(threadId) });
-      }
+      db.update(TABLE_NAME, contentValues, query.getWhere(), query.getWhereArgs());
+      DatabaseFactory.getRecipientDatabase(context).markNeedsSync(recipientIds);
 
       db.setTransactionSuccessful();
     } finally {
       db.endTransaction();
-    }
 
-    notifyConversationListListeners();
+      StorageSyncHelper.scheduleSyncForDataChange();
+      notifyConversationListListeners();
+    }
   }
 
 
@@ -874,22 +893,17 @@ public class ThreadDatabase extends Database {
     deleteAllThreads();
   }
 
-  public long getThreadIdIfExistsFor(Recipient recipient) {
+  public long getThreadIdIfExistsFor(@NonNull RecipientId recipientId) {
     SQLiteDatabase db            = databaseHelper.getReadableDatabase();
     String         where         = RECIPIENT_ID + " = ?";
-    String[]       recipientsArg = new String[] {recipient.getId().serialize()};
-    Cursor         cursor        = null;
+    String[]       recipientsArg = new String[] {recipientId.serialize()};
 
-    try {
-      cursor = db.query(TABLE_NAME, new String[]{ID}, where, recipientsArg, null, null, null);
-
-      if (cursor != null && cursor.moveToFirst())
-        return cursor.getLong(cursor.getColumnIndexOrThrow(ID));
-      else
-        return -1L;
-    } finally {
-      if (cursor != null)
-        cursor.close();
+    try (Cursor cursor = db.query(TABLE_NAME, new String[]{ ID }, where, recipientsArg, null, null, null, "1")) {
+      if (cursor != null && cursor.moveToFirst()) {
+        return CursorUtil.requireLong(cursor, ID);
+      } else {
+        return -1;
+      }
     }
   }
 
@@ -952,6 +966,24 @@ public class ThreadDatabase extends Database {
     return Recipient.resolved(id);
   }
 
+  public @NonNull List<RecipientId> getRecipientIdsForThreadIds(Collection<Long> threadIds) {
+    SQLiteDatabase    db    = databaseHelper.getReadableDatabase();
+    SqlUtil.Query     query = SqlUtil.buildCollectionQuery(ID, threadIds);
+    List<RecipientId> ids   = new ArrayList<>(threadIds.size());
+
+    try (Cursor cursor = db.query(TABLE_NAME, new String[] { RECIPIENT_ID }, query.getWhere(), query.getWhereArgs(), null, null, null)) {
+      while (cursor != null && cursor.moveToNext()) {
+        ids.add(RecipientId.from(CursorUtil.requireLong(cursor, RECIPIENT_ID)));
+      }
+    }
+
+    return ids;
+  }
+
+  public boolean hasThread(@NonNull RecipientId recipientId) {
+    return getThreadIdIfExistsFor(recipientId) > -1;
+  }
+
   public void setHasSent(long threadId, boolean hasSent) {
     ContentValues contentValues = new ContentValues(1);
     contentValues.put(HAS_SENT, hasSent ? 1 : 0);
@@ -963,16 +995,56 @@ public class ThreadDatabase extends Database {
   }
 
   void updateReadState(long threadId) {
-    int unreadCount = DatabaseFactory.getMmsSmsDatabase(context).getUnreadCount(threadId);
+    ThreadRecord previous    = getThreadRecord(threadId);
+    int          unreadCount = DatabaseFactory.getMmsSmsDatabase(context).getUnreadCount(threadId);
 
     ContentValues contentValues = new ContentValues();
-    contentValues.put(READ, unreadCount == 0);
+    contentValues.put(READ, unreadCount == 0 ? ReadStatus.READ.serialize() : ReadStatus.UNREAD.serialize());
     contentValues.put(UNREAD_COUNT, unreadCount);
 
-    databaseHelper.getWritableDatabase().update(TABLE_NAME, contentValues,ID_WHERE,
-                                                new String[] {String.valueOf(threadId)});
+    databaseHelper.getWritableDatabase().update(TABLE_NAME, contentValues, ID_WHERE, SqlUtil.buildArgs(threadId));
 
     notifyConversationListListeners();
+
+    if (previous != null && previous.isForcedUnread()) {
+      DatabaseFactory.getRecipientDatabase(context).markNeedsSync(previous.getRecipient().getId());
+      StorageSyncHelper.scheduleSyncForDataChange();
+    }
+  }
+
+  public void applyStorageSyncUpdate(@NonNull RecipientId recipientId, @NonNull SignalContactRecord record) {
+    applyStorageSyncUpdate(recipientId, record.isArchived(), record.isForcedUnread());
+  }
+
+  public void applyStorageSyncUpdate(@NonNull RecipientId recipientId, @NonNull SignalGroupV1Record record) {
+    applyStorageSyncUpdate(recipientId, record.isArchived(), record.isForcedUnread());
+  }
+
+  public void applyStorageSyncUpdate(@NonNull RecipientId recipientId, @NonNull SignalGroupV2Record record) {
+    applyStorageSyncUpdate(recipientId, record.isArchived(), record.isForcedUnread());
+  }
+
+  public void applyStorageSyncUpdate(@NonNull RecipientId recipientId, @NonNull SignalAccountRecord record) {
+    applyStorageSyncUpdate(recipientId, record.isNoteToSelfArchived(), record.isNoteToSelfForcedUnread());
+  }
+
+  private void applyStorageSyncUpdate(@NonNull RecipientId recipientId, boolean archived, boolean forcedUnread) {
+    ContentValues values = new ContentValues();
+    values.put(ARCHIVED, archived);
+
+    if (forcedUnread) {
+      values.put(READ, ReadStatus.FORCED_UNREAD.serialize());
+    } else {
+      Long threadId = getThreadIdFor(recipientId);
+      if (threadId != null) {
+        int unreadCount = DatabaseFactory.getMmsSmsDatabase(context).getUnreadCount(threadId);
+
+        values.put(READ, unreadCount == 0 ? ReadStatus.READ.serialize() : ReadStatus.UNREAD.serialize());
+        values.put(UNREAD_COUNT, unreadCount);
+      }
+    }
+
+    databaseHelper.getWritableDatabase().update(TABLE_NAME, values, RECIPIENT_ID + " = ?", SqlUtil.buildArgs(recipientId));
   }
 
   public boolean update(long threadId, boolean unarchive) {
@@ -1097,7 +1169,7 @@ public class ThreadDatabase extends Database {
     Slide     thumbnail = Optional.fromNullable(slideDeck.getThumbnailSlide()).or(Optional.fromNullable(slideDeck.getStickerSlide())).orNull();
 
     if (thumbnail != null && !((MmsMessageRecord) record).isViewOnce()) {
-      return thumbnail.getThumbnailUri();
+      return thumbnail.getUri();
     }
 
     return null;
@@ -1403,7 +1475,7 @@ public class ThreadDatabase extends Database {
     }
   }
 
-  private enum ReadStatus {
+  enum ReadStatus {
     READ(1), UNREAD(0), FORCED_UNREAD(2);
 
     private final int value;

app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java

@@ -57,17 +57,23 @@ import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.util.Base64;
+import org.thoughtcrime.securesms.util.CursorUtil;
 import org.thoughtcrime.securesms.util.FileUtils;
 import org.thoughtcrime.securesms.util.ServiceUtil;
 import org.thoughtcrime.securesms.util.SqlUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.Triple;
 import org.thoughtcrime.securesms.util.Util;
+import org.whispersystems.signalservice.internal.push.SignalServiceProtos;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.util.HashSet;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 
 public class SQLCipherOpenHelper extends SQLiteOpenHelper {
 
@@ -146,8 +152,13 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
   private static final int UNKNOWN_STORAGE_FIELDS           = 71;
   private static final int STICKER_CONTENT_TYPE             = 72;
   private static final int STICKER_EMOJI_IN_NOTIFICATIONS   = 73;
+  private static final int THUMBNAIL_CLEANUP                = 74;
+  private static final int STICKER_CONTENT_TYPE_CLEANUP     = 75;
+  private static final int MENTION_CLEANUP                  = 76;
+  private static final int MENTION_CLEANUP_V2               = 77;
+  private static final int REACTION_CLEANUP                 = 78;
 
-  private static final int    DATABASE_VERSION = 73;
+  private static final int    DATABASE_VERSION = 78;
   private static final String DATABASE_NAME    = "signal.db";
 
   private final Context        context;
@@ -1023,6 +1034,103 @@ public class SQLCipherOpenHelper extends SQLiteOpenHelper {
         db.execSQL("ALTER TABLE part ADD COLUMN sticker_emoji TEXT DEFAULT NULL");
       }
 
+      if (oldVersion < THUMBNAIL_CLEANUP) {
+        int total   = 0;
+        int deleted = 0;
+
+        try (Cursor cursor = db.rawQuery("SELECT thumbnail FROM part WHERE thumbnail NOT NULL", null)) {
+          if (cursor != null) {
+            total = cursor.getCount();
+            Log.w(TAG, "Found " + total + " thumbnails to delete.");
+          }
+
+          while (cursor != null && cursor.moveToNext()) {
+            File file = new File(CursorUtil.requireString(cursor, "thumbnail"));
+
+            if (file.delete()) {
+              deleted++;
+            } else {
+              Log.w(TAG, "Failed to delete file! " + file.getAbsolutePath());
+            }
+          }
+        }
+
+        Log.w(TAG, "Deleted " + deleted + "/" + total + " thumbnail files.");
+      }
+
+      if (oldVersion < STICKER_CONTENT_TYPE_CLEANUP) {
+        ContentValues values = new ContentValues();
+        values.put("ct", "image/webp");
+
+        String query = "sticker_id NOT NULL AND (ct IS NULL OR ct = '')";
+
+        int rows = db.update("part", values, query, null);
+        Log.i(TAG, "Updated " + rows + " sticker attachment content types.");
+      }
+
+      if (oldVersion < MENTION_CLEANUP) {
+        String selectMentionIdsNotInGroupsV2 = "select mention._id from mention left join thread on mention.thread_id = thread._id left join recipient on thread.recipient_ids = recipient._id where recipient.group_type != 3";
+        db.delete("mention", "_id in (" + selectMentionIdsNotInGroupsV2 + ")", null);
+        db.delete("mention", "message_id NOT IN (SELECT _id FROM mms) OR thread_id NOT IN (SELECT _id from thread)", null);
+
+        List<Long> idsToDelete = new LinkedList<>();
+        try (Cursor cursor = db.rawQuery("select mention.*, mms.body from mention inner join mms on mention.message_id = mms._id", null)) {
+          while (cursor != null && cursor.moveToNext()) {
+            int    rangeStart  = CursorUtil.requireInt(cursor, "range_start");
+            int    rangeLength = CursorUtil.requireInt(cursor, "range_length");
+            String body        = CursorUtil.requireString(cursor, "body");
+
+            if (body == null || body.isEmpty() || rangeStart < 0 || rangeLength < 0 || (rangeStart + rangeLength) > body.length()) {
+              idsToDelete.add(CursorUtil.requireLong(cursor, "_id"));
+            }
+          }
+        }
+
+        if (Util.hasItems(idsToDelete)) {
+          String ids = TextUtils.join(",", idsToDelete);
+          db.delete("mention", "_id in (" + ids + ")", null);
+        }
+      }
+
+      if (oldVersion < MENTION_CLEANUP_V2) {
+        String selectMentionIdsWithMismatchingThreadIds = "select mention._id from mention left join mms on mention.message_id = mms._id where mention.thread_id != mms.thread_id";
+        db.delete("mention", "_id in (" + selectMentionIdsWithMismatchingThreadIds + ")", null);
+
+        List<Long>                          idsToDelete   = new LinkedList<>();
+        Set<Triple<Long, Integer, Integer>> mentionTuples = new HashSet<>();
+        try (Cursor cursor = db.rawQuery("select mention.*, mms.body from mention inner join mms on mention.message_id = mms._id order by mention._id desc", null)) {
+          while (cursor != null && cursor.moveToNext()) {
+            long   mentionId   = CursorUtil.requireLong(cursor, "_id");
+            long   messageId   = CursorUtil.requireLong(cursor, "message_id");
+            int    rangeStart  = CursorUtil.requireInt(cursor, "range_start");
+            int    rangeLength = CursorUtil.requireInt(cursor, "range_length");
+            String body        = CursorUtil.requireString(cursor, "body");
+
+            if (body != null && rangeStart < body.length() && body.charAt(rangeStart) != '\uFFFC') {
+              idsToDelete.add(mentionId);
+            } else {
+              Triple<Long, Integer, Integer> tuple = new Triple<>(messageId, rangeStart, rangeLength);
+              if (mentionTuples.contains(tuple)) {
+                idsToDelete.add(mentionId);
+              } else {
+                mentionTuples.add(tuple);
+              }
+            }
+          }
+
+          if (Util.hasItems(idsToDelete)) {
+            String ids = TextUtils.join(",", idsToDelete);
+            db.delete("mention", "_id in (" + ids + ")", null);
+          }
+        }
+      }
+
+      if (oldVersion < REACTION_CLEANUP) {
+        ContentValues values = new ContentValues();
+        values.putNull("reactions");
+        db.update("sms", values, "remote_deleted = ?", new String[] { "1" });
+      }
+
       db.setTransactionSuccessful();
     } finally {
       db.endTransaction();

app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducer.java

@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.database.model;
 import android.content.Context;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
 
 import com.google.protobuf.ByteString;
@@ -81,7 +82,11 @@ final class GroupsV2UpdateMessageProducer {
     }
   }
 
-  List<UpdateDescription> describeChanges(@NonNull DecryptedGroupChange change) {
+  List<UpdateDescription> describeChanges(@Nullable DecryptedGroup previousGroupState, @NonNull DecryptedGroupChange change) {
+    if (DecryptedGroup.getDefaultInstance().equals(previousGroupState)) {
+      previousGroupState = null;
+    }
+
     List<UpdateDescription> updates = new LinkedList<>();
 
     if (change.getEditor().isEmpty() || UuidUtil.UNKNOWN_UUID.equals(UuidUtil.fromByteString(change.getEditor()))) {
@@ -96,7 +101,7 @@ final class GroupsV2UpdateMessageProducer {
       describeUnknownEditorNewTimer(change, updates);
       describeUnknownEditorNewAttributeAccess(change, updates);
       describeUnknownEditorNewMembershipAccess(change, updates);
-      describeUnknownEditorNewGroupInviteLinkAccess(change, updates);
+      describeUnknownEditorNewGroupInviteLinkAccess(previousGroupState, change, updates);
       describeRequestingMembers(change, updates);
       describeUnknownEditorRequestingMembersApprovals(change, updates);
       describeUnknownEditorRequestingMembersDeletes(change, updates);
@@ -119,7 +124,7 @@ final class GroupsV2UpdateMessageProducer {
       describeNewTimer(change, updates);
       describeNewAttributeAccess(change, updates);
       describeNewMembershipAccess(change, updates);
-      describeNewGroupInviteLinkAccess(change, updates);
+      describeNewGroupInviteLinkAccess(previousGroupState, change, updates);
       describeRequestingMembers(change, updates);
       describeRequestingMembersApprovals(change, updates);
       describeRequestingMembersDeletes(change, updates);
@@ -509,7 +514,16 @@ final class GroupsV2UpdateMessageProducer {
     }
   }
 
-  private void describeNewGroupInviteLinkAccess(@NonNull DecryptedGroupChange change, @NonNull List<UpdateDescription> updates) {
+  private void describeNewGroupInviteLinkAccess(@Nullable DecryptedGroup previousGroupState,
+                                                @NonNull DecryptedGroupChange change,
+                                                @NonNull List<UpdateDescription> updates)
+  {
+    AccessControl.AccessRequired previousAccessControl = null;
+
+    if (previousGroupState != null) {
+      previousAccessControl = previousGroupState.getAccessControl().getAddFromInviteLink();
+    }
+
     boolean editorIsYou      = change.getEditor().equals(selfUuidBytes);
     boolean groupLinkEnabled = false;
 
@@ -517,17 +531,33 @@ final class GroupsV2UpdateMessageProducer {
       case ANY:
         groupLinkEnabled = true;
         if (editorIsYou) {
-          updates.add(updateDescription(context.getString(R.string.MessageRecord_you_turned_on_the_group_link_with_admin_approval_off)));
+          if (previousAccessControl == AccessControl.AccessRequired.ADMINISTRATOR) {
+            updates.add(updateDescription(context.getString(R.string.MessageRecord_you_turned_off_admin_approval_for_the_group_link)));
+          } else {
+            updates.add(updateDescription(context.getString(R.string.MessageRecord_you_turned_on_the_group_link_with_admin_approval_off)));
+          }
         } else {
-          updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_turned_on_the_group_link_with_admin_approval_off, editor)));
+          if (previousAccessControl == AccessControl.AccessRequired.ADMINISTRATOR) {
+            updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_turned_off_admin_approval_for_the_group_link, editor)));
+          } else {
+            updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_turned_on_the_group_link_with_admin_approval_off, editor)));
+          }
         }
         break;
       case ADMINISTRATOR:
         groupLinkEnabled = true;
         if (editorIsYou) {
-          updates.add(updateDescription(context.getString(R.string.MessageRecord_you_turned_on_the_group_link_with_admin_approval_on)));
+          if (previousAccessControl == AccessControl.AccessRequired.ANY) {
+            updates.add(updateDescription(context.getString(R.string.MessageRecord_you_turned_on_admin_approval_for_the_group_link)));
+          } else {
+            updates.add(updateDescription(context.getString(R.string.MessageRecord_you_turned_on_the_group_link_with_admin_approval_on)));
+          }
         } else {
-          updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_turned_on_the_group_link_with_admin_approval_on, editor)));
+          if (previousAccessControl == AccessControl.AccessRequired.ANY) {
+            updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_turned_on_admin_approval_for_the_group_link, editor)));
+          } else {
+            updates.add(updateDescription(change.getEditor(), editor -> context.getString(R.string.MessageRecord_s_turned_on_the_group_link_with_admin_approval_on, editor)));
+          }
         }
         break;
       case UNSATISFIABLE:
@@ -548,13 +578,30 @@ final class GroupsV2UpdateMessageProducer {
     }
   }
 
-  private void describeUnknownEditorNewGroupInviteLinkAccess(@NonNull DecryptedGroupChange change, @NonNull List<UpdateDescription> updates) {
+  private void describeUnknownEditorNewGroupInviteLinkAccess(@Nullable DecryptedGroup previousGroupState,
+                                                             @NonNull DecryptedGroupChange change,
+                                                             @NonNull List<UpdateDescription> updates)
+  {
+    AccessControl.AccessRequired previousAccessControl = null;
+
+    if (previousGroupState != null) {
+      previousAccessControl = previousGroupState.getAccessControl().getAddFromInviteLink();
+    }
+
     switch (change.getNewInviteLinkAccess()) {
       case ANY:
-        updates.add(updateDescription(context.getString(R.string.MessageRecord_the_group_link_has_been_turned_on_with_admin_approval_off)));
+        if (previousAccessControl == AccessControl.AccessRequired.ADMINISTRATOR) {
+          updates.add(updateDescription(context.getString(R.string.MessageRecord_the_admin_approval_for_the_group_link_has_been_turned_off)));
+        } else {
+          updates.add(updateDescription(context.getString(R.string.MessageRecord_the_group_link_has_been_turned_on_with_admin_approval_off)));
+        }
         break;
       case ADMINISTRATOR:
-        updates.add(updateDescription(context.getString(R.string.MessageRecord_the_group_link_has_been_turned_on_with_admin_approval_on)));
+        if (previousAccessControl == AccessControl.AccessRequired.ANY) {
+          updates.add(updateDescription(context.getString(R.string.MessageRecord_the_admin_approval_for_the_group_link_has_been_turned_on)));
+        } else {
+          updates.add(updateDescription(context.getString(R.string.MessageRecord_the_group_link_has_been_turned_on_with_admin_approval_on)));
+        }
         break;
       case UNSATISFIABLE:
         updates.add(updateDescription(context.getString(R.string.MessageRecord_the_group_link_has_been_turned_off)));

app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java

@@ -177,7 +177,7 @@ public abstract class MessageRecord extends DisplayRecord {
       GroupsV2UpdateMessageProducer  updateMessageProducer   = new GroupsV2UpdateMessageProducer(context, descriptionStrategy, Recipient.self().getUuid().get());
 
       if (decryptedGroupV2Context.hasChange() && decryptedGroupV2Context.getGroupState().getRevision() != 0) {
-        return UpdateDescription.concatWithNewLines(updateMessageProducer.describeChanges(decryptedGroupV2Context.getChange()));
+        return UpdateDescription.concatWithNewLines(updateMessageProducer.describeChanges(decryptedGroupV2Context.getPreviousGroupState(), decryptedGroupV2Context.getChange()));
       } else {
         return updateMessageProducer.describeNewGroup(decryptedGroupV2Context.getGroupState(), decryptedGroupV2Context.getChange());
       }
@@ -270,7 +270,7 @@ public abstract class MessageRecord extends DisplayRecord {
   }
 
   public long getTimestamp() {
-    if (isPush() && getDateSent() < getDateReceived()) {
+    if ((isPush() || isCallLog()) && getDateSent() < getDateReceived()) {
       return getDateSent();
     }
     return getDateReceived();

app/src/main/java/org/thoughtcrime/securesms/database/model/StickerRecord.java

@@ -7,6 +7,7 @@ import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.util.MediaUtil;
+import org.thoughtcrime.securesms.util.Util;
 
 import java.util.Objects;
 
@@ -68,7 +69,7 @@ public final class StickerRecord {
   }
 
   public @NonNull String getContentType() {
-    return contentType == null ? MediaUtil.IMAGE_WEBP : contentType;
+    return Util.isEmpty(contentType) ? MediaUtil.IMAGE_WEBP : contentType;
   }
 
   public long getSize() {

app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencies.java

@@ -6,6 +6,7 @@ import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.BuildConfig;
+import org.thoughtcrime.securesms.KbsEnclave;
 import org.thoughtcrime.securesms.messages.IncomingMessageProcessor;
 import org.thoughtcrime.securesms.messages.BackgroundMessageRetriever;
 import org.thoughtcrime.securesms.groups.GroupsV2AuthorizationMemoryValueCache;
@@ -15,6 +16,7 @@ import org.thoughtcrime.securesms.keyvalue.KeyValueStore;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.megaphone.MegaphoneRepository;
 import org.thoughtcrime.securesms.notifications.MessageNotifier;
+import org.thoughtcrime.securesms.pin.KbsEnclaves;
 import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess;
 import org.thoughtcrime.securesms.recipients.LiveRecipientCache;
 import org.thoughtcrime.securesms.messages.IncomingMessageObserver;
@@ -111,11 +113,11 @@ public class ApplicationDependencies {
     return groupsV2Operations;
   }
 
-  public static synchronized @NonNull KeyBackupService getKeyBackupService() {
+  public static synchronized @NonNull KeyBackupService getKeyBackupService(@NonNull KbsEnclave enclave) {
     return getSignalServiceAccountManager().getKeyBackupService(IasKeyStore.getIasKeyStore(application),
-                                                                BuildConfig.KBS_ENCLAVE_NAME,
-                                                                Hex.fromStringOrThrow(BuildConfig.KBS_SERVICE_ID),
-                                                                BuildConfig.KBS_MRENCLAVE,
+                                                                enclave.getEnclaveName(),
+                                                                Hex.fromStringOrThrow(enclave.getServiceId()),
+                                                                enclave.getMrEnclave(),
                                                                 10);
   }
 
@@ -138,8 +140,7 @@ public class ApplicationDependencies {
       messageSender.update(
               IncomingMessageObserver.getPipe(),
               IncomingMessageObserver.getUnidentifiedPipe(),
-              TextSecurePreferences.isMultiDevice(application),
-              FeatureFlags.attachmentsV3());
+              TextSecurePreferences.isMultiDevice(application));
     }
 
     return messageSender;