Bump version to 4.67.2

Fixes #9860

app/build.gradle

@@ -80,8 +80,8 @@ protobuf {
     }
 }
 
-def canonicalVersionCode = 655
-def canonicalVersionName = "4.63.2"
+def canonicalVersionCode = 679
+def canonicalVersionName = "4.67.2"
 
 def postFixSize = 10
 def abiPostFix = ['universal'   : 0,
@@ -197,7 +197,7 @@ android {
             buildConfigField "String", "SIGNAL_CDN2_URL", "\"https://cdn2-staging.signal.org\""
             buildConfigField "String", "SIGNAL_CONTACT_DISCOVERY_URL", "\"https://api-staging.directory.signal.org\""
             buildConfigField "String", "SIGNAL_KEY_BACKUP_URL", "\"https://api-staging.backup.signal.org\""
-            buildConfigField "String", "CDS_MRENCLAVE", "\"ba4ebb438bc07713819ee6c98d94037747006d7df63fc9e44d2d6f1fec962a79\""
+            buildConfigField "String", "CDS_MRENCLAVE", "\"b657cad56d518827b0938949bb1e5727a9a4db358dd6a88e55e710a89ffa50bd\""
             buildConfigField "String", "KBS_ENCLAVE_NAME", "\"823a3b2c037ff0cbe305cc48928cfcc97c9ed4a8ca6d49af6f7d6981fb60a4e9\""
             buildConfigField "String", "UNIDENTIFIED_SENDER_TRUST_ROOT", "\"BbqY1DzohE4NUZoVF+L18oUPrK3kILllLEJh2UnPSsEx\""
             buildConfigField "String", "ZKGROUP_SERVER_PUBLIC_PARAMS", "\"ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdls=\""
@@ -304,7 +304,7 @@ dependencies {
 
     implementation 'org.signal:argon2:13.1@aar'
 
-    implementation 'org.signal:ringrtc-android:2.0.3'
+    implementation 'org.signal:ringrtc-android:2.3.1'
 
     implementation "me.leolin:ShortcutBadger:1.1.16"
     implementation 'se.emilsjolander:stickylistheaders:2.7.0'

app/lint.xml

@@ -1,15 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <lint>
 
+    <!-- Wont pass lint or qa with a STOPSHIP in a comment -->
+    <issue id="StopShip" severity="fatal" />
+
     <!-- L10N errors -->
     <!-- This is a runtime crash so we don't want to ship with this. -->
     <issue id="StringFormatMatches" severity="error" />
 
     <!-- L10N warnings -->
-    <issue id="MissingTranslation" severity="warning" />
+    <issue id="MissingTranslation" severity="ignore" />
     <issue id="MissingQuantity" severity="warning" />
     <issue id="ExtraTranslation" severity="warning" />
     <issue id="ImpliedQuantity" severity="warning" />
+    <issue id="TypographyDashes" severity="error" >
+        <ignore path="*/res/values-*" /> <!-- Ignore for non-English -->
+    </issue>
 
     <issue id="CanvasSize" severity="error" />
     <issue id="HardcodedText" severity="error" />

app/src/main/AndroidManifest.xml

@@ -120,8 +120,15 @@
               android:supportsPictureInPicture="true"
               android:windowSoftInputMode="stateAlwaysHidden"
               android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+              android:taskAffinity=".calling"
               android:launchMode="singleTask"/>
 
+    <activity android:name=".messagerequests.CalleeMustAcceptMessageRequestActivity"
+              android:theme="@style/TextSecure.DarkNoActionBar"
+              android:screenOrientation="portrait"
+              android:noHistory="true"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
     <activity android:name=".InviteActivity"
               android:theme="@style/Signal.Light.NoActionBar.Invite"
               android:windowSoftInputMode="stateHidden"
@@ -151,7 +158,7 @@
                android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".sharing.ShareActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:excludeFromRecents="true"
               android:launchMode="singleTask"
               android:taskAffinity=""
@@ -184,7 +191,7 @@
     </activity>
 
     <activity android:name=".stickers.StickerPackPreviewActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:launchMode="singleTask"
               android:noHistory="true"
               android:windowSoftInputMode="stateHidden"
@@ -243,24 +250,24 @@
               android:theme="@style/TextSecure.LightTheme.Popup"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
 
-    <activity android:name=".MessageDetailsActivity"
+    <activity android:name=".messagedetails.MessageDetailsActivity"
               android:label="@string/AndroidManifest__message_details"
               android:windowSoftInputMode="stateHidden"
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
-    <activity android:name=".GroupCreateActivity"
-          android:windowSoftInputMode="stateVisible"
-          android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
     <activity android:name=".groups.ui.pendingmemberinvites.PendingMemberInvitesActivity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
-              android:theme="@style/TextSecure.LightNoActionBar" />
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
 
     <activity android:name=".groups.ui.managegroup.ManageGroupActivity"
               android:windowSoftInputMode="stateAlwaysHidden"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
+    <activity android:name=".recipients.ui.managerecipient.ManageRecipientActivity"
+              android:windowSoftInputMode="stateAlwaysHidden"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
+
     <activity android:name=".DatabaseMigrationActivity"
               android:theme="@style/NoAnimation.Theme.AppCompat.Light.DarkActionBar"
               android:launchMode="singleTask"
@@ -274,7 +281,7 @@
       <activity android:name=".PassphraseCreateActivity"
               android:label="@string/AndroidManifest__create_passphrase"
               android:windowSoftInputMode="stateUnchanged"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -284,7 +291,7 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".NewConversationActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:windowSoftInputMode="stateAlwaysVisible"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -294,7 +301,7 @@
           android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".giph.ui.GiphyActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:windowSoftInputMode="stateHidden"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -359,7 +366,7 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".mediaoverview.MediaOverviewActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:windowSoftInputMode="stateHidden"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
@@ -410,10 +417,6 @@
 
     </activity>
 
-    <activity android:name=".RecipientPreferenceActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
-              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-
     <activity android:name=".mediasend.AvatarSelectionActivity"
               android:theme="@style/TextSecure.FullScreenMedia"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
@@ -462,44 +465,47 @@
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".contactshare.ContactNameEditActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".contactshare.SharedContactDetailsActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".ShortcutLauncherActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:exported="true"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity
             android:name=".maps.PlacePickerActivity"
             android:label="@string/PlacePickerActivity_title"
-            android:theme="@style/TextSecure.LightNoActionBar"
+            android:theme="@style/Theme.Signal.DayNight.NoActionBar"
             android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
 
     <activity android:name=".MainActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
 
     <activity android:name=".pin.PinRestoreActivity"
-              android:theme="@style/TextSecure.LightNoActionBar"
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
 
     <activity android:name=".groups.ui.creategroup.CreateGroupActivity"
-              android:theme="@style/TextSecure.LightNoActionBar" />
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
 
     <activity android:name=".groups.ui.addtogroup.AddToGroupsActivity"
-              android:theme="@style/TextSecure.LightNoActionBar" />
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
 
     <activity android:name=".groups.ui.addmembers.AddMembersActivity"
-              android:theme="@style/TextSecure.LightNoActionBar" />
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
 
     <activity android:name=".groups.ui.creategroup.details.AddGroupDetailsActivity"
-              android:theme="@style/TextSecure.LightNoActionBar" />
+              android:theme="@style/Theme.Signal.DayNight.NoActionBar" />
+
+    <activity android:name=".groups.ui.chooseadmin.ChooseNewAdminActivity"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize" />
 
     <service android:enabled="true" android:name="org.thoughtcrime.securesms.service.WebRtcCallService"/>
     <service android:enabled="true" android:name=".service.ApplicationMigrationService"/>
@@ -700,11 +706,7 @@
         </intent-filter>
     </receiver>
 
-    <receiver android:name=".notifications.MessageNotifier$ReminderReceiver">
-        <intent-filter>
-            <action android:name="org.thoughtcrime.securesms.MessageNotifier.REMINDER_ACTION"/>
-        </intent-filter>
-    </receiver>
+    <receiver android:name=".notifications.MessageNotifier$ReminderReceiver"/>
 
     <receiver android:name=".notifications.DeleteNotificationReceiver">
         <intent-filter>

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

@@ -45,12 +45,12 @@ import org.thoughtcrime.securesms.jobs.FcmRefreshJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
 import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
 import org.thoughtcrime.securesms.jobs.RefreshPreKeysJob;
+import org.thoughtcrime.securesms.jobs.RetrieveProfileJob;
 import org.thoughtcrime.securesms.logging.AndroidLogger;
 import org.thoughtcrime.securesms.logging.CustomSignalProtocolLogger;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.logging.PersistentLogger;
 import org.thoughtcrime.securesms.logging.SignalUncaughtExceptionHandler;
-import org.thoughtcrime.securesms.messages.InitialMessageRetriever;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.providers.BlobProvider;
@@ -60,7 +60,6 @@ import org.thoughtcrime.securesms.revealable.ViewOnceMessageManager;
 import org.thoughtcrime.securesms.ringrtc.RingRtcLogger;
 import org.thoughtcrime.securesms.service.DirectoryRefreshListener;
 import org.thoughtcrime.securesms.service.ExpiringMessageManager;
-import org.thoughtcrime.securesms.messages.IncomingMessageObserver;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.service.LocalBackupListener;
 import org.thoughtcrime.securesms.service.RotateSenderCertificateListener;
@@ -96,7 +95,6 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
   private ViewOnceMessageManager   viewOnceMessageManager;
   private TypingStatusRepository   typingStatusRepository;
   private TypingStatusSender       typingStatusSender;
-  private IncomingMessageObserver  incomingMessageObserver;
   private PersistentLogger         persistentLogger;
 
   private volatile boolean isAppVisible;
@@ -107,10 +105,11 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
 
   @Override
   public void onCreate() {
+    long startTime = System.currentTimeMillis();
     super.onCreate();
-    Log.i(TAG, "onCreate()");
     initializeSecurityProvider();
     initializeLogging();
+    Log.i(TAG, "onCreate()");
     initializeCrashHandling();
     initializeAppDependencies();
     initializeFirstEverAppLaunch();
@@ -133,7 +132,8 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     NotificationChannels.create(this);
     RefreshPreKeysJob.scheduleIfNecessary();
     StorageSyncHelper.scheduleRoutineSync();
-    RegistrationUtil.markRegistrationPossiblyComplete();
+    RetrieveProfileJob.enqueueRoutineFetchIfNeccessary(this);
+    RegistrationUtil.maybeMarkRegistrationComplete(this);
     ProcessLifecycleOwner.get().getLifecycle().addObserver(this);
 
     if (Build.VERSION.SDK_INT < 21) {
@@ -141,6 +141,7 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     }
 
     ApplicationDependencies.getJobManager().beginJobLoop();
+    Log.d(TAG, "onCreate() took " + (System.currentTimeMillis() - startTime) + " ms");
   }
 
   @Override
@@ -153,7 +154,6 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     KeyCachingService.onAppForegrounded(this);
     ApplicationDependencies.getFrameRateTracker().begin();
     ApplicationDependencies.getMegaphoneRepository().onAppForegrounded();
-    catchUpOnMessages();
   }
 
   @Override
@@ -230,7 +230,7 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
   }
 
   public void initializeMessageRetrieval() {
-    this.incomingMessageObserver = new IncomingMessageObserver(this);
+    ApplicationDependencies.getIncomingMessageObserver();
   }
 
   private void initializeAppDependencies() {
@@ -378,36 +378,6 @@ public class ApplicationContext extends MultiDexApplication implements DefaultLi
     });
   }
 
-  private void catchUpOnMessages() {
-    InitialMessageRetriever retriever = ApplicationDependencies.getInitialMessageRetriever();
-
-    if (retriever.isCaughtUp()) {
-      return;
-    }
-
-    SignalExecutors.UNBOUNDED.execute(() -> {
-      long startTime = System.currentTimeMillis();
-
-      switch (retriever.begin(TimeUnit.SECONDS.toMillis(60))) {
-        case SUCCESS:
-          Log.i(TAG, "Successfully caught up on messages. " + (System.currentTimeMillis() - startTime) + " ms");
-          break;
-        case FAILURE_TIMEOUT:
-          Log.w(TAG, "Did not finish catching up due to a timeout. " + (System.currentTimeMillis() - startTime) + " ms");
-          break;
-        case FAILURE_ERROR:
-          Log.w(TAG, "Did not finish catching up due to an error. " + (System.currentTimeMillis() - startTime) + " ms");
-          break;
-        case SKIPPED_ALREADY_CAUGHT_UP:
-          Log.i(TAG, "Already caught up. " + (System.currentTimeMillis() - startTime) + " ms");
-          break;
-        case SKIPPED_ALREADY_RUNNING:
-          Log.i(TAG, "Already in the process of catching up. " + (System.currentTimeMillis() - startTime) + " ms");
-          break;
-      }
-    });
-  }
-
   @Override
   protected void attachBaseContext(Context base) {
     super.attachBaseContext(DynamicLanguageContextWrapper.updateContext(base, TextSecurePreferences.getLanguage(base)));

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

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

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

@@ -3,8 +3,12 @@ package org.thoughtcrime.securesms;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.os.Bundle;
+import android.transition.TransitionInflater;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
@@ -14,12 +18,15 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.ActivityOptionsCompat;
+import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
 
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.load.engine.GlideException;
 import com.bumptech.glide.request.RequestListener;
+import com.bumptech.glide.request.target.CustomTarget;
 import com.bumptech.glide.request.target.Target;
+import com.bumptech.glide.request.transition.Transition;
 
 import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto;
@@ -33,7 +40,7 @@ import org.thoughtcrime.securesms.recipients.RecipientId;
 /**
  * Activity for displaying avatars full screen.
  */
-public final class AvatarPreviewActivity extends PassphraseRequiredActionBarActivity {
+public final class AvatarPreviewActivity extends PassphraseRequiredActivity {
 
   private static final String TAG = Log.tag(AvatarPreviewActivity.class);
 
@@ -58,7 +65,15 @@ public final class AvatarPreviewActivity extends PassphraseRequiredActionBarActi
     setTheme(R.style.TextSecure_MediaPreview);
     setContentView(R.layout.contact_photo_preview_activity);
 
-    Toolbar toolbar = findViewById(R.id.toolbar);
+    if (Build.VERSION.SDK_INT >= 21) {
+      postponeEnterTransition();
+      TransitionInflater inflater = TransitionInflater.from(this);
+      getWindow().setSharedElementEnterTransition(inflater.inflateTransition(R.transition.full_screen_avatar_image_enter_transition_set));
+      getWindow().setSharedElementReturnTransition(inflater.inflateTransition(R.transition.full_screen_avatar_image_return_transition_set));
+    }
+
+   Toolbar toolbar = findViewById(R.id.toolbar);
+
     ImageView avatar = findViewById(R.id.avatar);
 
     setSupportActionBar(toolbar);
@@ -79,26 +94,42 @@ public final class AvatarPreviewActivity extends PassphraseRequiredActionBarActi
       FallbackContactPhoto fallbackPhoto = recipient.isLocalNumber() ? new ResourceContactPhoto(R.drawable.ic_profile_outline_40, R.drawable.ic_profile_outline_20, R.drawable.ic_person_large)
                                                                      : recipient.getFallbackContactPhoto();
 
-      GlideApp.with(this).load(contactPhoto)
-                   .fallback(fallbackPhoto.asCallCard(this))
-                   .error(fallbackPhoto.asCallCard(this))
-                   .diskCacheStrategy(DiskCacheStrategy.ALL)
-                   .addListener(new RequestListener<Drawable>() {
-                     @Override
-                     public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
-                       Log.w(TAG, "Unable to load avatar, or avatar removed, closing");
-                       finish();
-                       return false;
-                     }
+      Resources resources = this.getResources();
 
-                     @Override
-                     public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
-                       return false;
-                     }
-                   })
-                   .into(avatar);
+      GlideApp.with(this)
+              .asBitmap()
+              .load(contactPhoto)
+              .fallback(fallbackPhoto.asCallCard(this))
+              .error(fallbackPhoto.asCallCard(this))
+              .diskCacheStrategy(DiskCacheStrategy.ALL)
+              .addListener(new RequestListener<Bitmap>() {
+                @Override
+                public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Bitmap> target, boolean isFirstResource) {
+                  Log.w(TAG, "Unable to load avatar, or avatar removed, closing");
+                  finish();
+                  return false;
+                }
 
-      toolbar.setTitle(recipient.toShortString(context));
+                @Override
+                public boolean onResourceReady(Bitmap resource, Object model, Target<Bitmap> target, DataSource dataSource, boolean isFirstResource) {
+                  return false;
+                }
+              })
+              .into(new CustomTarget<Bitmap>() {
+                @Override
+                public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition<? super Bitmap> transition) {
+                  avatar.setImageDrawable(RoundedBitmapDrawableFactory.create(resources, resource));
+                  if (Build.VERSION.SDK_INT >= 21) {
+                    startPostponedEnterTransition();
+                  }
+                }
+
+                @Override
+                public void onLoadCleared(@Nullable Drawable placeholder) {
+                }
+              });
+
+      toolbar.setTitle(recipient.getDisplayName(context));
     });
 
     avatar.setOnClickListener(v -> toggleUiVisibility());

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

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

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

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

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

@@ -47,5 +47,6 @@ public interface BindableConversationItem extends Unbindable {
     void onInviteSharedContactClicked(@NonNull List<Recipient> choices);
     void onReactionClicked(long messageId, boolean isMms);
     void onGroupMemberAvatarClicked(@NonNull RecipientId recipientId, @NonNull GroupId groupId);
+    void onMessageWithErrorClicked(@NonNull MessageRecord messageRecord);
   }
 }

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

@@ -14,4 +14,7 @@ public interface BindableConversationListItem extends Unbindable {
             @NonNull GlideRequests glideRequests, @NonNull Locale locale,
             @NonNull Set<Long> typingThreads,
             @NonNull Set<Long> selectedThreads, boolean batchMode);
+
+  void setBatchMode(boolean batchMode);
+  void updateTypingIndicator(@NonNull Set<Long> typingThreads);
 }

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

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -28,7 +27,7 @@ import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.recipients.RecipientUtil;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 
-public class BlockedContactsActivity extends PassphraseRequiredActionBarActivity {
+public class BlockedContactsActivity extends PassphraseRequiredActivity {
 
   private final DynamicTheme dynamicTheme = new DynamicTheme();
 

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

@@ -3,7 +3,6 @@ package org.thoughtcrime.securesms;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.database.Cursor;
 import android.os.AsyncTask;
 import android.text.SpannableString;
 import android.text.Spanned;
@@ -15,7 +14,6 @@ import androidx.appcompat.app.AlertDialog;
 import org.thoughtcrime.securesms.crypto.storage.TextSecureIdentityKeyStore;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MmsDatabase;
-import org.thoughtcrime.securesms.database.MmsSmsDatabase;
 import org.thoughtcrime.securesms.database.PushDatabase;
 import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
@@ -51,7 +49,7 @@ public class ConfirmIdentityDialog extends AlertDialog {
     super(context);
 
       Recipient       recipient       = Recipient.resolved(mismatch.getRecipientId(context));
-      String          name            = recipient.toShortString(context);
+      String          name            = recipient.getDisplayName(context);
       String          introduction    = context.getString(R.string.ConfirmIdentityDialog_your_safety_number_with_s_has_changed, name, name);
       SpannableString spannableString = new SpannableString(introduction + " " +
                                                             context.getString(R.string.ConfirmIdentityDialog_you_may_wish_to_verify_your_safety_number_with_this_contact));
@@ -105,7 +103,6 @@ public class ConfirmIdentityDialog extends AlertDialog {
           }
 
           processMessageRecord(messageRecord);
-          processPendingMessageRecords(messageRecord.getThreadId(), mismatch);
 
           return null;
         }
@@ -115,26 +112,6 @@ public class ConfirmIdentityDialog extends AlertDialog {
           else                            processIncomingMessageRecord(messageRecord);
         }
 
-        private void processPendingMessageRecords(long threadId, IdentityKeyMismatch mismatch) {
-          MmsSmsDatabase        mmsSmsDatabase = DatabaseFactory.getMmsSmsDatabase(getContext());
-          Cursor                cursor         = mmsSmsDatabase.getIdentityConflictMessagesForThread(threadId);
-          MmsSmsDatabase.Reader reader         = mmsSmsDatabase.readerFor(cursor);
-          MessageRecord         record;
-
-          try {
-            while ((record = reader.getNext()) != null) {
-              for (IdentityKeyMismatch recordMismatch : record.getIdentityKeyMismatches()) {
-                if (mismatch.equals(recordMismatch)) {
-                  processMessageRecord(record);
-                }
-              }
-            }
-          } finally {
-            if (reader != null)
-              reader.close();
-          }
-        }
-
         private void processOutgoingMessageRecord(MessageRecord messageRecord) {
           SmsDatabase        smsDatabase        = DatabaseFactory.getSmsDatabase(getContext());
           MmsDatabase        mmsDatabase        = DatabaseFactory.getMmsDatabase(getContext());
@@ -175,7 +152,9 @@ public class ConfirmIdentityDialog extends AlertDialog {
                                                                        messageRecord.getDateSent(),
                                                                        legacy ? Base64.decode(messageRecord.getBody()) : null,
                                                                        !legacy ? Base64.decode(messageRecord.getBody()) : null,
-                                                                       0, null);
+                                                                       0,
+                                                                       0,
+                                                                       null);
 
             long pushId = pushDatabase.insert(envelope);
 

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

@@ -42,7 +42,7 @@ import java.lang.ref.WeakReference;
  * @author Moxie Marlinspike
  *
  */
-public abstract class ContactSelectionActivity extends PassphraseRequiredActionBarActivity
+public abstract class ContactSelectionActivity extends PassphraseRequiredActivity
                                                implements SwipeRefreshLayout.OnRefreshListener,
                                                           ContactSelectionListFragment.OnContactSelectedListener,
                                                           ContactSelectionListFragment.ScrollCallback

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

@@ -40,7 +40,6 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.ConstraintSet;
-import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
@@ -93,7 +92,7 @@ import java.util.Set;
  * @author Moxie Marlinspike
  *
  */
-public final class ContactSelectionListFragment extends    Fragment
+public final class ContactSelectionListFragment extends LoggingFragment
                                                 implements LoaderManager.LoaderCallbacks<Cursor>
 {
   @SuppressWarnings("unused")
@@ -271,12 +270,8 @@ public final class ContactSelectionListFragment extends    Fragment
 
     RecyclerViewConcatenateAdapterStickyHeader concatenateAdapter = new RecyclerViewConcatenateAdapterStickyHeader();
 
-    if (listCallback != null && FeatureFlags.newGroupUI()) {
-      if (FeatureFlags.groupsV2create() && FeatureFlags.groupsV2internalTest()) {
-        headerAdapter = new FixedViewsAdapter(createNewGroupItem(listCallback), createNewGroupsV1GroupItem(listCallback));
-      } else {
-        headerAdapter = new FixedViewsAdapter(createNewGroupItem(listCallback));
-      }
+    if (listCallback != null) {
+      headerAdapter = new FixedViewsAdapter(createNewGroupItem(listCallback));
       headerAdapter.hide();
       concatenateAdapter.addAdapter(headerAdapter);
     }
@@ -317,13 +312,6 @@ public final class ContactSelectionListFragment extends    Fragment
     return view;
   }
 
-  private View createNewGroupsV1GroupItem(@NonNull ListCallback listCallback) {
-    View view = LayoutInflater.from(requireContext())
-                              .inflate(R.layout.contact_selection_new_group_v1_item, (ViewGroup) requireView(), false);
-    view.setOnClickListener(v -> listCallback.onNewGroup(true));
-    return view;
-  }
-
   private void initializeNoContactsPermission() {
     swipeRefresh.setVisibility(View.GONE);
 
@@ -463,6 +451,11 @@ public final class ContactSelectionListFragment extends    Fragment
       SelectedContact selectedContact = contact.isUsernameType() ? SelectedContact.forUsername(contact.getRecipientId().orNull(), contact.getNumber())
                                                                  : SelectedContact.forPhone(contact.getRecipientId().orNull(), contact.getNumber());
 
+      if (isMulti() && Recipient.self().getId().equals(selectedContact.getOrCreateRecipientId(requireContext()))) {
+        Toast.makeText(requireContext(), R.string.ContactSelectionListFragment_you_do_not_need_to_add_yourself_to_the_group, Toast.LENGTH_SHORT).show();
+        return;
+      }
+
       if (!isMulti() || !cursorRecyclerViewAdapter.isSelectedContact(selectedContact)) {
         if (selectionLimitReached()) {
           Toast.makeText(requireContext(), R.string.ContactSelectionListFragment_the_group_is_full, Toast.LENGTH_SHORT).show();
@@ -518,7 +511,7 @@ public final class ContactSelectionListFragment extends    Fragment
 
   private void markContactSelected(@NonNull SelectedContact selectedContact) {
     cursorRecyclerViewAdapter.addSelectedContact(selectedContact);
-    if (isMulti() && FeatureFlags.newGroupUI()) {
+    if (isMulti()) {
       addChipForSelectedContact(selectedContact);
     }
   }

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

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

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

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

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

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

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

@@ -53,7 +53,7 @@ public class DeviceListFragment extends ListFragment
   @Override
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    this.locale = (Locale) getArguments().getSerializable(PassphraseRequiredActionBarActivity.LOCALE_EXTRA);
+    this.locale = (Locale) getArguments().getSerializable(PassphraseRequiredActivity.LOCALE_EXTRA);
   }
 
   @Override

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

@@ -5,7 +5,7 @@ import android.os.Bundle;
 import androidx.appcompat.app.AlertDialog;
 import android.view.Window;
 
-public class DeviceProvisioningActivity extends PassphraseRequiredActionBarActivity {
+public class DeviceProvisioningActivity extends PassphraseRequiredActivity {
 
   @SuppressWarnings("unused")
   private static final String TAG = DeviceProvisioningActivity.class.getSimpleName();
@@ -26,7 +26,7 @@ public class DeviceProvisioningActivity extends PassphraseRequiredActionBarActiv
           startActivity(intent);
           finish();
         })
-        .setNegativeButton(R.string.DeviceProvisioningActivity_cancel, (dialog12, which) -> {
+        .setNegativeButton(android.R.string.cancel, (dialog12, which) -> {
           dialog12.dismiss();
           finish();
         })

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

@@ -1,14 +1,17 @@
 package org.thoughtcrime.securesms;
 
 import android.content.Context;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+
 import org.thoughtcrime.securesms.util.ExpirationUtil;
 
+import java.util.Arrays;
+
 import cn.carbswang.android.numberpickerview.library.NumberPickerView;
 
 public class ExpirationDialog extends AlertDialog {
@@ -36,7 +39,7 @@ public class ExpirationDialog extends AlertDialog {
     builder.setView(view);
     builder.setPositiveButton(android.R.string.ok, (dialog, which) -> {
       int selected = ((NumberPickerView)view.findViewById(R.id.expiration_number_picker)).getValue();
-      listener.onClick(context.getResources().getIntArray(R.array.expiration_times)[selected]);
+      listener.onClick(getExpirationTimes(context, currentExpiration)[selected]);
     });
     builder.setNegativeButton(android.R.string.cancel, null);
     builder.show();
@@ -47,7 +50,7 @@ public class ExpirationDialog extends AlertDialog {
     final View             view                    = inflater.inflate(R.layout.expiration_dialog, null);
     final NumberPickerView numberPickerView        = view.findViewById(R.id.expiration_number_picker);
     final TextView         textView                = view.findViewById(R.id.expiration_details);
-    final int[]            expirationTimes         = context.getResources().getIntArray(R.array.expiration_times);
+    final int[]            expirationTimes         = getExpirationTimes(context, currentExpiration);
     final String[]         expirationDisplayValues = new String[expirationTimes.length];
 
     int selectedIndex = expirationTimes.length - 1;
@@ -80,6 +83,19 @@ public class ExpirationDialog extends AlertDialog {
     return view;
   }
 
+  private static int[] getExpirationTimes(Context context, int currentExpiration) {
+    int[] expirationTimes = context.getResources().getIntArray(R.array.expiration_times);
+    int   location        = Arrays.binarySearch(expirationTimes, currentExpiration);
+    if (location < 0) {
+      int[] temp = Arrays.copyOf(expirationTimes, expirationTimes.length + 1);
+      temp[temp.length - 1] = currentExpiration;
+      Arrays.sort(temp);
+      expirationTimes = temp;
+    }
+
+    return expirationTimes;
+  }
+
   public interface OnClickListener {
     public void onClick(int expirationTime);
   }

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

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

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

@@ -43,7 +43,7 @@ import org.whispersystems.libsignal.util.guava.Optional;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
-public class InviteActivity extends PassphraseRequiredActionBarActivity implements ContactSelectionListFragment.OnContactSelectedListener {
+public class InviteActivity extends PassphraseRequiredActivity implements ContactSelectionListFragment.OnContactSelectedListener {
 
   private ContactSelectionListFragment contactsFragment;
   private EditText                     inviteText;

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

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

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

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

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

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

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

@@ -20,10 +20,12 @@ import android.Manifest;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
+import android.database.ContentObserver;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.Handler;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -73,11 +75,12 @@ import org.thoughtcrime.securesms.util.SaveAttachmentTask.Attachment;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * Activity for displaying media attachments in-app
  */
-public final class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
+public final class MediaPreviewActivity extends PassphraseRequiredActivity
   implements LoaderManager.LoaderCallbacks<Pair<Cursor, Integer>>,
              MediaRailAdapter.RailItemListener,
              MediaPreviewFragment.Events
@@ -117,17 +120,20 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
   private boolean               showThread;
   private MediaDatabase.Sorting sorting;
 
+  private @Nullable Cursor cursor = null;
+
   public static @NonNull Intent intentFromMediaRecord(@NonNull Context context,
                                                       @NonNull MediaRecord mediaRecord,
                                                       boolean leftIsRecent)
   {
+    DatabaseAttachment attachment = Objects.requireNonNull(mediaRecord.getAttachment());
     Intent intent = new Intent(context, MediaPreviewActivity.class);
     intent.putExtra(MediaPreviewActivity.THREAD_ID_EXTRA, mediaRecord.getThreadId());
     intent.putExtra(MediaPreviewActivity.DATE_EXTRA, mediaRecord.getDate());
-    intent.putExtra(MediaPreviewActivity.SIZE_EXTRA, mediaRecord.getAttachment().getSize());
-    intent.putExtra(MediaPreviewActivity.CAPTION_EXTRA, mediaRecord.getAttachment().getCaption());
+    intent.putExtra(MediaPreviewActivity.SIZE_EXTRA, attachment.getSize());
+    intent.putExtra(MediaPreviewActivity.CAPTION_EXTRA, attachment.getCaption());
     intent.putExtra(MediaPreviewActivity.LEFT_IS_RECENT_EXTRA, leftIsRecent);
-    intent.setDataAndType(mediaRecord.getAttachment().getDataUri(), mediaRecord.getContentType());
+    intent.setDataAndType(attachment.getDataUri(), mediaRecord.getContentType());
     return intent;
   }
 
@@ -181,7 +187,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
   private @NonNull String getTitleText(@NonNull MediaItem mediaItem) {
     String from;
     if      (mediaItem.outgoing)          from = getString(R.string.MediaPreviewActivity_you);
-    else if (mediaItem.recipient != null) from = mediaItem.recipient.toShortString(this);
+    else if (mediaItem.recipient != null) from = mediaItem.recipient.getDisplayName(this);
     else                                  from = "";
 
     if (showThread) {
@@ -193,7 +199,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
           if (threadRecipient.isLocalNumber()) {
             from = getString(R.string.note_to_self);
           } else {
-            to = threadRecipient.toShortString(this);
+            to = threadRecipient.getDisplayName(this);
           }
         } else {
           to = getString(R.string.MediaPreviewActivity_you);
@@ -228,6 +234,15 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
     restartItem = cleanupMedia();
   }
 
+  @Override
+  protected void onDestroy() {
+    if (cursor != null) {
+      cursor.close();
+      cursor = null;
+    }
+    super.onDestroy();
+  }
+
   @Override
   protected void onNewIntent(Intent intent) {
     super.onNewIntent(intent);
@@ -344,6 +359,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
 
     mediaPager.removeAllViews();
     mediaPager.setAdapter(null);
+    viewModel.setCursor(this, null, leftIsRecent);
 
     return restartItem;
   }
@@ -475,19 +491,46 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
   @Override
   public void onLoadFinished(@NonNull Loader<Pair<Cursor, Integer>> loader, @Nullable Pair<Cursor, Integer> data) {
     if (data != null) {
-      @SuppressWarnings("ConstantConditions")
-      CursorPagerAdapter adapter = new CursorPagerAdapter(getSupportFragmentManager(),this, data.first, data.second, leftIsRecent);
+      if (data.first == cursor) {
+        return;
+      }
+
+      if (cursor != null) {
+        cursor.close();
+      }
+      cursor = Objects.requireNonNull(data.first);
+
+      int mediaPosition = Objects.requireNonNull(data.second);
+
+      CursorPagerAdapter adapter = new CursorPagerAdapter(getSupportFragmentManager(),this, cursor, mediaPosition, leftIsRecent);
       mediaPager.setAdapter(adapter);
       adapter.setActive(true);
 
-      viewModel.setCursor(this, data.first, leftIsRecent);
+      viewModel.setCursor(this, cursor, leftIsRecent);
 
-      int item = restartItem >= 0 ? restartItem : data.second;
+      int item = restartItem >= 0 ? restartItem : mediaPosition;
       mediaPager.setCurrentItem(item);
 
       if (item == 0) {
         viewPagerListener.onPageSelected(0);
       }
+
+      cursor.registerContentObserver(new ContentObserver(new Handler(getMainLooper())) {
+        @Override
+        public void onChange(boolean selfChange) {
+          onMediaChange();
+        }
+      });
+    } else {
+      mediaNotAvailable();
+    }
+  }
+
+  private void onMediaChange() {
+    MediaItemAdapter adapter = (MediaItemAdapter) mediaPager.getAdapter();
+
+    if (adapter != null) {
+      adapter.checkMedia(mediaPager.getCurrentItem());
     }
   }
 
@@ -502,6 +545,12 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
     return true;
   }
 
+  @Override
+  public void mediaNotAvailable() {
+    Toast.makeText(this, R.string.MediaPreviewActivity_media_no_longer_available, Toast.LENGTH_LONG).show();
+    finish();
+  }
+
   private void toggleUiVisibility() {
     int systemUiVisibility = getWindow().getDecorView().getSystemUiVisibility();
     if ((systemUiVisibility & View.SYSTEM_UI_FLAG_FULLSCREEN) != 0) {
@@ -621,6 +670,11 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
     public boolean hasFragmentFor(int position) {
       return mediaPreviewFragment != null;
     }
+
+    @Override
+    public void checkMedia(int currentItem) {
+
+    }
   }
 
   private static void anchorMarginsToBottomInsets(@NonNull View viewToAnchor) {
@@ -712,7 +766,7 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
       cursor.moveToPosition(cursorPosition);
 
       MediaDatabase.MediaRecord mediaRecord = MediaDatabase.MediaRecord.from(context, cursor);
-      DatabaseAttachment        attachment  = mediaRecord.getAttachment();
+      DatabaseAttachment        attachment  = Objects.requireNonNull(mediaRecord.getAttachment());
       MediaPreviewFragment      fragment    = MediaPreviewFragment.newInstance(attachment, autoPlay);
 
       mediaFragments.put(position, fragment);
@@ -734,16 +788,15 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
     public MediaItem getMediaItemFor(int position) {
       cursor.moveToPosition(getCursorPosition(position));
 
-      MediaRecord mediaRecord       = MediaRecord.from(context, cursor);
-      RecipientId recipientId       = mediaRecord.getRecipientId();
-      RecipientId threadRecipientId = mediaRecord.getThreadRecipientId();
-
-      if (mediaRecord.getAttachment().getDataUri() == null) throw new AssertionError();
+      MediaRecord        mediaRecord       = MediaRecord.from(context, cursor);
+      DatabaseAttachment attachment        = Objects.requireNonNull(mediaRecord.getAttachment());
+      RecipientId        recipientId       = mediaRecord.getRecipientId();
+      RecipientId        threadRecipientId = mediaRecord.getThreadRecipientId();
 
       return new MediaItem(Recipient.live(recipientId).get(),
                            Recipient.live(threadRecipientId).get(),
-                           mediaRecord.getAttachment(),
-                           mediaRecord.getAttachment().getDataUri(),
+                           attachment,
+                           Objects.requireNonNull(attachment.getDataUri()),
                            mediaRecord.getContentType(),
                            mediaRecord.getDate(),
                            mediaRecord.isOutgoing());
@@ -767,6 +820,14 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
       return mediaFragments.containsKey(position);
     }
 
+    @Override
+    public void checkMedia(int position) {
+      MediaPreviewFragment fragment = mediaFragments.get(position);
+      if (fragment != null) {
+        fragment.checkMediaStillAvailable();
+      }
+    }
+
     private int getCursorPosition(int position) {
       if (leftIsRecent) return position;
       else              return cursor.getCount() - 1 - position;
@@ -805,5 +866,6 @@ public final class MediaPreviewActivity extends PassphraseRequiredActionBarActiv
     void pause(int position);
     @Nullable View getPlaybackControls(int position);
     boolean hasFragmentFor(int position);
+    void checkMedia(int currentItem);
   }
 }

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

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

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

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

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

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

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

@@ -21,15 +21,24 @@ import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
 
+import androidx.appcompat.app.AlertDialog;
+
+import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper;
 import org.thoughtcrime.securesms.conversation.ConversationActivity;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.groups.ui.creategroup.CreateGroupActivity;
+import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 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.concurrent.SimpleTask;
+import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
 import org.whispersystems.libsignal.util.guava.Optional;
 
+import java.io.IOException;
+
 /**
  * Activity container for starting a new conversation.
  *
@@ -52,14 +61,37 @@ public class NewConversationActivity extends ContactSelectionActivity
 
   @Override
   public void onContactSelected(Optional<RecipientId> recipientId, String number) {
-    Recipient recipient;
     if (recipientId.isPresent()) {
-      recipient = Recipient.resolved(recipientId.get());
+      launch(Recipient.resolved(recipientId.get()));
     } else {
       Log.i(TAG, "[onContactSelected] Maybe creating a new recipient.");
-      recipient = Recipient.external(this, number);
+      if (FeatureFlags.cds() && NetworkConstraint.isMet(this)) {
+        Log.i(TAG, "[onContactSelected] CDS enabled. 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.");
+            try {
+              DirectoryHelper.refreshDirectoryFor(this, resolved, false);
+              resolved = Recipient.resolved(resolved.getId());
+            } catch (IOException e) {
+              Log.w(TAG, "[onContactSelected] Failed to refresh directory for new contact.");
+            }
+          }
+
+          return resolved;
+        }, resolved -> {
+          progress.dismiss();
+          launch(resolved);
+        });
+      } else {
+        launch(Recipient.external(this, number));
+      }
     }
-    launch(recipient);
   }
 
   private void launch(Recipient recipient) {

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

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

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

@@ -29,8 +29,8 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 import java.util.Locale;
 
-public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarActivity implements MasterSecretListener {
-  private static final String TAG = PassphraseRequiredActionBarActivity.class.getSimpleName();
+public abstract class PassphraseRequiredActivity extends BaseActivity implements MasterSecretListener {
+  private static final String TAG = PassphraseRequiredActivity.class.getSimpleName();
 
   public static final String LOCALE_EXTRA      = "locale_extra";
   public static final String NEXT_INTENT_EXTRA = "next_intent";
@@ -49,7 +49,6 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
 
   @Override
   protected final void onCreate(Bundle savedInstanceState) {
-    Log.d(TAG, "[" + Log.tag(getClass()) + "] onCreate()");
     this.networkAccess = new SignalServiceNetworkAccess(this);
     onPreCreate();
 
@@ -69,7 +68,6 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
 
   @Override
   protected void onResume() {
-    Log.d(TAG, "[" + Log.tag(getClass()) + "] onResume()");
     super.onResume();
 
     if (networkAccess.isCensored(this)) {
@@ -77,27 +75,8 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
     }
   }
 
-  @Override
-  protected void onStart() {
-    Log.d(TAG, "[" + Log.tag(getClass()) + "] onStart()");
-    super.onStart();
-  }
-
-  @Override
-  protected void onPause() {
-    Log.d(TAG, "[" + Log.tag(getClass()) + "] onPause()");
-    super.onPause();
-  }
-
-  @Override
-  protected void onStop() {
-    Log.d(TAG, "[" + Log.tag(getClass()) + "] onStop()");
-    super.onStop();
-  }
-
   @Override
   protected void onDestroy() {
-    Log.d(TAG, "[" + Log.tag(getClass()) + "] onDestroy()");
     super.onDestroy();
     removeClearKeyReceiver(this);
   }
@@ -185,7 +164,7 @@ public abstract class PassphraseRequiredActionBarActivity extends BaseActionBarA
   }
 
   private boolean userMustCreateSignalPin() {
-    return !SignalStore.registrationValues().isRegistrationComplete() && !SignalStore.kbsValues().hasPin() && !SignalStore.kbsValues().lastPinCreateFailed();
+    return !SignalStore.registrationValues().isRegistrationComplete() && !SignalStore.kbsValues().hasPin() && !SignalStore.kbsValues().lastPinCreateFailed() && !SignalStore.kbsValues().hasOptedOut();
   }
 
   private boolean userMustSetProfileName() {

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

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

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

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

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

@@ -104,7 +104,7 @@ import static org.whispersystems.libsignal.SessionCipher.SESSION_LOCK;
  * @author Moxie Marlinspike
  */
 @SuppressLint("StaticFieldLeak")
-public class VerifyIdentityActivity extends PassphraseRequiredActionBarActivity implements ScanListener, View.OnClickListener {
+public class VerifyIdentityActivity extends PassphraseRequiredActivity implements ScanListener, View.OnClickListener {
 
   private static final String TAG = Log.tag(VerifyIdentityActivity.class);
 
@@ -307,7 +307,7 @@ public class VerifyIdentityActivity extends PassphraseRequiredActionBarActivity
       byte[] localId;
       byte[] remoteId;
 
-      if (FeatureFlags.uuids() && recipient.resolve().getUuid().isPresent()) {
+      if (FeatureFlags.cds() && recipient.resolve().getUuid().isPresent()) {
         Log.i(TAG, "Using UUID (version 2).");
         version  = 2;
         localId  = UuidUtil.toByteArray(TextSecurePreferences.getLocalUuid(requireContext()));
@@ -486,7 +486,7 @@ public class VerifyIdentityActivity extends PassphraseRequiredActionBarActivity
     }
 
     private void setRecipientText(Recipient recipient) {
-      description.setText(Html.fromHtml(String.format(getActivity().getString(R.string.verify_display_fragment__if_you_wish_to_verify_the_security_of_your_end_to_end_encryption_with_s), recipient.toShortString(getContext()))));
+      description.setText(Html.fromHtml(String.format(getActivity().getString(R.string.verify_display_fragment__if_you_wish_to_verify_the_security_of_your_end_to_end_encryption_with_s), recipient.getDisplayName(getContext()))));
       description.setMovementMethod(LinkMovementMethod.getInstance());
     }
 

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

@@ -51,6 +51,7 @@ import org.thoughtcrime.securesms.components.webrtc.WebRtcCallViewModel;
 import org.thoughtcrime.securesms.crypto.storage.TextSecureIdentityKeyStore;
 import org.thoughtcrime.securesms.events.WebRtcViewModel;
 import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.messagerequests.CalleeMustAcceptMessageRequestActivity;
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.ringrtc.RemotePeer;
@@ -155,14 +156,13 @@ public class WebRtcCallActivity extends AppCompatActivity {
 
   @Override
   protected void onUserLeaveHint() {
-    if (deviceSupportsPipMode()) {
-      PictureInPictureParams params = new PictureInPictureParams.Builder()
-                                                                .setAspectRatio(new Rational(16, 9))
-                                                                .build();
-      setPictureInPictureParams(params);
+    enterPipModeIfPossible();
+  }
 
-      //noinspection deprecation
-      enterPictureInPictureMode();
+  @Override
+  public void onBackPressed() {
+    if (!enterPipModeIfPossible()) {
+      super.onBackPressed();
     }
   }
 
@@ -171,8 +171,19 @@ public class WebRtcCallActivity extends AppCompatActivity {
     viewModel.setIsInPipMode(isInPictureInPictureMode);
   }
 
+  private boolean enterPipModeIfPossible() {
+    if (isSystemPipEnabledAndAvailable()) {
+      PictureInPictureParams params = new PictureInPictureParams.Builder()
+              .setAspectRatio(new Rational(9, 16))
+              .build();
+      enterPictureInPictureMode(params);
+      return true;
+    }
+    return false;
+  }
+
   private boolean isInPipMode() {
-    return deviceSupportsPipMode() && isInPictureInPictureMode();
+    return isSystemPipEnabledAndAvailable() && isInPictureInPictureMode();
   }
 
   private void processIntent(@NonNull Intent intent) {
@@ -391,6 +402,9 @@ public class WebRtcCallActivity extends AppCompatActivity {
 
     EventBus.getDefault().removeStickyEvent(WebRtcViewModel.class);
 
+    if (hangupType == HangupMessage.Type.NEED_PERMISSION) {
+      startActivity(CalleeMustAcceptMessageRequestActivity.createIntent(this, recipient.getId()));
+    }
     delayedFinish();
   }
 
@@ -489,9 +503,8 @@ public class WebRtcCallActivity extends AppCompatActivity {
                    .show();
   }
 
-  private boolean deviceSupportsPipMode() {
+  private boolean isSystemPipEnabledAndAvailable() {
     return Build.VERSION.SDK_INT >= 26 &&
-           FeatureFlags.callingPip()   &&
            getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE);
   }
 
@@ -510,27 +523,30 @@ public class WebRtcCallActivity extends AppCompatActivity {
     viewModel.setRecipient(event.getRecipient());
 
     switch (event.getState()) {
-      case CALL_CONNECTED:          handleCallConnected(event);                                         break;
-      case NETWORK_FAILURE:         handleServerFailure(event);                                         break;
-      case CALL_RINGING:            handleCallRinging(event);                                           break;
-      case CALL_DISCONNECTED:       handleTerminate(event.getRecipient(), HangupMessage.Type.NORMAL);   break;
-      case CALL_ACCEPTED_ELSEWHERE: handleTerminate(event.getRecipient(), HangupMessage.Type.ACCEPTED); break;
-      case CALL_DECLINED_ELSEWHERE: handleTerminate(event.getRecipient(), HangupMessage.Type.DECLINED); break;
-      case CALL_ONGOING_ELSEWHERE:  handleTerminate(event.getRecipient(), HangupMessage.Type.BUSY);     break;
-      case NO_SUCH_USER:            handleNoSuchUser(event);                                            break;
-      case RECIPIENT_UNAVAILABLE:   handleRecipientUnavailable(event);                                  break;
-      case CALL_INCOMING:           handleIncomingCall(event);                                          break;
-      case CALL_OUTGOING:           handleOutgoingCall(event);                                          break;
-      case CALL_BUSY:               handleCallBusy(event);                                              break;
-      case UNTRUSTED_IDENTITY:      handleUntrustedIdentity(event);                                     break;
+      case CALL_CONNECTED:          handleCallConnected(event);                                                break;
+      case NETWORK_FAILURE:         handleServerFailure(event);                                                break;
+      case CALL_RINGING:            handleCallRinging(event);                                                  break;
+      case CALL_DISCONNECTED:       handleTerminate(event.getRecipient(), HangupMessage.Type.NORMAL);          break;
+      case CALL_ACCEPTED_ELSEWHERE: handleTerminate(event.getRecipient(), HangupMessage.Type.ACCEPTED);        break;
+      case CALL_DECLINED_ELSEWHERE: handleTerminate(event.getRecipient(), HangupMessage.Type.DECLINED);        break;
+      case CALL_ONGOING_ELSEWHERE:  handleTerminate(event.getRecipient(), HangupMessage.Type.BUSY);            break;
+      case 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 UNTRUSTED_IDENTITY:      handleUntrustedIdentity(event);                                            break;
     }
 
     callScreen.setLocalRenderer(event.getLocalRenderer());
     callScreen.setRemoteRenderer(event.getRemoteRenderer());
 
-    viewModel.updateFromWebRtcViewModel(event);
+    boolean enableVideo = event.getLocalCameraState().getCameraCount() > 0 && enableVideoIfAvailable;
 
-    if (event.getLocalCameraState().getCameraCount() > 0 && enableVideoIfAvailable) {
+    viewModel.updateFromWebRtcViewModel(event, enableVideo);
+
+    if (enableVideo) {
       enableVideoIfAvailable = false;
       handleSetMuteVideo(false);
     }

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

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

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

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

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

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

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

@@ -39,6 +39,7 @@ public abstract class Attachment {
   private final String fastPreflightId;
 
   private final boolean voiceNote;
+  private final boolean borderless;
   private final int     width;
   private final int     height;
   private final boolean quote;
@@ -59,11 +60,26 @@ public abstract class Attachment {
   @NonNull
   private final TransformProperties transformProperties;
 
-  public Attachment(@NonNull String contentType, int transferState, long size, @Nullable String fileName,
-                    int cdnNumber, @Nullable String location, @Nullable String key, @Nullable String relay,
-                    @Nullable byte[] digest, @Nullable String fastPreflightId, boolean voiceNote,
-                    int width, int height, boolean quote, long uploadTimestamp, @Nullable String caption,
-                    @Nullable StickerLocator stickerLocator, @Nullable BlurHash blurHash, @Nullable AudioHash audioHash,
+  public Attachment(@NonNull String contentType,
+                    int transferState,
+                    long size,
+                    @Nullable String fileName,
+                    int cdnNumber,
+                    @Nullable String location,
+                    @Nullable String key,
+                    @Nullable String relay,
+                    @Nullable byte[] digest,
+                    @Nullable String fastPreflightId,
+                    boolean voiceNote,
+                    boolean borderless,
+                    int width,
+                    int height,
+                    boolean quote,
+                    long uploadTimestamp,
+                    @Nullable String caption,
+                    @Nullable StickerLocator stickerLocator,
+                    @Nullable BlurHash blurHash,
+                    @Nullable AudioHash audioHash,
                     @Nullable TransformProperties transformProperties)
   {
     this.contentType         = contentType;
@@ -77,6 +93,7 @@ public abstract class Attachment {
     this.digest              = digest;
     this.fastPreflightId     = fastPreflightId;
     this.voiceNote           = voiceNote;
+    this.borderless          = borderless;
     this.width               = width;
     this.height              = height;
     this.quote               = quote;
@@ -150,6 +167,10 @@ public abstract class Attachment {
     return voiceNote;
   }
 
+  public boolean isBorderless() {
+    return borderless;
+  }
+
   public int getWidth() {
     return width;
   }

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

@@ -20,17 +20,34 @@ public class DatabaseAttachment extends Attachment {
   private final boolean      hasThumbnail;
   private final int          displayOrder;
 
-  public DatabaseAttachment(AttachmentId attachmentId, long mmsId,
-                            boolean hasData, boolean hasThumbnail,
-                            String contentType, int transferProgress, long size,
-                            String fileName, int cdnNumber, String location, String key, String relay,
-                            byte[] digest, String fastPreflightId, boolean voiceNote,
-                            int width, int height, boolean quote, @Nullable String caption,
-                            @Nullable StickerLocator stickerLocator, @Nullable BlurHash blurHash, @Nullable AudioHash audioHash,
-                            @Nullable TransformProperties transformProperties, int displayOrder,
+  public DatabaseAttachment(AttachmentId attachmentId,
+                            long mmsId,
+                            boolean hasData,
+                            boolean hasThumbnail,
+                            String contentType,
+                            int transferProgress,
+                            long size,
+                            String fileName,
+                            int cdnNumber,
+                            String location,
+                            String key,
+                            String relay,
+                            byte[] digest,
+                            String fastPreflightId,
+                            boolean voiceNote,
+                            boolean borderless,
+                            int width,
+                            int height,
+                            boolean quote,
+                            @Nullable String caption,
+                            @Nullable StickerLocator stickerLocator,
+                            @Nullable BlurHash blurHash,
+                            @Nullable AudioHash audioHash,
+                            @Nullable TransformProperties transformProperties,
+                            int displayOrder,
                             long uploadTimestamp)
   {
-    super(contentType, transferProgress, size, fileName, cdnNumber, location, key, relay, digest, fastPreflightId, voiceNote, width, height, quote, uploadTimestamp, caption, stickerLocator, blurHash, audioHash, transformProperties);
+    super(contentType, transferProgress, size, fileName, cdnNumber, location, key, relay, digest, fastPreflightId, voiceNote, borderless, width, height, quote, uploadTimestamp, caption, stickerLocator, blurHash, audioHash, transformProperties);
     this.attachmentId = attachmentId;
     this.hasData      = hasData;
     this.hasThumbnail = hasThumbnail;

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

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

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

@@ -18,14 +18,26 @@ import java.util.List;
 
 public class PointerAttachment extends Attachment {
 
-  private PointerAttachment(@NonNull String contentType, int transferState, long size,
-                            @Nullable String fileName, int cdnNumber, @NonNull String location,
-                            @Nullable String key, @Nullable String relay,
-                            @Nullable byte[] digest, @Nullable String fastPreflightId, boolean voiceNote,
-                            int width, int height, long uploadTimestamp, @Nullable String caption, @Nullable StickerLocator stickerLocator,
+  private PointerAttachment(@NonNull String contentType,
+                            int transferState,
+                            long size,
+                            @Nullable String fileName,
+                            int cdnNumber,
+                            @NonNull String location,
+                            @Nullable String key,
+                            @Nullable String relay,
+                            @Nullable byte[] digest,
+                            @Nullable String fastPreflightId,
+                            boolean voiceNote,
+                            boolean borderless,
+                            int width,
+                            int height,
+                            long uploadTimestamp,
+                            @Nullable String caption,
+                            @Nullable StickerLocator stickerLocator,
                             @Nullable BlurHash blurHash)
   {
-    super(contentType, transferState, size, fileName, cdnNumber, location, key, relay, digest, fastPreflightId, voiceNote, width, height, false, uploadTimestamp, caption, stickerLocator, blurHash, null, null);
+    super(contentType, transferState, size, fileName, cdnNumber, location, key, relay, digest, fastPreflightId, voiceNote, borderless, width, height, false, uploadTimestamp, caption, stickerLocator, blurHash, null, null);
   }
 
   @Nullable
@@ -91,21 +103,22 @@ public class PointerAttachment extends Attachment {
     }
 
     return Optional.of(new PointerAttachment(pointer.get().getContentType(),
-                                      AttachmentDatabase.TRANSFER_PROGRESS_PENDING,
-                                      pointer.get().asPointer().getSize().or(0),
-                                      pointer.get().asPointer().getFileName().orNull(),
-                                      pointer.get().asPointer().getCdnNumber(),
-                                      pointer.get().asPointer().getRemoteId().toString(),
-                                      encodedKey, null,
-                                      pointer.get().asPointer().getDigest().orNull(),
-                                      fastPreflightId,
-                                      pointer.get().asPointer().getVoiceNote(),
-                                      pointer.get().asPointer().getWidth(),
-                                      pointer.get().asPointer().getHeight(),
-                                      pointer.get().asPointer().getUploadTimestamp(),
-                                      pointer.get().asPointer().getCaption().orNull(),
-                                      stickerLocator,
-                                      BlurHash.parseOrNull(pointer.get().asPointer().getBlurHash().orNull())));
+                                             AttachmentDatabase.TRANSFER_PROGRESS_PENDING,
+                                             pointer.get().asPointer().getSize().or(0),
+                                             pointer.get().asPointer().getFileName().orNull(),
+                                             pointer.get().asPointer().getCdnNumber(),
+                                             pointer.get().asPointer().getRemoteId().toString(),
+                                             encodedKey, null,
+                                             pointer.get().asPointer().getDigest().orNull(),
+                                             fastPreflightId,
+                                             pointer.get().asPointer().getVoiceNote(),
+                                             pointer.get().asPointer().isBorderless(),
+                                             pointer.get().asPointer().getWidth(),
+                                             pointer.get().asPointer().getHeight(),
+                                             pointer.get().asPointer().getUploadTimestamp(),
+                                             pointer.get().asPointer().getCaption().orNull(),
+                                             stickerLocator,
+                                             BlurHash.parseOrNull(pointer.get().asPointer().getBlurHash().orNull())));
 
   }
 
@@ -123,6 +136,7 @@ public class PointerAttachment extends Attachment {
                                              thumbnail != null ? thumbnail.asPointer().getDigest().orNull() : null,
                                              null,
                                              false,
+                                             false,
                                              thumbnail != null ? thumbnail.asPointer().getWidth() : 0,
                                              thumbnail != null ? thumbnail.asPointer().getHeight() : 0,
                                              thumbnail != null ? thumbnail.asPointer().getUploadTimestamp() : 0,

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

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

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

@@ -15,20 +15,42 @@ public class UriAttachment extends Attachment {
   private final @NonNull  Uri dataUri;
   private final @Nullable Uri thumbnailUri;
 
-  public UriAttachment(@NonNull Uri uri, @NonNull String contentType, int transferState, long size,
-                       @Nullable String fileName, boolean voiceNote, boolean quote, @Nullable String caption,
-                       @Nullable StickerLocator stickerLocator, @Nullable BlurHash blurHash, @Nullable AudioHash audioHash, @Nullable TransformProperties transformProperties)
+  public UriAttachment(@NonNull Uri uri,
+                       @NonNull String contentType,
+                       int transferState,
+                       long size,
+                       @Nullable String fileName,
+                       boolean voiceNote,
+                       boolean borderless,
+                       boolean quote,
+                       @Nullable String caption,
+                       @Nullable StickerLocator stickerLocator,
+                       @Nullable BlurHash blurHash,
+                       @Nullable AudioHash audioHash,
+                       @Nullable TransformProperties transformProperties)
   {
-    this(uri, uri, contentType, transferState, size, 0, 0, fileName, null, voiceNote, quote, caption, stickerLocator, blurHash, audioHash, transformProperties);
+    this(uri, 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, int width, int height,
-                       @Nullable String fileName, @Nullable String fastPreflightId,
-                       boolean voiceNote, boolean quote, @Nullable String caption, @Nullable StickerLocator stickerLocator,
-                       @Nullable BlurHash blurHash, @Nullable AudioHash audioHash, @Nullable TransformProperties transformProperties)
+  public UriAttachment(@NonNull Uri dataUri,
+                       @Nullable Uri thumbnailUri,
+                       @NonNull String contentType,
+                       int transferState,
+                       long size,
+                       int width,
+                       int height,
+                       @Nullable String fileName,
+                       @Nullable String fastPreflightId,
+                       boolean voiceNote,
+                       boolean borderless,
+                       boolean quote,
+                       @Nullable String caption,
+                       @Nullable StickerLocator stickerLocator,
+                       @Nullable BlurHash blurHash,
+                       @Nullable AudioHash audioHash,
+                       @Nullable TransformProperties transformProperties)
   {
-    super(contentType, transferState, size, fileName, 0, null, null, null, null, fastPreflightId, voiceNote, width, height, quote, 0, caption, stickerLocator, blurHash, audioHash, 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;
   }

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

@@ -18,6 +18,7 @@ import com.google.protobuf.ByteString;
 
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
+import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.model.databaseprotos.AudioWaveFormData;
 import org.thoughtcrime.securesms.logging.Log;
@@ -89,7 +90,11 @@ public final class AudioWaveForm {
       AudioHash audioHash = attachment.getAudioHash();
       if (audioHash != null) {
         AudioFileInfo audioFileInfo = AudioFileInfo.fromDatabaseProtobuf(audioHash.getAudioWaveForm());
-        if (audioFileInfo.waveForm.length != BAR_COUNT) {
+        if (audioFileInfo.waveForm.length == 0) {
+          Log.w(TAG, "Recovering from a wave form generation error  " + cacheKey);
+          Util.runOnMain(onFailure);
+          return;
+        } else if (audioFileInfo.waveForm.length != BAR_COUNT) {
           Log.w(TAG, "Wave form from database does not match bar count, regenerating " + cacheKey);
         } else {
           WAVE_FORM_CACHE.put(cacheKey, audioFileInfo);
@@ -100,13 +105,19 @@ public final class AudioWaveForm {
       }
 
       try {
-        DatabaseAttachment dbAttachment = (DatabaseAttachment) attachment;
-        long               startTime    = System.currentTimeMillis();
-        AudioFileInfo      fileInfo     = generateWaveForm(uri);
+        AttachmentDatabase attachmentDatabase = DatabaseFactory.getAttachmentDatabase(context);
+        DatabaseAttachment dbAttachment       = (DatabaseAttachment) attachment;
+        long               startTime          = System.currentTimeMillis();
+
+        attachmentDatabase.writeAudioHash(dbAttachment.getAttachmentId(), AudioWaveFormData.getDefaultInstance());
+
+        Log.i(TAG, String.format("Starting wave form generation (%s)", cacheKey));
+
+        AudioFileInfo fileInfo = generateWaveForm(uri);
 
         Log.i(TAG, String.format(Locale.US, "Audio wave form generation time %d ms (%s)", System.currentTimeMillis() - startTime, cacheKey));
 
-        DatabaseFactory.getAttachmentDatabase(context).writeAudioHash(dbAttachment.getAttachmentId(), fileInfo.toDatabaseProtobuf());
+        attachmentDatabase.writeAudioHash(dbAttachment.getAttachmentId(), fileInfo.toDatabaseProtobuf());
 
         WAVE_FORM_CACHE.put(cacheKey, fileInfo);
         Util.runOnMain(() -> onSuccess.accept(fileInfo));

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

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

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

@@ -1,6 +1,8 @@
 package org.thoughtcrime.securesms.color;
 
 import android.content.Context;
+
+import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -52,7 +54,7 @@ public class MaterialColors {
       return null;
     }
 
-    public int[] asConversationColorArray(@NonNull Context context) {
+    public @ColorInt int[] asConversationColorArray(@NonNull Context context) {
       int[] results = new int[colors.size()];
       int   index   = 0;
 

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

@@ -16,7 +16,6 @@ import androidx.fragment.app.FragmentActivity;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.RecipientPreferenceActivity;
 import org.thoughtcrime.securesms.color.MaterialColor;
 import org.thoughtcrime.securesms.contacts.avatars.ContactColors;
 import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
@@ -26,8 +25,8 @@ import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.ui.bottomsheet.RecipientBottomSheetDialogFragment;
+import org.thoughtcrime.securesms.recipients.ui.managerecipient.ManageRecipientActivity;
 import org.thoughtcrime.securesms.util.AvatarUtil;
-import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.ThemeUtil;
 
 import java.util.Objects;
@@ -113,6 +112,9 @@ public final class AvatarImageView extends AppCompatImageView {
     this.fallbackPhotoProvider = fallbackPhotoProvider;
   }
 
+  /**
+   * Shows self as the actual profile picture.
+   */
   public void setRecipient(@NonNull Recipient recipient) {
     if (recipient.isLocalNumber()) {
       setAvatar(GlideApp.with(this), null, false);
@@ -122,6 +124,13 @@ public final class AvatarImageView extends AppCompatImageView {
     }
   }
 
+  /**
+   * Shows self as the note to self icon.
+   */
+  public void setAvatar(@Nullable Recipient recipient) {
+    setAvatar(GlideApp.with(this), recipient, false);
+  }
+
   public void setAvatar(@NonNull GlideRequests requestManager, @Nullable Recipient recipient, boolean quickContactEnabled) {
     if (recipient != null) {
       RecipientContactPhoto photo = new RecipientContactPhoto(recipient);
@@ -165,7 +174,7 @@ public final class AvatarImageView extends AppCompatImageView {
     if (quickContactEnabled) {
       super.setOnClickListener(v -> {
         Context context = getContext();
-        if (FeatureFlags.newGroupUI() && recipient.isPushGroup()) {
+        if (recipient.isPushGroup()) {
           context.startActivity(ManageGroupActivity.newIntent(context, recipient.requireGroupId().requirePush()),
                                 ManageGroupActivity.createTransitionBundle(context, this));
         } else {
@@ -173,7 +182,8 @@ public final class AvatarImageView extends AppCompatImageView {
             RecipientBottomSheetDialogFragment.create(recipient.getId(), null)
                                               .show(((FragmentActivity) context).getSupportFragmentManager(), "BOTTOM");
           } else {
-            context.startActivity(RecipientPreferenceActivity.getLaunchIntent(context, recipient.getId()));
+            context.startActivity(ManageRecipientActivity.newIntent(context, recipient.getId()),
+                                  ManageRecipientActivity.createTransitionBundle(context, this));
           }
         }
       });

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

@@ -7,23 +7,26 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.FrameLayout;
 
+import com.bumptech.glide.load.resource.bitmap.CenterCrop;
+import com.bumptech.glide.load.resource.bitmap.CenterInside;
+
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.mms.SlideClickListener;
 import org.thoughtcrime.securesms.mms.SlidesClickedListener;
 
-public class StickerView extends FrameLayout {
+public class BorderlessImageView extends FrameLayout {
 
   private ThumbnailView image;
   private View          missingShade;
 
-  public StickerView(@NonNull Context context) {
+  public BorderlessImageView(@NonNull Context context) {
     super(context);
     init();
   }
 
-  public StickerView(@NonNull Context context, @Nullable AttributeSet attrs) {
+  public BorderlessImageView(@NonNull Context context, @Nullable AttributeSet attrs) {
     super(context, attrs);
     init();
   }
@@ -50,10 +53,17 @@ public class StickerView extends FrameLayout {
     image.setOnLongClickListener(l);
   }
 
-  public void setSticker(@NonNull GlideRequests glideRequests, @NonNull Slide stickerSlide) {
-    boolean showControls = stickerSlide.asAttachment().getDataUri() == null;
+  public void setSlide(@NonNull GlideRequests glideRequests, @NonNull Slide slide) {
+    boolean showControls = slide.asAttachment().getDataUri() == null;
+
+    if (slide.hasSticker()) {
+      image.setFit(new CenterInside());
+      image.setImageResource(glideRequests, slide, showControls, false);
+    } else {
+      image.setFit(new CenterCrop());
+      image.setImageResource(glideRequests, slide, showControls, false, slide.asAttachment().getWidth(), slide.asAttachment().getHeight());
+    }
 
-    image.setImageResource(glideRequests, stickerSlide, showControls, false);
     missingShade.setVisibility(showControls ? View.VISIBLE : View.GONE);
   }
 

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

@@ -6,14 +6,15 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.PorterDuff;
 import android.os.AsyncTask;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
@@ -94,9 +95,17 @@ public class ConversationItemFooter extends LinearLayout {
 
   private void presentDate(@NonNull MessageRecord messageRecord, @NonNull Locale locale) {
     dateView.forceLayout();
-
     if (messageRecord.isFailed()) {
-      dateView.setText(R.string.ConversationItem_error_not_delivered);
+      int errorMsg;
+      if (messageRecord.hasFailedWithNetworkFailures()) {
+        errorMsg = R.string.ConversationItem_error_network_not_delivered;
+      } else if (messageRecord.getRecipient().isPushGroup() && messageRecord.isIdentityMismatchFailure()) {
+        errorMsg = R.string.ConversationItem_error_partially_not_delivered;
+      } else {
+        errorMsg = R.string.ConversationItem_error_not_sent_tap_for_details;
+      }
+
+      dateView.setText(errorMsg);
     } else if (messageRecord.isPendingInsecureSmsFallback()) {
       dateView.setText(R.string.ConversationItem_click_to_approve_unencrypted);
     } else {

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

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

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

@@ -189,7 +189,7 @@ public class QuoteView extends FrameLayout implements RecipientForeverObserver {
     boolean outgoing = messageType != MESSAGE_TYPE_INCOMING;
 
     authorView.setText(author.isLocalNumber() ? getContext().getString(R.string.QuoteView_you)
-                                              : author.toShortString(getContext()));
+                                              : author.getDisplayName(getContext()));
 
     // We use the raw color resource because Android 4.x was struggling with tints here
     quoteBarView.setImageResource(author.getColor().toQuoteBarColorResource(getContext(), outgoing));

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

@@ -398,6 +398,10 @@ public class ThumbnailView extends FrameLayout {
     getTransferControls().showProgressSpinner();
   }
 
+  public void setFit(@NonNull BitmapTransformation fit) {
+    this.fit = fit;
+  }
+
   protected void setRadius(int radius) {
     this.radius = radius;
   }

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

@@ -205,6 +205,10 @@ public final class TransferControlView extends FrameLayout {
   }
 
   private void display(@Nullable final View view) {
+    if (current == view) {
+      return;
+    }
+
     if (current != null) {
       current.setVisibility(GONE);
     }

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

@@ -120,6 +120,10 @@ public final class WaveFormSeekBarView extends AppCompatSeekBar {
     canvas.save();
     canvas.translate(getPaddingLeft(), getPaddingTop());
 
+    if (getLayoutDirection() == LAYOUT_DIRECTION_RTL) {
+      canvas.scale(-1, 1, usableWidth / 2f, usableHeight / 2f);
+    }
+
     for (int bar = 0; bar < data.length; bar++) {
       float x        = bar * (barWidth + barGap) + barWidth / 2f;
       float y        = data[bar] * maxHeight;

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

@@ -286,6 +286,7 @@ public class WebRtcCallView extends FrameLayout {
   public void setStatusFromHangupType(@NonNull HangupMessage.Type hangupType) {
     switch (hangupType) {
       case NORMAL:
+      case NEED_PERMISSION:
         status.setText(R.string.RedPhone_ending_call);
         break;
       case ACCEPTED:
@@ -306,7 +307,10 @@ public class WebRtcCallView extends FrameLayout {
     Set<View> lastVisibleSet = new HashSet<>(visibleViewSet);
 
     visibleViewSet.clear();
-    visibleViewSet.addAll(topViews);
+
+    if (webRtcControls.displayTopViews()) {
+      visibleViewSet.addAll(topViews);
+    }
 
     if (webRtcControls.displayIncomingCallButtons()) {
       visibleViewSet.addAll(incomingCallViews);

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

@@ -35,6 +35,7 @@ public class WebRtcCallViewModel extends ViewModel {
 
   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;
@@ -97,7 +98,7 @@ public class WebRtcCallViewModel extends ViewModel {
   }
 
   @MainThread
-  public void updateFromWebRtcViewModel(@NonNull WebRtcViewModel webRtcViewModel) {
+  public void updateFromWebRtcViewModel(@NonNull WebRtcViewModel webRtcViewModel, boolean enableVideo) {
     remoteVideoEnabled.setValue(webRtcViewModel.isRemoteVideoEnabled());
     microphoneEnabled.setValue(webRtcViewModel.isMicrophoneEnabled());
 
@@ -106,6 +107,13 @@ public class WebRtcCallViewModel extends ViewModel {
     }
 
     localVideoEnabled.setValue(webRtcViewModel.getLocalCameraState().isEnabled());
+
+    if (enableVideo) {
+      showVideoForOutgoing = webRtcViewModel.getState() == WebRtcViewModel.State.CALL_OUTGOING;
+    } else if (webRtcViewModel.getState() != WebRtcViewModel.State.CALL_OUTGOING) {
+      showVideoForOutgoing = false;
+    }
+
     updateLocalRenderState(webRtcViewModel.getState());
     updateWebRtcControls(webRtcViewModel.getState(),
                          webRtcViewModel.getLocalCameraState().isEnabled(),
@@ -172,18 +180,19 @@ public class WebRtcCallViewModel extends ViewModel {
                                                isRemoteVideoEnabled || isRemoteVideoOffer,
                                                isMoreThanOneCameraAvailable,
                                                isBluetoothAvailable,
+                                               isInPipMode.getValue() == Boolean.TRUE,
                                                callState,
                                                audioOutput));
   }
 
   private @NonNull WebRtcLocalRenderState getRealLocalRenderState(boolean shouldDisplayLocalVideo, @NonNull WebRtcLocalRenderState state) {
-    if (shouldDisplayLocalVideo) return state;
-    else                         return WebRtcLocalRenderState.GONE;
+    if (shouldDisplayLocalVideo || showVideoForOutgoing) return state;
+    else                                                 return WebRtcLocalRenderState.GONE;
   }
 
-  private @NonNull WebRtcControls getRealWebRtcControls(boolean neverDisplayControls, @NonNull WebRtcControls controls) {
-    if (neverDisplayControls) return WebRtcControls.NONE;
-    else                      return controls;
+  private @NonNull WebRtcControls getRealWebRtcControls(boolean isInPipMode, @NonNull WebRtcControls controls) {
+    if (isInPipMode) return WebRtcControls.PIP;
+    else             return controls;
   }
 
   private void startTimer() {

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

@@ -5,22 +5,25 @@ import androidx.annotation.NonNull;
 public final class WebRtcControls {
 
   public static final WebRtcControls NONE = new WebRtcControls();
+  public static final WebRtcControls PIP  = new WebRtcControls(false, false, false, false, true, CallState.NONE, WebRtcAudioOutput.HANDSET);
 
   private final boolean           isRemoteVideoEnabled;
   private final boolean           isLocalVideoEnabled;
   private final boolean           isMoreThanOneCameraAvailable;
   private final boolean           isBluetoothAvailable;
+  private final boolean           isInPipMode;
   private final CallState         callState;
   private final WebRtcAudioOutput audioOutput;
 
   private WebRtcControls() {
-    this(false, false, false, false, CallState.NONE, WebRtcAudioOutput.HANDSET);
+    this(false, false, false, false, false, CallState.NONE, WebRtcAudioOutput.HANDSET);
   }
 
   WebRtcControls(boolean isLocalVideoEnabled,
                  boolean isRemoteVideoEnabled,
                  boolean isMoreThanOneCameraAvailable,
                  boolean isBluetoothAvailable,
+                 boolean isInPipMode,
                  @NonNull CallState callState,
                  @NonNull WebRtcAudioOutput audioOutput)
   {
@@ -28,6 +31,7 @@ public final class WebRtcControls {
     this.isRemoteVideoEnabled         = isRemoteVideoEnabled;
     this.isBluetoothAvailable         = isBluetoothAvailable;
     this.isMoreThanOneCameraAvailable = isMoreThanOneCameraAvailable;
+    this.isInPipMode                  = isInPipMode;
     this.callState                    = callState;
     this.audioOutput                  = audioOutput;
   }
@@ -80,6 +84,10 @@ public final class WebRtcControls {
     return isOngoing() && !(displayAudioToggle() && displayCameraToggle());
   }
 
+  boolean displayTopViews() {
+    return !isInPipMode;
+  }
+
   WebRtcAudioOutput getAudioOutput() {
     return audioOutput;
   }

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

@@ -274,7 +274,7 @@ public class ContactsCursorLoader extends CursorLoader {
         String    stringId  = recipient.isGroup() ? recipient.requireGroupId().toString() : recipient.getE164().or(recipient.getEmail()).or("");
 
         recentConversations.addRow(new Object[] { recipient.getId().serialize(),
-                                                  recipient.toShortString(getContext()),
+                                                  recipient.getDisplayName(getContext()),
                                                   stringId,
                                                   ContactsContract.CommonDataKinds.Phone.TYPE_MOBILE,
                                                   "",

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

@@ -2,13 +2,11 @@ package org.thoughtcrime.securesms.contacts.avatars;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.graphics.drawable.InsetDrawable;
 import android.graphics.drawable.LayerDrawable;
-import android.os.Build;
 
+import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.appcompat.content.res.AppCompatResources;
-import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 
 import org.thoughtcrime.securesms.R;
@@ -18,7 +16,16 @@ import org.thoughtcrime.securesms.util.ViewUtil;
 
 import java.util.Objects;
 
-public final class GroupFallbackPhoto80 implements FallbackContactPhoto {
+public final class FallbackPhoto80dp implements FallbackContactPhoto {
+
+  @DrawableRes private final int           drawable80dp;
+               private final MaterialColor backgroundColor;
+
+  public FallbackPhoto80dp(@DrawableRes int drawable80dp, @NonNull MaterialColor backgroundColor) {
+    this.drawable80dp    = drawable80dp;
+    this.backgroundColor = backgroundColor;
+  }
+
   @Override
   public Drawable asDrawable(Context context, int color) {
     return buildDrawable(context);
@@ -40,13 +47,13 @@ public final class GroupFallbackPhoto80 implements FallbackContactPhoto {
   }
 
   private @NonNull Drawable buildDrawable(@NonNull Context context) {
-    Drawable      background      = DrawableCompat.wrap(Objects.requireNonNull(AppCompatResources.getDrawable(context, R.drawable.circle_tintable)));
-    Drawable      foreground      = AppCompatResources.getDrawable(context, R.drawable.ic_group_80);
+    Drawable      background      = DrawableCompat.wrap(Objects.requireNonNull(AppCompatResources.getDrawable(context, R.drawable.circle_tintable))).mutate();
+    Drawable      foreground      = AppCompatResources.getDrawable(context, drawable80dp);
     Drawable      gradient        = ThemeUtil.getThemedDrawable(context, R.attr.resource_placeholder_gradient);
     LayerDrawable drawable        = new LayerDrawable(new Drawable[]{background, foreground, gradient});
     int           foregroundInset = ViewUtil.dpToPx(24);
 
-    DrawableCompat.setTint(background, MaterialColor.ULTRAMARINE.toAvatarColor(context));
+    DrawableCompat.setTint(background, backgroundColor.toAvatarColor(context));
 
     drawable.setLayerInset(1, foregroundInset, foregroundInset, foregroundInset, foregroundInset);
 

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

@@ -0,0 +1,58 @@
+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

@@ -0,0 +1,89 @@
+package org.thoughtcrime.securesms.contacts.sync;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.WorkerThread;
+
+import com.annimon.stream.Collectors;
+import com.annimon.stream.Stream;
+
+import org.thoughtcrime.securesms.BuildConfig;
+import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper.DirectoryResult;
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.push.IasTrustStore;
+import org.thoughtcrime.securesms.util.SetUtil;
+import org.whispersystems.signalservice.api.SignalServiceAccountManager;
+import org.whispersystems.signalservice.api.push.TrustStore;
+import org.whispersystems.signalservice.internal.contacts.crypto.Quote;
+import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedQuoteException;
+import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;
+
+import java.io.IOException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SignatureException;
+import java.security.cert.CertificateException;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+class ContactDiscoveryV2 {
+
+  private static final String TAG = Log.tag(ContactDiscoveryV2.class);
+
+  @WorkerThread
+  static DirectoryResult getDirectoryResult(@NonNull Context context,
+                                            @NonNull Set<String> databaseNumbers,
+                                            @NonNull Set<String> systemNumbers)
+      throws IOException
+  {
+    Set<String>                        allNumbers        = SetUtil.union(databaseNumbers, systemNumbers);
+    FuzzyPhoneNumberHelper.InputResult inputResult       = FuzzyPhoneNumberHelper.generateInput(allNumbers, databaseNumbers);
+    Set<String>                        sanitizedNumbers  = sanitizeNumbers(inputResult.getNumbers());
+
+
+    SignalServiceAccountManager accountManager = ApplicationDependencies.getSignalServiceAccountManager();
+    KeyStore                    iasKeyStore    = getIasKeyStore(context);
+
+    try {
+      Map<String, UUID>                     results      = accountManager.getRegisteredUsers(iasKeyStore, sanitizedNumbers, BuildConfig.CDS_MRENCLAVE);
+      FuzzyPhoneNumberHelper.OutputResultV2 outputResult = FuzzyPhoneNumberHelper.generateOutputV2(results, inputResult);
+
+      return new DirectoryResult(outputResult.getNumbers(), outputResult.getRewrites());
+    } catch (SignatureException | UnauthenticatedQuoteException | UnauthenticatedResponseException | Quote.InvalidQuoteFormatException e) {
+      Log.w(TAG, "Attestation error.", e);
+      throw new IOException(e);
+    }
+  }
+
+  static @NonNull DirectoryResult getDirectoryResult(@NonNull Context context, @NonNull String number) throws  IOException {
+    return getDirectoryResult(context, Collections.singleton(number), Collections.singleton(number));
+  }
+
+  private static Set<String> sanitizeNumbers(@NonNull Set<String> numbers) {
+    return Stream.of(numbers).filter(number -> {
+      try {
+        return number.startsWith("+") && number.length() > 1 && number.charAt(1) != '0' && Long.parseLong(number.substring(1)) > 0;
+      } catch (NumberFormatException e) {
+        return false;
+      }
+    }).collect(Collectors.toSet());
+  }
+
+  private static KeyStore getIasKeyStore(@NonNull Context context) {
+    try {
+      TrustStore contactTrustStore = new IasTrustStore(context);
+
+      KeyStore keyStore = KeyStore.getInstance("BKS");
+      keyStore.load(contactTrustStore.getKeyStoreInputStream(), contactTrustStore.getKeyStorePassword().toCharArray());
+
+      return keyStore;
+    } catch (KeyStoreException | CertificateException | IOException | NoSuchAlgorithmException e) {
+      throw new AssertionError(e);
+    }
+  }
+}

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

@@ -1,32 +1,141 @@
 package org.thoughtcrime.securesms.contacts.sync;
 
+import android.Manifest;
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.content.ContentResolver;
 import android.content.Context;
+import android.content.OperationApplicationException;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.RemoteException;
+import android.provider.ContactsContract;
+import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.WorkerThread;
 
+import com.annimon.stream.Collectors;
+import com.annimon.stream.Stream;
+
+import org.thoughtcrime.securesms.BuildConfig;
+import org.thoughtcrime.securesms.R;
+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.MessagingDatabase.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.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
 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.Recipient;
+import org.thoughtcrime.securesms.registration.RegistrationUtil;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.sms.IncomingJoinedMessage;
 import org.thoughtcrime.securesms.util.FeatureFlags;
+import org.thoughtcrime.securesms.util.ProfileUtil;
+import org.thoughtcrime.securesms.util.SetUtil;
+import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.Util;
+import org.whispersystems.libsignal.util.guava.Optional;
+import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
+import org.whispersystems.signalservice.api.push.exceptions.NotFoundException;
+import org.whispersystems.signalservice.api.util.UuidUtil;
 
 import java.io.IOException;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
+/**
+ * Manages all the stuff around determining if a user is registered or not.
+ */
 public class DirectoryHelper {
 
   private static final String TAG = Log.tag(DirectoryHelper.class);
 
   @WorkerThread
   public static void refreshDirectory(@NonNull Context context, boolean notifyOfNewUsers) throws IOException {
-    if (FeatureFlags.uuids()) {
-      // TODO [greyson] Create a DirectoryHelperV2 when appropriate.
-      DirectoryHelperV1.refreshDirectory(context, notifyOfNewUsers);
+    if (TextUtils.isEmpty(TextSecurePreferences.getLocalNumber(context))) {
+      Log.w(TAG, "Have not yet set our own local number. Skipping.");
+      return;
+    }
+
+    if (!Permissions.hasAll(context, Manifest.permission.WRITE_CONTACTS)) {
+      Log.w(TAG, "No contact permissions. Skipping.");
+      return;
+    }
+
+    if (!SignalStore.registrationValues().isRegistrationComplete()) {
+      Log.w(TAG, "Registration is not yet complete. Skipping, but running a routine to possibly mark it complete.");
+      RegistrationUtil.maybeMarkRegistrationComplete(context);
+      return;
+    }
+
+    RecipientDatabase recipientDatabase = DatabaseFactory.getRecipientDatabase(context);
+    Set<String>       databaseNumbers   = sanitizeNumbers(recipientDatabase.getAllPhoneNumbers());
+    Set<String>       systemNumbers     = sanitizeNumbers(ContactAccessor.getInstance().getAllContactsWithNumbers(context));
+    Set<String>       allNumbers        = SetUtil.union(databaseNumbers, systemNumbers);
+
+    DirectoryResult result;
+
+    if (FeatureFlags.cds()) {
+      result = ContactDiscoveryV2.getDirectoryResult(context, databaseNumbers, systemNumbers);
     } else {
-      DirectoryHelperV1.refreshDirectory(context, notifyOfNewUsers);
+      result = ContactDiscoveryV1.getDirectoryResult(databaseNumbers, systemNumbers);
+    }
+
+    if (result.getNumberRewrites().size() > 0) {
+      Log.i(TAG, "[getDirectoryResult] Need to rewrite some numbers.");
+      recipientDatabase.updatePhoneNumbers(result.getNumberRewrites());
+    }
+
+    Map<RecipientId, String> uuidMap       = recipientDatabase.bulkProcessCdsResult(result.getRegisteredNumbers());
+    Set<String>              activeNumbers = result.getRegisteredNumbers().keySet();
+    Set<RecipientId>         activeIds     = uuidMap.keySet();
+    Set<RecipientId>         inactiveIds   = Stream.of(allNumbers)
+                                                   .filterNot(activeNumbers::contains)
+                                                   .filterNot(n -> result.getNumberRewrites().containsKey(n))
+                                                   .map(recipientDatabase::getOrInsertFromE164)
+                                                   .collect(Collectors.toSet());
+
+    recipientDatabase.bulkUpdatedRegisteredStatus(uuidMap, inactiveIds);
+
+    updateContactsDatabase(context, activeIds, true, result.getNumberRewrites());
+
+    if (TextSecurePreferences.isMultiDevice(context)) {
+      ApplicationDependencies.getJobManager().add(new MultiDeviceContactUpdateJob());
+    }
+
+    if (TextSecurePreferences.hasSuccessfullyRetrievedDirectory(context) && notifyOfNewUsers) {
+      Set<RecipientId>  existingSignalIds = new HashSet<>(recipientDatabase.getRegistered());
+      Set<RecipientId>  existingSystemIds = new HashSet<>(recipientDatabase.getSystemContacts());
+      Set<RecipientId>  newlyActiveIds    = new HashSet<>(activeIds);
+
+      newlyActiveIds.removeAll(existingSignalIds);
+      newlyActiveIds.retainAll(existingSystemIds);
+
+      notifyNewUsers(context, newlyActiveIds);
+    } else {
+      TextSecurePreferences.setHasSuccessfullyRetrievedDirectory(context, true);
     }
 
     StorageSyncHelper.scheduleSyncForDataChange();
@@ -34,20 +143,260 @@ public class DirectoryHelper {
 
   @WorkerThread
   public static RegisteredState refreshDirectoryFor(@NonNull Context context, @NonNull Recipient recipient, boolean notifyOfNewUsers) throws IOException {
-    RegisteredState originalRegisteredState = recipient.resolve().getRegistered();
-    RegisteredState newRegisteredState      = null;
+    RecipientDatabase recipientDatabase       = DatabaseFactory.getRecipientDatabase(context);
+    RegisteredState   originalRegisteredState = recipient.resolve().getRegistered();
+    RegisteredState   newRegisteredState      = null;
 
-    if (FeatureFlags.uuids()) {
-      // TODO [greyson] Create a DirectoryHelperV2 when appropriate.
-      newRegisteredState = DirectoryHelperV1.refreshDirectoryFor(context, recipient, notifyOfNewUsers);
-    } else {
-      newRegisteredState = DirectoryHelperV1.refreshDirectoryFor(context, recipient, notifyOfNewUsers);
+    if (recipient.hasUuid() && !recipient.hasE164()) {
+      boolean isRegistered = isUuidRegistered(context, recipient);
+      if (isRegistered) {
+        boolean idChanged = recipientDatabase.markRegistered(recipient.getId(), recipient.getUuid().get());
+        if (idChanged) {
+          Log.w(TAG, "ID changed during refresh by UUID.");
+        }
+      } else {
+        recipientDatabase.markUnregistered(recipient.getId());
+      }
+
+      return isRegistered ? RegisteredState.REGISTERED : RegisteredState.NOT_REGISTERED;
     }
 
+    if (!recipient.getE164().isPresent()) {
+      Log.w(TAG, "No UUID or E164?");
+      return RegisteredState.NOT_REGISTERED;
+    }
+
+    DirectoryResult result;
+
+    if (FeatureFlags.cds()) {
+      result = ContactDiscoveryV2.getDirectoryResult(context, recipient.getE164().get());
+    } else {
+      result = ContactDiscoveryV1.getDirectoryResult(recipient.getE164().get());
+    }
+
+    if (result.getNumberRewrites().size() > 0) {
+      Log.i(TAG, "[getDirectoryResult] Need to rewrite some numbers.");
+      recipientDatabase.updatePhoneNumbers(result.getNumberRewrites());
+    }
+
+    if (result.getRegisteredNumbers().size() > 0) {
+      UUID uuid = result.getRegisteredNumbers().values().iterator().next();
+      if (uuid != null) {
+        boolean idChanged = recipientDatabase.markRegistered(recipient.getId(), uuid);
+        if (idChanged) {
+          recipient = Recipient.resolved(recipientDatabase.getByUuid(uuid).get());
+        }
+      } else {
+        recipientDatabase.markRegistered(recipient.getId());
+      }
+    } else {
+      recipientDatabase.markUnregistered(recipient.getId());
+    }
+
+    if (Permissions.hasAll(context, Manifest.permission.WRITE_CONTACTS)) {
+      updateContactsDatabase(context, Collections.singletonList(recipient.getId()), false, result.getNumberRewrites());
+    }
+
+    newRegisteredState = result.getRegisteredNumbers().size() > 0 ? RegisteredState.REGISTERED : RegisteredState.NOT_REGISTERED;
+
     if (newRegisteredState != originalRegisteredState) {
+      ApplicationDependencies.getJobManager().add(new MultiDeviceContactUpdateJob());
+      ApplicationDependencies.getJobManager().add(new StorageSyncJob());
+
+      if (notifyOfNewUsers && newRegisteredState == RegisteredState.REGISTERED && recipient.resolve().isSystemContact()) {
+        notifyNewUsers(context, Collections.singletonList(recipient.getId()));
+      }
+
       StorageSyncHelper.scheduleSyncForDataChange();
     }
 
     return newRegisteredState;
   }
+
+  private static boolean isUuidRegistered(@NonNull Context context, @NonNull Recipient recipient) throws IOException {
+    try {
+      ProfileUtil.retrieveProfile(context, recipient, SignalServiceProfile.RequestType.PROFILE).get(10, TimeUnit.SECONDS);
+      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);
+    }
+  }
+
+  private static void updateContactsDatabase(@NonNull Context context,
+                                             @NonNull Collection<RecipientId> activeIds,
+                                             boolean removeMissing,
+                                             @NonNull Map<String, String> rewrites)
+  {
+    AccountHolder account = getOrCreateSystemAccount(context);
+
+    if (account == null) {
+      Log.w(TAG, "Failed to create an account!");
+      return;
+    }
+
+    try {
+      RecipientDatabase recipientDatabase = DatabaseFactory.getRecipientDatabase(context);
+      ContactsDatabase  contactsDatabase  = DatabaseFactory.getContactsDatabase(context);
+      List<String>      activeAddresses   = Stream.of(activeIds)
+                                                  .map(Recipient::resolved)
+                                                  .filter(Recipient::hasE164)
+                                                  .map(Recipient::requireE164)
+                                                  .toList();
+
+      contactsDatabase.removeDeletedRawContacts(account.getAccount());
+      contactsDatabase.setRegisteredUsers(account.getAccount(), activeAddresses, removeMissing);
+
+      Cursor               cursor = ContactAccessor.getInstance().getAllSystemContacts(context);
+      BulkOperationsHandle handle = recipientDatabase.beginBulkSystemContactUpdate();
+
+      try {
+        while (cursor != null && cursor.moveToNext()) {
+          String number = cursor.getString(cursor.getColumnIndexOrThrow(ContactsContract.CommonDataKinds.Phone.NUMBER));
+
+          if (isValidContactNumber(number)) {
+            String      formattedNumber = PhoneNumberFormatter.get(context).format(number);
+            String      realNumber      = Util.getFirstNonEmpty(rewrites.get(formattedNumber), formattedNumber);
+            RecipientId recipientId     = Recipient.externalContact(context, realNumber).getId();
+            String      displayName     = cursor.getString(cursor.getColumnIndexOrThrow(ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME));
+            String      contactPhotoUri = cursor.getString(cursor.getColumnIndexOrThrow(ContactsContract.CommonDataKinds.Phone.PHOTO_URI));
+            String      contactLabel    = cursor.getString(cursor.getColumnIndexOrThrow(ContactsContract.CommonDataKinds.Phone.LABEL));
+            int         phoneType       = cursor.getInt(cursor.getColumnIndexOrThrow(ContactsContract.CommonDataKinds.Phone.TYPE));
+            Uri         contactUri      = ContactsContract.Contacts.getLookupUri(cursor.getLong(cursor.getColumnIndexOrThrow(ContactsContract.CommonDataKinds.Phone._ID)),
+                                                                                 cursor.getString(cursor.getColumnIndexOrThrow(ContactsContract.CommonDataKinds.Phone.LOOKUP_KEY)));
+
+            handle.setSystemContactInfo(recipientId, displayName, contactPhotoUri, contactLabel, phoneType, contactUri.toString());
+          }
+        }
+      } finally {
+        handle.finish();
+      }
+
+      if (NotificationChannels.supported()) {
+        try (RecipientDatabase.RecipientReader recipients = DatabaseFactory.getRecipientDatabase(context).getRecipientsWithNotificationChannels()) {
+          Recipient recipient;
+          while ((recipient = recipients.getNext()) != null) {
+            NotificationChannels.updateContactChannelName(context, recipient);
+          }
+        }
+      }
+    } catch (RemoteException | OperationApplicationException e) {
+      Log.w(TAG, "Failed to update contacts.", e);
+    }
+  }
+
+  private static boolean isValidContactNumber(@Nullable String number) {
+    return !TextUtils.isEmpty(number) && !UuidUtil.isUuid(number);
+  }
+
+  private static @Nullable AccountHolder getOrCreateSystemAccount(Context context) {
+    AccountManager accountManager = AccountManager.get(context);
+    Account[]      accounts       = accountManager.getAccountsByType(BuildConfig.APPLICATION_ID);
+
+    AccountHolder account;
+
+    if (accounts.length == 0) {
+      account = createAccount(context);
+    } else {
+      account = new AccountHolder(accounts[0], false);
+    }
+
+    if (account != null && !ContentResolver.getSyncAutomatically(account.getAccount(), ContactsContract.AUTHORITY)) {
+      ContentResolver.setSyncAutomatically(account.getAccount(), ContactsContract.AUTHORITY, true);
+    }
+
+    return account;
+  }
+
+  private static @Nullable AccountHolder createAccount(Context context) {
+    AccountManager accountManager = AccountManager.get(context);
+    Account        account        = new Account(context.getString(R.string.app_name), BuildConfig.APPLICATION_ID);
+
+    if (accountManager.addAccountExplicitly(account, null, null)) {
+      Log.i(TAG, "Created new account...");
+      ContentResolver.setIsSyncable(account, ContactsContract.AUTHORITY, 1);
+      return new AccountHolder(account, true);
+    } else {
+      Log.w(TAG, "Failed to create account!");
+      return null;
+    }
+  }
+
+  private static void notifyNewUsers(@NonNull  Context context,
+                                     @NonNull  Collection<RecipientId> newUsers)
+  {
+    if (!TextSecurePreferences.isNewContactsNotificationEnabled(context)) return;
+
+    for (RecipientId newUser: newUsers) {
+      Recipient recipient = Recipient.resolved(newUser);
+      if (!SessionUtil.hasSession(context, recipient.getId()) && !recipient.isLocalNumber()) {
+        IncomingJoinedMessage  message      = new IncomingJoinedMessage(newUser);
+        Optional<InsertResult> insertResult = DatabaseFactory.getSmsDatabase(context).insertMessageInbox(message);
+
+        if (insertResult.isPresent()) {
+          int hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
+          if (hour >= 9 && hour < 23) {
+            ApplicationDependencies.getMessageNotifier().updateNotification(context, insertResult.get().getThreadId(), true);
+          } else {
+            Log.i(TAG, "Not notifying of a new user due to the time of day. (Hour: " + hour + ")");
+          }
+        }
+      }
+    }
+  }
+
+  private static Set<String> sanitizeNumbers(@NonNull Set<String> numbers) {
+    return Stream.of(numbers).filter(number -> {
+      try {
+        return number.startsWith("+") && number.length() > 1 && number.charAt(1) != '0' && Long.parseLong(number.substring(1)) > 0;
+      } catch (NumberFormatException e) {
+        return false;
+      }
+    }).collect(Collectors.toSet());
+  }
+
+  static class DirectoryResult {
+    private final Map<String, UUID>   registeredNumbers;
+    private final Map<String, String> numberRewrites;
+
+    DirectoryResult(@NonNull Map<String, UUID> registeredNumbers,
+                    @NonNull Map<String, String> numberRewrites)
+    {
+      this.registeredNumbers = registeredNumbers;
+      this.numberRewrites    = numberRewrites;
+    }
+
+
+    @NonNull Map<String, UUID> getRegisteredNumbers() {
+      return registeredNumbers;
+    }
+
+    @NonNull Map<String, String> getNumberRewrites() {
+      return numberRewrites;
+    }
+  }
+
+  private static class AccountHolder {
+    private final boolean fresh;
+    private final Account account;
+
+    private AccountHolder(Account account, boolean fresh) {
+      this.fresh   = fresh;
+      this.account = account;
+    }
+
+    @SuppressWarnings("unused")
+    public boolean isFresh() {
+      return fresh;
+    }
+
+    public Account getAccount() {
+      return account;
+    }
+  }
 }

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

@@ -1,401 +0,0 @@
-package org.thoughtcrime.securesms.contacts.sync;
-
-import android.Manifest;
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.annotation.SuppressLint;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.OperationApplicationException;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.RemoteException;
-import android.provider.ContactsContract;
-import android.text.TextUtils;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.WorkerThread;
-
-import com.annimon.stream.Collectors;
-import com.annimon.stream.Stream;
-
-import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.contacts.ContactAccessor;
-import org.thoughtcrime.securesms.crypto.SessionUtil;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.database.MessagingDatabase.InsertResult;
-import org.thoughtcrime.securesms.database.RecipientDatabase;
-import org.thoughtcrime.securesms.database.RecipientDatabase.RegisteredState;
-import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.jobs.MultiDeviceContactUpdateJob;
-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.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.sms.IncomingJoinedMessage;
-import org.thoughtcrime.securesms.util.ProfileUtil;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.thoughtcrime.securesms.util.Util;
-import org.whispersystems.libsignal.util.guava.Optional;
-import org.whispersystems.signalservice.api.SignalServiceAccountManager;
-import org.whispersystems.signalservice.api.profiles.SignalServiceProfile;
-import org.whispersystems.signalservice.api.push.ContactTokenDetails;
-import org.whispersystems.signalservice.api.push.exceptions.NotFoundException;
-import org.whispersystems.signalservice.api.util.UuidUtil;
-
-import java.io.IOException;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-class DirectoryHelperV1 {
-
-  private static final String TAG = DirectoryHelperV1.class.getSimpleName();
-
-  @WorkerThread
-  static void refreshDirectory(@NonNull Context context, boolean notifyOfNewUsers) throws IOException {
-    if (TextUtils.isEmpty(TextSecurePreferences.getLocalNumber(context))) return;
-    if (!Permissions.hasAll(context, Manifest.permission.WRITE_CONTACTS)) return;
-
-    List<RecipientId> newlyActiveUsers = refreshDirectory(context, ApplicationDependencies.getSignalServiceAccountManager());
-
-    if (TextSecurePreferences.isMultiDevice(context)) {
-      ApplicationDependencies.getJobManager().add(new MultiDeviceContactUpdateJob());
-    }
-
-    if (notifyOfNewUsers) notifyNewUsers(context, newlyActiveUsers);
-  }
-
-  @SuppressLint("CheckResult")
-  private static @NonNull List<RecipientId> refreshDirectory(@NonNull Context context, @NonNull SignalServiceAccountManager accountManager) throws IOException {
-    if (TextUtils.isEmpty(TextSecurePreferences.getLocalNumber(context))) {
-      return Collections.emptyList();
-    }
-
-    if (!Permissions.hasAll(context, Manifest.permission.WRITE_CONTACTS)) {
-      return Collections.emptyList();
-    }
-
-    RecipientDatabase recipientDatabase                       = DatabaseFactory.getRecipientDatabase(context);
-    Set<String>       allRecipientNumbers                     = recipientDatabase.getAllPhoneNumbers();
-    Stream<String>    eligibleRecipientDatabaseContactNumbers = Stream.of(allRecipientNumbers);
-    Stream<String>    eligibleSystemDatabaseContactNumbers    = Stream.of(ContactAccessor.getInstance().getAllContactsWithNumbers(context));
-    Set<String>       eligibleContactNumbers                  = Stream.concat(eligibleRecipientDatabaseContactNumbers, eligibleSystemDatabaseContactNumbers).collect(Collectors.toSet());
-    Set<String>       storedNumbers                           = Stream.of(allRecipientNumbers).collect(Collectors.toSet());
-    DirectoryResult   directoryResult                         = getDirectoryResult(context, accountManager, recipientDatabase, storedNumbers, eligibleContactNumbers);
-
-    return directoryResult.getNewlyActiveRecipients();
-  }
-
-  @WorkerThread
-  static RegisteredState refreshDirectoryFor(@NonNull Context context, @NonNull Recipient recipient, boolean notifyOfNewUsers) throws IOException {
-    RecipientDatabase recipientDatabase = DatabaseFactory.getRecipientDatabase(context);
-
-    if (recipient.getUuid().isPresent() && !recipient.getE164().isPresent()) {
-      boolean isRegistered = isUuidRegistered(context, recipient);
-      if (isRegistered) {
-        recipientDatabase.markRegistered(recipient.getId(), recipient.getUuid().get());
-      } else {
-        recipientDatabase.markUnregistered(recipient.getId());
-      }
-
-      return isRegistered ? RegisteredState.REGISTERED : RegisteredState.NOT_REGISTERED;
-    }
-
-    return getRegisteredState(context, ApplicationDependencies.getSignalServiceAccountManager(), recipientDatabase, recipient);
-  }
-
-  private static void updateContactsDatabase(@NonNull Context context, @NonNull List<RecipientId> activeIds, boolean removeMissing, Map<String, String> rewrites) {
-    Optional<AccountHolder> account = getOrCreateAccount(context);
-
-    if (account.isPresent()) {
-      try {
-        List<String> activeAddresses = Stream.of(activeIds).map(Recipient::resolved).filter(Recipient::hasE164).map(Recipient::requireE164).toList();
-
-        DatabaseFactory.getContactsDatabase(context).removeDeletedRawContacts(account.get().getAccount());
-        DatabaseFactory.getContactsDatabase(context).setRegisteredUsers(account.get().getAccount(), activeAddresses, removeMissing);
-
-        Cursor                                 cursor = ContactAccessor.getInstance().getAllSystemContacts(context);
-        RecipientDatabase.BulkOperationsHandle handle = DatabaseFactory.getRecipientDatabase(context).beginBulkSystemContactUpdate();
-
-        try {
-          while (cursor != null && cursor.moveToNext()) {
-            String number = cursor.getString(cursor.getColumnIndexOrThrow(ContactsContract.CommonDataKinds.Phone.NUMBER));
-
-            if (isValidContactNumber(number)) {
-              String      formattedNumber = PhoneNumberFormatter.get(context).format(number);
-              String      realNumber      = Util.getFirstNonEmpty(rewrites.get(formattedNumber), formattedNumber);
-              RecipientId recipientId     = Recipient.externalContact(context, realNumber).getId();
-              String      displayName     = cursor.getString(cursor.getColumnIndexOrThrow(ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME));
-              String      contactPhotoUri = cursor.getString(cursor.getColumnIndexOrThrow(ContactsContract.CommonDataKinds.Phone.PHOTO_URI));
-              String      contactLabel    = cursor.getString(cursor.getColumnIndexOrThrow(ContactsContract.CommonDataKinds.Phone.LABEL));
-              int         phoneType       = cursor.getInt(cursor.getColumnIndexOrThrow(ContactsContract.CommonDataKinds.Phone.TYPE));
-              Uri         contactUri      = ContactsContract.Contacts.getLookupUri(cursor.getLong(cursor.getColumnIndexOrThrow(ContactsContract.CommonDataKinds.Phone._ID)),
-                                                                                   cursor.getString(cursor.getColumnIndexOrThrow(ContactsContract.CommonDataKinds.Phone.LOOKUP_KEY)));
-
-              handle.setSystemContactInfo(recipientId, displayName, contactPhotoUri, contactLabel, phoneType, contactUri.toString());
-            }
-          }
-        } finally {
-          handle.finish();
-        }
-
-        if (NotificationChannels.supported()) {
-          try (RecipientDatabase.RecipientReader recipients = DatabaseFactory.getRecipientDatabase(context).getRecipientsWithNotificationChannels()) {
-            Recipient recipient;
-            while ((recipient = recipients.getNext()) != null) {
-              NotificationChannels.updateContactChannelName(context, recipient);
-            }
-          }
-        }
-      } catch (RemoteException | OperationApplicationException e) {
-        Log.w(TAG, "Failed to update contacts.", e);
-      }
-    }
-  }
-
-  private static void notifyNewUsers(@NonNull  Context context,
-                                     @NonNull  List<RecipientId> newUsers)
-  {
-    if (!TextSecurePreferences.isNewContactsNotificationEnabled(context)) return;
-
-    for (RecipientId newUser: newUsers) {
-      Recipient recipient = Recipient.resolved(newUser);
-      if (!SessionUtil.hasSession(context, recipient.getId()) && !recipient.isLocalNumber()) {
-        IncomingJoinedMessage  message      = new IncomingJoinedMessage(newUser);
-        Optional<InsertResult> insertResult = DatabaseFactory.getSmsDatabase(context).insertMessageInbox(message);
-
-        if (insertResult.isPresent()) {
-          int hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
-          if (hour >= 9 && hour < 23) {
-            ApplicationDependencies.getMessageNotifier().updateNotification(context, insertResult.get().getThreadId(), true);
-          } else {
-            ApplicationDependencies.getMessageNotifier().updateNotification(context, insertResult.get().getThreadId(), false);
-          }
-        }
-      }
-    }
-  }
-
-  private static Optional<AccountHolder> getOrCreateAccount(Context context) {
-    AccountManager accountManager = AccountManager.get(context);
-    Account[]      accounts       = accountManager.getAccountsByType("org.thoughtcrime.securesms");
-
-    Optional<AccountHolder> account;
-
-    if (accounts.length == 0) account = createAccount(context);
-    else                      account = Optional.of(new AccountHolder(accounts[0], false));
-
-    if (account.isPresent() && !ContentResolver.getSyncAutomatically(account.get().getAccount(), ContactsContract.AUTHORITY)) {
-      ContentResolver.setSyncAutomatically(account.get().getAccount(), ContactsContract.AUTHORITY, true);
-    }
-
-    return account;
-  }
-
-  private static Optional<AccountHolder> createAccount(Context context) {
-    AccountManager accountManager = AccountManager.get(context);
-    Account        account        = new Account(context.getString(R.string.app_name), "org.thoughtcrime.securesms");
-
-    if (accountManager.addAccountExplicitly(account, null, null)) {
-      Log.i(TAG, "Created new account...");
-      ContentResolver.setIsSyncable(account, ContactsContract.AUTHORITY, 1);
-      return Optional.of(new AccountHolder(account, true));
-    } else {
-      Log.w(TAG, "Failed to create account!");
-      return Optional.absent();
-    }
-  }
-
-  private static DirectoryResult getDirectoryResult(@NonNull Context context,
-                                                    @NonNull SignalServiceAccountManager accountManager,
-                                                    @NonNull RecipientDatabase recipientDatabase,
-                                                    @NonNull Set<String> locallyStoredNumbers,
-                                                    @NonNull Set<String> eligibleContactNumbers)
-      throws IOException
-  {
-    FuzzyPhoneNumberHelper.InputResult  inputResult   = FuzzyPhoneNumberHelper.generateInput(eligibleContactNumbers, locallyStoredNumbers);
-    List<ContactTokenDetails>           activeTokens  = accountManager.getContacts(inputResult.getNumbers());
-    Set<String>                         activeNumbers = Stream.of(activeTokens).map(ContactTokenDetails::getNumber).collect(Collectors.toSet());
-    FuzzyPhoneNumberHelper.OutputResult outputResult  = FuzzyPhoneNumberHelper.generateOutput(activeNumbers, inputResult);
-
-    if (inputResult.getFuzzies().size() > 0) {
-      Log.i(TAG, "[getDirectoryResult] Got a fuzzy number result.");
-    }
-
-    if (outputResult.getRewrites().size() > 0) {
-      Log.i(TAG, "[getDirectoryResult] Need to rewrite some numbers.");
-    }
-
-    recipientDatabase.updatePhoneNumbers(outputResult.getRewrites());
-
-    List<RecipientId> activeIds   = new LinkedList<>();
-    List<RecipientId> inactiveIds = new LinkedList<>();
-
-    Set<String> inactiveContactNumbers = new HashSet<>(inputResult.getNumbers());
-    inactiveContactNumbers.removeAll(outputResult.getRewrites().keySet());
-
-    for (String number : outputResult.getNumbers()) {
-      activeIds.add(recipientDatabase.getOrInsertFromE164(number));
-      inactiveContactNumbers.remove(number);
-    }
-
-    for (String inactiveContactNumber : inactiveContactNumbers) {
-      inactiveIds.add(recipientDatabase.getOrInsertFromE164(inactiveContactNumber));
-    }
-
-    Set<RecipientId>  currentActiveIds = new HashSet<>(recipientDatabase.getRegistered());
-    Set<RecipientId>  contactIds       = new HashSet<>(recipientDatabase.getSystemContacts());
-    List<RecipientId> newlyActiveIds   = Stream.of(activeIds)
-                                               .filter(id -> !currentActiveIds.contains(id))
-                                               .filter(contactIds::contains)
-                                               .toList();
-
-    recipientDatabase.setRegistered(activeIds, inactiveIds);
-    updateContactsDatabase(context, activeIds, true, outputResult.getRewrites());
-
-    Set<String> activeContactNumbers = Stream.of(activeIds).map(Recipient::resolved).filter(Recipient::hasSmsAddress).map(Recipient::requireSmsAddress).collect(Collectors.toSet());
-
-    if (TextSecurePreferences.hasSuccessfullyRetrievedDirectory(context)) {
-      return new DirectoryResult(activeContactNumbers, newlyActiveIds);
-    } else {
-      TextSecurePreferences.setHasSuccessfullyRetrievedDirectory(context, true);
-      return new DirectoryResult(activeContactNumbers);
-    }
-  }
-
-  private static RegisteredState getRegisteredState(@NonNull Context                     context,
-                                                    @NonNull SignalServiceAccountManager accountManager,
-                                                    @NonNull RecipientDatabase           recipientDatabase,
-                                                    @NonNull Recipient                   recipient)
-      throws IOException
-  {
-    boolean                       activeUser    = recipient.resolve().getRegistered() == RegisteredState.REGISTERED;
-    boolean                       systemContact = recipient.isSystemContact();
-    Optional<ContactTokenDetails> details       = Optional.absent();
-    Map<String, String>           rewrites      = new HashMap<>();
-
-    if (recipient.hasE164()) {
-      FuzzyPhoneNumberHelper.InputResult inputResult = FuzzyPhoneNumberHelper.generateInput(Collections.singletonList(recipient.requireE164()), recipientDatabase.getAllPhoneNumbers());
-
-      if (inputResult.getNumbers().size() > 1) {
-        Log.i(TAG, "[getRegisteredState] Got a fuzzy number result.");
-
-        List<ContactTokenDetails>           detailList   = accountManager.getContacts(inputResult.getNumbers());
-        Collection<String>                  registered   = Stream.of(detailList).map(ContactTokenDetails::getNumber).collect(Collectors.toSet());
-        FuzzyPhoneNumberHelper.OutputResult outputResult = FuzzyPhoneNumberHelper.generateOutput(registered, inputResult);
-        String                              finalNumber  = recipient.requireE164();
-        ContactTokenDetails                 detail       = new ContactTokenDetails();
-
-        if (outputResult.getRewrites().size() > 0 && outputResult.getRewrites().containsKey(finalNumber)) {
-          Log.i(TAG, "[getRegisteredState] Need to rewrite a number.");
-          finalNumber = outputResult.getRewrites().get(finalNumber);
-          rewrites    = outputResult.getRewrites();
-        }
-
-        detail.setNumber(finalNumber);
-        details = Optional.of(detail);
-
-        recipientDatabase.updatePhoneNumbers(outputResult.getRewrites());
-      } else {
-        details = accountManager.getContact(recipient.requireE164());
-      }
-    }
-
-    if (details.isPresent()) {
-      recipientDatabase.setRegistered(recipient.getId(), RegisteredState.REGISTERED);
-
-      if (Permissions.hasAll(context, Manifest.permission.WRITE_CONTACTS)) {
-        updateContactsDatabase(context, Util.asList(recipient.getId()), false, rewrites);
-      }
-
-      if (!activeUser && TextSecurePreferences.isMultiDevice(context)) {
-        ApplicationDependencies.getJobManager().add(new MultiDeviceContactUpdateJob());
-      }
-
-      if (!activeUser && systemContact && !TextSecurePreferences.getNeedsSqlCipherMigration(context)) {
-        notifyNewUsers(context, Collections.singletonList(recipient.getId()));
-      }
-
-      return RegisteredState.REGISTERED;
-    } else {
-      recipientDatabase.setRegistered(recipient.getId(), RegisteredState.NOT_REGISTERED);
-      return RegisteredState.NOT_REGISTERED;
-    }
-  }
-
-  private static boolean isValidContactNumber(@Nullable String number) {
-    return !TextUtils.isEmpty(number) && !UuidUtil.isUuid(number);
-  }
-
-  private static boolean isUuidRegistered(@NonNull Context context, @NonNull Recipient recipient) throws IOException {
-    try {
-      ProfileUtil.retrieveProfile(context, recipient, SignalServiceProfile.RequestType.PROFILE).get(10, TimeUnit.SECONDS);
-      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);
-    }
-  }
-
-  private static class DirectoryResult {
-
-    private final Set<String>       numbers;
-    private final List<RecipientId> newlyActiveRecipients;
-
-    DirectoryResult(@NonNull Set<String> numbers) {
-      this(numbers, Collections.emptyList());
-    }
-
-    DirectoryResult(@NonNull Set<String> numbers, @NonNull List<RecipientId> newlyActiveRecipients) {
-      this.numbers               = numbers;
-      this.newlyActiveRecipients = newlyActiveRecipients;
-    }
-
-    Set<String> getNumbers() {
-      return numbers;
-    }
-
-    List<RecipientId> getNewlyActiveRecipients() {
-      return newlyActiveRecipients;
-    }
-  }
-
-  private static class AccountHolder {
-
-    private final boolean fresh;
-    private final Account account;
-
-    private AccountHolder(Account account, boolean fresh) {
-      this.fresh   = fresh;
-      this.account = account;
-    }
-
-    @SuppressWarnings("unused")
-    public boolean isFresh() {
-      return fresh;
-    }
-
-    public Account getAccount() {
-      return account;
-    }
-
-  }
-}

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

@@ -8,6 +8,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.UUID;
 
 /**
  * A helper class to match a single number with multiple possible registered numbers. An example is
@@ -67,6 +68,32 @@ class FuzzyPhoneNumberHelper {
     return new OutputResult(allNumbers, rewrites);
   }
 
+  /**
+   * This should be run on the list of numbers we find out are registered with the server. Based on
+   * these results and our initial input set, we can decide if we need to rewrite which number we
+   * have stored locally.
+   */
+  static @NonNull OutputResultV2 generateOutputV2(@NonNull Map<String, UUID> registeredNumbers, @NonNull InputResult inputResult) {
+    Map<String, UUID>   allNumbers = new HashMap<>(registeredNumbers);
+    Map<String, String> rewrites   = new HashMap<>();
+
+    for (Map.Entry<String, String> entry : inputResult.getFuzzies().entrySet()) {
+      if (registeredNumbers.containsKey(entry.getKey()) && registeredNumbers.containsKey(entry.getValue())) {
+        if (mxHas1(entry.getKey())) {
+          rewrites.put(entry.getKey(), entry.getValue());
+          allNumbers.remove(entry.getKey());
+        } else {
+          allNumbers.remove(entry.getValue());
+        }
+      } else if (registeredNumbers.containsKey(entry.getValue())) {
+        rewrites.put(entry.getKey(), entry.getValue());
+        allNumbers.remove(entry.getKey());
+      }
+    }
+
+    return new OutputResultV2(allNumbers, rewrites);
+  }
+
 
   private static boolean mx(@NonNull String number) {
     return number.startsWith("+52") && (number.length() == 13 || number.length() == 14);
@@ -127,4 +154,22 @@ class FuzzyPhoneNumberHelper {
       return rewrites;
     }
   }
+
+  public static class OutputResultV2 {
+    private final Map<String, UUID>   numbers;
+    private final Map<String, String> rewrites;
+
+    private OutputResultV2(@NonNull Map<String, UUID> numbers, @NonNull Map<String, String> rewrites) {
+      this.numbers  = numbers;
+      this.rewrites = rewrites;
+    }
+
+    public @NonNull Map<String, UUID> getNumbers() {
+      return numbers;
+    }
+
+    public @NonNull Map<String, String> getRewrites() {
+      return rewrites;
+    }
+  }
 }

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

@@ -643,7 +643,7 @@ public class Contact implements Parcelable {
 
     private static Attachment attachmentFromUri(@Nullable Uri uri) {
       if (uri == null) return null;
-      return new UriAttachment(uri, MediaUtil.IMAGE_JPEG, AttachmentDatabase.TRANSFER_PROGRESS_DONE, 0, null, false, false, null, null, null, null, null);
+      return new UriAttachment(uri, MediaUtil.IMAGE_JPEG, AttachmentDatabase.TRANSFER_PROGRESS_DONE, 0, null, false, false, false, null, null, null, null, null);
     }
 
     @Override

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

@@ -8,7 +8,7 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.widget.Toolbar;
 import android.widget.TextView;
 
-import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity;
+import org.thoughtcrime.securesms.PassphraseRequiredActivity;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
@@ -16,7 +16,7 @@ import org.thoughtcrime.securesms.util.DynamicTheme;
 
 import static org.thoughtcrime.securesms.contactshare.Contact.*;
 
-public class ContactNameEditActivity extends PassphraseRequiredActionBarActivity {
+public class ContactNameEditActivity extends PassphraseRequiredActivity {
 
   public static final String KEY_NAME          = "name";
   public static final String KEY_CONTACT_INDEX = "contact_index";

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

@@ -14,7 +14,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.Toast;
 
-import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity;
+import org.thoughtcrime.securesms.PassphraseRequiredActivity;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.mms.GlideApp;
@@ -27,7 +27,7 @@ import java.util.List;
 import static org.thoughtcrime.securesms.contactshare.Contact.*;
 import static org.thoughtcrime.securesms.contactshare.ContactShareEditViewModel.*;
 
-public class ContactShareEditActivity extends PassphraseRequiredActionBarActivity implements ContactShareEditAdapter.EventListener {
+public class ContactShareEditActivity extends PassphraseRequiredActivity implements ContactShareEditAdapter.EventListener {
 
   public  static final String KEY_CONTACTS     = "contacts";
   private static final String KEY_CONTACT_URIS = "contact_uris";

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

@@ -20,8 +20,7 @@ import android.widget.TextView;
 
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 
-import org.thoughtcrime.securesms.ApplicationContext;
-import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity;
+import org.thoughtcrime.securesms.PassphraseRequiredActivity;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.database.RecipientDatabase;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
@@ -44,7 +43,7 @@ import java.util.Map;
 
 import static org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.*;
 
-public class SharedContactDetailsActivity extends PassphraseRequiredActionBarActivity {
+public class SharedContactDetailsActivity extends PassphraseRequiredActivity {
 
   private static final int    CODE_ADD_EDIT_CONTACT = 2323;
   private static final String KEY_CONTACT           = "contact";

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

@@ -41,7 +41,6 @@ import android.provider.Browser;
 import android.provider.ContactsContract;
 import android.provider.Telephony;
 import android.text.Editable;
-import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.Gravity;
 import android.view.KeyEvent;
@@ -63,6 +62,7 @@ import android.widget.Toast;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.SearchView;
@@ -73,6 +73,7 @@ import androidx.core.graphics.drawable.IconCompat;
 import androidx.lifecycle.ViewModelProviders;
 
 import com.annimon.stream.Stream;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.request.target.CustomTarget;
 import com.bumptech.glide.request.transition.Transition;
 
@@ -82,14 +83,12 @@ import org.greenrobot.eventbus.ThreadMode;
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.BlockUnblockDialog;
 import org.thoughtcrime.securesms.ExpirationDialog;
-import org.thoughtcrime.securesms.GroupCreateActivity;
 import org.thoughtcrime.securesms.GroupMembersDialog;
 import org.thoughtcrime.securesms.MainActivity;
 import org.thoughtcrime.securesms.MuteDialog;
-import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity;
+import org.thoughtcrime.securesms.PassphraseRequiredActivity;
 import org.thoughtcrime.securesms.PromptMmsActivity;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.RecipientPreferenceActivity;
 import org.thoughtcrime.securesms.ShortcutLauncherActivity;
 import org.thoughtcrime.securesms.TransportOption;
 import org.thoughtcrime.securesms.VerifyIdentityActivity;
@@ -110,9 +109,7 @@ import org.thoughtcrime.securesms.components.TooltipPopup;
 import org.thoughtcrime.securesms.components.emoji.EmojiKeyboardProvider;
 import org.thoughtcrime.securesms.components.emoji.EmojiStrings;
 import org.thoughtcrime.securesms.components.emoji.MediaKeyboard;
-import org.thoughtcrime.securesms.components.identity.UntrustedSendDialog;
 import org.thoughtcrime.securesms.components.identity.UnverifiedBannerView;
-import org.thoughtcrime.securesms.components.identity.UnverifiedSendDialog;
 import org.thoughtcrime.securesms.components.location.SignalPlace;
 import org.thoughtcrime.securesms.components.reminder.ExpiredBuildReminder;
 import org.thoughtcrime.securesms.components.reminder.Reminder;
@@ -127,6 +124,7 @@ import org.thoughtcrime.securesms.contactshare.ContactShareEditActivity;
 import org.thoughtcrime.securesms.contactshare.ContactUtil;
 import org.thoughtcrime.securesms.contactshare.SimpleTextWatcher;
 import org.thoughtcrime.securesms.conversation.ConversationGroupViewModel.GroupActiveState;
+import org.thoughtcrime.securesms.conversation.ui.error.SafetyNumberChangeDialog;
 import org.thoughtcrime.securesms.conversationlist.model.MessageResult;
 import org.thoughtcrime.securesms.crypto.SecurityEvent;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
@@ -150,12 +148,10 @@ import org.thoughtcrime.securesms.database.model.StickerRecord;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.events.ReminderUpdateEvent;
 import org.thoughtcrime.securesms.giph.ui.GiphyActivity;
-import org.thoughtcrime.securesms.groups.GroupChangeBusyException;
-import org.thoughtcrime.securesms.groups.GroupChangeFailedException;
-import org.thoughtcrime.securesms.groups.GroupInsufficientRightsException;
+import org.thoughtcrime.securesms.groups.GroupChangeException;
 import org.thoughtcrime.securesms.groups.GroupManager;
-import org.thoughtcrime.securesms.groups.GroupNotAMemberException;
 import org.thoughtcrime.securesms.groups.ui.GroupChangeFailureReason;
+import org.thoughtcrime.securesms.groups.ui.GroupChangeResult;
 import org.thoughtcrime.securesms.groups.ui.GroupErrors;
 import org.thoughtcrime.securesms.groups.ui.LeaveGroupDialog;
 import org.thoughtcrime.securesms.groups.ui.managegroup.ManageGroupActivity;
@@ -175,11 +171,13 @@ import org.thoughtcrime.securesms.mediaoverview.MediaOverviewActivity;
 import org.thoughtcrime.securesms.mediasend.Media;
 import org.thoughtcrime.securesms.mediasend.MediaSendActivity;
 import org.thoughtcrime.securesms.mediasend.MediaSendActivityResult;
+import org.thoughtcrime.securesms.messagedetails.MessageDetailsActivity;
 import org.thoughtcrime.securesms.messagerequests.MessageRequestViewModel;
 import org.thoughtcrime.securesms.messagerequests.MessageRequestsBottomView;
 import org.thoughtcrime.securesms.mms.AttachmentManager;
 import org.thoughtcrime.securesms.mms.AttachmentManager.MediaType;
 import org.thoughtcrime.securesms.mms.AudioSlide;
+import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader;
 import org.thoughtcrime.securesms.mms.GifSlide;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.GlideRequests;
@@ -207,6 +205,7 @@ import org.thoughtcrime.securesms.recipients.RecipientExporter;
 import org.thoughtcrime.securesms.recipients.RecipientFormattingException;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.recipients.RecipientUtil;
+import org.thoughtcrime.securesms.recipients.ui.managerecipient.ManageRecipientActivity;
 import org.thoughtcrime.securesms.registration.RegistrationNavigationActivity;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.sms.MessageSender;
@@ -225,7 +224,6 @@ import org.thoughtcrime.securesms.util.DrawableUtil;
 import org.thoughtcrime.securesms.util.DynamicDarkToolbarTheme;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
-import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.IdentityUtil;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.MessageUtil;
@@ -248,7 +246,10 @@ import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -264,7 +265,7 @@ import static org.whispersystems.libsignal.SessionCipher.SESSION_LOCK;
  *
  */
 @SuppressLint("StaticFieldLeak")
-public class ConversationActivity extends PassphraseRequiredActionBarActivity
+public class ConversationActivity extends PassphraseRequiredActivity
     implements ConversationFragment.ConversationFragmentListener,
                AttachmentManager.AttachmentListener,
                OnKeyboardShownListener,
@@ -275,18 +276,22 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
                StickerKeyboardProvider.StickerEventListener,
                AttachmentKeyboard.Callback,
                ConversationReactionOverlay.OnReactionSelectedListener,
-               ReactWithAnyEmojiBottomSheetDialogFragment.Callback
+               ReactWithAnyEmojiBottomSheetDialogFragment.Callback,
+               SafetyNumberChangeDialog.Callback
 {
 
   private static final int SHORTCUT_ICON_SIZE = Build.VERSION.SDK_INT >= 26 ? ViewUtil.dpToPx(72) : ViewUtil.dpToPx(48 + 16 * 2);
 
   private static final String TAG = ConversationActivity.class.getSimpleName();
 
+  public static final String SAFETY_NUMBER_DIALOG = "SAFETY_NUMBER";
+
   public static final String RECIPIENT_EXTRA                   = "recipient_id";
   public static final String THREAD_ID_EXTRA                   = "thread_id";
   public static final String TEXT_EXTRA                        = "draft_text";
   public static final String MEDIA_EXTRA                       = "media_list";
   public static final String STICKER_EXTRA                     = "sticker_extra";
+  public static final String BORDERLESS_EXTRA                  = "borderless_extra";
   public static final String DISTRIBUTION_TYPE_EXTRA           = "distribution_type";
   public static final String STARTING_POSITION_EXTRA           = "starting_position";
 
@@ -333,6 +338,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   protected HidingLinearLayout       inlineAttachmentToggle;
   private   InputPanel               inputPanel;
   private   View                     panelParent;
+  private   View                     noLongerMemberBanner;
 
   private LinkPreviewViewModel         linkPreviewViewModel;
   private ConversationSearchViewModel  searchViewModel;
@@ -349,7 +355,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private boolean       isMmsEnabled                  = true;
   private boolean       isSecurityInitialized         = false;
 
-  private final IdentityRecordList identityRecords = new IdentityRecordList();
+  private       IdentityRecordList identityRecords = new IdentityRecordList(Collections.emptyList());
   private final DynamicTheme       dynamicTheme    = new DynamicDarkToolbarTheme();
   private final DynamicLanguage    dynamicLanguage = new DynamicLanguage();
 
@@ -495,7 +501,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     titleView.setTitle(glideRequests, recipientSnapshot);
     setActionBarColor(recipientSnapshot.getColor());
     setBlockedUserState(recipientSnapshot, isSecureText, isDefaultSms);
-    setGroupShareProfileReminder(recipientSnapshot);
     calculateCharactersRemaining();
 
     if (recipientSnapshot.getGroupId().isPresent() && recipientSnapshot.getGroupId().get().isV2()) {
@@ -611,7 +616,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       setMedia(data.getData(),
                MediaType.GIF,
                data.getIntExtra(GiphyActivity.EXTRA_WIDTH, 0),
-               data.getIntExtra(GiphyActivity.EXTRA_HEIGHT, 0));
+               data.getIntExtra(GiphyActivity.EXTRA_HEIGHT, 0),
+               data.getBooleanExtra(GiphyActivity.EXTRA_BORDERLESS, false));
       break;
     case SMS_DEFAULT:
       initializeSecurity(isSecureText, isDefaultSms);
@@ -635,9 +641,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
         if (MediaUtil.isVideoType(mediaItem.getMimeType())) {
           slideDeck.addSlide(new VideoSlide(this, mediaItem.getUri(), 0, 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.getCaption().orNull()));
+          slideDeck.addSlide(new GifSlide(this, mediaItem.getUri(), 0, mediaItem.getWidth(), mediaItem.getHeight(), mediaItem.isBorderless(), mediaItem.getCaption().orNull()));
         } else if (MediaUtil.isImageType(mediaItem.getMimeType())) {
-          slideDeck.addSlide(new ImageSlide(this, mediaItem.getUri(), 0, mediaItem.getWidth(), mediaItem.getHeight(), mediaItem.getCaption().orNull(), null));
+          slideDeck.addSlide(new ImageSlide(this, mediaItem.getUri(), mediaItem.getMimeType(), 0, mediaItem.getWidth(), mediaItem.getHeight(), mediaItem.isBorderless(), mediaItem.getCaption().orNull(), null));
         } else {
           Log.w(TAG, "Asked to send an unexpected mimeType: '" + mediaItem.getMimeType() + "'. Skipping.");
         }
@@ -757,10 +763,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
         } else {
           menu.findItem(R.id.menu_distribution_conversation).setChecked(true);
         }
-      } else if (isActiveV2Group || isActiveGroup && FeatureFlags.newGroupUI()) {
-        inflater.inflate(R.menu.conversation_push_group_v2_options, menu);
-      } else if (isActiveGroup) {
-        inflater.inflate(R.menu.conversation_push_group_options, menu);
+        inflater.inflate(R.menu.conversation_active_group_options, menu);
+      } else if (isActiveV2Group || isActiveGroup) {
+        inflater.inflate(R.menu.conversation_active_group_options, menu);
       }
     }
 
@@ -803,9 +808,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       hideMenuItem(menu, R.id.menu_mute_notifications);
     }
 
-    if (FeatureFlags.newGroupUI() && isPushGroupConversation()) {
-      hideMenuItem(menu, R.id.menu_group_recipients);
-    }
+    hideMenuItem(menu, R.id.menu_group_recipients);
 
     if (isActiveV2Group) {
       hideMenuItem(menu, R.id.menu_mute_notifications);
@@ -884,8 +887,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     case R.id.menu_group_recipients:          handleDisplayGroupRecipients();                    return true;
     case R.id.menu_distribution_broadcast:    handleDistributionBroadcastEnabled(item);          return true;
     case R.id.menu_distribution_conversation: handleDistributionConversationEnabled(item);       return true;
-    case R.id.menu_edit_group:                handleEditPushGroupV1();                           return true;
-    case R.id.menu_group_settings:            handleManagePushGroup();                           return true;
+    case R.id.menu_group_settings:            handleManageGroup();                               return true;
     case R.id.menu_leave:                     handleLeavePushGroup();                            return true;
     case R.id.menu_invite:                    handleInviteLink();                                return true;
     case R.id.menu_mute_notifications:        handleMuteNotifications();                         return true;
@@ -999,26 +1001,20 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
             if (activeGroup) {
               try {
                 GroupManager.updateGroupTimer(ConversationActivity.this, getRecipient().requireGroupId().requirePush(), expirationTime);
-              } catch (GroupInsufficientRightsException e) {
+                } catch (GroupChangeException | IOException e) {
                 Log.w(TAG, e);
-                return ConversationActivity.this.getString(R.string.ManageGroupActivity_you_dont_have_the_rights_to_do_this);
-              } catch (GroupNotAMemberException e) {
-                Log.w(TAG, e);
-                return ConversationActivity.this.getString(R.string.ManageGroupActivity_youre_not_a_member_of_the_group);
-              } catch (GroupChangeFailedException | GroupChangeBusyException | IOException e) {
-                Log.w(TAG, e);
-                return ConversationActivity.this.getString(R.string.ManageGroupActivity_failed_to_update_the_group);
+                return GroupChangeResult.failure(GroupChangeFailureReason.fromException(e));
               }
             } else {
               DatabaseFactory.getRecipientDatabase(ConversationActivity.this).setExpireMessages(recipient.getId(), expirationTime);
               OutgoingExpirationUpdateMessage outgoingMessage = new OutgoingExpirationUpdateMessage(getRecipient(), System.currentTimeMillis(), expirationTime * 1000L);
               MessageSender.send(ConversationActivity.this, outgoingMessage, threadId, false, null);
             }
-            return null;
+            return GroupChangeResult.SUCCESS;
           },
-          (errorString) -> {
-            if (errorString != null) {
-              Toast.makeText(ConversationActivity.this, errorString, Toast.LENGTH_SHORT).show();
+          (changeResult) -> {
+            if (!changeResult.isSuccess()) {
+              Toast.makeText(ConversationActivity.this, GroupErrors.getUserDisplayMessage(changeResult.getFailureReason()), Toast.LENGTH_SHORT).show();
             } else {
               invalidateOptionsMenu();
               if (fragment != null) fragment.setLastSeen(0);
@@ -1042,14 +1038,14 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void handleConversationSettings() {
-    if (FeatureFlags.newGroupUI() && isPushGroupConversation()) {
-      handleManagePushGroup();
+    if (isGroupConversation()) {
+      handleManageGroup();
       return;
     }
 
     if (isInMessageRequest()) return;
 
-    Intent intent = RecipientPreferenceActivity.getLaunchIntent(this, recipient.getId());
+    Intent intent = ManageRecipientActivity.newIntentFromConversation(this, recipient.getId());
     startActivitySceneTransition(intent, titleView.findViewById(R.id.contact_photo_image), "avatar");
   }
 
@@ -1200,18 +1196,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       return;
     }
 
-    LeaveGroupDialog.handleLeavePushGroup(ConversationActivity.this,
-                                          getLifecycle(),
-                                          getRecipient().requireGroupId().requirePush(),
-                                          null);
+    LeaveGroupDialog.handleLeavePushGroup(this, getRecipient().requireGroupId().requirePush(), this::finish);
   }
 
-  private void handleEditPushGroupV1() {
-    startActivityForResult(GroupCreateActivity.newEditGroupIntent(ConversationActivity.this, recipient.get().requireGroupId().requireV1()), GROUP_EDIT);
-  }
-
-  private void handleManagePushGroup() {
-    startActivityForResult(ManageGroupActivity.newIntent(ConversationActivity.this, recipient.get().requireGroupId().requirePush()),
+  private void handleManageGroup() {
+    startActivityForResult(ManageGroupActivity.newIntent(ConversationActivity.this, recipient.get().requireGroupId()),
                            GROUP_EDIT,
                            ManageGroupActivity.createTransitionBundle(this, titleView.findViewById(R.id.contact_photo_image)));
   }
@@ -1317,50 +1306,28 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     startActivity(intent);
   }
 
-  private void handleUnverifiedRecipients() {
-    List<Recipient>      unverifiedRecipients = identityRecords.getUnverifiedRecipients();
-    List<IdentityRecord> unverifiedRecords    = identityRecords.getUnverifiedRecords();
-    String               message              = IdentityUtil.getUnverifiedSendDialogDescription(this, unverifiedRecipients);
-
-    if (message == null) return;
-
-    //noinspection CodeBlock2Expr
-    new UnverifiedSendDialog(this, message, unverifiedRecords, () -> {
-      initializeIdentityRecords().addListener(new ListenableFuture.Listener<Boolean>() {
-        @Override
-        public void onSuccess(Boolean result) {
-          sendMessage();
-        }
-
-        @Override
-        public void onFailure(ExecutionException e) {
-          throw new AssertionError(e);
-        }
-      });
-    }).show();
+  private void handleRecentSafetyNumberChange() {
+    List<IdentityRecord> records = identityRecords.getUnverifiedRecords();
+    records.addAll(identityRecords.getUntrustedRecords());
+    SafetyNumberChangeDialog.create(records).show(getSupportFragmentManager(), SAFETY_NUMBER_DIALOG);
   }
 
-  private void handleUntrustedRecipients() {
-    List<Recipient>      untrustedRecipients = identityRecords.getUntrustedRecipients();
-    List<IdentityRecord> untrustedRecords    = identityRecords.getUntrustedRecords();
-    String               untrustedMessage    = IdentityUtil.getUntrustedSendDialogDescription(this, untrustedRecipients);
+  @Override
+  public void onSendAnywayAfterSafetyNumberChange() {
+    initializeIdentityRecords().addListener(new AssertedSuccessListener<Boolean>() {
+      @Override
+      public void onSuccess(Boolean result) {
+        sendMessage();
+      }
+    });
+  }
 
-    if (untrustedMessage == null) return;
-
-    //noinspection CodeBlock2Expr
-    new UntrustedSendDialog(this, untrustedMessage, untrustedRecords, () -> {
-      initializeIdentityRecords().addListener(new ListenableFuture.Listener<Boolean>() {
-        @Override
-        public void onSuccess(Boolean result) {
-          sendMessage();
-        }
-
-        @Override
-        public void onFailure(ExecutionException e) {
-          throw new AssertionError(e);
-        }
-      });
-    }).show();
+  @Override
+  public void onMessageResentAfterSafetyNumberChange() {
+    initializeIdentityRecords().addListener(new AssertedSuccessListener<Boolean>() {
+      @Override
+      public void onSuccess(Boolean result) { }
+    });
   }
 
   private void handleSecurityChange(boolean isSecureText, boolean isDefaultSms) {
@@ -1394,11 +1361,13 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private ListenableFuture<Boolean> initializeDraft() {
     final SettableFuture<Boolean> result = new SettableFuture<>();
 
-    final String         draftText      = getIntent().getStringExtra(TEXT_EXTRA);
-    final Uri            draftMedia     = getIntent().getData();
-    final MediaType      draftMediaType = MediaType.from(getIntent().getType());
-    final List<Media>    mediaList      = getIntent().getParcelableArrayListExtra(MEDIA_EXTRA);
-    final StickerLocator stickerLocator = getIntent().getParcelableExtra(STICKER_EXTRA);
+    final String         draftText        = getIntent().getStringExtra(TEXT_EXTRA);
+    final Uri            draftMedia       = getIntent().getData();
+    final String         draftContentType = getIntent().getType();
+    final MediaType      draftMediaType   = MediaType.from(draftContentType);
+    final List<Media>    mediaList        = getIntent().getParcelableArrayListExtra(MEDIA_EXTRA);
+    final StickerLocator stickerLocator   = getIntent().getParcelableExtra(STICKER_EXTRA);
+    final boolean        borderless       = getIntent().getBooleanExtra(BORDERLESS_EXTRA, false);
 
     if (stickerLocator != null && draftMedia != null) {
       Log.d(TAG, "Handling shared sticker.");
@@ -1406,6 +1375,13 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       return new SettableFuture<>(false);
     }
 
+    if (draftMedia != null && draftContentType != null && borderless) {
+      SimpleTask.run(getLifecycle(),
+                     () -> getKeyboardImageDetails(draftMedia),
+                     details -> sendKeyboardImage(draftMedia, draftContentType, details));
+      return new SettableFuture<>(false);
+    }
+
     if (!Util.isEmpty(mediaList)) {
       Log.d(TAG, "Handling shared Media.");
       Intent sendIntent = MediaSendActivity.buildEditorIntent(this, mediaList, recipient.get(), draftText, sendButton.getSelectedTransport());
@@ -1436,7 +1412,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
   private void initializeEnabledCheck() {
     groupViewModel.getGroupActiveState().observe(this, state -> {
-      boolean enabled = state == null || !(isPushGroupConversation() && !state.isActiveGroup());
+      boolean inactivePushGroup = state != null && isPushGroupConversation() && !state.isActiveGroup();
+      boolean enabled = !inactivePushGroup;
+      noLongerMemberBanner.setVisibility(enabled ? View.GONE : View.VISIBLE);
+      inputPanel.setVisibility(enabled ? View.VISIBLE : View.GONE);
       inputPanel.setEnabled(enabled);
       sendButton.setEnabled(enabled);
       attachButton.setEnabled(enabled);
@@ -1669,7 +1648,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       @Override
       protected void onPostExecute(@NonNull Pair<IdentityRecordList, String> result) {
         Log.i(TAG, "Got identity records: " + result.first().isUnverified());
-        identityRecords.replaceWith(result.first());
+        identityRecords = result.first();
 
         if (result.second() != null) {
           Log.d(TAG, "Replacing banner...");
@@ -1718,6 +1697,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     ImageButton quickCameraToggle      = ViewUtil.findById(this, R.id.quick_camera_toggle);
     ImageButton inlineAttachmentButton = ViewUtil.findById(this, R.id.inline_attachment_button);
 
+    noLongerMemberBanner = findViewById(R.id.conversation_no_longer_member_banner);
+
     container.addOnKeyboardShownListener(this);
     inputPanel.setListener(this);
     inputPanel.setMediaListener(this);
@@ -1965,7 +1946,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     titleView.setVerified(identityRecords.isVerified());
     setBlockedUserState(recipient, isSecureText, isDefaultSms);
     setActionBarColor(recipient.getColor());
-    setGroupShareProfileReminder(recipient);
     updateReminders();
     updateDefaultSubscriptionId(recipient.getDefaultSubscriptionId());
     initializeSecurity(isSecureText, isDefaultSms);
@@ -2015,10 +1995,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   //////// Helper Methods
 
   private ListenableFuture<Boolean> setMedia(@Nullable Uri uri, @NonNull MediaType mediaType) {
-    return setMedia(uri, mediaType, 0, 0);
+    return setMedia(uri, mediaType, 0, 0, false);
   }
 
-  private ListenableFuture<Boolean> setMedia(@Nullable Uri uri, @NonNull MediaType mediaType, int width, int height) {
+  private ListenableFuture<Boolean> setMedia(@Nullable Uri uri, @NonNull MediaType mediaType, int width, int height, boolean borderless) {
     if (uri == null) {
       return new SettableFuture<>(false);
     }
@@ -2027,7 +2007,12 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       openContactShareEditor(uri);
       return new SettableFuture<>(false);
     } else if (MediaType.IMAGE.equals(mediaType) || MediaType.GIF.equals(mediaType) || MediaType.VIDEO.equals(mediaType)) {
-      Media media = new Media(uri, MediaUtil.getMimeType(this, uri), 0, width, height, 0, 0, Optional.absent(), Optional.absent(), Optional.absent());
+      String mimeType = MediaUtil.getMimeType(this, uri);
+      if (mimeType == null) {
+        mimeType = mediaType.toFallbackMimeType();
+      }
+
+      Media media = new Media(uri, mimeType, 0, width, height, 0, 0, borderless, Optional.absent(), Optional.absent(), Optional.absent());
       startActivityForResult(MediaSendActivity.buildEditorIntent(ConversationActivity.this, Collections.singletonList(media), recipient.get(), composeText.getTextTrimmed(), sendButton.getSelectedTransport()), MEDIA_SENDER);
       return new SettableFuture<>(false);
     } else {
@@ -2147,12 +2132,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void setBlockedUserState(Recipient recipient, boolean isSecureText, boolean isDefaultSms) {
-    if (recipient.isBlocked() && !FeatureFlags.messageRequests()) {
-      unblockButton.setVisibility(View.VISIBLE);
-      inputPanel.setVisibility(View.GONE);
-      makeDefaultSmsButton.setVisibility(View.GONE);
-      registerButton.setVisibility(View.GONE);
-    } else if (!isSecureText && isPushGroupConversation()) {
+    if (!isSecureText && isPushGroupConversation()) {
       unblockButton.setVisibility(View.GONE);
       inputPanel.setVisibility(View.GONE);
       makeDefaultSmsButton.setVisibility(View.GONE);
@@ -2163,26 +2143,14 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
       makeDefaultSmsButton.setVisibility(View.VISIBLE);
       registerButton.setVisibility(View.GONE);
     } else {
-      inputPanel.setVisibility(View.VISIBLE);
+      boolean inactivePushGroup = isPushGroupConversation() && !recipient.isActiveGroup();
+      inputPanel.setVisibility(inactivePushGroup ? View.GONE : View.VISIBLE);
       unblockButton.setVisibility(View.GONE);
       makeDefaultSmsButton.setVisibility(View.GONE);
       registerButton.setVisibility(View.GONE);
     }
   }
 
-  private void setGroupShareProfileReminder(@NonNull Recipient recipient) {
-    if (FeatureFlags.messageRequests()) {
-      return;
-    }
-
-    if (recipient.isPushGroup() && !recipient.isProfileSharing()) {
-      groupShareProfileView.get().setRecipient(recipient);
-      groupShareProfileView.get().setVisibility(View.VISIBLE);
-    } else if (groupShareProfileView.resolved()) {
-      groupShareProfileView.get().setVisibility(View.GONE);
-    }
-  }
-
   private void calculateCharactersRemaining() {
     String          messageBody     = composeText.getTextTrimmed();
     TransportOption transportOption = sendButton.getSelectedTransport();
@@ -2359,10 +2327,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
       if ((recipient.isMmsGroup() || recipient.getEmail().isPresent()) && !isMmsEnabled) {
         handleManualMmsRequired();
-      } else if (!forceSms && identityRecords.isUnverified()) {
-        handleUnverifiedRecipients();
-      } else if (!forceSms && identityRecords.isUntrusted()) {
-        handleUntrustedRecipients();
+      } else if (!forceSms && (identityRecords.isUnverified() || identityRecords.isUntrusted())) {
+        handleRecentSafetyNumberChange();
       } else if (isMediaMessage) {
         sendMediaMessage(forceSms, expiresIn, false, subscriptionId, initiating);
       } else {
@@ -2396,10 +2362,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     long id = fragment.stageOutgoingMessage(message);
 
     SimpleTask.run(() -> {
-      if (!FeatureFlags.messageRequests() && initiating) {
-        DatabaseFactory.getRecipientDatabase(this).setProfileSharing(recipient.getId(), true);
-      }
-
       long resultId = MessageSender.sendPushWithPreUploadedMedia(this, secureMessage, result.getPreUploadResults(), threadId, () -> fragment.releaseOutgoingMessage(id));
 
       int deleted = DatabaseFactory.getAttachmentDatabase(this).deleteAbandonedPreuploadedAttachments();
@@ -2417,7 +2379,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   private ListenableFuture<Void> sendMediaMessage(final boolean forceSms,
-                                                  String body,
+                                                  @NonNull String body,
                                                   SlideDeck slideDeck,
                                                   QuoteModel quote,
                                                   List<Contact> contacts,
@@ -2470,10 +2432,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
                  final long id = fragment.stageOutgoingMessage(outgoingMessage);
 
                  SimpleTask.run(() -> {
-                   if (!FeatureFlags.messageRequests() && initiating) {
-                     DatabaseFactory.getRecipientDatabase(this).setProfileSharing(recipient.getId(), true);
-                   }
-
                    return MessageSender.send(context, outgoingMessage, threadId, forceSms, () -> fragment.releaseOutgoingMessage(id));
                  }, result -> {
                    sendComplete(result);
@@ -2517,10 +2475,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
                  new AsyncTask<OutgoingTextMessage, Void, Long>() {
                    @Override
                    protected Long doInBackground(OutgoingTextMessage... messages) {
-                     if (!FeatureFlags.messageRequests() && initiating) {
-                       DatabaseFactory.getRecipientDatabase(context).setProfileSharing(recipient.getId(), true);
-                     }
-
                      return MessageSender.send(context, messages[0], threadId, forceSms, () -> fragment.releaseOutgoingMessage(id));
                    }
 
@@ -2713,10 +2667,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
   @Override
   public void onMediaSelected(@NonNull Uri uri, String contentType) {
-    if (!TextUtils.isEmpty(contentType) && contentType.trim().equals("image/gif")) {
-      setMedia(uri, MediaType.GIF);
-    } else if (MediaUtil.isImageType(contentType)) {
-      setMedia(uri, MediaType.IMAGE);
+    if (MediaUtil.isGif(contentType) || MediaUtil.isImageType(contentType)) {
+      SimpleTask.run(getLifecycle(),
+                     () -> getKeyboardImageDetails(uri),
+                     details -> sendKeyboardImage(uri, contentType, details));
     } else if (MediaUtil.isVideoType(contentType)) {
       setMedia(uri, MediaType.VIDEO);
     } else if (MediaUtil.isAudioType(contentType)) {
@@ -2751,7 +2705,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
   private void sendSticker(@NonNull StickerLocator stickerLocator, @NonNull Uri uri, long size, boolean clearCompose) {
     if (sendButton.getSelectedTransport().isSms()) {
-      Media  media  = new Media(uri, MediaUtil.IMAGE_WEBP, System.currentTimeMillis(), StickerSlide.WIDTH, StickerSlide.HEIGHT, size, 0, Optional.absent(), Optional.absent(), Optional.absent());
+      Media  media  = new Media(uri, MediaUtil.IMAGE_WEBP, System.currentTimeMillis(), StickerSlide.WIDTH, StickerSlide.HEIGHT, size, 0, false, Optional.absent(), Optional.absent(), Optional.absent());
       Intent intent = MediaSendActivity.buildEditorIntent(this, Collections.singletonList(media), recipient.get(), composeText.getTextTrimmed(), sendButton.getSelectedTransport());
       startActivityForResult(intent, MEDIA_SENDER);
       return;
@@ -2889,25 +2843,44 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
   @Override
   public void onMessageRequest(@NonNull MessageRequestViewModel viewModel) {
-    messageRequestBottomView.setAcceptOnClickListener(v -> viewModel.onAccept(this::showGroupChangeErrorToast));
+    messageRequestBottomView.setAcceptOnClickListener(v -> viewModel.onAccept());
     messageRequestBottomView.setDeleteOnClickListener(v -> onMessageRequestDeleteClicked(viewModel));
     messageRequestBottomView.setBlockOnClickListener(v -> onMessageRequestBlockClicked(viewModel));
     messageRequestBottomView.setUnblockOnClickListener(v -> onMessageRequestUnblockClicked(viewModel));
 
     viewModel.getRecipient().observe(this, this::presentMessageRequestBottomViewTo);
     viewModel.getMessageRequestDisplayState().observe(this, this::presentMessageRequestDisplayState);
+    viewModel.getFailures().observe(this, this::showGroupChangeErrorToast);
     viewModel.getMessageRequestStatus().observe(this, status -> {
       switch (status) {
+        case IDLE:
+          hideMessageRequestBusy();
+          break;
+        case ACCEPTING:
+        case BLOCKING:
+        case DELETING:
+          showMessageRequestBusy();
+          break;
         case ACCEPTED:
+          hideMessageRequestBusy();
           messageRequestBottomView.setVisibility(View.GONE);
-          return;
+          break;
         case DELETED:
         case BLOCKED:
+          hideMessageRequestBusy();
           finish();
       }
     });
   }
 
+  private void showMessageRequestBusy() {
+    messageRequestBottomView.showBusy();
+  }
+
+  private void hideMessageRequestBusy() {
+    messageRequestBottomView.hideBusy();
+  }
+
   private void showGroupChangeErrorToast(@NonNull GroupChangeFailureReason e) {
     Toast.makeText(this, GroupErrors.getUserDisplayMessage(e), Toast.LENGTH_LONG).show();
   }
@@ -2928,6 +2901,21 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     reactionOverlay.setListVerticalTranslation(translationY);
   }
 
+  @Override
+  public void onMessageWithErrorClicked(@NonNull MessageRecord messageRecord) {
+    if (messageRecord.hasFailedWithNetworkFailures()) {
+      new AlertDialog.Builder(this)
+                     .setMessage(R.string.conversation_activity__message_could_not_be_sent)
+                     .setNegativeButton(android.R.string.cancel, null)
+                     .setPositiveButton(R.string.conversation_activity__send, (dialog, which) -> MessageSender.resend(this, messageRecord))
+                     .show();
+    } else if (messageRecord.isIdentityMismatchFailure()) {
+      SafetyNumberChangeDialog.create(this, messageRecord).show(getSupportFragmentManager(), SAFETY_NUMBER_DIALOG);
+    } else {
+      startActivity(MessageDetailsActivity.getIntentForMessageDetails(this, messageRecord, messageRecord.getRecipient().getId(), messageRecord.getThreadId()));
+    }
+  }
+
   @Override
   public void onCursorChanged() {
     if (!reactionOverlay.isShowing()) {
@@ -3113,6 +3101,55 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     }
   }
 
+  @WorkerThread
+  private @Nullable KeyboardImageDetails getKeyboardImageDetails(@NonNull Uri uri) {
+    try {
+      Bitmap bitmap = glideRequests.asBitmap()
+                                   .load(new DecryptableStreamUriLoader.DecryptableUri(uri))
+                                   .skipMemoryCache(true)
+                                   .diskCacheStrategy(DiskCacheStrategy.NONE)
+                                   .submit()
+                                   .get(1000, TimeUnit.MILLISECONDS);
+      int topLeft = bitmap.getPixel(0, 0);
+      return new KeyboardImageDetails(bitmap.getWidth(), bitmap.getHeight(), Color.alpha(topLeft) < 255);
+    } catch (InterruptedException | ExecutionException | TimeoutException e) {
+      return null;
+    }
+  }
+
+  private void sendKeyboardImage(@NonNull Uri uri, @NonNull String contentType, @Nullable KeyboardImageDetails details) {
+    if (details == null || !details.hasTransparency) {
+      setMedia(uri, Objects.requireNonNull(MediaType.from(contentType)));
+      return;
+    }
+
+    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)) {
+      slideDeck.addSlide(new GifSlide(this, uri, 0, details.width, details.height, details.hasTransparency, null));
+    } else if (MediaUtil.isImageType(contentType)) {
+      slideDeck.addSlide(new ImageSlide(this, uri, contentType, 0, details.width, details.height, details.hasTransparency, null, null));
+    } else {
+      throw new AssertionError("Only images are supported!");
+    }
+
+    sendMediaMessage(isSmsForced(),
+                     "",
+                     slideDeck,
+                     quote,
+                     Collections.emptyList(),
+                     Collections.emptyList(),
+                     expiresIn,
+                     false,
+                     subscriptionId,
+                     initiating,
+                     true);
+  }
+
   private class UnverifiedDismissedListener implements UnverifiedBannerView.DismissListener {
     @Override
     public void onDismissed(final List<IdentityRecord> unverifiedIdentities) {
@@ -3150,7 +3187,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
         String[] unverifiedNames = new String[unverifiedIdentities.size()];
 
         for (int i=0;i<unverifiedIdentities.size();i++) {
-          unverifiedNames[i] = Recipient.resolved(unverifiedIdentities.get(i).getRecipientId()).toShortString(ConversationActivity.this);
+          unverifiedNames[i] = Recipient.resolved(unverifiedIdentities.get(i).getRecipientId()).getDisplayName(ConversationActivity.this);
         }
 
         AlertDialog.Builder builder = new AlertDialog.Builder(ConversationActivity.this);
@@ -3202,4 +3239,16 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
     messageRequestBottomView.setRecipient(recipient);
   }
+
+  private static class KeyboardImageDetails {
+    private final int     width;
+    private final int     height;
+    private final boolean hasTransparency;
+
+    private KeyboardImageDetails(int width, int height, boolean hasTransparency) {
+      this.width           = width;
+      this.height          = height;
+      this.hasTransparency = hasTransparency;
+    }
+  }
 }

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

@@ -479,7 +479,7 @@ public class ConversationAdapter<V extends View & BindableConversationItem>
     return headerView != null;
   }
 
-  private boolean hasFooter() {
+  public boolean hasFooter() {
     return footerView != null;
   }
 
@@ -510,6 +510,10 @@ public class ConversationAdapter<V extends View & BindableConversationItem>
     }
   }
 
+  public @Nullable MessageRecord getLastVisibleMessageRecord(int position) {
+    return getItem(position - ((hasFooter() && position == getItemCount() - 1) ? 1 : 0));
+  }
+
   static class ConversationViewHolder extends RecyclerView.ViewHolder {
     public <V extends View & BindableConversationItem> ConversationViewHolder(final @NonNull V itemView) {
       super(itemView);

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

@@ -7,26 +7,32 @@ final class ConversationData {
   private final long    threadId;
   private final long    lastSeen;
   private final int     lastSeenPosition;
+  private final int     lastScrolledPosition;
   private final boolean hasSent;
   private final boolean isMessageRequestAccepted;
   private final boolean hasPreMessageRequestMessages;
   private final int     jumpToPosition;
+  private final int     threadSize;
 
   ConversationData(long threadId,
                    long lastSeen,
                    int lastSeenPosition,
+                   int lastScrolledPosition,
                    boolean hasSent,
                    boolean isMessageRequestAccepted,
                    boolean hasPreMessageRequestMessages,
-                   int jumpToPosition)
+                   int jumpToPosition,
+                   int threadSize)
   {
-     this.threadId                     = threadId;
-     this.lastSeen                     = lastSeen;
-     this.lastSeenPosition             = lastSeenPosition;
-     this.hasSent                      = hasSent;
-     this.isMessageRequestAccepted     = isMessageRequestAccepted;
-     this.hasPreMessageRequestMessages = hasPreMessageRequestMessages;
-     this.jumpToPosition               = jumpToPosition;
+    this.threadId                     = threadId;
+    this.lastSeen                     = lastSeen;
+    this.lastSeenPosition             = lastSeenPosition;
+    this.lastScrolledPosition         = lastScrolledPosition;
+    this.hasSent                      = hasSent;
+    this.isMessageRequestAccepted     = isMessageRequestAccepted;
+    this.hasPreMessageRequestMessages = hasPreMessageRequestMessages;
+    this.jumpToPosition               = jumpToPosition;
+    this.threadSize                   = threadSize;
   }
 
   public long getThreadId() {
@@ -41,6 +47,10 @@ final class ConversationData {
     return lastSeenPosition;
   }
 
+  int getLastScrolledPosition() {
+    return lastScrolledPosition;
+  }
+
   boolean hasSent() {
     return hasSent;
   }
@@ -57,7 +67,15 @@ final class ConversationData {
     return jumpToPosition >= 0;
   }
 
+  boolean shouldScrollToLastSeen() {
+    return lastSeenPosition > 0;
+  }
+
   int getJumpToPosition() {
     return jumpToPosition;
   }
+
+  int getThreadSize() {
+    return threadSize;
+  }
 }

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

@@ -14,6 +14,8 @@ import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
+import org.thoughtcrime.securesms.util.paging.Invalidator;
+import org.thoughtcrime.securesms.util.paging.SizeFixResult;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,16 +32,13 @@ class ConversationDataSource extends PositionalDataSource<MessageRecord> {
 
   private final Context             context;
   private final long                threadId;
-  private final DataUpdatedCallback dataUpdateCallback;
 
   private ConversationDataSource(@NonNull Context context,
                                  long threadId,
-                                 @NonNull Invalidator invalidator,
-                                 @NonNull DataUpdatedCallback dataUpdateCallback)
+                                 @NonNull Invalidator invalidator)
   {
     this.context            = context;
     this.threadId           = threadId;
-    this.dataUpdateCallback = dataUpdateCallback;
 
     ContentObserver contentObserver = new ContentObserver(null) {
       @Override
@@ -66,10 +65,6 @@ class ConversationDataSource extends PositionalDataSource<MessageRecord> {
     int                 totalCount     = db.getConversationCount(threadId);
     int                 effectiveCount = params.requestedStartPosition;
 
-    if  (totalCount == 0 || params.requestedStartPosition > totalCount) {
-
-    }
-
     try (MmsSmsDatabase.Reader reader = db.readerFor(db.getConversation(threadId, params.requestedStartPosition, params.requestedLoadSize))) {
       MessageRecord record;
       while ((record = reader.getNext()) != null && effectiveCount < totalCount && !isInvalid()) {
@@ -79,13 +74,12 @@ class ConversationDataSource extends PositionalDataSource<MessageRecord> {
     }
 
     if (!isInvalid()) {
-      SizeFixResult result = ensureMultipleOfPageSize(records, params.requestedStartPosition, params.pageSize, totalCount);
+      SizeFixResult<MessageRecord> result = SizeFixResult.ensureMultipleOfPageSize(records, params.requestedStartPosition, params.pageSize, totalCount);
 
-      callback.onResult(result.messages, params.requestedStartPosition, result.total);
-      Util.runOnMain(dataUpdateCallback::onDataUpdated);
+      callback.onResult(result.getItems(), params.requestedStartPosition, result.getTotal());
     }
 
-    Log.d(TAG, "[Initial Load] " + (System.currentTimeMillis() - start) + " ms" + (isInvalid() ? " -- invalidated" : ""));
+    Log.d(TAG, "[Initial Load] " + (System.currentTimeMillis() - start) + " ms | thread: " + threadId + ", start: " + params.requestedStartPosition + ", size: " + params.requestedLoadSize + (isInvalid() ? " -- invalidated" : ""));
   }
 
   @Override
@@ -104,59 +98,7 @@ class ConversationDataSource extends PositionalDataSource<MessageRecord> {
 
     callback.onResult(records);
 
-    if (!isInvalid()) {
-      Util.runOnMain(dataUpdateCallback::onDataUpdated);
-    }
-
-    Log.d(TAG, "[Update] " + (System.currentTimeMillis() - start) + " ms" + (isInvalid() ? " -- invalidated" : ""));
-  }
-
-  private static @NonNull SizeFixResult ensureMultipleOfPageSize(@NonNull List<MessageRecord> records,
-                                                                 int startPosition,
-                                                                 int pageSize,
-                                                                 int total)
-  {
-    if (records.size() + startPosition == total || (records.size() != 0 && records.size() % pageSize == 0)) {
-      return new SizeFixResult(records, total);
-    }
-
-    if (records.size() < pageSize) {
-      Log.w(TAG, "Hit a miscalculation where we don't have the full dataset, but it's smaller than a page size. records: " + records.size() + ", startPosition: " + startPosition + ", pageSize: " + pageSize + ", total: " + total);
-      return new SizeFixResult(records, records.size() + startPosition);
-    }
-
-    Log.w(TAG, "Hit a miscalculation where our data size isn't a multiple of the page size. records: " + records.size() + ", startPosition: " + startPosition + ", pageSize: " + pageSize + ", total: " + total);
-    int overflow = records.size() % pageSize;
-
-    return new SizeFixResult(records.subList(0, records.size() - overflow), total);
-  }
-
-  private static class SizeFixResult {
-    final List<MessageRecord> messages;
-    final int                 total;
-
-    private SizeFixResult(@NonNull List<MessageRecord> messages, int total) {
-      this.messages = messages;
-      this.total    = total;
-    }
-  }
-
-  interface DataUpdatedCallback {
-    void onDataUpdated();
-  }
-
-  static class Invalidator {
-    private Runnable callback;
-
-    synchronized void invalidate() {
-      if (callback != null) {
-        callback.run();
-      }
-    }
-
-    private synchronized void observe(@NonNull Runnable callback) {
-      this.callback = callback;
-    }
+    Log.d(TAG, "[Update] " + (System.currentTimeMillis() - start) + " ms | thread: " + threadId + ", start: " + params.startPosition + ", size: " + params.loadSize + (isInvalid() ? " -- invalidated" : ""));
   }
 
   static class Factory extends DataSource.Factory<Integer, MessageRecord> {
@@ -164,18 +106,16 @@ class ConversationDataSource extends PositionalDataSource<MessageRecord> {
     private final Context             context;
     private final long                threadId;
     private final Invalidator         invalidator;
-    private final DataUpdatedCallback callback;
 
-    Factory(Context context, long threadId, @NonNull Invalidator invalidator, @NonNull DataUpdatedCallback callback) {
+    Factory(Context context, long threadId, @NonNull Invalidator invalidator) {
       this.context     = context;
       this.threadId    = threadId;
       this.invalidator = invalidator;
-      this.callback    = callback;
     }
 
     @Override
     public @NonNull DataSource<Integer, MessageRecord> create() {
-      return new ConversationDataSource(context, threadId, invalidator, callback);
+      return new ConversationDataSource(context, threadId, invalidator);
     }
   }
 }

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

@@ -21,7 +21,6 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.graphics.Rect;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
@@ -51,7 +50,6 @@ import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.ActivityCompat;
 import androidx.core.app.ActivityOptionsCompat;
 import androidx.core.text.HtmlCompat;
-import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProviders;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -61,8 +59,8 @@ import com.annimon.stream.Stream;
 import com.google.android.collect.Sets;
 
 import org.thoughtcrime.securesms.ApplicationContext;
-import org.thoughtcrime.securesms.MessageDetailsActivity;
-import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity;
+import org.thoughtcrime.securesms.LoggingFragment;
+import org.thoughtcrime.securesms.PassphraseRequiredActivity;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.components.ConversationTypingView;
@@ -75,7 +73,6 @@ import org.thoughtcrime.securesms.conversation.ConversationAdapter.ItemClickList
 import org.thoughtcrime.securesms.conversation.ConversationAdapter.StickyHeaderViewHolder;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MessagingDatabase;
-import org.thoughtcrime.securesms.database.MmsSmsDatabase;
 import org.thoughtcrime.securesms.database.RecipientDatabase;
 import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
@@ -84,10 +81,12 @@ import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.jobs.DirectoryRefreshJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceViewOnceOpenJob;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.linkpreview.LinkPreview;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.longmessage.LongMessageActivity;
 import org.thoughtcrime.securesms.mediasend.Media;
+import org.thoughtcrime.securesms.messagedetails.MessageDetailsActivity;
 import org.thoughtcrime.securesms.messagerequests.MessageRequestViewModel;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.OutgoingMediaMessage;
@@ -113,6 +112,7 @@ import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.HtmlUtil;
 import org.thoughtcrime.securesms.util.RemoteDeleteUtil;
 import org.thoughtcrime.securesms.util.SaveAttachmentTask;
+import org.thoughtcrime.securesms.util.SnapToTopDataObserver;
 import org.thoughtcrime.securesms.util.StickyHeaderDecoration;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
@@ -134,7 +134,7 @@ import java.util.Locale;
 import java.util.Set;
 
 @SuppressLint("StaticFieldLeak")
-public class ConversationFragment extends Fragment {
+public class ConversationFragment extends LoggingFragment {
   private static final String TAG = ConversationFragment.class.getSimpleName();
 
   private static final int SCROLL_ANIMATION_THRESHOLD = 50;
@@ -163,13 +163,14 @@ public class ConversationFragment extends Fragment {
   private ConversationBannerView      emptyConversationBanner;
   private MessageRequestViewModel     messageRequestViewModel;
   private ConversationViewModel       conversationViewModel;
-
-  private Deferred deferred = new Deferred();
+  private SnapToTopDataObserver       snapToTopDataObserver;
 
   public static void prepare(@NonNull Context context) {
     FrameLayout parent = new FrameLayout(context);
     parent.setLayoutParams(new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT));
 
+    CachedInflater.from(context).cacheUntilLimit(R.layout.conversation_item_received_text_only, parent, 15);
+    CachedInflater.from(context).cacheUntilLimit(R.layout.conversation_item_sent_text_only, parent, 15);
     CachedInflater.from(context).cacheUntilLimit(R.layout.conversation_item_received_multimedia, parent, 10);
     CachedInflater.from(context).cacheUntilLimit(R.layout.conversation_item_sent_multimedia, parent, 10);
     CachedInflater.from(context).cacheUntilLimit(R.layout.conversation_item_update, parent, 5);
@@ -179,7 +180,7 @@ public class ConversationFragment extends Fragment {
   @Override
   public void onCreate(Bundle icicle) {
     super.onCreate(icicle);
-    this.locale = (Locale) getArguments().getSerializable(PassphraseRequiredActionBarActivity.LOCALE_EXTRA);
+    this.locale = (Locale) getArguments().getSerializable(PassphraseRequiredActivity.LOCALE_EXTRA);
   }
 
   @Override
@@ -198,12 +199,11 @@ public class ConversationFragment extends Fragment {
     list.setLayoutManager(layoutManager);
     list.setItemAnimator(null);
 
-    if (FeatureFlags.messageRequests()) {
-      conversationBanner = (ConversationBannerView) inflater.inflate(R.layout.conversation_item_banner, container, false);
-    }
+    snapToTopDataObserver = new ConversationSnapToTopDataObserver(list, new ConversationScrollRequestValidator());
+    conversationBanner    = (ConversationBannerView) inflater.inflate(R.layout.conversation_item_banner, container, false);
+    topLoadMoreView       = (ViewSwitcher) inflater.inflate(R.layout.load_more_header, container, false);
+    bottomLoadMoreView    = (ViewSwitcher) inflater.inflate(R.layout.load_more_header, container, false);
 
-    topLoadMoreView    = (ViewSwitcher) inflater.inflate(R.layout.load_more_header, container, false);
-    bottomLoadMoreView = (ViewSwitcher) inflater.inflate(R.layout.load_more_header, container, false);
     initializeLoadMoreView(topLoadMoreView);
     initializeLoadMoreView(bottomLoadMoreView);
 
@@ -226,16 +226,12 @@ public class ConversationFragment extends Fragment {
         Log.i(TAG, "submitList skipped an invalid list");
       }
     });
-    conversationViewModel.getConversationMetadata().observe(this, data -> deferred.defer(() -> presentConversationMetadata(data)));
+    conversationViewModel.getConversationMetadata().observe(this, this::presentConversationMetadata);
 
     return view;
   }
 
   private void setupListLayoutListeners() {
-    if (!FeatureFlags.messageRequests()) {
-      return;
-    }
-
     list.addOnLayoutChangeListener((v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> setListVerticalTranslation());
 
     list.addOnChildAttachStateChangeListener(new RecyclerView.OnChildAttachStateChangeListener() {
@@ -284,6 +280,23 @@ public class ConversationFragment extends Fragment {
     initializeTypingObserver();
   }
 
+  @Override
+  public void onPause() {
+    super.onPause();
+    int lastVisiblePosition  = getListLayoutManager().findLastVisibleItemPosition();
+    int firstVisiblePosition = getListLayoutManager().findFirstCompletelyVisibleItemPosition();
+
+    final long lastVisibleMessageTimestamp;
+    if (firstVisiblePosition > 0 && lastVisiblePosition != RecyclerView.NO_POSITION) {
+      MessageRecord message = getListAdapter().getLastVisibleMessageRecord(lastVisiblePosition);
+
+      lastVisibleMessageTimestamp = message != null ? message.getDateReceived() : 0;
+    } else {
+      lastVisibleMessageTimestamp = 0;
+    }
+    SignalExecutors.BOUNDED.submit(() -> DatabaseFactory.getThreadDatabase(requireContext()).setLastScrolled(threadId, lastVisibleMessageTimestamp));
+  }
+
   @Override
   public void onStop() {
     super.onStop();
@@ -312,7 +325,7 @@ public class ConversationFragment extends Fragment {
     }
 
     int position = getListAdapter().getAdapterPositionForMessagePosition(conversationViewModel.getLastSeenPosition());
-    scrollToLastSeenPosition(position);
+    snapToTopDataObserver.requestScrollPosition(position);
   }
 
   private void initializeMessageRequestViewModel() {
@@ -406,7 +419,6 @@ public class ConversationFragment extends Fragment {
     this.threadId          = this.getActivity().getIntent().getLongExtra(ConversationActivity.THREAD_ID_EXTRA, -1);
     this.unknownSenderView = new UnknownSenderView(getActivity(), recipient.get(), threadId, () -> clearHeaderIfNotTyping(getListAdapter()));
 
-    deferred.setDeferred(true);
     conversationViewModel.onConversationDataAvailable(threadId, startingPosition);
 
     OnScrollListener scrollListener = new ConversationScrollListener(getActivity());
@@ -425,12 +437,12 @@ public class ConversationFragment extends Fragment {
       list.addItemDecoration(new StickyHeaderDecoration(adapter, false, false));
       ConversationAdapter.initializePool(list.getRecycledViewPool());
 
-      adapter.registerAdapterDataObserver(new DataObserver());
+      adapter.registerAdapterDataObserver(snapToTopDataObserver);
 
       setLastSeen(conversationViewModel.getLastSeen());
 
       emptyConversationBanner.setVisibility(View.GONE);
-    } else if (FeatureFlags.messageRequests() && threadId == -1) {
+    } else if (threadId == -1) {
       emptyConversationBanner.setVisibility(View.VISIBLE);
     }
   }
@@ -546,7 +558,7 @@ public class ConversationFragment extends Fragment {
       this.threadId = threadId;
       messageRequestViewModel.setConversationInfo(recipient.getId(), threadId);
 
-      deferred.setDeferred(true);
+      snapToTopDataObserver.requestScrollPosition(0);
       conversationViewModel.onConversationDataAvailable(threadId, -1);
       initializeListAdapter();
     }
@@ -683,28 +695,38 @@ public class ConversationFragment extends Fragment {
     });
 
     if (RemoteDeleteUtil.isValidSend(messageRecords, System.currentTimeMillis())) {
-      builder.setNeutralButton(R.string.ConversationFragment_delete_for_everyone, (dialog, which) -> {
-        SignalExecutors.BOUNDED.execute(() -> {
-          for (MessageRecord message : messageRecords) {
-            MessageSender.sendRemoteDelete(context, message.getId(), message.isMms());
-          }
-        });
-      });
+      builder.setNeutralButton(R.string.ConversationFragment_delete_for_everyone, (dialog, which) -> handleDeleteForEveryone(messageRecords));
     }
 
     builder.setNegativeButton(android.R.string.cancel, null);
     return builder;
   }
 
+  private void handleDeleteForEveryone(Set<MessageRecord> messageRecords) {
+    Runnable deleteForEveryone = () -> {
+      SignalExecutors.BOUNDED.execute(() -> {
+        for (MessageRecord message : messageRecords) {
+          MessageSender.sendRemoteDelete(ApplicationDependencies.getApplication(), message.getId(), message.isMms());
+        }
+      });
+    };
+
+    if (SignalStore.uiHints().hasConfirmedDeleteForEveryoneOnce()) {
+      deleteForEveryone.run();
+    } else {
+      new AlertDialog.Builder(requireActivity())
+                     .setMessage(R.string.ConversationFragment_this_message_will_be_permanently_deleted_for_everyone)
+                     .setPositiveButton(R.string.ConversationFragment_delete_for_everyone, (dialog, which) -> {
+                       SignalStore.uiHints().markHasConfirmedDeleteForEveryoneOnce();
+                       deleteForEveryone.run();
+                     })
+                     .setNegativeButton(android.R.string.cancel, null)
+                     .show();
+    }
+  }
 
   private void handleDisplayDetails(MessageRecord message) {
-    Intent intent = new Intent(getActivity(), MessageDetailsActivity.class);
-    intent.putExtra(MessageDetailsActivity.MESSAGE_ID_EXTRA, message.getId());
-    intent.putExtra(MessageDetailsActivity.THREAD_ID_EXTRA, threadId);
-    intent.putExtra(MessageDetailsActivity.TYPE_EXTRA, message.isMms() ? MmsSmsDatabase.MMS_TRANSPORT : MmsSmsDatabase.SMS_TRANSPORT);
-    intent.putExtra(MessageDetailsActivity.RECIPIENT_EXTRA, recipient.getId());
-    intent.putExtra(MessageDetailsActivity.IS_PUSH_GROUP_EXTRA, recipient.get().isGroup() && message.isPush());
-    startActivity(intent);
+    startActivity(MessageDetailsActivity.getIntentForMessageDetails(requireContext(), message, recipient.getId(), threadId));
   }
 
   private void handleForwardMessage(MessageRecord message) {
@@ -744,6 +766,7 @@ public class ConversationFragment extends Fragment {
                                       attachment.getHeight(),
                                       attachment.getSize(),
                                       0,
+                                      attachment.isBorderless(),
                                       Optional.absent(),
                                       Optional.fromNullable(attachment.getCaption()),
                                       Optional.absent()));
@@ -757,6 +780,7 @@ public class ConversationFragment extends Fragment {
           Slide slide = mediaMessage.getSlideDeck().getSlides().get(0);
           composeIntent.putExtra(Intent.EXTRA_STREAM, slide.getUri());
           composeIntent.setType(slide.getContentType());
+          composeIntent.putExtra(ConversationActivity.BORDERLESS_EXTRA, slide.isBorderless());
 
           if (slide.hasSticker()) {
             composeIntent.putExtra(ConversationActivity.STICKER_EXTRA, slide.asAttachment().getSticker());
@@ -866,47 +890,49 @@ public class ConversationFragment extends Fragment {
       return;
     }
 
-    if (FeatureFlags.messageRequests()) {
-      adapter.setFooterView(conversationBanner);
-    } else {
-      adapter.setFooterView(null);
-    }
+    adapter.setFooterView(conversationBanner);
 
-    setLastSeen(conversation.getLastSeen());
-
-    if (FeatureFlags.messageRequests() && !conversation.hasPreMessageRequestMessages()) {
-      clearHeaderIfNotTyping(adapter);
-    } else {
-      if (!conversation.hasSent() && !recipient.get().isSystemContact() && !recipient.get().isGroup() && recipient.get().getRegistered() == RecipientDatabase.RegisteredState.REGISTERED) {
-        adapter.setHeaderView(unknownSenderView);
-      } else {
-        clearHeaderIfNotTyping(adapter);
+    Runnable afterScroll = () -> {
+      if (!conversation.isMessageRequestAccepted()) {
+        snapToTopDataObserver.requestScrollPosition(adapter.getItemCount() - 1);
       }
-    }
 
-    listener.onCursorChanged();
+      setLastSeen(conversation.getLastSeen());
 
-    int lastSeenPosition = adapter.getAdapterPositionForMessagePosition(conversation.getLastSeenPosition());
+      if (!conversation.hasPreMessageRequestMessages()) {
+        clearHeaderIfNotTyping(adapter);
+      } else {
+        if (!conversation.hasSent() && !recipient.get().isSystemContact() && !recipient.get().isGroup() && recipient.get().getRegistered() == RecipientDatabase.RegisteredState.REGISTERED) {
+          adapter.setHeaderView(unknownSenderView);
+        } else {
+          clearHeaderIfNotTyping(adapter);
+        }
+      }
 
-    if (conversation.shouldJumpToMessage()) {
-      scrollToStartingPosition(conversation.getJumpToPosition());
+      listener.onCursorChanged();
+    };
+
+    int lastSeenPosition     = adapter.getAdapterPositionForMessagePosition(conversation.getLastSeenPosition());
+    int lastScrolledPosition = adapter.getAdapterPositionForMessagePosition(conversation.getLastScrolledPosition());
+
+    if (conversation.getThreadSize() == 0) {
+      afterScroll.run();
+    } else if (conversation.shouldJumpToMessage()) {
+      snapToTopDataObserver.buildScrollPosition(conversation.getJumpToPosition())
+                           .withOnScrollRequestComplete(() -> {
+                             afterScroll.run();
+                             getListAdapter().pulseHighlightItem(conversation.getJumpToPosition());
+                           })
+                           .submit();
     } else if (conversation.isMessageRequestAccepted()) {
-      scrollToLastSeenPosition(lastSeenPosition);
-    } else if (FeatureFlags.messageRequests()) {
-      list.post(() -> getListLayoutManager().scrollToPosition(adapter.getItemCount() - 1));
-    }
-  }
-
-  private void scrollToStartingPosition(int startingPosition) {
-    list.post(() -> {
-      list.getLayoutManager().scrollToPosition(startingPosition);
-      getListAdapter().pulseHighlightItem(startingPosition);
-    });
-  }
-
-  private void scrollToLastSeenPosition(int lastSeenPosition) {
-    if (lastSeenPosition > 0) {
-      list.post(() -> getListLayoutManager().scrollToPositionWithOffset(lastSeenPosition, list.getHeight()));
+      snapToTopDataObserver.buildScrollPosition(conversation.shouldScrollToLastSeen() ? lastSeenPosition : lastScrolledPosition)
+                           .withOnPerformScroll((layoutManager, position) -> layoutManager.scrollToPositionWithOffset(position, list.getHeight()))
+                           .withOnScrollRequestComplete(afterScroll)
+                           .submit();
+    } else {
+      snapToTopDataObserver.buildScrollPosition(adapter.getItemCount() - 1)
+                           .withOnScrollRequestComplete(afterScroll)
+                           .submit();
     }
   }
 
@@ -941,24 +967,21 @@ public class ConversationFragment extends Fragment {
   }
 
   private void moveToMessagePosition(int position, @Nullable Runnable onMessageNotFound) {
-    if (position >= 0) {
-      list.scrollToPosition(position);
-
-      if (getListAdapter() == null || getListAdapter().getItem(position) == null) {
-        Log.i(TAG, "[moveToMessagePosition] Position " + position + " not currently populated. Scheduling a jump.");
-        conversationViewModel.scheduleForNextMessageUpdate(() -> {
-          list.scrollToPosition(position);
-          getListAdapter().pulseHighlightItem(position);
-        });
-      } else {
-        getListAdapter().pulseHighlightItem(position);
-      }
-    } else {
-      Log.w(TAG, "[moveToMessagePosition] Tried to navigate to message, but it wasn't found.");
-      if (onMessageNotFound != null) {
-        onMessageNotFound.run();
-      }
-    }
+    conversationViewModel.onConversationDataAvailable(threadId, position);
+    snapToTopDataObserver.buildScrollPosition(position)
+                         .withOnPerformScroll(((layoutManager, p) ->
+                           list.post(() -> {
+                             layoutManager.scrollToPosition(p);
+                             getListAdapter().pulseHighlightItem(position);
+                           })
+                         ))
+                         .withOnInvalidPosition(() -> {
+                           if (onMessageNotFound != null) {
+                             onMessageNotFound.run();
+                           }
+                           Log.w(TAG, "[moveToMessagePosition] Tried to navigate to message, but it wasn't found.");
+                         })
+                         .submit();
   }
 
   private void maybeShowSwipeToReplyTooltip() {
@@ -987,6 +1010,7 @@ public class ConversationFragment extends Fragment {
                         @NonNull ConversationReactionOverlay.OnHideListener onHideListener);
     void onCursorChanged();
     void onListVerticalTranslationChanged(float translationY);
+    void onMessageWithErrorClicked(@NonNull MessageRecord messageRecord);
   }
 
   private class ConversationScrollListener extends OnScrollListener {
@@ -1058,44 +1082,6 @@ public class ConversationFragment extends Fragment {
     }
   }
 
-  private class DataObserver extends RecyclerView.AdapterDataObserver {
-
-    private final Rect rect = new Rect();
-
-    @Override
-    public void onItemRangeInserted(int positionStart, int itemCount) {
-      if (deferred.isDeferred()) {
-        deferred.setDeferred(false);
-        return;
-      }
-
-      if (positionStart == 0 && itemCount == 1 && isTypingIndicatorShowing()) {
-        return;
-      }
-
-      if (list.getScrollState() == RecyclerView.SCROLL_STATE_IDLE) {
-        int firstVisibleItem = getListLayoutManager().findFirstVisibleItemPosition();
-
-        if (firstVisibleItem == 0) {
-          View view = getListLayoutManager().findViewByPosition(0);
-          if (view == null) {
-            return;
-          }
-
-          view.getDrawingRect(rect);
-          list.offsetDescendantRectToMyCoords(view, rect);
-
-          int bottom = rect.bottom;
-          list.getDrawingRect(rect);
-
-          if (bottom <= rect.bottom) {
-            getListLayoutManager().scrollToPosition(0);
-          }
-        }
-      }
-    }
-  }
-
   private class ConversationFragmentItemClickListener implements ItemClickListener {
 
     @Override
@@ -1285,6 +1271,11 @@ public class ConversationFragment extends Fragment {
 
       RecipientBottomSheetDialogFragment.create(recipientId, groupId).show(requireFragmentManager(), "BOTTOM");
     }
+
+    @Override
+    public void onMessageWithErrorClicked(@NonNull MessageRecord messageRecord) {
+      listener.onMessageWithErrorClicked(messageRecord);
+    }
   }
 
   @Override
@@ -1303,6 +1294,52 @@ public class ConversationFragment extends Fragment {
     actionMode = ((AppCompatActivity)getActivity()).startSupportActionMode(actionModeCallback);
   }
 
+  private final class ConversationSnapToTopDataObserver extends SnapToTopDataObserver {
+
+    public ConversationSnapToTopDataObserver(@NonNull RecyclerView recyclerView,
+                                             @Nullable ScrollRequestValidator scrollRequestValidator)
+    {
+      super(recyclerView, scrollRequestValidator);
+    }
+
+    @Override
+    public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) {
+      // Do nothing.
+    }
+
+    @Override
+    public void onItemRangeInserted(int positionStart, int itemCount) {
+      if (positionStart == 0 && itemCount == 1 && isTypingIndicatorShowing()) {
+        return;
+      }
+
+      super.onItemRangeInserted(positionStart, itemCount);
+    }
+  }
+
+  private final class ConversationScrollRequestValidator implements SnapToTopDataObserver.ScrollRequestValidator {
+
+    @Override
+    public boolean isPositionStillValid(int position) {
+      if (getListAdapter() == null) {
+        return position >= 0;
+      } else {
+        return position >= 0 && position < getListAdapter().getItemCount();
+      }
+    }
+
+    @Override
+    public boolean isItemAtPositionLoaded(int position) {
+      if (getListAdapter() == null) {
+        return false;
+      } else if (getListAdapter().hasFooter() && position == getListAdapter().getItemCount() - 1) {
+        return true;
+      } else {
+        return getListAdapter().getItem(position) != null;
+      }
+    }
+  }
+
   private class ReactionsToolbarListener implements Toolbar.OnMenuItemClickListener {
 
     private final MessageRecord messageRecord;
@@ -1449,33 +1486,4 @@ public class ConversationFragment extends Fragment {
     }
   }
 
-  private static class Deferred {
-
-    private Runnable deferred;
-    private boolean  isDeferred;
-
-    public void defer(@Nullable Runnable deferred) {
-      this.deferred = deferred;
-      executeIfNecessary();
-    }
-
-    public void setDeferred(boolean isDeferred) {
-      this.isDeferred = isDeferred;
-      executeIfNecessary();
-    }
-
-    public boolean isDeferred() {
-      return isDeferred;
-    }
-
-    private void executeIfNecessary() {
-      if (deferred != null && !isDeferred) {
-        Runnable local = deferred;
-
-        deferred = null;
-
-        local.run();
-      }
-    }
-  }
 }

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

@@ -36,7 +36,6 @@ import android.text.style.BackgroundColorSpan;
 import android.text.style.CharacterStyle;
 import android.text.style.ClickableSpan;
 import android.text.style.ForegroundColorSpan;
-import android.text.style.RelativeSizeSpan;
 import android.text.style.StyleSpan;
 import android.text.style.URLSpan;
 import android.text.util.Linkify;
@@ -58,7 +57,6 @@ import com.annimon.stream.Stream;
 import org.thoughtcrime.securesms.BindableConversationItem;
 import org.thoughtcrime.securesms.ConfirmIdentityDialog;
 import org.thoughtcrime.securesms.MediaPreviewActivity;
-import org.thoughtcrime.securesms.MessageDetailsActivity;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
 import org.thoughtcrime.securesms.components.AlertView;
@@ -71,13 +69,12 @@ import org.thoughtcrime.securesms.components.LinkPreviewView;
 import org.thoughtcrime.securesms.components.Outliner;
 import org.thoughtcrime.securesms.components.QuoteView;
 import org.thoughtcrime.securesms.components.SharedContactView;
-import org.thoughtcrime.securesms.components.StickerView;
+import org.thoughtcrime.securesms.components.BorderlessImageView;
 import org.thoughtcrime.securesms.components.emoji.EmojiTextView;
 import org.thoughtcrime.securesms.contactshare.Contact;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MmsDatabase;
-import org.thoughtcrime.securesms.database.MmsSmsDatabase;
 import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
 import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord;
@@ -109,7 +106,6 @@ import org.thoughtcrime.securesms.revealable.ViewOnceUtil;
 import org.thoughtcrime.securesms.stickers.StickerUrl;
 import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.DynamicTheme;
-import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.LongClickCopySpan;
 import org.thoughtcrime.securesms.util.LongClickMovementMethod;
 import org.thoughtcrime.securesms.util.SearchUtil;
@@ -172,7 +168,7 @@ public class ConversationItem extends LinearLayout implements BindableConversati
   private           Stub<DocumentView>              documentViewStub;
   private           Stub<SharedContactView>         sharedContactStub;
   private           Stub<LinkPreviewView>           linkPreviewStub;
-  private           Stub<StickerView>               stickerStub;
+  private           Stub<BorderlessImageView>       stickerStub;
   private           Stub<ViewOnceMessageView>       revealableStub;
   private @Nullable EventListener                   eventListener;
 
@@ -392,11 +388,11 @@ public class ConversationItem extends LinearLayout implements BindableConversati
   /// MessageRecord Attribute Parsers
 
   private void setBubbleState(MessageRecord messageRecord) {
-    if (messageRecord.isOutgoing()) {
+    if (messageRecord.isOutgoing() && !messageRecord.isRemoteDelete()) {
       bodyBubble.getBackground().setColorFilter(defaultBubbleColor, PorterDuff.Mode.MULTIPLY);
       footer.setTextColor(ThemeUtil.getThemedColor(context, R.attr.conversation_item_sent_text_secondary_color));
       footer.setIconColor(ThemeUtil.getThemedColor(context, R.attr.conversation_item_sent_icon_color));
-    } else if (isViewOnceMessage(messageRecord) && ViewOnceUtil.isViewed((MmsMessageRecord) messageRecord)) {
+    } else if (messageRecord.isRemoteDelete() || (isViewOnceMessage(messageRecord) && ViewOnceUtil.isViewed((MmsMessageRecord) messageRecord))) {
       bodyBubble.getBackground().setColorFilter(ThemeUtil.getThemedColor(context, R.attr.conversation_item_reveal_viewed_background_color), PorterDuff.Mode.MULTIPLY);
       footer.setTextColor(ThemeUtil.getThemedColor(context, R.attr.conversation_item_sent_text_secondary_color));
       footer.setIconColor(ThemeUtil.getThemedColor(context, R.attr.conversation_item_sent_icon_color));
@@ -459,7 +455,8 @@ public class ConversationItem extends LinearLayout implements BindableConversati
   }
 
   private boolean shouldDrawBodyBubbleOutline(MessageRecord messageRecord) {
-    return !messageRecord.isOutgoing() && isViewOnceMessage(messageRecord) && ViewOnceUtil.isViewed((MmsMessageRecord) messageRecord);
+    boolean isIncomingViewedOnce = !messageRecord.isOutgoing() && isViewOnceMessage(messageRecord) && ViewOnceUtil.isViewed((MmsMessageRecord) messageRecord);
+    return isIncomingViewedOnce || messageRecord.isRemoteDelete();
   }
 
   private boolean isCaptionlessMms(MessageRecord messageRecord) {
@@ -478,12 +475,20 @@ public class ConversationItem extends LinearLayout implements BindableConversati
     return messageRecord.isMms() && ((MmsMessageRecord)messageRecord).getSlideDeck().getStickerSlide() != null;
   }
 
+  private boolean isBorderless(MessageRecord messageRecord) {
+    //noinspection ConstantConditions
+    return isCaptionlessMms(messageRecord)   &&
+           hasThumbnail(messageRecord)       &&
+           ((MmsMessageRecord)messageRecord).getSlideDeck().getThumbnailSlide().isBorderless();
+  }
+
   private boolean hasOnlyThumbnail(MessageRecord messageRecord) {
     return hasThumbnail(messageRecord)      &&
            !hasAudio(messageRecord)         &&
            !hasDocument(messageRecord)      &&
            !hasSharedContact(messageRecord) &&
            !hasSticker(messageRecord)       &&
+           !isBorderless(messageRecord)     &&
            !isViewOnceMessage(messageRecord);
   }
 
@@ -532,12 +537,16 @@ public class ConversationItem extends LinearLayout implements BindableConversati
     bodyText.setMovementMethod(LongClickMovementMethod.getInstance(getContext()));
 
     if (messageRecord.isRemoteDelete()) {
-      String deletedMessage = context.getString(R.string.ConversationItem_this_message_was_deleted);
+      String deletedMessage = context.getString(messageRecord.isOutgoing() ? R.string.ConversationItem_you_deleted_this_message : R.string.ConversationItem_this_message_was_deleted);
       SpannableString italics = new SpannableString(deletedMessage);
-      italics.setSpan(new RelativeSizeSpan(0.9f), 0, deletedMessage.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
       italics.setSpan(new StyleSpan(android.graphics.Typeface.ITALIC), 0, deletedMessage.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+      italics.setSpan(new ForegroundColorSpan(ThemeUtil.getThemedColor(context, R.attr.conversation_item_delete_for_everyone_text_color)),
+                                              0,
+                                              deletedMessage.length(),
+                                              Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
 
       bodyText.setText(italics);
+      bodyText.setVisibility(View.VISIBLE);
     } else if (isCaptionlessMms(messageRecord)) {
       bodyText.setVisibility(View.GONE);
     } else {
@@ -673,7 +682,7 @@ public class ConversationItem extends LinearLayout implements BindableConversati
       ViewUtil.updateLayoutParamsIfNonNull(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
 
       footer.setVisibility(VISIBLE);
-    } else if (hasSticker(messageRecord) && isCaptionlessMms(messageRecord)) {
+    } else if ((hasSticker(messageRecord) && isCaptionlessMms(messageRecord)) || isBorderless(messageRecord)) {
       bodyBubble.setBackgroundColor(Color.TRANSPARENT);
 
       stickerStub.get().setVisibility(View.VISIBLE);
@@ -684,9 +693,16 @@ public class ConversationItem extends LinearLayout implements BindableConversati
       if (linkPreviewStub.resolved())    linkPreviewStub.get().setVisibility(GONE);
       if (revealableStub.resolved())     revealableStub.get().setVisibility(View.GONE);
 
-      //noinspection ConstantConditions
-      stickerStub.get().setSticker(glideRequests, ((MmsMessageRecord) messageRecord).getSlideDeck().getStickerSlide());
-      stickerStub.get().setThumbnailClickListener(new StickerClickListener());
+      if (hasSticker(messageRecord)) {
+        //noinspection ConstantConditions
+        stickerStub.get().setSlide(glideRequests, ((MmsMessageRecord) messageRecord).getSlideDeck().getStickerSlide());
+        stickerStub.get().setThumbnailClickListener(new StickerClickListener());
+      } else {
+        //noinspection ConstantConditions
+        stickerStub.get().setSlide(glideRequests, ((MmsMessageRecord) messageRecord).getSlideDeck().getThumbnailSlide());
+        stickerStub.get().setThumbnailClickListener((v, slide) -> performClick());
+      }
+
       stickerStub.get().setDownloadClickListener(downloadClickListener);
       stickerStub.get().setOnLongClickListener(passthroughClickListener);
       stickerStub.get().setOnClickListener(passthroughClickListener);
@@ -704,7 +720,6 @@ public class ConversationItem extends LinearLayout implements BindableConversati
       if (stickerStub.resolved())        stickerStub.get().setVisibility(View.GONE);
       if (revealableStub.resolved())     revealableStub.get().setVisibility(View.GONE);
 
-      //noinspection ConstantConditions
       List<Slide> thumbnailSlides = ((MmsMessageRecord) messageRecord).getSlideDeck().getThumbnailSlides();
       mediaThumbnailStub.get().setImageResource(glideRequests,
                                                 thumbnailSlides,
@@ -977,7 +992,7 @@ public class ConversationItem extends LinearLayout implements BindableConversati
   }
 
   private ConversationItemFooter getActiveFooter(@NonNull MessageRecord messageRecord) {
-    if (hasSticker(messageRecord)) {
+    if (hasSticker(messageRecord) || isBorderless(messageRecord)) {
       return stickerFooter;
     } else if (hasSharedContact(messageRecord)) {
       return sharedContactStub.get().getFooter();
@@ -1002,21 +1017,8 @@ public class ConversationItem extends LinearLayout implements BindableConversati
   @SuppressLint("SetTextI18n")
   private void setGroupMessageStatus(MessageRecord messageRecord, Recipient recipient) {
     if (groupThread && !messageRecord.isOutgoing() && groupSender != null && groupSenderProfileName != null) {
-
-      if (FeatureFlags.profileDisplay()) {
-        groupSender.setText(recipient.getDisplayName(getContext()));
-        groupSenderProfileName.setVisibility(View.GONE);
-      } else {
-        groupSender.setText(recipient.toShortString(context));
-
-        if (recipient.getName(context) == null && !recipient.getProfileName().isEmpty()) {
-          groupSenderProfileName.setText("~" + recipient.getProfileName().toString());
-          groupSenderProfileName.setVisibility(View.VISIBLE);
-        } else {
-          groupSenderProfileName.setText(null);
-          groupSenderProfileName.setVisibility(View.GONE);
-        }
-      }
+      groupSender.setText(recipient.getDisplayName(getContext()));
+      groupSenderProfileName.setVisibility(View.GONE);
     }
   }
 
@@ -1026,7 +1028,7 @@ public class ConversationItem extends LinearLayout implements BindableConversati
       if (shouldDrawBodyBubbleOutline(messageRecord)) {
         groupSender.setTextColor(stickerAuthorColor);
         groupSenderProfileName.setTextColor(stickerAuthorColor);
-      } else if (hasSticker(messageRecord)) {
+      } else if (hasSticker(messageRecord) || isBorderless(messageRecord)) {
         groupSender.setTextColor(stickerAuthorColor);
         groupSenderProfileName.setTextColor(stickerAuthorColor);
       } else {
@@ -1323,7 +1325,7 @@ public class ConversationItem extends LinearLayout implements BindableConversati
     public void onClick(View v, Slide slide) {
       if (shouldInterceptClicks(messageRecord) || !batchSelected.isEmpty()) {
         performClick();
-      } else if (eventListener != null && hasSticker(messageRecord)){
+      } else if (eventListener != null && hasSticker(messageRecord)) {
         //noinspection ConstantConditions
         eventListener.onStickerClicked(((MmsMessageRecord) messageRecord).getSlideDeck().getStickerSlide().asAttachment().getSticker());
       }
@@ -1390,13 +1392,9 @@ public class ConversationItem extends LinearLayout implements BindableConversati
       if (!shouldInterceptClicks(messageRecord) && parent != null) {
         parent.onClick(v);
       } else if (messageRecord.isFailed()) {
-        Intent intent = new Intent(context, MessageDetailsActivity.class);
-        intent.putExtra(MessageDetailsActivity.MESSAGE_ID_EXTRA, messageRecord.getId());
-        intent.putExtra(MessageDetailsActivity.THREAD_ID_EXTRA, messageRecord.getThreadId());
-        intent.putExtra(MessageDetailsActivity.TYPE_EXTRA, messageRecord.isMms() ? MmsSmsDatabase.MMS_TRANSPORT : MmsSmsDatabase.SMS_TRANSPORT);
-        intent.putExtra(MessageDetailsActivity.IS_PUSH_GROUP_EXTRA, groupThread && messageRecord.isPush());
-        intent.putExtra(MessageDetailsActivity.RECIPIENT_EXTRA, conversationRecipient.getId());
-        context.startActivity(intent);
+        if (eventListener != null) {
+          eventListener.onMessageWithErrorClicked(messageRecord);
+        }
       } else if (!messageRecord.isOutgoing() && messageRecord.isIdentityMismatchFailure()) {
         handleApproveIdentity();
       } else if (messageRecord.isPendingInsecureSmsFallback()) {

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

@@ -7,10 +7,10 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
 import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.recipients.RecipientUtil;
 import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
-import org.whispersystems.libsignal.util.Pair;
 
 import java.util.concurrent.Executor;
 
@@ -35,23 +35,30 @@ class ConversationRepository {
   }
 
   private @NonNull ConversationData getConversationDataInternal(long threadId, int jumpToPosition) {
-    Pair<Long, Boolean> lastSeenAndHasSent = DatabaseFactory.getThreadDatabase(context).getLastSeenAndHasSent(threadId);
+    ThreadDatabase.ConversationMetadata metadata   = DatabaseFactory.getThreadDatabase(context).getConversationMetadata(threadId);
+    int                                 threadSize = DatabaseFactory.getMmsSmsDatabase(context).getConversationCount(threadId);
 
-    long    lastSeen         = lastSeenAndHasSent.first();
-    boolean hasSent          = lastSeenAndHasSent.second();
-    int     lastSeenPosition = 0;
+    long    lastSeen             = metadata.getLastSeen();
+    boolean hasSent              = metadata.hasSent();
+    int     lastSeenPosition     = 0;
+    long    lastScrolled         = metadata.getLastScrolled();
+    int     lastScrolledPosition = 0;
 
     boolean isMessageRequestAccepted     = RecipientUtil.isMessageRequestAccepted(context, threadId);
     boolean hasPreMessageRequestMessages = RecipientUtil.isPreMessageRequestThread(context, threadId);
 
     if (lastSeen > 0) {
-      lastSeenPosition = DatabaseFactory.getMmsSmsDatabase(context).getMessagePositionForLastSeen(threadId, lastSeen);
+      lastSeenPosition = DatabaseFactory.getMmsSmsDatabase(context).getMessagePositionOnOrAfterTimestamp(threadId, lastSeen);
     }
 
     if (lastSeenPosition <= 0) {
       lastSeen = 0;
     }
 
-    return new ConversationData(threadId, lastSeen, lastSeenPosition, hasSent, isMessageRequestAccepted, hasPreMessageRequestMessages, jumpToPosition);
+    if (lastSeen == 0 && lastScrolled > 0) {
+      lastScrolledPosition = DatabaseFactory.getMmsSmsDatabase(context).getMessagePositionOnOrAfterTimestamp(threadId, lastScrolled);
+    }
+
+    return new ConversationData(threadId, lastSeen, lastSeenPosition, lastScrolledPosition, hasSent, isMessageRequestAccepted, hasPreMessageRequestMessages, jumpToPosition, threadSize);
   }
 }

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

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.conversation;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.content.res.ColorStateList;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
@@ -11,6 +12,8 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.core.widget.TextViewCompat;
 
 import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;
@@ -54,15 +57,15 @@ public class ConversationTitleView extends RelativeLayout {
   public void onFinishInflate() {
     super.onFinishInflate();
 
-    this.content                  = ViewUtil.findById(this, R.id.content);
-    this.title                    = ViewUtil.findById(this, R.id.title);
-    this.subtitle                 = ViewUtil.findById(this, R.id.subtitle);
-    this.verified                 = ViewUtil.findById(this, R.id.verified_indicator);
-    this.subtitleContainer        = ViewUtil.findById(this, R.id.subtitle_container);
-    this.verifiedSubtitle         = ViewUtil.findById(this, R.id.verified_subtitle);
-    this.avatar                   = ViewUtil.findById(this, R.id.contact_photo_image);
-    this.expirationBadgeContainer = ViewUtil.findById(this, R.id.expiration_badge_container);
-    this.expirationBadgeTime      = ViewUtil.findById(this, R.id.expiration_badge);
+    this.content                  = findViewById(R.id.content);
+    this.title                    = findViewById(R.id.title);
+    this.subtitle                 = findViewById(R.id.subtitle);
+    this.verified                 = findViewById(R.id.verified_indicator);
+    this.subtitleContainer        = findViewById(R.id.subtitle_container);
+    this.verifiedSubtitle         = findViewById(R.id.verified_subtitle);
+    this.avatar                   = findViewById(R.id.contact_photo_image);
+    this.expirationBadgeContainer = findViewById(R.id.expiration_badge_container);
+    this.expirationBadgeTime      = findViewById(R.id.expiration_badge);
 
     ViewUtil.setTextViewGravityStart(this.title, getContext());
     ViewUtil.setTextViewGravityStart(this.subtitle, getContext());
@@ -85,14 +88,22 @@ public class ConversationTitleView extends RelativeLayout {
     if      (recipient == null) setComposeTitle();
     else                        setRecipientTitle(recipient);
 
+    int startDrawable = 0;
+    int endDrawable   = 0;
+
     if (recipient != null && recipient.isBlocked()) {
-      title.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_block_white_18dp, 0, 0, 0);
+      startDrawable = R.drawable.ic_block_white_18dp;
     } else if (recipient != null && recipient.isMuted()) {
-      title.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_volume_off_white_18dp, 0, 0, 0);
-    } else {
-      title.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
+      startDrawable = R.drawable.ic_volume_off_white_18dp;
     }
 
+    if (recipient != null && recipient.isSystemContact() && !recipient.isLocalNumber()) {
+      endDrawable = R.drawable.ic_profile_circle_outline_16;
+    }
+
+    title.setCompoundDrawablesRelativeWithIntrinsicBounds(startDrawable, 0, endDrawable, 0);
+    TextViewCompat.setCompoundDrawableTintList(title, ColorStateList.valueOf(ContextCompat.getColor(getContext(), R.color.transparent_white_90)));
+
     if (recipient != null) {
       this.avatar.setAvatar(glideRequests, recipient, false);
     }
@@ -113,16 +124,9 @@ public class ConversationTitleView extends RelativeLayout {
   }
 
   private void setRecipientTitle(Recipient recipient) {
-    if (FeatureFlags.profileDisplay()) {
-      if      (recipient.isGroup())       setGroupRecipientTitle(recipient);
-      else if (recipient.isLocalNumber()) setSelfTitle();
-      else                                setIndividualRecipientTitle(recipient);
-    } else {
-      if      (recipient.isGroup())                                setGroupRecipientTitle(recipient);
-      else if (recipient.isLocalNumber())                          setSelfTitle();
-      else if (TextUtils.isEmpty(recipient.getName(getContext()))) setNonContactRecipientTitle(recipient);
-      else                                                         setContactRecipientTitle(recipient);
-    }
+    if      (recipient.isGroup())       setGroupRecipientTitle(recipient);
+    else if (recipient.isLocalNumber()) setSelfTitle();
+    else                                setIndividualRecipientTitle(recipient);
   }
 
   @SuppressLint("SetTextI18n")
@@ -138,25 +142,8 @@ public class ConversationTitleView extends RelativeLayout {
     updateSubtitleVisibility();
   }
 
-  private void setContactRecipientTitle(Recipient recipient) {
-    this.title.setText(recipient.getName(getContext()));
-
-    if (TextUtils.isEmpty(recipient.getCustomLabel())) {
-      this.subtitle.setText(null);
-    } else {
-      this.subtitle.setText(recipient.getCustomLabel());
-    }
-
-    updateSubtitleVisibility();
-  }
-
   private void setGroupRecipientTitle(Recipient recipient) {
-    if (FeatureFlags.profileDisplay()) {
-      this.title.setText(recipient.getDisplayName(getContext()));
-    } else {
-      this.title.setText(recipient.getName(getContext()));
-    }
-
+    this.title.setText(recipient.getDisplayName(getContext()));
     this.subtitle.setText(Stream.of(recipient.getParticipants())
                                 .sorted((a, b) -> Boolean.compare(a.isLocalNumber(), b.isLocalNumber()))
                                 .map(r -> r.isLocalNumber() ? getResources().getString(R.string.ConversationTitleView_you)

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

@@ -134,6 +134,7 @@ public class ConversationUpdateItem extends LinearLayout
     else if (messageRecord.isIdentityUpdate())        setIdentityRecord(messageRecord);
     else if (messageRecord.isIdentityVerified() ||
              messageRecord.isIdentityDefault())       setIdentityVerifyUpdate(messageRecord);
+    else if (messageRecord.isProfileChange())         setProfileNameChangeRecord(messageRecord);
     else                                              throw new AssertionError("Neither group nor log nor joined.");
 
     if (batchSelected.contains(messageRecord)) setSelected(true);
@@ -195,6 +196,16 @@ public class ConversationUpdateItem extends LinearLayout
     date.setVisibility(GONE);
   }
 
+  private void setProfileNameChangeRecord(MessageRecord messageRecord) {
+    icon.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.ic_profile_outline_20));
+    icon.setColorFilter(getIconTintFilter());
+    body.setText(messageRecord.getDisplayBody(getContext()));
+
+    title.setVisibility(GONE);
+    body.setVisibility(VISIBLE);
+    date.setVisibility(GONE);
+  }
+
   private void setGroupRecord(MessageRecord messageRecord) {
     icon.setImageDrawable(ThemeUtil.getThemedDrawable(getContext(), R.attr.menu_group_icon));
     icon.clearColorFilter();

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

@@ -3,11 +3,8 @@ package org.thoughtcrime.securesms.conversation;
 import android.app.Application;
 
 import androidx.annotation.NonNull;
-import androidx.arch.core.util.Function;
 import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MediatorLiveData;
 import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.Observer;
 import androidx.lifecycle.Transformations;
 import androidx.lifecycle.ViewModel;
 import androidx.lifecycle.ViewModelProvider;
@@ -15,19 +12,17 @@ import androidx.paging.DataSource;
 import androidx.paging.LivePagedListBuilder;
 import androidx.paging.PagedList;
 
-import org.thoughtcrime.securesms.conversation.ConversationDataSource.Invalidator;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mediasend.Media;
 import org.thoughtcrime.securesms.mediasend.MediaRepository;
-import org.thoughtcrime.securesms.util.Util;
-import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
+import org.thoughtcrime.securesms.util.livedata.LiveDataUtil;
+import org.thoughtcrime.securesms.util.paging.Invalidator;
 import org.whispersystems.libsignal.util.Pair;
 
-import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.Objects;
 
 class ConversationViewModel extends ViewModel {
 
@@ -40,7 +35,6 @@ class ConversationViewModel extends ViewModel {
   private final MutableLiveData<Long>              threadId;
   private final LiveData<PagedList<MessageRecord>> messages;
   private final LiveData<ConversationData>         conversationMetadata;
-  private final List<Runnable>                     onNextMessageLoad;
   private final Invalidator                        invalidator;
 
   private int jumpToPosition;
@@ -51,28 +45,35 @@ class ConversationViewModel extends ViewModel {
     this.conversationRepository = new ConversationRepository();
     this.recentMedia            = new MutableLiveData<>();
     this.threadId               = new MutableLiveData<>();
-    this.onNextMessageLoad      = new CopyOnWriteArrayList<>();
     this.invalidator            = new Invalidator();
 
-    LiveData<ConversationData> conversationDataForRequestedThreadId = Transformations.switchMap(threadId, thread -> {
-      return conversationRepository.getConversationData(thread, jumpToPosition);
+    LiveData<ConversationData> metadata = Transformations.switchMap(threadId, thread -> {
+      LiveData<ConversationData> conversationData = conversationRepository.getConversationData(thread, jumpToPosition);
+
+      jumpToPosition = -1;
+
+      return conversationData;
     });
 
-    LiveData<Pair<Long, PagedList<MessageRecord>>> messagesForThreadId = Transformations.switchMap(conversationDataForRequestedThreadId, data -> {
-      DataSource.Factory<Integer, MessageRecord> factory = new ConversationDataSource.Factory(context, data.getThreadId(), invalidator, this::onMessagesUpdated);
+    LiveData<Pair<Long, PagedList<MessageRecord>>> messagesForThreadId = Transformations.switchMap(metadata, data -> {
+      DataSource.Factory<Integer, MessageRecord> factory = new ConversationDataSource.Factory(context, data.getThreadId(), invalidator);
       PagedList.Config                           config  = new PagedList.Config.Builder()
                                                                                .setPageSize(25)
                                                                                .setInitialLoadSizeHint(25)
                                                                                .build();
 
       final int startPosition;
-      if (jumpToPosition > 0) {
-        startPosition = jumpToPosition;
-      } else {
+      if (data.shouldJumpToMessage()) {
+        startPosition = data.getJumpToPosition();
+      } else if (data.isMessageRequestAccepted() && data.shouldScrollToLastSeen()) {
         startPosition = data.getLastSeenPosition();
+      } else if (data.isMessageRequestAccepted()) {
+        startPosition = data.getLastScrolledPosition();
+      } else {
+        startPosition = data.getThreadSize();
       }
 
-      Log.d(TAG, "Starting at position " + startPosition + " :: " + jumpToPosition + " :: " + data.getLastSeenPosition());
+      Log.d(TAG, "Starting at position startPosition: " + startPosition + " jumpToPosition: " + jumpToPosition + " lastSeenPosition: " + data.getLastSeenPosition() + " lastScrolledPosition: " + data.getLastScrolledPosition());
 
       return Transformations.map(new LivePagedListBuilder<>(factory, config).setFetchExecutor(ConversationDataSource.EXECUTOR)
                                                                             .setInitialLoadKey(Math.max(startPosition, 0))
@@ -82,13 +83,11 @@ class ConversationViewModel extends ViewModel {
 
     this.messages = Transformations.map(messagesForThreadId, Pair::second);
 
-    LiveData<Long> threadIdForLoadedMessages = Transformations.distinctUntilChanged(Transformations.map(messagesForThreadId, Pair::first));
+    LiveData<DistinctConversationDataByThreadId> distinctData = LiveDataUtil.combineLatest(messagesForThreadId,
+                                                                                           metadata,
+                                                                                           (m, data) -> new DistinctConversationDataByThreadId(data));
 
-    conversationMetadata = Transformations.switchMap(threadIdForLoadedMessages, m -> {
-      LiveData<ConversationData> data = conversationRepository.getConversationData(m, jumpToPosition);
-      jumpToPosition = -1;
-      return data;
-    });
+    conversationMetadata = Transformations.map(Transformations.distinctUntilChanged(distinctData), DistinctConversationDataByThreadId::getConversationData);
   }
 
   void onAttachmentKeyboardOpen() {
@@ -122,24 +121,12 @@ class ConversationViewModel extends ViewModel {
     return conversationMetadata.getValue() != null ? conversationMetadata.getValue().getLastSeenPosition() : 0;
   }
 
-  void scheduleForNextMessageUpdate(@NonNull Runnable runnable) {
-    onNextMessageLoad.add(runnable);
-  }
-
   @Override
   protected void onCleared() {
     super.onCleared();
     invalidator.invalidate();
   }
 
-  private void onMessagesUpdated() {
-    for (Runnable runnable : onNextMessageLoad) {
-      runnable.run();
-    }
-
-    onNextMessageLoad.clear();
-  }
-
   static class Factory extends ViewModelProvider.NewInstanceFactory {
     @Override
     public @NonNull<T extends ViewModel> T create(@NonNull Class<T> modelClass) {
@@ -147,4 +134,29 @@ class ConversationViewModel extends ViewModel {
       return modelClass.cast(new ConversationViewModel());
     }
   }
+
+  private static class DistinctConversationDataByThreadId {
+    private final ConversationData conversationData;
+
+    private DistinctConversationDataByThreadId(@NonNull ConversationData conversationData) {
+      this.conversationData = conversationData;
+    }
+
+    public @NonNull ConversationData getConversationData() {
+      return conversationData;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) return true;
+      if (o == null || getClass() != o.getClass()) return false;
+      DistinctConversationDataByThreadId that = (DistinctConversationDataByThreadId) o;
+      return Objects.equals(conversationData.getThreadId(), that.conversationData.getThreadId());
+    }
+
+    @Override
+    public int hashCode() {
+      return Objects.hash(conversationData.getThreadId());
+    }
+  }
 }

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

@@ -127,7 +127,8 @@ final class MenuState {
            messageRecord.isEndSession()            ||
            messageRecord.isIdentityUpdate()        ||
            messageRecord.isIdentityVerified()      ||
-           messageRecord.isIdentityDefault();
+           messageRecord.isIdentityDefault()       ||
+           messageRecord.isProfileChange();
   }
 
   private final static class Builder {

app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/ChangedRecipient.java

@@ -0,0 +1,38 @@
+package org.thoughtcrime.securesms.conversation.ui.error;
+
+import androidx.annotation.NonNull;
+
+import org.thoughtcrime.securesms.database.IdentityDatabase;
+import org.thoughtcrime.securesms.database.IdentityDatabase.IdentityRecord;
+import org.thoughtcrime.securesms.recipients.Recipient;
+
+/**
+ * Wrapper class for helping show a list of recipients that had recent safety number changes.
+ *
+ * Also provides helper methods for behavior used in multiple spots.
+ */
+final class ChangedRecipient {
+  private final Recipient      recipient;
+  private final IdentityRecord record;
+
+  ChangedRecipient(@NonNull Recipient recipient, @NonNull IdentityRecord record) {
+    this.recipient = recipient;
+    this.record    = record;
+  }
+
+  @NonNull Recipient getRecipient() {
+    return recipient;
+  }
+
+  @NonNull IdentityRecord getIdentityRecord() {
+    return record;
+  }
+
+  boolean isUnverified() {
+    return record.getVerifiedStatus() == IdentityDatabase.VerifiedStatus.UNVERIFIED;
+  }
+
+  boolean isVerified() {
+    return record.getVerifiedStatus() == IdentityDatabase.VerifiedStatus.VERIFIED;
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/SafetyNumberChangeAdapter.java

@@ -0,0 +1,85 @@
+package org.thoughtcrime.securesms.conversation.ui.error;
+
+import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.ListAdapter;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.components.AvatarImageView;
+import org.thoughtcrime.securesms.components.FromTextView;
+import org.thoughtcrime.securesms.database.IdentityDatabase;
+import org.thoughtcrime.securesms.util.ViewUtil;
+import org.thoughtcrime.securesms.util.adapter.AlwaysChangedDiffUtil;
+
+final class SafetyNumberChangeAdapter extends ListAdapter<ChangedRecipient, SafetyNumberChangeAdapter.ViewHolder> {
+
+  private final Callbacks callbacks;
+
+  SafetyNumberChangeAdapter(@NonNull Callbacks callbacks) {
+    super(new AlwaysChangedDiffUtil<>());
+    this.callbacks = callbacks;
+  }
+
+  @Override
+  public @NonNull ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+    return new ViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.safety_number_change_recipient, parent, false));
+  }
+
+  @Override
+  public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
+    final ChangedRecipient changedRecipient = getItem(position);
+    holder.bind(changedRecipient);
+  }
+
+  class ViewHolder extends RecyclerView.ViewHolder {
+
+    final AvatarImageView avatar;
+    final FromTextView    name;
+    final TextView        subtitle;
+    final View            viewButton;
+
+    public ViewHolder(@NonNull View itemView) {
+      super(itemView);
+
+      avatar     = itemView.findViewById(R.id.safety_number_change_recipient_avatar);
+      name       = itemView.findViewById(R.id.safety_number_change_recipient_name);
+      subtitle   = itemView.findViewById(R.id.safety_number_change_recipient_subtitle);
+      viewButton = itemView.findViewById(R.id.safety_number_change_recipient_view);
+    }
+
+    void bind(@NonNull ChangedRecipient changedRecipient) {
+      avatar.setRecipient(changedRecipient.getRecipient());
+      name.setText(changedRecipient.getRecipient());
+
+      if (changedRecipient.isUnverified() || changedRecipient.isVerified()) {
+        subtitle.setText(R.string.safety_number_change_dialog__previous_verified);
+
+        Drawable check = ContextCompat.getDrawable(itemView.getContext(), R.drawable.check);
+        if (check != null) {
+          check.setBounds(0, 0, ViewUtil.dpToPx(12), ViewUtil.dpToPx(12));
+          subtitle.setCompoundDrawables(check, null, null, null);
+        }
+      } else if (changedRecipient.getRecipient().hasAUserSetDisplayName(itemView.getContext())) {
+        subtitle.setText(changedRecipient.getRecipient().getE164().or(""));
+        subtitle.setCompoundDrawables(null, null, null, null);
+      } else {
+        subtitle.setText("");
+      }
+      subtitle.setVisibility(TextUtils.isEmpty(subtitle.getText()) ?  View.GONE : View.VISIBLE);
+
+      viewButton.setOnClickListener(view -> callbacks.onViewIdentityRecord(changedRecipient.getIdentityRecord()));
+    }
+  }
+
+  interface Callbacks {
+    void onViewIdentityRecord(@NonNull IdentityDatabase.IdentityRecord identityRecord);
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/SafetyNumberChangeDialog.java

@@ -0,0 +1,162 @@
+package org.thoughtcrime.securesms.conversation.ui.error;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.annimon.stream.Stream;
+
+import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.VerifyIdentityActivity;
+import org.thoughtcrime.securesms.database.IdentityDatabase;
+import org.thoughtcrime.securesms.database.MmsSmsDatabase;
+import org.thoughtcrime.securesms.database.model.MessageRecord;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public final class SafetyNumberChangeDialog extends DialogFragment implements SafetyNumberChangeAdapter.Callbacks {
+
+  private static final String RECIPIENT_IDS_EXTRA = "recipient_ids";
+  private static final String MESSAGE_ID_EXTRA    = "message_id";
+  private static final String MESSAGE_TYPE_EXTRA  = "message_type";
+
+  private SafetyNumberChangeViewModel viewModel;
+  private SafetyNumberChangeAdapter   adapter;
+  private View                        dialogView;
+
+  public static @NonNull SafetyNumberChangeDialog create(List<IdentityDatabase.IdentityRecord> identityRecords) {
+    List<String> ids = Stream.of(identityRecords)
+                             .map(record -> record.getRecipientId().serialize())
+                             .distinct()
+                             .toList();
+
+    Bundle arguments = new Bundle();
+    arguments.putStringArray(RECIPIENT_IDS_EXTRA, ids.toArray(new String[0]));
+    SafetyNumberChangeDialog fragment = new SafetyNumberChangeDialog();
+    fragment.setArguments(arguments);
+    return fragment;
+  }
+
+  public static @NonNull SafetyNumberChangeDialog create(Context context, MessageRecord messageRecord) {
+    List<String> ids = Stream.of(messageRecord.getIdentityKeyMismatches())
+                             .map(mismatch -> mismatch.getRecipientId(context).serialize())
+                             .distinct()
+                             .toList();
+
+    Bundle arguments = new Bundle();
+    arguments.putStringArray(RECIPIENT_IDS_EXTRA, ids.toArray(new String[0]));
+    arguments.putLong(MESSAGE_ID_EXTRA, messageRecord.getId());
+    arguments.putString(MESSAGE_TYPE_EXTRA, messageRecord.isMms() ? MmsSmsDatabase.MMS_TRANSPORT : MmsSmsDatabase.SMS_TRANSPORT);
+    SafetyNumberChangeDialog fragment = new SafetyNumberChangeDialog();
+    fragment.setArguments(arguments);
+    return fragment;
+  }
+
+  private SafetyNumberChangeDialog() { }
+
+  @Override
+  public @Nullable View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    return dialogView;
+  }
+
+  @Override
+  public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+    super.onActivityCreated(savedInstanceState);
+
+    //noinspection ConstantConditions
+    List<RecipientId> recipientIds = Stream.of(getArguments().getStringArray(RECIPIENT_IDS_EXTRA)).map(RecipientId::from).toList();
+    long              messageId    = getArguments().getLong(MESSAGE_ID_EXTRA, -1);
+    String            messageType  = getArguments().getString(MESSAGE_TYPE_EXTRA, null);
+
+    viewModel = ViewModelProviders.of(this, new SafetyNumberChangeViewModel.Factory(recipientIds, (messageId != -1) ? messageId : null, messageType)).get(SafetyNumberChangeViewModel.class);
+    viewModel.getChangedRecipients().observe(getViewLifecycleOwner(), adapter::submitList);
+  }
+
+  @Override
+  public @NonNull Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+    dialogView = LayoutInflater.from(requireActivity()).inflate(R.layout.safety_number_change_dialog, null);
+
+    AlertDialog.Builder builder = new AlertDialog.Builder(requireActivity(), getTheme());
+
+    configureView(dialogView);
+
+    builder.setTitle(R.string.safety_number_change_dialog__safety_number_changes)
+           .setView(dialogView)
+           .setPositiveButton(R.string.safety_number_change_dialog__send_anyway, this::handleSendAnyway)
+           .setNegativeButton(android.R.string.cancel, null);
+
+    return builder.create();
+  }
+
+  @Override public void onDestroyView() {
+    dialogView = null;
+    super.onDestroyView();
+  }
+
+  private void configureView(View view) {
+    RecyclerView list = view.findViewById(R.id.safety_number_change_dialog_list);
+    adapter = new SafetyNumberChangeAdapter(this);
+    list.setAdapter(adapter);
+    list.setItemAnimator(null);
+    list.setLayoutManager(new LinearLayoutManager(requireContext()));
+  }
+
+  private void handleSendAnyway(DialogInterface dialogInterface, int which) {
+    Activity activity = getActivity();
+    Callback callback;
+    if (activity instanceof Callback) {
+      callback = (Callback) activity;
+    } else {
+      callback = null;
+    }
+
+    LiveData<TrustAndVerifyResult> trustOrVerifyResultLiveData = viewModel.trustOrVerifyChangedRecipients();
+
+    Observer<TrustAndVerifyResult> observer = new Observer<TrustAndVerifyResult>() {
+      @Override
+      public void onChanged(TrustAndVerifyResult result) {
+        if (callback != null) {
+          switch (result) {
+            case TRUST_AND_VERIFY:
+              callback.onSendAnywayAfterSafetyNumberChange();
+              break;
+            case TRUST_VERIFY_AND_RESEND:
+              callback.onMessageResentAfterSafetyNumberChange();
+              break;
+          }
+        }
+        trustOrVerifyResultLiveData.removeObserver(this);
+      }
+    };
+
+    trustOrVerifyResultLiveData.observeForever(observer);
+  }
+
+  @Override
+  public void onViewIdentityRecord(@NonNull IdentityDatabase.IdentityRecord identityRecord) {
+    startActivity(VerifyIdentityActivity.newIntent(requireContext(), identityRecord));
+  }
+
+  public interface Callback {
+    void onSendAnywayAfterSafetyNumberChange();
+    void onMessageResentAfterSafetyNumberChange();
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/SafetyNumberChangeRepository.java

@@ -0,0 +1,177 @@
+package org.thoughtcrime.securesms.conversation.ui.error;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+
+import com.annimon.stream.Stream;
+
+import org.thoughtcrime.securesms.crypto.storage.TextSecureIdentityKeyStore;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.IdentityDatabase;
+import org.thoughtcrime.securesms.database.IdentityDatabase.IdentityRecord;
+import org.thoughtcrime.securesms.database.MmsDatabase;
+import org.thoughtcrime.securesms.database.MmsSmsDatabase;
+import org.thoughtcrime.securesms.database.NoSuchMessageException;
+import org.thoughtcrime.securesms.database.SmsDatabase;
+import org.thoughtcrime.securesms.database.model.MessageRecord;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+import org.thoughtcrime.securesms.sms.MessageSender;
+import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
+import org.whispersystems.libsignal.IdentityKey;
+import org.whispersystems.libsignal.SignalProtocolAddress;
+
+import java.util.List;
+
+import static org.whispersystems.libsignal.SessionCipher.SESSION_LOCK;
+
+final class SafetyNumberChangeRepository {
+
+  private static final String TAG = SafetyNumberChangeRepository.class.getSimpleName();
+
+  private final Context context;
+
+  SafetyNumberChangeRepository(Context context) {
+    this.context = context.getApplicationContext();
+  }
+
+  @NonNull LiveData<SafetyNumberChangeState> getSafetyNumberChangeState(@NonNull List<RecipientId> recipientIds, @Nullable Long messageId, @Nullable String messageType) {
+    MutableLiveData<SafetyNumberChangeState> liveData = new MutableLiveData<>();
+    SignalExecutors.BOUNDED.execute(() -> liveData.postValue(getSafetyNumberChangeStateInternal(recipientIds, messageId, messageType)));
+    return liveData;
+  }
+
+  @NonNull LiveData<TrustAndVerifyResult> trustOrVerifyChangedRecipients(@NonNull List<ChangedRecipient> changedRecipients) {
+    MutableLiveData<TrustAndVerifyResult> liveData = new MutableLiveData<>();
+    SignalExecutors.BOUNDED.execute(() -> liveData.postValue(trustOrVerifyChangedRecipientsInternal(changedRecipients)));
+    return liveData;
+  }
+
+  @NonNull LiveData<TrustAndVerifyResult> trustOrVerifyChangedRecipientsAndResend(@NonNull List<ChangedRecipient> changedRecipients, @NonNull MessageRecord messageRecord) {
+    MutableLiveData<TrustAndVerifyResult> liveData = new MutableLiveData<>();
+    SignalExecutors.BOUNDED.execute(() -> liveData.postValue(trustOrVerifyChangedRecipientsAndResendInternal(changedRecipients, messageRecord)));
+    return liveData;
+  }
+
+  @WorkerThread
+  private @NonNull SafetyNumberChangeState getSafetyNumberChangeStateInternal(@NonNull List<RecipientId> recipientIds, @Nullable Long messageId, @Nullable String messageType) {
+    MessageRecord messageRecord = null;
+    if (messageId != null && messageType != null) {
+      messageRecord = getMessageRecord(messageId, messageType);
+    }
+
+    List<Recipient> recipients = Stream.of(recipientIds).map(Recipient::resolved).toList();
+
+    List<ChangedRecipient> changedRecipients = Stream.of(DatabaseFactory.getIdentityDatabase(context).getIdentities(recipients).getIdentityRecords())
+                                                     .map(record -> new ChangedRecipient(Recipient.resolved(record.getRecipientId()), record))
+                                                     .toList();
+
+    return new SafetyNumberChangeState(changedRecipients, messageRecord);
+  }
+
+  @WorkerThread
+  private @Nullable MessageRecord getMessageRecord(Long messageId, String messageType) {
+    try {
+      switch (messageType) {
+        case MmsSmsDatabase.SMS_TRANSPORT:
+          return DatabaseFactory.getSmsDatabase(context).getMessage(messageId);
+        case MmsSmsDatabase.MMS_TRANSPORT:
+          return DatabaseFactory.getMmsDatabase(context).getMessageRecord(messageId);
+        default:
+          throw new AssertionError("no valid message type specified");
+      }
+    } catch (NoSuchMessageException e) {
+      Log.i(TAG, e);
+    }
+    return null;
+  }
+
+  @WorkerThread
+  private TrustAndVerifyResult trustOrVerifyChangedRecipientsInternal(@NonNull List<ChangedRecipient> changedRecipients) {
+    IdentityDatabase identityDatabase = DatabaseFactory.getIdentityDatabase(context);
+
+    synchronized (SESSION_LOCK) {
+      for (ChangedRecipient changedRecipient : changedRecipients) {
+        IdentityRecord identityRecord = changedRecipient.getIdentityRecord();
+
+        if (changedRecipient.isUnverified()) {
+          identityDatabase.setVerified(identityRecord.getRecipientId(),
+                                       identityRecord.getIdentityKey(),
+                                       IdentityDatabase.VerifiedStatus.DEFAULT);
+        } else {
+          identityDatabase.setApproval(identityRecord.getRecipientId(), true);
+        }
+      }
+    }
+
+    return TrustAndVerifyResult.TRUST_AND_VERIFY;
+  }
+
+  @WorkerThread
+  private TrustAndVerifyResult trustOrVerifyChangedRecipientsAndResendInternal(@NonNull List<ChangedRecipient> changedRecipients,
+                                                                               @NonNull MessageRecord messageRecord) {
+    synchronized (SESSION_LOCK) {
+      for (ChangedRecipient changedRecipient : changedRecipients) {
+        SignalProtocolAddress      mismatchAddress  = new SignalProtocolAddress(changedRecipient.getRecipient().requireServiceId(), 1);
+        TextSecureIdentityKeyStore identityKeyStore = new TextSecureIdentityKeyStore(context);
+        identityKeyStore.saveIdentity(mismatchAddress, changedRecipient.getIdentityRecord().getIdentityKey(), true);
+      }
+    }
+
+    if (messageRecord.isOutgoing()) {
+      processOutgoingMessageRecord(changedRecipients, messageRecord);
+    }
+
+    return TrustAndVerifyResult.TRUST_VERIFY_AND_RESEND;
+  }
+
+  @WorkerThread
+  private void processOutgoingMessageRecord(@NonNull List<ChangedRecipient> changedRecipients, @NonNull MessageRecord messageRecord) {
+    SmsDatabase smsDatabase = DatabaseFactory.getSmsDatabase(context);
+    MmsDatabase mmsDatabase = DatabaseFactory.getMmsDatabase(context);
+
+    for (ChangedRecipient changedRecipient : changedRecipients) {
+      RecipientId id          = changedRecipient.getRecipient().getId();
+      IdentityKey identityKey = changedRecipient.getIdentityRecord().getIdentityKey();
+
+      if (messageRecord.isMms()) {
+        mmsDatabase.removeMismatchedIdentity(messageRecord.getId(), id, identityKey);
+
+        if (messageRecord.getRecipient().isPushGroup()) {
+          MessageSender.resendGroupMessage(context, messageRecord, id);
+        } else {
+          MessageSender.resend(context, messageRecord);
+        }
+      } else {
+        smsDatabase.removeMismatchedIdentity(messageRecord.getId(), id, identityKey);
+
+        MessageSender.resend(context, messageRecord);
+      }
+    }
+  }
+
+  static final class SafetyNumberChangeState {
+
+    private final List<ChangedRecipient> changedRecipients;
+    private final MessageRecord          messageRecord;
+
+    SafetyNumberChangeState(List<ChangedRecipient> changedRecipients, @Nullable MessageRecord messageRecord) {
+      this.changedRecipients = changedRecipients;
+      this.messageRecord     = messageRecord;
+    }
+
+    @NonNull List<ChangedRecipient> getChangedRecipients() {
+      return changedRecipients;
+    }
+
+    @Nullable MessageRecord getMessageRecord() {
+      return messageRecord;
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/SafetyNumberChangeViewModel.java

@@ -0,0 +1,61 @@
+package org.thoughtcrime.securesms.conversation.ui.error;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.Transformations;
+import androidx.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModelProvider;
+
+import org.thoughtcrime.securesms.conversation.ui.error.SafetyNumberChangeRepository.SafetyNumberChangeState;
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.recipients.RecipientId;
+
+import java.util.List;
+import java.util.Objects;
+
+public final class SafetyNumberChangeViewModel extends ViewModel {
+
+  private final SafetyNumberChangeRepository      safetyNumberChangeRepository;
+  private final LiveData<SafetyNumberChangeState> safetyNumberChangeState;
+
+  private SafetyNumberChangeViewModel(@NonNull List<RecipientId> recipientIds,
+                                      @Nullable Long messageId,
+                                      @Nullable String messageType,
+                                      SafetyNumberChangeRepository safetyNumberChangeRepository)
+  {
+    this.safetyNumberChangeRepository = safetyNumberChangeRepository;
+    safetyNumberChangeState           = this.safetyNumberChangeRepository.getSafetyNumberChangeState(recipientIds, messageId, messageType);
+  }
+
+  @NonNull LiveData<List<ChangedRecipient>> getChangedRecipients() {
+    return Transformations.map(safetyNumberChangeState, SafetyNumberChangeState::getChangedRecipients);
+  }
+
+  @NonNull LiveData<TrustAndVerifyResult> trustOrVerifyChangedRecipients() {
+    SafetyNumberChangeState state = Objects.requireNonNull(safetyNumberChangeState.getValue());
+    if (state.getMessageRecord() != null) {
+      return safetyNumberChangeRepository.trustOrVerifyChangedRecipientsAndResend(state.getChangedRecipients(), state.getMessageRecord());
+    } else {
+      return safetyNumberChangeRepository.trustOrVerifyChangedRecipients(state.getChangedRecipients());
+    }
+  }
+
+  public static final class Factory implements ViewModelProvider.Factory {
+    private final List<RecipientId> recipientIds;
+    private final Long              messageId;
+    private final String            messageType;
+
+    public Factory(@NonNull List<RecipientId> recipientIds, @Nullable Long messageId, @Nullable String messageType) {
+      this.recipientIds = recipientIds;
+      this.messageId    = messageId;
+      this.messageType  = messageType;
+    }
+
+    @Override
+    public @NonNull <T extends ViewModel> T create(@NonNull Class<T> modelClass) {
+      SafetyNumberChangeRepository repo = new SafetyNumberChangeRepository(ApplicationDependencies.getApplication());
+      return Objects.requireNonNull(modelClass.cast(new SafetyNumberChangeViewModel(recipientIds, messageId, messageType, repo)));
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/TrustAndVerifyResult.java

@@ -0,0 +1,7 @@
+package org.thoughtcrime.securesms.conversation.ui.error;
+
+public enum TrustAndVerifyResult {
+  TRUST_AND_VERIFY,
+  TRUST_VERIFY_AND_RESEND,
+  UNKNOWN
+}

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

@@ -1,184 +1,210 @@
-/*
- * Copyright (C) 2011 Whisper Systems
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
 package org.thoughtcrime.securesms.conversationlist;
 
-import android.content.Context;
-import android.database.Cursor;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.FrameLayout;
 
-import com.annimon.stream.Collectors;
-import com.annimon.stream.Stream;
+import androidx.annotation.NonNull;
+import androidx.paging.PagedListAdapter;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.RecyclerView;
 
 import org.thoughtcrime.securesms.BindableConversationListItem;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.database.ThreadDatabase;
+import org.thoughtcrime.securesms.conversationlist.model.Conversation;
 import org.thoughtcrime.securesms.database.model.ThreadRecord;
 import org.thoughtcrime.securesms.mms.GlideRequests;
-import org.thoughtcrime.securesms.util.Conversions;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.util.CachedInflater;
+import org.thoughtcrime.securesms.util.ViewUtil;
 
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
-/**
- * A CursorAdapter for building a list of conversation threads.
- *
- * @author Moxie Marlinspike
- */
-class ConversationListAdapter extends CursorRecyclerViewAdapter<ConversationListAdapter.ViewHolder> {
+class ConversationListAdapter extends PagedListAdapter<Conversation, RecyclerView.ViewHolder> {
 
-  private static final int MESSAGE_TYPE_SWITCH_ARCHIVE = 1;
-  private static final int MESSAGE_TYPE_THREAD         = 2;
-  private static final int MESSAGE_TYPE_INBOX_ZERO     = 3;
+  private static final int TYPE_THREAD      = 1;
+  private static final int TYPE_ACTION      = 2;
+  private static final int TYPE_PLACEHOLDER = 3;
 
-  private final @NonNull  ThreadDatabase    threadDatabase;
-  private final @NonNull  GlideRequests     glideRequests;
-  private final @NonNull  Locale            locale;
-  private final @NonNull  LayoutInflater    inflater;
-  private final @Nullable ItemClickListener clickListener;
-  private final @NonNull  MessageDigest     digest;
+  private enum Payload {
+    TYPING_INDICATOR,
+    SELECTION
+  }
 
-  private final Map<Long, ThreadRecord> batchSet  = Collections.synchronizedMap(new HashMap<>());
-  private       boolean                 batchMode = false;
-  private final Set<Long>               typingSet = new HashSet<>();
+  private final GlideRequests               glideRequests;
+  private final OnConversationClickListener onConversationClickListener;
+  private final Map<Long, Conversation>     batchSet  = Collections.synchronizedMap(new HashMap<>());
+  private       boolean                     batchMode = false;
+  private final Set<Long>                   typingSet = new HashSet<>();
+  private       int                         archived;
 
-  protected static class ViewHolder extends RecyclerView.ViewHolder {
-    public <V extends View & BindableConversationListItem> ViewHolder(final @NonNull V itemView)
-    {
-      super(itemView);
-    }
+  protected ConversationListAdapter(@NonNull GlideRequests glideRequests, @NonNull OnConversationClickListener onConversationClickListener) {
+    super(new ConversationDiffCallback());
 
-    public BindableConversationListItem getItem() {
-      return (BindableConversationListItem)itemView;
-    }
+    this.glideRequests               = glideRequests;
+    this.onConversationClickListener = onConversationClickListener;
   }
 
   @Override
-  public long getItemId(@NonNull Cursor cursor) {
-    ThreadRecord  record  = getThreadRecord(cursor);
+  public @NonNull RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+    if (viewType == TYPE_ACTION) {
+      ConversationViewHolder holder =  new ConversationViewHolder(LayoutInflater.from(parent.getContext())
+                                                                                .inflate(R.layout.conversation_list_item_action, parent, false));
 
-    return Conversions.byteArrayToLong(digest.digest(record.getRecipient().getId().serialize().getBytes()));
-  }
+      holder.itemView.setOnClickListener(v -> {
+        int position = holder.getAdapterPosition();
 
-  @Override
-  protected long getFastAccessItemId(int position) {
-    return super.getFastAccessItemId(position);
-  }
-
-  ConversationListAdapter(@NonNull Context context,
-                          @NonNull GlideRequests glideRequests,
-                          @NonNull Locale locale,
-                          @Nullable Cursor cursor,
-                          @Nullable ItemClickListener clickListener)
-  {
-    super(context, cursor);
-    try {
-      this.glideRequests  = glideRequests;
-      this.threadDatabase = DatabaseFactory.getThreadDatabase(context);
-      this.locale         = locale;
-      this.inflater       = LayoutInflater.from(context);
-      this.clickListener  = clickListener;
-      this.digest         = MessageDigest.getInstance("SHA1");
-      setHasStableIds(true);
-    } catch (NoSuchAlgorithmException nsae) {
-      throw new AssertionError("SHA-1 missing");
-    }
-  }
-
-  @Override
-  public ViewHolder onCreateItemViewHolder(ViewGroup parent, int viewType) {
-    if (viewType == MESSAGE_TYPE_SWITCH_ARCHIVE) {
-      ConversationListItemAction action = (ConversationListItemAction) inflater.inflate(R.layout.conversation_list_item_action,
-                                                                                        parent, false);
-
-      action.setOnClickListener(v -> {
-        if (clickListener != null) clickListener.onSwitchToArchive();
+        if (position != RecyclerView.NO_POSITION) {
+          onConversationClickListener.onShowArchiveClick();
+        }
       });
 
-      return new ViewHolder(action);
-    } else if (viewType == MESSAGE_TYPE_INBOX_ZERO) {
-      return new ViewHolder((ConversationListItemInboxZero)inflater.inflate(R.layout.conversation_list_item_inbox_zero, parent, false));
+      return holder;
+    } else if (viewType == TYPE_THREAD) {
+      ConversationViewHolder holder =  new ConversationViewHolder(CachedInflater.from(parent.getContext())
+                                                                                .inflate(R.layout.conversation_list_item_view, parent, false));
+
+      holder.itemView.setOnClickListener(v -> {
+        int position = holder.getAdapterPosition();
+
+        if (position != RecyclerView.NO_POSITION) {
+          onConversationClickListener.onConversationClick(getItem(position));
+        }
+      });
+
+      holder.itemView.setOnLongClickListener(v -> {
+        int position = holder.getAdapterPosition();
+
+        if (position != RecyclerView.NO_POSITION) {
+          return onConversationClickListener.onConversationLongClick(getItem(position));
+        }
+
+        return false;
+      });
+      return holder;
+    } else if (viewType == TYPE_PLACEHOLDER) {
+      View v = new FrameLayout(parent.getContext());
+      v.setLayoutParams(new FrameLayout.LayoutParams(1, ViewUtil.dpToPx(100)));
+      return new PlaceholderViewHolder(v);
     } else {
-      final ConversationListItem item = (ConversationListItem)inflater.inflate(R.layout.conversation_list_item_view,
-                                                                               parent, false);
-
-      item.setOnClickListener(view -> {
-        if (clickListener != null) clickListener.onItemClick(item);
-      });
-
-      item.setOnLongClickListener(view -> {
-        if (clickListener != null) clickListener.onItemLongClick(item);
-        return true;
-      });
-
-      return new ViewHolder(item);
+      throw new IllegalStateException("Unknown type! " + viewType);
     }
   }
 
   @Override
-  public void onItemViewRecycled(ViewHolder holder) {
-    holder.getItem().unbind();
-  }
-
-  @Override
-  public void onBindItemViewHolder(ViewHolder viewHolder, @NonNull Cursor cursor) {
-    viewHolder.getItem().bind(getThreadRecord(cursor), glideRequests, locale, typingSet, batchSet.keySet(), batchMode);
-  }
-
-  @Override
-  public int getItemViewType(@NonNull Cursor cursor) {
-    ThreadRecord threadRecord = getThreadRecord(cursor);
-
-    if (threadRecord.getDistributionType() == ThreadDatabase.DistributionTypes.ARCHIVE) {
-      return MESSAGE_TYPE_SWITCH_ARCHIVE;
-    } else if (threadRecord.getDistributionType() == ThreadDatabase.DistributionTypes.INBOX_ZERO) {
-      return MESSAGE_TYPE_INBOX_ZERO;
+  public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position, @NonNull List<Object> payloads) {
+    if (payloads.isEmpty()) {
+      onBindViewHolder(holder, position);
     } else {
-      return MESSAGE_TYPE_THREAD;
+      for (Object payloadObject : payloads) {
+        if (payloadObject instanceof Payload) {
+          Payload payload = (Payload) payloadObject;
+
+          if (payload == Payload.SELECTION) {
+            ((ConversationViewHolder) holder).getConversationListItem().setBatchMode(batchMode);
+          } else {
+            ((ConversationViewHolder) holder).getConversationListItem().updateTypingIndicator(typingSet);
+          }
+        }
+      }
     }
   }
 
-  public void setTypingThreads(@NonNull Set<Long> threadsIds) {
-    typingSet.clear();
-    typingSet.addAll(threadsIds);
-    notifyDataSetChanged();
+  @Override
+  public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+    if (holder.getItemViewType() == TYPE_ACTION) {
+      ConversationViewHolder casted = (ConversationViewHolder) holder;
+
+      casted.getConversationListItem().bind(new ThreadRecord.Builder(100)
+                                                            .setBody("")
+                                                            .setDate(100)
+                                                            .setRecipient(Recipient.UNKNOWN)
+                                                            .setCount(archived)
+                                                            .build(),
+                                            glideRequests,
+                                            Locale.getDefault(),
+                                            typingSet,
+                                            getBatchSelectionIds(),
+                                            batchMode);
+    } else if (holder.getItemViewType() == TYPE_THREAD) {
+      ConversationViewHolder casted       = (ConversationViewHolder) holder;
+      Conversation           conversation = Objects.requireNonNull(getItem(position));
+
+      casted.getConversationListItem().bind(conversation.getThreadRecord(),
+                                            glideRequests,
+                                            Locale.getDefault(),
+                                            typingSet,
+                                            getBatchSelectionIds(),
+                                            batchMode);
+    }
   }
 
-  private ThreadRecord getThreadRecord(@NonNull Cursor cursor) {
-    return threadDatabase.readerFor(cursor).getCurrent();
+  @Override
+  public void onViewRecycled(@NonNull RecyclerView.ViewHolder holder) {
+    if (holder instanceof ConversationViewHolder) {
+      ((ConversationViewHolder) holder).getConversationListItem().unbind();
+    }
   }
 
-  void toggleThreadInBatchSet(@NonNull ThreadRecord thread) {
-    if (batchSet.containsKey(thread.getThreadId())) {
-      batchSet.remove(thread.getThreadId());
-    } else if (thread.getThreadId() != -1) {
-      batchSet.put(thread.getThreadId(), thread);
+  void setTypingThreads(@NonNull Set<Long> typingThreadSet) {
+    this.typingSet.clear();
+    this.typingSet.addAll(typingThreadSet);
+
+    notifyItemRangeChanged(0, getItemCount(), Payload.TYPING_INDICATOR);
+  }
+
+  void toggleConversationInBatchSet(@NonNull Conversation conversation) {
+    if (batchSet.containsKey(conversation.getThreadRecord().getThreadId())) {
+      batchSet.remove(conversation.getThreadRecord().getThreadId());
+    } else if (conversation.getThreadRecord().getThreadId() != -1) {
+      batchSet.put(conversation.getThreadRecord().getThreadId(), conversation);
+    }
+
+    notifyItemRangeChanged(0, getItemCount(), Payload.SELECTION);
+  }
+
+  Collection<Conversation> getBatchSelection() {
+    return batchSet.values();
+  }
+
+  void updateArchived(int archived) {
+    int oldArchived = this.archived;
+
+    this.archived = archived;
+
+    if (oldArchived != archived) {
+      if (archived == 0) {
+        notifyItemRemoved(getItemCount());
+      } else if (oldArchived == 0) {
+        notifyItemInserted(getItemCount() - 1);
+      } else {
+        notifyItemChanged(getItemCount() - 1);
+      }
+    }
+  }
+
+  @Override
+  public int getItemCount() {
+    return (archived > 0 ? 1 : 0) + super.getItemCount();
+  }
+
+  @Override
+  public int getItemViewType(int position) {
+    if (archived > 0 && position == getItemCount() - 1) {
+      return TYPE_ACTION;
+    } else if (getItem(position) == null) {
+      return TYPE_PLACEHOLDER;
+    } else {
+      return TYPE_THREAD;
     }
   }
 
@@ -186,8 +212,15 @@ class ConversationListAdapter extends CursorRecyclerViewAdapter<ConversationList
     return batchSet.keySet();
   }
 
-  @NonNull Set<ThreadRecord> getBatchSelection() {
-    return new HashSet<>(batchSet.values());
+  void selectAllThreads() {
+    for (int i = 0; i < super.getItemCount(); i++) {
+      Conversation conversation = getItem(i);
+      if (conversation != null && conversation.getThreadRecord().getThreadId() != -1) {
+        batchSet.put(conversation.getThreadRecord().getThreadId(), conversation);
+      }
+    }
+
+    notifyItemRangeChanged(0, getItemCount(), Payload.SELECTION);
   }
 
   void initializeBatchMode(boolean toggle) {
@@ -196,23 +229,48 @@ class ConversationListAdapter extends CursorRecyclerViewAdapter<ConversationList
   }
 
   private void unselectAllThreads() {
-    this.batchSet.clear();
-    this.notifyDataSetChanged();
+    batchSet.clear();
+
+    notifyItemRangeChanged(0, getItemCount(), Payload.SELECTION);
   }
 
-  void selectAllThreads() {
-    for (int i = 0; i < getItemCount(); i++) {
-      ThreadRecord record = getThreadRecord(getCursorAtPositionOrThrow(i));
-      if (record.getThreadId() != -1) {
-        batchSet.put(record.getThreadId(), record);
-      }
+  static final class ConversationViewHolder extends RecyclerView.ViewHolder {
+
+    private final BindableConversationListItem conversationListItem;
+
+    ConversationViewHolder(@NonNull View itemView) {
+      super(itemView);
+
+      conversationListItem = (BindableConversationListItem) itemView;
+    }
+
+    public BindableConversationListItem getConversationListItem() {
+      return conversationListItem;
     }
-    this.notifyDataSetChanged();
   }
 
-  interface ItemClickListener {
-    void onItemClick(ConversationListItem item);
-    void onItemLongClick(ConversationListItem item);
-    void onSwitchToArchive();
+  private static final class ConversationDiffCallback extends DiffUtil.ItemCallback<Conversation> {
+
+    @Override
+    public boolean areItemsTheSame(@NonNull Conversation oldItem, @NonNull Conversation newItem) {
+      return oldItem.getThreadRecord().getThreadId() == newItem.getThreadRecord().getThreadId();
+    }
+
+    @Override
+    public boolean areContentsTheSame(@NonNull Conversation oldItem, @NonNull Conversation newItem) {
+      return oldItem.equals(newItem);
+    }
+  }
+
+  private static class PlaceholderViewHolder extends RecyclerView.ViewHolder {
+    PlaceholderViewHolder(@NonNull View itemView) {
+      super(itemView);
+    }
+  }
+
+  interface OnConversationClickListener {
+    void onConversationClick(Conversation conversation);
+    boolean onConversationLongClick(Conversation conversation);
+    void onShowArchiveClick();
   }
 }

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

@@ -17,14 +17,9 @@
 package org.thoughtcrime.securesms.conversationlist;
 
 import android.annotation.SuppressLint;
-import android.database.Cursor;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.View;
-import android.view.ViewGroup;
 
 import androidx.annotation.DrawableRes;
 import androidx.annotation.MenuRes;
@@ -35,22 +30,17 @@ import androidx.annotation.WorkerThread;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.view.ActionMode;
 import androidx.appcompat.widget.Toolbar;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.Loader;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.snackbar.Snackbar;
 
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.registration.PulsingFloatingActionButton;
-import org.thoughtcrime.securesms.conversationlist.ConversationListAdapter.ItemClickListener;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.database.loaders.ConversationListLoader;
 import org.thoughtcrime.securesms.util.task.SnackbarAsyncTask;
 
 
-public class ConversationListArchiveFragment extends ConversationListFragment
-  implements LoaderManager.LoaderCallbacks<Cursor>, ActionMode.Callback, ItemClickListener
+public class ConversationListArchiveFragment extends ConversationListFragment implements ActionMode.Callback
 {
   private RecyclerView                list;
   private View                        emptyState;
@@ -71,10 +61,10 @@ public class ConversationListArchiveFragment extends ConversationListFragment
   public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
     super.onViewCreated(view, savedInstanceState);
 
-    list          = view.findViewById(R.id.list);
-    fab           = view.findViewById(R.id.fab);
-    cameraFab     = view.findViewById(R.id.camera_fab);
-    emptyState    = view.findViewById(R.id.empty_state);
+    list       = view.findViewById(R.id.list);
+    fab        = view.findViewById(R.id.fab);
+    cameraFab  = view.findViewById(R.id.camera_fab);
+    emptyState = view.findViewById(R.id.empty_state);
 
     ((AppCompatActivity) requireActivity()).getSupportActionBar().setDisplayHomeAsUpEnabled(true);
     Toolbar toolbar = view.findViewById(R.id.toolbar_basic);
@@ -86,16 +76,14 @@ public class ConversationListArchiveFragment extends ConversationListFragment
   }
 
   @Override
-  public @NonNull Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
-    return new ConversationListLoader(getActivity(), null, true);
+  protected void onPostSubmitList() {
+    list.setVisibility(View.VISIBLE);
+    emptyState.setVisibility(View.GONE);
   }
 
   @Override
-  public void onLoadFinished(@NonNull Loader<Cursor> arg0, Cursor cursor) {
-    super.onLoadFinished(arg0, cursor);
-
-    list.setVisibility(View.VISIBLE);
-    emptyState.setVisibility(View.GONE);
+  protected boolean isArchived() {
+    return true;
   }
 
   @Override

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

@@ -0,0 +1,170 @@
+package org.thoughtcrime.securesms.conversationlist;
+
+import android.content.Context;
+import android.database.ContentObserver;
+import android.database.Cursor;
+
+import androidx.annotation.NonNull;
+import androidx.paging.DataSource;
+import androidx.paging.PositionalDataSource;
+
+import org.thoughtcrime.securesms.conversationlist.model.Conversation;
+import org.thoughtcrime.securesms.database.DatabaseContentProviders;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.database.ThreadDatabase;
+import org.thoughtcrime.securesms.database.model.ThreadRecord;
+import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
+import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.util.ThrottledDebouncer;
+import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
+import org.thoughtcrime.securesms.util.paging.Invalidator;
+import org.thoughtcrime.securesms.util.paging.SizeFixResult;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.Executor;
+
+abstract class ConversationListDataSource extends PositionalDataSource<Conversation> {
+
+  public static final Executor EXECUTOR = SignalExecutors.newFixedLifoThreadExecutor("signal-conversation-list", 1, 1);
+
+  private static final ThrottledDebouncer THROTTLER = new ThrottledDebouncer(500);
+
+  private static final String TAG = Log.tag(ConversationListDataSource.class);
+
+  protected final ThreadDatabase threadDatabase;
+
+  protected ConversationListDataSource(@NonNull Context context, @NonNull Invalidator invalidator) {
+    this.threadDatabase = DatabaseFactory.getThreadDatabase(context);
+
+    ContentObserver contentObserver = new ContentObserver(null) {
+      @Override
+      public void onChange(boolean selfChange) {
+        THROTTLER.publish(() -> {
+          invalidate();
+          context.getContentResolver().unregisterContentObserver(this);
+        });
+      }
+    };
+
+    invalidator.observe(() -> {
+      invalidate();
+      context.getContentResolver().unregisterContentObserver(contentObserver);
+    });
+
+    context.getContentResolver().registerContentObserver(DatabaseContentProviders.ConversationList.CONTENT_URI,  true, contentObserver);
+  }
+
+  private static ConversationListDataSource create(@NonNull Context context, @NonNull Invalidator invalidator, boolean isArchived) {
+    if (!isArchived) return new UnarchivedConversationListDataSource(context, invalidator);
+    else             return new ArchivedConversationListDataSource(context, invalidator);
+  }
+
+  @Override
+  public final void loadInitial(@NonNull LoadInitialParams params, @NonNull LoadInitialCallback<Conversation> callback) {
+    long start = System.currentTimeMillis();
+
+    List<Conversation> conversations  = new ArrayList<>(params.requestedLoadSize);
+    int                totalCount     = getTotalCount();
+    int                effectiveCount = params.requestedStartPosition;
+    List<Recipient>    recipients     = new LinkedList<>();
+
+    try (ThreadDatabase.Reader reader = threadDatabase.readerFor(getCursor(params.requestedStartPosition, params.requestedLoadSize))) {
+      ThreadRecord record;
+      while ((record = reader.getNext()) != null && effectiveCount < totalCount && !isInvalid()) {
+        conversations.add(new Conversation(record));
+        recipients.add(record.getRecipient());
+        effectiveCount++;
+      }
+    }
+
+    ApplicationDependencies.getRecipientCache().addToCache(recipients);
+
+    if (!isInvalid()) {
+      SizeFixResult<Conversation> result = SizeFixResult.ensureMultipleOfPageSize(conversations, params.requestedStartPosition, params.pageSize, totalCount);
+
+      callback.onResult(result.getItems(), params.requestedStartPosition, result.getTotal());
+    }
+
+    Log.d(TAG, "[Initial Load] " + (System.currentTimeMillis() - start) + " ms | start: " + params.requestedStartPosition + ", size: " + params.requestedLoadSize + ", totalCount: " + totalCount + ", class: " + getClass().getSimpleName() + (isInvalid() ? " -- invalidated" : ""));
+  }
+
+  @Override
+  public final void loadRange(@NonNull LoadRangeParams params, @NonNull LoadRangeCallback<Conversation> callback) {
+    long start = System.currentTimeMillis();
+
+    List<Conversation> conversations = new ArrayList<>(params.loadSize);
+    List<Recipient>    recipients    = new LinkedList<>();
+
+    try (ThreadDatabase.Reader reader = threadDatabase.readerFor(getCursor(params.startPosition, params.loadSize))) {
+      ThreadRecord record;
+      while ((record = reader.getNext()) != null && !isInvalid()) {
+        conversations.add(new Conversation(record));
+        recipients.add(record.getRecipient());
+      }
+    }
+
+    ApplicationDependencies.getRecipientCache().addToCache(recipients);
+
+    callback.onResult(conversations);
+
+    Log.d(TAG, "[Update] " + (System.currentTimeMillis() - start) + " ms | start: " + params.startPosition + ", size: " + params.loadSize + ", class: " + getClass().getSimpleName() + (isInvalid() ? " -- invalidated" : ""));
+  }
+
+  protected abstract int getTotalCount();
+  protected abstract Cursor getCursor(long offset, long limit);
+
+  private static class ArchivedConversationListDataSource extends ConversationListDataSource {
+
+    ArchivedConversationListDataSource(@NonNull Context context, @NonNull Invalidator invalidator) {
+      super(context, invalidator);
+    }
+
+    @Override
+    protected int getTotalCount() {
+      return threadDatabase.getArchivedConversationListCount();
+    }
+
+    @Override
+    protected Cursor getCursor(long offset, long limit) {
+      return threadDatabase.getArchivedConversationList(offset, limit);
+    }
+  }
+
+  private static class UnarchivedConversationListDataSource extends ConversationListDataSource {
+
+    UnarchivedConversationListDataSource(@NonNull Context context, @NonNull Invalidator invalidator) {
+      super(context, invalidator);
+    }
+
+    @Override
+    protected int getTotalCount() {
+      return threadDatabase.getUnarchivedConversationListCount();
+    }
+
+    @Override
+    protected Cursor getCursor(long offset, long limit) {
+      return threadDatabase.getConversationList(offset, limit);
+    }
+  }
+
+  static class Factory extends DataSource.Factory<Integer, Conversation> {
+
+    private final Context     context;
+    private final Invalidator invalidator;
+    private final boolean     isArchived;
+
+    public Factory(@NonNull Context context, @NonNull Invalidator invalidator, boolean isArchived) {
+      this.context     = context;
+      this.invalidator = invalidator;
+      this.isArchived  = isArchived;
+    }
+
+    @Override
+    public @NonNull DataSource<Integer, Conversation> create() {
+      return ConversationListDataSource.create(context, invalidator, isArchived);
+    }
+  }
+}

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

@@ -22,13 +22,11 @@ import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Resources;
 import android.content.res.TypedArray;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Color;
-import android.graphics.Paint;
+import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
@@ -55,12 +53,11 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.view.ActionMode;
 import androidx.appcompat.widget.Toolbar;
 import androidx.appcompat.widget.TooltipCompat;
+import androidx.core.content.res.ResourcesCompat;
 import androidx.lifecycle.DefaultLifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.ProcessLifecycleOwner;
 import androidx.lifecycle.ViewModelProviders;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.Loader;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -91,18 +88,19 @@ import org.thoughtcrime.securesms.components.reminder.ServiceOutageReminder;
 import org.thoughtcrime.securesms.components.reminder.ShareReminder;
 import org.thoughtcrime.securesms.components.reminder.SystemSmsImportReminder;
 import org.thoughtcrime.securesms.components.reminder.UnauthorizedReminder;
-import org.thoughtcrime.securesms.conversationlist.ConversationListAdapter.ItemClickListener;
+import org.thoughtcrime.securesms.conversation.ConversationFragment;
+import org.thoughtcrime.securesms.conversationlist.model.Conversation;
 import org.thoughtcrime.securesms.conversationlist.model.MessageResult;
 import org.thoughtcrime.securesms.conversationlist.model.SearchResult;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MessagingDatabase.MarkedMessageInfo;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
-import org.thoughtcrime.securesms.database.loaders.ConversationListLoader;
 import org.thoughtcrime.securesms.database.model.ThreadRecord;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.events.ReminderUpdateEvent;
 import org.thoughtcrime.securesms.insights.InsightsLauncher;
 import org.thoughtcrime.securesms.jobs.ServiceOutageDetectionJob;
+import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.lock.v2.CreateKbsPinActivity;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mediasend.MediaSendActivity;
@@ -119,6 +117,7 @@ import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.storage.StorageSyncHelper;
 import org.thoughtcrime.securesms.util.AvatarUtil;
 import org.thoughtcrime.securesms.util.ServiceUtil;
+import org.thoughtcrime.securesms.util.SnapToTopDataObserver;
 import org.thoughtcrime.securesms.util.StickyHeaderDecoration;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
@@ -126,28 +125,25 @@ import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
 import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
 import org.thoughtcrime.securesms.util.task.SnackbarAsyncTask;
-import org.whispersystems.libsignal.util.Pair;
 import org.whispersystems.libsignal.util.guava.Optional;
 
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;
 import java.util.Set;
 
 import static android.app.Activity.RESULT_OK;
 
 
-public class ConversationListFragment extends MainFragment implements LoaderManager.LoaderCallbacks<Cursor>,
-                                                                      ActionMode.Callback,
-                                                                      ItemClickListener,
+public class ConversationListFragment extends MainFragment implements ActionMode.Callback,
+                                                                      ConversationListAdapter.OnConversationClickListener,
                                                                       ConversationListSearchAdapter.EventListener,
                                                                       MainNavigator.BackHandler,
                                                                       MegaphoneActionController
 {
   public static final short MESSAGE_REQUESTS_REQUEST_CODE_CREATE_NAME = 32562;
-  public static final short PROFILE_NAMES_REQUEST_CODE_CREATE_NAME    = 18473;
-  public static final short PROFILE_NAMES_REQUEST_CODE_CONFIRM_NAME   = 19563;
 
   private static final String TAG = Log.tag(ConversationListFragment.class);
 
@@ -157,23 +153,25 @@ public class ConversationListFragment extends MainFragment implements LoaderMana
                                                         R.drawable.empty_inbox_4,
                                                         R.drawable.empty_inbox_5 };
 
-  private ActionMode                    actionMode;
-  private RecyclerView                  list;
-  private ReminderView                  reminderView;
-  private View                          emptyState;
-  private ImageView                     emptyImage;
-  private TextView                      searchEmptyState;
-  private PulsingFloatingActionButton   fab;
-  private PulsingFloatingActionButton   cameraFab;
-  private SearchToolbar                 searchToolbar;
-  private ImageView                     searchAction;
-  private View                          toolbarShadow;
-  private ConversationListViewModel     viewModel;
-  private RecyclerView.Adapter          activeAdapter;
-  private ConversationListAdapter       defaultAdapter;
-  private ConversationListSearchAdapter searchAdapter;
-  private StickyHeaderDecoration        searchAdapterDecoration;
-  private ViewGroup                     megaphoneContainer;
+  private ActionMode                        actionMode;
+  private RecyclerView                      list;
+  private ReminderView                      reminderView;
+  private View                              emptyState;
+  private ImageView                         emptyImage;
+  private TextView                          searchEmptyState;
+  private PulsingFloatingActionButton       fab;
+  private PulsingFloatingActionButton       cameraFab;
+  private SearchToolbar                     searchToolbar;
+  private ImageView                         searchAction;
+  private View                              toolbarShadow;
+  private ConversationListViewModel         viewModel;
+  private RecyclerView.Adapter              activeAdapter;
+  private ConversationListAdapter           defaultAdapter;
+  private ConversationListSearchAdapter     searchAdapter;
+  private StickyHeaderDecoration            searchAdapterDecoration;
+  private ViewGroup                         megaphoneContainer;
+  private SnapToTopDataObserver             snapToTopDataObserver;
+  private Drawable                          archiveDrawable;
 
   public static ConversationListFragment newInstance() {
     return new ConversationListFragment();
@@ -214,10 +212,12 @@ public class ConversationListFragment extends MainFragment implements LoaderMana
     reminderView.setOnDismissListener(this::updateReminders);
 
     list.setHasFixedSize(true);
-    list.setLayoutManager(new LinearLayoutManager(getActivity()));
+    list.setLayoutManager(new LinearLayoutManager(requireActivity()));
     list.setItemAnimator(new DeleteItemAnimator());
     list.addOnScrollListener(new ScrollListener());
 
+    snapToTopDataObserver = new SnapToTopDataObserver(list, null);
+
     new ItemTouchHelper(new ArchiveListenerCallback()).attachToRecyclerView(list);
 
     fab.setOnClickListener(v -> startActivity(new Intent(getActivity(), NewConversationActivity.class)));
@@ -247,7 +247,6 @@ public class ConversationListFragment extends MainFragment implements LoaderMana
     super.onResume();
 
     updateReminders();
-    list.getAdapter().notifyDataSetChanged();
     EventBus.getDefault().register(this);
 
     if (TextSecurePreferences.isSmsEnabled(requireContext())) {
@@ -257,17 +256,19 @@ public class ConversationListFragment extends MainFragment implements LoaderMana
     SimpleTask.run(getLifecycle(), Recipient::self, this::initializeProfileIcon);
 
     if (!searchToolbar.isVisible() && list.getAdapter() != defaultAdapter) {
-      activeAdapter = defaultAdapter;
       list.removeItemDecoration(searchAdapterDecoration);
-      list.setAdapter(defaultAdapter);
+      setAdapter(defaultAdapter);
+    }
+
+    if (activeAdapter != null) {
+      activeAdapter.notifyDataSetChanged();
     }
   }
 
   @Override
   public void onStart() {
     super.onStart();
-    // TODO [greyson] Re-enable when we figure out how to invalidate the cache after a system theme change
-//    ConversationFragment.prepare(requireContext());
+    ConversationFragment.prepare(requireContext());
   }
 
   @Override
@@ -314,9 +315,8 @@ public class ConversationListFragment extends MainFragment implements LoaderMana
 
   private boolean closeSearchIfOpen() {
     if (searchToolbar.isVisible() || activeAdapter == searchAdapter) {
-      activeAdapter = defaultAdapter;
       list.removeItemDecoration(searchAdapterDecoration);
-      list.setAdapter(defaultAdapter);
+      setAdapter(defaultAdapter);
       searchToolbar.collapse();
       return true;
     }
@@ -330,20 +330,9 @@ public class ConversationListFragment extends MainFragment implements LoaderMana
       return;
     }
 
-    boolean isProfileCreatedRequestCode = requestCode == MESSAGE_REQUESTS_REQUEST_CODE_CREATE_NAME ||
-                                          requestCode ==PROFILE_NAMES_REQUEST_CODE_CREATE_NAME;
-
     if (requestCode == CreateKbsPinActivity.REQUEST_NEW_PIN) {
-      Snackbar.make(fab, R.string.ConfirmKbsPinFragment__pin_created, Snackbar.LENGTH_LONG).show();
+      Snackbar.make(fab, R.string.ConfirmKbsPinFragment__pin_created, Snackbar.LENGTH_LONG).setTextColor(Color.WHITE).show();
       viewModel.onMegaphoneCompleted(Megaphones.Event.PINS_FOR_ALL);
-    } else if (isProfileCreatedRequestCode) {
-      Snackbar.make(fab, R.string.ConversationListFragment__your_profile_name_has_been_created, Snackbar.LENGTH_LONG).show();
-
-      if (requestCode == MESSAGE_REQUESTS_REQUEST_CODE_CREATE_NAME) {
-        viewModel.onMegaphoneCompleted(Megaphones.Event.MESSAGE_REQUESTS);
-      }
-    } else if (requestCode == PROFILE_NAMES_REQUEST_CODE_CONFIRM_NAME) {
-      Snackbar.make(fab, R.string.ConversationListFragment__your_profile_name_has_been_saved, Snackbar.LENGTH_LONG).show();
     }
   }
 
@@ -356,6 +345,11 @@ public class ConversationListFragment extends MainFragment implements LoaderMana
                                     -1);
   }
 
+  @Override
+  public void onShowArchiveClick() {
+    getNavigator().goToArchiveList();
+  }
+
   @Override
   public void onContactClicked(@NonNull Recipient contact) {
     SimpleTask.run(getViewLifecycleOwner().getLifecycle(), () -> {
@@ -395,7 +389,9 @@ public class ConversationListFragment extends MainFragment implements LoaderMana
 
   @Override
   public void onMegaphoneToastRequested(@NonNull String string) {
-    Snackbar.make(fab, string, Snackbar.LENGTH_LONG).show();
+    Snackbar.make(fab, string, Snackbar.LENGTH_LONG)
+            .setTextColor(Color.WHITE)
+            .show();
   }
 
   @Override
@@ -440,16 +436,14 @@ public class ConversationListFragment extends MainFragment implements LoaderMana
 
         if (trimmed.length() > 0) {
           if (activeAdapter != searchAdapter) {
-            activeAdapter = searchAdapter;
-            list.setAdapter(searchAdapter);
+            setAdapter(searchAdapter);
             list.removeItemDecoration(searchAdapterDecoration);
             list.addItemDecoration(searchAdapterDecoration);
           }
         } else {
           if (activeAdapter != defaultAdapter) {
-            activeAdapter = defaultAdapter;
             list.removeItemDecoration(searchAdapterDecoration);
-            list.setAdapter(defaultAdapter);
+            setAdapter(defaultAdapter);
           }
         }
       }
@@ -457,19 +451,36 @@ public class ConversationListFragment extends MainFragment implements LoaderMana
       @Override
       public void onSearchClosed() {
         list.removeItemDecoration(searchAdapterDecoration);
-        list.setAdapter(defaultAdapter);
+        setAdapter(defaultAdapter);
       }
     });
   }
 
   private void initializeListAdapters() {
-    defaultAdapter          = new ConversationListAdapter      (requireContext(), GlideApp.with(this), Locale.getDefault(), null, this);
-    searchAdapter           = new ConversationListSearchAdapter(GlideApp.with(this), this, Locale.getDefault            ()            );
+    defaultAdapter          = new ConversationListAdapter(GlideApp.with(this), this);
+    searchAdapter           = new ConversationListSearchAdapter(GlideApp.with(this), this, Locale.getDefault());
     searchAdapterDecoration = new StickyHeaderDecoration(searchAdapter, false, false);
-    activeAdapter           = defaultAdapter;
 
-    list.setAdapter(defaultAdapter);
-    LoaderManager.getInstance(this).restartLoader(0, null, this);
+    setAdapter(defaultAdapter);
+  }
+
+  @SuppressWarnings("rawtypes")
+  private void setAdapter(@NonNull RecyclerView.Adapter adapter) {
+    RecyclerView.Adapter oldAdapter = activeAdapter;
+
+    activeAdapter = adapter;
+
+    if (oldAdapter == activeAdapter) {
+      return;
+    }
+
+    list.setAdapter(adapter);
+
+    if (adapter == defaultAdapter) {
+      defaultAdapter.registerAdapterDataObserver(snapToTopDataObserver);
+    } else {
+      defaultAdapter.unregisterAdapterDataObserver(snapToTopDataObserver);
+    }
   }
 
   private void initializeTypingObserver() {
@@ -482,11 +493,16 @@ public class ConversationListFragment extends MainFragment implements LoaderMana
     });
   }
 
+  protected boolean isArchived() {
+    return false;
+  }
+
   private void initializeViewModel() {
-    viewModel = ViewModelProviders.of(this, new ConversationListViewModel.Factory()).get(ConversationListViewModel.class);
+    viewModel = ViewModelProviders.of(this, new ConversationListViewModel.Factory(isArchived())).get(ConversationListViewModel.class);
 
     viewModel.getSearchResult().observe(this, this::onSearchResultChanged);
     viewModel.getMegaphone().observe(this, this::onMegaphoneChanged);
+    viewModel.getConversationList().observe(this, this::onSubmitList);
 
     ProcessLifecycleOwner.get().getLifecycle().addObserver(new DefaultLifecycleObserver() {
       @Override
@@ -733,14 +749,8 @@ public class ConversationListFragment extends MainFragment implements LoaderMana
     getNavigator().goToConversation(recipient.getId(), threadId, distributionType, -1);
   }
 
-  @Override
-  public @NonNull Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
-    return new ConversationListLoader(getActivity(), null, false);
-  }
-
-  @Override
-  public void onLoadFinished(@NonNull Loader<Cursor> arg0, Cursor cursor) {
-    if (cursor == null || cursor.getCount() <= 0) {
+  private void onSubmitList(@NonNull ConversationListViewModel.ConversationList conversationList) {
+    if (conversationList.isEmpty()) {
       list.setVisibility(View.INVISIBLE);
       emptyState.setVisibility(View.VISIBLE);
       emptyImage.setImageResource(EMPTY_IMAGES[(int) (Math.random() * EMPTY_IMAGES.length)]);
@@ -753,45 +763,39 @@ public class ConversationListFragment extends MainFragment implements LoaderMana
       cameraFab.stopPulse();
     }
 
-    defaultAdapter.changeCursor(cursor);
+    defaultAdapter.submitList(conversationList.getConversations());
+    defaultAdapter.updateArchived(conversationList.getArchivedCount());
+
+    onPostSubmitList();
+  }
+
+  protected void onPostSubmitList() {
   }
 
   @Override
-  public void onLoaderReset(@NonNull Loader<Cursor> arg0) {
-    defaultAdapter.changeCursor(null);
-  }
-
-  @Override
-  public void onItemClick(ConversationListItem item) {
+  public void onConversationClick(Conversation conversation) {
     if (actionMode == null) {
-      handleCreateConversation(item.getThreadId(), item.getRecipient(), item.getDistributionType());
+      handleCreateConversation(conversation.getThreadRecord().getThreadId(), conversation.getThreadRecord().getRecipient(), conversation.getThreadRecord().getDistributionType());
     } else {
-      ConversationListAdapter adapter = (ConversationListAdapter)list.getAdapter();
-      adapter.toggleThreadInBatchSet(item.getThread());
+      defaultAdapter.toggleConversationInBatchSet(conversation);
 
-      if (adapter.getBatchSelectionIds().size() == 0) {
+      if (defaultAdapter.getBatchSelectionIds().size() == 0) {
         actionMode.finish();
       } else {
         actionMode.setTitle(String.valueOf(defaultAdapter.getBatchSelectionIds().size()));
         setCorrectMenuVisibility(actionMode.getMenu());
       }
-
-      adapter.notifyDataSetChanged();
     }
   }
 
   @Override
-  public void onItemLongClick(ConversationListItem item) {
+  public boolean onConversationLongClick(Conversation conversation) {
     actionMode = ((AppCompatActivity) getActivity()).startSupportActionMode(ConversationListFragment.this);
 
     defaultAdapter.initializeBatchMode(true);
-    defaultAdapter.toggleThreadInBatchSet(item.getThread());
-    defaultAdapter.notifyDataSetChanged();
-  }
+    defaultAdapter.toggleConversationInBatchSet(conversation);
 
-  @Override
-  public void onSwitchToArchive() {
-    getNavigator().goToArchiveList();
+    return true;
   }
 
   @Override
@@ -870,7 +874,7 @@ public class ConversationListFragment extends MainFragment implements LoaderMana
   }
 
   private void setCorrectMenuVisibility(@NonNull Menu menu) {
-    boolean hasUnread = Stream.of(defaultAdapter.getBatchSelection()).anyMatch(thread -> !thread.isRead());
+    boolean hasUnread = Stream.of(defaultAdapter.getBatchSelection()).anyMatch(conversation -> !conversation.getThreadRecord().isRead());
 
     if (hasUnread) {
       menu.findItem(R.id.menu_mark_as_unread).setVisible(false);
@@ -954,11 +958,10 @@ public class ConversationListFragment extends MainFragment implements LoaderMana
 
     @Override
     public int getSwipeDirs(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder) {
-      if (viewHolder.itemView instanceof ConversationListItemAction) {
-        return 0;
-      }
-
-      if (actionMode != null) {
+      if (viewHolder.itemView instanceof ConversationListItemAction ||
+          actionMode != null                                        ||
+          activeAdapter == searchAdapter)
+      {
         return 0;
       }
 
@@ -976,7 +979,7 @@ public class ConversationListFragment extends MainFragment implements LoaderMana
     }
 
     @Override
-    public void onChildDraw(@NonNull Canvas c, @NonNull RecyclerView recyclerView,
+    public void onChildDraw(@NonNull Canvas canvas, @NonNull RecyclerView recyclerView,
                             @NonNull RecyclerView.ViewHolder viewHolder,
                             float dX, float dY, int actionState,
                             boolean isCurrentlyActive)
@@ -984,28 +987,32 @@ public class ConversationListFragment extends MainFragment implements LoaderMana
       if (viewHolder.itemView instanceof ConversationListItemInboxZero) return;
       if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) {
         View  itemView = viewHolder.itemView;
-        Paint p        = new Paint();
         float alpha    = 1.0f - Math.abs(dX) / (float) viewHolder.itemView.getWidth();
 
         if (dX > 0) {
-          Bitmap icon = BitmapFactory.decodeResource(getResources(), getArchiveIconRes());
+          Resources resources = getResources();
 
-          if (alpha > 0) p.setColor(getResources().getColor(R.color.green_500));
-          else           p.setColor(Color.WHITE);
+          if (archiveDrawable == null) {
+            archiveDrawable = ResourcesCompat.getDrawable(resources, getArchiveIconRes(), requireActivity().getTheme());
+            Objects.requireNonNull(archiveDrawable).setBounds(0, 0, archiveDrawable.getIntrinsicWidth(), archiveDrawable.getIntrinsicHeight());
+          }
 
-          c.drawRect((float) itemView.getLeft(), (float) itemView.getTop(), dX,
-                     (float) itemView.getBottom(), p);
+          canvas.save();
+          canvas.clipRect(itemView.getLeft(), itemView.getTop(), dX, itemView.getBottom());
 
-          c.drawBitmap(icon,
-                       (float) itemView.getLeft() + getResources().getDimension(R.dimen.conversation_list_fragment_archive_padding),
-                       (float) itemView.getTop() + ((float) itemView.getBottom() - (float) itemView.getTop() - icon.getHeight())/2,
-                       p);
+          canvas.drawColor(alpha > 0 ? resources.getColor(R.color.green_500) : Color.WHITE);
+
+          canvas.translate(itemView.getLeft() + resources.getDimension(R.dimen.conversation_list_fragment_archive_padding),
+                           itemView.getTop() + (itemView.getBottom() - itemView.getTop() - archiveDrawable.getIntrinsicHeight()) / 2f);
+
+          archiveDrawable.draw(canvas);
+          canvas.restore();
         }
 
         viewHolder.itemView.setAlpha(alpha);
         viewHolder.itemView.setTranslationX(dX);
       } else {
-        super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
+        super.onChildDraw(canvas, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
       }
     }
   }

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

@@ -46,7 +46,6 @@ import org.thoughtcrime.securesms.database.MmsSmsColumns;
 import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.database.model.ThreadRecord;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.LiveRecipient;
 import org.thoughtcrime.securesms.recipients.Recipient;
@@ -174,28 +173,19 @@ public class ConversationListItem extends RelativeLayout
       this.fromView.setText(recipient.get(), thread.isRead());
     }
 
-    if (typingThreads.contains(threadId)) {
-      this.subjectView.setVisibility(INVISIBLE);
+    updateTypingIndicator(typingThreads);
 
-      this.typingView.setVisibility(VISIBLE);
-      this.typingView.startAnimation();
-    } else {
-      this.typingView.setVisibility(GONE);
-      this.typingView.stopAnimation();
+    this.subjectView.setText(getTrimmedSnippet(getThreadDisplayBody(getContext(), thread)));
 
-      this.subjectView.setVisibility(VISIBLE);
-      this.subjectView.setText(getTrimmedSnippet(getThreadDisplayBody(getContext(), thread)));
-
-      if (thread.getGroupAddedBy() != null) {
-        groupAddedBy = Recipient.live(thread.getGroupAddedBy());
-        groupAddedBy.observeForever(groupAddedByObserver);
-      }
-
-      this.subjectView.setTypeface(thread.isRead() ? LIGHT_TYPEFACE : BOLD_TYPEFACE);
-      this.subjectView.setTextColor(thread.isRead() ? ThemeUtil.getThemedColor(getContext(), R.attr.conversation_list_item_subject_color)
-                                                    : ThemeUtil.getThemedColor(getContext(), R.attr.conversation_list_item_unread_color));
+    if (thread.getGroupAddedBy() != null) {
+      groupAddedBy = Recipient.live(thread.getGroupAddedBy());
+      groupAddedBy.observeForever(groupAddedByObserver);
     }
 
+    this.subjectView.setTypeface(thread.isRead() ? LIGHT_TYPEFACE : BOLD_TYPEFACE);
+    this.subjectView.setTextColor(thread.isRead() ? ThemeUtil.getThemedColor(getContext(), R.attr.conversation_list_item_subject_color)
+                                                  : ThemeUtil.getThemedColor(getContext(), R.attr.conversation_list_item_unread_color));
+
     if (thread.getDate() > 0) {
       CharSequence date = DateUtils.getBriefRelativeTimeSpanString(getContext(), locale, thread.getDate());
       dateView.setText(date);
@@ -291,11 +281,27 @@ public class ConversationListItem extends RelativeLayout
     }
   }
 
-  private void setBatchMode(boolean batchMode) {
+  @Override
+  public void setBatchMode(boolean batchMode) {
     this.batchMode = batchMode;
     setSelected(batchMode && selectedThreads.contains(thread.getThreadId()));
   }
 
+  @Override
+  public void updateTypingIndicator(@NonNull Set<Long> typingThreads) {
+    if (typingThreads.contains(threadId)) {
+      this.subjectView.setVisibility(INVISIBLE);
+
+      this.typingView.setVisibility(VISIBLE);
+      this.typingView.startAnimation();
+    } else {
+      this.typingView.setVisibility(GONE);
+      this.typingView.stopAnimation();
+
+      this.subjectView.setVisibility(VISIBLE);
+    }
+  }
+
   public Recipient getRecipient() {
     return recipient.get();
   }
@@ -421,7 +427,7 @@ public class ConversationListItem extends RelativeLayout
     } else if (SmsDatabase.Types.isMissedCall(thread.getType())) {
       return emphasisAdded(context.getString(org.thoughtcrime.securesms.R.string.ThreadRecord_missed_call));
     } else if (SmsDatabase.Types.isJoinedType(thread.getType())) {
-      return emphasisAdded(context.getString(R.string.ThreadRecord_s_is_on_signal, thread.getRecipient().toShortString(context)));
+      return emphasisAdded(context.getString(R.string.ThreadRecord_s_is_on_signal, thread.getRecipient().getDisplayName(context)));
     } else if (SmsDatabase.Types.isExpirationTimerUpdate(thread.getType())) {
       int seconds = (int)(thread.getExpiresIn() / 1000);
       if (seconds <= 0) {
@@ -433,7 +439,7 @@ public class ConversationListItem extends RelativeLayout
       if (thread.getRecipient().isGroup()) {
         return emphasisAdded(context.getString(R.string.ThreadRecord_safety_number_changed));
       } else {
-        return emphasisAdded(context.getString(R.string.ThreadRecord_your_safety_number_with_s_has_changed, thread.getRecipient().toShortString(context)));
+        return emphasisAdded(context.getString(R.string.ThreadRecord_your_safety_number_with_s_has_changed, thread.getRecipient().getDisplayName(context)));
       }
     } else if (SmsDatabase.Types.isIdentityVerified(thread.getType())) {
       return emphasisAdded(context.getString(R.string.ThreadRecord_you_marked_verified));
@@ -446,7 +452,7 @@ public class ConversationListItem extends RelativeLayout
       if (extra != null && extra.isViewOnce()) {
         return new SpannableString(emphasisAdded(getViewOnceDescription(context, thread.getContentType())));
       } else if (extra != null && extra.isRemoteDelete()) {
-        return new SpannableString(emphasisAdded(context.getString(R.string.ThreadRecord_this_message_was_deleted)));
+        return new SpannableString(emphasisAdded(context.getString(thread.isOutgoing() ? R.string.ThreadRecord_you_deleted_this_message : R.string.ThreadRecord_this_message_was_deleted)));
       } else {
         return new SpannableString(Util.emptyIfNull(thread.getBody()));
       }

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

@@ -55,4 +55,14 @@ public class ConversationListItemAction extends LinearLayout implements Bindable
   public void unbind() {
 
   }
+
+  @Override
+  public void setBatchMode(boolean batchMode) {
+
+  }
+
+  @Override
+  public void updateTypingIndicator(@NonNull Set<Long> typingThreads) {
+
+  }
 }

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

@@ -49,4 +49,14 @@ public class ConversationListItemInboxZero extends LinearLayout implements Binda
   {
 
   }
+
+  @Override
+  public void setBatchMode(boolean batchMode) {
+
+  }
+
+  @Override
+  public void updateTypingIndicator(@NonNull Set<Long> typingThreads) {
+
+  }
 }

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

@@ -10,9 +10,14 @@ import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
 import androidx.lifecycle.ViewModelProvider;
+import androidx.paging.DataSource;
+import androidx.paging.LivePagedListBuilder;
+import androidx.paging.PagedList;
 
+import org.thoughtcrime.securesms.conversationlist.model.Conversation;
 import org.thoughtcrime.securesms.conversationlist.model.SearchResult;
 import org.thoughtcrime.securesms.database.DatabaseContentProviders;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.megaphone.Megaphone;
 import org.thoughtcrime.securesms.megaphone.MegaphoneRepository;
@@ -20,36 +25,67 @@ import org.thoughtcrime.securesms.megaphone.Megaphones;
 import org.thoughtcrime.securesms.search.SearchRepository;
 import org.thoughtcrime.securesms.util.Debouncer;
 import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.util.concurrent.SignalExecutors;
+import org.thoughtcrime.securesms.util.livedata.LiveDataUtil;
+import org.thoughtcrime.securesms.util.paging.Invalidator;
 
 class ConversationListViewModel extends ViewModel {
 
   private final Application                   application;
   private final MutableLiveData<Megaphone>    megaphone;
   private final MutableLiveData<SearchResult> searchResult;
+  private final MutableLiveData<Integer>      archivedCount;
+  private final LiveData<ConversationList>    conversationList;
   private final SearchRepository              searchRepository;
   private final MegaphoneRepository           megaphoneRepository;
   private final Debouncer                     debouncer;
   private final ContentObserver               observer;
+  private final Invalidator                   invalidator;
 
   private String lastQuery;
 
-  private ConversationListViewModel(@NonNull Application application, @NonNull SearchRepository searchRepository) {
+  private ConversationListViewModel(@NonNull Application application, @NonNull SearchRepository searchRepository, boolean isArchived) {
     this.application         = application;
     this.megaphone           = new MutableLiveData<>();
     this.searchResult        = new MutableLiveData<>();
+    this.archivedCount       = new MutableLiveData<>();
     this.searchRepository    = searchRepository;
     this.megaphoneRepository = ApplicationDependencies.getMegaphoneRepository();
     this.debouncer           = new Debouncer(300);
+    this.invalidator         = new Invalidator();
     this.observer            = new ContentObserver(new Handler()) {
       @Override
       public void onChange(boolean selfChange) {
         if (!TextUtils.isEmpty(getLastQuery())) {
           searchRepository.query(getLastQuery(), searchResult::postValue);
         }
+
+        if (!isArchived) {
+          updateArchivedCount();
+        }
       }
     };
 
+    DataSource.Factory<Integer, Conversation> factory = new ConversationListDataSource.Factory(application, invalidator, isArchived);
+    PagedList.Config                          config  = new PagedList.Config.Builder()
+                                                                            .setPageSize(15)
+                                                                            .setInitialLoadSizeHint(30)
+                                                                            .setEnablePlaceholders(true)
+                                                                            .build();
+
+    LiveData<PagedList<Conversation>> conversationList = new LivePagedListBuilder<>(factory, config).setFetchExecutor(ConversationListDataSource.EXECUTOR)
+                                                                                                    .setInitialLoadKey(0)
+                                                                                                    .build();
+
+    if (isArchived) {
+      this.archivedCount.setValue(0);
+    } else {
+      updateArchivedCount();
+    }
+
     application.getContentResolver().registerContentObserver(DatabaseContentProviders.ConversationList.CONTENT_URI, true, observer);
+
+    this.conversationList = LiveDataUtil.combineLatest(conversationList, this.archivedCount, ConversationList::new);
   }
 
   @NonNull LiveData<SearchResult> getSearchResult() {
@@ -60,6 +96,10 @@ class ConversationListViewModel extends ViewModel {
     return megaphone;
   }
 
+  @NonNull LiveData<ConversationList> getConversationList() {
+    return conversationList;
+  }
+
   void onVisible() {
     megaphoneRepository.getNextMegaphone(megaphone::postValue);
   }
@@ -95,15 +135,51 @@ class ConversationListViewModel extends ViewModel {
 
   @Override
   protected void onCleared() {
+    invalidator.invalidate();
     debouncer.clear();
     application.getContentResolver().unregisterContentObserver(observer);
   }
 
+  private void updateArchivedCount() {
+    SignalExecutors.BOUNDED.execute(() -> {
+      archivedCount.postValue(DatabaseFactory.getThreadDatabase(application).getArchivedConversationListCount());
+    });
+  }
+
   public static class Factory extends ViewModelProvider.NewInstanceFactory {
+
+    private final boolean isArchived;
+
+    public Factory(boolean isArchived) {
+      this.isArchived = isArchived;
+    }
+
     @Override
     public @NonNull<T extends ViewModel> T create(@NonNull Class<T> modelClass) {
       //noinspection ConstantConditions
-      return modelClass.cast(new ConversationListViewModel(ApplicationDependencies.getApplication(), new SearchRepository()));
+      return modelClass.cast(new ConversationListViewModel(ApplicationDependencies.getApplication(), new SearchRepository(), isArchived));
+    }
+  }
+
+  final static class ConversationList {
+    private final PagedList<Conversation> conversations;
+    private final int                     archivedCount;
+
+    ConversationList(PagedList<Conversation> conversations, int archivedCount) {
+      this.conversations = conversations;
+      this.archivedCount = archivedCount;
+    }
+
+    PagedList<Conversation> getConversations() {
+      return conversations;
+    }
+
+    int getArchivedCount() {
+      return archivedCount;
+    }
+
+    boolean isEmpty() {
+      return conversations.isEmpty() && archivedCount == 0;
     }
   }
 }

app/src/main/java/org/thoughtcrime/securesms/conversationlist/model/Conversation.java

@@ -0,0 +1,30 @@
+package org.thoughtcrime.securesms.conversationlist.model;
+
+import androidx.annotation.NonNull;
+
+import org.thoughtcrime.securesms.database.model.ThreadRecord;
+
+public class Conversation {
+  private final ThreadRecord threadRecord;
+
+  public Conversation(@NonNull ThreadRecord threadRecord) {
+    this.threadRecord = threadRecord;
+  }
+
+  public @NonNull ThreadRecord getThreadRecord() {
+    return threadRecord;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    Conversation that = (Conversation) o;
+    return threadRecord.equals(that.threadRecord);
+  }
+
+  @Override
+  public int hashCode() {
+    return threadRecord.hashCode();
+  }
+}

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

@@ -60,6 +60,7 @@ 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;
@@ -112,6 +113,7 @@ public class AttachmentDatabase extends Database {
   public  static final String UNIQUE_ID              = "unique_id";
           static final String DIGEST                 = "digest";
           static final String VOICE_NOTE             = "voice_note";
+          static final String BORDERLESS             = "borderless";
           static final String QUOTE                  = "quote";
   public  static final String STICKER_PACK_ID        = "sticker_pack_id";
   public  static final String STICKER_PACK_KEY       = "sticker_pack_key";
@@ -122,7 +124,7 @@ public class AttachmentDatabase extends Database {
           static final String WIDTH                  = "width";
           static final String HEIGHT                 = "height";
           static final String CAPTION                = "caption";
-  private static final String DATA_HASH              = "data_hash";
+          static final String DATA_HASH              = "data_hash";
           static final String VISUAL_HASH            = "blur_hash";
           static final String TRANSFORM_PROPERTIES   = "transform_properties";
           static final String DISPLAY_ORDER          = "display_order";
@@ -146,7 +148,7 @@ public class AttachmentDatabase extends Database {
                                                            CDN_NUMBER, CONTENT_LOCATION, DATA, THUMBNAIL,
                                                            TRANSFER_STATE, SIZE, FILE_NAME, THUMBNAIL,
                                                            THUMBNAIL_ASPECT_RATIO, UNIQUE_ID, DIGEST,
-                                                           FAST_PREFLIGHT_ID, VOICE_NOTE, QUOTE, DATA_RANDOM,
+                                                           FAST_PREFLIGHT_ID, VOICE_NOTE, BORDERLESS, QUOTE, DATA_RANDOM,
                                                            THUMBNAIL_RANDOM, WIDTH, HEIGHT, CAPTION, STICKER_PACK_ID,
                                                            STICKER_PACK_KEY, STICKER_ID, DATA_HASH, VISUAL_HASH,
                                                            TRANSFORM_PROPERTIES, TRANSFER_FILE, DISPLAY_ORDER,
@@ -175,6 +177,7 @@ public class AttachmentDatabase extends Database {
                                                                                   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, " +
@@ -306,6 +309,23 @@ public class AttachmentDatabase extends Database {
     }
   }
 
+  public boolean hasAttachment(@NonNull AttachmentId id) {
+    SQLiteDatabase database = databaseHelper.getReadableDatabase();
+
+    try (Cursor cursor = database.query(TABLE_NAME,
+                                        new String[]{ROW_ID, UNIQUE_ID},
+                                        PART_ID_WHERE,
+                                        id.toStrings(),
+                                        null,
+                                        null,
+                                        null)) {
+      if (cursor != null && cursor.getCount() > 0) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   public boolean hasAttachmentFilesForMessage(long mmsId) {
     String   selection = MMS_ID + " = ? AND (" + DATA + " NOT NULL OR " + TRANSFER_STATE + " != ?)";
     String[] args      = new String[] { String.valueOf(mmsId), String.valueOf(TRANSFER_PROGRESS_DONE) };
@@ -496,14 +516,20 @@ public class AttachmentDatabase extends Database {
           database.beginTransaction();
           try {
             for (AttachmentId weakReference : removableWeakReferences) {
-              Log.i(TAG, String.format("[deleteAttachmentOnDisk] Deleting weak reference for %s %s", data, weakReference));
-              deletedCount += database.delete(TABLE_NAME, PART_ID_WHERE, weakReference.toStrings());
+              Log.i(TAG, String.format("[deleteAttachmentOnDisk] Clearing weak reference for %s %s", data, weakReference));
+              ContentValues values = new ContentValues();
+              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();
           } finally {
             database.endTransaction();
           }
-          String logMessage = String.format(Locale.US, "[deleteAttachmentOnDisk] Deleted %d/%d weak references for %s", deletedCount, removableWeakReferences.size(), data);
+          String logMessage = String.format(Locale.US, "[deleteAttachmentOnDisk] Cleared %d/%d weak references for %s", deletedCount, removableWeakReferences.size(), data);
           if (deletedCount != removableWeakReferences.size()) {
             Log.w(TAG, logMessage);
           } else {
@@ -1162,6 +1188,7 @@ public class AttachmentDatabase extends Database {
                                               null,
                                               object.getString(FAST_PREFLIGHT_ID),
                                               object.getInt(VOICE_NOTE) == 1,
+                                              object.getInt(BORDERLESS) == 1,
                                               object.getInt(WIDTH),
                                               object.getInt(HEIGHT),
                                               object.getInt(QUOTE) == 1,
@@ -1198,6 +1225,7 @@ public class AttachmentDatabase extends Database {
                                                                 cursor.getBlob(cursor.getColumnIndexOrThrow(DIGEST)),
                                                                 cursor.getString(cursor.getColumnIndexOrThrow(FAST_PREFLIGHT_ID)),
                                                                 cursor.getInt(cursor.getColumnIndexOrThrow(VOICE_NOTE)) == 1,
+                                                                cursor.getInt(cursor.getColumnIndexOrThrow(BORDERLESS)) == 1,
                                                                 cursor.getInt(cursor.getColumnIndexOrThrow(WIDTH)),
                                                                 cursor.getInt(cursor.getColumnIndexOrThrow(HEIGHT)),
                                                                 cursor.getInt(cursor.getColumnIndexOrThrow(QUOTE)) == 1,
@@ -1263,6 +1291,7 @@ public class AttachmentDatabase extends Database {
     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);

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

@@ -67,6 +67,10 @@ public abstract class Database {
     cursor.setNotificationUri(context.getContentResolver(), DatabaseContentProviders.Conversation.getUriForThread(threadId));
   }
 
+  protected void setNotifyConversationListeners(Cursor cursor) {
+    cursor.setNotificationUri(context.getContentResolver(), DatabaseContentProviders.Conversation.getUriForAllThreads());
+  }
+
   protected void setNotifyVerboseConversationListeners(Cursor cursor, long threadId) {
     cursor.setNotificationUri(context.getContentResolver(), DatabaseContentProviders.Conversation.getVerboseUriForThread(threadId));
   }

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

@@ -27,6 +27,10 @@ public class DatabaseContentProviders {
     public static Uri getVerboseUriForThread(long threadId) {
       return Uri.parse(CONTENT_URI_STRING + "verbose/" + threadId);
     }
+
+    public static Uri getUriForAllThreads() {
+      return Uri.parse(CONTENT_URI_STRING);
+    }
   }
 
   public static class Attachment extends NoopContentProvider {

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

@@ -39,29 +39,30 @@ public class DatabaseFactory {
 
   private static DatabaseFactory instance;
 
-  private final SQLCipherOpenHelper   databaseHelper;
-  private final SmsDatabase           sms;
-  private final MmsDatabase           mms;
-  private final AttachmentDatabase    attachments;
-  private final MediaDatabase         media;
-  private final ThreadDatabase        thread;
-  private final MmsSmsDatabase        mmsSmsDatabase;
-  private final IdentityDatabase      identityDatabase;
-  private final DraftDatabase         draftDatabase;
-  private final PushDatabase          pushDatabase;
-  private final GroupDatabase         groupDatabase;
-  private final RecipientDatabase     recipientDatabase;
-  private final ContactsDatabase      contactsDatabase;
-  private final GroupReceiptDatabase  groupReceiptDatabase;
-  private final OneTimePreKeyDatabase preKeyDatabase;
-  private final SignedPreKeyDatabase  signedPreKeyDatabase;
-  private final SessionDatabase       sessionDatabase;
-  private final SearchDatabase        searchDatabase;
-  private final JobDatabase           jobDatabase;
-  private final StickerDatabase       stickerDatabase;
-  private final StorageKeyDatabase    storageKeyDatabase;
-  private final KeyValueDatabase      keyValueDatabase;
-  private final MegaphoneDatabase     megaphoneDatabase;
+  private final SQLCipherOpenHelper     databaseHelper;
+  private final SmsDatabase             sms;
+  private final MmsDatabase             mms;
+  private final AttachmentDatabase      attachments;
+  private final MediaDatabase           media;
+  private final ThreadDatabase          thread;
+  private final MmsSmsDatabase          mmsSmsDatabase;
+  private final IdentityDatabase        identityDatabase;
+  private final DraftDatabase           draftDatabase;
+  private final PushDatabase            pushDatabase;
+  private final GroupDatabase           groupDatabase;
+  private final RecipientDatabase       recipientDatabase;
+  private final ContactsDatabase        contactsDatabase;
+  private final GroupReceiptDatabase    groupReceiptDatabase;
+  private final OneTimePreKeyDatabase   preKeyDatabase;
+  private final SignedPreKeyDatabase    signedPreKeyDatabase;
+  private final SessionDatabase         sessionDatabase;
+  private final SearchDatabase          searchDatabase;
+  private final JobDatabase             jobDatabase;
+  private final StickerDatabase         stickerDatabase;
+  private final StorageKeyDatabase      storageKeyDatabase;
+  private final KeyValueDatabase        keyValueDatabase;
+  private final MegaphoneDatabase       megaphoneDatabase;
+  private final RemappedRecordsDatabase remappedRecordsDatabase;
 
   public static DatabaseFactory getInstance(Context context) {
     synchronized (lock) {
@@ -160,6 +161,10 @@ public class DatabaseFactory {
     return getInstance(context).megaphoneDatabase;
   }
 
+  static RemappedRecordsDatabase getRemappedRecordsDatabase(Context context) {
+    return getInstance(context).remappedRecordsDatabase;
+  }
+
   public static SQLiteDatabase getBackupDatabase(Context context) {
     return getInstance(context).databaseHelper.getReadableDatabase();
   }
@@ -175,8 +180,8 @@ public class DatabaseFactory {
     }
   }
 
-  static SQLCipherOpenHelper getRawDatabase(Context context) {
-    return getInstance(context).databaseHelper;
+  public static boolean inTransaction(Context context) {
+    return getInstance(context).databaseHelper.getWritableDatabase().inTransaction();
   }
 
   private DatabaseFactory(@NonNull Context context) {
@@ -185,29 +190,30 @@ public class DatabaseFactory {
     DatabaseSecret      databaseSecret   = new DatabaseSecretProvider(context).getOrCreateDatabaseSecret();
     AttachmentSecret    attachmentSecret = AttachmentSecretProvider.getInstance(context).getOrCreateAttachmentSecret();
 
-    this.databaseHelper       = new SQLCipherOpenHelper(context, databaseSecret);
-    this.sms                  = new SmsDatabase(context, databaseHelper);
-    this.mms                  = new MmsDatabase(context, databaseHelper);
-    this.attachments          = new AttachmentDatabase(context, databaseHelper, attachmentSecret);
-    this.media                = new MediaDatabase(context, databaseHelper);
-    this.thread               = new ThreadDatabase(context, databaseHelper);
-    this.mmsSmsDatabase       = new MmsSmsDatabase(context, databaseHelper);
-    this.identityDatabase     = new IdentityDatabase(context, databaseHelper);
-    this.draftDatabase        = new DraftDatabase(context, databaseHelper);
-    this.pushDatabase         = new PushDatabase(context, databaseHelper);
-    this.groupDatabase        = new GroupDatabase(context, databaseHelper);
-    this.recipientDatabase    = new RecipientDatabase(context, databaseHelper);
-    this.groupReceiptDatabase = new GroupReceiptDatabase(context, databaseHelper);
-    this.contactsDatabase     = new ContactsDatabase(context);
-    this.preKeyDatabase       = new OneTimePreKeyDatabase(context, databaseHelper);
-    this.signedPreKeyDatabase = new SignedPreKeyDatabase(context, databaseHelper);
-    this.sessionDatabase      = new SessionDatabase(context, databaseHelper);
-    this.searchDatabase       = new SearchDatabase(context, databaseHelper);
-    this.jobDatabase          = new JobDatabase(context, databaseHelper);
-    this.stickerDatabase      = new StickerDatabase(context, databaseHelper, attachmentSecret);
-    this.storageKeyDatabase   = new StorageKeyDatabase(context, databaseHelper);
-    this.keyValueDatabase     = new KeyValueDatabase(context, databaseHelper);
-    this.megaphoneDatabase    = new MegaphoneDatabase(context, databaseHelper);
+    this.databaseHelper          = new SQLCipherOpenHelper(context, databaseSecret);
+    this.sms                     = new SmsDatabase(context, databaseHelper);
+    this.mms                     = new MmsDatabase(context, databaseHelper);
+    this.attachments             = new AttachmentDatabase(context, databaseHelper, attachmentSecret);
+    this.media                   = new MediaDatabase(context, databaseHelper);
+    this.thread                  = new ThreadDatabase(context, databaseHelper);
+    this.mmsSmsDatabase          = new MmsSmsDatabase(context, databaseHelper);
+    this.identityDatabase        = new IdentityDatabase(context, databaseHelper);
+    this.draftDatabase           = new DraftDatabase(context, databaseHelper);
+    this.pushDatabase            = new PushDatabase(context, databaseHelper);
+    this.groupDatabase           = new GroupDatabase(context, databaseHelper);
+    this.recipientDatabase       = new RecipientDatabase(context, databaseHelper);
+    this.groupReceiptDatabase    = new GroupReceiptDatabase(context, databaseHelper);
+    this.contactsDatabase        = new ContactsDatabase(context);
+    this.preKeyDatabase          = new OneTimePreKeyDatabase(context, databaseHelper);
+    this.signedPreKeyDatabase    = new SignedPreKeyDatabase(context, databaseHelper);
+    this.sessionDatabase         = new SessionDatabase(context, databaseHelper);
+    this.searchDatabase          = new SearchDatabase(context, databaseHelper);
+    this.jobDatabase             = new JobDatabase(context, databaseHelper);
+    this.stickerDatabase         = new StickerDatabase(context, databaseHelper, attachmentSecret);
+    this.storageKeyDatabase      = new StorageKeyDatabase(context, databaseHelper);
+    this.keyValueDatabase        = new KeyValueDatabase(context, databaseHelper);
+    this.megaphoneDatabase       = new MegaphoneDatabase(context, databaseHelper);
+    this.remappedRecordsDatabase = new RemappedRecordsDatabase(context, databaseHelper);
   }
 
   public void onApplicationLevelUpgrade(@NonNull Context context, @NonNull MasterSecret masterSecret,